Merge pull request #3511 from edwardspec/fix-misc-typos

Fix random uprooting of Vorit and Aquapod (aquatic plants)
sayterdarkwynd · Oct 28, 2023 · 3f5ed99 · 3f5ed99
2 parents b0f4109 + c490b60
commit 3f5ed99
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 24 deletions.
diff --git a/liquids/beer.liquid b/liquids/beer.liquid
@@ -4,11 +4,10 @@
   "description" : "The purest, finest, tastiest of fluids.",
   "tickDelta" : 1,
   "color" : [139,99,30,125],
-  "radiantLight" : [0,0,0],
   "statusEffects" : [ "swimming", "booze" ],
   "itemDrop" : "liquidbeer",
   "texture":"/liquids/watertex.png",
   "bottomLightMix" : [83,53,0],
   "textureMovementFactor" : 0.75,
   "interactions" : []
-}
+}
diff --git a/liquids/helium3gas.liquid b/liquids/helium3gas.liquid
@@ -4,11 +4,10 @@
   "description" : "Handy energy-infused gas. Great for fusion.",
   "tickDelta" : 9,
   "color" : [255, 255, 255, 0],
-  "radiantLight" : [0, 0, 0],
   "statusEffects" : [ "biomeairless", "helium3" ],
   "itemDrop" : "helium3gasliquid",
 
   "texture" : "/liquids/watertex.png",
   "bottomLightMix" : [255, 255, 255],
   "textureMovementFactor" : 1.6
-}
+}
diff --git a/liquids/shadowgas.liquid b/liquids/shadowgas.liquid
@@ -4,7 +4,6 @@
   "description" : "A dangerous gas named for its unique light and gravity absorption properties.",
   "tickDelta" : 20,
   "color" : [0, 0, 0, 55],
-  "radiantLight" : [0, 0, 0],
   "statusEffects" : [ "shadowgasfx" ],
   "itemDrop" : "shadowgasliquid",
   "interactions" : [

diff --git a/liquids/wastewater.liquid b/liquids/wastewater.liquid
@@ -4,7 +4,6 @@
   "description" : "Ew. Filthy water.",
   "tickDelta" : 2,
   "color" : [89,81,56,200],
-  "radiantLight" : [0,0,0],
   "statusEffects" : [ "swimming", "contaminatedpoison", "wet" ],
   "itemDrop" : "liquidwastewater",
   "texture":"/liquids/watertex.png",
@@ -28,4 +27,4 @@
       "liquidResult" : 6
     }
   ]
-}
+}
diff --git a/objects/farmables/aquapod/aquapodseed.object b/objects/farmables/aquapod/aquapodseed.object
@@ -42,7 +42,7 @@
     }
   ],
  // "learnBlueprintsOnPickup" : [ "voritseed", "littlegoodberryseed" ],
-    "minImmersion" : 1.0,
+    "minImmersion" : 0.9,
     "consumeSoilMoisture" : false,
   "beeLikeness" : { "aquarum" : 1}
-}
+}
diff --git a/objects/farmables/aquapod/wildaquapodseed.object b/objects/farmables/aquapod/wildaquapodseed.object
@@ -37,10 +37,10 @@
       "resetToStage" : 2
     }
   ],
-    "minImmersion" : 1.0,
+    "minImmersion" : 0.9,
     "consumeSoilMoisture" : false,
   "breakDropOptions" : [
     [ [ "aquapodseed", 1, { } ] ]
   ],
   "beeLikeness" : {"aquarum":1,"gelidbburrower":1}
-}
+}
diff --git a/objects/farmables/voritseed/voritseed.object b/objects/farmables/voritseed/voritseed.object
@@ -41,6 +41,6 @@
       "resetToStage" : 2
     }
   ],
-    "minImmersion" : 1.0,
+    "minImmersion" : 0.9,
     "consumeSoilMoisture" : false
-}
+}
diff --git a/objects/nightar/nightarclock/nightarclock.object b/objects/nightar/nightarclock/nightarclock.object
@@ -9,8 +9,6 @@
   "shortdescription" : "Nightar Clock",
   "race" : "nightar",
 
-  "lightColor" : [0, 0, 0],
-
   "inventoryIcon" : "nightarclockicon.png",
   "orientations" : [
     {

diff --git a/objects/nightar/nightarfountain/nightarfountain.object b/objects/nightar/nightarfountain/nightarfountain.object
@@ -17,8 +17,6 @@
   "hylotlDescription" : "A fountain like this surely belongs in a well-kept garden.",
   "novakidDescription" : "A fancy lookin' fountain.",
 
-  "lightColor" : [0, 0, 0],
-
   "inventoryIcon" : "nightarfountainicon.png",
   "orientations" : [
     {

diff --git a/objects/proppack/tapedeck/tapedeck.object b/objects/proppack/tapedeck/tapedeck.object
@@ -17,8 +17,6 @@
   "hylotlDescription" : "A simple tapedeck.",
   "novakidDescription" : "Just a tapedeck.",
 
-  "lightColor" : [0, 0, 0],
-
   "inventoryIcon" : "tapedeckicon.png",
   "orientations" : [
     {

diff --git a/objects/themed/roman/romanfountain/romanfountain.object b/objects/themed/roman/romanfountain/romanfountain.object
@@ -17,8 +17,6 @@
   "hylotlDescription" : "A fountain like this surely belongs in a well-kept garden.",
   "novakidDescription" : "A fancy lookin' fountain.",
 
-  "lightColor" : [0, 0, 0],
-
   "inventoryIcon" : "romanfountainicon.png",
   "orientations" : [
     {

diff --git a/objects/themed/sweets/sweetsplayer/sweetsplayer.object b/objects/themed/sweets/sweetsplayer/sweetsplayer.object
@@ -5,7 +5,6 @@
   "rarity" : "Rare",
   "category" : "decorative",
   "price" : 0,
-  "lightColor" : [0, 0, 0],
   "description" : "A macaroon themed record player. It plays a sweet little song.",
   "shortdescription" : "Sweets Music Player",
   "race" : "generic",

diff --git a/tiles/materials/penumbriteblock.material b/tiles/materials/penumbriteblock.material
@@ -17,7 +17,6 @@
     "lightTransparent" : false,
     "occludesBelow" : true,
     "multiColored" : true,
-    "zLevel" : 0,
-	"radiantLight" : [0.3, 0.05, 0.3]
+    "zLevel" : 0
   }
 }