Merge pull request #1 from sayterdarkwynd/master

Merging master into branch... hopefully? Sayter if this shows up for you just ignore it.
sayterdarkwynd · Apr 18, 2017 · fa0af06 · fa0af06
2 parents 091a4fb + a716068
commit fa0af06
Show file tree

Hide file tree

Showing 667 changed files with 25,799 additions and 23,907 deletions.
diff --git a/.metadata b/.metadata
@@ -7,5 +7,5 @@
   "name" : "FrackinUniverse",
   "requires" : [],
   "steamContentId" : "729480149",
-  "version" : "5.0.91"
+  "version" : "5.0.92"
 }
diff --git a/biomes/surface/oceanfloor.biome.patch b/biomes/surface/oceanfloor.biome.patch
@@ -17,7 +17,9 @@
         "pool" : [ 
           [ 0.05, "fufirecrabocean" ],
           [ 0.05, "pulpinocean" ],
-          [ 0.05, "snagglerocean" ]
+          [ 0.05, "snagglerocean" ],
+          [ 0.05, "aquamantle" ],
+          [ 0.05, "dolphin1" ]
         ]
       }
 },

diff --git a/biomes/surface_detached/coralreef.biome b/biomes/surface_detached/coralreef.biome
@@ -3,6 +3,33 @@
   "friendlyName" : "Reef",
   "hueShiftOptions" : [-40, -25, 0, 25, 40],
 
+
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
+
   "mainBlock" : "livecoral",
   "subBlocks" : [ "coral2", "oystershell", "sand2" ],
   "ores" : "surface",

