Skip to content

Commit dce78df

Browse files
kevingranadekevingranade
authored
Merge pull request #82579 from ehughsbaird/mostly-templates
Remove typed (non-templated) assign readers
2 parents b966b4b + ff8ee76 commit dce78df

File tree

16 files changed

+40
-501
lines changed

16 files changed

+40
-501
lines changed

‎data/json/furniture_and_terrain/appliances.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@
10201020
"removal": { "time": "1 m" }
10211021
},
10221022
"pseudo_tools": [ { "id": "microwave" } ],
1023-
"size": 20,
1023+
"size": "5 L",
10241024
"breaks_into": [
10251025
{ "item": "plastic_chunk", "count": [ 4, 7 ] },
10261026
{ "item": "mc_steel_chunk", "count": [ 3, 6 ] },

‎data/json/furniture_and_terrain/furniture-fakes.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"color": "red",
2121
"move_cost_mod": 2,
2222
"required_str": -1,
23-
"workbench": { "multiplier": 1.0, "mass": 5000, "volume": "10 L" }
23+
"workbench": { "multiplier": 1.0, "mass": "5 kg", "volume": "10 L" }
2424
},
2525
{
2626
"type": "furniture",
@@ -37,7 +37,7 @@
3737
"bash": { "str_min": 0, "str_max": 0, "items": [ ] },
3838
"flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "NOCOLLIDE" ],
3939
"examine_action": "workbench",
40-
"workbench": { "multiplier": 0.7, "mass": 10000000, "volume": "1000 L" }
40+
"workbench": { "multiplier": 0.7, "mass": "10000 kg", "volume": "1000 L" }
4141
},
4242
{
4343
"type": "furniture",

‎data/json/furniture_and_terrain/furniture-medical.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
]
237237
},
238238
"examine_action": "workbench",
239-
"workbench": { "multiplier": 1.15, "mass": 300000, "volume": "100 L" }
239+
"workbench": { "multiplier": 1.15, "mass": "300 kg", "volume": "100 L" }
240240
},
241241
{
242242
"type": "furniture",

‎data/json/furniture_and_terrain/furniture-surfaces.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"destroyed_field": [ "fd_splinters", 1 ]
2727
},
2828
"examine_action": "workbench",
29-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
29+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
3030
},
3131
{
3232
"type": "furniture",
@@ -60,7 +60,7 @@
6060
"destroyed_field": [ "fd_splinters", 1 ]
6161
},
6262
"examine_action": "workbench",
63-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
63+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
6464
},
6565
{
6666
"type": "furniture",
@@ -145,7 +145,7 @@
145145
"destroyed_field": [ "fd_splinters", 1 ]
146146
},
147147
"examine_action": "workbench",
148-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
148+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
149149
},
150150
{
151151
"type": "furniture",
@@ -162,7 +162,7 @@
162162
"item": "workbench",
163163
"bash": { "str_min": 35, "str_max": 80, "sound": "metal screeching!", "sound_fail": "clang!" },
164164
"examine_action": "workbench",
165-
"workbench": { "multiplier": 1.2, "mass": 500000, "volume": "200 L" }
165+
"workbench": { "multiplier": 1.2, "mass": "500 kg", "volume": "200 L" }
166166
},
167167
{
168168
"type": "furniture",
@@ -179,7 +179,7 @@
179179
"item": "leather_tarp",
180180
"bash": { "str_min": 5, "str_max": 10, "sound": "smash!", "sound_fail": "whump." },
181181
"examine_action": "workbench",
182-
"workbench": { "multiplier": 0.85, "mass": 500000, "volume": "500 L" }
182+
"workbench": { "multiplier": 0.85, "mass": "500 kg", "volume": "500 L" }
183183
},
184184
{
185185
"type": "furniture",
@@ -196,7 +196,7 @@
196196
"item": "plastic_sheet",
197197
"bash": { "str_min": 5, "str_max": 10, "sound": "whuff!", "sound_fail": "crinkle." },
198198
"examine_action": "workbench",
199-
"workbench": { "multiplier": 0.85, "mass": 500000, "volume": "500 L" }
199+
"workbench": { "multiplier": 0.85, "mass": "500 kg", "volume": "500 L" }
200200
},
201201
{
202202
"type": "furniture",
@@ -213,7 +213,7 @@
213213
"item": "fiber_mat",
214214
"bash": { "str_min": 5, "str_max": 10, "sound": "smash!", "sound_fail": "whump." },
215215
"examine_action": "workbench",
216-
"workbench": { "multiplier": 0.85, "mass": 500000, "volume": "500 L" }
216+
"workbench": { "multiplier": 0.85, "mass": "500 kg", "volume": "500 L" }
217217
},
218218
{
219219
"type": "furniture",
@@ -232,7 +232,7 @@
232232
"item": "tourist_table",
233233
"bash": { "str_min": 16, "str_max": 50, "sound": "metal screeching!", "sound_fail": "clang!" },
234234
"examine_action": "workbench",
235-
"workbench": { "multiplier": 1.05, "mass": 100000, "volume": "35 L" }
235+
"workbench": { "multiplier": 1.05, "mass": "100 kg", "volume": "35 L" }
236236
},
237237
{
238238
"type": "furniture",
@@ -264,7 +264,7 @@
264264
"destroyed_field": [ "fd_splinters", 1 ]
265265
},
266266
"examine_action": "workbench",
267-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
267+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
268268
},
269269
{
270270
"type": "furniture",
@@ -289,7 +289,7 @@
289289
"destroyed_field": [ "fd_splinters", 1 ]
290290
},
291291
"examine_action": "workbench",
292-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
292+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
293293
},
294294
{
295295
"type": "furniture",
@@ -321,7 +321,7 @@
321321
"destroyed_field": [ "fd_splinters", 1 ]
322322
},
323323
"examine_action": "workbench",
324-
"workbench": { "multiplier": 0.85, "mass": 200000, "volume": "75 L" }
324+
"workbench": { "multiplier": 0.85, "mass": "200 kg", "volume": "75 L" }
325325
},
326326
{
327327
"type": "furniture",
@@ -355,6 +355,6 @@
355355
]
356356
},
357357
"examine_action": "workbench",
358-
"workbench": { "multiplier": 1.1, "mass": 500000, "volume": "300 L" }
358+
"workbench": { "multiplier": 1.1, "mass": "500 kg", "volume": "300 L" }
359359
}
360360
]

