backlog of changes

biomes/underground_detached/precursorunderground.biome

@@ -139,7 +139,7 @@
           "type" : "object",
           "objectSets" : [
             {
-              "pool" : [ [0.35, "invisiblelight"], [0.35, "invisiblesparker"], [0.35, "teslaspike"], [0.35, "tesla"], [0.35, "coppersupport"],[0.35, "junctionbox" ], [0.55, "device1" ], [0.35, "metallicmachine1" ],[0.35, "metallicmachine2" ],[0.35, "metallicmachine3" ],[0.35, "metallicmachine4" ],[0.35, "metallicmachine5" ],[0.35, "metallicmachine6" ],[0.35, "metallicmachine7" ],[0.35, "tetrapod" ],[0.35, "tech2" ],[0.35, "outpostcargocrate" ],[0.35, "outpostcargocrateshort" ],[0.35, "outpostgenerator" ],[0.35, "outpostconsole" ],[0.35, "outpostradardish" ],[0.35, "outpostsecurityconsole" ],[0.35, "outposttank" ],[0.35, "roofvent" ],[0.35, "outpostlamp" ],[0.35, "sawblade2" ],[0.35, "ancientbouldertrap" ],[0.35, "airbooster" ],[0.35, "ancientconsole" ], [0.35, "wreckconsole1" ], [0.35, "wreckconsole2" ], [0.35, "wreckconsole3" ], [ 0.35, "wreckturbine2" ], [ 0.35, "wreckturbines" ], [ 0.35, "ancienticetrap" ], [ 0.35, "ancientpillar" ], [ 0.35, "ancientcrystaltrap" ], [ 0.35, "jumpbooster" ], [ 0.35, "powerbooster" ], [ 0.35, "speedbooster" ]  ],
+              "pool" : [ [0.35, "invisiblelight"], [0.35, "invisiblesparker"], [0.35, "teslaspike"], [0.35, "tesla"], [0.35, "coppersupport"],[0.35, "junctionbox" ], [0.55, "device1" ], [0.35, "metallicmachine1" ],[0.35, "metallicmachine2" ],[0.35, "metallicmachine3" ],[0.35, "metallicmachine4" ],[0.35, "metallicmachine5" ],[0.35, "metallicmachine6" ],[0.35, "metallicmachine7" ],[0.35, "tetrapod" ],[0.35, "tech2" ],[0.35, "outpostcargocrate" ],[0.35, "outpostcargocrateshort" ],[0.35, "outpostgenerator" ],[0.35, "outpostconsole" ],[0.35, "outpostradardish" ],[0.35, "outpostsecurityconsole" ],[0.35, "outposttank" ],[0.35, "roofvent" ],[0.35, "outpostlamp" ],[0.35, "sawblade2" ],[0.35, "ancientbouldertrap" ],[0.35, "airbooster" ],[0.35, "wreckconsole1" ], [0.35, "wreckconsole2" ], [0.35, "wreckconsole3" ], [ 0.35, "wreckturbine2" ], [ 0.35, "wreckturbines" ], [ 0.35, "ancienticetrap" ], [ 0.35, "ancientpillar" ], [ 0.35, "ancientcrystaltrap" ], [ 0.35, "jumpbooster" ], [ 0.35, "powerbooster" ], [ 0.35, "speedbooster" ]  ],
               "parameters" : { }
             }
           ]

dungeons/other/outpost/medic1.dungeon

@@ -6,7 +6,6 @@
 
     "anchor" : [ "medic1" ],
 
-    "gravity" : 80,
     "maxRadius" : 1000000,
     "maxParts" : 100,
     "protected" : true

dungeons/other/outpost/starterhouse.dungeon

@@ -6,7 +6,6 @@
 
     "anchor" : [ "starterhouse" ],
 
-    "gravity" : 80,
     "maxRadius" : 1000000,
     "maxParts" : 100,
     "protected" : false

interface/scripted/mmupgrade/mmupgradegui.lua

@@ -1,5 +1,4 @@
 require "/scripts/util.lua"
