11 files changed, 289 insertions, 31 deletions

diff --git a/assets/combinator.json b/assets/combinator.json
index ec383d8..6d48ebf 100644
--- a/assets/combinator.json
+++ b/assets/combinator.json
@@ -3,20 +3,23 @@
     "Great, you have succesfully created a new planet!\
 It has a mass of /mass/, it is mainly /type/.",
     "Your new creation is ready master!\
-A planet was created as you commanded. /mass_comment/ /type_comment/"
+A planet was created as you commanded.\
+/mass_comment/\
+/type_comment/",
+    "The materials combined and created a /type/ planet, with a mass of /mass/."
  ],
  "mass_comment": {
     "very_small": "It's so tiny it's largest mountain almost covers it.",
     "small": "A rather small planet.",
-    "medium": "",
-    "big": "",
-    "huge": "",
+    "medium": "Medium sized.",
+    "big": "A very large planet.",
+    "huge": "It's quiet huge!",
     "yuge": "It is so YUGE! Something else must be small... Look at those hands. Are they small hands? And he referred to my hands, if they are small, something else must be small."
  },
  "type_comment": {
     "solid": "It is clearly solid, with a metallic core.",
     "rock": "A rocky planet, like this one shouldn't get lost anywhere.",
     "icy": "Consists largely of ice, which being a solid form of water, gives good chances to CHON based life forms.",
-    "gaseous": "Gaseous."
+    "gaseous": "It is gaseous."
  }
 }
