Fixed broken organelle list after merge. Made preview in browser work…

… again
yowshi · Feb 15, 2019 · 3f68d82 · 3f68d82
1 parent 452be0a
commit 3f68d82
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/scripts/gui/microbe_hud.mjs b/scripts/gui/microbe_hud.mjs
@@ -107,6 +107,7 @@ export function runMicrobeHUDSetup(){
         const oxytoxy = common.randomBetween(0, 10);
         const phosphate = common.randomBetween(0, 50);
         const hydrogenSulfide = common.randomBetween(0, 50);
+        const iron = common.randomBetween(0, 50);
         updateMicrobeHUDBars({
             hitpoints: common.randomBetween(1, hp),
             maxHitpoints: hp,
@@ -122,6 +123,8 @@ export function runMicrobeHUDSetup(){
             PhosphateMax: phosphate,
             compoundHydrogenSulfide: common.randomBetween(0, hydrogenSulfide),
             HydrogenSulfideMax: hydrogenSulfide,
+            compoundIron: common.randomBetween(0, iron),
+            IronMax: iron,
         });
 
         // Pseudo population code

diff --git a/scripts/gui/thrive_gui.html b/scripts/gui/thrive_gui.html
@@ -405,6 +405,35 @@
                 sulfide from hydrothermal vents into usable energy in the form of glucose.</span>
                 <div id="ChemosynthisizingProteinsIcon"></div>Chemosynthisizing Proteins<br>45 MP</td>
         </tr></table>
+        <table><tr>
+            <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>45 MP</td>
+	        <td id="addRusticyanin" class="OrganelleListItem">
+              <span class="tooltiptext">
+                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>45 MP</td>
+        </tr></table>
         <div class="OrganelleListTitle">EXTERNAL ORGANELLES</div>
         <table><tr>
             <td id="addFlagellum" class="OrganelleListItem">
@@ -416,7 +445,7 @@
             <td id="addPilus" class="OrganelleListItem DisabledButton">
                 <div id="PilusIcon"></div>Predatory Pilus<br>30 MP</td>
             <td id="addCilia" class="OrganelleListItem DisabledButton">
-                <div id="CiliaIcon"></div>Cilia<br>40 MP</td>
+              <div id="CiliaIcon"></div>Cilia<br>40 MP</td>
         </tr></table>
 	      <div class="OrganelleListTitle">INTERNAL ORGANELLES</div>
 	      <table class="OrganelleTable"><tr>
@@ -470,7 +499,7 @@
                 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>
+                </div>Nitrogen Fixing <br> Plastid<br>80 MP</td>
 	        </tr><tr>
              <td id="addVacuole" class="OrganelleListItem">
                 <span class="tooltiptext">
@@ -487,34 +516,6 @@
                 <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="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>45 MP</td> </tr>
-                <tr>
-	          <td id="addRusticyanin" class="OrganelleListItem">
-                <span class="tooltiptext">
-                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>45 MP</td>
 	      </tr></table>
 	    </div>
       </div>