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

Feral preppers, survivalists, and militia #52526

Merged
merged 70 commits into from
Dec 19, 2021
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
174dfb7
add and lint mondrops
BioHazardSuit Oct 28, 2021
e65e50b
add ferals (first iteration)
BioHazardSuit Oct 28, 2021
2a0a01d
Group spawn
BioHazardSuit Oct 28, 2021
78f1e70
Militia changes
BioHazardSuit Oct 28, 2021
1bd512b
headlamp
BioHazardSuit Oct 29, 2021
70f6e10
Description changes
BioHazardSuit Oct 29, 2021
b425e51
movecost difference
BioHazardSuit Oct 29, 2021
56a548f
function check 1
BioHazardSuit Oct 29, 2021
dd882f8
lint check 2
BioHazardSuit Oct 29, 2021
e7a7322
adjust frequency
BioHazardSuit Oct 29, 2021
0b13d71
frequency update
BioHazardSuit Oct 29, 2021
b9101e9
Update zombies.json
BioHazardSuit Oct 29, 2021
18cadf6
testing's result
BioHazardSuit Oct 29, 2021
81f1273
Testing's result
BioHazardSuit Oct 29, 2021
88ad17d
testing's result
BioHazardSuit Oct 29, 2021
af59600
Create feral_upgrades
BioHazardSuit Oct 29, 2021
c7aa6f1
skill similar to crowbar feral
BioHazardSuit Oct 29, 2021
93d5d86
spelling
BioHazardSuit Oct 29, 2021
dda63ef
Linting
BioHazardSuit Oct 30, 2021
7342f6a
Linting
BioHazardSuit Oct 30, 2021
e1fc5a9
Linting and adjustments
BioHazardSuit Oct 30, 2021
fc41637
Lint and applying "starts":
BioHazardSuit Oct 30, 2021
ab801f3
Lint and remove "upgrades_into":
BioHazardSuit Oct 30, 2021
663d292
Delete feral_upgrades
BioHazardSuit Oct 30, 2021
2c5fc9c
Lint and make autogun all .223
BioHazardSuit Oct 31, 2021
527d0e4
Spawning balancing and lint
BioHazardSuit Oct 31, 2021
63b099a
Lint and final balancing
BioHazardSuit Oct 31, 2021
4e27526
lint and increasingly loot drop
BioHazardSuit Nov 1, 2021
5ee1621
Uncommon but not too uncommon
BioHazardSuit Nov 1, 2021
e55e46e
No hands no grab
BioHazardSuit Nov 2, 2021
c7f8168
Make `"starts":` longer
BioHazardSuit Nov 2, 2021
716b3d6
Merge branch 'master' into ferals
kevingranade Nov 5, 2021
808a2cd
Update zombies.json
BioHazardSuit Nov 6, 2021
b866287
Update zombies.json
BioHazardSuit Nov 8, 2021
e81dea1
Resolve file conflict and lint
BioHazardSuit Nov 13, 2021
02ec9eb
Resolve conflict?
BioHazardSuit Nov 13, 2021
58334b8
Maybe
BioHazardSuit Nov 13, 2021
e5c1117
what if
BioHazardSuit Nov 13, 2021
e13a448
nevermind
BioHazardSuit Nov 13, 2021
b12d188
Adjusting spawn weight for later
BioHazardSuit Nov 26, 2021
b3125df
Group_prepper feral weight changes
BioHazardSuit Dec 8, 2021
2f1a043
No gun for survivalist
BioHazardSuit Dec 8, 2021
16ea80d
Changing survivalist attacks to melee
BioHazardSuit Dec 8, 2021
1517517
Occupied feral Lmoe shelters
BioHazardSuit Dec 8, 2021
31665b2
Cabin Lmoe feral variant
BioHazardSuit Dec 8, 2021
c58d43a
Overmap specials
BioHazardSuit Dec 8, 2021
dc516f5
Terrain military
BioHazardSuit Dec 8, 2021
46b5b48
Overmap terrain prepcabin
BioHazardSuit Dec 8, 2021
cfbd587
Lint time
BioHazardSuit Dec 9, 2021
c23e919
Lint time
BioHazardSuit Dec 9, 2021
baa964c
Lint time
BioHazardSuit Dec 9, 2021
65b123f
quick change
BioHazardSuit Dec 9, 2021
594d7c3
Lint
BioHazardSuit Dec 10, 2021
ba26f0d
Lint
BioHazardSuit Dec 10, 2021
8e4b225
Maybe
BioHazardSuit Dec 10, 2021
e2715ab
Update feral_humans.json
BioHazardSuit Dec 10, 2021
58ac66e
trap fix and stone walls
BioHazardSuit Dec 14, 2021
3366fe8
Details say it needs linting
BioHazardSuit Dec 15, 2021
c72d8d0
Catch up
BioHazardSuit Dec 15, 2021
6a5025f
ketchup
BioHazardSuit Dec 15, 2021
f9a3bdc
fix conflict
BioHazardSuit Dec 15, 2021
641b306
Give in
BioHazardSuit Dec 15, 2021
57b854b
Spearman
BioHazardSuit Dec 15, 2021
038e879
spearman
BioHazardSuit Dec 15, 2021
9b8fbba
Delete lmoe_zombie.json
BioHazardSuit Dec 16, 2021
c45552b
Add on to lmoe.json
BioHazardSuit Dec 16, 2021
b24f68c
Merge branch 'CleverRaven:master' into ferals
BioHazardSuit Dec 16, 2021
31645cf
Spawning changes with "ends":
BioHazardSuit Dec 17, 2021
97a285b
Adjust spawnings
BioHazardSuit Dec 18, 2021
d5ee35d
Update data/json/monsters/feral_humans.json
I-am-Erk Dec 18, 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
60 changes: 60 additions & 0 deletions data/json/monsters/feral_humans.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,66 @@
"DROPS_AMMO"
]
},
{
"id": "mon_feral_sapien_spear",
"type": "MONSTER",
"name": { "str": "cunning feral" },
"description": "In this feral human's eyes is more intelligence than in those of most of their kind. They're carrying a crude spear, and have assembled some basic armor from scavenged clothing and bits of riot armour, leaving several gaps. Although a bit more together, this creature is still only a few steps away from being a living zombie themself.",
"default_faction": "zombie",
"bodytype": "human",
"species": [ "HUMAN" ],
"volume": "62500 ml",
"weight": "81500 g",
"hp": 80,
"speed": 100,
"material": [ "flesh" ],
"symbol": "@",
"color": "magenta",
"aggression": 30,
"morale": 100,
"melee_skill": 3,
"melee_dice": 4,
"melee_dice_sides": 6,
"melee_cut": 2,
"dodge": 3,
"armor_bash": 9,
"armor_cut": 7,
"armor_bullet": 12,
"special_attacks": [
[ "PARROT_AT_DANGER", 0 ],
{
"id": "stretch_attack",
"cooldown": 5,
"range": 2,
"hit_dmg_u": "The %1$s thrusts a spear at your %2$s, slashing it!",
"hit_dmg_npc": "The %1$s thrusts a spear at <npcname>'s %2$s, slashing it!",
"no_dmg_msg_u": "The %1$s thrusts a spear at your %2$s, but glances off your armor!",
"no_dmg_msg_npc": "The %1$s thrusts a spear at <npcname>'s %2$s, but glances off armor!",
"miss_msg_u": "The %s thrusts a spear at you, but you evade it!",
"miss_msg_npc": "The %s thrusts a spear at <npcname>, but they evade it!"
}
],
"armor_acid": 4,
"harvest": "human",
"vision_day": 50,
"vision_night": 3,
"path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true },
"death_drops": "feral_sapien_death_drops_spear",
"zombify_into": "mon_zombie_survivor",
"anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ],
"flags": [
"SEES",
"HEARS",
"SMELLS",
"WARM",
"BASHES",
"GROUP_BASH",
"HUMAN",
"CAN_OPEN_DOORS",
"PATH_AVOID_DANGER_1",
"PRIORITIZE_TARGETS"
]
},
{
"id": "mon_chud",
"type": "MONSTER",
Expand Down