Skip to content

Commit 477815c

Browse files
Fris0umanFris0uman
committed
Update json to the new system
1 parent 477f32c commit 477815c

File tree

8 files changed

+53
-40
lines changed

8 files changed

+53
-40
lines changed

‎data/json/items/ammo.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,8 @@
539539
"dispersion": 14,
540540
"loudness": 0,
541541
"to_hit": -2,
542-
"effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80" ],
542+
"recovery_chance": 80,
543+
"effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
543544
"melee_damage": { "cut": 9 }
544545
},
545546
{
@@ -560,7 +561,8 @@
560561
"dispersion": 14,
561562
"loudness": 0,
562563
"to_hit": -1,
563-
"effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80", "ALLOWS_BODY_BLOCK" ],
564+
"recovery_chance": 80,
565+
"effects": [ "NEVER_MISFIRES", "NON_FOULING", "ALLOWS_BODY_BLOCK" ],
564566
"qualities": [ [ "HAMMER", 1 ] ],
565567
"melee_damage": { "bash": 7 }
566568
},

‎data/json/items/generic/toys_and_sports.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@
122122
"dispersion": 14,
123123
"loudness": 0,
124124
"to_hit": -3,
125-
"effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_60" ],
125+
"recovery_chance": 60,
126+
"effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
126127
"melee_damage": { "bash": 8 }
127128
},
128129
{
@@ -163,7 +164,8 @@
163164
"dispersion": 12,
164165
"loudness": 0,
165166
"to_hit": 3,
166-
"effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80" ],
167+
"recovery_chance": 80,
168+
"effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
167169
"melee_damage": { "bash": 6 }
168170
},
169171
{

‎data/json/items/ranged/archery.json‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"description": "A crude pointed wooden shaft with a notch at the back.",
1313
"material": [ "wood" ],
1414
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
15-
"effects": [ "RECOVER_2" ]
15+
"recovery_chance": 2
1616
},
1717
{
1818
"type": "AMMO",
@@ -33,7 +33,7 @@
3333
"dispersion": 150,
3434
"loudness": 0,
3535
"critical_multiplier": 10,
36-
"effects": [ "RECOVER_30" ],
36+
"recovery_chance": 30,
3737
"melee_damage": { "bash": 3 }
3838
},
3939
{
@@ -50,7 +50,8 @@
5050
"material": [ { "type": "wood", "portion": 81 }, { "type": "rubber", "portion": 19 } ],
5151
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.2 },
5252
"critical_multiplier": 1,
53-
"effects": [ "RECOVER_35", "BEANBAG" ]
53+
"recovery_chance": 35,
54+
"effects": [ "BEANBAG" ]
5455
},
5556
{
5657
"type": "AMMO",
@@ -63,7 +64,8 @@
6364
"copy-from": "arrow_field_point_fletched",
6465
"price_postapoc": "15 cent",
6566
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
66-
"effects": [ "RECOVER_10", "NOGIB" ]
67+
"recovery_chance": 10,
68+
"effects": [ "NOGIB" ]
6769
},
6870
{
6971
"type": "AMMO",
@@ -76,7 +78,7 @@
7678
"relative": { "dispersion": -40 },
7779
"price": "20 USD",
7880
"damage": { "damage_type": "stab", "armor_penetration": 1, "constant_damage_multiplier": 1.5 },
79-
"effects": [ "RECOVER_25" ],
81+
"recovery_chance": 25,
8082
"melee_damage": { "bash": 2, "cut": 1 }
8183
},
8284
{
@@ -90,7 +92,7 @@
9092
"material": [ "wood" ],
9193
"copy-from": "arrow_field_point_fletched",
9294
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
93-
"effects": [ "RECOVER_6" ]
95+
"recovery_chance": 6
9496
},
9597
{
9698
"type": "AMMO",
@@ -103,7 +105,8 @@
103105
"copy-from": "arrow_field_point_fletched",
104106
"price_postapoc": "25 cent",
105107
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
106-
"effects": [ "RECOVER_35", "NOGIB" ]
108+
"recovery_chance": 35,
109+
"effects": [ "NOGIB" ]
107110
},
108111
{
109112
"type": "AMMO",
@@ -118,7 +121,7 @@
118121
"price_postapoc": "15 cent",
119122
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25 },
120123
"show_stats": true,
121-
"effects": [ "RECOVER_8" ]
124+
"recovery_chance": 8
122125
},
123126
{
124127
"type": "AMMO",
@@ -132,7 +135,7 @@
132135
"price_postapoc": "20 cent",
133136
"damage": { "damage_type": "stab", "armor_penetration": 1 },
134137
"show_stats": true,
135-
"effects": [ "RECOVER_20" ],
138+
"recovery_chance": 20,
136139
"melee_damage": { "bash": 2 }
137140
},
138141
{
@@ -148,7 +151,7 @@
148151
"price_postapoc": "40 cent",
149152
"damage": { "damage_type": "stab", "armor_penetration": 1, "constant_damage_multiplier": 1.5 },
150153
"range": 2,
151-
"effects": [ "RECOVER_35" ],
154+
"recovery_chance": 35,
152155
"melee_damage": { "bash": 3, "cut": 2 }
153156
},
154157
{
@@ -164,7 +167,7 @@
164167
"price_postapoc": "40 cent",
165168
"damage": { "damage_type": "stab", "armor_penetration": 3 },
166169
"range": 2,
167-
"effects": [ "RECOVER_40" ],
170+
"recovery_chance": 40,
168171
"melee_damage": { "bash": 3, "cut": 2 }
169172
},
170173
{
@@ -181,7 +184,8 @@
181184
"relative": { "dispersion": -75 },
182185
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
183186
"range": 2,
184-
"effects": [ "RECOVER_45", "NOGIB" ]
187+
"recovery_chance": 45,
188+
"effects": [ "NOGIB" ]
185189
},
186190
{
187191
"type": "AMMO",
@@ -197,7 +201,7 @@
197201
"price_postapoc": "50 cent",
198202
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.75 },
199203
"range": 4,
200-
"effects": [ "RECOVER_30" ],
204+
"recovery_chance": 30,
201205
"melee_damage": { "bash": 1 }
202206
},
203207
{
@@ -220,7 +224,7 @@
220224
"dispersion": 120,
221225
"loudness": 0,
222226
"critical_multiplier": 6,
223-
"effects": [ "RECOVER_1000000" ],
227+
"recovery_chance": 100,
224228
"to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "good" },
225229
"flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE" ],
226230
"melee_damage": { "bash": 10, "stab": 26 }
@@ -245,7 +249,7 @@
245249
"count": 1,
246250
"stack_size": 1,
247251
"critical_multiplier": 10,
248-
"effects": [ "RECOVER_35" ],
252+
"recovery_chance": 35,
249253
"use_action": {
250254
"target": "arrow_flamming",
251255
"target_timer": "20 seconds",
@@ -266,7 +270,8 @@
266270
"symbol": "=",
267271
"color": "brown",
268272
"revert_to": "arrow_field_point_fletched",
269-
"effects": [ "IGNITE", "RECOVER_35" ],
273+
"recovery_chance": 35,
274+
"effects": [ "IGNITE" ],
270275
"flags": [ "TRADER_AVOID" ]
271276
},
272277
{

‎data/json/items/ranged/atlatl.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"dispersion": 35,
5454
"loudness": 0,
5555
"critical_multiplier": 15,
56-
"effects": [ "RECOVER_30" ],
56+
"recovery_chance": 30,
5757
"melee_damage": { "stab": 10 }
5858
},
5959
{
@@ -74,7 +74,7 @@
7474
"dispersion": 35,
7575
"loudness": 0,
7676
"critical_multiplier": 15,
77-
"effects": [ "RECOVER_25" ],
77+
"recovery_chance": 25,
7878
"melee_damage": { "stab": 8 }
7979
},
8080
{
@@ -95,7 +95,7 @@
9595
"dispersion": 50,
9696
"loudness": 0,
9797
"critical_multiplier": 8,
98-
"effects": [ "RECOVER_6" ],
98+
"recovery_chance": 6,
9999
"melee_damage": { "stab": 5 }
100100
}
101101
]

