From 2d4ea98d01a92ea36d0806f943b4c28817a9d12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henri=20Hyyryl=C3=A4inen?= Date: Sat, 12 Jan 2019 12:15:19 +0200 Subject: [PATCH] Fixed a ton of "protien" typos. There should be none left according to ag --- scripts/gui/microbe_editor.mjs | 4 +- scripts/gui/thrive_gui.html | 8 +-- scripts/gui/thrive_style.css | 2 +- .../microbe_editor/microbe_editor.as | 2 +- scripts/microbe_stage/organelle_table.as | 60 ++++++++++--------- scripts/microbe_stage/species_system.as | 10 ++-- 6 files changed, 44 insertions(+), 42 deletions(-) diff --git a/scripts/gui/microbe_editor.mjs b/scripts/gui/microbe_editor.mjs index 134da298d69..cf08ff04127 100644 --- a/scripts/gui/microbe_editor.mjs +++ b/scripts/gui/microbe_editor.mjs @@ -49,8 +49,8 @@ const organelleSelectionElements = [ organelle: "nitrogenfixingplastid" }, { - element: document.getElementById("addChemoSynthisizingProtiens"), - organelle: "chemoSynthisizingProtiens" + element: document.getElementById("addChemoSynthisizingProteins"), + organelle: "chemoSynthisizingProteins" }, { element: document.getElementById("addFlagellum"), diff --git a/scripts/gui/thrive_gui.html b/scripts/gui/thrive_gui.html index e98479589ab..c46a84ad208 100644 --- a/scripts/gui/thrive_gui.html +++ b/scripts/gui/thrive_gui.html @@ -457,15 +457,15 @@ Coloured, membrane-associated vesicles used by various prokaryotes perform photosynthesis. Chromatophores contain bacteriochlorophyll pigments and carotenoids.
Chromatophores
25 MP - + - ChemosynthisizingProtiens

Cost: 20 mutation points

+ ChemosynthisizingProteins

Cost: 20 mutation points

Performs Process: Bacterial Chemosynthesis
(1 CO2 + 1 Hydrogen Sulfide -> 1 Glucose)/Second (Depending On Environmental C02)
Performs Process: Glycolysis
(0.125 glucose -> 5 ATP)/Second

Storage Space: 20

Small membrane-associated structures that convert the noxious soup containing hydrogen sulfide from hydrothermal vents into usable energy in the form of glucose. -
Chemosynthisizing Protiens
20 MP +
Chemosynthisizing Proteins
20 MP @@ -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
-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
+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
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.

diff --git a/scripts/gui/thrive_style.css b/scripts/gui/thrive_style.css index 9fb61f084b8..05c14baa92b 100644 --- a/scripts/gui/thrive_style.css +++ b/scripts/gui/thrive_style.css @@ -1240,7 +1240,7 @@ video { background-image: url("../../Textures/gui/bevel/ChromatophorIcon.png"); } -#ChemosynthisizingProtiensIcon { +#ChemosynthisizingProteinsIcon { position: relative; left: calc(50% - 30px); width: 60px; diff --git a/scripts/microbe_stage/microbe_editor/microbe_editor.as b/scripts/microbe_stage/microbe_editor/microbe_editor.as index 228c126af4c..27739eba152 100644 --- a/scripts/microbe_stage/microbe_editor/microbe_editor.as +++ b/scripts/microbe_stage/microbe_editor/microbe_editor.as @@ -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)} }; } diff --git a/scripts/microbe_stage/organelle_table.as b/scripts/microbe_stage/organelle_table.as index 2c14feb6075..3b0f5ad6478 100644 --- a/scripts/microbe_stage/organelle_table.as +++ b/scripts/microbe_stage/organelle_table.as @@ -515,7 +515,7 @@ void setupOrganelles(){ // Prokaryotic Organelles (all meshes are placeholders)// // ------------------------------------ // - // Respiratory Protien + // Respiratory Protein auto respiratoryProtein = OrganelleParameters("metabolosome"); respiratoryProtein.mass = 0.1; @@ -568,7 +568,7 @@ void setupOrganelles(){ _addOrganelleToTable(Organelle(photosyntheticProtein)); - // Oxytoxy Protien + // Oxytoxy Protein auto oxytoxyProtein = OrganelleParameters("oxytoxyProteins"); oxytoxyProtein.mass = 0.1; @@ -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"); @@ -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(); } diff --git a/scripts/microbe_stage/species_system.as b/scripts/microbe_stage/species_system.as index 2f2d00548fa..d4c336cc09b 100644 --- a/scripts/microbe_stage/species_system.as +++ b/scripts/microbe_stage/species_system.as @@ -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: @@ -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;