Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@GuardianDll
GuardianDll authored Jul 25, 2024
1 parent fb257b8 commit 4b5636c
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion data/json/mapgen/dive_shop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"-.....................- ",
"-..............ooo..Я.- ",
"-....A.........ooo..Я.- ",
"-....MM........ooo....- ",
"-....1.........ooo....- ",
"-..................&..- ",
"-.....................- ",
"-5--------------------- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/urban_22_house_pool.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
" -........- ",
" -........- ------- ",
" -........- -.....- ",
" ---------- -...M.- ",
" ---------- -.1...- ",
" -.....- ",
" -.....- ",
" ------- ",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/nested/nested_chunks_roof.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,13 +542,13 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "residential_1x2_solar",
"object": { "mapgensize": [ 1, 2 ], "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } }
"object": { "mapgensize": [ 2, 2 ], "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } }

Check failure on line 545 in data/json/mapgen/nested/nested_chunks_roof.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

([slow] ~starting_items)=> Expected an array, got object

    "method": "json",
    "nested_mapgen_id": "residential_1x2_solar",
    "object": { "mapgensize": [ 2, 2 ], "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } }
                                                         ▲▲▲
  },
  {

Check failure on line 545 in data/json/mapgen/nested/nested_chunks_roof.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

(~[slow] ~[.],starting_items)=> Expected an array, got object

    "method": "json",
    "nested_mapgen_id": "residential_1x2_solar",
    "object": { "mapgensize": [ 2, 2 ], "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } }
                                                         ▲▲▲
  },
  {
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "residential_1x3_solar",
"object": { "mapgensize": [ 1, 3 ], "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 2 ] } }
"object": { "mapgensize": [ 3, 3 ], "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 2 ] } }
},
{
"type": "mapgen",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/nursing_home.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
"-............................................................- ",
"-................................ЯЯ.........&.&..............- ",
"-................................ЯЯ..........................- ",
"-..............................................MM............- ",
"-..............................................1.............- ",
"-....................................................&&......- ",
"-............................................................- ",
"-............................................................- ",
Expand Down Expand Up @@ -473,7 +473,7 @@
"-....................- --------------#v# -........oooo........-",
"-....................--------5................----5........oooo........-",
"-..........................................................oooo........-",
"-......MM..................................................oooo........-",
"-......1...................................................oooo........-",
"-......................................................................-",
"-......................................................................-",
"-..........................oooo.oooooooo.oooo.....NN...................-",
Expand Down
8 changes: 4 additions & 4 deletions data/json/mapgen/parking_garage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,13 @@
"-.......- ",
"-.......- ",
"--......... ",
" -.MM.MM... ",
" -.MM.MM... ",
" -.1....... ",
" -......... ",
" -......... ",
" -......... ",
" -.MM.MM... ",
" -.MM.MM... ",
" -......... ",
" -....1.... ",
" -......... ",
"--......... ",
"-.......- ",
"-.......- ",
Expand Down
10 changes: 5 additions & 5 deletions data/json/mapgen/shelter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
" ",
" ",
" ---------------- ",
" -............M.- ",
" -..............- ",
" -.........1....- ",
" -..............- ",
" -..............- ",
" -..............- ",
Expand Down Expand Up @@ -164,9 +164,9 @@
" -.........v....- ",
" -..............- ",
" -.......&......- ",
" -..........1...- ",
" -..............- ",
" -..............- ",
" -............M.5 ",
" -..............5 ",
" ---------------- "
],
"palettes": [ "roof_palette" ],
Expand Down Expand Up @@ -223,9 +223,9 @@
" ",
" ---------- ",
" ---------........- ",
" -v.....M.........- ",
" -v...............- ",
" -................- ",
" --................-- ",
" --.....1..........-- ",
" -..................- ",
" -..................- ",
" -..................- ",
Expand Down
12 changes: 6 additions & 6 deletions data/json/mapgen/station_radio.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@
" -...................- ",
" -...................- ",
" ----###-----........- ",
" #v# -.......=- ",
" #v# -..1....=- ",
" -........- ",
" R,aaaR -.MHЯ.---- ",
" R,aaaR -..HЯ.---- ",
" , a,≷a -.....- ",
" , aaaa ------5 ",
" , , ",
" , , ....... ",
" R,,,,R ....X.. ",
" ..M.... ",
" ....... ",
" ....... ",
" "
],
Expand Down Expand Up @@ -363,8 +363,8 @@
" ------------------ ",
" -............=...- ",
" -.X.X............5-- ",
" -..................- ",
" -.X.X...........M..- ",
" -.............1....- ",
" -.X.X..............- ",
" -.......&.......HЯ.- ",
" -..................- ",
" -.............------ ",
Expand All @@ -379,7 +379,7 @@
" -...:...- ..... ",
" -.......## ..... ",
" -.......#v ..X.. ",
" -.......## ..M.. ",
" -.......## .1... ",
" --------- ..... ",
" ..... ",
" "
Expand Down
6 changes: 3 additions & 3 deletions data/json/mapgen/zoo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
" -...........- ",
" -...........- ",
" ----- -...........- ",
" -...- -......M....- ",
" -...- -......1....- ",
" -...- -...........- ",
" -...- -...........- ",
" -..A- -......A....- ",
Expand Down Expand Up @@ -305,7 +305,7 @@
" -..................- ",
" -..................- ",
" -..................- ",
" -...........M......- ",
" -...........1......- ",
" -..................- ",
" -..................- ",
" -..................- ",
Expand Down Expand Up @@ -350,7 +350,7 @@
" -........- ",
" 5-------------..------5 ",
" -...............- ",
" -.......MM......- ",
" -.......1.......- ",
" -...............- ",
" -....X....:.....-------5 ",
" -......................- ",
Expand Down

0 comments on commit 4b5636c

Please sign in to comment.