‎data/json/furniture_and_terrain/furniture_vitrified.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
"items": [ { "item": "black_glass_shard", "count": [ 40, 80 ] } ]
371371
},
372372
"examine_action": "workbench",
373-
"workbench": { "multiplier": 0.7, "mass": 2000, "volume": "75 L" }
373+
"workbench": { "multiplier": 0.7, "mass": "2 kg", "volume": "75 L" }
374374
},
375375
{
376376
"type": "furniture",
@@ -520,7 +520,7 @@
520520
"items": [ { "item": "black_glass_shard", "count": [ 40, 80 ] } ]
521521
},
522522
"examine_action": "workbench",
523-
"workbench": { "multiplier": 1.1, "mass": 2000, "volume": "75 L" }
523+
"workbench": { "multiplier": 1.1, "mass": "2 kg", "volume": "75 L" }
524524
},
525525
{
526526
"type": "furniture",
@@ -658,7 +658,7 @@
658658
"items": [ { "item": "black_glass_shard", "count": [ 40, 80 ] } ]
659659
},
660660
"examine_action": "workbench",
661-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
661+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
662662
},
663663
{
664664
"type": "furniture",
@@ -680,7 +680,7 @@
680680
"items": [ { "item": "black_glass_shard", "count": [ 40, 80 ] } ]
681681
},
682682
"examine_action": "workbench",
683-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
683+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
684684
},
685685
{
686686
"type": "furniture",

‎data/json/vehicleparts/vehicle_parts.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@
891891
},
892892
"flags": [ "CARGO", "OBSTACLE", "FLAT_SURF", "WORKBENCH" ],
893893
"breaks_into": [ { "item": "2x4", "prob": 5 }, { "item": "splinter", "count": [ 4, 8 ] }, { "item": "nail", "charges": [ 4, 7 ] } ],
894-
"workbench": { "multiplier": 1.1, "mass": 150000, "volume": "20 L" },
894+
"workbench": { "multiplier": 1.1, "mass": "150 kg", "volume": "20 L" },
895895
"damage_reduction": { "all": 24 },
896896
"variants": [ { "symbols": "#", "symbols_broken": "#" } ]
897897
},
@@ -914,7 +914,7 @@
914914
},
915915
"flags": [ "CARGO", "OBSTACLE", "FLAT_SURF", "WORKBENCH" ],
916916
"breaks_into": [ { "item": "2x4", "prob": 5 }, { "item": "splinter", "count": [ 4, 8 ] }, { "item": "nail", "charges": [ 4, 7 ] } ],
917-
"workbench": { "multiplier": 1.1, "mass": 150000, "volume": "20 L" },
917+
"workbench": { "multiplier": 1.1, "mass": "150 kg", "volume": "20 L" },
918918
"damage_reduction": { "all": 16 },
919919
"variants": [ { "symbols": "#", "symbols_broken": "#" } ]
920920
},
@@ -968,7 +968,7 @@
968968
{ "item": "lc_steel_chunk", "count": [ 7, 12 ] },
969969
{ "item": "scrap", "charges": [ 15, 30 ] }
970970
],
971-
"workbench": { "multiplier": 1.2, "mass": 300000, "volume": "30 L" },
971+
"workbench": { "multiplier": 1.2, "mass": "300 kg", "volume": "30 L" },
972972
"damage_reduction": { "all": 29 },
973973
"variants": [ { "symbols": "#", "symbols_broken": "#" } ]
974974
},

