Skip to content

Commit

Permalink
Vitamin and MME per item
Browse files Browse the repository at this point in the history
  • Loading branch information
Maleclypse committed Jul 22, 2024
1 parent d09c6c1 commit 4824e8b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
14 changes: 14 additions & 0 deletions data/json/items/comestibles/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "codeine" },
"//": "Based on 30mg Codeine Sulfate Tablets.",
"description": "A mild opiate used in the suppression of pain, cough, and other ailments. While relatively weak for a narcotic, it is still addictive, with a potential for overdose.",
"material": [ "drug_filler" ],
"weight": "1 g",
Expand All @@ -433,6 +434,7 @@
"fun": 10,
"flags": [ "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"addiction_potential": 10,
"vitamins": [ [ "vit_mme", 450 ] ],
"addiction_type": "opiate",
"use_action": {
"type": "consume_drug",
Expand Down Expand Up @@ -1163,6 +1165,7 @@
"stim": -10,
"healthy": -5,
"fun": 50,
"vitamins": [ [ "vit_mme", 2000 ] ],
"addiction_potential": 75,
"addiction_type": "opiate",
"flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
Expand Down Expand Up @@ -1292,6 +1295,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "morphine" },
"//": "10mg syrette in army medkits",
"description": "A very strong, naturally-occurring narcotic used to treat intense pain in hospital settings. You'll need a syringe to inject it, and it's very addictive, so be careful.",
"weight": "1 g",
"volume": "2 ml",
Expand All @@ -1305,6 +1309,7 @@
"fun": 25,
"addiction_potential": 25,
"addiction_type": "opiate",
"vitamins": [ [ "vit_mme", 1000 ] ],
"flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "consume_drug",
Expand Down Expand Up @@ -1430,6 +1435,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "oxycodone" },
"//": "15mg Oxycodone pills",
"description": "A strong semi-synthetic narcotic used in the treatment of intense pain. Highly addictive.",
"material": [ "drug_filler" ],
"weight": "1 g",
Expand All @@ -1445,6 +1451,7 @@
"fun": 18,
"flags": [ "IRREPLACEABLE_CONSUMABLE", "EDIBLE_FROZEN" ],
"addiction_potential": 16,
"vitamins": [ [ "vit_mme", 2250 ] ],
"addiction_type": "opiate",
"use_action": {
"type": "consume_drug",
Expand Down Expand Up @@ -1491,6 +1498,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "poppy painkiller" },
"//": "ML equivalent to 1 mg of morphine",
"description": "A potent opioid palliative produced by the refining of the mutated poppy. Notably devoid of euphoric or sedative effects, but as an opiate it can still be addictive.",
"weight": "1 g",
"volume": "2 ml",
Expand All @@ -1502,6 +1510,7 @@
"healthy": -2,
"addiction_potential": 10,
"addiction_type": "opiate",
"vitamins": [ [ "vit_mme", 200 ] ],
"flags": [ "EDIBLE_FROZEN" ],
"use_action": {
"type": "consume_drug",
Expand All @@ -1514,6 +1523,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "poppy sleep" },
"//": "ML equivalent to 1 mg of morphine",
"description": "A potent sleep aid extracted from mutated poppy seeds. Effective, but as an opiate it can be addictive.",
"weight": "1 g",
"volume": "2 ml",
Expand All @@ -1523,6 +1533,7 @@
"symbol": "!",
"color": "magenta",
"healthy": -2,
"vitamins": [ [ "vit_mme", 200 ] ],
"addiction_type": "opiate",
"flags": [ "EDIBLE_FROZEN" ],
"use_action": {
Expand All @@ -1545,6 +1556,7 @@
"symbol": "~",
"color": "magenta",
"phase": "liquid",
"vitamins": [ [ "vit_mme", 200 ] ],
"container": "bottle_plastic_small",
"stim": -3,
"healthy": -1,
Expand Down Expand Up @@ -1735,6 +1747,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "tramadol" },
"//": "60mg Ultram",
"description": "A painkiller used to manage moderate pain. The effects last for several hours, but are relatively subdued for an opioid.",
"material": [ "drug_filler" ],
"weight": "1 g",
Expand All @@ -1746,6 +1759,7 @@
"container": "bottle_plastic_pill_prescription",
"fun": 6,
"flags": [ "IRREPLACEABLE_CONSUMABLE", "EDIBLE_FROZEN" ],
"vitamins": [ [ "vit_mme", 600 ] ],
"addiction_potential": 6,
"addiction_type": "opiate",
"use_action": {
Expand Down
13 changes: 13 additions & 0 deletions data/json/vitamin.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,19 @@
"rate": "100 s",
"disease_excess": [ [ 10, 216 ] ]
},
{
"id": "vit_mme",
"type": "vitamin",
"vit_type": "drug",
"name": { "str": "Morphine Milligram Equivalent (percentile)" },
"//": "1 vit_mme is equivalent to 1% of an MME. Need to adjust excess and rate at minimum.",
"excess": "opiate_eff",
"min": 0,
"max": 40000,
"//": "Takes 30 min to kick in, lasts 6 hours",

Check failure on line 95 in data/json/vitamin.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> duplicate entry in json object "min": 0, "max": 40000, "//": "Takes 30 min to kick in, lasts 6 hours", ▲▲▲ "rate": "100 s", "disease_excess": [ [ 100, 216 ] ]

Check failure on line 95 in data/json/vitamin.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

([slow] ~starting_items)=> duplicate entry in json object "min": 0, "max": 40000, "//": "Takes 30 min to kick in, lasts 6 hours", ▲▲▲ "rate": "100 s", "disease_excess": [ [ 100, 216 ] ]
"rate": "100 s",
"disease_excess": [ [ 100, 216 ] ]
},
{
"id": "mutant_toxin",
"type": "vitamin",
Expand Down
1 change: 1 addition & 0 deletions data/mods/Xedra_Evolved/items/alchemy.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
"healthy": -7,
"fun": 30,
"addiction_potential": 15,
"vitamins": [ [ "vit_mme", 200 ] ],
"addiction_type": [ "amphetamine", { "addiction": "opiate", "potential": 10 } ],
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
Expand Down

0 comments on commit 4824e8b

Please sign in to comment.