From 7e224c97ae2728472180322f625dafa545f21f7f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 18 Jan 2025 21:46:00 -0800
Subject: Convert the PKGBUILD to my own fork of cataclysm-bn.
---
...re-fix-for-level-0-of-the-Necropolis-4387.patch | 522 ---------------------
1 file changed, 522 deletions(-)
delete mode 100644 hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch
(limited to 'hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch')
diff --git a/hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch b/hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch
deleted file mode 100644
index 6f478f3..0000000
--- a/hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch
+++ /dev/null
@@ -1,522 +0,0 @@
-From 3fbd2bfd731810410770039835c9cfee9c89bfcd Mon Sep 17 00:00:00 2001
-From: 0Monet <146018959+0Monet@users.noreply.github.com>
-Date: Sun, 24 Mar 2024 23:42:32 +0100
-Subject: [PATCH] fix: more fix for level 0 of the Necropolis (#4387)
-
-* Update necropolis.json
-
-* Update necropolis_a.json
-
-* Update necropolis.json
-
-* style(autofix.ci): automated formatting
-
----------
-
-Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
----
- data/json/mapgen/necropolis/necropolis.json | 265 +++++++++---------
- .../necropolis/necropolis_a.json | 14 +
- 2 files changed, 150 insertions(+), 129 deletions(-)
-
-diff --git a/data/json/mapgen/necropolis/necropolis.json b/data/json/mapgen/necropolis/necropolis.json
-index 111d183670e..f03d1340342 100644
---- a/data/json/mapgen/necropolis/necropolis.json
-+++ b/data/json/mapgen/necropolis/necropolis.json
-@@ -44,6 +44,12 @@
- ]
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_1", "necropolis_a_2", "necropolis_a_3" ],
-+ [ "necropolis_a_10", "necropolis_a_11", "necropolis_a_12" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -87,11 +93,11 @@
- ".q....V ;sssssssssss_______,,_______ss...8srrrrrrrrrsssssZZssr8.",
- ".q....| ooP|....s...qss_______,,_______ss..|------------|rssssssr8.",
- ".q....|;|--+----|--|es...qss________________ss..|222222222222|rssssssr8.",
-- ".q..ssss|r =_______________,,_______ss..w3 2|rssZZssr8.",
-- ".q..shss|r =_______________,,_______ss..w3 11 11 2|rssZZssr8.",
-- ".q..snss|r =_______________,,_______ss..w3 11 11 2|rssssssr8.",
-- ".q..shss|r =________________________ss..|r [sssssssr8.",
-- ".q..ssss|r =_______________,,_______ss..w3 11 [sssssssr8.",
-+ ".q..ssss|r̲~~~~~~~~~=_______________,,_______ss..w3 2|rssZZssr8.",
-+ ".q..sЮss|r̲~~~~~~~~~=_______________,,_______ss..w3 11 11 2|rssZZssr8.",
-+ ".q..sЯss|r̲~~~~~~~~~=_______________,,_______ss..w3 11 11 2|rssssssr8.",
-+ ".q..sЮss|r̲~~~~~~~~~=________________________ss..|r [sssssssr8.",
-+ ".q..ssss|r̲~~~~~~~~~=_______________,,_______ss..w3 11 [sssssssr8.",
- ".q......|----------|.....qss_______,,_______ss..w3 11 cc 1|rssssssr8.",
- ".q.......................qss_______,,_______ss..w3 6 1|rssZZssr8.",
- ".qQQQQQQQQQQQQQQQQQQQQQQQqss________________ss..|r333r c 1|rssZZssr8.",
-@@ -110,9 +116,9 @@
- { "group": "SUS_junk_drawer", "x": 42, "y": 8, "chance": 75 },
- { "group": "SUS_junk_drawer", "x": 42, "y": 10, "chance": 75 },
- { "item": "television", "x": 32, "y": [ 11, 12 ], "chance": 80 },
-- { "item": "television", "x": 10, "y": [ 32, 33 ], "chance": 80 },
-- { "group": "tools_general", "x": 9, "y": [ 40, 44 ], "chance": 50, "repeat": 2 },
-- { "group": "supplies_mechanics", "x": 9, "y": [ 40, 44 ], "chance": 50, "repeat": 2 },
-+ { "item": "television", "x": 10, "y": 32, "chance": 80 },
-+ { "group": "tools_general", "x": 9, "y": [ 39, 43 ], "chance": 50, "repeat": 2 },
-+ { "group": "supplies_mechanics", "x": 9, "y": [ 39, 43 ], "chance": 50, "repeat": 2 },
- { "group": "fertilizers", "x": 25, "y": [ 52, 61 ], "chance": 40, "repeat": 4 },
- { "group": "farming_seeds", "x": [ 25, 47 ], "y": 69, "chance": 30, "repeat": 10 }
- ],
-@@ -128,15 +134,15 @@
- { "vehicle": "electric_car", "x": 15, "y": 41, "chance": 75, "rotation": 0 },
- { "vehicle": "flatbed_truck", "x": 55, "y": 30, "chance": 50, "rotation": 180 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_1", "necropolis_a_2", "necropolis_a_3" ],
-- [ "necropolis_a_10", "necropolis_a_11", "necropolis_a_12" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_4", "necropolis_a_5", "necropolis_a_6" ],
-+ [ "necropolis_a_13", "necropolis_a_14", "necropolis_a_15" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -222,15 +228,15 @@
- { "vehicle": "policecar", "x": 60, "y": 16, "chance": 25, "rotation": 90 },
- { "vehicle": "car", "x": 30, "y": 31, "chance": 100, "rotation": 135 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_4", "necropolis_a_5", "necropolis_a_6" ],
-- [ "necropolis_a_13", "necropolis_a_14", "necropolis_a_15" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_7", "necropolis_a_8", "necropolis_a_9" ],
-+ [ "necropolis_a_16", "necropolis_a_17", "necropolis_a_18" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -336,15 +342,15 @@
- { "vehicle": "policecar", "x": 57, "y": 38, "chance": 50, "rotation": 180 },
- { "vehicle": "policecar", "x": 57, "y": 45, "chance": 50, "rotation": 180 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_7", "necropolis_a_8", "necropolis_a_9" ],
-- [ "necropolis_a_16", "necropolis_a_17", "necropolis_a_18" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_19", "necropolis_a_20", "necropolis_a_21" ],
-+ [ "necropolis_a_28", "necropolis_a_29", "necropolis_a_30" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -374,20 +380,20 @@
- ".....ssssssssssssssssssssssssssssssssssssssssssss..........ssss.........",
- "......IsssssI..................ssssssss......sss............ss.........T",
- ".....|-=====-|--|---HHH-HHH-HHH-[[--[[-HHH-|.sss............ss..........",
-- ".....|e | r[ ccccccccccc cccc|.sss....T.......ss...T......",
-- "..#..| EEEEE | r[ c|.sss............bss.........",
-- ".....| EEEEE | r[ cc cc ZZ c|.sss............bss.........",
-- ".....|zYEEEE | r[ rrrrrrrrr c c ZZ c|.sss............bss.........",
-- ".....|zYEEEE | r[ rrrrrrrrr 6c 6c cV.sss........T.....ss........",
-- "....X| EEEEE | r[ cV.sss..............ss......T.",
-+ ".....|e~~~~~~| r[ ccccccccccc cccc|.sss....T.......ss...T......",
-+ "..#..|~EEEEE~| r[ c|.sss............bss.........",
-+ ".....|~EEEEE~| r[ cc cc ZZ c|.sss............bss.........",
-+ ".....|zYEEEE~| r[ rrrrrrrrr c c ZZ c|.sss............bss.........",
-+ ".....|zYEEEE~| r[ rrrrrrrrr 6c 6c cV.sss........T.....ss........",
-+ "....X|~EEEEE~| r[ cV.sss..............ss......T.",
- ".....|zYEEEYz| r[ cV.sss.............ssss.......",
- ".....|zYEEEYz| r[ rrrrrrrrr ZZ ZZ c c|.sss...T........ssssss......",
-- ".....| EEEEE + r[ rrrrrrrrr ZZ ZZ c c|.sss........aAassssssss.....",
-- ".....|zYEEEE |--| c {c{.sss........aUasssssssssssss",
-- ".....|zz6% + Z{ ZZ c {{.sss........aUasssssssssssss",
-- ".....| + rrrrrrrrr Z{{ ZZ {{{{sss........aAassssssss.....",
-- ".....|-------| | rrrrrrrrr { { {{){|.sss...T........ssssss......",
-- "...........ss: | {{ {{){{{{|.sss.............ssss......T",
-+ ".....|~EEEEE~+ r[ rrrrrrrrr ZZ ZZ c c|.sss........aAassssssss.....",
-+ ".....|zYEEEE~|--| c {c{.sss........aUasssssssssssss",
-+ ".....|zz6%~~~~~~+ Z{ ZZ c {{.sss........aUasssssssssssss",
-+ ".....|~~~~~~~~~~+ rrrrrrrrr Z{{ ZZ {{{{sss........aAassssssss.....",
-+ ".....|-------|~~| rrrrrrrrr { { {{){|.sss...T........ssssss......",
-+ "...........ss:~~| {{ {{){{{{|.sss.............ssss......T",
- "...........ss|--| {{ { rr{{{{{{{{{ss.sss..NNNNNNNNNN..ss........",
- "...#.....x.ss| rrrrrr{rr {{{{{){{sssss.sss.MNNNNNNNNNNN..ss.......",
- "...........ss|r rrrrr{rr){{{{){{{{{MssMssMMMsMNN55555NNNNNN.ss..T....",
-@@ -399,7 +405,14 @@
- "...........ss|r {{ {{{{sMsssssMsMMsMMMMMMMMMMMMMMMNNNMNNMNNNNNNMss....."
- ],
- "palettes": [ "necropolis_a" ],
-- "terrain": { "%": "t_elevator_control_off", "Y": "t_elevator", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
-+ "terrain": {
-+ "%": "t_elevator_control_off",
-+ "Y": "t_elevator",
-+ "Z": "t_floor",
-+ "l": "t_floor",
-+ "u": "t_floor",
-+ "z": "t_thconc_floor"
-+ },
- "furniture": { "Y": "f_crate_c" },
- "set": [
- { "square": "radiation", "amount": [ 0, 1 ], "x": 0, "x2": 23, "y": 0, "y2": 23 },
-@@ -449,15 +462,15 @@
- { "vehicle": "car", "x": 15, "y": 17, "chance": 25, "rotation": 270 },
- { "vehicle": "car_mini", "x": 22, "y": 18, "chance": 25, "rotation": 270 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_19", "necropolis_a_20", "necropolis_a_21" ],
-- [ "necropolis_a_28", "necropolis_a_29", "necropolis_a_30" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_22", "necropolis_a_23", "necropolis_a_24" ],
-+ [ "necropolis_a_31", "necropolis_a_32", "necropolis_a_33" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -546,15 +559,15 @@
- { "vehicle": "fire_truck", "x": 15, "y": 8, "chance": 90, "rotation": 45 },
- { "vehicle": "car", "x": 45, "y": 5, "chance": 100, "rotation": 45 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_22", "necropolis_a_23", "necropolis_a_24" ],
-- [ "necropolis_a_31", "necropolis_a_32", "necropolis_a_33" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_25", "necropolis_a_26", "necropolis_a_27" ],
-+ [ "necropolis_a_34", "necropolis_a_35", "necropolis_a_36" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -632,15 +645,15 @@
- { "group": "GROUP_NECROPOLIS", "x": [ 25, 46 ], "y": [ 25, 46 ], "repeat": [ 1, 5 ] },
- { "group": "GROUP_NECROPOLIS", "x": [ 49, 70 ], "y": [ 25, 46 ], "repeat": [ 1, 5 ] }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_25", "necropolis_a_26", "necropolis_a_27" ],
-- [ "necropolis_a_34", "necropolis_a_35", "necropolis_a_36" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_37", "necropolis_a_38", "necropolis_a_39" ],
-+ [ "necropolis_a_46", "necropolis_a_47", "necropolis_a_48" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -723,15 +736,15 @@
- { "vehicle": "fire_truck", "x": 32, "y": 28, "chance": 90, "rotation": 270 }
- ],
- "place_vendingmachines": [ { "item_group": "vending_drink", "x": 64, "y": 47 } ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_37", "necropolis_a_38", "necropolis_a_39" ],
-- [ "necropolis_a_46", "necropolis_a_47", "necropolis_a_48" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_40", "necropolis_a_41", "necropolis_a_42" ],
-+ [ "necropolis_a_49", "necropolis_a_50", "necropolis_a_51" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -759,24 +772,24 @@
- "sssssssssssssssssssssssssss__________________sssssssssssssssssssssssssss",
- "ssssssssssssssssssssssssssss_________,,,,,,_ssssssssssssssssssssssssssss",
- "..ss{{{{--|--|--|-----|sssss________________sss#######|--ww-++-ww---|sss",
-- "..ss{{ {@d|BB|BB|d@@ n|ss.ss_______,,_______ss##shhsss|hh chNNh|sss",
-- "..ss{{{@@ | t|t | @@ hwss.ss_______,,_______ss#shNNhss|NN chNNh|sss",
-- "..ss{ | S|S | wss.ss_______,,_______ss#shNNhsswNN h |sss",
-- "..ss{ |+-|-+| |ss.ss________________ssssshhssswhh N hcc |777",
-+ "..ss{{ {@d|BB|BB|d@@ n|ss.ss_______,,_______ss##sh̲h̲sss|hh chNNh|sss",
-+ "..ss{{{@@ | t|t | @@ hwss.ss_______,,_______ss#sh̲n̲n̲h̲ss|NN chNNh|sss",
-+ "..ss{ | S|S | wss.ss_______,,_______ss#sh̲n̲n̲h̲sswNN h |sss",
-+ "..ss{ |+-|-+| |ss.ss________________sssssh̲h̲ssswhh N hcc |777",
- "..ss; f|f ;ss.ss_______,,_______sssssssssswcc h hc r|sss",
- "..ss| nnnn | nnnn |ss.ss_______,,_______ss#sssssss|hh hc r|sss",
-- "..ss|-----|--|--|-----|ss.ss_______,,_______ss#sshhsss|NN h hc f|sss",
-- "..ss|n @@d|BB|BB|d@@ n|ss.ss________________ss#shNNhsswNN N hc f|sss",
-- "..sswh @@ | t|t | @@ hwss.ss_______,,_______ss#shNNhsswhh h hc c|sss",
-- "..ssw | S|S | wss.ss_______,,_______ss#sshhssswcc hc S|sss",
-+ "..ss|-----|--|--|-----|ss.ss_______,,_______ss#ssh̲h̲sss|NN h hc f|sss",
-+ "..ss|n @@d|BB|BB|d@@ n|ss.ss________________ss#sh̲n̲n̲h̲sswNN N hc f|sss",
-+ "..sswh @@ | t|t | @@ hwss.ss_______,,_______ss#sh̲n̲n̲h̲sswhh h hc c|sss",
-+ "..ssw | S|S | wss.ss_______,,_______ss#ssh̲h̲ssswcc hc S|sss",
- "..ss| |+-|-+| |ss.ss_______,,_______ss#sssssss| c r|sss",
- "..ss; f|f ;ss.ss________________ssssssssss[ c r|sss",
- "..ss| nnnn | nnnn |ss.ss_______,,_______ssssssssss[ |----|c-- -|sss",
- "..ss|-----|--|--|-----|ss.ss_______,,_______ss#sssssss| + | c|sss",
-- "..ss|n @@d|BB|BB|d@@ n|ss.ss_______,,_______ss#sshhsssw |S t |c S|Dss",
-- "..sswh @@ | t|t | @@ hwss.ss________________ss#shNNhssw |----|c S|Dss",
-- "..ssw | S|S | wss.ss_______,,_______ss#shNNhssw + |c ;sss",
-- "..ss| |+-|-+| |ss.ss_______,,_______ss##shhsss| |S t |cOOff|797",
-+ "..ss|n @@d|BB|BB|d@@ n|ss.ss_______,,_______ss#ssh̲h̲sssw |S t |c S|d̲ss",
-+ "..sswh @@ | t|t | @@ hwss.ss________________ss#sh̲n̲n̲h̲ssw |----|c S|d̲ss",
-+ "..ssw | S|S | wss.ss_______,,_______ss#sh̲n̲n̲h̲ssw + |c ;sss",
-+ "..ss| |+-|-+| |ss.ss_______,,_______ss##sh̲h̲sss| |S t |cOOff|797",
- "..ss; f|f ;ss.ss_______,,________ss#####ss|--|----|-----|sss",
- "..ss| nnnnn | nnnn |ss.ss_______________________,__,_________________",
- "..ss|--------|--------|ss.ss_______,,______________,,,,_________________",
-@@ -804,15 +817,15 @@
- { "group": "GROUP_NECROPOLIS", "x": [ 25, 46 ], "y": [ 25, 46 ], "repeat": [ 1, 5 ] },
- { "group": "GROUP_NECROPOLIS", "x": [ 49, 70 ], "y": [ 25, 46 ], "repeat": [ 1, 5 ] }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_40", "necropolis_a_41", "necropolis_a_42" ],
-- [ "necropolis_a_49", "necropolis_a_50", "necropolis_a_51" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_43", "necropolis_a_44", "necropolis_a_45" ],
-+ [ "necropolis_a_52", "necropolis_a_53", "necropolis_a_54" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -899,15 +912,15 @@
- { "group": "GROUP_NECROPOLIS", "x": [ 25, 46 ], "y": [ 25, 46 ], "repeat": [ 1, 5 ] },
- { "group": "GROUP_NECROPOLIS", "x": [ 49, 70 ], "y": [ 25, 46 ], "repeat": [ 1, 5 ] }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_43", "necropolis_a_44", "necropolis_a_45" ],
-- [ "necropolis_a_52", "necropolis_a_53", "necropolis_a_54" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_55", "necropolis_a_56", "necropolis_a_57" ],
-+ [ "necropolis_a_64", "necropolis_a_65", "necropolis_a_66" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -988,15 +1001,15 @@
- { "vehicle": "policecar", "x": 23, "y": 35, "chance": 90, "rotation": 90 }
- ],
- "place_vendingmachines": [ { "item_group": "vending_food", "x": 64, "y": 0 }, { "item_group": "vending_drink", "x": 68, "y": 17 } ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_55", "necropolis_a_56", "necropolis_a_57" ],
-- [ "necropolis_a_64", "necropolis_a_65", "necropolis_a_66" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_58", "necropolis_a_59", "necropolis_a_60" ],
-+ [ "necropolis_a_67", "necropolis_a_68", "necropolis_a_69" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -1074,15 +1087,15 @@
- { "vehicle": "pickup", "x": 64, "y": 21, "chance": 50, "rotation": 270 },
- { "vehicle": "car", "x": 71, "y": 21, "chance": 50, "rotation": 270 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_58", "necropolis_a_59", "necropolis_a_60" ],
-- [ "necropolis_a_67", "necropolis_a_68", "necropolis_a_69" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [
-+ [ "necropolis_a_61", "necropolis_a_62", "necropolis_a_63" ],
-+ [ "necropolis_a_70", "necropolis_a_71", "necropolis_a_72" ]
-+ ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -1160,15 +1173,12 @@
- { "vehicle": "pickup", "x": 15, "y": 21, "chance": 25, "rotation": 270 },
- { "vehicle": "car", "x": 23, "y": 21, "chance": 25, "rotation": 270 }
- ]
-- },
-- "om_terrain": [
-- [ "necropolis_a_61", "necropolis_a_62", "necropolis_a_63" ],
-- [ "necropolis_a_70", "necropolis_a_71", "necropolis_a_72" ]
-- ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [ [ "necropolis_a_73", "necropolis_a_74", "necropolis_a_75" ] ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -1216,12 +1226,12 @@
- { "group": "GROUP_NECROPOLIS", "x": [ 25, 46 ], "y": [ 1, 22 ], "repeat": [ 1, 5 ] },
- { "group": "GROUP_NECROPOLIS", "x": [ 49, 70 ], "y": [ 1, 22 ], "repeat": [ 1, 5 ] }
- ]
-- },
-- "om_terrain": [ [ "necropolis_a_73", "necropolis_a_74", "necropolis_a_75" ] ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [ [ "necropolis_a_76", "necropolis_a_77", "necropolis_a_78" ] ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -1267,12 +1277,12 @@
- { "group": "GROUP_NECROPOLIS", "x": [ 49, 70 ], "y": [ 1, 22 ], "repeat": [ 1, 5 ] }
- ],
- "place_vehicles": [ { "vehicle": "policecar", "x": 33, "y": 9, "chance": 90, "rotation": 0 } ]
-- },
-- "om_terrain": [ [ "necropolis_a_76", "necropolis_a_77", "necropolis_a_78" ] ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- },
- {
-+ "type": "mapgen",
-+ "om_terrain": [ [ "necropolis_a_79", "necropolis_a_80", "necropolis_a_81" ] ],
-+ "weight": 250,
- "method": "json",
- "object": {
- "fill_ter": "t_floor",
-@@ -1325,9 +1335,6 @@
- { "vehicle": "car", "x": 10, "y": 10, "chance": 75, "rotation": 270 },
- { "vehicle": "pickup", "x": 21, "y": 10, "chance": 75, "rotation": 270 }
- ]
-- },
-- "om_terrain": [ [ "necropolis_a_79", "necropolis_a_80", "necropolis_a_81" ] ],
-- "type": "mapgen",
-- "weight": 250
-+ }
- }
- ]
-diff --git a/data/json/mapgen_palettes/necropolis/necropolis_a.json b/data/json/mapgen_palettes/necropolis/necropolis_a.json
-index da883f01f07..8e785c6163e 100644
---- a/data/json/mapgen_palettes/necropolis/necropolis_a.json
-+++ b/data/json/mapgen_palettes/necropolis/necropolis_a.json
-@@ -3,10 +3,16 @@
- "type": "palette",
- "id": "necropolis_a",
- "furniture": {
-+ "Ю": "f_camp_chair",
-+ "Я": "f_tourist_table",
- "@": "f_bed",
- "à": "f_bed",
- "é": "f_desk",
- "è": "f_dresser",
-+ "n̲": "f_table",
-+ "h̲": "f_chair",
-+ "d̲": "f_dumpster",
-+ "r̲": "f_rack",
- ")": "f_wreckage",
- "?": "f_sofa",
- "B": "f_bathtub",
-@@ -44,10 +50,17 @@
- "u": "f_barricade_road"
- },
- "terrain": {
-+ "Ю": "t_sidewalk",
-+ "Я": "t_sidewalk",
- "@": "t_floor",
- "à": "t_floor",
- "é": "t_floor",
- "è": "t_floor",
-+ "n̲": "t_sidewalk",
-+ "h̲": "t_sidewalk",
-+ "d̲": "t_sidewalk",
-+ "~": "t_thconc_floor",
-+ "r̲": "t_thconc_floor",
- "!": "t_bars",
- "#": "t_region_shrub",
- "&": "t_sidewalk",
-@@ -137,6 +150,7 @@
- "(": { "item": "pantry", "chance": 50, "repeat": 3 },
- "@": { "item": "bed", "chance": 50, "repeat": 2 },
- ".": { "item": "field", "chance": 1 },
-+ "d̲": { "item": "trash", "chance": 65, "repeat": 4 },
- "D": { "item": "floor_trash", "chance": 90, "repeat": 3 },
- "O": { "item": "oven", "chance": 50, "repeat": 2 },
- "d": { "item": "dresser", "chance": 50, "repeat": 3 },
---
-2.43.0
-
--
cgit v1.2.1