Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"rows" is defaulted to just spaces #72699

Merged
merged 10 commits into from
Apr 4, 2024
Merged

"rows" is defaulted to just spaces #72699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c83dde0
"palettes" no longer relies on "rows" being defined
Procyonae Mar 29, 2024
cc597c3
Default rows instead
Procyonae Mar 29, 2024
0081d34
Remove JSON default rows
Procyonae Mar 29, 2024
122cba2
Appease our clang overlords
Procyonae Mar 29, 2024
ea0c1cd
Tweaks
Procyonae Mar 29, 2024
9ea50c1
Our clang overlords lied to us
Procyonae Mar 29, 2024
83617ac
Documentation
Procyonae Mar 29, 2024
7634ae3
KISS
Procyonae Apr 2, 2024
fdc07b5
Updates and adds error messages
Procyonae Apr 2, 2024
ca1f71f
Less very unlikely error messages
Procyonae Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 1 addition & 30 deletions data/json/mapgen/basecamps/base/bare_bones_basecamp/bare_bones_basecamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,6 @@
"type": "mapgen",
"update_mapgen_id": "fbbb",
"method": "json",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "fbbb_palette" ]
}
"object": { "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "fbbb_palette" ] }
}
]
13 changes: 1 addition & 12 deletions data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbmk_common_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "palettes": [ "fbmk_common_palette" ] }
},
{
"type": "mapgen",
Expand Down
13 changes: 1 addition & 12 deletions data/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmf_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "acidia_camp_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "palettes": [ "acidia_camp_palette" ] }
},
{
"type": "mapgen",
Expand Down
13 changes: 1 addition & 12 deletions data/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmg_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "acidia_camp_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "palettes": [ "acidia_camp_palette" ] }
},
{
"type": "mapgen",
Expand Down
13 changes: 1 addition & 12 deletions ...json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbml_common_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "palettes": [ "fbml_common_palette" ] }
},
{
"type": "mapgen",
Expand Down
13 changes: 1 addition & 12 deletions ...json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbmsw_common_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "palettes": [ "fbmsw_common_palette" ] }
},
{
"type": "mapgen",
Expand Down
14 changes: 1 addition & 13 deletions ...on/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbms_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "fbms_common_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "fbms_common_palette" ] }
},
{
"type": "mapgen",
Expand Down
13 changes: 1 addition & 12 deletions data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmw_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbmw_common_palette" ]
}
"object": { "mapgensize": [ 6, 6 ], "palettes": [ "fbmw_common_palette" ] }
},
{
"type": "mapgen",
Expand Down
33 changes: 2 additions & 31 deletions data/json/mapgen/debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,8 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "debug_itemgroup_test" ],
"object": {
"fill_ter": "t_pavement",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"items": { " ": [ { "item": "milspec_arsenal_group_only_ammo", "chance": 100 } ] }
}
"om_terrain": "debug_itemgroup_test",
"object": { "fill_ter": "t_pavement", "items": { " ": [ { "item": "milspec_arsenal_group_only_ammo", "chance": 100 } ] } }
},
{
"type": "overmap_terrain",
Expand Down
54 changes: 0 additions & 54 deletions data/json/mapgen/derelict_property.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,34 +155,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": "derelict_property",
"//": "rows only defined bc otherwise palettes, needed for nest selection, throws an error",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"fallback_predecessor_mapgen": "forest",
"palettes": [ "derelict_variant_parameter_palette" ],
"place_nested": [ { "chunks": [ { "param": "variant", "fallback": "derelict_property_1" } ], "x": 0, "y": 0 } ]
Expand All @@ -192,35 +165,8 @@
"type": "mapgen",
"method": "json",
"om_terrain": "derelict_property_roof",
"//": "rows only defined bc otherwise palettes, needed for nest selection, throws an error",
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "derelict_variant_parameter_palette" ],
"place_nested": [
{
Expand Down
40 changes: 3 additions & 37 deletions data/json/mapgen/dummy/dummy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,9 @@
{
"type": "mapgen",
"method": "json",
"//": "This mapgen exist only for suppressing 'No mapgen terrain exists for %s' type of errors on game start and shouldn't spawn ingame",
"om_terrain": [ "unexplored" ],
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"terrain": { " ": "t_null" }
}
},
{
"type": "mapgen",
"om_terrain": [ "omt_obsolete" ],
"method": "json",
"//": "this mapgen is used for replacing obsoleted overmap terrain, normally it shouldn't spawn",
"//unexplored": "This mapgen exist only for suppressing 'No mapgen terrain exists for %s' type of errors on game start and shouldn't spawn ingame",
"//omt_obsolete": "This mapgen is used for replacing obsoleted overmap terrain, normally it shouldn't spawn",
"om_terrain": [ "unexplored", "omt_obsolete" ],
"object": { "fill_ter": "t_nether_glass_floor" }
}
]
26 changes: 0 additions & 26 deletions data/json/mapgen/house/house05.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,32 +135,6 @@
"om_terrain": "house_05_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "house_05_variant_palette" ],
"place_nested": [
{
Expand Down
5 changes: 0 additions & 5 deletions data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
"nested_mapgen_id": "lab_maintenance_3x3_NS_open",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" ",
" ",
" "
],
"palettes": [ "lab_common_palette", "lab_maintenance_palette" ],
"place_loot": [ { "group": "trash", "x": [ 1, 3 ], "y": [ 1, 3 ], "repeat": 3, "chance": 100 } ],
"place_nested": [ { "chunks": [ [ "sub_fd_shock_vent", 30 ], [ "null", 70 ] ], "x": 1, "y": 1 } ]
Expand Down
Loading
Loading