Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ Xedra Evolved ] Update more comestibles to use effect_on_consumption #78805

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[ Xedra Evolved ] Update more comestibles to use effect_on_consumption #78805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ee6327
Fixes
Maleclypse Dec 28, 2024
4cfa125
Apply suggestions from code review
Maleclypse Dec 28, 2024
1a730fd
Update data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json
Maleclypse Dec 28, 2024
3bda1a7
Update data/mods/Xedra_Evolved/items/alchemy.json
Maleclypse Dec 28, 2024
1db08f0
Apply suggestions from code review
Maleclypse Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 35 additions & 53 deletions data/mods/Xedra_Evolved/items/alchemy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,19 +293,22 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion.",
"effect_on_conditions": [
{
"id": "extend_life",
"effect": [
{ "u_message": "You imbibed the concoction and you feel your chakras align and your DNA de-age." },
{ "u_add_trait": "EXTEND_LIFE" }
]
}
]
}
"consumption_effect_on_conditions": [ "extend_life" ]
},
{
"type": "effect_on_condition",
"id": "extend_life",
"condition": { "not": { "u_has_trait": "EXTEND_LIFE" } },
"effect": [
{ "u_message": "You imbibed the concoction and you feel your chakras align and your DNA de-age." },
{ "u_add_trait": "EXTEND_LIFE" }
],
"false_effect": [
{
"u_message": "This was a very valuable elixir that you just wasted drinking yourself. You can't become more unaging.",
"type": "neutral"
}
]
},
{
"id": "potion_dex",
Expand Down Expand Up @@ -342,21 +345,24 @@
"id": "hyde_formula",
"name": { "str_sp": "Hyde Formula" },
"description": "This is a transmutation potion that will bring your best attributes to the forefront.",
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the formula.",
"effect_on_conditions": [
{
"id": "hyde_formula",
"effect": [ { "u_message": "You imbibed the concoction and you feel your inner self unleashed." }, { "u_add_trait": "HYDE" } ]
}
]
},
"consumption_effect_on_conditions": [ "hyde_formula" ],
"type": "COMESTIBLE",
"color": "green_yellow",
"calories": 50,
"copy-from": "life_extension_potion"
},
{
"type": "effect_on_condition",
"id": "hyde_formula",
"condition": { "not": { "u_has_trait": "HYDE" } },
"effect": [ { "u_message": "You imbibed the concoction and you feel your inner self unleashed." }, { "u_add_trait": "HYDE" } ],
"false_effect": [
{
"u_message": "If this was a just world choosing to drink this concotion more than once would send you into an uncontrollable rage state where you rampaged until your inevitable death. This is not a just world.",
"type": "neutral"
}
]
},
{
"id": "plant_imbuement",
"type": "COMESTIBLE",
Expand All @@ -375,11 +381,7 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_plant_fae" ]
}
"consumption_effect_on_conditions": [ "become_plant_fae" ]
},
{
"id": "earth_imbuement",
Expand All @@ -399,11 +401,7 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_earth_fae" ]
}
"consumption_effect_on_conditions": [ "become_earth_fae" ]
},
{
"id": "water_imbuement",
Expand All @@ -423,11 +421,7 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_water_fae" ]
}
"consumption_effect_on_conditions": [ "become_water_fae" ]
},
{
"id": "air_imbuement",
Expand All @@ -447,11 +441,7 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_air_fae" ]
}
"consumption_effect_on_conditions": [ "become_air_fae" ]
},
{
"id": "fire_imbuement",
Expand All @@ -471,11 +461,7 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_fire_fae" ]
}
"consumption_effect_on_conditions": [ "become_fire_fae" ]
},
{
"id": "doll_imbuement",
Expand All @@ -495,10 +481,6 @@
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_doll_fae" ]
}
"consumption_effect_on_conditions": [ "become_doll_fae" ]
}
]
36 changes: 18 additions & 18 deletions data/mods/Xedra_Evolved/items/comestibles/med.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,24 @@
"vitamins": [ ],
"material": [ "water" ],
"freezing_point": -8,
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the blood.",
"effect_on_conditions": [
{
"id": "learn_blood_of_saints",
"condition": { "u_has_effect": "vampire_virus_post_mortal" },
"effect": [
{ "u_add_effect": "poisoned_blood2", "duration": "2 hours" },
{
"u_message": "Your veins burn and ache. What were you thinking trying this? You are already one of the damned!",
"type": "bad"
}
],
"false_effect": [ { "run_eocs": "learn_blood_of_saints_2" } ]
}
]
}
"consumption_effect_on_conditions": [ "learn_blood_of_saints" ]
},
{
"type": "effect_on_condition",
"id": "learn_blood_of_saints",
"condition": { "u_has_effect": "vampire_virus_post_mortal" },
"effect": [
{ "u_add_effect": "poisoned_blood2", "duration": "2 hours" },
{
"u_message": "Your veins burn and ache. What were you thinking trying this? You are already one of the damned!",
"type": "bad"
}
],
"false_effect": [
{ "u_message": "You imbibed the concoction and you feel your veins flex in a warm glow.", "type": "good" },
{ "u_add_trait": "BLOOD_OF_SAINTS" },
{ "u_add_effect": "blood_treatment", "duration": "PERMANENT" }
]
},
{
"type": "effect_on_condition",
Expand Down
6 changes: 1 addition & 5 deletions data/mods/Xedra_Evolved/items/drugs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,7 @@
"stack_size": 4,
"symbol": "!",
"color": "magenta",
"use_action": {
"type": "effect_on_conditions",
"description": "Inject the treatment.",
"effect_on_conditions": [ "EOC_CONSUMED_BLOOD_TREATMENT" ]
},
"consumption_effect_on_conditions": [ "EOC_CONSUMED_BLOOD_TREATMENT" ],
"flags": [ "NPC_SAFE", "TRADER_AVOID" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
},
Expand Down
Loading
Loading