Merge pull request #1 from TaiGambol/TaiGambol-patch-1

Patch to function on current experimental
TaiGambol · May 3, 2023 · 4cf9ff1 · 4cf9ff1
2 parents ef52cd5 + b20ba55
commit 4cf9ff1
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 41 deletions.
diff --git a/EOCs.json b/EOCs.json
@@ -229,7 +229,7 @@
       { "arithmetic": [ { "u_val": "vitamin", "name": "bad_food" }, "=", { "const": 0 } ] },
       { "arithmetic": [ { "u_val": "vitamin", "name": "blood" }, "=", { "const": 0 } ] },
       { "arithmetic": [ { "u_val": "vitamin", "name": "instability" }, "=", { "const": 0 } ] },
-      { "arithmetic": [ { "u_val": "pain" }, "=", { "const": 0 } ] },
+      { "math": [ "u_pain()", "=", "0" ] },
       { "u_add_effect": "cureall", "duration": "1 s", "intensity": 1 },
       { "u_add_effect": "panacea", "duration": "30 s", "intensity": 1 },
       { "u_lose_effect": "corroding" },

diff --git a/constructions.json b/constructions.json
@@ -24,7 +24,7 @@
       { "item": "twig", "count": [ 5, 12 ] },
       { "item": "leaves", "count": [ 4, 16 ] }
     ],
-    "pre_terrain": "t_infinitree1",
+    "pre_terrain": "f_infinitree1",
     "post_flags": [ "keep_items" ],
     "activity_level": "LIGHT_EXERCISE"
   },
@@ -41,7 +41,7 @@
       { "item": "stick_long", "count": [ 0, 2 ] },
       { "item": "splinter", "count": [ 2, 8 ] }
     ],
-    "pre_terrain": "t_infinitree1",
+    "pre_terrain": "f_infinitree1",
     "post_flags": [ "keep_items" ],
     "activity_level": "ACTIVE_EXERCISE"
   },
@@ -58,7 +58,7 @@
       { "item": "stick_long", "count": [ 1, 2 ] },
       { "item": "splinter", "count": [ 2, 8 ] }
     ],
-    "pre_terrain": "t_infinitree1",
+    "pre_terrain": "f_infinitree1",
     "post_flags": [ "keep_items" ],
     "activity_level": "ACTIVE_EXERCISE"
   },
@@ -75,7 +75,7 @@
       { "item": "stick_long", "count": [ 1, 2 ] },
       { "item": "splinter", "count": [ 2, 8 ] }
     ],
-    "pre_terrain": "t_infinitree1",
+    "pre_terrain": "f_infinitree1",
     "post_flags": [ "keep_items" ],
     "activity_level": "ACTIVE_EXERCISE"
   },
@@ -92,7 +92,7 @@
       { "item": "stick_long", "count": [ 1, 2 ] },
       { "item": "splinter", "count": [ 2, 8 ] }
     ],
-    "pre_terrain": "t_infinitree1",
+    "pre_terrain": "f_infinitree1",
     "post_flags": [ "keep_items" ],
     "activity_level": "ACTIVE_EXERCISE"
   },

diff --git a/furniture and terrain.json b/furniture and terrain.json
@@ -88,48 +88,46 @@
     "color": "red"
   },
   {
-    "type": "terrain",
-    "id": "t_infinitree1",
+    "type": "furniture",
+    "id": "f_infinitree1",
     "name": "infinitree sapling",
-    "looks_like": "t_tree_young",
     "description": "Purple-blue shimmers sparkle around the leaves of this small sapling. New growth seems to spring up in seconds, as if in a timelapse, and yet there never seem to be too many branches. It's always in equilibrium. You can harvest sticks, logs, and other materials from it using the construction menu.",
+    "looks_like": "t_tree_young",
     "symbol": "7",
     "color": "brown",
-    "move_cost": 0,
+    "move_cost_mod": -1,
     "coverage": 80,
+    "required_str": -1,
+    "crafting_pseudo_item": "fakeitem_infinitree1",
     "flags": [ "NOITEM", "TRANSPARENT" ],
-	"deconstruct": {
-      "ter_set": "t_grass",
-      "items": [
-        { "item": "warptoken", "count": 10 }
-      ]
-    },
-    "crafting_pseudo_item": "fakeitem_infinitree1"
+	"deconstruct": { "items": [ { "item": "warptoken", "count": 10 } ] }
   },
   {
-    "type": "terrain",
-    "id": "t_infinitree2",
+    "type": "furniture",
+    "id": "f_infinitree2",
     "name": "infinitree sapling",
     "looks_like": "t_tree",
     "description": "Purple-blue shimmers sparkle around the leaves of this small sapling. New growth seems to spring up in seconds, as if in a timelapse, and yet there never seem to be too many branches. It's always in equilibrium. You could probably use this in some recipes.",
     "symbol": "7",
     "color": "brown",
-    "move_cost": 0,
+    "move_cost_mod": -1,
     "coverage": 80,
+	"required_str": -1,
     "flags": [ "NOITEM", "TRANSPARENT" ],	
     "crafting_pseudo_item": "fakeitem_infinitree1"
   },
   {
-    "type": "terrain",
-    "id": "t_infinitree3",
+    "type": "furniture",
+    "id": "f_infinitree3",
     "name": "infinitree sapling",
     "looks_like": "t_tree_pine",
     "description": "Purple-blue shimmers sparkle around the leaves of this small sapling. New growth seems to spring up in seconds, as if in a timelapse, and yet there never seem to be too many branches. It's always in equilibrium. You could probably use this in some recipes.",
     "symbol": "7",
     "color": "brown",
-    "move_cost": 0,
+    "move_cost_mod": -1,
     "coverage": 80,
+	"required_str": -1,
     "flags": [ "NOITEM", "TRANSPARENT" ],	
     "crafting_pseudo_item": "fakeitem_infinitree1"
   }
