Skip to content

Commit

Permalink
[Magiclysm/MoM/Xedra Evolved] Update potion fruit / matrix elixirs / …
Browse files Browse the repository at this point in the history 
…goblin fruit to use consumption EoCs (#78712)

* Edit potion fruits

* Matrix elixirs + alien fruit

* Do goblin fruits

* Mention consumption_effect_on_conditions in the debug message
  • Loading branch information
@Standing-Storm
Standing-Storm authored Dec 29, 2024
1 parent a16268b commit f676f9f
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 222 deletions.
90 changes: 15 additions & 75 deletions data/mods/Magiclysm/items/potion_fruits.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "66 days 16 hours",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the apple potion fruit.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_APPLE" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_APPLE" ]
},
{
"type": "effect_on_condition",
Expand All @@ -30,11 +26,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "30 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the peach potion fruit.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_PEACH" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_PEACH" ]
},
{
"type": "effect_on_condition",
Expand All @@ -51,11 +43,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "40 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the pear potion fruit.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_PEAR" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_PEAR" ]
},
{
"type": "effect_on_condition",
Expand All @@ -72,11 +60,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of blackberry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_BLACKBERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_BLACKBERRY" ]
},
{
"type": "effect_on_condition",
Expand All @@ -93,11 +77,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of raspberry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_RASPBERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_RASPBERRY" ]
},
{
"type": "effect_on_condition",
Expand All @@ -114,11 +94,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of strawberry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_STRAWBERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_STRAWBERRY" ]
},
{
"type": "effect_on_condition",
Expand All @@ -135,11 +111,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of elderberry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_ELDERBERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_ELDERBERRY" ]
},
{
"type": "effect_on_condition",
Expand Down Expand Up @@ -168,11 +140,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of cranberry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_CRANBERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_CRANBERRY" ]
},
{
"type": "effect_on_condition",
Expand All @@ -189,11 +157,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of huckleberry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_HUCKLEBERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_HUCKLEBERRY" ]
},
{
"type": "effect_on_condition",
Expand All @@ -210,11 +174,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of wintergreen berry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_WINTERGREEN" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_WINTERGREEN" ]
},
{
"type": "effect_on_condition",
Expand All @@ -231,11 +191,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "25 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of cherry potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_CHERRY" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_CHERRY" ]
},
{
"type": "effect_on_condition",
Expand All @@ -252,11 +208,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "20 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of apricot potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_APRICOT" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_APRICOT" ]
},
{
"type": "effect_on_condition",
Expand All @@ -273,11 +225,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "20 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the handful of grape potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_GRAPE" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_GRAPE" ]
},
{
"type": "effect_on_condition",
Expand All @@ -297,11 +245,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "20 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the mayapple potion fruit.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_MAYAPPLE" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_MAYAPPLE" ]
},
{
"type": "effect_on_condition",
Expand All @@ -321,11 +265,7 @@
"proportional": { "quench": 0.5, "calories": 0.5 },
"spoils_in": "30 days",
"extend": { "flags": [ "NO_AUTO_CONSUME" ] },
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the starry false Solomon's seal potion fruits.",
"effect_on_conditions": [ "EOC_POTION_FRUIT_SOLOMON_SEAL" ]
}
"consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_SOLOMON_SEAL" ]
},
{
"type": "effect_on_condition",
Expand Down
60 changes: 10 additions & 50 deletions data/mods/MindOverMatter/items/comestibles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_BIOKIN_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_BIOKIN_POTION" ]
},
{
"id": "matrix_crystal_clair_dust_potion",
Expand All @@ -45,11 +41,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_CLAIR_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_CLAIR_POTION" ]
},
{
"id": "matrix_crystal_electrokin_dust_potion",
Expand All @@ -71,11 +63,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_ELECTROKIN_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_ELECTROKIN_POTION" ]
},
{
"id": "matrix_crystal_photokin_dust_potion",
Expand All @@ -97,11 +85,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_PHOTOKIN_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_PHOTOKIN_POTION" ]
},
{
"id": "matrix_crystal_pyrokin_dust_potion",
Expand All @@ -123,11 +107,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_PYROKIN_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_PYROKIN_POTION" ]
},
{
"id": "matrix_crystal_telekin_dust_potion",
Expand All @@ -149,11 +129,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_TELEKIN_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_TELEKIN_POTION" ]
},
{
"id": "matrix_crystal_telepath_dust_potion",
Expand All @@ -175,11 +151,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_TELEPATH_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_TELEPATH_POTION" ]
},
{
"id": "matrix_crystal_teleport_dust_potion",
Expand All @@ -201,11 +173,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_TELEPORT_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_TELEPORT_POTION" ]
},
{
"id": "matrix_crystal_vitakin_dust_potion",
Expand All @@ -227,11 +195,7 @@
"quench": 50,
"ammo_data": { "ammo_type": "water" },
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the concoction.",
"effect_on_conditions": [ "EOC_VITAKIN_POTION" ]
}
"consumption_effect_on_conditions": [ "EOC_VITAKIN_POTION" ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -294,11 +258,7 @@
"volume": "250 ml",
"fun": 1,
"flags": [ "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the berries.",
"effect_on_conditions": [ "EOC_ALIEN_MEADOW_BUSH_2_BERRIES" ]
}
"consumption_effect_on_conditions": [ "EOC_ALIEN_MEADOW_BUSH_2_BERRIES" ]
},
{
"type": "COMESTIBLE",
Expand Down
Loading

0 comments on commit f676f9f

Please sign in to comment.