diff --git a/assets/events.json b/assets/events.json
index e69de29..6502336 100644
--- a/assets/events.json
+++ b/assets/events.json
@@ -0,0 +1,187 @@
+{
+   "choice":[
+      {
+         "id":"tribe_war",
+         "text":"A war between two tribes broke out.",
+         "options":[
+            "Annihilate the first tribe.",
+            "Annihilate the second tribe.",
+            "Destroy both tribes.",
+            "Create a mountain barrier between them."
+         ],
+         "correct":[
+            "You made the ground tremble, mountains fall, lightnings strike and soon there was no war.",
+            "",
+            "None of these tribes were on their way to intelligent life anyway, am I right?",
+            "The tribes went on with their pre-societal life and soon forgotten about the war."
+         ],
+         "incorrect":[
+            "The other tribe quickly advanced to being a society, of slave and torture that is. Thankfully, it destroyed itself quickly.",
+            "Although you killed a whole tribe, it was the wrong one. The first tribe died out naturally.",
+            "These were the only two tribes on this planet on their way to intelligent life. You killed them.",
+            "The mountain barrier was great for peace, although it's effects on the ecosystem killed of both promising tribes."
+         ],
+         "stages":[
+            3
+         ]
+      },
+      {
+         "id":"alien_incursion",
+         "text":"An alien civilisation came upon your planet.",
+         "options":[
+            "optA",
+            "optB"
+         ],
+         "correct":[
+            "yes A",
+            "yes B"
+         ],
+         "incorrect":[
+            "no A",
+            "no B"
+         ],
+         "stages":[
+            0,
+            1,
+            2,
+            3,
+            4,
+            5
+         ]
+      },
+      {
+         "id":"ice_age",
+         "text":"An ice age kicks in, a deadly threat to your primitive beings.",
+         "options":[
+            "Invent fire and warm them up.",
+            "Invent igloos.",
+            "Invent clothes",
+            "Do nothing, they will figure it out."
+         ],
+         "correct":[
+            "Great idea! Not only you saved your planet, you also helped evolution.",
+            "Igloo hmmm good choice, they survived the long winter succesfully.",
+            "Clothes! Not the best choice but it sure kept them alive during the disaster.",
+            "Actually a great choice, your organisms have been forced to evolve and no longer do they feel cold."
+         ],
+         "incorrect":[
+            "You can´t just invent fire. What did you think? All your primitive organisms burned in a crazy brutal war.",
+            "Turns out, you didn´t have the right kind of liquid to create snow on your planet, all the poisonous gases released in the igloos destroyed your creatures.",
+            "Clothing required leather and fur from other creatures which led to genocide.",
+            "They froze to death."
+         ],
+         "stages":[
+            3,
+            4,
+            5
+         ]
+      },
+      {
+         "id":"quantum_fluct",
+         "text":"Quantum fluctuations turned the cells on your planet into planets and your planet into a cell.",
+         "options":[
+            "Choose a new planet, from the cell-transformed ones.",
+            "Try to reverse the process and get your planet back."
+         ],
+         "correct":[
+            "After choosing a particular planet, it seems that all others dissappeared. Nevermind, you got your planet.",
+            "The forces at play didn't like your experiment, but in the end you made it. Your planet has a few holes in it though."
+         ],
+         "incorrect":[
+            "Your new planet seems just like the old one, with one minor detail, all atoms look like cells and all cells look like atoms.",
+            "Ooops, a white-black hole appeared."
+         ],
+         "stages":[
+            1,
+            2,
+            3,
+            4,
+            5,
+            6
+         ]
+      },
+      {
+         "id":"sentient_cell",
+         "text":"One cell of a new multi-cell species just became sentient, out of the blue, really.",
+         "options":[
+            "Kill it!",
+            "Let it be."
+         ],
+         "correct":[
+            "A wise choice, other organisms prosper.",
+            "One of it's first thoughts went to it splitting and then creating a diverse fauna and flora on your planet."
+         ],
+         "incorrect":[
+            "What could you expect from such an anomally? It made quick work of all of your planet's other organisms.",
+            "As fast as it developed sentience, it has realized that life on it's planet is meaningless (remember that you forgot to add meaning!) and just dissolved."
+         ],
+         "stages":[
+            3
+         ]
+      },
+      {
+         "id":"relativity",
+         "text":"The space and time of your planet stopped being relative. An absolute reference frame appears!",
+         "options":[
+            "Fix it!",
+            "Let it be."
+         ],
+         "correct":[
+            "It's super effective. Relativity is back.",
+            "Your planet seems just fine the way it is."
+         ],
+         "incorrect":[
+            "It seems your powers aren't as strong as you expected. It doesn't quite work out and you end up with time and space all jumbled up. This, wibbily wobbly timey wimey stuff..",
+            "Why would you bother keeping the fundamental laws of the Multiverse sane?"
+         ],
+         "stages":[
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6
+         ]
+      },
+      {
+         "id":"emotions",
+         "text":"Somebody fell in love and got angry, when the other person did't love them back. Oops emotions discovered.",
+         "options": [
+            "Kill them both, don't let those emotions spread.",
+            "Let them evolve."
+         ],
+         "correct": [
+            "Good choice, emotions won't longer appear on your planet and you can prosper without any drama.",
+            "Your species learned how to love and now they reproduce faster then ever."
+         ],
+         "incorrect": [
+            "What did you think? Now you have a planet full of cybermen, they will proceed to delete emotion from the whole Multiverse if let loose. Half of them die in a war.",
+            "Well now there are wars and love triangles, all kinds of psychology and philosophy, your species will spend lots of years just figuring themselves out. They won't even care about the rest of the world. No spaceships, no telescopes, no interaction."
+         ],
+         "stages": [
+            5,6
+         ]
+      },
+      {
+         "id":"tectonic",
+         "text":"The tectonic plates of your planet are having a tec-tonic tec-hno par-ty.",
+         "options": [
+            "Merge them all into one, to stop it.",
+            "Disconnect the speakers.",
+            ""
+         ],
+         "correct": [
+            "",
+            ""
+         ],
+         "incorrect": [
+            "",
+            ""
+         ],
+         "stages": [
+            0,1,2,3,4,5,6
+         ]
+      }
+   ]
+}
diff --git a/assets/exporter.blend b/assets/exporter.blend
index da18a95..3393595 100644
--- a/assets/exporter.blend
+++ b/assets/exporter.blend
diff --git a/assets/exporter.blend1 b/assets/exporter.blend1
index f9fd56b..27bbf73 100644
--- a/assets/exporter.blend1
+++ b/assets/exporter.blend1
diff --git a/assets/exporter.json b/assets/exporter.json
new file mode 100644
index 0000000..bed29e7
--- /dev/null
+++ b/assets/exporter.json
@@ -0,0 +1,10 @@
+{
+   "feedback":[
+      "Great for my shelf, thanks!",
+      "Came all jumbled up in the packaging, are you sure you packaged well? What are my refund options?",
+      "I want a refund!",
+      "[i]Buyer chose to not supply feedback.[/i]",
+      "The iPlanet is better.",
+      "The beings escaped the globe and are currently vandalising my dimensional laboratory. Thanks, but no thanks."
+   ]
+}
diff --git a/assets/howto.json b/assets/howto.json
index 5705c81..21e81b6 100644
--- a/assets/howto.json
+++ b/assets/howto.json
@@ -5,6 +5,20 @@ Covers all the bases, even the orthonormal ones.\
 \
 You definitely need some solid base, to create the planet's core, mantle and crust. If you want to have a chance at creating life, gaseous elements for your planet's atmosphere are a must have! You could also try to create a gaseous planet, or anything else really, if spaghetti monsters are your thing.\
 \
