Skip to content

Commit 7df3d9f

Browse files
committed
switch_source needs the case to be present, even if its *_null
We were using f_null when the type is ter_str_id (should be t_*) fixes #83613
1 parent 37347b2 commit 7df3d9f

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

data/json/mapgen_palettes/apartment_complex.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,24 @@
8888
},
8989
"furniture": {
9090
"Ŧ": {
91-
"switch": { "param": "fencing_type", "fallback": "t_null" },
91+
"switch": { "param": "fencing_type", "fallback": "t_region_soil" },
9292
"cases": {
9393
"t_region_shrub_decorative": "f_null",
9494
"t_region_soil": "f_hedge_short",
9595
"t_region_groundcover_urban": "f_null",
9696
"t_chainfence": "f_null",
9797
"t_fence": "f_null",
9898
"t_privacy_fence": "f_null",
99-
"t_drystone_wall_half": "f_null",
100-
"t_null": "f_null"
99+
"t_drystone_wall_half": "f_null"
101100
}
102101
},
103102
"%": {
104-
"switch": { "param": "shrubbery_type", "fallback": "t_null" },
103+
"switch": { "param": "shrubbery_type", "fallback": "t_region_soil" },
105104
"cases": {
106105
"t_region_shrub_decorative": "f_null",
107106
"t_region_soil": "f_hedge_short",
108107
"t_region_groundcover_urban": "f_null",
109-
"t_region_groundcover": "f_region_flower_decorative",
110-
"t_null": "f_null"
108+
"t_region_groundcover": "f_region_flower_decorative"
111109
}
112110
}
113111
}

data/json/mapgen_palettes/park_palette.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,12 @@
125125
},
126126
"furniture": {
127127
"Y": {
128-
"switch": { "param": "walkway", "fallback": "t_null" },
128+
"switch": { "param": "walkway", "fallback": "t_region_soil" },
129129
"cases": {
130130
"t_railroad_rubble": "f_null",
131131
"t_region_soil": "f_null",
132132
"t_region_groundcover_barren": "f_null",
133-
"t_concrete": "f_street_light",
134-
"t_null": "f_null"
133+
"t_concrete": "f_street_light"
135134
}
136135
},
137136
"T": "f_table",

0 commit comments

Comments
 (0)