Merge branch 'CleverRaven:master' into LisaIsherwoodTypo(s)

CleverRaven · Nov 17, 2024 · 6e0b4a3 · 6e0b4a3
2 parents 3910047 + 2ca630f
commit 6e0b4a3
Show file tree

Hide file tree

Showing 74 changed files with 1,097 additions and 852 deletions.
diff --git a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json
@@ -475,7 +475,8 @@
   },
   {
     "type": "effect_on_condition",
-    "eoc_type": "OM_MOVE",
+    "eoc_type": "EVENT",
+    "required_event": "avatar_enters_omt",
     "id": "EOC_HAVE_U_BEEN_TO_MIGOS",
     "condition": {
       "or": [

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
@@ -818,9 +818,11 @@
     "description": "A car battery wired into a static power grid.",
     "item": "battery_car",
     "breaks_into": [
-      { "item": "steel_lump", "count": [ 6, 9 ] },
-      { "item": "steel_chunk", "count": [ 6, 9 ] },
-      { "item": "scrap", "count": [ 6, 9 ] }
+      { "item": "lead", "charges": [ 1680, 2380 ] },
+      { "item": "chem_sulphuric_acid", "count": [ 5, 8 ], "container-item": "null" },
+      { "item": "plastic_chunk", "count": [ 14, 20 ] },
+      { "item": "scrap", "charges": [ 2, 3 ] },
+      { "item": "shredded_rubber", "charges": [ 10, 14 ] }
     ],
     "durability": 120,
     "requirements": { "removal": { "time": "6 m" } },

diff --git a/data/json/furniture_and_terrain/special_use/bullet_trailer.json b/data/json/furniture_and_terrain/special_use/bullet_trailer.json
@@ -10,6 +10,13 @@
     "color": "brown",
     "copy-from": "t_linoleum_gray"
   },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_roof",
+    "name": "bullet trailer roof",
+    "description": "A smooth roof of gleaming chrome, slightly dusty from the road.",
+    "copy-from": "t_metal_flat_roof"
+  },
   {
     "type": "terrain",
     "id": "t_bullettrailer_nwall_westcorner",

diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -9,6 +9,7 @@
       [ "seed_cranberries", 60 ],
       [ "seed_raspberries", 60 ],
       [ "seed_wheat", 60 ],
+      [ "seed_buckwheat", 10 ],
       [ "seed_barley", 60 ],
       [ "seed_sugar_beet", 60 ],
       [ "seed_lettuce", 60 ],

diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json
@@ -36,7 +36,6 @@
       { "group": "egg_reptile_forest", "prob": 5, "count": [ 2, 5 ] },
       { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] },
       { "item": "wild_herbs", "prob": 20, "count": 20 },
-      { "item": "buckwheat", "prob": 5, "count": [ 2, 8 ] },
       { "item": "thyme", "prob": 5, "count": [ 1, 3 ] },
       { "item": "garlic", "prob": 1 },
       { "item": "seed_garlic", "prob": 4, "count": [ 1, 6 ] },
@@ -57,7 +56,6 @@
       { "item": "groundnut", "prob": 2, "count": [ 1, 9 ] },
       { "group": "forage_mushroom", "prob": 50 },
       { "item": "wild_herbs", "prob": 10, "count": 20 },
-      { "item": "buckwheat", "prob": 15, "count": [ 4, 8 ] },
       { "item": "thyme", "prob": 5, "count": [ 1, 3 ] },
       { "item": "garlic", "prob": 1 },
       { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] },

diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -1317,25 +1317,10 @@
     ],
     "name": { "str_sp": "Mi-go Biotech" },
     "conditional_names": [
-      { "type": "VAR", "condition": "npctalk_var_mbt_f_function", "value": "morale", "name": { "str_sp": "%s (happy)" } },
-      {
-        "type": "VAR",
-        "condition": "npctalk_var_mbt_f_function",
-        "value": "focus",
-        "name": { "str_sp": "%s (focus)" }
-      },
-      {
-        "type": "VAR",
-        "condition": "npctalk_var_mbt_f_function",
-        "value": "pain",
-        "name": { "str_sp": "%s (pain relief)" }
-      },
-      {
-        "type": "VAR",
-        "condition": "npctalk_var_mbt_f_function",
-        "value": "sleepiness",
-        "name": { "str_sp": "%s (wake up)" }
-      }
+      { "type": "VAR", "condition": "mbt_f_function", "value": "morale", "name": { "str_sp": "%s (happy)" } },
+      { "type": "VAR", "condition": "mbt_f_function", "value": "focus", "name": { "str_sp": "%s (focus)" } },
+      { "type": "VAR", "condition": "mbt_f_function", "value": "pain", "name": { "str_sp": "%s (pain relief)" } },
+      { "type": "VAR", "condition": "mbt_f_function", "value": "sleepiness", "name": { "str_sp": "%s (wake up)" } }
     ],
     "description": "A piece of mi-go biotechnology.",
     "material": [ "alien_resin" ],

