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.

Sign up for GitHub

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

[Magiclysm] update black dragon lair #35919

Merged
merged 8 commits into from
Dec 8, 2019
Merged

[Magiclysm] update black dragon lair #35919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f3e687
update black dragon lair
curstwist Dec 7, 2019
f812c98
update dragon
curstwist Dec 7, 2019
bb8df57
Update data/mods/Magiclysm/monstergroups.json
curstwist Dec 7, 2019
e9f7c96
Merge branch 'master' into pr/35919
KorGgenT Dec 7, 2019
d922b55
Merge branch 'black-dragon-lair-updates' of https://github.com/curstw…
KorGgenT Dec 7, 2019
ac6f82c
update lair loot for treasure rooms
curstwist Dec 7, 2019
87e6f48
fix item group name
curstwist Dec 8, 2019
994a408
Merge branch 'master' into pr/35919
KorGgenT Dec 8, 2019
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
14 changes: 14 additions & 0 deletions data/mods/Magiclysm/itemgroups/itemgroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,5 +571,19 @@
{ "group": "enchanted_melee_weapons_plus1", "prob": 2 },
{ "group": "enchanted_small_items", "prob": 1 }
]
},
{
"id": "boss_treasure_items",
"//": "A distribution of rare magical items treasure rooms.",
"type": "item_group",
"subtype": "distribution",
"items": [
{ "group": "enchanted_combat_items", "prob": 20 },
{ "group": "enchanted_misc", "prob": 40 },
{ "group": "enchanted_rings_unusual", "prob": 10 },
{ "group": "enchanted_rings_rare", "prob": 20 },
{ "group": "enchanted_wands_greater", "prob": 20 },
{ "group": "enchanted_wands_lesser", "prob": 10 }
]
}
]
30 changes: 27 additions & 3 deletions data/mods/Magiclysm/monstergroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,42 @@
{ "monster": "mon_rattlesnake", "freq": 5, "cost_multiplier": 1 },
{ "monster": "mon_rattlesnake_giant", "freq": 5, "cost_multiplier": 2 },
{ "monster": "mon_black_rat", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_dragon_black_wyrmling", "freq": 2, "cost_multiplier": 50 }
{ "monster": "mon_dragon_black_wyrmling", "freq": 2, "cost_multiplier": 50 },
{ "monster": "mon_lizardfolk_warrior", "freq": 20, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
{ "monster": "mon_lizardfolk_hunter", "freq": 30, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_crocodile", "freq": 20, "cost_multiplier": 10, "pack_size": [ 1, 4 ] },
{ "monster": "mon_lizardfolk_shaman", "freq": 2, "cost_multiplier": 30 },
{ "monster": "mon_lizardfolk_chieftan", "freq": 1, "cost_multiplier": 50 }
]
},
{
"type": "monstergroup",
"name": "GROUP_BLACKDRAGON_LAIR_2",
"default": "mon_null",
"default": "mon_lizardfolk_warrior",
"is_animal": true,
"monsters": [
{ "monster": "mon_black_pudding", "freq": 14, "cost_multiplier": 0.8, "pack_size": [ 4, 6 ] },
{ "monster": "mon_dragon_black_wyrmling", "freq": 2, "cost_multiplier": 50 },
{ "monster": "mon_dragon_black_young", "freq": 1, "cost_multiplier": 65 }
{ "monster": "mon_dragon_black_young", "freq": 1, "cost_multiplier": 65 },
{ "monster": "mon_lizardfolk_warrior", "freq": 20, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
{ "monster": "mon_lizardfolk_hunter", "freq": 30, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_crocodile", "freq": 30, "cost_multiplier": 30, "pack_size": [ 1, 4 ] },
{ "monster": "mon_lizardfolk_shaman", "freq": 10, "cost_multiplier": 30 },
{ "monster": "mon_lizardfolk_chieftan", "freq": 10, "cost_multiplier": 50 }
]
},
{
"type": "monstergroup",
"name": "GROUP_LIZARDFOLK",
"default": "mon_lizardfolk_warrior",
"//": "A lizard humanoid race, they are allies and servants of the black dragons.",
"is_animal": true,
"monsters": [
{ "monster": "mon_lizardfolk_warrior", "freq": 20, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
{ "monster": "mon_lizardfolk_hunter", "freq": 30, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_crocodile", "freq": 30, "cost_multiplier": 30, "pack_size": [ 1, 4 ] },
{ "monster": "mon_lizardfolk_shaman", "freq": 10, "cost_multiplier": 30 },
{ "monster": "mon_lizardfolk_chieftan", "freq": 10, "cost_multiplier": 50 }
]
}
]
1 change: 1 addition & 0 deletions data/mods/Magiclysm/monsters/dragon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
"dodge": 3,
"//": "Large means powerful, but it does not mean fast.",
"speed": 100,
"delete": { "flags": [ "PATH_AVOID_DANGER_2" ] },
"emit_fields": [ "emit_dragon_adult_fright" ],
"special_attacks": [
{ "type": "bite", "cooldown": 10 },
Expand Down
74 changes: 51 additions & 23 deletions data/mods/Magiclysm/worldgen/black_dragon_lair.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
".......................>>.......................",
".......................>>.......................",
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
"................................................",
"........................~~......................",
"......................~1~~......................",
"....................~~a~~a2~....................",
".............1......||| |||....................",
"..............~~~..~| |~~~.~~1~............",
"............~~i~i~.~| ____ |~~~~~~~.~~..........",
"..............~~~..e| _>>_ |e~g~~~g~~i~.........",
"...................~ _>>_ ~~g~f~g~~~~.........",
"...................e| ____ |e~g~~~g~............",
".................1`~| |~~~~~.~~............",
"...............~~~~~||| |||~.~i~~..............",
"..............~~i~~~~~a~~a~~...~~...............",
"...............~~.~~.~~~~1~.....................",
".......................~~.......................",
"................................................",
"................................................",
"................................................",
Expand All @@ -60,11 +60,19 @@
"................................................",
"................................................"
],
"place_monsters": [ { "monster": "GROUP_SWAMP", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.03, "repeat": [ 4, 10 ] } ],
"terrain": {
"~": "t_sand",
"f": "t_sand",
"_": "t_floor_blue",
" ": "t_floor_green",
"|": "t_rock_smooth",
"e": "t_rock_blue",
"a": "t_rock_green",
">": "t_slope_down",
"<": "t_slope_up",
"X": "t_rock",
"g": "t_trunk",
"i": "t_improvised_shelter",
".": [
[ "t_grass_tall", 5 ],
[ "t_grass_dead", 4 ],
Expand All @@ -84,7 +92,19 @@
"t_shrub"
]
},
"furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large" }
"furniture": {
"d": "f_boulder_small",
"c": "f_boulder_medium",
"b": "f_boulder_large",
"f": "f_firering",
"1": "f_fog",
"2": "f_swamp_gas"
},
"place_monsters": [
{ "monster": "GROUP_LIZARDFOLK", "x": [ 4, 19 ], "y": [ 24, 44 ], "density": 0.1, "repeat": [ 1, 3 ] },
{ "monster": "GROUP_LIZARDFOLK", "x": [ 24, 44 ], "y": [ 24, 44 ], "density": 0.1, "repeat": [ 1, 3 ] },
{ "monster": "GROUP_LIZARDFOLK", "x": [ 24, 44 ], "y": [ 4, 23 ], "density": 0.1, "repeat": [ 1, 3 ] }
]
}
},
{
Expand Down Expand Up @@ -383,9 +403,17 @@
]
},
"furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large", "1": "f_fog", "2": "f_swamp_gas" },
"place_items": [ { "item": "boss_treasure_items", "x": 44, "y": 46, "chance": 100 } ],
"items": {
".": [ { "item": "lair_black_dragon", "chance": 15, "repeat": [ 0, 2 ] } ],
" ": [ { "item": "lair_black_dragon_treasure", "chance": 80 } ]
" ": [
{ "item": "lair_black_dragon", "chance": 10, "repeat": [ 0, 2 ] },
{ "item": "enchanted_small_items", "chance": 10, "repeat": [ 0, 2 ] },
{ "item": "enchanted_combat_items", "chance": 10, "repeat": [ 0, 2 ] },
{ "item": "enchanted_melee_weapons_plus2", "chance": 5 },
{ "item": "spellbook_loot_1", "chance": 50, "repeat": [ 1, 2 ] },
{ "item": "spellbook_loot_2", "chance": 20, "repeat": [ 1, 2 ] }
]
}
}
},
Expand Down Expand Up @@ -450,12 +478,12 @@
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
],
"place_monster": [
{ "monster": "mon_gator", "x": 10, "y": 2, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_gator", "x": 24, "y": 9, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_gator", "x": 20, "y": 19, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_gator", "x": 14, "y": 33, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_gator", "x": 7, "y": 18, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_gator", "x": 20, "y": 45, "repeat": [ 1, 2 ], "chance": 50 }
{ "monster": "mon_crocodile", "x": 10, "y": 2, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_crocodile", "x": 24, "y": 9, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_crocodile", "x": 20, "y": 19, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_crocodile", "x": 14, "y": 33, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_crocodile", "x": 7, "y": 18, "repeat": [ 1, 2 ], "chance": 50 },
{ "monster": "mon_crocodile", "x": 20, "y": 45, "repeat": [ 1, 2 ], "chance": 50 }
],
"terrain": { "<": "t_slope_up", "X": "t_rock", " ": "t_water_dp_underground" }
}
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/worldgen/overmap_specials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"locations": [ "forest_with_swamp" ],
"city_distance": [ 20, -1 ],
"city_sizes": [ 0, 20 ],
"occurrences": [ 0, 0 ]
"occurrences": [ 0, 1 ]
},
{
"type": "overmap_special",
Expand Down