-require "/interface/scripted/mmutility/mmutility.lua"
 
 function init()
     self.baseStats = {
@@ -122,7 +121,7 @@ function giveRacialManipulator()
                 mm.parameters.upgrades[#mm.parameters.upgrades + 1] = "liquidcollection"
             end
             if manip.rangeBonus then
-                status.setStatusProperty("bonusBeamGunRadius", getMMRange(mm))
+                status.setStatusProperty("bonusBeamGunRadius", manip.rangeBonus+status.statusProperty("bonusBeamGunRadius", 0))
             end
 
             local newcfg = root.itemConfig(manip.item).config

interface/scripted/mmutility/mmutility.lua

@@ -48,13 +48,13 @@ function swapMM(name)
     if not swapItem then
         swapItem = self.currentMM.parameters.originalMM or root.createItem(getBaseManip())
     else
-        swapItem.parameters.originalMM = currentlyBase and self.currentMM or self.currentMM.parameters.originalMM
+        swapItem.parameters.originalMM = (currentlyBase and self.currentMM or self.currentMM.parameters.originalMM) or root.createItem(getBaseManip())
     end
 
     paintSizeCap(getMaxSize(swapItem)+1)
 
     -- Set the bonus radius to that of the new MM
-    status.setStatusProperty("bonusBeamGunRadius", getMMRange(swapItem))
+    status.setStatusProperty("bonusBeamGunRadius", (root.itemConfig(swapItem).config.rangeBonus or 0)+getStatBonus(swapItem, "bonusBeamGunRadius"))
 
     -- Transfer wiremode and paintmode upgrades (as they should be permanent)
     -- Also handles granting of the liquidcollection upgrade if it is enabled by default on the new MM
@@ -67,15 +67,6 @@ function swapMM(name)
     updateMM()
 end
 
-function getMMRange(mm)
-    if mm.config then
-        mmConfig = mm
-    else
-        mmConfig = root.itemConfig(mm)
-    end
-    return (mmConfig.config.rangeBonus or 0)+getStatBonus(mmConfig, "bonusBeamGunRadius")
-end
-
 function swapTool(name)
     local tool = self.tools[name]
     local toolItem = player.essentialItem(tool)
@@ -256,8 +247,6 @@ end
 function getStat(item, stat)
     if item.parameters[stat] ~= nil then
         return item.parameters[stat]
-    elseif item.config then
-        return item.config[stat]
     else
         return root.itemConfig(item).config[stat]
     end

items/generic/produce/nailery.consumable

@@ -4,18 +4,22 @@
 	"category": "food",
 	"rarity": "Common",
 	"price": 5,
-	"maxStack": 1000,
+	"foodValue": 10,
 
 	"tooltipKind": "food",
-	"description": "Craft into bombs, or extract for iron.\n^yellow;^reset;^red;Poisons^reset;: 5s",
+	"description": "Craft into bombs, or extract for iron.\n^yellow;^reset;^red;Poison^reset;: 5s\n^yellow;Type: Robot Food^reset;",
 	"shortdescription": "Nailery",
 
-	//"learnBlueprintsOnPickup": ["nailbomb"],
+	"eventCategory": "eventCrop",
+	"builder": "/items/buildscripts/buildfood.lua",
 	"effects": [
 		[{
 			"effect": "weakpoison",
 			"duration": 5
+		},
+		{
+			"effect": "robot_food"
 		}]
 	],
-	"blockingEffects": ["weakpoison"]
+	"blockingEffects": ["wellfed"]
 }

items/generic/produce/sweetscoop.consumable

@@ -3,7 +3,7 @@
 	"inventoryIcon": "sweetscoop.png",
 	"category": "food",
 	"rarity": "Uncommon",
-	"price": 60,
+	"price": 10,
 	"foodValue": 40,
 
 	"tooltipKind": "food",

items/materials/blackslimematerial.matitem

@@ -10,6 +10,6 @@
         2.0
     ],
     "shortdescription": "Black Slime",
-    "description": "This is just gross. Seriously. It's all gloppy and toxic!\n^green;Extractable^reset;.",
+    "description": "This is just gross. Seriously. It's all gloppy and toxic!\n^green;Extractable^reset;, ^yellow;Centrifugable^reset;.",
     "materialId": 6544
 }

items/materials/brick.matitem.patch

@@ -1,7 +1,7 @@
 [
-{
-    "op": "replace",
-    "path": "/description",
-    "value": "Small but perfectly formed bricks made from clay. \n^orange;Crushable^reset;."
-}
+    {
+        "op": "replace",
+        "path": "/description",
+        "value": "Small but perfectly formed bricks made from clay.\n^orange;Crushable^reset;."
+    }
 ]

items/materials/candyblock.matitem.patch

@@ -1,7 +1,7 @@
-[
-    {
-        "op": "replace",
-        "path": "/description",
-        "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;, \n^orange;Crushable^reset;."
-    }
-]
+[
+    {
+        "op": "replace",
+        "path": "/description",
+        "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;, ^orange;Crushable^reset;."
+    }
+]

items/materials/coral2material.matitem

@@ -9,7 +9,7 @@
         2.5,
         2.0
     ],
-    "description": "A block of delicate coral.\n^green;Extractable^reset;, ^orange;Siftable^reset;.",
+    "description": "A block of delicate coral.\n^green;Extractable^reset;, ^orange;Crushable^reset;.",
     "shortdescription": "Delicate Coral",
     "materialId": 6548
 }

items/materials/direstone.matitem.patch

@@ -2,6 +2,6 @@
     {
         "op": "replace",
         "path": "/description",
-        "value": "Little wormlike forms wriggle beneath the surface of this glassy stone.\n^green;Extractable^reset;, ^red;Smeltable^reset;."
+        "value": "Little wormlike forms wriggle beneath the surface of this glassy stone.\n^green;Extractable^reset;, ^orange;Crushable^reset;, ^red;Smeltable^reset;."
     }
 ]

monsters/dungeon/toyhorse/toyhorse.monstertype

@@ -181,8 +181,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 1.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 1.5
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : 0.5
         }
       },
 