diff --git a/biomes/surface_detached/coralreefdark.biome b/biomes/surface_detached/coralreefdark.biome
@@ -7,6 +7,30 @@
   "subBlocks" : [ "coral2", "oystershell", "sand2" ],
   "ores" : "surface",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
 
 
   "surfacePlaceables" : {

diff --git a/biomes/surface_detached/deepseavent.biome b/biomes/surface_detached/deepseavent.biome
@@ -8,6 +8,32 @@
   "subBlocks" : [ "magmatile1", "magmatile2", "magmatile3", "magmatile4" ],
   "ores" : "surface",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
+
   "surfacePlaceables" : {
     "grassMod" : [ "ash" ],
     "grassModDensity" : 0.2,

diff --git a/biomes/surface_detached/deepseaventaether.biome b/biomes/surface_detached/deepseaventaether.biome
@@ -6,6 +6,31 @@
   "subBlocks" : [ "obsidian", "bonemeal" ],
   "ores" : "ff_surfacesulfurOres",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
   "surfacePlaceables" : {
     "grassMod" : [ "blackslimegrass" ],
     "grassModDensity" : 0.75,

diff --git a/biomes/surface_detached/deepseaventdark.biome b/biomes/surface_detached/deepseaventdark.biome
@@ -8,6 +8,31 @@
   "subBlocks" : [ "magmatile1", "magmatile2", "magmatile3", "magmatile4" ],
   "ores" : "surface",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
   "surfacePlaceables" : {
     "grassMod" : [ "ash" ],
     "grassModDensity" : 0.2,

diff --git a/biomes/surface_detached/deepseaventsulphur.biome b/biomes/surface_detached/deepseaventsulphur.biome
@@ -8,6 +8,31 @@
   "subBlocks" : [ "sulphurstone", "drydirt" ],
   "ores" : "ff_surfacesulfurOres",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
   "surfacePlaceables" : {
     "grassMod" : [ "ash" ],
     "grassModDensity" : 0.2,

diff --git a/biomes/surface_detached/estuary.biome b/biomes/surface_detached/estuary.biome
@@ -6,6 +6,31 @@
   "subBlocks" : [ "clay", "wetdirt", "oystershell", "clay" ],
   "ores" : "surface",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
   "surfacePlaceables" : {
     "grassMod" : [ "clay" ],
     "grassModDensity" : 0.3,

diff --git a/biomes/surface_detached/estuaryaether.biome b/biomes/surface_detached/estuaryaether.biome
@@ -6,6 +6,31 @@
   "subBlocks" : [ "matterblock", "oystershell", "bonemeal" ],
   "ores" : "surface",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
   "surfacePlaceables" : {
     "grassMod" : [ "clay" ],
     "grassModDensity" : 0.3,

diff --git a/biomes/surface_detached/estuarydark.biome b/biomes/surface_detached/estuarydark.biome
@@ -6,6 +6,31 @@
   "subBlocks" : [ "clay", "wetdirt", "oystershell", "clay" ],
   "ores" : "surface",
 
+  "spawnProfile" : {
+    "groups" : [
+      {
+        "select" : 1,
+        "pool" : [
+          [ 0.1, "aquamantle" ],
+          [ 0.05, "fufirecrabocean" ],
+          [ 0.05, "pulpinocean" ],
+          [ 0.05, "snagglerocean" ]        
+        ]
+      },    
+      {
+        "select" : 6,
+        "pool" : [
+          [ 1, "smallFishOcean1" ],
+          [ 1, "smallFishOcean2" ],
+          [ 1, "passiveLargeFish" ],
+          [ 1, "aggroLargeFish" ],
+          [ 1, "squidcritter" ],
+          [ 1, "jellycritter" ]
+        ]
+      }
+    ]
+  },
+
   "surfacePlaceables" : {
     "grassMod" : [ "clay" ],
     "grassModDensity" : 0.3,

diff --git a/codex/legacy_codex/fuagaranhunt.codex b/codex/legacy_codex/fuagaranhunt.codex
@@ -0,0 +1,19 @@
+{
+  "id" : "fuagaranhunt",
+  "title" : "The Agaran Menace",
+  "description" : "A warning.",
+  "icon" : "/codex/legacy_codex_images/shroombook.png",
+  "contentPages" : [
+
+    "Greetings, intrepid space explorer. Don't ask who we are, or how we've found you. You're better off not knowing. We'll get straight to the point. Mushrooms. Mushrooms are taking over the galaxy. Agarans, to be precise. I'm sure you've seen them, waddling about, making their terrifying pods, yelling in unknown tongues. What you may not be aware of is just how dangerous they are.",
+
+    "We, an unknown organization in no way associated with Thornwing or Big Ape, are attempting to translate their speech patterns and quell their uprising. And that's where you come in. We need you to get close to the Agarans, to study them, to hit them with heavy weaponry until they surrender.",
+
+    "To aid you in your unsolicited mission - which we are very grateful for, of course - we have provided you with a foolproof Agaran disguise that will let you get close to these vile fungi. Wear it, or don't, it's up to you. Oh, one thing. We've heard talk of giant pods appearing around the galaxy. Maybe avoid those, leave them to the experts."
+
+  ],
+    "itemConfig" : {
+    "rarity" : "rare",
+    "price" : 25
+  }
+}
diff --git a/codex/legacy/agaranhunt.codex → codex/legacy_codex/fuancientprayer.codex b/codex/legacy/agaranhunt.codex → codex/legacy_codex/fuancientprayer.codex
@@ -1,5 +1,5 @@
 {
-  "id" : "ancientprayer",
+  "id" : "fuancientprayer",
   "title" : "An Ancient Avian Prayer",
   "description" : "A holy scripture for the Avian faith.",
   "icon" : "prayerbook.png",

diff --git a/codex/legacy_codex/fuapexorigins.codex b/codex/legacy_codex/fuapexorigins.codex
@@ -0,0 +1,17 @@
+{
+  "id" : "fuapexorigins",
+  "title" : "An Apex Introduction",
+  "description" : "Big Ape Presents: Apex Origins",
+  "icon" : "/codex/legacy_codex_images/apexlabbook_01.png",
+  "contentPages" : [
+
+    "From as far back as Apex history can be traced, all that is known is the rule of the majestic Big Ape and his benevolent Miniknog. Of course, Apex history only reaches back about one hundred years, due to a series of accidental fires, explosions and rogue mech accidents which destroyed all of the archives ever.",
+
+    "Big Ape assures the populace, however, that he has been in charge since the dawn of time, and will continue to be in charge until the last star supernovas. Any Apex who steps out of line, says the wrong thing, eats the wrong banana or looks at one of the many hidden cameras in a funny way will be subjected to Miniknog Therapy, designed to improve the species. In fact, all Apex should volunteer for this. Sign up now."
+
+  ],
+    "itemConfig" : {
+    "rarity" : "rare",
+    "price" : 25
+  }
+}
diff --git a/codex/legacy_codex/fuapexplea.codex b/codex/legacy_codex/fuapexplea.codex
@@ -0,0 +1,18 @@
+{
+  "id" : "fuapexplea",
+  "title" : "Resistance Plea",
+  "description" : "A plea from the Resistance",
+  "icon" : "/codex/legacy_codex_images/apexlabbook_02.png",
+  "contentPages" : [
+
+    "To our Apex comrade,
+The Resistance is counting on you. Even now, the Miniknog descend on our secret base. You're our last, best hope, and only partly because you're the sole member of our cell who can fly a spaceship.",
+
+    "Go now, brave Apex. Go, spread the plight of our people to the universe at large. Call for help! Return with an army so that we may crush Big Ape once and for all! And pick up some bananas on your way back. Just be sure not to run out of fuel."
+
+  ],
+    "itemConfig" : {
+    "rarity" : "rare",
+    "price" : 25
+  }
+}
diff --git a/codex/legacy_codex/fuavianafterlife.codex b/codex/legacy_codex/fuavianafterlife.codex
@@ -0,0 +1,16 @@
+{
+  "id" : "fuavianafterlife",
+  "title" : "The Afterlife",
+  "description" : "Kluex: After Death series",
+  "icon" : "/codex/legacy_codex_images/avianairshipbook_01.png",
+  "contentPages" : [
+
+    "by K'arn Hollowbeak, Avian scholar
+Those who serve Kluex with passion and dedication in this life are said to regain their wings in the next. It is the Avians' ultimate goal; to regain the power of flight, and join our gods in the afterlife."
+
+  ],
+    "itemConfig" : {
+    "rarity" : "rare",
+    "price" : 25
+  }
+}