Skip to content

Commit b20e933

Browse files
[Xedra Evolved ] Fix Gracken Stomachs (CleverRaven#83417)
* Fix Gracken Stomachs * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent bd69c6a commit b20e933

File tree

3 files changed

+37
-6
lines changed

3 files changed

+37
-6
lines changed

data/mods/Xedra_Evolved/items/gracken_trait_improvements.json

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,19 @@
164164
"type": "effect_on_condition",
165165
"id": "herbivorous_stomach",
166166
"condition": { "not": { "u_has_trait": "SHADE_HERBIVORE" } },
167-
"effect": [ { "u_message": "You exchanged your previous stomach for this." }, { "u_add_trait": "SHADE_HERBIVORE" } ],
167+
"effect": [
168+
{ "u_message": "You exchanged your previous stomach for this." },
169+
{ "u_add_trait": "SHADE_HERBIVORE" },
170+
{ "u_lose_trait": "RADIOTROPHIC" }
171+
],
168172
"false_effect": [ { "u_message": "You are already an herbivore.", "type": "neutral" } ]
169173
},
170174
{
171175
"id": "gracken_omnivorous_stomach",
172176
"copy-from": "gracken_improvement_general",
173177
"type": "ITEM",
174178
"subtypes": [ "TOOL" ],
175-
"name": { "str_sp": "Gracken Dextrous Hands" },
179+
"name": { "str_sp": "Gracken Omnivorous Stomach" },
176180
"looks_like": "offal",
177181
"description": "An organ that allows a mature Gracken to convert their diet to an omnivorous one.",
178182
"use_action": {
@@ -186,15 +190,19 @@
186190
"type": "effect_on_condition",
187191
"id": "omnivorous_stomach",
188192
"condition": { "not": { "u_has_trait": "SHADE_OMNIVORE" } },
189-
"effect": [ { "u_message": "You exchanged your previous stomach for this." }, { "u_add_trait": "SHADE_OMNIVORE" } ],
193+
"effect": [
194+
{ "u_message": "You exchanged your previous stomach for this." },
195+
{ "u_add_trait": "SHADE_OMNIVORE" },
196+
{ "u_lose_trait": "RADIOTROPHIC" }
197+
],
190198
"false_effect": [ { "u_message": "You are already an omnivore.", "type": "neutral" } ]
191199
},
192200
{
193201
"id": "gracken_carnivorous_stomach",
194202
"copy-from": "gracken_improvement_general",
195203
"type": "ITEM",
196204
"subtypes": [ "TOOL" ],
197-
"name": { "str_sp": "Gracken Dextrous Hands" },
205+
"name": { "str_sp": "Gracken Carnivorous Stomach" },
198206
"looks_like": "offal",
199207
"description": "An organ that allows a mature Gracken to convert their diet to an carnivorous one.",
200208
"use_action": {
@@ -208,7 +216,11 @@
208216
"type": "effect_on_condition",
209217
"id": "carnivorous_stomach",
210218
"condition": { "not": { "u_has_trait": "SHADE_CARNIVORE" } },
211-
"effect": [ { "u_message": "You exchanged your previous stomach for this." }, { "u_add_trait": "SHADE_CARNIVORE" } ],
219+
"effect": [
220+
{ "u_message": "You exchanged your previous stomach for this." },
221+
{ "u_add_trait": "SHADE_CARNIVORE" },
222+
{ "u_lose_trait": "RADIOTROPHIC" }
223+
],
212224
"false_effect": [ { "u_message": "You are already a carnivore.", "type": "neutral" } ]
213225
},
214226
{

data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"type": "effect_on_condition",
44
"id": "EOC_GRACKEN_CONVERT_RADS_TO_CALORIES",
5-
"recurrence": [ "5 seconds", "15 seconds" ],
5+
"recurrence": [ "75 seconds", "175 seconds" ],
66
"condition": { "u_has_trait": "RADIOTROPHIC" },
77
"deactivate_condition": { "not": { "u_has_trait": "RADIOTROPHIC" } },
88
"effect": [

data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,15 @@
322322
"category": [ "GRACKEN" ],
323323
"threshreq": [ "THRESH_SPECIES_GRACKEN" ],
324324
"flags": [ "CARNIVORE_DIET" ],
325+
"enchantments": [
326+
{
327+
"values": [
328+
{ "value": "STRENGTH", "add": 1 },
329+
{ "value": "METABOLISM", "multiply": 0.8 },
330+
{ "value": "STOMACH_SIZE_MULTIPLIER", "add": 500 }
331+
]
332+
}
333+
],
325334
"vitamin_rates": [ [ "vitC", -1200 ] ]
326335
},
327336
{
@@ -335,6 +344,16 @@
335344
"mixed_effect": true,
336345
"points": 1,
337346
"category": [ "GRACKEN" ],
347+
"flags": "HERBIVORE_DIET",
348+
"enchantments": [
349+
{
350+
"values": [
351+
{ "value": "KCAL", "multiply": 1.3 },
352+
{ "value": "DODGE_CHANCE", "add": 3 },
353+
{ "value": "STOMACH_SIZE_MULTIPLIER", "add": 1000 }
354+
]
355+
}
356+
],
338357
"threshreq": [ "THRESH_SPECIES_GRACKEN" ]
339358
},
340359
{

0 commit comments

Comments
 (0)