‎data/mods/Magiclysm/furniture_and_terrain/furniture.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"destroyed_field": [ "fd_splinters", 1 ]
120120
},
121121
"examine_action": "workbench",
122-
"workbench": { "multiplier": 1.15, "mass": 300000, "volume": "100L" }
122+
"workbench": { "multiplier": 1.15, "mass": "300 kg", "volume": "100L" }
123123
},
124124
{
125125
"type": "furniture",
@@ -392,7 +392,7 @@
392392
"crafting_pseudo_item": "boulder_anvil",
393393
"examine_action": "workbench",
394394
"flags": [ "TRANSPARENT", "MINEABLE", "FLAT_SURF", "MOUNTABLE", "PLACE_ITEM", "SHORT" ],
395-
"workbench": { "multiplier": 1.1, "mass": 300000, "volume": "100L" },
395+
"workbench": { "multiplier": 1.1, "mass": "300 kg", "volume": "100L" },
396396
"bash": { "str_min": 0, "str_max": 0, "sound": "The boulder recedes into the ground.", "sound_fail": "thump." }
397397
},
398398
{

‎data/mods/Magiclysm/furniture_and_terrain/furniture_druid.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"destroyed_field": [ "fd_splinters", 1 ]
124124
},
125125
"examine_action": "workbench",
126-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
126+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" }
127127
},
128128
{
129129
"type": "furniture",
@@ -173,7 +173,7 @@
173173
"destroyed_field": [ "fd_splinters", 1 ]
174174
},
175175
"examine_action": "workbench",
176-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
176+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" }
177177
},
178178
{
179179
"type": "furniture",
@@ -256,7 +256,7 @@
256256
"destroyed_field": [ "fd_splinters", 1 ]
257257
},
258258
"examine_action": "workbench",
259-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" }
259+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75 L" }
260260
},
261261
{
262262
"id": "wildwood_weaver_shelter",

‎data/mods/Xedra_Evolved/furniture_and_terrain/furniture.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"light_emitted": 4,
175175
"crafting_pseudo_item": "sacrifice_table",
176176
"examine_action": "workbench",
177-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" },
177+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" },
178178
"description": "This is a dramatic stone altar, it glows faintly in the dark. Each of the four corners has a place for one of the cardinal elements as well as several recessed spaces around the center of the altar.",
179179
"bash": {
180180
"str_min": 30,

‎data/mods/Xedra_Evolved/furniture_and_terrain/furniture_treesung.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"destroyed_field": [ "fd_splinters", 1 ]
7272
},
7373
"examine_action": "workbench",
74-
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
74+
"workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" }
7575
},
7676
{
7777
"type": "furniture",

0 commit comments

Comments
 (0)