-]
+]
diff --git a/items.json b/items.json
@@ -29,7 +29,7 @@
     "color": "light_green",
     "use_action": {
       "type": "unpack",
-      "use_message": "The object's superposition collapses and it becomes a singular artifact!",
+	  "//": "'activation_message': 'The object's superposition collapses and it becomes a singular artifact!' <- Not currently functional",
       "group": "random_artifact_pool"
     }
   },

diff --git a/missions and mapgen.json b/missions and mapgen.json
@@ -905,7 +905,7 @@
     "value": 0,
     "start": {
       "assign_mission_target": { "var": { "global_val": "OM_missionspot" } },
-      "update_mapgen": { "place_npcs": [ { "class": "bandit", "x": [ 1, 22 ], "y": [ 1, 22 ], "target": true, "name": "Marked." } ] }
+      "update_mapgen": { "place_npcs": [ { "class": "bandit_marked", "x": [ 1, 22 ], "y": [ 1, 22 ], "target": true } ] }
     },
     "end": {
       "effect": [
@@ -937,7 +937,7 @@
     "value": 0,
     "start": {
       "assign_mission_target": { "var": { "global_val": "OM_missionspot" } },
-      "update_mapgen": { "place_npcs": [ { "class": "thug", "x": [ 1, 22 ], "y": [ 1, 22 ], "target": true, "name": "Marked." } ] }
+      "update_mapgen": { "place_npcs": [ { "class": "thug_marked", "x": [ 1, 22 ], "y": [ 1, 22 ], "target": true } ] }
     },
     "end": {
       "effect": [
@@ -971,9 +971,9 @@
       "assign_mission_target": { "var": { "global_val": "OM_missionspot" } },
       "update_mapgen": {
         "place_npcs": [
-          { "class": "thug", "x": [ 1, 22 ], "y": [ 1, 22 ], "name": "Marked.", "repeat": [ 1, 2 ] },
-          { "class": "bandit", "x": [ 1, 22 ], "y": [ 1, 22 ], "name": "Marked.", "repeat": [ 0, 1 ] },
-          { "class": "bandit", "x": [ 1, 22 ], "y": [ 1, 22 ], "target": true, "name": "Marked." }
+          { "class": "thug_marked", "x": [ 1, 22 ], "y": [ 1, 22 ], "repeat": [ 1, 2 ] },
+          { "class": "bandit_marked", "x": [ 1, 22 ], "y": [ 1, 22 ], "repeat": [ 0, 1 ] },
+          { "class": "bandit_marked", "x": [ 1, 22 ], "y": [ 1, 22 ], "target": true }
         ]
       }
     },

diff --git a/npc.json b/npc.json
@@ -0,0 +1,35 @@
+[
+  {
+    "type": "npc",
+    "id": "thug_marked",
+    "//": "Generic melee focused guard for the Hell's Raiders faction.",
+    "name_suffix": "Marked Thug",
+    "class": "NC_THUG",
+    "attitude": 10,
+    "mission": 8,
+    "chat": "TALK_DONE",
+    "faction": "no_faction"
+  },
+  {
+    "type": "npc",
+    "id": "bandit_marked",
+    "//": "Generic pistol/rifle focused guard for the Hell's Raiders faction.",
+    "name_suffix": "Marked Bandit",
+    "class": "NC_SCAVENGER",
+    "attitude": 10,
+    "mission": 8,
+    "chat": "TALK_DONE",
+    "faction": "no_faction"
+  },
+  {
+    "type": "npc",
+    "id": "assassin_marked",
+    "//": "EOC-specific, should not spawn outside of trigger events.",
+    "name_suffix": "Marked Assassin",
+    "class": "NC_BOUNTY_HUNTER",
+    "attitude": 10,
+    "mission": 8,
+    "chat": "TALK_DONE",
+    "faction": "no_faction"
+  }
+]
diff --git a/warpitems.json b/warpitems.json
@@ -84,23 +84,23 @@
       "AURA",
       "TARDIS"
     ],
-    "bashing": 0,
-    "cutting": 0,
     "to_hit": 0,
     "warmth": 0,
     "weight": "400 g",
     "volume": "2000 ml",
     "longest_side": "11 meter",
     "description": "This is a template you shouldn't actually see.",
-    "armor": [
-      {
-        "coverage": 0,
-        "covers": [ "torso" ],
-        "material": [ "alien_resin" ],
-        "material_thickness": 1,
-        "environmental_protection": 0
-      }
-    ]
+    "armor_data": { 
+	  "armor": [
+        {
+		  "material": [ { "type": "alien_resin", "covered_by_mat": 100, "thickness": 1.0 } ],
+          "encumbrance": 0,
+          "coverage": 0,
+          "covers": [ "torso" ]
+        }
+      ]
+	},
+    "melee_damage": { "bash": 0 }
   },
   {
     "type": "ARMOR",