Merge branch 'master' into cannibalism_as_a_vitamin

CleverRaven · Mar 12, 2024 · 334f12b · 334f12b
2 parents d5394f8 + 3ccc5fa
commit 334f12b
Show file tree

Hide file tree

Showing 260 changed files with 16,713 additions and 8,524 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -181,23 +181,31 @@ jobs:
         run: |
           git clone --depth=1 --shallow-submodules --recurse-submodules https://github.com/Fris0uman/CDDA-Soundpacks '${{ github.workspace }}/CDDA-Soundpacks'
           mv '${{ github.workspace }}/CDDA-Soundpacks/sound/CC-Sounds' '${{ github.workspace }}/data/sound'
-      - name: Install dependencies (windows msvc) (0/3)
+      - name: Install dependencies (windows msvc) (0/4)
         if: runner.os == 'Windows'
         uses: lukka/get-cmake@latest
-      - name: Install dependencies (windows msvc) (1/3)
+      - name: Install dependencies (windows msvc) (1/4)
         if: runner.os == 'Windows'
         uses: microsoft/[email protected]
-      - name: Install dependencies (windows msvc) (2/3)
+      - name: Install dependencies (windows msvc) (2/4)
         if: runner.os == 'Windows'
         uses: lukka/run-vcpkg@v11
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
           vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
-      - name: Install dependencies (windows msvc) (3/3)
+      - name: Install dependencies (windows msvc) (3/4)
         if: runner.os == 'Windows'
         run: |
           vcpkg integrate install --vcpkg-root '${{ runner.workspace }}\b\vcpkg'
+      - name: Install dependencies (windows msvc) (4/4)
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          install: >-
+            gettext
+            make
       - name: Install dependencies (windows mxe)
         if: matrix.mxe != 'none' && matrix.artifact != 'windows-objectcreator-x64'
         run: |
@@ -254,7 +262,7 @@ jobs:
           EOL
       - name: Compile translations (windows)
         if: runner.os == 'Windows'
-        shell: bash
+        shell: msys2 {0}
         run: |
           lang/compile_mo.sh all
       - name: Build libbacktrace

diff --git a/Makefile b/Makefile
@@ -956,6 +956,7 @@ SOURCES += $(THIRD_PARTY_SOURCES)
 IMGUI_SOURCES = $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
 
 ifeq ($(SDL), 1)
+	OTHERS += -DIMGUI_DISABLE_OBSOLETE_KEYIO
 	IMGUI_SOURCES += $(IMGUI_DIR)/imgui_impl_sdl2.cpp $(IMGUI_DIR)/imgui_impl_sdlrenderer2.cpp
 else
 	IMGUI_SOURCES += $(IMTUI_DIR)/imtui-impl-ncurses.cpp $(IMTUI_DIR)/imtui-impl-text.cpp

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -1793,7 +1793,7 @@
     "name": { "str": "Titanium Skeletal Bracing" },
     "description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain.  Your carrying capacity is increased by 20 kilograms, or about 44 pounds, and you receive slightly less bashing damage to your arms, legs and torso.",
     "occupied_bodyparts": [ [ "torso", 8 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "leg_l", 3 ], [ "leg_r", 3 ] ],
-    "weight_capacity_bonus": "20 kg",
+    "enchantments": [ { "values": [ { "value": "CARRY_WEIGHT", "add": 20000 } ] } ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "protec": [
       [ "torso", { "bash": 2 } ],

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1589,7 +1589,7 @@
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "50 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-    "components": [ [ [ "2x4", 10 ], [ "wood_panel", 1 ] ], [ [ "nails", 20, "LIST" ] ] ],
+    "components": [ [ [ "2x4", 5 ] ], [ [ "wood_panel", 1 ] ], [ [ "nails", 20, "LIST" ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "t_ponywall"
   },
@@ -1897,7 +1897,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "30 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
     "pre_terrain": "t_brick_wall",
     "post_terrain": "t_embrasure_brick"
   },
@@ -1926,7 +1926,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "30 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
     "pre_terrain": "t_adobe_brick_wall",
     "post_terrain": "t_embrasure_adobe_brick"
   },
@@ -4768,8 +4768,8 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ],
-      [ [ "rope_natural", 1, "LIST" ] ]
+      [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ],
+      [ [ "tool_rope_long", 1, "LIST" ] ]
     ],
     "components": [ [ [ "2x4", 18 ] ], [ [ "wood_beam", 2 ] ], [ [ "nails", 90, "LIST" ], [ "nuts_bolts", 90 ] ] ],
     "byproducts": [ { "group": "digging_soil_loam_50L", "count": 40 } ],
@@ -4792,8 +4792,8 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
-      [ [ "rope_natural", 1, "LIST" ] ]
+      [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
+      [ [ "tool_rope_long", 1, "LIST" ] ]
     ],
     "components": [ [ [ "2x4", 18 ] ], [ [ "wood_beam", 2 ] ], [ [ "nails", 90, "LIST" ], [ "nuts_bolts", 90 ] ] ],
     "byproducts": [ { "group": "mining_rock" } ],
