Merge pull request Revolutionary-Games#754 from Revolutionary-Games/r…

…elease_0.4.1

Release 0.4.1

CMakeLists.txt

@@ -55,14 +55,14 @@ set(LEVIATHAN_SKIP_OPTIONAL_ASSETS ON)
 include(LeviathanCompileOptions)
 include(LeviathanSetRPath)
 
-set(LEVIATHAN_FULL_BUILD ON)
-
-set(USE_ANGELSCRIPT ON)
-set(USE_BOOST ON)
-set(USE_OGRE ON)
-set(USE_NEWTON ON)
-set(USE_SFML ON)
-set(USE_SDL2 ON)
+set(LEVIATHAN_USING_ANGELSCRIPT ON)
+set(LEVIATHAN_USING_OGRE ON)
+set(LEVIATHAN_USING_BULLET ON)
+set(LEVIATHAN_USING_CEF ON)
+set(LEVIATHAN_USING_GUI ON)
+set(LEVIATHAN_USING_SFML ON)
+set(LEVIATHAN_USING_SDL2 ON)
+set(LEVIATHAN_USING_LEAP ON)
 
 include(LeviathanFindLibraries)
 
@@ -98,8 +98,8 @@ link_directories("${LEVIATHAN_SRC}/build/bin")
 # Version
 set(PROGRAM_VERSION_STABLE 0)
 set(PROGRAM_VERSION_MAJOR 4)
-set(PROGRAM_VERSION_MINOR 0)
-set(PROGRAM_VERSION_PATCH 2)
+set(PROGRAM_VERSION_MINOR 1)
+set(PROGRAM_VERSION_PATCH 0)
 set(PROGRAM_VERSION_SUFFIX "")
 
 set(PROGRAM_VERSION_STR ${PROGRAM_VERSION_STABLE}.${PROGRAM_VERSION_MAJOR}.${PROGRAM_VERSION_MINOR}.${PROGRAM_VERSION_PATCH}${PROGRAM_VERSION_SUFFIX})

SetupThrive.rb

@@ -78,7 +78,7 @@ def parseExtraArgs
 leviathan = Leviathan.new(
   # Use this if you always want the latest commit
   # version: "develop",
-  version: "0d08da11c7d15bb5710427634371b62eccf7867d",
+  version: "109ae9e19a05967c9160bf5dbaeb69c9373cf1b1",
   # Doesn't actually work, but leviathan doesn't install with sudo by
   # default, or install at all for that matter
   noInstallSudo: true

scripts/SimulationParameters/MicrobeStage/BioProcesses.json

@@ -8,7 +8,7 @@
         },
 
         "outputs": {
-           "atp": 38.0
+           "atp": 45.0
         }
     },
 
@@ -93,7 +93,7 @@
 
         "inputs": {
             "oxygen": 1.0,
-            "glucose": 0.7
+            "glucose": 1.0
         },
 
         "outputs": {
@@ -109,7 +109,7 @@
         },
 
         "outputs": {
-            "glucose": 0.33
+            "glucose": 0.15
         }
     },
 
@@ -118,6 +118,7 @@
 
         "inputs": {
             "carbondioxide": 0.09,
+            "oxygen": 0.21,
             "iron": 0.175
         },
 

scripts/SimulationParameters/MicrobeStage/SpeciesNames.json

@@ -24,7 +24,11 @@
         "River",
         "Prim",
         "Prem",
