From f06c8f39f13a7af899e7327be9f3b0ccc2dc098f Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 18:54:11 +0000 Subject: [PATCH 01/16] Add SWAT zombie Adding a SWAT zombie, which is between a cop zombie and a soldier zombie in terms of strength and resistances --- data/json/monsters/zed-classic.json | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 945ca05dd8934..70f1380f098ed 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -399,6 +399,57 @@ "FILTHY" ] }, + { + "id": "mon_zombie_swat", + "type": "MONSTER", + "name": "SWAT zombie", + "description": "This zombie was part of a specialized unit of law enforcement. It still wears a battered armor with the SWAT logo emblazoned at the front.", + "looks_like": "mon_zombie_cop", + "bodytype": "human", + "default_faction": "cop_zombie", + "categories": [ "CLASSIC" ], + "species": [ "ZOMBIE", "HUMAN" ], + "volume": "62500 ml", + "weight": "81500 g", + "hp": 90, + "speed": 75, + "material": [ "flesh" ], + "symbol": "Z", + "color": "blue", + "aggression": 100, + "morale": 100, + "melee_skill": 6, + "melee_dice": 2, + "melee_dice_sides": 5, + "melee_cut": 0, + "armor_bash": 10, + "armor_cut": 16, + "vision_day": 30, + "vision_night": 3, + "harvest": "zombie", + "special_attacks": [ + { "type": "grab", "cooldown": 6 }, + { "type": "scratch", "cooldown": 15 } + ], + "death_drops": "mon_zombie_swat_death_drops", + "death_function": [ "NORMAL" ], + "burn_into": "mon_zombie_scorched", + "flags": [ + "SEES", + "HEARS", + "SMELLS", + "STUMBLES", + "WARM", + "BASHES", + "GROUP_BASH", + "POISON", + "BLEED", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "FILTHY" + ] + }, { "id": "mon_zombie_tough", "type": "MONSTER", From 6513d4e6eb540043a60c281b55643cadd7ff5e39 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 19:11:23 +0000 Subject: [PATCH 02/16] Create SWAT zombie monsterdrop Largely based on the zombie cop loot table. Used existing swat_guns item group. Group "swat_gear" already exist (hence the "_zombie" in the name), but has a mixture of all item slots (head, torso, boots, equipment), so couldn't be used here (or there would be a possibility to have duplicate of things that don't make sense, like two helmets, or two pairs of boots, etc...) --- data/json/monsterdrops/zombie_cop.json | 102 ++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 2 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 2ace5aae10dfb..906319b7b1db9 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -22,7 +22,7 @@ }, { "item": "cash_card", "charges-min": 0, "charges-max": 50000 } ] - }, + }, { "type": "item_group", "id": "cop_gear", @@ -79,5 +79,103 @@ "id": "cop_weapons", "type": "item_group", "items": [ { "group": "cop_melee", "prob": 60 }, { "group": "guns_cop", "prob": 40 } ] - } + }, + { + "id": "mon_zombie_swat_death_drops", + "type": "item_group", + "subtype": "collection", + "magazine": 100, + "ammo": 40, + "entries": [ + { "group": "swat_zombie_gear", "prob": 100, "damage": [ 0, 2 ] }, + { "group": "swat_gloves", "prob": 30, "damage": [ 0, 4 ] }, + { "group": "swat_helmet", "prob": 20, "damage": [ 0, 4 ] }, + { "group": "swat_pants", "damage": [ 0, 4 ] }, + { "group": "swat_shoes", "damage": [ 0, 4 ] }, + { "group": "swat_torso", "damage": [ 0, 4 ] }, + { "group": "swat_weapons", "prob": 50, "damage": [ 0, 1 ], "dirt": [ 0, 7050 ] }, + { "group": "underwear", "damage": [ 0, 4 ] }, + { "group": "clothing_glasses", "prob": 5 }, + { "group": "clothing_watch", "prob": 10 }, + { "item": "badge_swat", "prob": 10 }, + { "item": "cash_card", "charges-min": 0, "charges-max": 50000, "prob": 50 } + ] + }, + { + "type": "item_group", + "id": "swat_zombie_gear", + "subtype": "collection", + "entries": [ + { + "collection": [ + { "item": "bandages", "prob": 60 }, + { "item": "pocket_firstaid", "prob": 40 }, + { "item": "1st_aid", "prob": 20 } + ], + "prob": 25 + }, + { + "collection": [ + { "item": "swat_armor", "prob": 50 }, + { "item": "kevlar", "prob": 25 }, + { "item": "tacvest", "prob": 10 } + ], + "prob": 75 + }, + { + "collection": [ + { "item": "heavy_flashlight", "prob": 20 }, + { "item": "airhorn", "prob": 5 }, + { "item": "two_way_radio", "prob": 30 }, + { "item": "whistle", "prob": 5 }, + { "item": "flashbang", "prob": 10 }, + { "item": "sm_extinguisher", "prob": 5 }, + { "item": "rope_30", "prob": 10 } + ], + "prob": 30 + }, + { + "collection": [ + { "item": "holster", "prob": 35 }, + { "item": "chestpouch", "prob": 15 }, + { "item": "ammo_satchel", "prob": 10 }, + { "item": "bholster", "prob": 25 }, + { "item": "bandolier_shotgun", "prob": 10 }, + { "item": "legpouch_large", "prob": 25 }, + { "item": "police_belt", "prob": 15 } + ], + "prob": 25 + } + ] + }, + { + "id": "swat_gloves", + "type": "item_group", + "items": [ ["gloves_fingerless", 15 ], [ "gloves_leather", 15 ], [ "gloves_tactical", 45 ] ] + }, + { + "id": "swat_helmet", + "type": "item_group", + "items": [ [ "mask_gas", 10 ], [ "helmet_riot", 20 ], [ "tac_helmet", 10 ], [ "tac_fullhelmet", 5 ] ] + }, + { + "id": "swat_pants", + "type": "item_group", + "items": [ [ "pants", 75 ], [ "pants_cargo", 70 ] ] + }, + { + "id": "swat_shoes", + "type": "item_group", + "items": [ [ "boots", 20 ], [ "boots_steel", 40 ], [ "boots_hiking", 5 ], [ "boots_combat", 30 ] ] + }, + { + "id": "swat_torso", + "type": "item_group", + "items": [ [ "dress_shirt", 10 ], [ "tank_top", 25 ], [ "tshirt", 50 ], [ "undershirt", 25 ], [ "jacket_light", 40 ] ] + }, + { + "id": "swat_weapons", + "type": "item_group", + "items": [ { "group": "cop_melee", "prob": 25 }, { "group": "guns_swat", "prob": 75 } ] + } ] From 4baf7b224f09d2ce5dcf5c24300bc8ca5ca469e8 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 19:19:21 +0000 Subject: [PATCH 03/16] Adding SWAT zombie spawn points Added SWAT zombies everywhere cop zombies can spawn, with half the chance --- data/json/monstergroups/zombies.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json index 6726d99c11c79..5693f0f9e30af 100644 --- a/data/json/monstergroups/zombies.json +++ b/data/json/monstergroups/zombies.json @@ -80,6 +80,7 @@ { "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 5 }, { "monster": "mon_zombie_soldier", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 3 }, + { "monster": "mon_zombie_swat", "freq": 10, "cost_multiplier": 3 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 }, { "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer", "freq": 10, "cost_multiplier": 5 }, @@ -118,6 +119,7 @@ { "monster": "mon_zombie_rot", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_crawler", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 280, "cost_multiplier": 3 }, + { "monster": "mon_zombie_swat", "freq": 140, "cost_multiplier": 3 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_fireman", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_dog_zombie_cop", "freq": 40, "cost_multiplier": 2 }, @@ -141,6 +143,7 @@ { "monster": "mon_zombie_crawler", "freq": 5, "cost_multiplier": 2 }, { "monster": "mon_zombie_child", "freq": 150, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 2 }, + { "monster": "mon_zombie_swat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_dog", "freq": 40, "cost_multiplier": 2 }, @@ -174,6 +177,7 @@ { "monster": "mon_zombie_rot", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_crawler", "freq": 5, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 2 }, + { "monster": "mon_zombie_swat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_dog", "freq": 130, "cost_multiplier": 2 }, @@ -198,6 +202,7 @@ { "monster": "mon_zombie_rot", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_crawler", "freq": 5, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 2 }, + { "monster": "mon_zombie_swat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_dog", "freq": 40, "cost_multiplier": 2 }, @@ -221,6 +226,7 @@ { "monster": "mon_zombie_rot", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_crawler", "freq": 5, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 2 }, + { "monster": "mon_zombie_swat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_dog", "freq": 40, "cost_multiplier": 2 }, @@ -408,6 +414,7 @@ "default": "mon_zombie_cop", "monsters": [ { "monster": "mon_zombie_cop", "freq": 100, "cost_multiplier": 0 }, + { "monster": "mon_zombie_swat", "freq": 50, "cost_multiplier": 0 }, { "monster": "mon_dog_zombie_cop", "freq": 50, "cost_multiplier": 2, "pack_size": [ 1, 2 ] } ] }, @@ -423,6 +430,7 @@ { "monster": "mon_zombie_child", "freq": 10, "cost_multiplier": 1 }, { "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 4 }, { "monster": "mon_zombie_cop", "freq": 10, "cost_multiplier": 3 }, + { "monster": "mon_zombie_swat", "freq": 5, "cost_multiplier": 3 }, { "monster": "mon_zombie_static", "freq": 5, "cost_multiplier": 5 }, { "monster": "mon_zombie_runner", "freq": 10, "cost_multiplier": 5, "pack_size": [ 1, 2 ] } ] @@ -459,6 +467,7 @@ { "monster": "mon_zombie_crawler", "freq": 25, "cost_multiplier": 3 }, { "monster": "mon_zombie_soldier", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 3 }, + { "monster": "mon_zombie_cop", "freq": 10, "cost_multiplier": 3 }, { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 }, { "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer", "freq": 10, "cost_multiplier": 5 }, @@ -504,6 +513,7 @@ { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1 }, { "monster": "mon_zombie_fat", "freq": 30, "cost_multiplier": 1 }, { "monster": "mon_zombie_cop", "freq": 10, "cost_multiplier": 2 }, + { "monster": "mon_zombie_swat", "freq": 5, "cost_multiplier": 2 }, { "monster": "mon_zombie_child", "freq": 20, "cost_multiplier": 1 }, { "monster": "mon_zombie_crawler", "freq": 10, "cost_multiplier": 1 } ] @@ -514,6 +524,7 @@ "default": "mon_zombie", "monsters": [ { "monster": "mon_zombie_cop", "freq": 250, "cost_multiplier": 2 }, + { "monster": "mon_zombie_swat", "freq": 125, "cost_multiplier": 2 }, { "monster": "mon_zombie", "freq": 150, "cost_multiplier": 1 }, { "monster": "mon_zombie_swimmer", "freq": 100, "cost_multiplier": 2 } ] From d5799d0ea755c646709e72e283b04c8711c00788 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 20:36:00 +0000 Subject: [PATCH 04/16] Fix special_attacks Fixed special attacks, as it was causing an error ("attack type does not exist"). Also aligned grab cooldown with all other zombies. --- data/json/monsters/zed-classic.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 70f1380f098ed..c456fc2341c16 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -427,10 +427,7 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie", - "special_attacks": [ - { "type": "grab", "cooldown": 6 }, - { "type": "scratch", "cooldown": 15 } - ], + "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 15 ] ], "death_drops": "mon_zombie_swat_death_drops", "death_function": [ "NORMAL" ], "burn_into": "mon_zombie_scorched", From 663329143cd1e7aa88e17a20e447857ab76a3ccd Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 21:13:46 +0000 Subject: [PATCH 05/16] Lint Removed 3 extra spaces... :) --- data/json/monsters/zed-classic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index c456fc2341c16..8c29405c5c698 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -446,7 +446,7 @@ "PUSH_MON", "FILTHY" ] - }, + }, { "id": "mon_zombie_tough", "type": "MONSTER", From 30f52a6878a577dcad1259d16599ff49a72cecf5 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 21:18:53 +0000 Subject: [PATCH 06/16] Lint Removing more extra spaces >_> --- data/json/monsterdrops/zombie_cop.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 906319b7b1db9..03113e53f0dd0 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -22,7 +22,7 @@ }, { "item": "cash_card", "charges-min": 0, "charges-max": 50000 } ] - }, + }, { "type": "item_group", "id": "cop_gear", @@ -100,7 +100,7 @@ { "item": "badge_swat", "prob": 10 }, { "item": "cash_card", "charges-min": 0, "charges-max": 50000, "prob": 50 } ] - }, + }, { "type": "item_group", "id": "swat_zombie_gear", @@ -177,5 +177,5 @@ "id": "swat_weapons", "type": "item_group", "items": [ { "group": "cop_melee", "prob": 25 }, { "group": "guns_swat", "prob": 75 } ] - } + } ] From d8be965897c80a3bda75468f8bd271ac0ee70129 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 21:26:11 +0000 Subject: [PATCH 07/16] More Lint Removed newlines for <120 characters array --- data/json/monsterdrops/zombie_cop.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 03113e53f0dd0..d69f312e90294 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -107,19 +107,11 @@ "subtype": "collection", "entries": [ { - "collection": [ - { "item": "bandages", "prob": 60 }, - { "item": "pocket_firstaid", "prob": 40 }, - { "item": "1st_aid", "prob": 20 } - ], + "collection": [ { "item": "bandages", "prob": 60 }, { "item": "pocket_firstaid", "prob": 40 }, { "item": "1st_aid", "prob": 20 } ], "prob": 25 }, { - "collection": [ - { "item": "swat_armor", "prob": 50 }, - { "item": "kevlar", "prob": 25 }, - { "item": "tacvest", "prob": 10 } - ], + "collection": [ { "item": "swat_armor", "prob": 50 }, { "item": "kevlar", "prob": 25 }, { "item": "tacvest", "prob": 10 } ], "prob": 75 }, { From d96bce6ba34ea2e6bb1d14b8e6820363f218a867 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 21:29:44 +0000 Subject: [PATCH 08/16] Lint Changed 4 spaces to 2. No idea why I put 4 there. :) --- data/json/monsterdrops/zombie_cop.json | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index d69f312e90294..ced9fe0bcddbe 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -116,25 +116,25 @@ }, { "collection": [ - { "item": "heavy_flashlight", "prob": 20 }, - { "item": "airhorn", "prob": 5 }, - { "item": "two_way_radio", "prob": 30 }, - { "item": "whistle", "prob": 5 }, - { "item": "flashbang", "prob": 10 }, - { "item": "sm_extinguisher", "prob": 5 }, - { "item": "rope_30", "prob": 10 } + { "item": "heavy_flashlight", "prob": 20 }, + { "item": "airhorn", "prob": 5 }, + { "item": "two_way_radio", "prob": 30 }, + { "item": "whistle", "prob": 5 }, + { "item": "flashbang", "prob": 10 }, + { "item": "sm_extinguisher", "prob": 5 }, + { "item": "rope_30", "prob": 10 } ], "prob": 30 }, { "collection": [ - { "item": "holster", "prob": 35 }, - { "item": "chestpouch", "prob": 15 }, - { "item": "ammo_satchel", "prob": 10 }, - { "item": "bholster", "prob": 25 }, - { "item": "bandolier_shotgun", "prob": 10 }, - { "item": "legpouch_large", "prob": 25 }, - { "item": "police_belt", "prob": 15 } + { "item": "holster", "prob": 35 }, + { "item": "chestpouch", "prob": 15 }, + { "item": "ammo_satchel", "prob": 10 }, + { "item": "bholster", "prob": 25 }, + { "item": "bandolier_shotgun", "prob": 10 }, + { "item": "legpouch_large", "prob": 25 }, + { "item": "police_belt", "prob": 15 } ], "prob": 25 } From 6b5c9b0cfa119a9c4e48fb305dbe04224f3fd6a9 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 21:36:14 +0000 Subject: [PATCH 09/16] Lint Last one I hope :') --- data/json/monsterdrops/zombie_cop.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index ced9fe0bcddbe..4c7e470c20d95 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -130,7 +130,7 @@ "collection": [ { "item": "holster", "prob": 35 }, { "item": "chestpouch", "prob": 15 }, - { "item": "ammo_satchel", "prob": 10 }, + { "item": "ammo_satchel", "prob": 10 }, { "item": "bholster", "prob": 25 }, { "item": "bandolier_shotgun", "prob": 10 }, { "item": "legpouch_large", "prob": 25 }, @@ -143,7 +143,7 @@ { "id": "swat_gloves", "type": "item_group", - "items": [ ["gloves_fingerless", 15 ], [ "gloves_leather", 15 ], [ "gloves_tactical", 45 ] ] + "items": [ [ "gloves_fingerless", 15 ], [ "gloves_leather", 15 ], [ "gloves_tactical", 45 ] ] }, { "id": "swat_helmet", From 2b568469f415467acc96c8da6d935fc4a9829a05 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Fri, 7 Feb 2020 23:08:54 +0000 Subject: [PATCH 10/16] Modernize item_groups + standardize torso items As per comments from ymber, modernizing the item groups (for the SWAT zombie) to use distribution or collection. Didn't change the cop zombie item_groups as it's not part of this PR. Also changed the torso item group to have less diverse type of items, and remove things that made less sense for SWAT than cops (dress shirt & jacket). --- data/json/monsterdrops/zombie_cop.json | 40 +++++++++++++++++++++----- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 4c7e470c20d95..2bae32662a035 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -111,7 +111,7 @@ "prob": 25 }, { - "collection": [ { "item": "swat_armor", "prob": 50 }, { "item": "kevlar", "prob": 25 }, { "item": "tacvest", "prob": 10 } ], + "collection": [ { "item": "swat_armor", "prob": 50 }, { "item": "kevlar", "prob": 25 }, { "item": "tacvest", "prob": 5 } ], "prob": 75 }, { @@ -143,31 +143,57 @@ { "id": "swat_gloves", "type": "item_group", - "items": [ [ "gloves_fingerless", 15 ], [ "gloves_leather", 15 ], [ "gloves_tactical", 45 ] ] + "subtype": "distribution", + "entries": [ + { "item": "gloves_fingerless", "prob": 15 }, + { "item": "gloves_leather", "prob": 15 }, + { "item": "gloves_tactical", "prob": 45 } + ] }, { "id": "swat_helmet", "type": "item_group", - "items": [ [ "mask_gas", 10 ], [ "helmet_riot", 20 ], [ "tac_helmet", 10 ], [ "tac_fullhelmet", 5 ] ] + "subtype": "distribution", + "entries": [ + { "item": "mask_gas", "prob": 10 }, + { "item": "helmet_riot", "prob": 20 }, + { "item": "tac_helmet", "prob": 10 }, + { "item": "tac_fullhelmet", "prob": 5 } + ] }, { "id": "swat_pants", "type": "item_group", - "items": [ [ "pants", 75 ], [ "pants_cargo", 70 ] ] + "subtype": "distribution", + "entries": [ { "item": "pants", "prob": 75 }, { "item": "pants_cargo", "prob": 70 }, { "item": "pants_army", "prob": 30 } ] }, { "id": "swat_shoes", "type": "item_group", - "items": [ [ "boots", 20 ], [ "boots_steel", 40 ], [ "boots_hiking", 5 ], [ "boots_combat", 30 ] ] + "subtype": "distribution", + "entries": [ + { "item": "boots", "prob": 20 }, + { "item": "boots_steel", "prob": 40 }, + { "item": "boots_hiking", "prob": 5 }, + { "item": "boots_combat", "prob": 30 } + ] }, { "id": "swat_torso", "type": "item_group", - "items": [ [ "dress_shirt", 10 ], [ "tank_top", 25 ], [ "tshirt", 50 ], [ "undershirt", 25 ], [ "jacket_light", 40 ] ] + "subtype": "distribution", + "entries": [ + { "item": "tank_top", "prob": 30 }, + { "item": "army_top", "prob": 40 }, + { "item": "tshirt", "prob": 20 }, + { "item": "longshirt", "prob": 10 }, + { "item": "thermal_shirt", "prob": 10 } + ] }, { "id": "swat_weapons", "type": "item_group", - "items": [ { "group": "cop_melee", "prob": 25 }, { "group": "guns_swat", "prob": 75 } ] + "subtype": "collection", + "entries": [ { "group": "cop_melee", "prob": 25 }, { "group": "guns_swat", "prob": 75 } ] } ] From 45ca4ac93c2feace4a42db5fcbb5724d157e14fe Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Sat, 8 Feb 2020 00:40:47 +0000 Subject: [PATCH 11/16] Adding upgrade to Kevlar Zombie As per suggested changes --- data/json/monsters/zed-classic.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 8c29405c5c698..b3b6ad84c4159 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -430,6 +430,7 @@ "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 15 ] ], "death_drops": "mon_zombie_swat_death_drops", "death_function": [ "NORMAL" ], + "upgrades": { "half_life": 28, "into": "mon_zombie_kevlar_1" }, "burn_into": "mon_zombie_scorched", "flags": [ "SEES", From 0c2b78f8e48331f6fe57b4c0bad23e9c7552b25a Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Sat, 8 Feb 2020 10:39:32 +0000 Subject: [PATCH 12/16] 2 spaces after period Only the old rules of typing requires this. The general rule now is only one space after punctuations, but I understand it's the format that has been used in the rest of the project, so np! :p Co-Authored-By: Anton Burmistrov --- data/json/monsters/zed-classic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index b3b6ad84c4159..77cde3ece0ecd 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -403,7 +403,7 @@ "id": "mon_zombie_swat", "type": "MONSTER", "name": "SWAT zombie", - "description": "This zombie was part of a specialized unit of law enforcement. It still wears a battered armor with the SWAT logo emblazoned at the front.", + "description": "This zombie was part of a specialized unit of law enforcement. It still wears a battered armor with the SWAT logo emblazoned at the front.", "looks_like": "mon_zombie_cop", "bodytype": "human", "default_faction": "cop_zombie", From f1992bcf23219e13f5183dc1f794b21f48dbedbd Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Sat, 8 Feb 2020 10:50:20 +0000 Subject: [PATCH 13/16] Remove first aid book from SWAT zombie loot --- data/json/monsterdrops/zombie_cop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 2bae32662a035..4bbcd78a17d69 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -107,7 +107,7 @@ "subtype": "collection", "entries": [ { - "collection": [ { "item": "bandages", "prob": 60 }, { "item": "pocket_firstaid", "prob": 40 }, { "item": "1st_aid", "prob": 20 } ], + "collection": [ { "item": "bandages", "prob": 60 }, { "item": "1st_aid", "prob": 20 } ], "prob": 25 }, { From c1d034156c33c49eda03250af05eb66f45179966 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Sat, 8 Feb 2020 12:07:58 +0000 Subject: [PATCH 14/16] Lint is the bane of my existence ;) --- data/json/monsterdrops/zombie_cop.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 4bbcd78a17d69..cd5076676caf7 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -107,8 +107,7 @@ "subtype": "collection", "entries": [ { - "collection": [ { "item": "bandages", "prob": 60 }, { "item": "1st_aid", "prob": 20 } ], - "prob": 25 + "collection": [ { "item": "bandages", "prob": 60 }, { "item": "1st_aid", "prob": 20 } ], "prob": 25 }, { "collection": [ { "item": "swat_armor", "prob": 50 }, { "item": "kevlar", "prob": 25 }, { "item": "tacvest", "prob": 5 } ], From cf3ac93e35ae6bdba9773f092fe98d8eba04b6e7 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Sat, 8 Feb 2020 13:02:17 +0000 Subject: [PATCH 15/16] Lint --- data/json/monsterdrops/zombie_cop.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index cd5076676caf7..fb955cb5b1b2d 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -106,9 +106,7 @@ "id": "swat_zombie_gear", "subtype": "collection", "entries": [ - { - "collection": [ { "item": "bandages", "prob": 60 }, { "item": "1st_aid", "prob": 20 } ], "prob": 25 - }, + { "collection": [ { "item": "bandages", "prob": 60 }, { "item": "1st_aid", "prob": 20 } ], "prob": 25 }, { "collection": [ { "item": "swat_armor", "prob": 50 }, { "item": "kevlar", "prob": 25 }, { "item": "tacvest", "prob": 5 } ], "prob": 75 From 4b296405828fed6e89494dfcc4cc0eeed53f39f7 Mon Sep 17 00:00:00 2001 From: Moumix3 Date: Sat, 8 Feb 2020 17:18:35 +0000 Subject: [PATCH 16/16] Grammar! Co-Authored-By: matskuman5 --- data/json/monsters/zed-classic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 77cde3ece0ecd..7840aecdeee89 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -403,7 +403,7 @@ "id": "mon_zombie_swat", "type": "MONSTER", "name": "SWAT zombie", - "description": "This zombie was part of a specialized unit of law enforcement. It still wears a battered armor with the SWAT logo emblazoned at the front.", + "description": "This zombie was part of a specialized unit of law enforcement. It still wears a battered armor with the SWAT logo emblazoned on the front.", "looks_like": "mon_zombie_cop", "bodytype": "human", "default_faction": "cop_zombie",