Merge branch 'CleverRaven:master' into post-office-letters-outside

CleverRaven · Dec 8, 2024 · c34bc97 · c34bc97
2 parents 51122b2 + ff8b5d3
commit c34bc97
Show file tree

Hide file tree

Showing 238 changed files with 4,122 additions and 4,197 deletions.
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -235,7 +235,12 @@ jobs:
         CCACHE_FILECLONE: true
         CCACHE_HARDLINK: true
         CCACHE_NOCOMPRESS: true
-        SKIP: ${{ ( github.event.pull_request.draft == true && matrix.title != 'Basic Build and Test (Clang 10, Ubuntu, Curses)' ) || ( matrix.dont_skip_data_only_changes == 0 && needs.skip-duplicates.outputs.should_skip_code == 'true' ) || ( matrix.dont_skip_data_only_changes != 0 && needs.skip-duplicates-mods.outputs.should_skip_data == 'true' ) }}
+        SKIP: >-
+          ${{
+          ( github.event.pull_request.draft == true && matrix.title != 'Basic Build and Test (Clang 10, Ubuntu, Curses)' ) ||
+          ( matrix.dont_skip_data_only_changes == 0 && needs.skip-duplicates.outputs.should_skip_code == 'true' ) ||
+          ( matrix.dont_skip_data_only_changes != 0 && needs.skip-duplicates-mods.outputs.should_skip_data == 'true' )
+          }}
         SKIP_TESTS: ${{ needs.matrix-variables.outputs.skip_tests }}
     steps:
     - name: Maximize build space
@@ -356,7 +361,7 @@ jobs:
         if-no-files-found: ignore
         retention-days: 9
   emscripten:
-    needs: [ varied_builds ]
+    needs: [ skip-duplicates-code, varied_builds ]
     uses: ./.github/workflows/emscripten.yml
-    if: ${{ success() && github.event.pull_request.draft == false }}
+    if: ${{ needs.skip-duplicates.outputs.should_skip_code != 'true' && success() && github.event.pull_request.draft == false }}
     secrets: inherit
diff --git a/data/json/construction/furniture_tools.json b/data/json/construction/furniture_tools.json
@@ -489,7 +489,7 @@
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
     "using": [ [ "welding_standard", 5 ] ],
     "//1": "5cm of weld to join the faucet to the pipe",
-    "components": [ [ [ "metal_tank", 4 ] ], [ [ "water_faucet", 1 ] ] ],
+    "components": [ [ [ "metal_tank", 5 ] ], [ [ "water_faucet", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_standing_tank"
   },

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -4975,40 +4975,6 @@
     "removes_effects": [ "invisibility" ],
     "show_in_info": true
   },
-  {
-    "id": "star_vampire_blood_drink",
-    "type": "effect_type",
-    "name": [ "Exsanguination" ],
-    "desc": [ "The monster is greedily drinking your blood!" ],
-    "rating": "bad",
-    "resist_traits": [ "BLEED_IMMUNE" ],
-    "show_in_info": true,
-    "max_intensity": 2,
-    "show_intensity": false,
-    "int_decay_step": -2,
-    "int_decay_tick": 1,
-    "vitamins": [
-      { "vitamin": "blood", "rate": [ [ -250, -650 ] ], "tick": [ "1 s" ] },
-      { "vitamin": "redcells", "rate": [ [ -250, -650 ] ], "tick": [ "1 s" ] }
-    ]
-  },
-  {
-    "id": "star_vampire_blood_drink",
-    "type": "effect_type",
-    "name": [ "Hemorrhage" ],
-    "desc": [ "The monster is sucking up your blood!" ],
-    "rating": "bad",
-    "resist_traits": [ "BLEED_IMMUNE" ],
-    "show_in_info": true,
-    "max_intensity": 2,
-    "show_intensity": false,
-    "int_decay_step": -2,
-    "int_decay_tick": 1,
-    "vitamins": [
-      { "vitamin": "blood", "rate": [ [ -125, -325 ] ], "tick": [ "1 s" ] },
-      { "vitamin": "redcells", "rate": [ [ -125, -325 ] ], "tick": [ "1 s" ] }
-    ]
-  },
   {
     "id": "star_vampire_blood_drink_feral",
     "type": "effect_type",

diff --git a/data/json/effects_on_condition/addictions_eocs.json b/data/json/effects_on_condition/addictions_eocs.json
@@ -21,7 +21,7 @@
             { "math": [ "rand(10) < u_addiction_intensity('caffeine')" ] }
           ]
         },