-        "Kapp"
+        "Kapp",
+        "Vip",
+        "Viper",
+        "Spik",
+        "Vuper"
     ],
 
     "prefixes_v": [
@@ -77,7 +81,12 @@
         "Cya",
         "Cyo",
         "Cyi",
-        "Cyu"
+        "Cyu",
+        "Vi",
+        "Ve",
+        "Va",
+        "Vo",
+        "Vu"
      ],
 
     "prefixes_c": [
@@ -134,6 +143,8 @@
         "Var",
         "Vic",
         "Vir",
+        "Vip",
+        "Vup",
         "Zy",
         "Ab",
         "Ant",

scripts/gui/microbe_editor.mjs

@@ -371,16 +371,13 @@ function openHelpEditor(){
             "Paramecium? Predator, or Prey?",
         "Heres a tip, toxins can be used to knock other toxins away from you " +
             "if you are quick enough.",
-        "Heres a tip, Osmoregulation costs 1 ATP per second per organelle your cell has, " +
+        "Heres a tip, Osmoregulation costs 1 ATP per second per hex your cell has, " +
             " each empty hex of cytoplasm generates 5 ATP per second aswell," +
             "which means if you are losing ATP due to osmoregulation just add a couple" +
             " empty hexes cytoplasm or remove some organelles.",
         "Fun Fact, In real life prokaryotes have something called Biocompartments " +
         "which act like organelles, and are in fact called Polyhedral organelles",
         "Fun Fact, The metabolosome is what is called a Polyhedral organelle",
-        "Heres a Tip, You generate exactly 14 atp per second per mitochondria.",
-        "Heres a Tip, You generate exactly 14 atp per second per metabolosome," +
-        "however, it is 7 times less efficient than a mitochondria.",
         "Heres a Tip, Chromatophores generate 1/3rd the glucose of a chloroplast",
         "Heres a Tip, You generate exactly 2 glucose per second per chemoplast," +
             "as long as you have at least 1 hydrogen sulfide to convert.",
@@ -389,7 +386,52 @@ function openHelpEditor(){
         "or two other species due to evolution happening around you, see if you can " +
         "identify them!",
         "One of the first playable game-play prototypes was made by our awesome programmer," +
-        " untrustedlife!"
+        " untrustedlife!",
+        "Fun Fact, The Didinium  and Paramecium are a textbook example of a " +
+            "predator prey relationship" +
+            " that has been studied for decades, now are you the Didinium, or the " +
+            "Paramecium? Predator, or Prey?",
+        "Heres a tip, toxins can be used to knock other toxins away from you " +
+            "if you are quick enough.",
+        "Heres a tip, sometimes its best just to run away from other cells.",
+        "Heres a tip, if a cell is about half your size, thats when you can engulf them.",
+        "Heres a tip, Bacteria can be stronger then they appear, they may look " +
+            "small, but some of them can burrow into you and kill you that way!",
+        "Heres a tip, You can hunt other species to extinction if you arent careful " +
+            "enough, they can also be hunted to extinction by other species.",
+        "Heres a tip, Every 5 minutes an Auto-evo step happens, if you dont evolve " +
+            "fast enough you may be out-competed.",
+        "Heres a tip, If you mouse over a cloud a box will pop up on the top left " +
+            "of your screen that tells you exactly whats there.",
+        "WIGGLY THINGS!!",
+        "Smeltal the meltal.",
+        "Those blue cells though.",
+        "Fun Fact, The thrive team does podcasts every so often, you should check them out!",
+        "Heres a tip, Biomes are more then just differnet backgrounds, " +
+            "the compounds in, different biomes sometimes spawn at different rates.",
+        "Heres a tip, The more flagella you have, the faster you go, " +
+            "vroom vroom, but it also costs more ATP",
+        "Heres a tip, you can en[g]ulf chunks iron or otherwise.",
+        "Heres a tip, prepare before adding a nucleus." +
+        " those things are expensive! In upkeep and up front cost.",
+        "Fun Fact, Did you know that there are over 8000 species of ciliate on planet earth?",
+        "Fun Fact, The Stentor is a ciliate that can stretch itself and catch prey " +
+            "in a kind of trumpet like mouth that draws prey in by generating " +
+            "water currents with cilia.",
+        "Fun Fact, The Didinum is a ciliate that hunts paramecia.",
+        "Fun Fact, The Ameoba hunts and catches prey with 'legs' made of " +
+            "cytoplasm called pseudopods, eventually we want those in thrive.",
+        "Heres a tip, Watch out for larger cells and large bacteria, " +
+            "it's not fun to be digested,  and they will eat you.",
+        "Heres a tip, Osmoregulation costs 1 ATP per second per hex, " +
+            " each empty hex of cytoplasm generates 5 ATP per second aswell," +
+            "which means if you are losing ATP due to osmoregulation just add a couple" +
+            " empty hexes cytoplasm or remove some organelles",
+        "Fun Fact, Thrive is meant as a simulation of an alien planet, therefore it makes" +
+            "sense that most creatures you find will be related to one " +
+        "or two other species due to evolution happening around you, see if" +
+        " you can identify them!",
+        "Heres a tip, if your cell is 150 hexes, you can engulf the large iron chunks."
     ];
 
 

scripts/gui/microbe_hud.mjs

@@ -221,6 +221,9 @@ function openHelp(){
             "the compounds in, different biomes sometimes spawn at different rates.",
         "Heres a tip, The more flagella you have, the faster you go, " +
             "vroom vroom, but it also costs more ATP",
+        "Heres a tip, you can en[g]ulf chunks iron or otherwise.",
+        "Heres a tip, prepare before adding a nucleus." +
+        " those things are expensive! In upkeep and up front cost.",
         "Fun Fact, Did you know that there are over 8000 species of ciliate on planet earth?",
         "Fun Fact, The Stentor is a ciliate that can stretch itself and catch prey " +
             "in a kind of trumpet like mouth that draws prey in by generating " +
@@ -230,14 +233,15 @@ function openHelp(){
             "cytoplasm called pseudopods, eventually we want those in thrive.",
         "Heres a tip, Watch out for larger cells and large bacteria, " +
             "it's not fun to be digested,  and they will eat you.",
-        "Heres a tip, Osmoregulation costs 1 ATP per second per organelle your cell has, " +
+        "Heres a tip, Osmoregulation costs 1 ATP per second per hex, " +
             " each empty hex of cytoplasm generates 5 ATP per second aswell," +
             "which means if you are losing ATP due to osmoregulation just add a couple" +
             " empty hexes cytoplasm or remove some organelles",
         "Fun Fact, Thrive is meant as a simulation of an alien planet, therefore it makes" +
             "sense that most creatures you find will be related to one " +
         "or two other species due to evolution happening around you, see if" +
         " you can identify them!",
+        "Heres a tip, if your cell is 150 hexes, you can engulf the large iron chunks.",
         "Fun Fact, One of the first playable game-play prototypes was made " +
         "by our awesome programmer, untrustedlife!"
     ];

scripts/gui/thrive_gui.html

@@ -134,7 +134,7 @@
 
 	  <div id="winContainer">
 		<span id="winTitle">YOU HAVE THRIVED!</span>
-		<span id="winBody">Congratulation- a winner is y... who am I kidding, you have thrived! You have won in the 0.4.0 build Good job, you may continue playing after this screen closes if you wish, or start a new game in a new world.</span>
+		<span id="winBody">Congratulation- a winner is y... who am I kidding, you have thrived! You have won in the 0.4.1 build Good job, you may continue playing after this screen closes if you wish, or start a new game in a new world.</span>
 	  </div>
 
 	  <div id="extinctionContainer">
@@ -294,37 +294,36 @@
 		environment to process in your cell's organelles and generate
 		ATP. Be careful not to let your ATP stores run out, or you
 		will slow down, lose health and eventually die.
-		<br><br> The various compound clouds are:<br> White –
-Glucose <br> Yellow – Hydrogen Sulfide <br> Orange - Ammonia  <br> Purple - Phosphates <br>
+		<br><br> The various compound clouds are:<br><br> White –
+Glucose <br> Yellow – Hydrogen Sulfide <br> Orange - Ammonia  <br> Purple - Phosphates <br> Rust Brown - Iron Ions <br><br>
 
-Glucose makes ATP, Hydrogen Sulfide can be converted into glucose via chemoplasts and Ammonia and Phosphates are crucial for
-reproduction. <br><br>
+Glucose makes ATP<br>
+Hydrogen Sulfide can be converted into glucose via chemoplasts and chemosynthesizing proteins<br>
+Iron Ions can be converted via rusticyanin into ATP<br>
+and Ammonia and Phosphates are crucial for reproduction. <br><br>
 
 Press E to release a dangerous agent, Oxytoxy NT, to kill other cells
 and then collect the spilled compounds if you have a toxin vacuole. <br><br>
 
-You can also engulf cells and bacteria that are smaller than you by pressing
+You can also engulf cells and bacteria and iron chunks and cell chunks that are smaller than you by pressing
 G. This will cost additional ATP and will slow you down. Don't forget
 to press G a second time to stop engulfing. <br><br>
 
-You can also gain a pilus in the editor and skewer other cells and bacteria  <br><br>
-
 To reproduce you need to divide each of your organelles into two and
 then duplicate the DNA in your nucleus. Each organelle needs 2 ammonia
 and 2 phosphate to split in
 half. 
 <br><br>
-Osmoregulation Now costs ATP, which means the bigger your cell is, the more Mitochondria (or cytoplasm, which does Glycolysis now) you need to avoid losing ATP when you are stationary.
-It works this way: Osmoregulation costs are ((Organelle Amount)x1)/per second , each empty hex of cytoplasm generates 4 ATP per second aswell (Due to glycolysis), which means if you are losing ATP
-due to osmoregulation just add a couple empty hexes cytoplasm or a mitochondria or remove some organelles. Be wary of this when making huge cells...
+Osmoregulation Now costs ATP, which means the bigger your cell is, the more Mitochondria or Metabolosomes or Rusticyanin (or cytoplasm, which does Glycolysis) you need to avoid losing ATP when you are stationary.
+It works this way: Osmoregulation costs are ((Hex Amount * 1) per second...
 <br><br>
 There are many Organelles in the editor for you to evolve, allowing for a wide range of different playstyles.
 <br><br>
 For this Release if your population (top tab) drops to zero you go extinct.
 <br>
-But if you survive for fifteen generations, you are considered to have won, after winning you get a popup and can continue playing as you wish.
+But if you survive for fifteen generations with 200 population, you are considered to have won, after winning you get a popup and can continue playing as you wish.
 <br><br>
-Be wary because your competitors are evolving alongside you.
+Be wary because your competitors are evolving alongside you. Every time you enter the editor they evolve as well.
 <br><br>
         <div class="MenuButton" id="closeHelp">Close</div>
         </div>
@@ -381,15 +380,15 @@
             <td id="addMetabolosome" class="OrganelleListItem">
                 <span class="tooltiptext">
                 Metabolosomes<hr><br> Cost: 45 mutation points<hr><br> 
-                Performs Process: Metabolsome Respiration (In real life they Ferment, but we dont have those compounds in the game yet)<br>(1 Oxygen + 0.7 Glucose -> 38 ATP)/Second (Depending On Environmental Oxygen)<hr><br>
+                Performs Process: Metabolsome Respiration (In real life they Ferment, but we dont have those compounds in the game yet)<br>(1 Oxygen + 1 Glucose -> 38 ATP)/Second (Depending On Environmental Oxygen)<hr><br>
                 Storage Space: 1<hr><br>
                 Organelle-like Bacterial microcompartments (BMCs) consisting of a protein shell that encloses enzymes used for fermentation.
                 </span>
                 <div id="MetabolosomeIcon"></div>Metabolosomes<br>45 MP</td>
             <td id="addChromatophor" class="OrganelleListItem">
                 <span class="tooltiptext">
                 Chromatophores <hr><br> Cost: 55 mutation points <hr><br> 
-                Performs Process: Chromatophore Photosynthesis<br>(0.09 CO2 -> 0.33 glucose)/Second (Depending On Environmental C02)<br>
+                Performs Process: Chromatophore Photosynthesis<br>(0.09 CO2 -> 0.15 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: 1<hr><br>
                 Coloured, membrane-associated vesicles used by various prokaryotes perform photosynthesis.
@@ -409,9 +408,9 @@
 	        <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.175 Iron Ion -> 10 ATP)/Second (Depending On Environmental C02)<hr><br>
+                Performs Process: Iron Chemolithotrophy<br>(0.21 Oxygen (Primary Electron acceptor) + 0.09 CO2 + 0.175 Iron Ion -> 10 ATP)/Second (Depending On Environmental C02 and O2)<hr><br>
                 Storage Space: 1<hr><br>
-                Siderophores and Rusticyanin for storing and using iron ions and carbon from atmospheric carbon dioxide to produce ATP.
+                Siderophores and Rusticyanin for storing and using iron ions with oxygen as the primary electron acceptor 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>
@@ -438,13 +437,14 @@
                 Performs Process: Eukaryote Evolution<hr><br>
                 Storage Space: 15<hr><br>
                 Allows for synthesis of RNA and MRNA, allows cell to evolve membrane bound organelles.
+                 <p style="color:yellow;">Warning! The nucleus will slow you down significantly and has an upkeep cost of 11 ATP per second due to osmoregulation! It is also irreversible.</p>
                 </span>
                 <div id="NucleusIcon">
                 </div>Nucleus<br>100 MP</td>
 	          <td id="addMitochondrion" class="OrganelleListItem">
                 <span class="tooltiptext">
                 Mitochondria<hr><br> Cost: 45 mutation points<hr><br> 
-                Performs Process: Respiration<br>(1 Oxygen + 0.2 glucose -> 38 ATP)/Second (Depending On Environmental Oxygen)<hr><br>
+                Performs Process: Respiration<br>(1 Oxygen + 0.2 glucose -> 45 ATP)/Second (Depending On Environmental Oxygen)<hr><br>
                 Storage Space: 2<hr><br>
                 A captured prokaryote used by eukaryotic cells to perform respiration.<br>
                 - The Mitochondria is the powerhouse of the cell
@@ -561,30 +561,41 @@
         Each visit to the editor in the Microbe Stage Represents 200 million years of evolution<br>
 Each generation, you have 100 mutation points to spend, and each change
 (or mutation) will cost a certain amount of that MP, removing costs mutation points aswell as adding. <br><br>
-You can rotate your organelles, with A and D<br>
-Mitochondrion: Produces ATP out of glucose and atmospheric 02. Much more eficiently then cytoplasm<br>
+You can rotate your organelles, with A and D<br><br>
 
-Chloroplast: Makes glucose out of sunlight and atmospheric CO2. <br>
+Prokaryotic Structures<br>
+Metabolosomes: Produces the same amount of ATP of a mitocondria, but is way way less efficient, it only takes up 1 Hex<br>
 
-Chemoplast: Makes glucose out of Hydrogen Sulfide. <br>
+Chemosynthisizing Proteins: Produces half of the glucose out of Hydrogen Sulfide as a chemoplast, but also performs glycolysis, takes up 1 Hex <br>
 
-Nitrogen Fixing Plastid: Makes ammonia from ATP and atmospheric Nitrogen. <br>
+Chromatophores: Produces 1/3rd the amount of glucose as a normal chloroplast, but also performs glycolysis, and takes up 1 Hex.<br>
 
-Vacuole: Stores 50 collected compounds. <br>
+Rusticyanin: Converts iron ions into ATP, and takes up 1 Hex.<br>
 
-Toxin Vacuoles: Produces toxins (called OxyToxyNT). <br>
+Cytoplasm: Increases the rate of compound absorbtion and has 4 storage space and performs glycolysis (Produces small amounts of ATP).<br><br>
+
+External Organelles<br>
 
 Flagella: Moves your cell faster by consuming ATP. <br>
 
-Pilus: Can be used to stab other cells. <br>
+Pilus: Can be used to stab other cells. <br><br>
+
+Membrane Bound Organelles <br>
+
+Nucleus: Takes up 11 hexes and allows for evolution of membrane bound organelles. And also doubles your cells size. (Can only be evolved once)<br>
 
-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>
+Mitochondrion: Produces ATP out of glucose and atmospheric 02. Much more efficiently then cytoplasm<br>
+
+Chloroplast: Makes glucose out of sunlight and atmospheric CO2. <br>
+
+Chemoplast: Makes glucose out of Hydrogen Sulfide. <br>
+
+Nitrogen Fixing Plastid: Makes ammonia from ATP and atmospheric Nitrogen. <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>
+Vacuole: Stores 15 collected compounds. <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>
+Toxin Vacuoles: Produces toxins (called OxyToxyNT). <p>
 
-Cytoplasm: Increases the rate of compound absorbtion and has 20 storage space and performs glycolysis (Produces small amounts of ATP).</p>
           <div class="MenuButton" id="closeHelpEditor">Close</div>
             </div>
            <div id="tipMsgEditor"></div>