diff options
Diffstat (limited to 'backport-02_fix-mass_grave-map-extras-3680.patch')
-rw-r--r-- | backport-02_fix-mass_grave-map-extras-3680.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/backport-02_fix-mass_grave-map-extras-3680.patch b/backport-02_fix-mass_grave-map-extras-3680.patch deleted file mode 100644 index adf1ad3..0000000 --- a/backport-02_fix-mass_grave-map-extras-3680.patch +++ /dev/null @@ -1,61 +0,0 @@ -From dc6799623ced84cf03c09b6ba55f4f442e3afb2e Mon Sep 17 00:00:00 2001 -From: 0Monet <146018959+0Monet@users.noreply.github.com> -Date: Wed, 15 Nov 2023 23:46:19 +0100 -Subject: [PATCH] fix: mass_grave map extras (#3680) - -* fix_mass_grave - -* mass_grave_casings in itemgroups - -* style(autofix.ci): automated formatting - ---------- - -Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> ---- - data/json/itemgroups/Locations_MapExtras/map_extras.json | 5 +++++ - data/json/mapgen/map_extras/mass_grave.json | 8 +------- - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json -index c20ad0bf854..70d983adae9 100644 ---- a/data/json/itemgroups/Locations_MapExtras/map_extras.json -+++ b/data/json/itemgroups/Locations_MapExtras/map_extras.json -@@ -111,5 +111,10 @@ - "subtype": "distribution", - "id": "map_extra_casings", - "entries": [ { "item": "rag_bloody" }, { "item": "cigar_butt" }, { "item": "cig_butt" }, { "item": "can_drink_unsealed" } ] -+ }, -+ { -+ "type": "item_group", -+ "id": "mass_grave_casings", -+ "items": [ [ "223_casing", 60 ], [ "308_casing", 20 ], [ "shot_hull", 20 ] ] - } - ] -diff --git a/data/json/mapgen/map_extras/mass_grave.json b/data/json/mapgen/map_extras/mass_grave.json -index 4c4f84695c7..429524304cd 100644 ---- a/data/json/mapgen/map_extras/mass_grave.json -+++ b/data/json/mapgen/map_extras/mass_grave.json -@@ -1,9 +1,4 @@ - [ -- { -- "id": "mass_grave_casings", -- "type": "item_group", -- "items": [ [ "223_casing", 60 ], [ "308_casing", 20 ], [ "shot_hull", 20 ] ] -- }, - { - "type": "mapgen", - "method": "json", -@@ -35,8 +30,7 @@ - " cccccccccccccccccccccc ", - " " - ], -- "terrain": { "a": "t_pit_corpsed", "b": "t_fence_post", "c": "t_fence_barbed" }, -- "furniture": { }, -+ "terrain": { "a": [ "t_pit_corpsed" ], "b": [ "t_fence_post" ], "c": [ "t_fence_barbed" ] }, - "place_loot": [ - { "group": "everyday_corpse", "x": [ 4, 4 ], "y": [ 8, 8 ] }, - { "group": "everyday_corpse", "chance": 100, "repeat": [ 1 ], "x": [ 4, 4 ], "y": [ 10, 10 ] }, --- -2.42.0 - |