-        "then": { "math": [ "u_val('stim')", "--" ] }
+        "then": { "math": [ "u_val('stim')--" ] }
       },
       {
         "if": {
@@ -42,7 +42,7 @@
     "id": "EOC_SLEEP_ADDICTION",
     "//": "Actual effects processed in player::can_sleep().  Here, only prolong this addiction longer than usual.",
     "condition": { "and": [ { "one_in_chance": 2 }, { "math": [ "u_addiction_turns('sleeping pill') < 0" ] } ] },
-    "effect": { "math": [ "u_addiction_turns('sleeping pill')", "++" ] }
+    "effect": { "math": [ "u_addiction_turns('sleeping pill')++" ] }
   },
   {
     "type": "effect_on_condition",
@@ -51,7 +51,7 @@
     "effect": [
       { "u_add_morale": "morale_craving_marloss", "bonus": -5, "max_bonus": -30 },
       { "u_message": "You daydream about luscious pink berries as big as your fist.", "type": "info" },
-      { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')", "--" ] } }
+      { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')--" ] } }
     ]
   },
   {
@@ -61,7 +61,7 @@
     "effect": [
       { "u_add_morale": "morale_craving_marloss", "bonus": -5, "max_bonus": -30 },
       { "u_message": "You daydream about nutty cyan seeds as big as your hand.", "type": "info" },
-      { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')", "--" ] } }
+      { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')--" ] } }
     ]
   },
   {
@@ -71,7 +71,7 @@
     "effect": [
       { "u_add_morale": "morale_craving_marloss", "bonus": -5, "max_bonus": -30 },
       { "u_message": "You daydream about succulent, pale golden gel, sweet but light.", "type": "info" },
-      { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')", "--" ] } }
+      { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')--" ] } }
     ]
   },
   {

diff --git a/data/json/effects_on_condition/bionic_eocs.json b/data/json/effects_on_condition/bionic_eocs.json
@@ -42,7 +42,7 @@
     "effect": [
       { "u_message": "Your malfunctioning bionic causes you to spasm and fall to the floor!", "type": "bad" },
       { "sound_effect": "elec_crackle_high", "id": "bionics", "volume": 100 },
-      { "math": [ "u_pain()", "++" ] },
+      { "math": [ "u_pain()++" ] },
       { "u_add_effect": "stunned", "duration": 1 },
       { "u_add_effect": "downed", "duration": 1, "force": true }
     ]
@@ -84,7 +84,7 @@
     "recurrence": [ "25 minutes", "1 hours 15 minutes" ],
     "condition": { "and": [ { "u_has_bionics": "bio_sleepy" }, { "not": { "u_has_effect": "sleep" } } ] },
     "deactivate_condition": { "not": { "u_has_bionics": "bio_sleepy" } },
-    "effect": { "math": [ "u_val('sleepiness')", "++" ] }
+    "effect": { "math": [ "u_val('sleepiness')++" ] }
   },
   {
     "type": "effect_on_condition",

diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json
@@ -48,7 +48,7 @@
     "id": "EOC_mininuke_record",
     "eoc_type": "EVENT",
     "required_event": "activates_mininuke",
-    "effect": [ { "math": [ "u_mininuke_activated", "++" ] } ]
+    "effect": [ { "math": [ "u_mininuke_activated++" ] } ]
   },
   {
     "id": "EOC_DEATH_SWITCH",

diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
@@ -73,7 +73,7 @@
       { "u_forget_recipe": "prac_unmute_bird" }
     ],
     "false_effect": [
-      { "math": [ "u_progress_unmute_bird", "++" ] },
+      { "math": [ "u_progress_unmute_bird++" ] },
       {
         "u_message": "Restricting your range to the apes' feels demeaning, and you decide to take a break before you start plucking out your feathers in frustration."
       }
@@ -92,7 +92,7 @@
       { "u_forget_recipe": "prac_unmute_ceph" }
     ],
     "false_effect": [
-      { "math": [ "u_progress_unmute_ceph", "++" ] },
+      { "math": [ "u_progress_unmute_ceph++" ] },
       {
         "u_message": "Draw air into your mantle, close your throat, rehearse your sentence, exhale and contort your beak just so."
       }
@@ -111,7 +111,7 @@
       { "u_forget_recipe": "prac_unmute_gastropod" }
     ],
     "false_effect": [
-      { "math": [ "u_progress_unmute_gastropod", "++" ] },
+      { "math": [ "u_progress_unmute_gastropod++" ] },
       {
         "u_message": "If you rub your tongue against your palate like this is makes a `th` - or at least, a `thrksrkkk`, but it's a start.  Ignore the taste of blood, there's work to be done."
       }
@@ -130,7 +130,7 @@
       { "u_forget_recipe": "prac_unmute_insect" }
     ],
     "false_effect": [
-      { "math": [ "u_progress_unmute_insect", "++" ] },
+      { "math": [ "u_progress_unmute_insect++" ] },
       {
         "u_message": "You have all these new moving parts in your not-mouth, but they are struggling under the strain you put them under."
       }
@@ -149,7 +149,7 @@
       { "u_forget_recipe": "prac_unmute_slime" }
     ],
     "false_effect": [
-      { "math": [ "u_progress_unmute_slime", "++" ] },
+      { "math": [ "u_progress_unmute_slime++" ] },
       {
         "u_message": "Do you need teeth, lungs?  You fall back into your resting shape in exasperation.  This will take long."
       }

diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
@@ -242,7 +242,7 @@
       { "remove_active_mission": "MISSION_INVESTIGATE_PORTAL_DUNGEON" },
       { "remove_active_mission": "MISSION_INVESTIGATE_PORTAL_STORM_CENTER" },
       { "alter_timed_events": "portal_dungeon_entrance" },
-      { "math": [ "u_counter_portal_storm_counter", "++" ] },
+      { "math": [ "u_counter_portal_storm_counter++" ] },
       { "math": [ "talked_to_storm = 0" ] },
       {
         "trigger_event": "u_var_changed",
@@ -275,9 +275,9 @@
     "id": "EOC_PORTAL_EXPAND",
     "condition": { "math": [ "portal_storm_distance != 0" ] },
     "effect": [
-      { "math": [ "portal_storm_distant_distance", "++" ] },
-      { "math": [ "portal_storm_close_distance", "++" ] },
-      { "math": [ "portal_storm_distance", "++" ] }
+      { "math": [ "portal_storm_distant_distance++" ] },
+      { "math": [ "portal_storm_close_distance++" ] },
+      { "math": [ "portal_storm_distance++" ] }
     ],
     "false_effect": [
       { "math": [ "portal_storm_distant_distance = 201" ] },
@@ -379,7 +379,7 @@
         "or": [ { "is_weather": "distant_portal_storm" }, { "is_weather": "near_portal_storm" }, { "is_weather": "portal_storm" } ]
       }
     },
-    "effect": [ { "math": [ "u_ire", "++" ] }, { "u_message": "PORTAL_STORM_WITNESSED", "snippet": true } ]
+    "effect": [ { "math": [ "u_ire++" ] }, { "u_message": "PORTAL_STORM_WITNESSED", "snippet": true } ]
   },
   {
     "type": "effect_on_condition",
@@ -974,7 +974,7 @@
     "type": "effect_on_condition",
     "id": "EOC_PORTAL_STORM_DUNGEON_NEXT_LEVEL",
     "effect": [
-      { "math": [ "portal_dungeon_level", "++" ] },
+      { "math": [ "portal_dungeon_level++" ] },
       { "mapgen_update": "portal_dungeon_cleanup", "target_var": { "global_val": "dungeon_loc" } },
       { "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true },
       { "run_eocs": [ "EOC_PORTAL_STORM_DUNGEON_REFLECTION_SPAWN", "capture_generic_nre_anomaly" ] },
@@ -1276,7 +1276,7 @@
       }
     },
     "effect": [
-      { "math": [ "u_portal_storm_record", "++" ] },
+      { "math": [ "u_portal_storm_record++" ] },
       {
         "run_eocs": [
           {
@@ -1315,10 +1315,7 @@
     "id": "capture_generic_nre_anomaly",
     "global": true,
     "condition": { "u_has_items": { "item": "nre_recorder", "charges": 1 } },
-    "effect": [
-      { "math": [ "u_generic_nre_anomaly", "++" ] },
-      { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" }
-    ]
+    "effect": [ { "math": [ "u_generic_nre_anomaly++" ] }, { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" } ]
   },
   {
     "type": "effect_on_condition",
@@ -1352,10 +1349,7 @@
         }
       ]
     },
-    "effect": [
-      { "math": [ "u_generic_nre_anomaly", "++" ] },
-      { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" }
-    ]
+    "effect": [ { "math": [ "u_generic_nre_anomaly++" ] }, { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" } ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
@@ -207,7 +207,7 @@
             "case": 1,
             "effect": [
               { "u_message": "Vitrifaction_Ambient_1", "snippet": true, "type": "good" },
-              { "math": [ "u_vitri_glassed", "++" ] },
+              { "math": [ "u_vitri_glassed++" ] },
               { "u_add_morale": "morale_vitri_placid", "bonus": 3, "max_bonus": 50 },
               { "run_eocs": "EOC_queue_vitrified_int_drain" }
             ]
@@ -216,7 +216,7 @@
             "case": 2,
             "effect": [
               { "u_message": "Vitrifaction_Ambient_2", "snippet": true, "type": "good" },
-              { "math": [ "u_vitri_glassed", "++" ] },
+              { "math": [ "u_vitri_glassed++" ] },
               { "u_add_morale": "morale_vitri_placid", "bonus": 5, "max_bonus": 99 },
               { "run_eocs": "EOC_queue_vitrified_int_drain" }
             ]
@@ -225,7 +225,7 @@
             "case": 3,
             "effect": [
               { "u_message": "Vitrifaction_Ambient_3", "snippet": true, "type": "good" },
-              { "math": [ "u_vitri_glassed", "++" ] },
+              { "math": [ "u_vitri_glassed++" ] },
               { "u_add_morale": "morale_vitri_placid", "bonus": 7, "max_bonus": 99 },
               { "run_eocs": "EOC_queue_vitrified_int_drain" }
             ]
@@ -234,7 +234,7 @@
             "case": 4,
             "effect": [
               { "u_message": "Vitrifaction_Ambient_4", "snippet": true, "type": "good" },
-              { "math": [ "u_vitri_glassed", "++" ] },
+              { "math": [ "u_vitri_glassed++" ] },
               { "u_add_morale": "morale_vitri_placid", "bonus": 10, "max_bonus": 99 },
               { "run_eocs": "EOC_queue_vitrified_int_drain" }
             ]
@@ -243,7 +243,7 @@
             "case": 5,
             "effect": [
               { "u_message": "Vitrifaction_Ambient_5", "snippet": true, "type": "good" },
-              { "math": [ "u_vitri_glassed", "++" ] },
+              { "math": [ "u_vitri_glassed++" ] },
               { "u_add_morale": "morale_vitri_placid", "bonus": 15, "max_bonus": 99 },
               { "run_eocs": "EOC_queue_vitrified_int_drain" }
             ]
@@ -252,7 +252,7 @@
             "case": 6,
             "effect": [
               { "u_message": "Vitrifaction_Ambient_6", "snippet": true, "type": "good" },
-              { "math": [ "u_vitri_glassed", "++" ] },
+              { "math": [ "u_vitri_glassed++" ] },
               { "u_add_morale": "morale_vitri_placid", "bonus": 20, "max_bonus": 99 },
               { "run_eocs": "EOC_queue_vitrified_int_drain" }
             ]
@@ -301,7 +301,7 @@
     "id": "EOC_vitrified_int_drain",
     "condition": { "and": [ { "x_in_y_chance": { "x": 1, "y": 2 } }, { "math": [ "u_vitri_glassed >= 5" ] } ] },
     "effect": [
-      { "math": [ "u_vitri_vitrified", "++" ] },
+      { "math": [ "u_vitri_vitrified++" ] },
       { "u_add_effect": "VITRIFYING", "duration": "PERMANENT", "intensity": { "math": [ "u_vitri_vitrified" ] } },
       { "math": [ "u_vitri_glassed = 0" ] }
     ]

diff --git a/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json b/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json
@@ -153,7 +153,7 @@
     },
     "effect": [
       { "u_spawn_npc": "hells_raiders_assassin", "real_count": 1, "min_radius": 15, "max_radius": 25 },
-      { "math": [ "u_bandit_assassins_sent", "++" ] }
+      { "math": [ "u_bandit_assassins_sent++" ] }
     ]
   },
   {

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
@@ -434,7 +434,7 @@
     "deactivate_condition": { "math": [ "isherwood_luke_truck_status > 1" ] },
     "effect": [
       { "mapgen_update": "LUKE_REMOVE_TRUCK", "om_terrain": "trailhead_shack_z0" },
-      { "math": [ "isherwood_luke_truck_status", "++" ] }
+      { "math": [ "isherwood_luke_truck_status++" ] }
     ],
     "false_effect": [ { "run_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ]
   },

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -1267,7 +1267,7 @@
     "coverage": 90,
     "required_str": -1,
     "flags": [ "CONTAINER", "LIQUIDCONT", "NOITEM", "SEALED", "TRANSPARENT" ],
-    "deconstruct": { "items": [ { "item": "metal_tank", "count": 4 }, { "item": "water_faucet", "count": 1 } ] },
+    "deconstruct": { "items": [ { "item": "metal_tank", "count": 5 }, { "item": "water_faucet", "count": 1 } ] },
     "examine_action": "keg",
     "keg_capacity": 1200,
     "bash": {

diff --git a/data/json/furniture_and_terrain/terrain-traps.json b/data/json/furniture_and_terrain/terrain-traps.json
@@ -140,7 +140,7 @@
             "and": [ { "u_has_items": { "item": "human_sample", "count": 1 } }, { "u_has_mission": "BEM_human_sample_mission" } ]
           },
           "effect": [
-            { "math": [ "u_counter_BEM_BEM_human_sample_reward_owed", "++" ] },
+            { "math": [ "u_counter_BEM_BEM_human_sample_reward_owed++" ] },
             { "u_message": "You prepare the drop as instructed", "popup": true },
             { "u_consume_item": "human_sample", "count": 1 },
             { "finish_mission": "BEM_human_sample_mission", "success": true }

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1610,11 +1610,7 @@
       { "group": "superglue", "prob": 20 },
       [ "firecracker_pack", 5 ],
       [ "firecracker", 5 ],
-      [ "wolfsuit", 3 ],
-      [ "dinosuit", 2 ],
-      [ "sharksuit", 2 ],
-      [ "felinesuit", 3 ],
-      [ "dragonsuit", 2 ],
+      [ "fursuit", 5 ],
       [ "zentai", 5 ],
       { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "condom", "prob": 30, "count": [ 1, 5 ] },
@@ -4161,16 +4157,12 @@
     "items": [
       { "item": "bondage_suit", "prob": 10 },
       { "item": "bodysuit_lycra", "prob": 10 },
-      { "item": "dinosuit", "prob": 5 },
-      { "item": "sharksuit", "prob": 5 },
       { "item": "yukata", "prob": 20 },
       { "item": "leotard", "prob": 40 },
       { "item": "motorbike_armor", "prob": 15 },
       { "item": "suit", "prob": 70 },
       { "item": "touring_suit", "prob": 20 },
-      { "item": "wolfsuit", "prob": 3 },
-      { "item": "felinesuit", "prob": 3 },
-      { "item": "dragonsuit", "prob": 1 },
+      { "item": "fursuit", "prob": 3 },
       { "item": "wool_suit", "prob": 40 },
       { "item": "wool_suit_devil", "prob": 15 },
       { "item": "unitard", "prob": 60 },