Merge pull request #78169 from Milopetilo/mil-surplus

Fix counters in military surplus walls
CleverRaven · Nov 26, 2024 · f5814da · f5814da
2 parents c01fe14 + 2c4fce1
commit f5814da
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/data/json/mapgen/mil_surplus.json b/data/json/mapgen/mil_surplus.json
@@ -12,10 +12,10 @@
         "...........~~...........",
         "..#''''''##!!##''''''##.",
         "..#             QrQ@  #.",
-        "..# #         b     b #.",
-        "..#S#           T     #.",
-        "..# #        @        #.",
-        "..# #                 #.",
+        "..# G         b     b #.",
+        "..#SG           T     #.",
+        "..# G        @        #.",
+        "..# G                 #.",
         "..#                   #.",
         "..# A A A B B B C C C #.",
         "..# A A A B B B C C C #.",
@@ -51,10 +51,10 @@
         "...........~~...........",
         "..#''''''##!!##''''''##.",
         "..#             QrQ@  #.",
-        "..# #    1    b     b #.",
-        "..#S#           T     #.",
-        "..#1#        @        #.",
-        "..# #   1             #.",
+        "..# G    1    b     b #.",
+        "..#SG           T     #.",
+        "..#1G        @        #.",
+        "..# G   1             #.",
         "..#                   #.",
         "..# А А А Б Б Б В В В #.",
         "..# А А А Б Б Б В В В #.",
@@ -90,10 +90,10 @@
         "...........~~...........",
         "..#''''''##!!##''''''##.",
         "..#             QrQ@  #.",
-        "..# #         b     b #.",
-        "..#S#           T     #.",
-        "..# #        @        #.",
-        "..# #                 #.",
+        "..# G         b     b #.",
+        "..#SG           T     #.",
+        "..# G        @        #.",
+        "..# G                 #.",
         "..#                   #.",
         "..# А А А Б Б Б В В В #.",
         "..# А А А Б Б Б В В В #.",
@@ -188,9 +188,9 @@
         ".........[.~~...........",
         "...........~~...........",
         ".##''''''##!!##''''''##.",
-        ".#|||           @  @  #.",
-        ".# S|                 #.",
-        ".#  |          A BB C #.",
+        ".#GGG           @  @  #.",
+        ".# SG                 #.",
+        ".#  G          A BB C #.",
         ".#L                   #.",
         ".#|||   A  A  A    |||#.",
         ".#&_|   A  A  A    / ^#.",
@@ -226,9 +226,9 @@
         ".........[.~~...........",
         "...........~~...........",
         ".##''''''##!!##''''''##.",
-        ".#|||      1    @  @  #.",
-        ".# S|                 #.",
-        ".# 1|          А ББ В #.",
+        ".#GGG      1    @  @  #.",
+        ".# SG                 #.",
+        ".# 1G          А ББ В #.",
         ".#L       1           #.",
         ".#|||   А  А  А    |||#.",
         ".#&_|   А  А  А    / ^#.",
@@ -264,9 +264,9 @@
         ".........[.~~...........",
         "...........~~...........",
         ".##''''''##!!##''''''##.",
-        ".#|||           @  @  #.",
-        ".# S|                 #.",
-        ".#  |          А ББ В #.",
+        ".#GGG           @  @  #.",
+        ".# SG                 #.",
+        ".#  G          А ББ В #.",
         ".#L                   #.",
         ".#|||   А  А  А    |||#.",
         ".#&_|   А  А  А    / ^#.",
@@ -364,7 +364,7 @@
         "..#@   b    ###########.",
         "..#        y|    DDDAB#.",
         "..#@        +  h     C#.",
-        "..#||||     ||||||||||#.",
+        "..#||||     ||GGGGGG||#.",
         "..#                  F#.",
         "..# T    tt          F#.",
         "..#      tt          F#.",
@@ -402,7 +402,7 @@
         "..#@   b    ###########.",
         "..#        y|    DDDAB#.",
         "..#@        +  h     C#.",
-        "..#||||     ||||||||||#.",
+        "..#||||     ||GGGGGG||#.",
         "..#                  F#.",
         "..# T    tt          F#.",
         "..#      tt          F#.",
@@ -440,7 +440,7 @@
         "..#@     @ b###########.",
         "..#        y|    DDDAB#.",
         "..#@        +  h     C#.",
-        "..#||||     ||||||||||#.",
+        "..#||||     ||GGGGGG||#.",
         "..#                  F#.",
         "..# T                F#.",
         "..#                  F#.",

diff --git a/data/json/mapgen_palettes/mil_surplus.json b/data/json/mapgen_palettes/mil_surplus.json
@@ -40,7 +40,7 @@
       "<": "t_ladder_up"
     },
     "furniture": {
-      "#": "f_counter",
+      "G": "f_counter",
       "U": [ "f_dumpster", "f_recycle_bin" ],
       "h": "f_chair",
       "%": "f_sink",