Skip to content

Commit

Permalink
Fixed a ton of "protien" typos. There should be none left according t…
Browse files Browse the repository at this point in the history
…o ag
  • Loading branch information
hhyyrylainen committed Jan 12, 2019
1 parent a41c28f commit 2d4ea98
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 42 deletions.
4 changes: 2 additions & 2 deletions scripts/gui/microbe_editor.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ const organelleSelectionElements = [
organelle: "nitrogenfixingplastid"
},
{
element: document.getElementById("addChemoSynthisizingProtiens"),
organelle: "chemoSynthisizingProtiens"
element: document.getElementById("addChemoSynthisizingProteins"),
organelle: "chemoSynthisizingProteins"
},
{
element: document.getElementById("addFlagellum"),
Expand Down
8 changes: 4 additions & 4 deletions scripts/gui/thrive_gui.html
Original file line number Diff line number Diff line change
Expand Up @@ -457,15 +457,15 @@
Coloured, membrane-associated vesicles used by various prokaryotes perform photosynthesis.
Chromatophores contain bacteriochlorophyll pigments and carotenoids.</span>
<div id="ChromatophorIcon"></div>Chromatophores<br>25 MP</td>
<td id="addChemoSynthisizingProtiens" class="OrganelleListItem">
<td id="addChemoSynthisizingProteins" class="OrganelleListItem">
<span class="tooltiptext">
ChemosynthisizingProtiens <hr><br> Cost: 20 mutation points <hr><br>
ChemosynthisizingProteins <hr><br> Cost: 20 mutation points <hr><br>
Performs Process: Bacterial Chemosynthesis<br>(1 CO2 + 1 Hydrogen Sulfide -> 1 Glucose)/Second (Depending On Environmental C02)<br>
Performs Process: Glycolysis<br>(0.125 glucose -> 5 ATP)/Second<hr><br>
Storage Space: 20<hr><br>
Small membrane-associated structures that convert the noxious soup containing hydrogen
sulfide from hydrothermal vents into usable energy in the form of glucose.</span>
<div id="ChemosynthisizingProtiensIcon"></div>Chemosynthisizing Protiens<br>20 MP</td>
<div id="ChemosynthisizingProteinsIcon"></div>Chemosynthisizing Proteins<br>20 MP</td>
</tr></table>
</div>
</div>
Expand Down Expand Up @@ -540,7 +540,7 @@

Metabolosomes: Produces the same amount of ATP of a mitocondria, but is way way less efficient, it only takes up 1 Hex and has 10 storage space<br>

Chemosynthisizing Protiens: Produces half of the glucose out of Hydrogen Sulfide as a chemoplast, but also performs glycolysis, takes up 1 Hex and has 20 storage space<br>
Chemosynthisizing Proteins: Produces half of the glucose out of Hydrogen Sulfide as a chemoplast, but also performs glycolysis, takes up 1 Hex and has 20 storage space<br>

Chromatophores: Produces 1/3rd the amount of glucose as a normal chloroplast, but also performs glycolysis, and has 10 storage space, and takes up 1 Hex.<br><br>

Expand Down
2 changes: 1 addition & 1 deletion scripts/gui/thrive_style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ video {
background-image: url("../../Textures/gui/bevel/ChromatophorIcon.png");
}

#ChemosynthisizingProtiensIcon {
#ChemosynthisizingProteinsIcon {
position: relative;
left: calc(50% - 30px);
width: 60px;
Expand Down
2 changes: 1 addition & 1 deletion scripts/microbe_stage/microbe_editor/microbe_editor.as
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class MicrobeEditor{
{"chemoplast", PlacementFunctionType(this.addOrganelle)},
{"chromatophors", PlacementFunctionType(this.addOrganelle)},
{"metabolosome", PlacementFunctionType(this.addOrganelle)},
{"chemoSynthisizingProtiens", PlacementFunctionType(this.addOrganelle)},
{"chemoSynthisizingProteins", PlacementFunctionType(this.addOrganelle)},
{"remove", PlacementFunctionType(this.removeOrganelle)}
};
}
Expand Down
60 changes: 31 additions & 29 deletions scripts/microbe_stage/organelle_table.as
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ void setupOrganelles(){
// Prokaryotic Organelles (all meshes are placeholders)//

// ------------------------------------ //
// Respiratory Protien
// Respiratory Protein
auto respiratoryProtein = OrganelleParameters("metabolosome");

respiratoryProtein.mass = 0.1;
Expand Down Expand Up @@ -568,7 +568,7 @@ void setupOrganelles(){

_addOrganelleToTable(Organelle(photosyntheticProtein));

// Oxytoxy Protien
// Oxytoxy Protein
auto oxytoxyProtein = OrganelleParameters("oxytoxyProteins");

oxytoxyProtein.mass = 0.1;
Expand Down Expand Up @@ -597,32 +597,32 @@ void setupOrganelles(){
_addOrganelleToTable(Organelle(oxytoxyProtein));


// chemoSynthisizingProtien
auto chemoSynthisizingProtien = OrganelleParameters("chemoSynthisizingProtiens");
// chemoSynthisizingProtein
auto chemoSynthisizingProtein = OrganelleParameters("chemoSynthisizingProteins");

chemoSynthisizingProtien.mass = 0.1;
chemoSynthisizingProtien.gene = "c";
chemoSynthisizingProtien.mesh = "chemoproteins.mesh";
chemoSynthisizingProtien.chanceToCreate = 0.5f;
chemoSynthisizingProtien.prokaryoteChance = 1;
chemoSynthisizingProtien.mpCost = 20;
chemoSynthisizingProtien.initialComposition = {
chemoSynthisizingProtein.mass = 0.1;
chemoSynthisizingProtein.gene = "c";
chemoSynthisizingProtein.mesh = "chemoproteins.mesh";
chemoSynthisizingProtein.chanceToCreate = 0.5f;
chemoSynthisizingProtein.prokaryoteChance = 1;
chemoSynthisizingProtein.mpCost = 20;
chemoSynthisizingProtein.initialComposition = {
{"phosphates", 1},
{"ammonia", 1}
};
chemoSynthisizingProtien.components = {
chemoSynthisizingProtein.components = {
processorOrganelleFactory(1.0f),
storageOrganelleFactory(20.0f)
};
chemoSynthisizingProtien.processes = {
chemoSynthisizingProtein.processes = {
TweakedProcess("bacterial_ChemoSynthesis", 1),
TweakedProcess("glycolosis", 1)
};
chemoSynthisizingProtien.hexes = {
chemoSynthisizingProtein.hexes = {
Int2(0, 0),
};

_addOrganelleToTable(Organelle(chemoSynthisizingProtien));
_addOrganelleToTable(Organelle(chemoSynthisizingProtein));

// Bacterial cytoplasm equivilent (so they dont die immediately) (just a stopgap measure for now, though it is real)
auto protoplasmParameters = OrganelleParameters("protoplasm");
Expand All @@ -649,33 +649,35 @@ void setupOrganelles(){
};
_addOrganelleToTable(Organelle(protoplasmParameters));

// nitrogenFixationProtien
// nitrogenFixationProtein
// Uses same mode as chemoplast for now
auto nitrogenFixationProtien = OrganelleParameters("nitrogenFixationProtiens");

nitrogenFixationProtien.mass = 0.1;
nitrogenFixationProtien.gene = "i";
nitrogenFixationProtien.mesh = "nitrogenplastid.mesh";
nitrogenFixationProtien.chanceToCreate = 0;
nitrogenFixationProtien.prokaryoteChance = 1;
nitrogenFixationProtien.mpCost = 15;
nitrogenFixationProtien.initialComposition = {
auto nitrogenFixationProtein = OrganelleParameters("nitrogenFixationProteins");

nitrogenFixationProtein.mass = 0.1;
nitrogenFixationProtein.gene = "i";
nitrogenFixationProtein.mesh = "nitrogenplastid.mesh";
nitrogenFixationProtein.chanceToCreate = 0;
nitrogenFixationProtein.prokaryoteChance = 1;
nitrogenFixationProtein.mpCost = 15;
nitrogenFixationProtein.initialComposition = {
{"phosphates", 1},
{"ammonia",1}
};
nitrogenFixationProtien.components = {
nitrogenFixationProtein.components = {
processorOrganelleFactory(1.0f),
storageOrganelleFactory(25.0f)
};
nitrogenFixationProtien.processes = {
nitrogenFixationProtein.processes = {
TweakedProcess("nitrogenFixing", 1),
TweakedProcess("glycolosis", 1)
};
nitrogenFixationProtien.hexes = {
nitrogenFixationProtein.hexes = {
Int2(0, 0),
};

_addOrganelleToTable(Organelle(nitrogenFixationProtien)); // ------------------------------------ //
_addOrganelleToTable(Organelle(nitrogenFixationProtein));

// ------------------------------------ //
// Setup the organelle letters
setupOrganelleLetters();
}
Expand Down
10 changes: 5 additions & 5 deletions scripts/microbe_stage/species_system.as
Original file line number Diff line number Diff line change
Expand Up @@ -699,10 +699,10 @@ class Species{
}

// Bacteria
// will randomly have 1 of 3 organelles right now, photosynthesizing protiens,
// respiratory Protiens, or Oxy Toxy Producing Protiens, also pure cytoplasm
// will randomly have 1 of 3 organelles right now, photosynthesizing proteins,
// respiratory Proteins, or Oxy Toxy Producing Proteins, also pure cytoplasm
// aswell for variety.
//TODO when chemosynthesis is added add a protien for that aswell
//TODO when chemosynthesis is added add a protein for that aswell
switch(GetEngine().GetRandom().GetNumber(1,7))
{
case 1:
Expand All @@ -718,10 +718,10 @@ class Species{
stringCode = getOrganelleDefinition("oxytoxyProteins").gene;
break;
case 5:
stringCode = getOrganelleDefinition("chemoSynthisizingProtiens").gene;
stringCode = getOrganelleDefinition("chemoSynthisizingProteins").gene;
break;
case 6:
stringCode = getOrganelleDefinition("nitrogenFixationProtiens").gene;
stringCode = getOrganelleDefinition("nitrogenFixationProteins").gene;
break;
default:
stringCode = getOrganelleDefinition("protoplasm").gene;
Expand Down

0 comments on commit 2d4ea98

Please sign in to comment.