Nitrogen fixation now relies on environmental oxygen and at max (if t…

…he atmosphere was 100% oxygen) would produce .5 ammonia from 5 atp a second. Fixed typos and made rusticyanin 45 mp cleaned up iron spawn code just a little bit.
yowshi · Feb 15, 2019 · 997a574 · 997a574
1 parent 12a98d4
commit 997a574
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/scripts/SimulationParameters/MicrobeStage/BioProcesses.json b/scripts/SimulationParameters/MicrobeStage/BioProcesses.json
@@ -79,11 +79,12 @@
         "name": "Nitrogen Fixing",
 
         "inputs": {
-            "atp": 0.5
+            "oxygen": 1.0,
+            "atp": 5
         },
 
         "outputs": {
-            "ammonia": 0.1
+            "ammonia": 0.5
         }
     },
 

diff --git a/scripts/gui/thrive_gui.html b/scripts/gui/thrive_gui.html
@@ -466,8 +466,8 @@
             <td id="addNitrogenFixingPlastid" class="OrganelleListItem">
                 <span class="tooltiptext">
                 Nitrogen Fixing Plastid<hr><br> Cost: 80 mutation points<hr><br> 
-                Performs Process: Nitrogen Fixation<br>(0.5 ATP -> 0.1 Ammonia)/Second<hr><br>
-                Allows for synthesis of ammonia from atmospheric nitrogen. For easier cell growth.
+                Performs Process: Nitrogen Fixation<br>(1 Oxygen + 5 ATP -> 0.5 Ammonia)/Second (Depending On Environmental Oxygen)<hr><br>
+                Allows for synthesis of ammonia from atmospheric nitrogen and oxygen. For easier cell growth.
                 </span>
                 <div id="PlastidIcon">
                 </div>Nitrogen Fixing Plastid<br>80 MP</td>
@@ -485,36 +485,36 @@
                 Allows for production and storage of OxytoxyNT which can be shot at enemy cells using E. The more of this organelle you have the faster your toxin fire rate aswell.
                 </span>
                 <div id="ToxinVacuoleIcon"></div>Toxin Vacuole<br>70 MP</td>
-            <td id="addBioluminescent" class="OrganelleListItem DisabledButton">
-                <div id="BioluminescentIcon"></div>Bioluminescent Vacuole<br>N/A MP</td>
+             <td id="addBioluminescent" class="OrganelleListItem DisabledButton">
+               <div id="BioluminescentIcon"></div>Bioluminescent Vacuole<br>N/A MP</td>
              <td id="addChromatophor" class="OrganelleListItem">
                <span class="tooltiptext">
-                 Chromatophores <hr><br> Cost: 25 mutation points <hr><br> 
-                 Performs Process: Chromatophore Photosynthesis<br>(0.09 CO2 -> 0.33 glucose)/Second (Depending On Environmental C02)<br>
-                 Performs Process: Glycolysis<br>(0.125 glucose -> 5 ATP)/Second (Depending On Environmental C02)<hr><br>
-                 Storage Space: 10<hr><br>
-                 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="addChemoSynthisizingProteins" class="OrganelleListItem">
-               <span class="tooltiptext">
-                 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="ChemosynthisizingProteinsIcon"></div>Chemosynthisizing Proteins<br>20 MP</td> </tr>
-            <tr>
+                Chromatophores <hr><br> Cost: 25 mutation points <hr><br> 
+                Performs Process: Chromatophore Photosynthesis<br>(0.09 CO2 -> 0.33 glucose)/Second (Depending On Environmental C02)<br>
+                Performs Process: Glycolysis<br>(0.125 glucose -> 5 ATP)/Second (Depending On Environmental C02)<hr><br>
+                Storage Space: 10<hr><br>
+                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="addChemoSynthisizingProteins" class="OrganelleListItem">
+                <span class="tooltiptext">
+                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="ChemosynthisizingProteinsIcon"></div>Chemosynthisizing Proteins<br>45 MP</td> </tr>
+                <tr>
 	          <td id="addRusticyanin" class="OrganelleListItem">
                 <span class="tooltiptext">
-                Rusticyanin <hr><br> Cost: 20 mutation points <hr><br>
+                Rusticyanin <hr><br> Cost: 45 mutation points <hr><br>
                 Performs Process: Iron Chemolithotrophy<br>(0.09 CO2 + 0.5 Iron Ion -> 10 ATP)/Second (Depending On Environmental C02)<br>
                 Storage Space: 5<hr><br>
                 Siderophores and Rusticyanin for storing and using iron ions and carbon from atmospheric carbon dioxide to produce ATP.
                 Iron Chemolithotrophy is a process by which organisms obtain their energy from the oxidation of reduced inorganic ions.
                 </span>
-                <div id="RusticyaninIcon"></div>Rusticyanin<br>20 MP</td>
+                <div id="RusticyaninIcon"></div>Rusticyanin<br>45 MP</td>
 	      </tr></table>
 	    </div>
       </div>

diff --git a/scripts/microbe_stage/organelle_table.as b/scripts/microbe_stage/organelle_table.as
@@ -685,7 +685,7 @@ void setupOrganelles(){
     rusticyanin.mesh = "chemoproteins.mesh";
     rusticyanin.chanceToCreate = 0.5f;
     rusticyanin.prokaryoteChance = 1;
-    rusticyanin.mpCost = 20;
+    rusticyanin.mpCost = 45;
     rusticyanin.initialComposition = {
         {"phosphates", 1},
         {"ammonia", 1}

diff --git a/scripts/microbe_stage/setup.as b/scripts/microbe_stage/setup.as
@@ -657,9 +657,9 @@ ObjectID createIron(CellStageWorld@ world, Float3 pos)
         }
 
 
-    world.Create_CompoundVenterComponent(ironEntity);
+    auto venter = world.Create_CompoundVenterComponent(ironEntity);
     // So that larger iron chunks give out more compounds
-    world.GetComponent_CompoundVenterComponent(ironEntity).setVentAmount(ironAmount);
+    venter.setVentAmount(ironAmount);
     world.Create_CompoundBagComponent(ironEntity);
     auto model = world.Create_Model(ironEntity, renderNode.Node, mesh);
     // Need to set the tint