diff --git a/data/mods/Magiclysm/obsolete/camp_placement.json b/data/mods/Magiclysm/obsolete/camp_placement.json index 2497399f684ab..01e5772978bdd 100644 --- a/data/mods/Magiclysm/obsolete/camp_placement.json +++ b/data/mods/Magiclysm/obsolete/camp_placement.json @@ -4,10 +4,6 @@ "type": "camp_migration", "camp_migrations": { "name": "Forge of Wonders", "overmap_terrain": "forge_3A", "faction": "forge_lords" } }, - { - "type": "camp_migration", - "camp_migrations": { "name": "Healer's respite", "overmap_terrain": "magic_shop", "faction": "healers_grey" } - }, { "type": "camp_migration", "camp_migrations": { "name": "Old Wizard", "overmap_terrain": "lake_retreat_z3", "faction": "wizards_ancient" } diff --git a/data/mods/Magiclysm/worldgen/magic_shop.json b/data/mods/Magiclysm/worldgen/city_specials/magic_shop.json similarity index 95% rename from data/mods/Magiclysm/worldgen/magic_shop.json rename to data/mods/Magiclysm/worldgen/city_specials/magic_shop.json index 488d979aa19eb..c312888cc4eed 100644 --- a/data/mods/Magiclysm/worldgen/magic_shop.json +++ b/data/mods/Magiclysm/worldgen/city_specials/magic_shop.json @@ -196,9 +196,15 @@ "K": { "item": "allclothes", "chance": 20, "repeat": [ 1, 2 ] }, "B": { "item": "magic_shop_books", "chance": 20, "repeat": [ 1, 2 ] } }, - "place_npcs": [ { "class": "healer_priest", "x": 10, "y": 10 } ] + "place_nested": [ { "chunks": [ [ "NPC_healer_priest", 20 ], [ "null", 80 ] ], "x": 10, "y": 10 } ] } }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "NPC_healer_priest", + "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "place_npcs": [ { "class": "healer_priest", "x": 0, "y": 0 } ] } + }, { "type": "mapgen", "method": "json", diff --git a/data/mods/Magiclysm/worldgen/multitile_city_buildings.json b/data/mods/Magiclysm/worldgen/multitile_city_buildings.json index 059167bfc9f1c..3767a55c23ed3 100644 --- a/data/mods/Magiclysm/worldgen/multitile_city_buildings.json +++ b/data/mods/Magiclysm/worldgen/multitile_city_buildings.json @@ -4,7 +4,7 @@ "id": "magic_shop", "locations": [ "land" ], "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "magic_shop_north", "camp": "healers_grey", "camp_name": "Healer's respite" }, + { "point": [ 0, 0, 0 ], "overmap": "magic_shop_north" }, { "point": [ 0, 0, 1 ], "overmap": "magic_shop_2ndfloor_north" }, { "point": [ 0, 0, 2 ], "overmap": "magic_shop_roof_north" } ]