summaryrefslogtreecommitdiff
path: root/hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch
diff options
context:
space:
mode:
Diffstat (limited to 'hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch')
-rw-r--r--hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch100
1 files changed, 0 insertions, 100 deletions
diff --git a/hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch b/hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch
deleted file mode 100644
index 081464a..0000000
--- a/hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 0992ddd7cea7c1f16101951367fa8a222d67f8b0 Mon Sep 17 00:00:00 2001
-From: 0Monet <146018959+0Monet@users.noreply.github.com>
-Date: Fri, 22 Mar 2024 22:58:30 +0100
-Subject: [PATCH] fix: mapgen fix for level 0 of the Necropolis (#4380)
-
-* Add symbols to the palette
-
-* Change symbols
----
- data/json/mapgen/necropolis/necropolis.json | 17 +++++++++--------
- .../necropolis/necropolis_a.json | 10 ++++++++--
- 2 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/data/json/mapgen/necropolis/necropolis.json b/data/json/mapgen/necropolis/necropolis.json
-index 32b64ed0835..111d183670e 100644
---- a/data/json/mapgen/necropolis/necropolis.json
-+++ b/data/json/mapgen/necropolis/necropolis.json
-@@ -98,6 +98,7 @@
- "..........................ss_______,,_______ss..|-www-[[-www-|777777778."
- ],
- "palettes": [ "necropolis_a" ],
-+ "terrain": { "1": "t_floor", "2": "t_floor", "3": "t_floor" },
- "furniture": { "1": "f_rack", "2": "f_rack", "3": "f_counter" },
- "items": {
- "1": { "item": "farming_tools", "chance": 30 },
-@@ -649,18 +650,18 @@
- "...........sssssss{{{s8ssssMMMMsMsMMMMMmmmmmmmmmMMMMMssssMssMssMssssssss",
- "...........sss{{{sssssMsMMsMssMssMMMMMmm]]]]]]]mmMMMMMsMsMssssssssssssMs",
- "......|--------{{{--sssssssssMM_MMMMMmm]]]]]]]]]mmMMMMM__MMMM_M___M_____",
-- "......| 33 222{{{{{sssssMsMM___MMMMMmm]]]]]]]]]]]mmMMMMM________M___M___",
-- "......| 11 2 {{{{ssssssMss_MMMMMMmm]]]]]]]]]]]]]mmMMMMM_M_M__M________",
-- "......| 11 { {{{){sMssMssss_MMMMMmm]]]]]]]]]]]]]]]mmMMMMM_____M________",
-+ "......| èè ééé{{{{{sssssMsMM___MMMMMmm]]]]]]]]]]]mmMMMMM________M___M___",
-+ "......| àà é {{{{ssssssMss_MMMMMMmm]]]]]]]]]]]]]mmMMMMM_M_M__M________",
-+ "......| àà { {{{){sMssMssss_MMMMMmm]]]]]]]]]]]]]]]mmMMMMM_____M________",
- ".#....| {{ {{{{{ssssMsMsMMMMMmm]]]]]]]]]]]]]]]]]mmMMMMM_MMMMM_MM_M_M",
- "......|c {{{{){sssssMsMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_M______M___",
-- "......|c 11{){{{ssssss.ssMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_M_MM_______",
-+ "......|c àà{){{{ssssss.ssMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_M_MM_______",
- "......|c {{{{{{sssssMsMsMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM,M_,,,M,,,_,",
- "......|J J{){{){{ssssM.sMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMMMM_MM,_MM,_,",
- "......| {{ {)ssssssMssMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_MM______M__",
-- "......|c11 {{{{{{{sMsssssMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_____MM_____",
-- "......|c11 1{{{{{ssssssMMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_MM__M_M_M__",
-- "......| KK1 {{{{{MssMwsssMMMMMmm]]]]]]]]]]]]]]]]]mmMMMMM_M__M________",
-+ "......|càà {{{{{{{sMsssssMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_____MM_____",
-+ "......|càà à{{{{{ssssssMMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM_MM__M_M_M__",
-+ "......| KKà {{{{{MssMwsssMMMMMmm]]]]]]]]]]]]]]]]]mmMMMMM_M__M________",
- "..x...|-|----{{{)--ssssMMMss_MMMMMmm]]]]]]]]]]]]]]]mmMMMMM____M__MMM__M_",
- "........|RRRRR{{{{sssssssssMM_MMMMMmm]]]]]]]]]]]]]mmMMMMM_MMM_M__M______",
- "........|R {{{{{{sssssMsMM___MMMMMmm]]]]]]]]]]]mmMMMMM__MM__M____M____",
-@@ -695,7 +696,7 @@
- ],
- "palettes": [ "necropolis_a" ],
- "terrain": { "D": "t_floor", "R": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
-- "furniture": { "1": "f_bed", "2": "f_desk", "3": "f_dresser", "R": "f_rack" },
-+ "furniture": { "R": "f_rack" },
- "set": [
- { "square": "radiation", "amount": [ 0, 1 ], "x": 0, "x2": 23, "y": 0, "y2": 23 },
- { "square": "radiation", "amount": [ 0, 1 ], "x": 24, "x2": 47, "y": 0, "y2": 23 },
-diff --git a/data/json/mapgen_palettes/necropolis/necropolis_a.json b/data/json/mapgen_palettes/necropolis/necropolis_a.json
-index 657f5399bac..da883f01f07 100644
---- a/data/json/mapgen_palettes/necropolis/necropolis_a.json
-+++ b/data/json/mapgen_palettes/necropolis/necropolis_a.json
-@@ -3,9 +3,12 @@
- "type": "palette",
- "id": "necropolis_a",
- "furniture": {
-+ "@": "f_bed",
-+ "à": "f_bed",
-+ "é": "f_desk",
-+ "è": "f_dresser",
- ")": "f_wreckage",
- "?": "f_sofa",
-- "@": "f_bed",
- "B": "f_bathtub",
- "C": "f_region_weed",
- "D": "f_trashcan",
-@@ -41,6 +44,10 @@
- "u": "f_barricade_road"
- },
- "terrain": {
-+ "@": "t_floor",
-+ "à": "t_floor",
-+ "é": "t_floor",
-+ "è": "t_floor",
- "!": "t_bars",
- "#": "t_region_shrub",
- "&": "t_sidewalk",
-@@ -65,7 +72,6 @@
- "=": "t_door_metal_locked",
- ">": "t_stairs_down",
- "?": "t_floor",
-- "@": "t_floor",
- "A": "t_railing_h",
- "B": "t_floor",
- "C": "t_region_groundcover_urban",
---
-2.43.0
-