Merge branch 'master' into Hard-steel-to-tempered

CleverRaven · Mar 1, 2022 · b079dfa · b079dfa
2 parents 0f5ca38 + 2c922b0
commit b079dfa
Show file tree

Hide file tree

Showing 296 changed files with 566,522 additions and 329,301 deletions.
diff --git a/.github/workflows/assign_mission_target_needs_om_special.yml b/.github/workflows/assign_mission_target_needs_om_special.yml
@@ -0,0 +1,12 @@
+name: Detect missions that are missing .start.assign_mission_target.om_special
+
+on: pull_request
+
+jobs:
+  run-the-tool:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+    - run: ./tools/json_tools/assign_mission_target_needs_om_special.bash 2>&1
diff --git a/Makefile b/Makefile
@@ -1205,14 +1205,14 @@ astyle-all: $(ASTYLE_SOURCES)
 
 # Test whether the system has a version of astyle that supports --dry-run
 ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo)
-  ASTYLE_CHECK=$(shell $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q --ascii $(ASTYLE_SOURCES))
+  ASTYLE_CHECK=$(shell $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q --ascii $(ASTYLE_SOURCES) | sed -E "s/Formatted[[:space:]]+(.*)/Needs formatting: \1\\\n/" | tr -d '\n')
 endif
 
 astyle-check:
 ifdef ASTYLE_CHECK
 	$(info $(ASTYLE_BINARY) -V: $(shell $(ASTYLE_BINARY) -V))
-	@if [ "$(findstring Formatted,$(ASTYLE_CHECK))" = "" ]; then echo "no astyle regressions";\
-        else printf "astyle regressions found.\n$(ASTYLE_CHECK)\n" && false; fi
+	@if [ "$(findstring Needs formatting:,$(ASTYLE_CHECK))" = "" ]; then echo "no astyle regressions";\
+        else printf "astyle regressions found.\n$(ASTYLE_CHECK)" && false; fi
 else
 	@echo Cannot run an astyle check, your system either does not have astyle, or it is too old.
 endif

diff --git a/build-scripts/get_all_mods.py b/build-scripts/get_all_mods.py
@@ -41,7 +41,7 @@ def print_modlist(modlist, master_list):
 total_conversions = set()
 
 for info in glob.glob('data/mods/*/modinfo.json'):
-    mod_info = json.load(open(info))
+    mod_info = json.load(open(info, encoding='utf-8'))
     for e in mod_info:
         if(e["type"] == "MOD_INFO" and
                 ("obsolete" not in e or not e["obsolete"])):

diff --git a/data/json/body_parts.json b/data/json/body_parts.json
@@ -26,7 +26,7 @@
     "fire_warmth_bonus": 150,
     "squeamish_penalty": 6,
     "base_hp": 60,
-    "drench_capacity": 40,
+    "drench_capacity": 4000,
     "smash_message": "You smash the %s with a powerful shoulder-check.",
     "bionic_slots": 80,
     "sub_parts": [ "torso_upper", "torso_neck", "torso_lower", "torso_hanging_front", "torso_hanging_back" ]
@@ -57,11 +57,12 @@
     "fire_warmth_bonus": 150,
     "squeamish_penalty": 7,
     "base_hp": 60,
-    "drench_capacity": 7,
+    "drench_capacity": 700,
     "smash_message": "You smash the %s with a firm headbutt.",
     "smash_efficiency": 0.25,
     "bionic_slots": 18,
