From cd034e168d368d70731d0736511562b769388772 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Thu, 2 Jan 2020 21:54:07 +0100 Subject: [PATCH 01/24] Create forest_tomb.json --- data/mods/Magiclysm/worldgen/forest_tomb.json | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 data/mods/Magiclysm/worldgen/forest_tomb.json diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json new file mode 100644 index 0000000000000..0d59d02c4c219 --- /dev/null +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -0,0 +1,70 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "forest_tomb" ], + "//": "Ground level - Z-0.", + "weight": 100, + "object": { + "rows": [ + " S ", + " S ", + " S ", + " S ", + " S ", + " S S ", + " ################## ", + " ################## ", + " S ####..##<<##...### ", + " ###...........####S ", + " ###...##..##...### ", + " ###.####..######## ", + " ###..###.....##### ", + " ###...##..#....### S ", + " S####.###..######## ", + " ########++######## ", + " T T S ", + " S ", + " T T S ", + " S ", + " T T ", + " S ", + " S " + ], + "palettes": [ "tomb" ] + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "forest_tomb" ], + "//": "Underground level - Z -1.", + "weight": 100, + "object": { + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "######..################", + "######.####.......######", + "######.####..###.#######", + "#####....##<<##...######", + "#######.###..###########", + "#######.....############", + "###########..###########", + "###########..###########", + "############.###########", + "###########..###########", + "###########..###########", + "###########..###########", + "########........########", + "########...I....########", + "########.I.H.I..########", + "########..I.I...########", + "########################", + "########################" + ], + "palettes": [ "tomb" ] + }, +] From e245512b4f5783c43a31dc119cce7f7bd1d7e7da Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Thu, 2 Jan 2020 22:09:10 +0100 Subject: [PATCH 02/24] Fix few mistakes. --- data/mods/Magiclysm/worldgen/forest_tomb.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 0d59d02c4c219..9d3e591d3b3e6 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -36,7 +36,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "forest_tomb" ], + "om_terrain": [ "forest_tomb_bottom" ], "//": "Underground level - Z -1.", "weight": 100, "object": { @@ -49,7 +49,7 @@ "######..################", "######.####.......######", "######.####..###.#######", - "#####....##<<##...######", + "#####....##>>##...######", "#######.###..###########", "#######.....############", "###########..###########", @@ -66,5 +66,5 @@ "########################" ], "palettes": [ "tomb" ] - }, + } ] From ea2bc2b7ae1afbf61232b5f0a24136306aef00e8 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Thu, 2 Jan 2020 22:18:52 +0100 Subject: [PATCH 03/24] Lint --- data/mods/Magiclysm/worldgen/forest_tomb.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 9d3e591d3b3e6..03f7e37651693 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -32,8 +32,9 @@ " S " ], "palettes": [ "tomb" ] - }, - { + } + }, + { "type": "mapgen", "method": "json", "om_terrain": [ "forest_tomb_bottom" ], @@ -67,4 +68,5 @@ ], "palettes": [ "tomb" ] } + } ] From 17180eb31af724e7f1745c6f30b62b648eea4279 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Thu, 2 Jan 2020 22:24:42 +0100 Subject: [PATCH 04/24] Add forest tomb to overmap --- data/mods/Magiclysm/worldgen/overmap_terrain.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/mods/Magiclysm/worldgen/overmap_terrain.json b/data/mods/Magiclysm/worldgen/overmap_terrain.json index 00f559ab37660..b3b97e8e812a8 100644 --- a/data/mods/Magiclysm/worldgen/overmap_terrain.json +++ b/data/mods/Magiclysm/worldgen/overmap_terrain.json @@ -299,5 +299,13 @@ "sym": ".", "color": "blue", "see_cost": 5 + }, + { + "type": "overmap_terrain", + "id": "forest_tomb", + "name": "forest", + "sym": "F", + "color": "brown", + "see_cost": 5 } ] From de391abbed413c456a6894792e3c74e3e0bff0a6 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Thu, 2 Jan 2020 22:25:12 +0100 Subject: [PATCH 05/24] Add forest_tomb to list of overmap specials --- data/mods/Magiclysm/worldgen/overmap_specials.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/mods/Magiclysm/worldgen/overmap_specials.json b/data/mods/Magiclysm/worldgen/overmap_specials.json index 793fa84e1f4bb..685c821197bce 100644 --- a/data/mods/Magiclysm/worldgen/overmap_specials.json +++ b/data/mods/Magiclysm/worldgen/overmap_specials.json @@ -114,5 +114,17 @@ "city_sizes": [ 4, 12 ], "occurrences": [ 0, 1 ], "flags": [ "CLASSIC", "LAKE" ] + }, + { + "type": "overmap_special", + "id": "forest_tomb", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "forest_tomb" }, + { "point": [ 0, 0, -1 ], "overmap": "forest_tomb_bottom" } + ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 1 ] } ] From 273a62ff42e2ae19b94b4951c44d03a5a685e8b4 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Fri, 3 Jan 2020 18:11:32 +0100 Subject: [PATCH 06/24] Tweaks. --- data/mods/Magiclysm/worldgen/forest_tomb.json | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 03f7e37651693..04167b7136998 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -1,4 +1,16 @@ [ + { + "type": "palette", + "id": "tomb", + "terrain": { + ".": [ "t_rock_floor" ], + " ": [ [ "t_grass_dead", 2 ], [ "t_dirt", 15 ], [ "t_dirtmound", 3 ], [ "t_rock_floor_no_roof", 8 ] ], + "T": [ "t_tree_dead" ], + "S": [ "t_shrub" ], + "<": [ "t_slope_up" ], + ">": [ "t_slope_down" ], + "#": [ "t_rock" ] + }, { "type": "mapgen", "method": "json", @@ -15,14 +27,14 @@ " S S ", " ################## ", " ################## ", - " S ####..##<<##...### ", - " ###...........####S ", + " S ####..##>>##...### ", + " ###$..........####S ", " ###...##..##...### ", " ###.####..######## ", - " ###..###.....##### ", - " ###...##..#....### S ", - " S####.###..######## ", - " ########++######## ", + " ###..###..$..##### ", + " ###...##..#...x### S ", + " S####x###..######## ", + " ########..######## ", " T T S ", " S ", " T T S ", @@ -47,10 +59,10 @@ "########################", "########################", "########################", - "######..################", + "######.x################", "######.####.......######", - "######.####..###.#######", - "#####....##>>##...######", + "######.####..###.$######", + "#####....##<<##x..######", "#######.###..###########", "#######.....############", "###########..###########", @@ -58,11 +70,11 @@ "############.###########", "###########..###########", "###########..###########", - "###########..###########", + "###########.############", + "########........########", + "########........########", + "########...HZ...########", "########........########", - "########...I....########", - "########.I.H.I..########", - "########..I.I...########", "########################", "########################" ], From f46303acdb1f50535b503c367afa13ef15240b79 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Fri, 3 Jan 2020 18:28:29 +0100 Subject: [PATCH 07/24] Add missing sign --- data/mods/Magiclysm/worldgen/forest_tomb.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 04167b7136998..5377755b73e5c 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -9,7 +9,8 @@ "S": [ "t_shrub" ], "<": [ "t_slope_up" ], ">": [ "t_slope_down" ], - "#": [ "t_rock" ] + "#": [ "t_rock" ] + } }, { "type": "mapgen", From addcfb63f1297b6168235bb3e44bcfc8f9c005c9 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Fri, 3 Jan 2020 19:48:12 +0100 Subject: [PATCH 08/24] Lint --- data/mods/Magiclysm/worldgen/forest_tomb.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 5377755b73e5c..e69a2d53fb718 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -9,10 +9,10 @@ "S": [ "t_shrub" ], "<": [ "t_slope_up" ], ">": [ "t_slope_down" ], - "#": [ "t_rock" ] + "#": [ "t_rock" ] } - }, - { + }, + { "type": "mapgen", "method": "json", "om_terrain": [ "forest_tomb" ], From c6eac50bd63aac055417cd8ccaffca67ed120807 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Fri, 3 Jan 2020 20:26:54 +0100 Subject: [PATCH 09/24] Lint. --- data/mods/Magiclysm/worldgen/overmap_specials.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/overmap_specials.json b/data/mods/Magiclysm/worldgen/overmap_specials.json index 685c821197bce..fbd2026f9bd27 100644 --- a/data/mods/Magiclysm/worldgen/overmap_specials.json +++ b/data/mods/Magiclysm/worldgen/overmap_specials.json @@ -118,10 +118,7 @@ { "type": "overmap_special", "id": "forest_tomb", - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "forest_tomb" }, - { "point": [ 0, 0, -1 ], "overmap": "forest_tomb_bottom" } - ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "forest_tomb" }, { "point": [ 0, 0, -1 ], "overmap": "forest_tomb_bottom" } ], "locations": [ "wilderness" ], "city_distance": [ 20, -1 ], "city_sizes": [ 0, 20 ], From 9c5984c08b0aa36c990717bfc165ac2a9c22f921 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 18:06:54 +0100 Subject: [PATCH 10/24] Add loot, monsters and roof. After that add mentioned new item group. --- data/mods/Magiclysm/worldgen/forest_tomb.json | 78 ++++++++++++++++--- 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index e69a2d53fb718..698da69b7d9c0 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -4,12 +4,30 @@ "id": "tomb", "terrain": { ".": [ "t_rock_floor" ], - " ": [ [ "t_grass_dead", 2 ], [ "t_dirt", 15 ], [ "t_dirtmound", 3 ], [ "t_rock_floor_no_roof", 8 ] ], + " ": [ [ "t_grass_dead", 15 ], [ "t_dirt", 4 ], [ "t_dirtmound", 3 ], [ "t_rock_floor_no_roof", 4 ] ], "T": [ "t_tree_dead" ], "S": [ "t_shrub" ], "<": [ "t_slope_up" ], ">": [ "t_slope_down" ], "#": [ "t_rock" ] + }, + "furniture": { "H": "f_altar" }, + "items": { + "$": { "group": "magic_animist", "chance": 25 }, + "H": { "item": "summon_undead_spellbook", "chance": 100 }, + "Z": { "item": "rune_animist", "chance": 50 } + }, + "monster": { + "x": { "mon_skeleton", "chance": 50 }, + "Z": { "mon_zombie_necro", "chance": 100 } + } + }, + { + "type": "palette", + "id": "tomb_roof", + "terrain": { + ".": [ "t_rock_roof" ], + " ": [ "t_open_air" ], } }, { @@ -19,6 +37,7 @@ "//": "Ground level - Z-0.", "weight": 100, "object": { + "fill_ter": "t_rock_floor", "rows": [ " S ", " S ", @@ -29,12 +48,12 @@ " ################## ", " ################## ", " S ####..##>>##...### ", - " ###$..........####S ", + " ###x..........####S ", " ###...##..##...### ", " ###.####..######## ", - " ###..###..$..##### ", - " ###...##..#...x### S ", - " S####x###..######## ", + " ###..###..x..##### ", + " ###...##..#...$### S ", + " S####$###..######## ", " ########..######## ", " T T S ", " S ", @@ -42,7 +61,8 @@ " S ", " T T ", " S ", - " S " + " S ", + " S " ], "palettes": [ "tomb" ] } @@ -54,16 +74,17 @@ "//": "Underground level - Z -1.", "weight": 100, "object": { + "fill_ter": "t_rock_floor", "rows": [ "########################", "########################", "########################", "########################", "########################", - "######.x################", + "######.$################", "######.####.......######", - "######.####..###.$######", - "#####....##<<##x..######", + "######.####..###.x######", + "#####....##<<##$..######", "#######.###..###########", "#######.....############", "###########..###########", @@ -75,11 +96,48 @@ "########........########", "########........########", "########...HZ...########", - "########........########", + "########$.......########", + "########################", "########################", "########################" ], "palettes": [ "tomb" ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "forest_tomb_roof" ], + "//": "Roof level - Z +1.", + "weight": 100, + "object": { + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " .................. ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "tomb_roof" ] + } } ] From 706ae6eb6179a544aa533732f1f52bb11b975eea Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 18:10:12 +0100 Subject: [PATCH 11/24] Add missing part. --- data/mods/Magiclysm/worldgen/forest_tomb.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 698da69b7d9c0..2c5149d4d35c6 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -18,8 +18,8 @@ "Z": { "item": "rune_animist", "chance": 50 } }, "monster": { - "x": { "mon_skeleton", "chance": 50 }, - "Z": { "mon_zombie_necro", "chance": 100 } + "x": { "monster": "mon_skeleton", "chance": 50 }, + "Z": { "monster": "mon_zombie_necro", "chance": 100 } } }, { From 41f23b43712bc45110bffe807d7d761e2da0aa72 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 18:19:04 +0100 Subject: [PATCH 12/24] Remove unneeded extra signs --- data/mods/Magiclysm/worldgen/forest_tomb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 2c5149d4d35c6..fb1fe1239fab0 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -27,7 +27,7 @@ "id": "tomb_roof", "terrain": { ".": [ "t_rock_roof" ], - " ": [ "t_open_air" ], + " ": [ "t_open_air" ] } }, { From 6dd78b12ce8b6383da59b79e988c78726c0c05a8 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 20:53:45 +0100 Subject: [PATCH 13/24] Lint --- data/mods/Magiclysm/worldgen/forest_tomb.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index fb1fe1239fab0..292c2458e9bf2 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -12,23 +12,17 @@ "#": [ "t_rock" ] }, "furniture": { "H": "f_altar" }, - "items": { + "items": { "$": { "group": "magic_animist", "chance": 25 }, "H": { "item": "summon_undead_spellbook", "chance": 100 }, "Z": { "item": "rune_animist", "chance": 50 } }, - "monster": { - "x": { "monster": "mon_skeleton", "chance": 50 }, - "Z": { "monster": "mon_zombie_necro", "chance": 100 } - } + "monster": { "x": { "monster": "mon_skeleton", "chance": 50 }, "Z": { "monster": "mon_zombie_necro", "chance": 100 } } }, { "type": "palette", "id": "tomb_roof", - "terrain": { - ".": [ "t_rock_roof" ], - " ": [ "t_open_air" ] - } + "terrain": { ".": [ "t_rock_roof" ], " ": [ "t_open_air" ] } }, { "type": "mapgen", From 50ce6e636df77e6dc9837a5c3087aaaef59f5c7a Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 21:00:11 +0100 Subject: [PATCH 14/24] Update map connections --- data/mods/Magiclysm/worldgen/overmap_specials.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/worldgen/overmap_specials.json b/data/mods/Magiclysm/worldgen/overmap_specials.json index fbd2026f9bd27..5bc70d91f610a 100644 --- a/data/mods/Magiclysm/worldgen/overmap_specials.json +++ b/data/mods/Magiclysm/worldgen/overmap_specials.json @@ -118,7 +118,11 @@ { "type": "overmap_special", "id": "forest_tomb", - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "forest_tomb" }, { "point": [ 0, 0, -1 ], "overmap": "forest_tomb_bottom" } ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "forest_tomb" }, + { "point": [ 0, 0, 1 ], "overmap": "forest_tomb_roof" }, + { "point": [ 0, 0, -1 ], "overmap": "forest_tomb_bottom" } + ], "locations": [ "wilderness" ], "city_distance": [ 20, -1 ], "city_sizes": [ 0, 20 ], From e4f9f787e6abaf80b29c57ef14b8094e4cb9f396 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 22:00:22 +0100 Subject: [PATCH 15/24] Add stone altar. --- data/mods/Magiclysm/furniture.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json index f00d97b8108e8..09cf1c852ba66 100644 --- a/data/mods/Magiclysm/furniture.json +++ b/data/mods/Magiclysm/furniture.json @@ -50,5 +50,27 @@ { "item": "orichalcum_sliver", "count": [ 1, 8 ], "prob": 20 } ] } + }, + { + "type": "furniture", + "id": "f_altar", + "name": "stone altar", + "move_cost_mod": 10, + "symbol": "H", + "color": "light_gray", + "coverage": 40, + "required_str": 30, + "flags": [ "BASHABLE" ], + "description": "This is big stone altar. Most commonly used in morally questionable rituals.", + "bash": { + "str_min": 30, + "str_max": 160, + "sound": "smash!", + "sound_fail": "thump.", + "items": [ + { "item": "rock", "count": [ 5, 15 ] }, + { "item": "sharp_rock", "count": [ 3, 5 ] } + ] + } } ] From a4e6d78e86df3a1a56efaa5aab516d8ddc99d416 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sat, 4 Jan 2020 22:05:39 +0100 Subject: [PATCH 16/24] lint --- data/mods/Magiclysm/furniture.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json index 09cf1c852ba66..78dde0daaa071 100644 --- a/data/mods/Magiclysm/furniture.json +++ b/data/mods/Magiclysm/furniture.json @@ -67,10 +67,7 @@ "str_max": 160, "sound": "smash!", "sound_fail": "thump.", - "items": [ - { "item": "rock", "count": [ 5, 15 ] }, - { "item": "sharp_rock", "count": [ 3, 5 ] } - ] + "items": [ { "item": "rock", "count": [ 5, 15 ] }, { "item": "sharp_rock", "count": [ 3, 5 ] } ] } } ] From 8c575ace689527297f9a954db47fdeba94d6f88b Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sun, 5 Jan 2020 09:30:13 +0100 Subject: [PATCH 17/24] Add new item group. --- data/mods/Magiclysm/itemgroups/itemgroups.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index bce0390918afd..9f3c46dc30552 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -591,5 +591,17 @@ { "group": "enchanted_wands_greater", "prob": 20 }, { "group": "enchanted_wands_lesser", "prob": 10 } ] - } + }, + { + "id": "magic_animist", + "//": "A distribution of animist magical scrolls.", + "type": "item_group", + "subtype": "distribution", + "items": [ + { "item": "spell_scroll_smite", "prob": 20 }, + { "item": "spell_scroll_recover_pain", "prob": 20 }, + { "item": "spell_scroll_summon_skeleton", "prob": 20 }, + { "item": "copper_infuser", "prob": 10 } + ] + }, ] From cd91aa97fef5754232aeaba67c8b70419180f422 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sun, 5 Jan 2020 09:35:08 +0100 Subject: [PATCH 18/24] lint --- data/mods/Magiclysm/itemgroups/itemgroups.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index 9f3c46dc30552..3dc5b5a4a2e94 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -603,5 +603,5 @@ { "item": "spell_scroll_summon_skeleton", "prob": 20 }, { "item": "copper_infuser", "prob": 10 } ] - }, + } ] From 4cea2de0c9073e143d4784753b4497e354cb1593 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sun, 5 Jan 2020 16:16:07 +0100 Subject: [PATCH 19/24] remove unneeded parts --- data/mods/Magiclysm/itemgroups/itemgroups.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index 3dc5b5a4a2e94..6571b5826ef2c 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -596,7 +596,6 @@ "id": "magic_animist", "//": "A distribution of animist magical scrolls.", "type": "item_group", - "subtype": "distribution", "items": [ { "item": "spell_scroll_smite", "prob": 20 }, { "item": "spell_scroll_recover_pain", "prob": 20 }, From a69c9c5c129cba94bda2c50121cbb92bf5498ba8 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Sun, 5 Jan 2020 18:47:40 +0100 Subject: [PATCH 20/24] Fix terrains. --- data/mods/Magiclysm/worldgen/forest_tomb.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index 292c2458e9bf2..eade8570f36c6 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -6,6 +6,7 @@ ".": [ "t_rock_floor" ], " ": [ [ "t_grass_dead", 15 ], [ "t_dirt", 4 ], [ "t_dirtmound", 3 ], [ "t_rock_floor_no_roof", 4 ] ], "T": [ "t_tree_dead" ], + "R": [ "t_rubble" ], "S": [ "t_shrub" ], "<": [ "t_slope_up" ], ">": [ "t_slope_down" ], @@ -13,7 +14,7 @@ }, "furniture": { "H": "f_altar" }, "items": { - "$": { "group": "magic_animist", "chance": 25 }, + "R": { "group": "magic_animist", "chance": 25 }, "H": { "item": "summon_undead_spellbook", "chance": 100 }, "Z": { "item": "rune_animist", "chance": 50 } }, @@ -46,8 +47,8 @@ " ###...##..##...### ", " ###.####..######## ", " ###..###..x..##### ", - " ###...##..#...$### S ", - " S####$###..######## ", + " ###...##..#...R### S ", + " S####R###..######## ", " ########..######## ", " T T S ", " S ", @@ -75,10 +76,10 @@ "########################", "########################", "########################", - "######.$################", + "######.R################", "######.####.......######", "######.####..###.x######", - "#####....##<<##$..######", + "#####....##<<##R..######", "#######.###..###########", "#######.....############", "###########..###########", @@ -90,7 +91,7 @@ "########........########", "########........########", "########...HZ...########", - "########$.......########", + "########R......R########", "########################", "########################", "########################" From 35e59fb514ccfb6a65487075031222445741fa45 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Tue, 21 Jan 2020 09:40:11 +0100 Subject: [PATCH 21/24] Tweaks --- data/mods/Magiclysm/worldgen/forest_tomb.json | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/forest_tomb.json b/data/mods/Magiclysm/worldgen/forest_tomb.json index eade8570f36c6..9d060af8ae542 100644 --- a/data/mods/Magiclysm/worldgen/forest_tomb.json +++ b/data/mods/Magiclysm/worldgen/forest_tomb.json @@ -3,16 +3,19 @@ "type": "palette", "id": "tomb", "terrain": { - ".": [ "t_rock_floor" ], + ".": "t_rock_floor", " ": [ [ "t_grass_dead", 15 ], [ "t_dirt", 4 ], [ "t_dirtmound", 3 ], [ "t_rock_floor_no_roof", 4 ] ], - "T": [ "t_tree_dead" ], - "R": [ "t_rubble" ], - "S": [ "t_shrub" ], - "<": [ "t_slope_up" ], - ">": [ "t_slope_down" ], - "#": [ "t_rock" ] + "T": "t_tree_dead", + "R": "t_rubble", + "S": "t_shrub", + "<": "t_slope_up", + ">": "t_slope_down", + "#": "t_rock" + }, + "furniture": { + "H": "f_altar", + "C": "f_coffin_c" }, - "furniture": { "H": "f_altar" }, "items": { "R": { "group": "magic_animist", "chance": 25 }, "H": { "item": "summon_undead_spellbook", "chance": 100 }, @@ -40,16 +43,16 @@ " S ", " S ", " S S ", + " ##<############### ", " ################## ", - " ################## ", - " S ####..##>>##...### ", - " ###x..........####S ", - " ###...##..##...### ", + " S ####C.##>>##..C### ", + " ###x..........###............... ", " .................. ", " .................. ", + " .................> ", " .................. ", " .................. ", " .................. ", " .................. ", " .................. ", - " .................. ", - " .................. ", - " .................. ", + " .............>.... ", " ", " ", " ", From e5b4fe2f5d7ab08e22ec9124915c7017101cc76c Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Tue, 21 Jan 2020 21:44:16 +0100 Subject: [PATCH 22/24] Tweaks --- data/mods/Magiclysm/furniture.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json index ac075a356bb5e..275c0532efd2d 100644 --- a/data/mods/Magiclysm/furniture.json +++ b/data/mods/Magiclysm/furniture.json @@ -129,7 +129,7 @@ { "item": "stopcock", "count": [ 1, 5 ] }, { "item": "flask_glass", "count": [ 1, 3 ] } ] - }, + } "max_volume": "1750 L", "bash": { "str_min": 4, From 97fefbc274fa9d4ebf85bf7036cef7095192a00b Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Tue, 21 Jan 2020 21:46:43 +0100 Subject: [PATCH 23/24] Tweaks --- data/mods/Magiclysm/furniture.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json index 275c0532efd2d..dad69b1e4d7e8 100644 --- a/data/mods/Magiclysm/furniture.json +++ b/data/mods/Magiclysm/furniture.json @@ -88,7 +88,8 @@ { "item": "plastic_chunk", "count": [ 50, 75 ] }, { "item": "wood_panel", "count": [ 1, 2 ] }, { "item": "2x4", "count": [ 3, 4 ] } - ] + ] + }, "max_volume": "1750 L", "bash": { "str_min": 35, @@ -129,7 +130,7 @@ { "item": "stopcock", "count": [ 1, 5 ] }, { "item": "flask_glass", "count": [ 1, 3 ] } ] - } + }, "max_volume": "1750 L", "bash": { "str_min": 4, From 10a676d01c2c9e4d189679825ee67727560cf13c Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Tue, 21 Jan 2020 21:48:17 +0100 Subject: [PATCH 24/24] Add missing type. --- data/mods/Magiclysm/furniture.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json index dad69b1e4d7e8..fb5a11d1c8712 100644 --- a/data/mods/Magiclysm/furniture.json +++ b/data/mods/Magiclysm/furniture.json @@ -69,7 +69,8 @@ "sound_fail": "thump.", "items": [ { "item": "rock", "count": [ 5, 15 ] }, { "item": "sharp_rock", "count": [ 3, 5 ] } ] }, - { + { + "type": "furniture", "id": "f_magic_bench", "name": "enchanter's workbench", "looks_like": "f_table",