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

New foes for the Collapsed Tower #33322

Merged
merged 17 commits into from
Aug 22, 2019
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
24 changes: 24 additions & 0 deletions data/json/items/ammo/barb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "AMMO",
"id": "barb_paralysis",
"price": 400,
"name": "paralyzing barb",
"symbol": "=",
"color": "green",
"description": "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp barb.",
"material": "bone",
"volume": "250ml",
"weight": 37,
"bashing": 6,
"cutting": 2,
"ammo_type": "barb",
"damage": 5,
"pierce": 5,
"dispersion": 120,
"loudness": 0,
"count": 10,
"show_stats": true,
"effects": [
"PARALYZEPOISON"
]
}
6 changes: 6 additions & 0 deletions data/json/items/ammo_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
"name": "nails",
"default": "nail"
},
{
"type": "ammunition_type",
"id": "barb",
"name": "barb",
"default": "barb_paralysis"
},
{
"type": "ammunition_type",
"id": "BB",
Expand Down
33 changes: 33 additions & 0 deletions data/json/items/gun/monster_gun.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"id": "barb_launcher",
"type": "GUN",
"symbol": "%",
"color": "red",
"name": "barb launching organ",
"description": "A mutated organ capable of launching bony barbs at great speed.",
"material": [
"hflesh"
],
"flags": [
"PRIMITIVE_RANGED_WEAPON",
"NEVER_JAMS",
"NONCONDUCTIVE",
"NO_REPAIR",
"WATERPROOF_GUN",
"NO_SALVAGE",
"NO_UNLOAD",
"RELOAD_AND_SHOOT"
],
"skill": "pistol",
"ammo": "barb",
"clip_size": 1,
"weight": 540,
"volume": "750ml",
"bashing": 2,
"to_hit": 1,
"reload_noise_volume": 2,
"loudness": 2,
"range": 12,
"dispersion": 100,
"durability": 8
}
110 changes: 56 additions & 54 deletions data/json/mapgen/collapsed_tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"type": "monstergroup",
"default": "mon_null",
"monsters": [
{ "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1, "pack_size": [ 3, 5 ] },
{ "monster": "mon_zombie_gasbag_immobile", "freq": 200, "cost_multiplier": 1 },
{ "monster": "mon_zombie_gasbag_crawler", "freq": 10, "cost_multiplier": 7, "pack_size": [ 3, 5 ] },
{ "monster": "mon_zombie_tough", "freq": 20, "cost_multiplier": 6 }
{ "monster": "mon_zombie_gasbag_immobile", "freq": 150, "cost_multiplier": 1 },
{ "monster": "mon_zombie", "freq": 200, "cost_multiplier": 7, "pack_size": [ 3, 5 ] },
{ "monster": "mon_zombie_gasbag_crawler", "freq": 150, "cost_multiplier": 7, "pack_size": [ 1, 2 ] },
{ "monster": "mon_zombie_gasbag_impaler", "freq": 50, "cost_multiplier": 6, "pack_size": [ 1, 4 ] }
]
},
{
Expand All @@ -28,46 +28,46 @@
"....s.z1CCC 4|CC l|CCC | 4 #|4 4|zsssssss##ssssssssssssssssss",
"....s.z1C B |||||||###| |#| B B||B 1zsssssssssssssssssssssssssss",
"....s.||||||||| #####|||||||||||666|||6 1zssss###ssssssssssssssssssss",
"....s.z1#### ## | |||####|||#B ||||ssssssssssszzzzssssssssss",
"....s.z## # 6666666|||||##sssss##s|||||||||Bsssssss",
"....s.z|C B | |C 00 |#| B B B 1zs###ssssssBsz.zz z|Bsssssss",
"....s.||#### ## | |||####|||#B ||||ssssssssssszzzzssssssssss",
"....s|||# # 6666666|||||##sssss##s|||||||||Bsssssss",
"....s|z|C B | |C 00 |#| B B B 1zs###ssssssBsz.zz z|Bsssssss",
"....s.#|CCC l||| -|CCC | |||#|4 4 zss|||sssssssz.zz z|ssssssss",
"....#.z|-- | ||||----## ||||222--33--22 zsss|||||ssBsz.zz z|Bsssssss",
"....s.#|;w |####|# |###|### B |||sssssBszz. z|Bsssssss",
"...####|-- -----| --||####|#C##### ||##1 #zsss||||sszz zssssssssss",
"....s.#|;w A|A w;| ####|||||||| B |||| #sss|||sssssssssssssszz",
".##.s |-- | --|#####||B ||||||| # ~~~ss~~22222222~~ss~~~~",
"....s.z|;w A|A | w;||||##| ### C|C||||||~~~~ss~~1## ##1~~ss~~~~",
"....s z|--| |##||####| |--| |||||3zzzz~~sszz1## ##1zzsszzz~",
"....s z|||| |##||####| |--| |||||3zzzz~~sszz1## ##1zzsszzz~",
".||.s |-w-----|||#||| | ####C |#-22---~~{{222--22--222{{221~",
"....s s||| # || ##BC #|||||| ~~ 4 ???? 4 1s",
"..||s |---w-----|-|| - ---- ---- ---|### ~~ 1s",
"...| ||-|l l| |B B | |l| ##||| z~~ ???? zzz 1s",
"...| ||||l l| |B B | |l| ##||| z~~ ???? zzz 1s",
".||||||||#|l l| ||66 | | |-c----c-| | z~~ ###### zTz |s",
"....s.. |--- ---|#|||66 ||#| #|#||| zz~~~ zzz 1s",
"....|.. |### #||| B B | |l ll ll ll|l| ~~~ 1s",
"....s..||-- --||||| | |l ll ll l|####rHr z~~ >????> zzz 1s",
"....s..||B666B 46B || B w |## | #|?rrr ##~~ rrrrrr s",
". |||||| 666 6B ||||| w #|###llll l#|||r###zT~~ Hr>>rH |",
".. ### B B 666|| | ##|||||--| ##|?r|||||#~~~ ||||s",
".. |||# B B B B||| | |##| ###| ## |||||###### ## |s",
".. |||# B B B B||| | |##| ###| ## - |||||###### ## |s",
".... |# B B 666 || | w C || ~ ||||||666666 ||| |s",
"....s||||###6 666 B##|| | | 444424## r ~~ ||| 6|| B66 1s",
"....#z|||##### ####66 # 4| ||||||| ## ~~ |||## ## 1s",
"....#||------- |----|||||| | |## ~~~~~~~ | |||||w### 1s",
"....s||CCC 4 C C| ||||4 B | || || ~~~~~~~~~~- |||||||###- -|s",
"....sz|C | BC| CCC CCC | | B| ~~||~~~~ 3```| | 4 1s",
"....3##||||| C| ||||| | | C|| ~~~~~~~~~~~ 3```| |BC C 1s",
"..###z1 ||||C CCC CC||| ##||| ~~~~~ | |```| | C C B|s",
"....sz14 | BC -- #| |---| ||||||||CC CCC|s",
"....#z14 || C | #|| ##### w || w 1s",
"...#### ||||||||||||||CCC ##||| ---| ### ||||||||| 41s",
"..|||z|C | C| B B |||||||||||| |CCC |```3 >|| ||CCC CCC|s",
"....s CB |||| CCC CC||#D | C||||| #```3 |#||||C C B|s",
".... CC 4 CCC||B 4##||##3 ##|||###```||||||#3 ||#|####### 1s",
"....s||||###6 666 B##|| | | 444424##-- r ~~ ||| 6|| B66 1s",
"....#z|||##### ####66 # 4| |||||||-## --~~ |||## ## 1s",
"....#||------- |----|||||| | |##|| ~~~~~~~-| |||||w### 1s",
"....s||CCC 4 C C| ||||4 B | || || ~~~~~~~~~~---||||||||##- -|s",
"....sz|C | BC| CCC CCC | | B| ~~--~~~~ |```| | 4 1s",
"....3##||||| C| ||||| | | C|| ~~~~~~~~~~~ ||``| |BC C 1s",
"..###z1 ||||C CCC CC||| ##||| ~~~~~ | M||||`| | C C B|s",
"....sz14 | BC -- #|| ||||| |M|||||||||||CC CCC|s",
"....#z14 || C | #|| | ##||| w || w 1s",
"...#### ||||||||||||||CCC ##||| |---| |## |||||||||| 41s",
"..|||z|C | C| B B |||||||||||| |CCC||```3 >|| ||CCC CCC|s",
"....s CB |||| CCC CC||#D | C||||| |#```3 |#||||C C B|s",
".... CC 4 CCC||B 4##||##3 ##|||#|#```||||||#3 ||#|####### 1s",
".... |||--22-||||||||||| ## ||||||||||||||| ||| ||||||||||||||s",
"....szzzzz|||zzzzzzz|||##| z## |||zzzzz###zzzz1111 ||##zzzzzzzzzzs",
"...##.......||......||.... ##...........||..##......|||||.............",
"....szzzzz|||zzzzzzz|||##| z## |||z||z|###zzzz1111 ||##zzzzzzzzzzs",
"...##.......||......||.... ##...........|||.##......|||||.............",
".#..sssssssssssssssssssssss 3sssssssssssssssssssssssss||sssssssssssssss"
],
"set": [
Expand All @@ -85,12 +85,13 @@
{ "item": "cleaning", "x": [ 11, 11 ], "y": [ 21, 22 ], "chance": 60 },
{ "item": "cleaning", "x": [ 15, 15 ], "y": [ 21, 22 ], "chance": 60 }
],
"monster": { "M": { "monster": "mon_zombie_crushed_giant" } },
"place_monsters": [
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 47 ], "y": [ 0, 23 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 48, 71 ], "y": [ 0, 23 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 24, 47 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 35 ], "y": [ 24, 47 ], "density": 1.5 }
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 47 ], "y": [ 0, 23 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 48, 71 ], "y": [ 0, 23 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 24, 47 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 35 ], "y": [ 24, 47 ], "density": 2.5 }
]
}
},
Expand Down Expand Up @@ -123,32 +124,32 @@
"###################### ###############~~########|~~~~||| ~||||||||####",
"###################### ||||||||||#|####~~#######|~~##| ~ |####",
"#####||||||||||||||||| || |#############|~~~#| 6666|####",
"#####|xppCCppppCCppp6| #|## #### |# ~~~~~######|#~~#|22{{22222222|####",
"#####|xppppppppppppp6| #|# #### #|# ~#~~~######|####| 6666|####",
"#####|222222ppY66ppp6| |##########| # ~~~ # ~~~~## |####",
"#####|ppppp2ppppppppp|# ||| ## ##|# ~~#~~~~~~ #~~~# BB |####",
"#####|p//pp{ppppppppp3# 3##| ##| {~~~~~~~~~~~~~~~~##||||||BB#|| |####",
"#####|ppppp2ppppppppp3 3 #| # + { ## ########~~ #|######### |####",
"#####|222222ppY66ppp6| #|##|###| |||||||||||||||~~~~|###|# # |####",
"#####|xppppppppppppp6| |#|||||| ##|##########~~#|##~~|###|# # ##|####",
"#####|xppCCppppppppp6| |## ##| |#########~~~~~####||||||||||###|####",
"#####||||||||||#ppppp| #| # 66|# #|#~~~~~~~~~~~~~~~~#|########### |####",
"##############|#2{{22| + B|| ||######~~t~~~| ######## |####",
"#####|xppCCppppCCppp|| #|## #### |# ~~~~~######|#~~#|22{{22222222|####",
"#####|xppppppppppppp|| #|# #### #|# ~#~~~######|####| 6666|####",
"#####|222222ppY66ppp|| |##########| # ~~~ # ~~~~## |####",
"#####|ppppp2pppppppp||# ||| ## ##|# ~~#~~~~~~ #~~~# BB |####",
"#####|p//pp{pppppppp33# 3##| ##| {~~~~~~~~~~~~~~~~##||||||BB#|| |####",
"#####|ppppp2pppppppp33 3 #| # + { ## ########~~ #|######### |####",
"#####|222222ppY66ppp|| #|##|###| |||||||||||||||~~~~|###|# # |####",
"#####|xppppppppppppp|| |#|||||| ##|##########~~#|##~~|###|# # ##|####",
"#####|xppCCppppppppp|| |## ##| |#########~~~~~####||||||||||###|####",
"#####||||||||||#pppp|| #| # 66|# #|#~~~~~~~~~~~~~~~~#|########### |####",
"##############|#2{{2|| + B|| ||######~~t~~~| ######## |####",
"################ppppr|# | | ##~~~~~~| |# #### |####",
"#################pppr|33| ####|###|| ##### ~~~||33||## #|####",
"###############pppppp|##||||###| ########~~~~~~~|# # 6#####|####",
"################p##pR|# |######| # ##~~~~####|# #####|####",
"#############||||||||| |######| ######~~~####| ##|#66#########|####",
"#####################| | ####| ##~~######| ###||||||||||||||####",
"#####################| | #####| ###||| ||||||| 3 |#############",
"#####################| 3 ##| ##| 6 |###3~~ 3 |#############",
"####################|| |# | |B6 |###3 | |#############",
"#####################| | #####| ###||| ||||||| #3ppp|#############",
"#####################| 3 ##| ##| 6 |###3~~ 3ppp|#############",
"####################|| |# | |B6 |### |ppp|#############",
"#####||||||||||||||||# |######| | 6 ||||| |||||#############",
"##### # |R |# |######||| + ##### w ||#############",
"##### # |R |# |######||| + ##### #wpp||#############",
"#########|####### #|| ||| ## + #||||| |||||||############",
"#########|###### ## # + # |# #| 3 3 ||#############",
"#########|####### ### + # ######|||###| 3 ||||||#############",
"#########|######## ||||||| #||||||||# #| ||||||###################",
"#########|###### ## # + # |# #|ppp3 3ppp||#############",
"#########|####### ### + # ######|||###|ppp## ||||||#############",
"#########|######## ||||||| #||||||||# #|ppp|##|||###################",
"#########|## R|##### ########| ||||||||#####################",
"#########||||||||||||####### ########| ||############################",
"#####################################||||||#############################",
Expand Down Expand Up @@ -182,13 +183,14 @@
{ "item": "cleaning", "x": [ 15, 15 ], "y": [ 21, 22 ], "chance": 60 }
],
"place_monster": [ { "monster": "mon_tripod", "x": [ 12, 13 ], "y": [ 20, 23 ] } ],
"monster": { " ": { "monster": "mon_zombie_living_wall", "chance": 20 } },
"place_monsters": [
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 0, 19 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 47 ], "y": [ 0, 23 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 48, 71 ], "y": [ 0, 23 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 27, 47 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 47 ], "y": [ 24, 47 ], "density": 1.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 48, 71 ], "y": [ 24, 47 ], "density": 1.5 }
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 0, 15 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 47 ], "y": [ 0, 23 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 48, 71 ], "y": [ 0, 23 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 37, 47 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 24, 47 ], "y": [ 24, 47 ], "density": 2.5 },
{ "monster": "GROUP_COLLAPSED_TOWER", "x": [ 48, 71 ], "y": [ 24, 47 ], "density": 2.5 }
]
}
}
Expand Down
37 changes: 37 additions & 0 deletions data/json/monster_special_attacks/spells.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,42 @@
"min_duration": 1000,
"max_duration": 10000,
"duration_increment": 2000
},
{
"type": "SPELL",
"id": "mon_summon_zombie_gasbag_crawler",
"name": "Summon Gangrenous Crawler",
John-Candlebury marked this conversation as resolved.
Show resolved Hide resolved
"description": "Summons 2 permanent gangrenous crawlers.",
"flags": [ "HOSTILE_SUMMON", "PERMANENT" ],
"valid_targets": [ "ground", "self" ],
"max_level": 1,
"min_damage": 1,
"max_damage": 1,
"min_range": 0,
"max_range": 0,
"min_aoe": 3,
"max_aoe": 3,
"base_casting_time": 3,
"effect": "summon",
"effect_str": "mon_zombie_gasbag_crawler"
},
{
"type": "SPELL",
"id": "crushed_giant_summoning",
"name": "Summon Gangrenous Monsters",
"description": "Summons 2 permanent gangrenous impalers.",
"flags": [ "HOSTILE_SUMMON", "PERMANENT" ],
"valid_targets": [ "ground" ],
"extra_effects": [ { "id": "mon_summon_zombie_gasbag_crawler" } ],
"max_level": 1,
"min_damage": 1,
"max_damage": 1,
"min_range": 0,
"max_range": 0,
"min_aoe": 3,
"max_aoe": 3,
"base_casting_time": 3,
"effect": "summon",
"effect_str": "mon_zombie_gasbag_impaler"
}
]
101 changes: 98 additions & 3 deletions data/json/monsters/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -3892,12 +3892,107 @@
"melee_skill": 3,
"melee_dice": 2,
"melee_dice_sides": 4,
"melee_cut": 0,
"vision_night": 3,
"melee_cut": 2,
"armor_bash": 6,
"armor_cut": 6,
"vision_night": 50,
"harvest": "exempt",
"special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "scratch", 5 ] ],
"death_function": [ "GAS" ],
"flags": [ "SEES", "HEARS", "SMELLS", "WARM", "POISON", "NO_BREATHE", "CLIMBS", "HARDTOSHOOT" ]
"flags": [ "SEES", "HEARS", "SMELLS", "WARM", "POISON", "CLIMBS", "NO_BREATHE", "CLIMBS", "HARDTOSHOOT" ]
},
{
"id": "mon_zombie_gasbag_impaler",
"type": "MONSTER",
"name": "gangrenous impaler",
"description": "A corpse hideously twisted into an insect-like form. A hollow tendril reaches out from its open thorax.",
"default_faction": "zombie",
"bodytype": "spider",
"species": [ "ZOMBIE", "HUMAN" ],
"diff": 14,
"volume": "30000 ml",
"weight": 40750,
"hp": 30,
"speed": 12,
"material": [ "flesh" ],
"symbol": "w",
"color": "yellow_yellow",
"aggression": 100,
"morale": 100,
"melee_skill": 3,
"melee_dice": 2,
"melee_dice_sides": 4,
"melee_cut": 0,
"vision_night": 30,
"armor_bash": 6,
"armor_cut": 6,
"harvest": "exempt",
"starting_ammo": { "barb_paralysis": 100 },
"special_attacks": [
{
"type": "gun",
"cooldown": 2,
John-Candlebury marked this conversation as resolved.
Show resolved Hide resolved
"gun_type": "barb_launcher",
"ranges": [ [ 2, 12, "DEFAULT" ] ],
"description": "The impaler launches a barb!"
},
{ "type": "leap", "cooldown": 15, "max_range": 2, "allow_no_target": true },
[ "scratch", 5 ]
],
"death_function": [ "GAS" ],
"flags": [ "SEES", "HEARS", "SMELLS", "WARM", "POISON", "CLIMBS", "NO_BREATHE", "CLIMBS", "HARDTOSHOOT" ]
},
{
"id": "mon_zombie_crushed_giant",
"type": "MONSTER",
"name": "trapped tendril",
"description": "A great tendril of mutated flesh and sharpened bone. Emergent from a crevice in the ruined floor, hundreds of human limbs seek freedom and writhe incessantly from underneath its grotesque carapace. As enormous as it may already be, you feel certain that this is just part of a creature much bigger, for when it moves, you can feel this whole ruin tremble, as if an unseen giant struggled against the weight of its concrete tomb.",
"default_faction": "zombie",
"volume": "875000 ml",
"weight": 200000,
"species": [ "ZOMBIE", "HUMAN" ],
"diff": 35,
"hp": 500,
"speed": 100,
"material": [ "flesh" ],
"symbol": "S",
"color": "red_yellow",
"aggression": 100,
"morale": 100,
"melee_skill": 7,
"melee_dice": 6,
"melee_dice_sides": 4,
"melee_cut": 10,
"vision_day": 60,
"vision_night": 60,
"harvest": "exempt",
"special_attacks": [ [ "FLESH_TENDRIL", 1 ] ],
"death_function": [ "GAS" ],
"flags": [ "SEES", "HEARS", "SMELLS", "IMMOBILE", "WARM", "POISON", "IMMOBILE", "NO_BREATHE", "FILTHY" ]
},
{
"id": "mon_zombie_living_wall",
"type": "MONSTER",
"name": "flesh wall",
"description": "A great lump of mutated flesh. It resembles the innards of some gigantic creature and is covered in a grid of diminutive veins.",
"default_faction": "zombie",
"volume": "875000 ml",
"weight": 200000,
"species": [ "ZOMBIE", "HUMAN" ],
"diff": 1,
"hp": 3,
"speed": 100,
"material": [ "flesh" ],
"symbol": "#",
"color": "red_yellow",
"morale": 10,
"vision_day": 60,
"vision_night": 60,
"armor_bash": 50,
"armor_cut": 25,
"harvest": "exempt",
"death_function": [ "NORMAL" ],
"flags": [ "SEES", "HEARS", "SMELLS", "IMMOBILE", "WARM", "POISON", "IMMOBILE", "NO_BREATHE", "FILTHY" ]
},
{
"id": "mon_zombie_gasbag_fungus",
Expand Down
Loading