‎data/json/items/ranged/crossbows.json‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"price": "0 cent",
1212
"price_postapoc": "20 cent",
1313
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
14-
"effects": [ "RECOVER_2" ]
14+
"recovery_chance": 2
1515
},
1616
{
1717
"type": "AMMO",
@@ -26,7 +26,7 @@
2626
"price": "5 USD",
2727
"price_postapoc": "25 cent",
2828
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
29-
"effects": [ "RECOVER_6" ]
29+
"recovery_chance": 6
3030
},
3131
{
3232
"type": "AMMO",
@@ -41,7 +41,8 @@
4141
"price": "6 USD 50 cent",
4242
"price_postapoc": "25 cent",
4343
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
44-
"effects": [ "RECOVER_10", "NOGIB" ]
44+
"recovery_chance": 10,
45+
"effects": [ "NOGIB" ]
4546
},
4647
{
4748
"type": "AMMO",
@@ -57,7 +58,7 @@
5758
"price_postapoc": "30 cent",
5859
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25 },
5960
"show_stats": true,
60-
"effects": [ "RECOVER_8" ]
61+
"recovery_chance": 8
6162
},
6263
{
6364
"type": "AMMO",
@@ -69,7 +70,7 @@
6970
"copy-from": "bolt_wood_bodkin",
7071
"relative": { "dispersion": 10 },
7172
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.5, "armor_penetration": 1 },
72-
"effects": [ "RECOVER_25" ]
73+
"recovery_chance": 25
7374
},
7475
{
7576
"type": "AMMO",
@@ -89,7 +90,7 @@
8990
"dispersion": 100,
9091
"loudness": 0,
9192
"critical_multiplier": 10,
92-
"effects": [ "RECOVER_30" ],
93+
"recovery_chance": 30,
9394
"melee_damage": { "bash": 3 }
9495
},
9596
{
@@ -102,7 +103,8 @@
102103
"copy-from": "bolt_wood_bodkin",
103104
"relative": { "dispersion": 30 },
104105
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
105-
"effects": [ "RECOVER_35", "NOGIB" ]
106+
"recovery_chance": 35,
107+
"effects": [ "NOGIB" ]
106108
},
107109
{
108110
"type": "AMMO",
@@ -115,7 +117,7 @@
115117
"relative": { "dispersion": 80 },
116118
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25, "armor_penetration": 1 },
117119
"show_stats": true,
118-
"effects": [ "RECOVER_20" ]
120+
"recovery_chance": 20
119121
},
120122
{
121123
"type": "AMMO",
@@ -131,7 +133,7 @@
131133
"price_postapoc": "50 cent",
132134
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.5, "armor_penetration": 2 },
133135
"range": 2,
134-
"effects": [ "RECOVER_35" ]
136+
"recovery_chance": 35
135137
},
136138
{
137139
"type": "AMMO",
@@ -147,7 +149,7 @@
147149
"price_postapoc": "50 cent",
148150
"damage": { "damage_type": "stab", "armor_penetration": 4 },
149151
"range": 2,
150-
"effects": [ "RECOVER_40" ]
152+
"recovery_chance": 40
151153
},
152154
{
153155
"type": "AMMO",
@@ -161,7 +163,8 @@
161163
"relative": { "dispersion": -30 },
162164
"damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
163165
"range": 2,
164-
"effects": [ "RECOVER_45", "NOGIB" ]
166+
"recovery_chance": 45,
167+
"effects": [ "NOGIB" ]
165168
},
166169
{
167170
"type": "AMMO",
@@ -177,7 +180,7 @@
177180
"price_postapoc": "60 cent",
178181
"damage": { "damage_type": "stab", "constant_damage_multiplier": 1.75 },
179182
"range": 4,
180-
"effects": [ "RECOVER_30" ]
183+
"recovery_chance": 30
181184
},
182185
{
183186
"id": "bullet_crossbow",

‎data/json/items/ranged/launchers.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"price": "500 USD",
6666
"material": [ "steel" ],
6767
"flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON_FOULING", "WONT_TRAIN_MARKSMANSHIP" ],
68-
"ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES", "RECOVER_10" ],
68+
"ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES" ],
6969
"skill": "launcher",
7070
"ammo": [ "water" ],
7171
"weight": "24500 g",

‎data/json/items/ranged/spearguns.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dispersion": 150,
2020
"loudness": 0,
2121
"count": 4,
22-
"effects": [ "RECOVER_5" ],
22+
"recovery_chance": 5,
2323
"melee_damage": { "bash": 1 }
2424
},
2525
{
@@ -42,7 +42,7 @@
4242
"dispersion": 90,
4343
"loudness": 0,
4444
"count": 4,
45-
"effects": [ "RECOVER_3" ],
45+
"recovery_chance": 3,
4646
"melee_damage": { "bash": 1 }
4747
},
4848
{
@@ -65,7 +65,7 @@
6565
"dispersion": 120,
6666
"loudness": 0,
6767
"count": 4,
68-
"effects": [ "RECOVER_15" ],
68+
"recovery_chance": 15,
6969
"melee_damage": { "bash": 1 }
7070
},
7171
{

‎data/json/items/resources/stone.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"dispersion": 14,
1919
"loudness": 0,
2020
"to_hit": -1,
21-
"effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_60" ],
21+
"recovery_chance": 60,
22+
"effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
2223
"melee_damage": { "bash": 7 }
2324
},
2425
{

0 commit comments

Comments
 (0)