-    "flags": [ "LIMB_UPPER" ]
+    "flags": [ "LIMB_UPPER" ],
+    "sub_parts": [ "head_forehead", "head_crown", "head_nape", "head_throat", "head_ear_r", "head_ear_l" ]
   },
   {
     "id": "eyes",
@@ -83,11 +84,12 @@
     "stylish_bonus": 2,
     "squeamish_penalty": 8,
     "base_hp": 60,
-    "drench_capacity": 1,
+    "drench_capacity": 100,
     "flags": [ "IGNORE_TEMP", "LIMB_UPPER" ],
     "smash_message": "You use your flippin' face to smash the %s.  EXTREME.",
     "smash_efficiency": 0.25,
-    "bionic_slots": 4
+    "bionic_slots": 4,
+    "sub_parts": [ "eyes_left", "eyes_right" ]
   },
   {
     "id": "mouth",
@@ -110,11 +112,12 @@
     "cold_morale_mod": 2,
     "squeamish_penalty": 9,
     "base_hp": 60,
-    "drench_capacity": 1,
+    "drench_capacity": 100,
     "smash_message": "You use your flippin' face to smash the %s.  EXTREME.",
     "smash_efficiency": 0.25,
     "bionic_slots": 4,
-    "flags": [ "LIMB_UPPER" ]
+    "flags": [ "LIMB_UPPER" ],
+    "sub_parts": [ "mouth_lips", "mouth_nose", "mouth_cheeks" ]
   },
   {
     "id": "arm_l",
@@ -144,7 +147,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
-    "drench_capacity": 10,
+    "drench_capacity": 1000,
     "smash_message": "You elbow-smash the %s.",
     "bionic_slots": 20,
     "sub_parts": [ "arm_shoulder_l", "arm_upper_l", "arm_elbow_l", "arm_lower_l" ]
@@ -176,7 +179,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
-    "drench_capacity": 10,
+    "drench_capacity": 1000,
     "smash_message": "You elbow-smash the %s.",
     "bionic_slots": 20,
     "sub_parts": [ "arm_shoulder_r", "arm_upper_r", "arm_elbow_r", "arm_lower_r" ]
@@ -205,7 +208,7 @@
     "fire_warmth_bonus": 1500,
     "squeamish_penalty": 3,
     "base_hp": 60,
-    "drench_capacity": 3,
+    "drench_capacity": 300,
     "smash_message": "You smash the %s with your fist.",
     "bionic_slots": 5,
     "sub_parts": [ "hand_wrist_l", "hand_palm_l", "hand_back_l", "hand_fingers_l" ]
@@ -234,7 +237,7 @@
     "fire_warmth_bonus": 1500,
     "squeamish_penalty": 3,
     "base_hp": 60,
-    "drench_capacity": 3,
+    "drench_capacity": 300,
     "smash_message": "You smash the %s with your fist.",
     "bionic_slots": 5,
     "sub_parts": [ "hand_wrist_r", "hand_palm_r", "hand_back_r", "hand_fingers_r" ]
@@ -268,7 +271,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
-    "drench_capacity": 11,
+    "drench_capacity": 1100,
     "smash_message": "You bring your knee down on the %s, smashing it.",
     "bionic_slots": 30,
     "sub_parts": [ "leg_hip_l", "leg_upper_l", "leg_knee_l", "leg_lower_l" ],
@@ -303,7 +306,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
-    "drench_capacity": 11,
+    "drench_capacity": 1100,
     "smash_message": "You bring your knee down on the %s, smashing it.",
     "bionic_slots": 30,
     "sub_parts": [ "leg_hip_r", "leg_upper_r", "leg_knee_r", "leg_lower_r" ],
@@ -334,9 +337,10 @@
     "fire_warmth_bonus": 300,
     "squeamish_penalty": 3,
     "base_hp": 60,
-    "drench_capacity": 3,
+    "drench_capacity": 300,
     "smash_message": "You kick down the %s, smashing it.",
     "bionic_slots": 7,
+    "sub_parts": [ "foot_arch_l", "foot_toes_l", "foot_ankle_l", "foot_heel_l" ],
     "flags": [ "LIMB_LOWER" ]
   },
   {
@@ -364,9 +368,10 @@
     "fire_warmth_bonus": 300,
     "squeamish_penalty": 3,
     "base_hp": 60,
-    "drench_capacity": 3,
+    "drench_capacity": 300,
     "smash_message": "You kick down the %s, smashing it.",
     "bionic_slots": 7,
+    "sub_parts": [ "foot_arch_r", "foot_toes_r", "foot_ankle_r", "foot_heel_r" ],
     "flags": [ "LIMB_LOWER" ]
   },
   {
@@ -697,5 +702,177 @@
     "opposite": "hand_fingers_r",
     "name_multiple": "fingers",
     "name": "left fingers"
+  },
+  {
+    "id": "eyes_left",
+    "type": "sub_body_part",
+    "max_coverage": 50,
+    "parent": "eyes",
+    "side": 1,
+    "opposite": "eyes_right",
+    "name_multiple": "eyes",
+    "name": "left eye"
+  },
+  {
+    "id": "eyes_right",
+    "type": "sub_body_part",
+    "max_coverage": 50,
+    "parent": "eyes",
+    "side": 2,
+    "opposite": "eyes_left",
+    "name_multiple": "eyes",
+    "name": "right eye"
+  },
+  {
+    "id": "mouth_lips",
+    "type": "sub_body_part",
+    "max_coverage": 30,
+    "parent": "mouth",
+    "side": 0,
+    "name": "lips"
+  },
+  {
+    "id": "mouth_nose",
+    "type": "sub_body_part",
+    "max_coverage": 30,
+    "parent": "mouth",
+    "side": 0,
+    "name": "nose"
+  },
+  {
+    "id": "mouth_cheeks",
+    "type": "sub_body_part",
+    "max_coverage": 40,
+    "parent": "mouth",
+    "side": 0,
+    "name": "cheeks"
+  },
+  {
+    "id": "foot_arch_l",
+    "type": "sub_body_part",
+    "max_coverage": 50,
+    "parent": "foot_l",
+    "side": 1,
+    "opposite": "foot_arch_r",
+    "name_multiple": "foot arches",
+    "name": "left foot arch"
+  },
+  {
+    "id": "foot_toes_l",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "foot_l",
+    "side": 1,
+    "opposite": "foot_toes_r",
+    "name_multiple": "toes",
+    "name": "left toes"
+  },
+  {
+    "id": "foot_ankle_l",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "foot_l",
+    "side": 1,
+    "opposite": "foot_ankle_r",
+    "name_multiple": "ankles",
+    "name": "left ankle"
+  },
+  {
+    "id": "foot_heel_l",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "foot_l",
+    "side": 1,
+    "opposite": "foot_heel_r",
+    "name_multiple": "heels",
+    "name": "left heel"
+  },
+  {
+    "id": "foot_arch_r",
+    "type": "sub_body_part",
+    "max_coverage": 50,
+    "parent": "foot_r",
+    "side": 1,
+    "opposite": "foot_arch_l",
+    "name_multiple": "foot arches",
+    "name": "left foot arch"
+  },
+  {
+    "id": "foot_toes_r",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "foot_r",
+    "side": 1,
+    "opposite": "foot_toes_l",
+    "name_multiple": "toes",
+    "name": "left toes"
+  },
+  {
+    "id": "foot_ankle_r",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "foot_r",
+    "side": 1,
+    "opposite": "foot_ankle_l",
+    "name_multiple": "ankles",
+    "name": "left ankle"
+  },
+  {
+    "id": "foot_heel_r",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "foot_r",
+    "side": 1,
+    "opposite": "foot_heel_l",
+    "name_multiple": "heels",
+    "name": "left heel"
+  },
+  {
+    "id": "head_forehead",
+    "type": "sub_body_part",
+    "max_coverage": 15,
+    "parent": "head",
+    "side": 0,
+    "name": "forehead"
+  },
+  {
+    "id": "head_crown",
+    "type": "sub_body_part",
+    "max_coverage": 25,
+    "parent": "head",
+    "side": 0,
+    "name": "crown"
+  },
+  {
+    "id": "head_nape",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "head",
+    "side": 0,
+    "name": "nape"
+  },
+  {
+    "id": "head_throat",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "head",
+    "side": 0,
+    "name": "throat"
+  },
+  {
+    "id": "head_ear_r",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "head",
+    "side": 2,
+    "name": "right ear"
+  },
+  {
+    "id": "head_ear_l",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "head",
+    "side": 1,
+    "name": "left ear"
   }
 ]
