Merge pull request #74124 from John-Candlebury/afs-mod-maintenance

Aftershock: Low priority maintenance.
CleverRaven · May 28, 2024 · ec621a8 · ec621a8
2 parents ef5af3b + 2c32738
commit ec621a8
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 66 deletions.
diff --git a/data/mods/Aftershock/EOC/drug_eoc.json b/data/mods/Aftershock/EOC/drug_eoc.json
@@ -11,7 +11,7 @@
         { "u_has_effect": "afs_medigel_eff", "bodypart": { "context_val": "bodypart" } }
       ]
     },
-    "effect": [ { "u_lose_effect": "afs_medigel_eff" } ]
+    "effect": [ { "u_lose_effect": "afs_medigel_eff", "target_part": { "context_val": "bodypart" } } ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/mods/Aftershock/damage_types.json b/data/mods/Aftershock/damage_types.json
@@ -17,11 +17,36 @@
     "melee_combat_info": { "order": 407, "show_type": true },
     "ablative_info": { "order": 307, "show_type": true }
   },
+  {
+    "id": "afs_heat_melee",
+    "type": "damage_type",
+    "melee_only": true,
+    "physical": true,
+    "edged": true,
+    "magic_color": "red",
+    "name": { "ctxt": "damage_type", "str": "heat" },
+    "skill": "cutting",
+    "mon_difficulty": true,
+    "derived_from": [ "heat", 1 ],
+    "immune_flags": { "character": [ "CUT_IMMUNE" ] }
+  },
+  {
+    "id": "afs_heat_melee",
+    "type": "damage_info_order",
+    "info_display": "detailed",
+    "verb": { "ctxt": "damage_type", "str": "melting" },
+    "bionic_info": { "order": 200, "show_type": true },
+    "protection_info": { "order": 200, "show_type": false },
+    "pet_prot_info": { "order": 200, "show_type": false },
+    "melee_combat_info": { "order": 200, "show_type": true },
+    "ablative_info": { "order": 200, "show_type": false }
+  },
   {
     "id": "afs_toxin_pierce",
     "type": "damage_type",
     "physical": true,
     "edged": true,
+    "melee_only": true,
     "magic_color": "light_green",
     "name": "toxic pierce",
     "skill": "stabbing",
@@ -54,7 +79,7 @@
   {
     "id": "afs_toxin_pierce",
     "type": "damage_info_order",
-    "info_display": "basic",
+    "info_display": "detailed",
     "verb": "toxic piercing",
     "bionic_info": { "order": 407, "show_type": false },
     "protection_info": { "order": 307, "show_type": false },

diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json
@@ -17,15 +17,6 @@
     "condition": { "math": [ "u_flag_motion_sensor_afs_motion_sensor_ping", ">=", "1" ] },
     "values": [ { "value": "MOTION_VISION_RANGE", "add": 24 } ]
   },
-  {
-    "type": "enchantment",
-    "id": "afs_ench_esab",
-    "has": "WIELD",
-    "condition": "ACTIVE",
-    "name": { "str": "Super Heated Blade" },
-    "description": "The energy radiating from this weapon cuts and burns with ease.",
-    "values": [ { "value": "ITEM_DAMAGE_CUT", "add": 18 }, { "value": "ITEM_DAMAGE_HEAT", "add": 35 } ]
-  },
   {
     "type": "enchantment",
     "id": "afs_ench_exo_big_carry",

diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json
@@ -1,4 +1,16 @@
 [
+  {
+    "type": "MIGRATION",
+    "//": "remove after 0.J",
+    "id": "afs_cam_spy",
+    "replace": "afs_motion_sensor"
+  },
+  {
+    "type": "MIGRATION",
+    "//": "remove after 0.J",
+    "id": "afs_cam_spy_on",
+    "replace": "afs_motion_sensor"
+  },
   {
     "type": "MIGRATION",
     "//": "remove after 0.I",

diff --git a/data/mods/Aftershock/items/radio_tools.json b/data/mods/Aftershock/items/radio_tools.json
@@ -6,51 +6,5 @@
     "name": { "str": "radio detonator" },
     "price": "15 USD",
     "description": "A standard pattern detonator fabricated for military and industrial use.  This is an advanced model capable of controlling explosive drones alongside simpler devices."
-  },
-  {
-    "id": "afs_cam_spy",
-    "copy-from": "bot_bloodhound_drone",
-    "type": "TOOL",
-    "name": { "str": "cam-spy rover" },
-    "description": "A small wheeled drone, nimble and almost undetectable it mounts a robotic eye for espionage work.  Once turned on, a remote controller will let you use it as a mobile camera.",
-    "symbol": "e",
-    "ammo": [ "battery" ],
-    "charges_per_use": 1,
-    "proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 },
-    "use_action": {
-      "target": "afs_cam_spy_on",
-      "menu_text": "Activate cam-spy",
-      "msg": "You activate the cam-spy rover.",
-      "active": true,
-      "type": "transform"
-    },
-    "flags": [ "RADIO_CONTAINER" ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "holster": true,
-        "rigid": true,
-        "max_contains_volume": "2 L",
-        "max_contains_weight": "2 kg",
-        "item_restriction": [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ]
-      }
-    ]
-  },
-  {
-    "id": "afs_cam_spy_on",
-    "copy-from": "afs_cam_spy",
-    "type": "TOOL",
-    "name": { "str": "cam-spy rover (on)", "str_pl": "cam-spy rovers (on)" },
-    "description": "This cam-spy rover is on, and continuously transmitting a video-feed of its immediate surroundings.  Use a remote control to drive it around.",
-    "turns_per_charge": 5,
-    "revert_to": "afs_cam_spy",
-    "use_action": {
-      "target": "afs_cam_spy",
-      "menu_text": "Deactivate cam-spy",
-      "msg": "You deactivate the cam-spy.",
-      "type": "transform"
-    },
-    "emits": [ "emit_clairvoyant" ],
-    "flags": [ "LIGHT_15", "RADIO_CONTAINER", "RADIOCAR" ]
   }
 ]
diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json
@@ -10,7 +10,6 @@
     "price": "1 kUSD",
     "price_postapoc": "20 USD",
     "material": [ "superalloy", "qt_steel" ],
-    "relic_data": { "passive_effects": [ { "id": "afs_ench_esab" } ] },
     "symbol": "[",
     "looks_like": "PR24-extended",
     "color": "light_gray",
@@ -59,7 +58,6 @@
     "color": "light_blue",
     "looks_like": "arming_sword",
     "turns_per_charge": 4,
-    "relic_data": { "passive_effects": [ { "id": "afs_ench_esab" } ] },
     "to_hit": 2,
     "flags": [ "DURABLE_MELEE" ],
     "techniques": [ "WBLOCK_2" ],
@@ -70,7 +68,7 @@
       "target": "afs_energy_saber_off",
       "msg": "The blade stops humming, and its edge dissipates into a smooth curve as it cools."
     },
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 8, "cut": 18, "afs_heat_melee": 35 }
   },
   {
     "id": "afs_hardlight_longbow",

diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json
@@ -446,12 +446,6 @@
           { "item": "rollmat" },
           { "item": "e_tool" },
           { "item": "knife_hunting" },
-          {
-            "item": "medium_plus_battery_cell",
-            "ammo-item": "battery",
-            "charges": 600,
-            "container-item": "multi_cooker"
-          },
           {
             "item": "m2010",
             "ammo-item": "300_winmag",

diff --git a/src/melee.cpp b/src/melee.cpp
@@ -2575,6 +2575,8 @@ std::string melee_message( const ma_technique &tec, Character &p,
         message = npc ? _( npc_cut[index] ) : _( player_cut[index] );
     } else if( dominant_type.first == damage_bash ) {
         message = npc ? _( npc_bash[index] ) : _( player_bash[index] );
+    } else {
+        message = npc ? _( "<npcname> hits %s" ) : _( "You hit %s" );
     }
     if( ddi.wp_hit.empty() ) {
         return message;