-Buy resources from the Multiverse shop, they have everything you will need to make a planet. Usually sold in batches of sextillion tons.
-"
+Buy resources from the Multiverse shop, they have everything you will need to make a planet. Usually sold in batches of sextillion tons.\
+\
+After combining your planet in the Combinator, go to the Incubator and evolve your planet/s. Some challenges may face you there, as not every step in planet's evolution is in the right direction. Evolving life in highest possible form is what will satisfy your customers.\
+\
+Then move your planet to the Exporter for potential buyers.\
+\
+The more advanced life you evolve on your planets the more you get for them.\
+",
+    "list": [
+    "Basic life = 1",
+    "Multi cell life = 2",
+    "Diverse life = 3",
+    "Tribal life = 4",
+    "Societial life = 5",
+    "Civilisation = 6"
+    ]
 }
diff --git a/assets/incubator.json b/assets/incubator.json
index d9a3a2f..4fee95b 100644
--- a/assets/incubator.json
+++ b/assets/incubator.json
@@ -1,47 +1,62 @@
 {
    "bases":[
-      ""
+      "Your planet has /stage/."
    ],
    "misc":{
-      "schrodinger":[
+      "cardboard_box":[
          "Life on this planet possesses a weird property, even by Multiverse standards. It seems to be in a state between existing and not existing.",
-         "Cardboard boxes are a common occurence on this planet, everything seems to have them on. Oh god, even the molecules are in cardboard boxes!",
-         ""
+         "Cardboard boxes are a common occurence on this planet, everything seems to have them on. Oh god, even the molecules are in cardboard boxes!"
       ],
-      "trees":[
+      "stage_trees":[
          "This planet is covered in trees full of solid rocket fuel. They grow to maturity, producing solid fuel in their trunks. When mature, they shed their branches apart from a few top, seed-bearing, ones and lift off, to seek another planet.",
          "The smell of rocket fuel is very strong at the surface of the planet. It feels like it's evaporating from the trees.",
+      ],
+      "plumbus":[
+         "Everybody has a Plumbus at their home, so there is really no point explaining it's usage.",
+         "This planet looks like the home planet of the Plumbii origin species."
+      ],
+      "grey_goo":[
+         "Everythin is quite, what's the word, gooey?"
+      ],
+      "spaghetti_monster":[
          ""
       ]
    },
-   "stages":[
+   "stage":[
       {
          "id":"none",
-         "text":"No life!"
+         "name": "no life",
+         "text":""
       },
       {
          "id":"basic",
-         "text":"Basic life."
+         "name":"basic life",
+         "text":""
       },
       {
          "id":"diverse",
-         "text":"Diverse life."
+         "name":"diverse life",
+         "text":""
       },
       {
          "id":"multi-cell",
-         "text":"Multi cell life."
+         "name":"multi cell life",
+         "text":""
       },
       {
          "id":"group",
-         "text":"Groups!"
+         "name":"life in tribes",
+         "text":""
       },
       {
          "id":"societal",
-         "text":"Societal life!"
+         "name":"societies",
+         "text":""
       },
       {
          "id":"civilisation",
-         "text":"Civilisation!"
+         "name":"civilisation",
+         "text":""
       }
    ]
 }
diff --git a/assets/logo.png b/assets/logo.png
new file mode 100644
index 0000000..effaa04
--- /dev/null
+++ b/assets/logo.png
diff --git a/assets/logo.png.import b/assets/logo.png.import
new file mode 100644
index 0000000..5cdc2f3
--- /dev/null
+++ b/assets/logo.png.import
@@ -0,0 +1,21 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.etc="res://.import/logo.png-e2220799298e3631eb0e245316e0501a.etc.stex"
+path.s3tc="res://.import/logo.png-e2220799298e3631eb0e245316e0501a.s3tc.stex"
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=true
+stream=false
+size_limit=0
+detect_3d=false
diff --git a/assets/logo.xcf b/assets/logo.xcf
new file mode 100644
index 0000000..b1951d1
--- /dev/null
+++ b/assets/logo.xcf
diff --git a/assets/shop.json b/assets/shop.json
index 241bbd1..9232f04 100644
--- a/assets/shop.json
+++ b/assets/shop.json
@@ -5,48 +5,56 @@
          "desc": "Buying this, you basically get bread crumbs from other recycled worlds.",
          "cost": 10,
          "mass": 0.2,
+         "volume": 5,
          "color": "#222034"},
         {"id": "mid_planet_mat",
          "name": "Middle-grade planetary material",
          "desc": "While still recycled, it's previous owners didn't filter out all the good stuff.",
          "cost": 30,
          "mass": 0.3,
+         "volume": 6,
          "color": "#181910"},
         {"id": "high_planet_mat",
          "name": "High-grade planetary material",
          "desc": "Made from worlds demolished to make way for a new hyperspatial express drive.",
          "cost": 50,
          "mass": 0.4,
+         "volume": 10,
          "color": "#151731"},
         {"id": "top_planet_mat",
          "name": "Pristine planetary material",
          "desc": "Pretty much the only source of such high-quality planetary material comes from the underground. ",
          "cost": 100,
          "mass": 0.5,
+         "volume": 9,
          "color": "#321521"},
         {"id": "high_rad_mat",
          "name": "Ionizing planetary material",
          "desc": "",
          "cost": 140,
          "mass": 0.4,
+         "volume": 7,
          "color": "#99e550"},
         {"id": "low_inter_dust",
          "name": "Low-grade interplanetary dust",
          "desc": "Scraped of the bottom of some junkyard universe megaship, this really doesn't have much to offer.",
          "cost": 20,
          "mass":0.3,
+         "volume": 5,
          "color": "#323c39"},
         {"id": "middle_inter_dust",
          "name": "Middle-grade interplanetary dust",
          "desc": "",
          "cost": 40,
          "mass":0.4,
+         "volume": 7,
          "color": "#3c3031"},
         {"id": "high_inter_dust",
          "name": "High-grade interplanetary dust",
          "desc": "Collected after a supernova, it contains many diverse solid and gaseous elements.",
          "cost": 80,
          "mass":0.5,
+         "volume": 9,
          "color": "#453832"}
     ],
     "gas": [
@@ -105,33 +113,33 @@
         {"id": "simple_amino",
          "name": "Simple aminoacids",
          "desc": "",
-         "cost": 200},
+         "cost": 120},
         {"id": "nucleotid",
          "name": "Nucleotids",
          "desc": "Bunch of nucleotids will step up your life game. These are building blocks of nucleic acids.",
-         "cost": 300},
+         "cost": 180},
        {"id": "nucleic_acid",
          "name": "Nucleic acids",
          "desc": "",
-         "cost": 400},
+         "cost": 250},
         {"id": "nanotech_elements",
          "name": "Nano-tech microelements",
          "desc": "",
-         "cost": 500}
+         "cost": 300}
     ],
     "life": [
         {"id": "chon_life_1",
          "name": "CHON based life (level 1)",
          "desc": "The most common life forms among the multi-verse are CHON based, so you can get them in bulk.",
-         "cost": 1000},
+         "cost": 400},
         {"id": "chon_life_2",
          "name": "CHON based life (level 2)",
          "desc": "",
-         "cost": 1500},
+         "cost": 450},
         {"id": "grey_goo",
          "name": "Grey goo",
          "desc": "No one really told you what it is, they just sell it.",
-         "cost": 2000},
+         "cost": 500},
         {"id": "plumbus",
          "name": "Plumbus",
          "desc": "Everyone has a plumbus in their home.\
@@ -143,19 +151,19 @@ Then, a schlami shows up, and he rubs it and spits on it.\
 They cut the fleeb. There's several hizzards in the way.\
 The blamfs rub against the chumbles, and the plubis, and grumbo are shaved away.\
 That leaves you with a regular old plumbus.",
-         "cost": 2500},
+         "cost": 600},
         {"id": "cardboard_box",
          "name": "A cardboard box",
          "desc": "You might have heard some cat noises from the inside, although you can't be sure unless you open it.",
-         "cost": 3000},
+         "cost": 700},
          {"id": "stage_trees",
           "name": "A forest of weird trees",
           "desc": "They seem oddly rocket shaped. They even have the inter-civilized safety markings.",
-          "cost": 3000},
+          "cost": 8000},
         {"id": "spaghetti_monster",
          "name": "A flying spaghetti monster",
           "desc": "Hovering with barely audible noises of slurping sauce you are not even sure how it's legal to trade such a creature.",
-          "cost": 3500}
+          "cost": 800}
     ]
 }