diff --git a/data/json/character_modifiers.json b/data/json/character_modifiers.json
@@ -18,7 +18,7 @@
     "id": "aim_speed_mod",
     "description": "Gun aim speed modifier <color_dark_gray>(Manipulation)</color>",
     "mod_type": "x",
-    "value": { "limb_score": "manip" }
+    "value": { "limb_score": "manip", "limb_type": "hand" }
   },
   {
     "type": "character_mod",
@@ -46,21 +46,21 @@
     "id": "reloading_move_mod",
     "description": "Reloading movement point cost <color_dark_gray>(Manipulation)</color>",
     "mod_type": "x",
-    "value": { "limb_score": "manip", "max": "max_move_cost", "nominator": 1.0 }
+    "value": { "limb_score": "manip", "limb_type": "hand", "max": "max_move_cost", "nominator": 1.0 }
   },
   {
     "type": "character_mod",
     "id": "thrown_dex_mod",
     "description": "Dexterity when throwing items <color_dark_gray>(Manipulation)</color>",
     "mod_type": "x",
-    "value": { "limb_score": "manip" }
+    "value": { "limb_score": "manip", "limb_type": "hand" }
   },
   {
     "type": "character_mod",
     "id": "ranged_dispersion_manip_mod",
     "description": "Hand dispersion when using ranged attacks <color_dark_gray>(Manipulation)</color>",
     "mod_type": "+",
-    "value": { "limb_score": "manip", "max": 1000.0, "nominator": 22.8, "subtract": 22.8 }
+    "value": { "limb_score": "manip", "limb_type": "hand", "max": 1000.0, "nominator": 22.8, "subtract": 22.8 }
   },
   {
     "type": "character_mod",