diff --git a/data/json/npcs/isolated_road/isolated_road_jay_convert.json b/data/json/npcs/isolated_road/isolated_road_jay_convert.json
@@ -307,8 +307,8 @@
   },
   {
     "type": "var_migration",
-    "from": "npctalk_var_number_artisans_gunsmith_ammo_ammount",
-    "to": "npctalk_var_number_artisans_gunsmith_ammo_amount"
+    "from": "number_artisans_gunsmith_ammo_ammount",
+    "to": "number_artisans_gunsmith_ammo_amount"
   },
   {
     "id": "TALK_GUNSMITH_BULLET_PICKUP",

diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
@@ -244,7 +244,7 @@
         { "npc_location_variable": { "context_val": "refcenter_nunez_departure" } },
         { "math": [ "_travel_time", "=", "time_since('cataclysm', 'unit': 'days') + 2" ] },
         {
-          "run_eocs": [ "EOC_Nunez_Travel" ],
+          "run_eocs": [ "EOC_Nunez_Travel_To_Tacoma" ],
           "time_in_future": { "context_val": "travel_time" },
           "variables": {
             "refcenter_nunez_departure": { "context_val": "refcenter_nunez_departure" },

diff --git a/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json b/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "EOC_Nunez_Travel",
+    "id": "EOC_Nunez_Travel_To_Tacoma",
     "type": "effect_on_condition",
     "effect": [
       { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] },
@@ -30,23 +30,17 @@
     "update_mapgen_id": "tacoma_nunez_trailer_arrive",
     "method": "json",
     "//": "In addition to basic mapgen, adds some point variables in the hopes that I can add some passive movement animations for pablo and dana.",
-    "object": {
-      "place_nested": [ { "chunks": [ "nunez_trailer" ], "x": 0, "y": 17 } ],
-      "place_npcs": [ { "class": "tacoma_DanaNunez", "x": 4, "y": 19 }, { "class": "tacoma_PabloNunez", "x": 4, "y": 20 } ],
-      "set": [
-        { "point": "variable", "id": "Pablo_relax", "x": 4, "y": 20 },
-        { "point": "variable", "id": "Dana_baking", "x": 4, "y": 19 }
-      ]
-    }
+    "object": { "flags": [ "NO_UNDERLYING_ROTATE" ], "place_nested": [ { "chunks": [ "nunez_trailer" ], "x": 5, "y": 15 } ] }
   },
   {
     "type": "mapgen",
     "method": "json",
     "nested_mapgen_id": "nunez_trailer",
     "//": "Nunez bakery inside a silver bullet trailer.",
     "object": {
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN", "NO_UNDERLYING_ROTATE" ],
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "mapgensize": [ 6, 6 ],
+      "rotation": [ 0 ],
       "rows": [
         "ABCDE ",
         "123456",
@@ -99,7 +93,32 @@
         "c": "f_bullettrailer_bed_head",
         "d": "f_bullettrailer_toilet",
         "i": "f_bullettrailer_sign_danabakery"
-      }
+      },
+      "place_npcs": [ { "class": "tacoma_DanaNunez", "x": 4, "y": 2 }, { "class": "tacoma_PabloNunez", "x": 4, "y": 3 } ],
+      "set": [
+        { "point": "variable", "id": "Pablo_relax", "x": 4, "y": 3 },
+        { "point": "variable", "id": "Dana_baking", "x": 4, "y": 2 }
+      ],
+      "place_nested": [ { "chunks": [ "nunez_trailer_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "nunez_trailer_roof",
+    "object": {
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
+      "mapgensize": [ 6, 6 ],
+      "rotation": [ 0 ],
+      "rows": [
+        "      ",
+        "......",
+        "......",
+        "......",
+        "......",
+        "      "
+      ],
+      "terrain": { ".": "t_bullettrailer_roof" }
     }
   }
 ]
diff --git a/data/json/obsoletion_and_migration_0.I/obsolete_eoc.json b/data/json/obsoletion_and_migration_0.I/obsolete_eoc.json
@@ -30,5 +30,9 @@
   {
     "type": "effect_on_condition",
     "id": "eoc_conjunctivitis_itch"
+  },
+  {
+    "id": "EOC_Nunez_Travel",
+    "type": "effect_on_condition"
   }
 ]
diff --git a/data/json/vehicleparts/battery.json b/data/json/vehicleparts/battery.json
@@ -12,9 +12,11 @@
     "description": "A battery for storing electrical power, and discharging it to power electrical devices built into the vehicle.",
     "folded_volume": "10 L",
     "breaks_into": [
-      { "item": "steel_lump", "count": [ 6, 9 ] },
-      { "item": "steel_chunk", "count": [ 6, 9 ] },
-      { "item": "scrap", "count": [ 6, 9 ] }
+      { "item": "lead", "charges": [ 1680, 2380 ] },
+      { "item": "chem_sulphuric_acid", "count": [ 5, 8 ], "container-item": "null" },
+      { "item": "plastic_chunk", "count": [ 14, 20 ] },
+      { "item": "scrap", "charges": [ 2, 3 ] },
+      { "item": "shredded_rubber", "charges": [ 10, 14 ] }
     ],
     "requirements": {
       "install": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
@@ -34,9 +36,11 @@
     "durability": 100,
     "folded_volume": "1500 ml",
     "breaks_into": [
-      { "item": "steel_lump", "count": [ 4, 7 ] },
-      { "item": "steel_chunk", "count": [ 4, 7 ] },
-      { "item": "scrap", "count": [ 4, 7 ] }
+      { "item": "lead", "charges": [ 252, 357 ] },
+      { "item": "chem_sulphuric_acid", "count": [ 0, 1 ], "container-item": "null" },
+      { "item": "plastic_chunk", "count": [ 2, 3 ] },
+      { "item": "scrap", "charges": [ 0, 1 ] },
+      { "item": "shredded_rubber", "charges": [ 1, 2 ] }
     ]
   },
   {
@@ -48,9 +52,11 @@
     "durability": 30,
     "folded_volume": "750 ml",
     "breaks_into": [
-      { "item": "steel_lump", "count": [ 4, 7 ] },
-      { "item": "steel_chunk", "count": [ 4, 7 ] },
-      { "item": "scrap", "count": [ 4, 7 ] }
+      { "item": "lead", "charges": [ 126, 178 ] },
+      { "item": "chem_sulphuric_acid", "count": [ 0, 1 ], "container-item": "null" },
+      { "item": "plastic_chunk" },
+      { "item": "scrap", "charges": [ 0, 1 ] },
+      { "item": "shredded_rubber", "charges": [ 0, 1 ] }
     ]
   },
   {

diff --git a/data/mods/Magiclysm/Spells/attunements/Blood_Mage.json b/data/mods/Magiclysm/Spells/attunements/Blood_Mage.json
@@ -46,7 +46,7 @@
             "DEMON_CLAWS",
             "DEMON_SKIN",
             "DEMON_TAIL",
-            "HUGE_OK",
+            "DEMON_HUGE",
             "NOPAIN",
             "FACIAL_HAIR_GOATEE"
           ]
@@ -59,12 +59,12 @@
     "type": "SPELL",
     "name": "Demonic Possession",
     "description": "You allow a demon to possess your body for a short time, giving you great combat abilities.  You still retain control, though lose your spellcasting abilities temporarily.",
-    "valid_targets": [ "none" ],
+    "valid_targets": [ "self" ],
     "flags": [ "CONJURATION_SPELL", "SOMATIC", "NO_LEGS", "MUST_HAVE_CLASS_TO_LEARN" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
-    "effect": "spawn_item",
+    "effect": "effect_on_condition",
     "shape": "blast",
-    "effect_str": "demon_possession_aura",
+    "effect_str": "EOC_DEMON_POSSESSION",
     "min_damage": 1,
     "max_damage": 1,
     "min_duration": 360000,
@@ -76,5 +76,74 @@
     "base_casting_time": 800,
     "base_energy_cost": 5,
     "energy_source": "HP"
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_DEMON_POSSESSION",
+    "condition": { "and": [ { "not": { "u_has_trait": "HUGE" } }, { "not": { "u_has_trait": "HUGE_OK" } } ] },
+    "effect": [
+      { "u_message": "Your body swells and warps as your size increases!", "type": "good" },
+      { "math": [ "u_preshift_size", "=", "u_val('size')" ] },
+      {
+        "switch": { "math": [ "u_preshift_size" ] },
+        "cases": [
+          { "case": 1, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "*=", "12" ] } ] },
+          { "case": 2, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "*=", "6" ] } ] },
+          { "case": 3, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "*=", "2" ] } ] },
+          { "case": 4, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "*=", "1.5" ] } ] },
+          { "case": 5, "effect": [  ] }
+        ]
+      },
+      { "u_cast_spell": { "id": "demonic_possession_real" } },
+      {
+        "run_eocs": "EOC_DEMON_POSSESSION_REMOVE",
+        "time_in_future": { "math": [ "(u_spell_level('demonic_possession') * 309) + 3600" ] }
+      }
+    ],
+    "false_effect": [
+      { "u_message": "Your body fills with demonic power!", "type": "good" },
+      { "u_cast_spell": { "id": "demonic_possession_real" } },
+      {
+        "run_eocs": "EOC_DEMON_POSSESSION_REMOVE",
+        "time_in_future": { "math": [ "(u_spell_level('demonic_possession') * 309) + 3600" ] }
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_DEMON_POSSESSION_REMOVE",
+    "effect": [
+      { "u_message": "Your body shrinks and warps as your size decreases!", "type": "bad" },
+      {
+        "switch": { "math": [ "u_preshift_size" ] },
+        "cases": [
+          { "case": 1, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "/=", "12" ] } ] },
+          { "case": 2, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "/=", "6" ] } ] },
+          { "case": 3, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "/=", "2" ] } ] },
+          { "case": 4, "effect": [ { "math": [ "u_calories('dont_affect_weariness': true)", "/=", "1.5" ] } ] },
+          { "case": 5, "effect": [  ] }
+        ]
+      }
+    ]
+  },
+  {
+    "id": "demonic_possession_real",
+    "type": "SPELL",
+    "name": "Demonic Possession Real",
+    "description": "Grants the aura that gives the demon traits.  You're not supposed to see this.",
+    "valid_targets": [ "self" ],
+    "flags": [ "CONJURATION_SPELL", "SOMATIC", "NO_LEGS", "MUST_HAVE_CLASS_TO_LEARN", "SILENT", "NO_EXPLOSION_SFX" ],
+    "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
+    "effect": "spawn_item",
+    "shape": "blast",
+    "effect_str": "demon_possession_aura",
+    "min_damage": 1,
+    "max_damage": 1,
+    "min_duration": { "math": [ "(u_spell_level('demonic_possession') * 30900) + 360000" ] },
+    "max_duration": { "math": [ "(u_spell_level('demonic_possession') * 30900) + 360000" ] },
+    "spell_class": "BLOOD_MAGE",
+    "difficulty": 5,
+    "max_level": 35,
+    "base_casting_time": 0
   }
 ]
