Merge pull request #77399 from Maleclypse/XE-Feral-Agent-Variety

[ Xedra Evolved ] Feral Agent Variety
CleverRaven · Nov 5, 2024 · cbe022d · cbe022d
2 parents 1fcc8bd + 0ecd672
commit cbe022d
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 10 deletions.
diff --git a/data/mods/Xedra_Evolved/itemgroups/monster_drops.json b/data/mods/Xedra_Evolved/itemgroups/monster_drops.json
@@ -412,8 +412,30 @@
       { "group": "clothing_glasses", "prob": 5 },
       { "group": "clothing_watch", "prob": 5 },
       { "group": "wallets", "damage": [ 1, 4 ] },
-      { "item": "fn57mag", "prob": 50, "ammo-item": "57mm_ss", "charges": [ 0, 10 ] },
-      { "item": "fn57mag", "prob": 50, "ammo-item": "57mm_ss", "charges": [ 0, 15 ] }
+      { "item": "fn57mag", "prob": 50, "ammo-item": "57mm", "charges": [ 0, 10 ] },
+      { "item": "fn57mag", "prob": 50, "ammo-item": "57mm", "charges": [ 0, 15 ] }
+    ]
+  },
+  {
+    "id": "feral_agent_p90_death_drops",
+    "type": "item_group",
+    "subtype": "collection",
+    "magazine": 100,
+    "ammo": 20,
+    "entries": [
+      { "item": "fn_p90", "prob": 100, "damage": [ 2, 4 ] },
+      { "group": "security_armor", "prob": 30, "damage": [ 0, 2 ] },
+      { "group": "security_gear", "prob": 50, "damage": [ 0, 2 ] },
+      { "group": "cop_gloves", "prob": 30, "damage": [ 1, 4 ] },
+      { "item": "pants", "damage": [ 1, 4 ] },
+      { "item": "dress_shoes", "prob": 70, "damage": [ 1, 4 ] },
+      { "group": "security_torso", "prob": 70, "damage": [ 1, 4 ] },
+      { "group": "underwear", "damage": [ 1, 4 ] },
+      { "group": "clothing_glasses", "prob": 5 },
+      { "group": "clothing_watch", "prob": 5 },
+      { "group": "wallets", "damage": [ 1, 4 ] },
+      { "item": "fnp90mag", "prob": 50, "ammo-item": "57mm", "charges": [ 0, 50 ] },
+      { "item": "fnp90mag", "prob": 50, "ammo-item": "57mm", "charges": [ 0, 50 ] }
     ]
   },
   {

diff --git a/data/mods/Xedra_Evolved/mapgen/xedra_field_office.json b/data/mods/Xedra_Evolved/mapgen/xedra_field_office.json
@@ -701,7 +701,7 @@
         { "vehicle": "car", "x": 40, "y": 40, "rotation": 90, "chance": 25 },
         { "vehicle": "beetle", "x": 28, "y": 40, "rotation": 270, "chance": 25 }
       ],
-      "place_monsters": [ { "monster": "GROUP_FERAL_AGENTS", "x": [ 5, 19 ], "y": [ 5, 19 ], "density": 0.4 } ],
+      "place_monsters": [ { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 5, 19 ], "y": [ 5, 19 ], "density": 0.4 } ],
       "palettes": [ "field_office_palette" ]
     }
   },
@@ -763,7 +763,13 @@
       ],
       "palettes": [ "field_office_palette" ],
       "place_monsters": [
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 10, 23 ], "y": [ 10, 23 ], "chance": 2, "repeat": [ 1, 4 ] },
+        {
+          "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE",
+          "x": [ 10, 23 ],
+          "y": [ 10, 23 ],
+          "chance": 2,
+          "repeat": [ 1, 4 ]
+        },
         { "monster": "GROUP_Exodii_Jotunn", "x": [ 26, 38 ], "y": [ 26, 38 ], "chance": 2, "repeat": [ 1, 4 ] }
       ],
       "computers": {
@@ -1082,10 +1088,10 @@
         }
       ],
       "place_monsters": [
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 4, 23 ], "y": [ 5, 23 ], "density": 0.4 },
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 24, 43 ], "y": [ 29, 47 ], "density": 0.4 },
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 4, 23 ], "y": [ 0, 18 ], "density": 0.4 },
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 24, 43 ], "y": [ 24, 42 ], "density": 0.4 },
+        { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 4, 23 ], "y": [ 5, 23 ], "density": 0.4 },
+        { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 24, 43 ], "y": [ 29, 47 ], "density": 0.4 },
+        { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 4, 23 ], "y": [ 0, 18 ], "density": 0.4 },
+        { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 24, 43 ], "y": [ 24, 42 ], "density": 0.4 },
         { "monster": "GROUP_Exodii_Jotunn", "x": [ 4, 23 ], "y": [ 5, 23 ], "density": 0.2 },
         { "monster": "GROUP_Exodii_Jotunn", "x": [ 24, 43 ], "y": [ 29, 47 ], "density": 0.2 },
         { "monster": "GROUP_Exodii_Jotunn", "x": [ 4, 23 ], "y": [ 0, 18 ], "density": 0.2 },
