Skip to content

Commit

Permalink
Mansion Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Termineitor244
Termineitor244 committed Apr 2, 2024
1 parent d2b51fd commit 2ee1afc
Show file tree
Hide file tree
Showing 8 changed files with 322 additions and 123 deletions.
5 changes: 3 additions & 2 deletions data/json/effects_on_condition/scenario_specific_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
{ "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" },
{
"u_run_monster_eocs": [ { "id": "EOC_BANISH_MONSTERS_AROUND_PLAYER", "effect": { "run_eocs": "EOC_BANISH_SELF" } } ],
"monster_range": 6
"mtype_ids": [ "mon_zombie", "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake", "mon_feral_maid_knife" ],
"monster_range": 10
}
]
},
Expand Down Expand Up @@ -111,7 +112,7 @@
{
"u_spawn_monster": "GROUP_MANSION_START",
"group": true,
"real_count": 20,
"real_count": 15,
"min_radius": 0,
"max_radius": 36,
"target_var": { "u_val": "mansion_centre" },
Expand Down
104 changes: 57 additions & 47 deletions data/json/mapgen/mansion.json
View file

Large diffs are not rendered by default.

54 changes: 32 additions & 22 deletions data/json/mapgen/mansion_boarded.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"K": { "item": "crate_cleaning", "chance": 100 },
"I": { "item": "table_foyer", "chance": 40 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
},
"furniture": { "&": "f_sofa" },
"items": { " ": { "item": "clutter_mansion", "chance": 2 }, "c": { "item": "suit_of_armor", "chance": 100 } },
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -142,7 +142,7 @@
"x": { "item": "a_television", "chance": 100 },
"c": { "item": "suit_of_armor", "chance": 100 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -226,15 +226,24 @@
{ "item": "tailorbooks", "chance": 60, "repeat": [ 0, 1 ] },
{ "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] }
],
"f": [
{ "item": "snacks_fancy", "chance": 65, "repeat": [ 1, 2 ] },
{ "item": "table_sideboard", "chance": 40, "repeat": [ 2, 3 ] }
],
"D": [ { "item": "sex_lair", "chance": 75, "repeat": [ 2, 3 ] }, { "item": "ss_merch_1", "chance": 55, "repeat": [ 2, 3 ] } ],
"d": [
{ "item": "clothing_fancy", "chance": 75, "repeat": [ 2, 3 ] },
{ "item": "beauty", "chance": 75, "repeat": [ 2, 3 ] }
],
"h": [ { "item": "backroom", "chance": 55, "repeat": [ 1, 2 ] }, { "item": "tools_lighting", "chance": 100 } ],
".": { "item": "clutter_basement" },
"=": { "item": "sex_lair", "chance": 25, "repeat": [ 2, 4 ] },
"!": { "item": "crate_stack", "chance": 100 },
"D": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] },
"d": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] }
"$": { "item": "creepy", "chance": 25 }
},
"place_monster": [
{ "group": "GROUP_ZOMBIE", "x": [ 2, 23 ], "y": [ 2, 12 ], "chance": 35, "repeat": [ 1, 4 ] },
{ "monster": "mon_zombie_resort_dancer", "x": [ 5, 19 ], "y": [ 16, 18 ], "chance": 50, "repeat": [ 1, 2 ] }
{ "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 2, 23 ], "y": [ 2, 12 ], "chance": 35, "repeat": [ 2, 3 ] },
{ "monster": "mon_zombie_resort_dancer", "x": [ 5, 19 ], "y": [ 16, 18 ], "chance": 33, "repeat": [ 1, 2 ] }
],
"place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": [ 5, 10 ], "y": [ 16, 18 ] } ]
}
Expand Down Expand Up @@ -286,7 +295,7 @@
"s": { "item": "nightstand", "chance": 40 },
"d": { "item": "dresser_stack", "chance": 100 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -334,17 +343,18 @@
"~": { "item": "clutter_bathroom", "chance": 10 },
")": { "item": "bed", "chance": 40 },
"R": { "item": "mansion_bookcase", "chance": 100 },
"6": { "item": "panic_room", "chance": 65, "repeat": [ 2, 6 ] },
"6": { "item": "panic_room", "chance": 75, "repeat": [ 2, 6 ] },
"I": { "item": "nightstand", "chance": 40 },
"d": { "item": "dresser_stack", "chance": 100 }
},
"place_loot": [
{ "group": "corpse_mansion", "x": [ 10, 12 ], "y": [ 5, 7 ], "chance": 50, "repeat": [ 0, 2 ] },
{ "item": "television", "x": 12, "y": 17, "chance": 100 }
],
"//": "Flavor spawn group for panic rooms with a different configuration of monsters for better story-telling.",
"place_monster": [
{ "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 35, "repeat": [ 1, 4 ] },
{ "group": "GROUP_ZOMBIE", "x": [ 11, 13 ], "y": [ 6, 10 ], "chance": 65, "repeat": [ 1, 2 ] }
{ "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 35, "repeat": [ 2, 3 ] },
{ "group": "GROUP_FANCY_PANICROOM", "x": [ 11, 13 ], "y": [ 6, 10 ], "chance": 65, "repeat": [ 1, 2 ] }
],
"place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": [ 10, 13 ], "y": [ 3, 4 ] } ]
}
Expand Down Expand Up @@ -407,7 +417,7 @@
",": { "item": "clutter_bathroom", "chance": 15 },
"I": { "item": "vanity", "chance": 30 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -462,7 +472,7 @@
{ "item": "stereo", "x": 4, "y": 4, "chance": 100 },
{ "item": "television", "x": 14, "y": 9, "chance": 100 }
],
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -514,7 +524,7 @@
"J": { "item": "table_sideboard", "chance": 35 },
"x": { "item": "table_livingroom", "chance": 35 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 15 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 15 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -616,7 +626,7 @@
"i": { "item": "pool_side", "chance": 30 },
",": { "item": "pool_side", "chance": 2 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE_POOL", "x": [ 9, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_ZOMBIE_POOL", "x": [ 9, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -679,7 +689,7 @@
"1": { "item": "wetbar_stack", "chance": 100 },
"l": { "item": "snacks_fancy", "chance": 30 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 9, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 9, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -742,7 +752,7 @@
"J": { "item": "wetbar_stack", "chance": 100 },
"l": { "item": "table_livingroom", "chance": 30 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 6, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 6, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -803,7 +813,7 @@
",": { "item": "clutter_bathroom", "chance": 10 },
"i": { "item": "wetbar_counter", "chance": 30 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 9, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 9, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -857,7 +867,7 @@
"R": { "item": "mansion_bookcase", "chance": 100 },
")": { "item": "table_livingroom", "chance": 30 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 5, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 5, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -918,7 +928,7 @@
"s": { "item": "snacks_fancy", "chance": 20 },
"∞": { "item": "mansion_guns", "chance": 100 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 15, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 15, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -966,7 +976,7 @@
"R": { "item": "mansion_bookcase", "chance": 100 },
"s": { "item": "nightstand", "chance": 35 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 10, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 10, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -1018,7 +1028,7 @@
",": { "item": "softdrugs", "chance": 40 },
"?": { "item": "dresser_servant", "chance": 45 }
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 18, 23 ], "y": [ 8, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
"place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 18, 23 ], "y": [ 8, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
}
}
]
6 changes: 3 additions & 3 deletions data/json/monstergroups/misc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
"name": "GROUP_MANSION_START",
"//": "Nonsense ferals for the mansion escape challenge scenario, shouldn't be used for general spawns",
"monsters": [
{ "monster": "mon_feral_maid_broom", "weight": 400 },
{ "monster": "mon_feral_maid_candlestick", "weight": 400 },
{ "monster": "mon_feral_maid_broom", "weight": 600 },
{ "monster": "mon_feral_maid_candlestick", "weight": 600 },
{ "monster": "mon_feral_maid_knife", "weight": 400 },
{ "monster": "mon_feral_fancy_rapier", "weight": 300 },
{ "monster": "mon_feral_fancy_rapier", "weight": 200 },
{ "monster": "mon_feral_fancy_rapier_fake", "weight": 300 }
]
},
Expand Down
35 changes: 35 additions & 0 deletions data/json/monstergroups/zombies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,41 @@
{ "monster": "mon_dog_zombie_cop", "weight": 50, "cost_multiplier": 2, "pack_size": [ 1, 2 ] }
]
},
{
"name": "GROUP_PANICROOM",
"type": "monstergroup",
"//": "Flavor spawn group for panic rooms for better story-telling. Improved chance of dogs, fancy dogs, and (still) breathing people and children.",
"monsters": [
{ "monster": "mon_zombie_child", "weight": 180 },
{ "monster": "mon_zombie", "weight": 120, "cost_multiplier": 2 },
{ "group": "GROUP_CIVILIANS_STANDARD", "weight": 200 },
{ "group": "GROUP_FERAL", "weight": 150, "cost_multiplier": 2 },
{ "group": "GROUP_PET_DOGS", "weight": 100, "cost_multiplier": 2 },
{ "monster": "mon_dog_rottweiler", "weight": 100, "cost_multiplier": 2 },
{ "monster": "mon_dog_gpyrenees", "weight": 100, "cost_multiplier": 2 },
{ "monster": "mon_zombie_dog", "weight": 20 }
]
},
{
"name": "GROUP_FANCY_PANICROOM",
"type": "monstergroup",
"//": "Same as above, but with the fancy ferals thrown into the mix for the scenario.",
"monsters": [
{ "monster": "mon_zombie_child", "weight": 250 },
{ "monster": "mon_zombie", "weight": 20, "cost_multiplier": 2 },
{ "group": "GROUP_CIVILIANS_STANDARD", "weight": 100 },
{ "group": "GROUP_FERAL", "weight": 50, "cost_multiplier": 2 },
{ "monster": "mon_feral_maid_broom", "weight": 20 },
{ "monster": "mon_feral_maid_candlestick", "weight": 20 },
{ "monster": "mon_feral_maid_knife", "weight": 20 },
{ "monster": "mon_feral_fancy_rapier", "weight": 140, "cost_multiplier": 5 },
{ "monster": "mon_feral_fancy_rapier_fake", "weight": 100, "cost_multiplier": 3 },
{ "group": "GROUP_PET_DOGS", "weight": 100, "cost_multiplier": 2 },
{ "monster": "mon_dog_rottweiler", "weight": 100, "cost_multiplier": 2 },
{ "monster": "mon_dog_gpyrenees", "weight": 100, "cost_multiplier": 2 },
{ "monster": "mon_zombie_dog", "weight": 20 }
]
},
{
"type": "monstergroup",
"name": "GROUP_ZOMBULL_FROG_UPGRADE",
Expand Down
25 changes: 16 additions & 9 deletions data/json/monsters/feral_humans.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,10 @@
"description": "Once a fancy servant of some rich family, this maniac walks around with a broom in hand, searching for a victim to sweep off this mortal coil.",
"copy-from": "mon_feral_human_pipe",
"melee_skill": 2,
"special_attacks": [ { "id": "feral_weapon_broom" } ],
"special_attacks": [ { "id": "feral_weapon_broom" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ] ],
"extend": { "flags": [ "CLIMBS" ] },
"delete": { "flags": [ "BASHES", "GROUP_BASH" ] },
"//2": "Removed bashing and added CLIMBS to avoid them from trashing too much the mansion.",
"death_drops": "feral_maids_death_drops_broom"
},
{
Expand All @@ -280,7 +283,7 @@
"copy-from": "mon_feral_maid_broom",
"name": { "str": "feral servant" },
"description": "Once a fancy servant of some rich family, this maniac walks around with a candlestick in hand, ready to snuff out your life.",
"special_attacks": [ { "id": "feral_weapon_candlestick" } ],
"special_attacks": [ { "id": "feral_weapon_candlestick" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ] ],
"death_drops": "feral_maids_death_drops_candlestick"
},
{
Expand All @@ -290,7 +293,7 @@
"name": { "str": "feral servant" },
"description": "Once a fancy servant of some rich family, this maniac walks around with a knife in hand, searching for some victims to butcher.",
"melee_skill": 3,
"special_attacks": [ { "id": "feral_weapon_knife_chef" } ],
"special_attacks": [ { "id": "feral_weapon_knife_chef" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ] ],
"death_drops": "feral_maids_death_drops_knife"
},
{
Expand All @@ -300,7 +303,7 @@
"name": { "str": "well dressed feral" },
"description": "Wearing fancy clothes and with a rapier in hand, this maniac was once a socialite. They smile with madness and seem like they want to invite you to dinner.",
"melee_skill": 4,
"special_attacks": [ { "id": "feral_weapon_rapier" } ],
"special_attacks": [ { "id": "feral_weapon_rapier" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 400 ] ],
"death_drops": "feral_fancy_death_drops_rapier"
},
{
Expand All @@ -309,7 +312,7 @@
"copy-from": "mon_feral_fancy_rapier",
"name": { "str": "well dressed feral" },
"description": "Wearing fancy clothes and with a rapier in hand, this maniac was once a socialite. They smile with madness and seem like they want to invite you to dinner.",
"special_attacks": [ { "id": "feral_weapon_rapier_fake" } ],
"special_attacks": [ { "id": "feral_weapon_rapier_fake" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 400 ] ],
"death_drops": "feral_fancy_death_drops_rapier_fake"
},
{
Expand All @@ -320,10 +323,14 @@
"color": "i_magenta",
"description": "Clad in ancient armor and with a mace in hand, this maniac walks around in search of their next prey. You can see stains of dried blood all over their mace.",
"melee_skill": 3,
"speed": 85,
"special_attacks": [ { "id": "feral_weapon_mace" } ],
"speed": 75,
"special_attacks": [ { "id": "feral_weapon_mace" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 600 ] ],
"death_drops": "feral_armored_death_drops_mace",
"extend": { "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ] },
"extend": {
"flags": [ "LOUDMOVES", "BASHES", "GROUP_BASH" ],
"weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ]
},
"delete": { "flags": [ "CLIMBS" ] },
"//": "No synthetic armor proficiency because plate armor doesn't work the same as modern armor",
"armor": { "bash": 20, "cut": 20, "stab": 15, "bullet": 12 }
},
Expand All @@ -334,7 +341,7 @@
"color": "i_magenta",
"name": { "str": "armored feral" },
"description": "Clad in ancient armor and with a battle axe in hand, this maniac walks around in search of their next prey. You can see stains of dried blood all over their axe.",
"special_attacks": [ { "id": "feral_weapon_battleaxe" } ],
"special_attacks": [ { "id": "feral_weapon_battleaxe" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 600 ] ],
"death_drops": "feral_armored_death_drops_battleaxe"
},
{
Expand Down
Loading

0 comments on commit 2ee1afc

Please sign in to comment.