monsters/flyers/tentaclespawnerish/bloodbag/tentaclespawner2.monstertype

@@ -229,8 +229,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 1.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
         }
       },
 

monsters/flyers/tentaclespawnerish/floatingshoggoth/floatingshoggoth.monstertype

@@ -256,8 +256,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 1.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
         },
         "bleedingImmunity" : { "baseValue" : 1 },
         "linerifleResistance" : { "baseValue" : 0.9 },

monsters/walkers/crabcanoish/shadowcrab/shadowcrab.monstertype

@@ -236,8 +236,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 0.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0.0
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
         }
       },
 

monsters/walkers/mandrafloraish/bandraflora3/bandraflora3.monstertype

@@ -284,8 +284,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 1
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0.01
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -0.99
         }
       },
 

monsters/walkers/minishoggoths/minishoggothnew/minishoggoth.monstertype

@@ -314,8 +314,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 1.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
         },
         "powerMultiplier" : {
           "baseValue" : 1.0

monsters/walkers/orbideish/ravager.monstertype

@@ -323,8 +323,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 1.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
         }
       },
 

monsters/walkers/poptopish/illumitop/illumitop.monstertype

@@ -233,7 +233,9 @@
         "physicalResistance" : {
           "baseValue" : 0.0
         },
-        "fallDamageMultiplier" : { "baseValue" : 0.0 },
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
+        },
         "fireResistance" : {
           "baseValue" : 0.42
         },

monsters/walkers/poptopish/slimetop/slimetop.monstertype

@@ -250,7 +250,9 @@
         "physicalResistance" : {
           "baseValue" : 0.3
         },
-        "fallDamageMultiplier" : { "baseValue" : 0.0 },
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
+        },
         "fireResistance" : {
           "baseValue" : -0.5
         },

monsters/walkers/toumingoish/chromingo.monstertype

@@ -218,8 +218,8 @@
         "poisonStatusImmunity" : {
           "baseValue" : 0.0
         },
-        "fallDamageMultiplier" : {
-          "baseValue" : 0.0
+        "monsterFallDamageMultiplier" : {
+          "baseValue" : -1.0
         }
       },
 

npcs/base.npctype.patch

@@ -108,6 +108,11 @@
 		"path" : "/statusControllerSettings/primaryScriptSources/-",
 		"value" : "/scripts/fr_raceEffects.lua"
 	},
+	{
+		"op" : "add",
+		"path" : "/statusControllerSettings/stats/fallDamageMultiplier",
+		"value" : { "baseValue": 1.0 }
+	},
 	{
 		"op" : "add",
 		"path" : "/statusControllerSettings/statusProperties/mouthPosition",

objects/farmables/sweetscoop/sweetscoopseed.object

@@ -7,7 +7,7 @@
   "shortdescription" : "Sweetscoop Seed",
   "objectType" : "farmable",
   "printable" : false,
-  "price" : 45,
+  "price" : 15,
 
   "apexDescription" : "It has the consistency and feel of a banana but tastes like a pie.",
   "avianDescription" : "This tastes like something a human would eat around one of their holidays.",

objects/generic/centrifuge_recipes.config

@@ -42,16 +42,6 @@
       "algaegreen": ["common", 3],
       "fu_salt": ["common", 3]
     },
-    "coral2material": {
-      "bone": ["common", 3],
-      "coralfragment": ["common", 3],
-      "fu_salt": ["common", 3],
-
-      "cellmatter": ["rare", 1],
-
-      "calciumnitrate": ["rarest", 1]
-
-    },
     "glasssandmaterial": {
       "biospore": ["rarest", 2],
       "lead": ["rarest", 2],
@@ -832,20 +822,6 @@
       "gravelmaterial": ["common", 2], 
       "cobblestonematerial": ["common", 2]
     },			
-    "bioblockmaterial": {            
-      "sand": ["uncommon", 2],
-      "sand2": ["uncommon", 2],
-
-      "gravelmaterial": ["common", 2], 
-      "cobblestonematerial": ["common", 2]
-    },  	
-    "bioblock2material": {            
-      "sand": ["uncommon", 2],
-      "sand2": ["uncommon", 2],
-
-      "gravelmaterial": ["common", 2], 
-      "cobblestonematerial": ["common", 2]
-    },    
     "tarstonematerial": {
       "fu_carbon": ["rarest", 1],
 
@@ -1028,6 +1004,21 @@
       "coalore": ["common", 3],
       "copperore": ["common", 3]
     },
+    "direstone": {
+      "tungstenore": ["rarest", 2],
+      "goldore": ["rarest", 2],
+
+      "corefragmentore": ["rare", 3],
+      "liquidoil": ["rare", 3],
+      "lead": ["rare", 3],
+
+      "silverore": ["uncommon", 3],
+      "copperore": ["uncommon", 3],
+      "ironore": ["uncommon", 3],
+
+      "cobblestonematerial": ["common", 2],
+      "gravelmaterial": ["common", 2]
+    },
     "conglomeratematerial": {
       "goldore": ["rarest", 3],
       "magnesiumsulfate" : ["rarest", 3],