@@ -1191,8 +1197,8 @@
         }
       ],
       "place_monsters": [
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 5, 23 ], "y": [ 6, 23 ], "density": 0.3 },
-        { "monster": "GROUP_FERAL_AGENTS", "x": [ 5, 23 ], "y": [ 6, 18 ], "density": 0.3 }
+        { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 5, 23 ], "y": [ 6, 23 ], "density": 0.3 },
+        { "monster": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE", "x": [ 5, 23 ], "y": [ 6, 18 ], "density": 0.3 }
       ]
     }
   },

diff --git a/data/mods/Xedra_Evolved/monsters/ferals.json b/data/mods/Xedra_Evolved/monsters/ferals.json
@@ -64,5 +64,29 @@
       "WIELDED_WEAPON"
     ],
     "armor": { "bash": 4, "cut": 6, "stab": 4, "bullet": 4 }
+  },
+  {
+    "id": "mon_feral_zebra_agent_p90",
+    "type": "MONSTER",
+    "name": "heavily armed zebra agent",
+    "copy-from": "mon_feral_zebra_agent",
+    "starting_ammo": { "57mm": 50 },
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 10,
+        "move_cost": 150,
+        "gun_type": "feral_p90",
+        "ammo_type": "57mm",
+        "fake_skills": [ [ "gun", 1 ], [ "smg", 2 ] ],
+        "fake_dex": 8,
+        "fake_per": 10,
+        "ranges": [ [ 2, 14, "DEFAULT" ] ],
+        "condition": { "test_eoc": "is_disarmed" },
+        "require_targeting_player": false,
+        "description": "The deranged agent fires their P90!"
+      }
+    ],
+    "death_drops": "feral_agent_p90_death_drops"
   }
 ]
diff --git a/data/mods/Xedra_Evolved/monsters/monsterattacks.json b/data/mods/Xedra_Evolved/monsters/monsterattacks.json
@@ -139,6 +139,51 @@
     "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "fn57mag" ] } ],
     "melee_damage": { "bash": 6 }
   },
+  {
+    "id": "feral_p90",
+    "looks_like": "hk_mp5",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "P90 automatic PDW" },
+    "description": "A late 90s manufactured personal defense weapon (PDW), this automatic firearm fires the high-velocity, proprietary 5.7x28mm cartridge.  Making use of top-mounted 50-round custom magazines which lock into the receiver of the weapon behind the grip, this little submachine gun packs quite the nasty payload.  Its small, high-speed caliber makes it excellent at both defeating armored opponents and firing short bursts manageably.",
+    "weight": "2640 g",
+    "volume": "3817 ml",
+    "longest_side": "511 mm",
+    "barrel_length": "264 mm",
+    "price": "3 kUSD 500 USD",
+    "price_postapoc": "35 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "ranged_damage": { "damage_type": "bullet", "amount": -5 },
+    "range": 4,
+    "ammo": [ "57" ],
+    "skill": "smg",
+    "dispersion": 4800,
+    "durability": 8,
+    "min_cycle_recoil": 81,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock accessory", 2 ]
+    ],
+    "faults": [
+      "fault_gun_blackpowder",
+      "fault_gun_dirt",
+      "fault_gun_chamber_spent",
+      "fault_fail_to_feed",
+      "fault_stovepipe",
+      "fault_double_feed"
+    ],
+    "pocket_data": [ { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "fnp90mag" ] } ],
+    "melee_damage": { "bash": 10 }
+  },
   {
     "id": "shifting",
     "type": "SPELL",

diff --git a/data/mods/Xedra_Evolved/monsters/monstergroup.json b/data/mods/Xedra_Evolved/monsters/monstergroup.json
@@ -178,6 +178,14 @@
     "name": "GROUP_FERAL_AGENTS",
     "monsters": [ { "monster": "mon_feral_zebra_agent", "weight": 100, "pack_size": [ 1, 2 ] } ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_FERAL_AGENTS_BORDER_PATROL_OFFICE",
+    "monsters": [
+      { "monster": "mon_feral_zebra_agent", "weight": 100, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_feral_zebra_agent_p90", "weight": 100, "pack_size": [ 0, 2 ] }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_GENIUS_IERDE",