Skip to content

Commit ba164bf

Browse files
RenechCDDARenechCDDA
committed
Fix all the json definitions for consume_drug/vitamins mismatches
1 parent ad84005 commit ba164bf

File tree

4 files changed

+113
-23
lines changed

4 files changed

+113
-23
lines changed

‎data/json/items/comestibles/med.json‎

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
"use_action": {
150150
"type": "consume_drug",
151151
"activation_message": "You take some %s.",
152-
"effects": [ { "id": "pkill1_nsaid", "duration": 9000 } ]
152+
"effects": [ { "id": "pkill1_nsaid", "duration": 9000 } ],
153+
"vitamins": [ [ "vit_bloodthinner", 4320, 4320 ] ]
153154
},
154155
"vitamins": [ [ "vit_bloodthinner", 4320 ] ]
155156
},
@@ -173,7 +174,8 @@
173174
"use_action": {
174175
"type": "consume_drug",
175176
"activation_message": "You take some %s.",
176-
"effects": [ { "id": "pkill1_nsaid", "duration": 9000 } ]
177+
"effects": [ { "id": "pkill1_nsaid", "duration": 9000 } ],
178+
"vitamins": [ [ "vit_ibuprofen", 216, 216 ] ]
177179
},
178180
"vitamins": [ [ "vit_ibuprofen", 216 ] ]
179181
},
@@ -197,7 +199,8 @@
197199
"use_action": {
198200
"type": "consume_drug",
199201
"activation_message": "You take some %s.",
200-
"effects": [ { "id": "pkill1_nsaid", "duration": 18000 } ]
202+
"effects": [ { "id": "pkill1_nsaid", "duration": 18000 } ],
203+
"vitamins": [ [ "vit_ibuprofen", 432, 432 ] ]
201204
},
202205
"vitamins": [ [ "vit_ibuprofen", 432 ] ]
203206
},
@@ -241,7 +244,7 @@
241244
"container": "bottle_plastic_pill_painkiller",
242245
"healthy": -1,
243246
"flags": [ "WATER_DISSOLVE", "NO_TEMP" ],
244-
"use_action": { "type": "consume_drug", "activation_message": "You take some %s." },
247+
"use_action": { "type": "consume_drug", "activation_message": "You take some %s.", "vitamins": [ [ "vit_betablocker", 864, 864 ] ] },
245248
"vitamins": [ [ "vit_betablocker", 864 ] ]
246249
},
247250
{
@@ -492,7 +495,8 @@
492495
"use_action": {
493496
"type": "consume_drug",
494497
"activation_message": "You take some %s.",
495-
"effects": [ { "id": "pkill2", "duration": 1080 }, { "id": "cough_suppress", "duration": 1000 } ]
498+
"effects": [ { "id": "pkill2", "duration": 1080 }, { "id": "cough_suppress", "duration": 1000 } ],
499+
"vitamins": [ [ "vit_mme", 450, 450 ] ]
496500
}
497501
},
498502
{
@@ -1262,7 +1266,8 @@
12621266
{ "id": "pkill3", "duration": 480 },
12631267
{ "id": "pkill2", "duration": 1200 },
12641268
{ "id": "cough_suppress", "duration": 1000 }
1265-
]
1269+
],
1270+
"vitamins": [ [ "vit_mme", 3000, 3000 ] ]
12661271
}
12671272
},
12681273
{
@@ -1410,7 +1415,8 @@
14101415
"type": "consume_drug",
14111416
"activation_message": "You shoot up.",
14121417
"tools_needed": { "syringe": -1 },
1413-
"effects": [ { "id": "pkill3", "duration": 120 }, { "id": "pkill2", "duration": 1200 } ]
1418+
"effects": [ { "id": "pkill3", "duration": 120 }, { "id": "pkill2", "duration": 1200 } ],
1419+
"vitamins": [ [ "vit_mme", 3000, 3000 ] ]
14141420
}
14151421
},
14161422
{
@@ -1556,7 +1562,8 @@
15561562
"use_action": {
15571563
"type": "consume_drug",
15581564
"activation_message": "You take some %s.",
1559-
"effects": [ { "id": "pkill3", "duration": 120 }, { "id": "pkill2", "duration": 1200 } ]
1565+
"effects": [ { "id": "pkill3", "duration": 120 }, { "id": "pkill2", "duration": 1200 } ],
1566+
"vitamins": [ [ "vit_mme", 2250, 2250 ] ]
15601567
}
15611568
},
15621569
{
@@ -1614,7 +1621,8 @@
16141621
"use_action": {
16151622
"type": "consume_drug",
16161623
"activation_message": "You take some %s.",
1617-
"effects": [ { "id": "pkill2", "duration": 1080 } ]
1624+
"effects": [ { "id": "pkill2", "duration": 1080 } ],
1625+
"vitamins": [ [ "vit_mme", 200, 200 ] ]
16181626
}
16191627
},
16201628
{
@@ -1636,7 +1644,7 @@
16361644
"addiction_type": [ "sleeping pill", "opiate" ],
16371645
"vitamins": [ [ "vit_mme", 200 ] ],
16381646
"flags": [ "NO_TEMP" ],
1639-
"use_action": { "type": "consume_drug", "activation_message": "You take a %s." },
1647+
"use_action": { "type": "consume_drug", "activation_message": "You take a %s.", "vitamins": [ [ "vit_mme", 200, 200 ] ] },
16401648
"sleepiness_mod": -40
16411649
},
16421650
{
@@ -1872,7 +1880,8 @@
18721880
"use_action": {
18731881
"type": "consume_drug",
18741882
"activation_message": "You take some %s.",
1875-
"effects": [ { "id": "pkill_l", "duration": 27000 } ]
1883+
"effects": [ { "id": "pkill_l", "duration": 27000 } ],
1884+
"vitamins": [ [ "vit_mme", 600, 600 ] ]
18761885
}
18771886
},
18781887
{
@@ -1896,8 +1905,6 @@
18961905
"activation_message": "You take the %s.",
18971906
"vitamins": [ [ "calcium", 24, 48 ], [ "iron", 24, 48 ], [ "vitC", 24, 48 ] ]
18981907
},
1899-
"//": "Yes, the vitamins are intentionally duplicated here. The consume/use/iteminfo UI needs them in use_action, but to actually pass on the vitamins they need to be in the comestible data, as below.",
1900-
"//2": "TODO: Fix this...",
19011908
"vitamins": [ [ "calcium", 36 ], [ "iron", 36 ], [ "vitC", 36 ] ]
19021909
},
19031910
{
@@ -1916,6 +1923,7 @@
19161923
"symbol": "!",
19171924
"color": "magenta",
19181925
"container": "bottle_plastic_pill_supplement",
1926+
"vitamins": [ [ "calcium", 75 ] ],
19191927
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "calcium", 75 ] ] }
19201928
},
19211929
{
@@ -1936,8 +1944,12 @@
19361944
"color": "white",
19371945
"looks_like": "calcium_tablet",
19381946
"flags": [ "NO_TEMP" ],
1939-
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "calcium", 24 ] ] },
1940-
"vitamins": [ [ "meat_allergen", 1 ] ]
1947+
"use_action": {
1948+
"type": "consume_drug",
1949+
"activation_message": "You take the %s.",
1950+
"vitamins": [ [ "calcium", 24 ], [ "meat_allergen", 1 ] ]
1951+
},
1952+
"vitamins": [ [ "calcium", 24 ], [ "meat_allergen", 1 ] ]
19411953
},
19421954
{
19431955
"id": "flavored_bonemeal_tablet",
@@ -1957,8 +1969,12 @@
19571969
"color": "yellow",
19581970
"looks_like": "calcium_tablet",
19591971
"flags": [ "NO_TEMP" ],
1960-
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "calcium", 23 ] ] },
1961-
"vitamins": [ [ "meat_allergen", 1 ] ]
1972+
"use_action": {
1973+
"type": "consume_drug",
1974+
"activation_message": "You take the %s.",
1975+
"vitamins": [ [ "calcium", 23 ], [ "meat_allergen", 1 ] ]
1976+
},
1977+
"vitamins": [ [ "calcium", 23 ], [ "meat_allergen", 1 ] ]
19621978
},
19631979
{
19641980
"id": "vitc_tablet",
@@ -1975,7 +1991,8 @@
19751991
"flags": [ "IRREPLACEABLE_CONSUMABLE", "NO_TEMP" ],
19761992
"symbol": "!",
19771993
"color": "magenta",
1978-
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "vitC", 556 ] ] }
1994+
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "vitC", 556 ] ] },
1995+
"vitamins": [ [ "vitC", 556 ] ]
19791996
},
19801997
{
19811998
"id": "vitc_fragment",
@@ -1992,7 +2009,8 @@
19922009
"flags": [ "IRREPLACEABLE_CONSUMABLE", "NO_TEMP" ],
19932010
"symbol": "!",
19942011
"color": "magenta",
1995-
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "vitC", 92 ] ] }
2012+
"use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "vitC", 92 ] ] },
2013+
"vitamins": [ [ "vitC", 92 ] ]
19962014
},
19972015
{
19982016
"id": "gummy_vitamins",
@@ -2078,6 +2096,7 @@
20782096
"symbol": "!",
20792097
"color": "magenta",
20802098
"flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "NO_TEMP" ],
2099+
"vitamins": [ [ "iron", 100 ] ],
20812100
"use_action": {
20822101
"type": "consume_drug",
20832102
"activation_message": "You inject some iron.",
@@ -2113,7 +2132,8 @@
21132132
"fields_produced": { "fd_weedsmoke": 2 },
21142133
"charges_needed": { "fire": 1 },
21152134
"tools_needed": { "apparatus": -1 },
2116-
"moves": 420
2135+
"moves": 420,
2136+
"vitamins": [ [ "veggy_allergen", 1 ] ]
21172137
},
21182138
"vitamins": [ [ "veggy_allergen", 1 ] ]
21192139
},
@@ -2210,6 +2230,7 @@
22102230
"color": "white",
22112231
"container": "bottle_plastic_small",
22122232
"flags": [ "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "NPC_SAFE", "NO_TEMP" ],
2233+
"vitamins": [ [ "calcium", 25 ] ],
22132234
"use_action": {
22142235
"type": "consume_drug",
22152236
"activation_message": "You take an antacid tablet.",

0 commit comments

Comments
 (0)