Skip to content

Commit

Permalink
Fix more bork in DDA version
Browse files Browse the repository at this point in the history
Fix stuff caused by CleverRaven/Cataclysm-DDA#60885, I'm gonna have to check other mods too, bleh.

Fixes #358
  • Loading branch information
chaosvolt committed Aug 1, 2023
1 parent f792134 commit d3a4610
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Arcana/item_groups/item_groups_cleansingflame.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@
[ "strength_potion", 15 ],
[ "speed_potion", 10 ],
[ "healing_potion", 10 ],
[ "red_black_vulnerary", 5 ],
[ "yellow_white_incense", 5 ]
{ "item": "red_black_vulnerary", "prob": 5, "charges": 2 },
{ "item": "yellow_white_incense", "prob": 5, "charges": 2 }
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions Arcana/item_groups/item_groups_general.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@
[ "strength_potion", 40 ],
[ "speed_potion", 35 ],
[ "healing_potion", 30 ],
[ "red_black_vulnerary", 25 ],
[ "yellow_white_incense", 20 ],
{ "item": "red_black_vulnerary", "prob": 25, "charges": 2 },
{ "item": "yellow_white_incense", "prob": 20, "charges": 2 },
[ "scroll_sun", 25 ],
[ "scroll_moon", 25 ],
[ "scroll_artiface", 20 ],
Expand Down
10 changes: 3 additions & 7 deletions Arcana/items/comestibles.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,12 @@
"name": { "str": "carmine vulnerary", "str_pl": "carmine vulnerary" },
"description": "Patches of cloth steeped in an alchemical mixture, forming a poultice that refines and focuses its effects. Its healing effect is focused on a single limb, and can purge infected wounds before they become septic. However, it loses its effect on deeper ailments, only staving off blood loss and spores, while providing some painkilling effect.",
"weight": "150 g",
"volume": "250 ml",
"volume": "25 ml",
"price": "450 USD",
"price_postapoc": "90 USD",
"looks_like": "disinrag",
"symbol": "!",
"color": "red",
"charges": 2,
"stack_size": 9,
"use_action": {
"type": "heal",
"limb_power": 20,
Expand All @@ -171,14 +169,12 @@
"//": "Citrine isn't quite white-yellow either, but jasmine incense would imply the flower rather than the color.",
"description": "An alchemical mixture permeating a combustible base of charcoal or resin, resulting in a peculiar sort of incense. Using it will invigorate the user with a focused effect similar to the potions originally used to make it. Rather than affecting strength and speed, it will directly restore a large burst of stamina and fatigue.\n\nEach use will restore 30 fatigue, and 3000 stamina.",
"weight": "550 g",
"volume": "250 ml",
"volume": "25 ml",
"price": "350 USD",
"price_postapoc": "70 USD",
"looks_like": "charcoal",
"symbol": "!",
"color": "light_gray",
"charges": 2,
"stack_size": 9,
"use_action": { "type": "cast_spell", "spell_id": "arcana_item_incense", "no_fail": true, "level": 0 },
"flags": [ "NO_INGEST", "NPC_SAFE", "NUTRIENT_OVERRIDE" ]
},
Expand All @@ -198,6 +194,7 @@
"container": "flask_glass",
"symbol": "~",
"color": "red",
"charges": 1,
"healthy": -6,
"fun": -8,
"freezing_point": -10,
Expand All @@ -223,7 +220,6 @@
"looks_like": "birchbark",
"symbol": ",",
"color": "cyan",
"charges": 1,
"use_action": [
{ "type": "cast_spell", "spell_id": "arcana_item_immolate", "no_fail": true, "level": 0 },
{ "type": "firestarter", "moves": 5 }
Expand Down
2 changes: 2 additions & 0 deletions Arcana/recipes/recipe_medsandchemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@
"difficulty": 3,
"skills_required": [ "firstaid", 1 ],
"time": "10 m",
"charges": 2,
"activity_level": "LIGHT_EXERCISE",
"batch_time_factors": [ 80, 4 ],
"book_learn": [ [ "book_potioncraft", 4 ] ],
Expand All @@ -342,6 +343,7 @@
"difficulty": 4,
"skills_required": [ "chemistry", 3 ],
"time": "30 m",
"charges": 2,
"activity_level": "LIGHT_EXERCISE",
"batch_time_factors": [ 80, 4 ],
"book_learn": [ [ "book_potioncraft", 5 ] ],
Expand Down

0 comments on commit d3a4610

Please sign in to comment.