Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Firearm-wielding feral humans; Feral preppers & survivalists #51825

Closed
wants to merge 62 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
0ca672b
Adding mondrops for feral prep-survivalist
BioHazardSuit Sep 23, 2021
8951d2c
Adding feral prepper-survivalist to mongroup
BioHazardSuit Sep 23, 2021
3ff5ee6
Adding feral prepper to feral humans file
BioHazardSuit Sep 23, 2021
04be7c5
Update zombies.json
BioHazardSuit Sep 23, 2021
e479fc5
Update feral_humans.json
BioHazardSuit Sep 23, 2021
0535db5
Update feral_humans.json
BioHazardSuit Sep 23, 2021
6ea5d44
Updated frequency
BioHazardSuit Sep 23, 2021
4c80960
Adding "upgrade: to" to prepper
BioHazardSuit Sep 23, 2021
c67d104
Increased prepper startingammo to 3x the amount
BioHazardSuit Sep 23, 2021
eb1b6ea
Changed "looks_like" for feralprepper to zomsurvivor
BioHazardSuit Sep 23, 2021
63266e7
Updated looks and descript
BioHazardSuit Sep 23, 2021
031d344
Updated anger fear
BioHazardSuit Sep 23, 2021
6b0b43a
Made fakeguns for feralpreppers (error on:45acp)
BioHazardSuit Sep 24, 2021
4980510
Gave the feral preppers fake guns
BioHazardSuit Sep 24, 2021
6b93445
Updated feraldrop: made gun variety
BioHazardSuit Sep 24, 2021
9d18c3f
recommended double spaces
BioHazardSuit Sep 24, 2021
cf793c4
double spaces for survivalist descript
BioHazardSuit Sep 24, 2021
ff8ef21
JSON tidiness check
BioHazardSuit Sep 24, 2021
6f826f1
Json row tidiness check
BioHazardSuit Sep 24, 2021
93a4f2a
Sort JSON row drops
BioHazardSuit Sep 24, 2021
ea2789b
Update feral_humans.json
BioHazardSuit Sep 24, 2021
39b821f
sort row order
BioHazardSuit Sep 24, 2021
7b6c2d1
decrease 400 to 350 freq for prephouse
BioHazardSuit Sep 24, 2021
930c04e
Decrease prep freq to 180 like toughzom
BioHazardSuit Sep 25, 2021
b236a47
spelling check and decrease ammunition
BioHazardSuit Sep 25, 2021
2136f10
Feral prepper aim horrible
BioHazardSuit Sep 25, 2021
f7febcb
All hail Linting Machine
BioHazardSuit Sep 25, 2021
2b3c80f
Linting Machine is truth
BioHazardSuit Sep 25, 2021
17c4c87
Linting Machine
BioHazardSuit Sep 25, 2021
75ec8ab
no need 45 caliber itemgroup collection| not yet
BioHazardSuit Sep 25, 2021
bb1e9e3
Update monster_gun.json
BioHazardSuit Sep 25, 2021
225b0da
Update feral_humans.json
BioHazardSuit Sep 25, 2021
19db33b
decrease movecost 150->50 for feralprepper
BioHazardSuit Sep 26, 2021
4f79bb2
Increased survivalists' bravery
BioHazardSuit Sep 26, 2021
7729881
morale+aggression to 100| They keepgetting scared
BioHazardSuit Sep 26, 2021
77bfbbe
Balanced melee lethality, raised ammo survivalist
BioHazardSuit Sep 26, 2021
173474c
rewrite survivalists' instinct description
BioHazardSuit Sep 26, 2021
719eaa3
gave starts": to spawngroup, ~22 days
BioHazardSuit Sep 26, 2021
ef1a474
Survivalist group spawn starts": ~2 months
BioHazardSuit Sep 26, 2021
c719044
Prepper upgrades-evolves in 2 months
BioHazardSuit Sep 26, 2021
ca0f93b
Update monster_gun.json
BioHazardSuit Sep 26, 2021
e7f3921
bunker: added feral prepper and bed place_monster
BioHazardSuit Sep 26, 2021
86d59d6
Survivor camp: added feral prepper
BioHazardSuit Sep 26, 2021
8580c79
Fierce
BioHazardSuit Sep 26, 2021
f22fb46
Decrease morale, enable survival instinct-fear
BioHazardSuit Sep 26, 2021
db19a06
decrease aggression spark fear
BioHazardSuit Sep 26, 2021
4ebede0
fixed it
BioHazardSuit Sep 26, 2021
463f78e
Sorting mon-drops
BioHazardSuit Sep 28, 2021
9d903fd
giving 'real' firearms and pistol skill
BioHazardSuit Sep 28, 2021
4d98f12
Removing fake feral guns from monster_guns
BioHazardSuit Sep 28, 2021
9834f52
adjust basement spawn
BioHazardSuit Sep 28, 2021
dbd56c8
I accidentally added decimals to 1440
BioHazardSuit Sep 29, 2021
05ad43a
Firearm
BioHazardSuit Sep 29, 2021
d3483ba
add firearms with civilian self-defense descript
BioHazardSuit Sep 29, 2021
847bf5f
Possible loaded firearm as reward
BioHazardSuit Sep 30, 2021
f021943
aim horrible
BioHazardSuit Sep 30, 2021
0274127
Update feral_humans.json
BioHazardSuit Sep 30, 2021
9dfe032
adjust stash food
BioHazardSuit Oct 1, 2021
e59a814
varying 9mm guns
BioHazardSuit Oct 1, 2021
db8d389
Nevermind previous commit
BioHazardSuit Oct 2, 2021
1849d12
adding hi point
BioHazardSuit Oct 3, 2021
42b1f6c
Update feral_humans.json
BioHazardSuit Oct 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/json/mapgen/ws_survivor_bunker.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"default": "mon_zombie_survivor",
"monsters": [
{ "monster": "mon_zombie_survivor", "freq": 250, "cost_multiplier": 0 },
{ "monster": "mon_feral_prepper", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_zombie_dog", "freq": 150, "cost_multiplier": 0 },
{ "monster": "mon_dog_zombie_rot", "freq": 150, "cost_multiplier": 0 }
Expand Down Expand Up @@ -250,6 +251,7 @@
],
"place_monsters": [
{ "monster": "GROUP_ZOMBIE_BUNKER", "x": 14, "y": 19 },
{ "monster": "GROUP_ZOMBIE_BUNKER", "x": 14, "y": 16 },
{ "monster": "GROUP_ZOMBIE_BUNKER", "x": 15, "y": 20 },
{ "monster": "GROUP_ZOMBIE_BUNKER", "x": 16, "y": 19 }
]
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/ws_survivor_camp.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{ "monster": "mon_zombie_survivor", "freq": 250, "cost_multiplier": 0 },
{ "monster": "mon_zombie_soldier", "freq": 100, "cost_multiplier": 2 },
{ "monster": "mon_zombie_dog", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_feral_prepper", "freq": 100, "cost_multiplier": 2 },
{ "monster": "mon_dog_zombie_rot", "freq": 150, "cost_multiplier": 0 },
{ "monster": "mon_dog_zombie_cop", "freq": 100, "cost_multiplier": 0 }
]
Expand Down
53 changes: 53 additions & 0 deletions data/json/monsterdrops/feral_humans.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,58 @@
{ "group": "clothing_watch", "prob": 5 },
{ "group": "wallets", "damage": [ 1, 4 ] }
]
},
{
"id": "mon_feral_prepper_death_drops",
"type": "item_group",
"subtype": "collection",
"magazine": 100,
"ammo": 20,
"entries": [
{ "group": "feral_ninemm", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "clothing_outdoor_set", "damage": [ 1, 4 ] },
{ "group": "bags", "damage": [ 1, 4 ], "prob": 10 },
{ "group": "book_survival", "prob": 40 },
{ "group": "survivor_knife", "damage": [ 1, 4 ] },
{ "group": "gear_survival", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "survivor_bashing", "prob": 35, "damage": [ 1, 4 ] },
{ "group": "stash_food", "prob": 50 },
{ "group": "mil_food_nodrugs", "prob": 20 },
{ "group": "used_survival_kit", "prob": 100, "damage": [ 1, 4 ] }
]
},
{
"id": "mon_feral_survivalist_death_drops",
"type": "item_group",
"subtype": "collection",
"magazine": 100,
"ammo": 10,
"entries": [
{ "group": "feral_ninemm", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "survivor_grenades", "prob": 20, "damage": [ 1, 4 ] },
{ "group": "clothing_outdoor_set", "damage": [ 1, 4 ] },
{ "group": "bags", "damage": [ 1, 4 ], "prob": 10 },
{ "group": "book_survival", "prob": 40 },
{ "group": "survivor_knife", "damage": [ 1, 4 ] },
{ "group": "gear_survival", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "survivor_cutting", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "stash_food", "prob": 70 },
{ "group": "mil_food", "prob": 33 },
{ "group": "mil_food_nodrugs", "prob": 48 },
{ "group": "shelter", "prob": 16 },
{ "group": "survivorzed_gloves", "damage": [ 1, 4 ] },
{ "group": "survivorzed_boots", "damage": [ 1, 4 ] },
{ "group": "survivorzed_head", "damage": [ 1, 4 ] },
{ "group": "survivorzed_extra", "damage": [ 1, 4 ] },
{ "group": "used_survival_kit", "prob": 100, "damage": [ 1, 4 ] }
]
},
{
"type": "item_group",
"subtype": "distribution",
"magazine": 100,
"ammo": 10,
"id": "feral_ninemm",
"items": [ [ "glock_19", 200 ], [ "hptjhp", 200 ], [ "uzi", 100 ], [ "cx4", 100 ], [ "sw_619", 200 ], [ "glock_17", 200 ] ]
}
]
40 changes: 30 additions & 10 deletions data/json/monstergroups/zombies.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@
{ "monster": "mon_feral_human_pipe", "freq": 4, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
{ "monster": "mon_feral_human_crowbar", "freq": 4, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
{ "monster": "mon_feral_human_axe", "freq": 2, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
{ "monster": "mon_zombie_brainless", "freq": 65, "cost_multiplier": 1 }
{ "monster": "mon_zombie_brainless", "freq": 65, "cost_multiplier": 1 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand Down Expand Up @@ -165,7 +167,9 @@
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand All @@ -190,7 +194,9 @@
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 540 }
]
},
{
Expand All @@ -200,7 +206,9 @@
"monsters": [
{ "monster": "mon_zombie_tough", "freq": 180, "cost_multiplier": 0 },
{ "monster": "mon_zombie_survivor", "freq": 400, "cost_multiplier": 0 },
{ "monster": "mon_zombie_survivor_elite", "freq": 20, "cost_multiplier": 25, "starts": 540 }
{ "monster": "mon_zombie_survivor_elite", "freq": 20, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_prepper", "freq": 180, "cost_multiplier": 0 },
{ "monster": "mon_feral_survivalist", "freq": 20, "cost_multiplier": 25, "starts": 540 }
]
},
{
Expand All @@ -226,7 +234,9 @@
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_zombie_runner", "freq": 130, "cost_multiplier": 3 }
{ "monster": "mon_zombie_runner", "freq": 130, "cost_multiplier": 3 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand All @@ -251,7 +261,9 @@
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_static", "freq": 180, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 540 }
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand All @@ -276,7 +288,9 @@
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 540 }
{ "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand Down Expand Up @@ -455,7 +469,9 @@
{ "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 },
{ "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 },
{ "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
{ "monster": "mon_zombie_brainless", "freq": 55, "cost_multiplier": 1 }
{ "monster": "mon_zombie_brainless", "freq": 55, "cost_multiplier": 1 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand Down Expand Up @@ -531,7 +547,9 @@
"monsters": [
{ "monster": "mon_feral_human_pipe", "freq": 100, "cost_multiplier": 1, "pack_size": [ 3, 8 ] },
{ "monster": "mon_feral_human_crowbar", "freq": 40, "cost_multiplier": 1, "pack_size": [ 2, 6 ] },
{ "monster": "mon_feral_human_axe", "freq": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }
{ "monster": "mon_feral_human_axe", "freq": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
{ "monster": "mon_feral_prepper", "freq": 5, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 3, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand All @@ -545,7 +563,9 @@
{ "monster": "mon_zombie_crawler", "freq": 50, "cost_multiplier": 1 },
{ "monster": "mon_zombie_regenerating", "freq": 5, "cost_multiplier": 1 },
{ "monster": "mon_zombie_survivor", "freq": 70, "cost_multiplier": 1 },
{ "monster": "mon_zombie_survivor_elite", "freq": 10, "cost_multiplier": 1, "starts": 540 }
{ "monster": "mon_zombie_survivor_elite", "freq": 10, "cost_multiplier": 1, "starts": 540 },
{ "monster": "mon_feral_prepper", "freq": 1, "cost_multiplier": 25, "starts": 540 },
{ "monster": "mon_feral_survivalist", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
]
},
{
Expand Down
133 changes: 132 additions & 1 deletion data/json/monsters/feral_humans.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"move_cost": 150,
"gun_type": "m9",
"ammo_type": "9mm",
"fake_skills": [ [ "gun", 1 ], [ "handgun", 2 ] ],
"fake_skills": [ [ "gun", 1 ], [ "pistol", 2 ] ],
"fake_dex": 8,
"fake_per": 10,
"ranges": [ [ 0, 14, "DEFAULT" ] ],
Expand Down Expand Up @@ -215,5 +215,136 @@
"special_attacks": [ [ "TAZER", 10 ] ],
"luminance": 500,
"death_drops": "feral_security_death_drops_flashlight"
},
{
"id": "mon_feral_prepper",
"type": "MONSTER",
"name": { "str": "feral prepper" },
"description": "A quick glance of this person would show that they have prepared well for times like these. Unfortunately, their bloodshot eyes, and the excluding treatment by the undead shows that they have turned feral. One of their hands clasp the handle of their prepped improvised weapon, while the other clasps unto the grip of a firearm, treating both as clubs.",
"default_faction": "zombie",
"bodytype": "human",
"species": [ "HUMAN" ],
"volume": "62500 ml",
"weight": "81500 g",
"hp": 80,
"speed": 100,
"material": [ "flesh" ],
"symbol": "@",
"color": "magenta",
"aggression": 75,
"morale": 100,
"melee_skill": 3,
"melee_dice": 3,
"melee_dice_sides": 6,
"melee_cut": 5,
"dodge": 4,
"armor_bash": 7,
"armor_cut": 7,
"armor_bullet": 6,
"armor_acid": 4,
"vision_day": 50,
"vision_night": 3,
"harvest": "human",
"upgrades": { "into": "mon_feral_survivalist", "half_life": 120 },
"starting_ammo": { "9mm": 3 },
"special_attacks": [
[ "GRAB", 7 ],
{
"type": "gun",
"cooldown": 10,
"move_cost": 50,
"//": "(movecost is 50 to show that the feral prepper doesn't take time to aim, and just shoots haphazardly)",
"gun_type": "m9",
"ammo_type": "9mm",
"fake_skills": [ [ "gun", 1 ], [ "pistol", 1 ] ],
"fake_dex": 8,
"fake_per": 9,
"ranges": [ [ 0, 14, "DEFAULT" ], [ 10, 35, "DEFAULT" ] ],
"require_targeting_player": false,
"description": "The feral prepper haphazardly fires their firearm!"
}
],
"death_drops": "mon_feral_prepper_death_drops",
"zombify_into": "mon_zombie_survivor",
"flags": [
"SEES",
"HEARS",
"SMELLS",
"WARM",
"BASHES",
"GROUP_BASH",
"HUMAN",
"CAN_OPEN_DOORS",
"CLIMBS",
"PUSH_MON",
"PATH_AVOID_DANGER_1",
"DROPS_AMMO"
]
},
{
"id": "mon_feral_survivalist",
"type": "MONSTER",
"name": { "str": "feral survivalist" },
"description": "Using formidable equipment, this feral prepper is seen having an athletic body, a sign of sturdy training before they turned feral. In addition of handling their firearm more properly, they seem to have an awareness of self preservation when in critical harm, a byproduct of leftover survival instincts kicking in.",
"default_faction": "zombie",
"bodytype": "human",
"species": [ "HUMAN" ],
"volume": "62500 ml",
"weight": "81500 g",
"hp": 100,
"speed": 110,
"material": [ "flesh" ],
"symbol": "@",
"color": "magenta",
"aggression": 75,
"morale": 12,
"melee_skill": 6,
"melee_dice": 2,
"melee_dice_sides": 3,
"melee_cut": 5,
"dodge": 4,
"armor_stab": 18,
"armor_bash": 15,
"armor_cut": 25,
"armor_bullet": 20,
"armor_acid": 4,
"vision_day": 50,
"vision_night": 6,
"harvest": "human",
"starting_ammo": { "9mm": 6 },
"special_attacks": [
[ "GRAB", 7 ],
{
"type": "gun",
"cooldown": 5,
"move_cost": 150,
"gun_type": "m9",
"ammo_type": "9mm",
"fake_skills": [ [ "gun", 2 ], [ "pistol", 2 ] ],
"fake_dex": 8,
"fake_per": 10,
"ranges": [ [ 0, 14, "DEFAULT" ], [ 10, 35, "DEFAULT" ] ],
"require_targeting_player": false,
"description": "The feral survivalist mechanically fires their firearm!"
}
],
"death_drops": "mon_feral_survivalist_death_drops",
"zombify_into": "mon_zombie_survivor_elite",
"flags": [
"SEES",
"HEARS",
"SMELLS",
"WARM",
"BASHES",
"GROUP_BASH",
"HUMAN",
"CAN_OPEN_DOORS",
"CLIMBS",
"PUSH_MON",
"PATH_AVOID_DANGER_1",
"DROPS_AMMO"
],
"anger_triggers": [ "HURT", "FRIEND_ATTACKED", "PLAYER_CLOSE", "STALK" ],
"fear_triggers": [ "FRIEND_DIED", "HURT" ]
}
]