[Aftershock] Bounty hunter scenario (#56153)

* Bounty Hunter Scenario * more stuff * First start plus new spell targeting c++ Update needle.json Update data/mods/Aftershock/items/gun/needle.json Update magic.h Co-Authored-By: Dillon Matchett <dillon.matchett@gmail.com> * Add species as a possible spell target * Apply suggestions from code review Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update scenarios.json * Update magic.h * Update magic.cpp * Apply suggestions from code review * Update overmap_map_extras.json * Fixes * more * Update gunship.json * Update gunship.json * Update gunship.json * Update gunship.json * moar work * Update terrain_spaceship.json Update gunship.json * Update dictionary.txt * Gunship terrain * Update terrain_spaceship.json * Update terrain_spaceship.json * Update terrain_spaceship.json * Update terrain_spaceship.json * fixes * fixes * fixes * Update terrain_spaceship.json * Update terrain_spaceship.json * Apply suggestions from code review * Update terrain_spaceship.json * Update terrain_spaceship.json * Update terrain_spaceship.json * Update terrain_spaceship.json * Update gunship.json * sryff * Update gunship.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update gunship.json * Apply suggestions from code review Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Apply suggestions from code review * Update data/mods/Aftershock/maps/overmap_map_extras.json * Apply suggestions from code review * Update data/mods/Aftershock/maps/mapgen/gunship.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Add to scenario blacklist * Update data/mods/Aftershock/spells.json * Update data/mods/Aftershock/spells.json * Update data/mods/Aftershock/spells.json * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review * Apply suggestions from code review * FIXES * Update data/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json * Update data/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json * Update data/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json * Update gunship.json * Update inactiverobot.json --------- Co-authored-by: Dillon Matchett <dillon.matchett@gmail.com> Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com>
CleverRaven · May 10, 2024 · a42711f · a42711f
1 parent c2595d1
commit a42711f
Show file tree

Hide file tree

Showing 20 changed files with 989 additions and 9 deletions.
diff --git a/data/mods/Aftershock/items/ammo/needle.json b/data/mods/Aftershock/items/ammo/needle.json
@@ -0,0 +1,34 @@
+[
+  {
+    "id": "3x35dart",
+    "type": "AMMO",
+    "name": { "str": "GG Stinger 3x35mm flechette" },
+    "description": "The Gibson Gear Stinger flechette is a magnetically propelled dart roughly half the length of the average human thumb.   ",
+    "weight": "7 g",
+    "volume": "105 ml",
+    "price": 1125,
+    "material": [ "steel" ],
+    "symbol": "=",
+    "color": "green",
+    "count": 100,
+    "stack_size": 75,
+    "ammo_type": "3x35",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 20 },
+    "dispersion": 60,
+    "recoil": 40,
+    "effects": [ "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "3x35frangible",
+    "copy-from": "3x35dart",
+    "type": "AMMO",
+    "name": { "str": "GG Splinter 3x35mm flechette" },
+    "description": "Gibson Gear Splinter flechettes are made with magnetic ceramics that shatter upon impact and dig deeply into flesh, as a consequence of this change these rounds lose almost all of their armor piercing.",
+    "weight": "6 g",
+    "price": 1688,
+    "material": [ "ceramic" ],
+    "relative": { "range": -1, "damage": { "damage_type": "bullet", "amount": 14, "armor_penetration": -18 }, "dispersion": 20 },
+    "proportional": { "recoil": 0.9 }
+  }
+]
diff --git a/data/mods/Aftershock/items/ammo_type.json b/data/mods/Aftershock/items/ammo_type.json
@@ -23,6 +23,12 @@
     "name": "solid hydrogen",
     "default": "afs_shydrogen"
   },