@@ -4809,7 +4809,7 @@
     "category": "DIG",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "70 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ] ] ],
     "activity_level": "EXTRA_EXERCISE",
     "pre_terrain": "t_wall_resin_cage",
     "post_terrain": "t_floor_resin",
@@ -4884,7 +4884,8 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
+      [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
+      [ [ "tool_rope_long", 1, "LIST" ] ],
       [
         "miner_hat",
         "hat_hard",
@@ -4894,8 +4895,7 @@
         "helmet_riot",
         "tac_helmet",
         "miner_hat_on"
-      ],
-      [ [ "rope_natural", 1, "LIST" ] ]
+      ]
     ],
     "//": "Helmets are essential because you're digging up and things may fall on you.",
     "components": [ [ [ "2x4", 18 ] ], [ [ "wood_beam", 2 ] ], [ [ "nails", 90, "LIST" ], [ "nuts_bolts", 90 ] ] ],
@@ -6906,7 +6906,7 @@
     "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
     "required_skills": [ [ "survival", 3 ] ],
     "time": "300 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ] ],
     "byproducts": [ { "group": "mining_rock" } ],
     "pre_terrain": "t_rock_floor",
     "post_terrain": "t_pit",
@@ -7748,7 +7748,7 @@
     "components": [ [ [ "2x4", 4 ] ], [ [ "nails", 16, "LIST" ] ] ],
     "pre_terrain": "t_rock_roof",
     "post_terrain": "t_skylight_frame",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ]
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ]
   },
   {
     "type": "construction",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -2035,47 +2035,26 @@
     "id": "boomered",
     "name": [ "Boomered" ],
     "desc": [ "Your vision is obscured by a disgusting splatter of bile." ],
-    "apply_message": "Bile gets in your eyes!",
+    "apply_message": "You're covered in bile!",
     "rating": "bad",
-    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
-    "base_mods": {
-      "per_mod": [ -3, -3 ],
-      "vomit_chance": [ 500, 0 ],
-      "health_chance": [ 1 ],
-      "health_min": [ -1 ],
-      "health_chance_bot": [ 300, 0 ]
-    },
+    "base_mods": { "per_mod": [ -3 ], "vomit_chance": [ 500 ] },
     "max_duration": "30 s",
     "limb_score_mods": [
       { "limb_score": "vision", "modifier": 0.1 },
       { "limb_score": "night_vis", "modifier": 0.0 },
       { "limb_score": "reaction", "modifier": 0.2 }
     ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD", "BILE_AFFLICTED" ]
-  },
-  {
-    "type": "effect_type",
-    "id": "bile",
-    "name": [ "Bile Splashed" ],
-    "desc": [ "You're splattered with a greasy layer of liquified putrescence." ],
-    "apply_message": "You're covered in bile!",
-    "rating": "bad",
-    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
-    "base_mods": { "vomit_chance": [ 500, 0 ], "health_chance": [ 1 ], "health_min": [ -1 ], "health_chance_bot": [ 300, 0 ] },
-    "max_duration": "30 s",
-    "flags": [ "BILE_AFFLICTED" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
   },
   {
     "type": "effect_type",
     "id": "glowing",
     "name": [ "Glowing" ],
     "desc": [ "You are covered in glowing goo!" ],
-    "max_duration": "30 s",
+    "max_duration": "6 m",
     "apply_message": "You're covered in a glowing goo!",
     "rating": "bad",
-    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
-    "base_mods": { "vomit_chance": [ 500, 0 ], "health_chance": [ 1 ], "health_min": [ -1 ], "health_chance_bot": [ 300, 0 ] },
-    "flags": [ "BILE_AFFLICTED" ]
+    "base_mods": { "vomit_chance": [ 500 ] }
   },
   {
     "type": "effect_type",
@@ -3054,74 +3033,6 @@
     "max_duration": 14515200,
     "dur_add_perc": 50
   },
-  {
-    "//": "For player, indistinguishable from pre_conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
-    "type": "effect_type",
-    "id": "pre_conjunctivitis_viral",
-    "show_in_info": false,
-    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
-    "blood_analysis_description": "Viral Infection",
-    "max_duration": "71 h"
-  },
-  {
-    "//": "For player, indistinguishable from pre_conjunctivitis_viral, but separate here to allow for separate resistances from antibiotics.",
-    "type": "effect_type",
-    "id": "pre_conjunctivitis_bacterial",
-    "show_in_info": false,
-    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
-    "blood_analysis_description": "Bacterial Infection",
-    "max_duration": "71 h"
-  },
-  {
-    "//": "For player, indistinguishable from conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
-    "type": "effect_type",
-    "id": "conjunctivitis_viral",
-    "name": [ "Conjunctivitis" ],
-    "desc": [
-      "Commonly known as pinkeye, this minor infection can be treated with antihistamines.  If it's bacterial, antibiotics may help, but you can't tell without a lab analysis."
-    ],
-    "apply_memorial_log": "Got pinkeye.",
-    "remove_memorial_log": "Got over a pinkeye infection.",
-    "apply_message": "Your itchy eye leaks a filmy discharge.",
-    "rating": "bad",
-    "resist_effects": [ "took_antihistamine", "took_flumed" ],
-    "resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
-    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
-    "int_dur_factor": "50 m",
-    "base_mods": { "int_mod": [ -1 ], "per_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
-    "limb_score_mods": [
-      { "limb_score": "vision", "modifier": 0.8, "resist_modifier": 0.9 },
-      { "limb_score": "night_vis", "modifier": 0.8, "resist_modifier": 0.9 }
-    ],
-    "miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD" ],
-    "blood_analysis_description": "Viral Infection"
-  },
-  {
-    "//": "For player, indistinguishable from conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
-    "type": "effect_type",
-    "id": "conjunctivitis_bacterial",
-    "name": [ "Conjunctivitis" ],
-    "desc": [
-      "Commonly known as pinkeye, this minor infection can be treated with antihistamines.  If it's bacterial, antibiotics may help, but you can't tell without a lab analysis."
-    ],
-    "apply_memorial_log": "Got pinkeye.",
-    "remove_memorial_log": "Got over a pinkeye infection.",
-    "apply_message": "Your itchy eye leaks a filmy discharge.",
-    "rating": "bad",
-    "resist_effects": [ "took_antihistamine", "took_flumed" ],
-    "resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
-    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
-    "int_dur_factor": "50 m",
-    "base_mods": { "int_mod": [ -1 ], "per_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
-    "miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
-    "limb_score_mods": [
-      { "limb_score": "vision", "modifier": 0.8, "resist_modifier": 0.9 },
-      { "limb_score": "night_vis", "modifier": 0.8, "resist_modifier": 0.9 }
-    ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD" ],
-    "blood_analysis_description": "Bacterial Infection"
-  },
   {
     "type": "effect_type",
     "id": "prophylactic_antivenom",
@@ -3169,10 +3080,6 @@
       "rat_bite_fever",
       "infected",
       "asthma",
-      "pre_conjunctivitis_viral",
-      "pre_conjunctivitis_bacterial",
-      "conjunctivitis_viral",
-      "conjunctivitis_bacterial",
       "common_cold",
       "flu"
     ],
@@ -4792,21 +4699,6 @@
       }
     ]
   },
-  {
-    "id": "slippery_terrain",
-    "type": "effect_type",
-    "max_duration": "1 s",
-    "name": [ "Slick Surface", "Slippery Terrain", "Dangerously Slippery" ],
-    "desc": [
-      "There's a slippery surface here, running may be a bad idea.",
-      "It's quite slippery, it may not be safe to stand here.",
-      "This area is extremely slippery."
-    ],
-    "rating": "bad",
-    "show_intensity": true,
-    "resist_traits": [ "GASTROPOD_BALANCE" ],
-    "show_in_info": true
-  },
   {
     "type": "effect_type",
     "id": "hay_fever",

diff --git a/data/json/effects_on_condition/effects_eocs.json b/data/json/effects_on_condition/effects_eocs.json
@@ -63,47 +63,5 @@
       }
     ],
     "false_effect": [ { "u_lose_morale": "morale_asocial_dissatisfied" } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "bile_in_eyes",
-    "recurrence": [ "1 seconds", "1 seconds" ],
-    "condition": {
-      "and": [
-        { "or": [ { "u_has_effect": "bile", "bodypart": "eyes" }, { "u_has_effect": "glowing", "bodypart": "eyes" } ] },
-        {
-          "and": [
-            { "not": { "u_has_trait": "COMPOUND_EYES" } },
-            { "not": { "u_has_trait": "PER_SLIME_OK" } },
-            { "not": { "u_has_bionics": "bio_armor_eyes" } }
-          ]
-        }
-      ]
-    },
-    "effect": [
-      { "u_add_effect": "boomered", "target_part": "eyes", "duration": "9 seconds" },
-      { "u_lose_effect": "bile", "target_part": "eyes" },
-      { "u_lose_effect": "glowing", "target_part": "eyes" }
-    ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "bile_stink",
-    "recurrence": [ "1 seconds", "1 seconds" ],
-    "condition": {
-      "and": [
-        { "u_has_flag": "BILE_AFFLICTED" },
-        { "not": { "u_has_trait": "BILE_STINK" } },
-        { "not": { "u_has_trait": "CHLOROMORPH" } }
-      ]
-    },
-    "effect": [ { "u_add_trait": "BILE_STINK" } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "bile_unstink",
-    "recurrence": [ "3 minutes", "10 minutes" ],
-    "condition": { "not": { "u_has_flag": "BILE_AFFLICTED" } },
-    "effect": [ { "u_lose_trait": "BILE_STINK" } ]
   }
 ]