diff --git a/data/mods/Magiclysm/traits/temporary_demon_traits.json b/data/mods/Magiclysm/traits/temporary_demon_traits.json
@@ -62,6 +62,33 @@
     ],
     "flags": [ "NO_SPELLCASTING" ]
   },
+  {
+    "type": "mutation",
+    "id": "DEMON_HUGE",
+    "//": "Identical to HUGE_OK but uses the flag for temporary sizeshifting.",
+    "//2": "I am not using the biomancer version, as it has more bonuses than HUGE_OK and I want to keep the spell's balance identical while fixing the bug.",
+    "flags": [ "TEMPORARY_SHAPESHIFT", "SHAPESHIFT_SIZE_HUGE" ],
+    "name": { "str": "Huge" },
+    "points": 2,
+    "visibility": 4,
+    "ugliness": 3,
+    "valid": false,
+    "starting_trait": false,
+    "mixed_effect": true,
+    "description": "Your cardiovascular system has caught up with your muscular physique, so who needs pathetic human cars?  Strength +4.",
+    "types": [ "SIZE" ],
+    "enchantments": [
+      {
+        "values": [
+          { "value": "STRENGTH", "add": 4 },
+          { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": 1 },
+          { "value": "CARRY_WEIGHT", "multiply": 0.1 }
+        ]
+      }
+    ],
+    "restricts_gear": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r" ],
+    "destroys_gear": true
+  },
   {
     "type": "mutation",
     "id": "DEMON_CLAWS",