+  {
+    "type": "ammunition_type",
+    "id": "3x35",
+    "name": "3x35mm",
+    "default": "3x35dart"
+  },
   {
     "type": "ammunition_type",
     "id": "afs_25mm",

diff --git a/data/mods/Aftershock/items/gun/needle.json b/data/mods/Aftershock/items/gun/needle.json
@@ -0,0 +1,79 @@
+[
+  {
+    "id": "wasp_gun",
+    "looks_like": "fn_p90",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "GG-860 Wasp Rifle" },
+    "description": "This light coilgun fires 3x35mm armor-piercing flechette.  Classified as a support crew weapon that can be stashed in hidden lockers throughout the floors of a ship.  Designed to be fired in short bursts, if the flechettes pierce a ship's hull they leave tiny holes that are easily repaired.",
+    "weight": "1302 g",
+    "volume": "1250 ml",
+    "longest_side": "690 mm",
+    "price": 232000,
+    "to_hit": -2,
+    "melee_damage": { "bash": 12 },
+    "material": [ "steel", "ceramic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "3x35" ],
+    "skill": "smg",
+    "range": 10,
+    "ranged_damage": { "damage_type": "bullet", "amount": 6 },
+    "dispersion": 220,
+    "durability": 9,
+    "barrel_volume": "250 ml",
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 8 ] ],
+    "valid_mod_locations": [
+      [ "accessories", 3 ],
+      [ "barrel", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "stock accessory", 2 ],
+      [ "underbarrel", 1 ]
+    ],
+    "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "3x35_150_mag", "3x35_75_mag" ] } ]
+  },
+  {
+    "id": "3x35_pistol",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "3x35mm automatic 'Wandering Priest' coilpistol" },
+    "description": "An automatic coilgun made entirely of lightweight ceramics, with no moving pieces and if loaded with splinter rounds almost entirely invisible on most security scanners.  No one is sure who manufactures this assassin's tool, but they randomly come onto the back room markets frequented by the unsavory.",
+    "weight": "682 g",
+    "volume": "620 ml",
+    "longest_side": "255 mm",
+    "price": 1200000,
+    "to_hit": -2,
+    "melee_damage": { "bash": 8 },
+    "material": [ "ceramic" ],
+    "symbol": "(",
+    "range": 8,
+    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
+    "color": "dark_gray",
+    "ammo": [ "3x35" ],
+    "skill": "pistol",
+    "dispersion": 280,
+    "durability": 9,
+    "modes": [ [ "BURST", "2 rd.", 3 ], [ "AUTO", "auto", 5 ] ],
+    "valid_mod_locations": [
+      [ "accessories", 3 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "3x35_75_mag", "3x35_150_mag" ] } ]
+  }
+]
diff --git a/data/mods/Aftershock/items/inactiverobot.json b/data/mods/Aftershock/items/inactiverobot.json
@@ -118,6 +118,22 @@
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
     "melee_damage": { "bash": 10, "cut": 6 }
   },
+  {
+    "type": "GENERIC",
+    "id": "broken_scavbot_needle",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "broken Scavbot Skorpion" },
+    "category": "other",
+    "description": "A broken Scavbot Skorpion.  Now that its legs lie broken and immobile, the world seems a little less threatening.  Could be gutted for parts.",
+    "price": "10 USD",
+    "material": [ "steel", "plastic" ],
+    "volume": "12500 ml",
+    "weight": "10500 g",
+    "to_hit": -2,
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
+    "melee_damage": { "bash": 10, "cut": 6 }
+  },
   {
     "type": "GENERIC",
     "id": "broken_tankbot",

diff --git a/data/mods/Aftershock/items/magazine/needle.json b/data/mods/Aftershock/items/magazine/needle.json
@@ -0,0 +1,36 @@
+[
+  {
+    "id": "3x35_150_mag",
+    "looks_like": "fnp90mag",
+    "type": "MAGAZINE",
+    "name": { "str": "3x35mm 150-round magazine" },
+    "description": "A 150-round box magazine for use with 3x35mm flechette coilguns.  Marketed as GGS150.",
+    "weight": "360 g",
+    "volume": "630ml",
+    "price": 15000,
+    "material": [ "ceramic", "plastic" ],
+    "symbol": "#",
+    "color": "dark_gray",
+    "ammo_type": [ "3x35" ],
+    "reload_time": 60,
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3x35": 150 } } ]
+  },
+  {
+    "id": "3x35_75_mag",
+    "looks_like": "fnp90mag",
+    "type": "MAGAZINE",
+    "name": { "str": "3x35mm 75-round magazine" },
+    "description": "A 75-round box magazine for use with 3x35mm flechette coilguns.  Marketed as GGS75.",
+    "weight": "240 g",
+    "volume": "315ml",
+    "price": 12500,
+    "material": [ "ceramic", "plastic" ],
+    "symbol": "#",
+    "color": "dark_gray",
+    "ammo_type": [ "3x35" ],
+    "reload_time": 50,
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3x35": 75 } } ]
+  }
+]