From 4e5a04e8e5d0c92c12721433ef5949c33d386be1 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:00:52 -0400 Subject: [PATCH 1/3] magiclysm add black dragon lair --- .../mods/Magiclysm/itemgroups/itemgroups.json | 25 +++ data/mods/Magiclysm/monster_factions.json | 6 +- data/mods/Magiclysm/monstergroups.json | 27 +++ .../Magiclysm/worldgen/black_dragon_lair.json | 174 +++++++++++++----- .../Magiclysm/worldgen/overmap_specials.json | 2 +- 5 files changed, 181 insertions(+), 53 deletions(-) diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index d5ddb9cdf4616..9b041dc4d41c2 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -187,5 +187,30 @@ "type": "item_group", "id": "magic_CBM", "items": [ [ "bio_fuel_cell_blood", 10 ] ] + }, + { + "type": "item_group", + "id": "lair_loot_generic", + "//": "Stuff you would find in any dragon lair, gold, jewelry, etc.", + "items": [ + { "group": "jewelry_safe", "prob": 50 }, + { "group": "jewelry_front", "prob": 8 }, + { "item": "bone_human", "prob": 20, "count-min": 1, "count-max": 5 } + ] + }, + { + "type": "item_group", + "id": "lair_black_dragon", + "//": "Stuff you would find in any dragon lair, gold, jewelry, etc.", + "items": [ + { "item": "bone_human", "prob": 30, "count-min": 1, "count-max": 5 }, + { "group": "archery", "prob": 1 }, + { "group": "jewelry_safe", "prob": 2 }, + { "group": "jewelry_front", "prob": 2 }, + { "group": "corpses", "prob": 20 }, + { "group": "remains_human_generic", "prob": 5, "count-min": 1, "count-max": 2 }, + { "group": "archery_ammo", "prob": 2, "count-min": 1, "count-max": 4 }, + { "group": "medieval", "prob": 1, "count-min": 1, "count-max": 2 } + ] } ] diff --git a/data/mods/Magiclysm/monster_factions.json b/data/mods/Magiclysm/monster_factions.json index 1af4c37b6896b..d273d01c7133c 100644 --- a/data/mods/Magiclysm/monster_factions.json +++ b/data/mods/Magiclysm/monster_factions.json @@ -5,10 +5,12 @@ }, { "type": "MONSTER_FACTION", - "name": "dragon_black" + "name": "dragon_black", + "friendly": [ "ooze" ] }, { "type": "MONSTER_FACTION", - "name": "ooze" + "name": "ooze", + "friendly": [ "dragon_black" ] } ] diff --git a/data/mods/Magiclysm/monstergroups.json b/data/mods/Magiclysm/monstergroups.json index 702e05e5c5c8f..7cf8fa5720c30 100644 --- a/data/mods/Magiclysm/monstergroups.json +++ b/data/mods/Magiclysm/monstergroups.json @@ -43,5 +43,32 @@ "default": "mon_worm", "is_animal": true, "monsters": [ { "monster": "mon_bulette", "freq": 5, "cost_multiplier": 40 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_BLACKDRAGON_LAIR_1", + "default": "mon_null", + "is_animal": true, + "monsters": [ + { "monster": "mon_black_pudding_2", "freq": 14, "cost_multiplier": 0.8, "pack_size": [ 4, 6 ] }, + { "monster": "mon_wisp", "freq": 5, "cost_multiplier": 10, "conditions": [ "NIGHT" ] }, + { "monster": "mon_wisp", "freq": 1, "cost_multiplier": 10, "conditions": [ "NIGHT" ], "pack_size": [ 1, 3 ] }, + { "monster": "mon_bat", "freq": 5, "cost_multiplier": 5, "pack_size": [ 6, 10 ] }, + { "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 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_BLACKDRAGON_LAIR_2", + "default": "mon_null", + "is_animal": true, + "monsters": [ + { "monster": "mon_black_pudding_2", "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 } + ] } ] diff --git a/data/mods/Magiclysm/worldgen/black_dragon_lair.json b/data/mods/Magiclysm/worldgen/black_dragon_lair.json index ccdc62ee552a3..32a70f9ce2899 100644 --- a/data/mods/Magiclysm/worldgen/black_dragon_lair.json +++ b/data/mods/Magiclysm/worldgen/black_dragon_lair.json @@ -11,55 +11,56 @@ "fill_ter": "t_water_sh", "predecessor_mapgen": "forest_water", "rows": [ - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", ".......................>>.......................", ".......................>>.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x.......................", - "........................x......................." + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................", + "................................................" ], + "place_monsters": [ { "monster": "GROUP_SWAMP", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.03, "repeat": [ 4, 10 ] } ], "terrain": { ">": "t_slope_down", "<": "t_slope_up", @@ -146,6 +147,37 @@ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ], + "place_monsters": [ + { "monster": "GROUP_BLACKDRAGON_LAIR_1", "x": [ 4, 23 ], "y": [ 4, 23 ], "density": 0.1, "repeat": [ 4, 10 ] }, + { + "monster": "GROUP_BLACKDRAGON_LAIR_1", + "x": [ 4, 19 ], + "y": [ 24, 44 ], + "density": 0.1, + "repeat": [ 4, 10 ] + }, + { + "monster": "GROUP_BLACKDRAGON_LAIR_1", + "x": [ 24, 44 ], + "y": [ 24, 44 ], + "density": 0.1, + "repeat": [ 4, 10 ] + }, + { + "monster": "GROUP_BLACKDRAGON_LAIR_1", + "x": [ 24, 44 ], + "y": [ 4, 23 ], + "density": 0.1, + "repeat": [ 4, 10 ] + }, + { + "monster": "GROUP_BLACKDRAGON_LAIR_1", + "x": [ 10, 23 ], + "y": [ 10, 23 ], + "density": 0.1, + "repeat": [ 4, 10 ] + } + ], "terrain": { ">": "t_slope_down", "<": "t_slope_up", @@ -172,13 +204,14 @@ "t_shrub" ] }, - "furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large", "1": "f_fog", "2": "f_swamp_gas" } + "furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large", "1": "f_fog", "2": "f_swamp_gas" }, + "items": { ".": [ { "item": "lair_black_dragon", "chance": 5 } ] } } }, { "type": "mapgen", "method": "json", - "//": "z -2, reserved for loot/habitat rooms, should be vaulted x2 with dragon entrances from above?", + "//": "dragon nests, open to cavern below", "om_terrain": [ [ "black_dragon_lair_z-2_NW", "black_dragon_lair_z-2_NE" ], [ "black_dragon_lair_z-2_SW", "black_dragon_lair_z-2_SE" ] @@ -235,8 +268,21 @@ "XXXXXXXXXXX XXXXXXXXXXXXX.....XXXXX ...XX", "XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ], + "place_monster": [ + { "monster": "mon_dragon_black_young", "x": 15, "y": 36, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_young", "x": 30, "y": 26, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_young", "x": 30, "y": 26, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_young", "x": 30, "y": 26, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_wyrmling", "x": 41, "y": 45, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_wyrmling", "x": 17, "y": 2, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_wyrmling", "x": 9, "y": 17, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_wyrmling", "x": 30, "y": 2, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_wyrmling", "x": 3, "y": 12, "repeat": [ 1, 2 ], "chance": 100 }, + { "monster": "mon_dragon_black_wyrmling", "x": 12, "y": 45, "repeat": [ 1, 2 ], "chance": 100 } + ], "terrain": { "X": "t_rock", " ": "t_sand", ".": "t_open_air_rooved", ">": "t_slope_down", "<": "t_slope_up" }, - "furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large" } + "furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large" }, + "items": { " ": [ { "item": "lair_loot_generic", "chance": 10, "repeat": [ 2, 4 ] } ] } } }, { @@ -299,6 +345,18 @@ "XXXXXXXXXXXXXXXXXXXXXXXXXXXX.....XXXXXXXXXX XX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ], + "place_monsters": [ + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 5, "y": 5, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 35, "y": 3, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 20, "y": 14, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 37, "y": 14, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 23, "y": 17, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 20, "y": 32, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 39, "y": 33, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 41, "y": 40, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 5, "y": 40, "density": 0.1, "repeat": [ 4, 10 ] }, + { "monster": "GROUP_BLACKDRAGON_LAIR_2", "x": 20, "y": 43, "density": 0.1, "repeat": [ 4, 10 ] } + ], "terrain": { ">": "t_slope_down", "<": "t_slope_up", @@ -323,7 +381,15 @@ "t_shrub" ] }, - "furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large", "1": "f_fog", "2": "f_swamp_gas" } + "furniture": { "a": "f_boulder_small", "c": "f_boulder_medium", "b": "f_boulder_large", "1": "f_fog", "2": "f_swamp_gas" }, + "items": { + ".": [ { "item": "lair_black_dragon", "chance": 15, "repeat": [ 0, 2 ] } ], + " ": [ + { "item": "lair_black_dragon", "chance": 10, "repeat": [ 0, 2 ] }, + { "item": "spellbook_loot_1", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "spellbook_loot_2", "chance": 20, "repeat": [ 1, 2 ] } + ] + } } }, { @@ -386,6 +452,14 @@ "XXXXXXXX XX", "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 } + ], "terrain": { "<": "t_slope_up", "X": "t_rock", " ": "t_water_dp_underground" } } } diff --git a/data/mods/Magiclysm/worldgen/overmap_specials.json b/data/mods/Magiclysm/worldgen/overmap_specials.json index 863e09b77ce9d..7d19e942fe156 100644 --- a/data/mods/Magiclysm/worldgen/overmap_specials.json +++ b/data/mods/Magiclysm/worldgen/overmap_specials.json @@ -48,6 +48,6 @@ "locations": [ "wilderness" ], "city_distance": [ 20, -1 ], "city_sizes": [ 0, 20 ], - "occurrences": [ 0, 0 ] + "occurrences": [ 0, 1 ] } ] From b4d33ecd61fb855d26a6ef8a6957c4f064676d33 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:02:05 -0400 Subject: [PATCH 2/3] Update monstergroups.json --- data/mods/Magiclysm/monstergroups.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/monstergroups.json b/data/mods/Magiclysm/monstergroups.json index 7cf8fa5720c30..1c9e8c4c8a766 100644 --- a/data/mods/Magiclysm/monstergroups.json +++ b/data/mods/Magiclysm/monstergroups.json @@ -50,7 +50,7 @@ "default": "mon_null", "is_animal": true, "monsters": [ - { "monster": "mon_black_pudding_2", "freq": 14, "cost_multiplier": 0.8, "pack_size": [ 4, 6 ] }, + { "monster": "mon_black_pudding", "freq": 14, "cost_multiplier": 0.8, "pack_size": [ 4, 6 ] }, { "monster": "mon_wisp", "freq": 5, "cost_multiplier": 10, "conditions": [ "NIGHT" ] }, { "monster": "mon_wisp", "freq": 1, "cost_multiplier": 10, "conditions": [ "NIGHT" ], "pack_size": [ 1, 3 ] }, { "monster": "mon_bat", "freq": 5, "cost_multiplier": 5, "pack_size": [ 6, 10 ] }, @@ -66,7 +66,7 @@ "default": "mon_null", "is_animal": true, "monsters": [ - { "monster": "mon_black_pudding_2", "freq": 14, "cost_multiplier": 0.8, "pack_size": [ 4, 6 ] }, + { "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 } ] From e7a41b2e2c2ada8849937d6f1b09821164b8d6c3 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:10:59 -0400 Subject: [PATCH 3/3] Update overmap_specials.json resuppress map --- data/mods/Magiclysm/worldgen/overmap_specials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/worldgen/overmap_specials.json b/data/mods/Magiclysm/worldgen/overmap_specials.json index 7d19e942fe156..863e09b77ce9d 100644 --- a/data/mods/Magiclysm/worldgen/overmap_specials.json +++ b/data/mods/Magiclysm/worldgen/overmap_specials.json @@ -48,6 +48,6 @@ "locations": [ "wilderness" ], "city_distance": [ 20, -1 ], "city_sizes": [ 0, 20 ], - "occurrences": [ 0, 1 ] + "occurrences": [ 0, 0 ] } ]