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.

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 ] Playable Gracken Characters #75868

Merged
merged 24 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
13e485c
Create xe_playable_gracken.json
Maleclypse Aug 20, 2024
dca6ff6
First Draft
Maleclypse Aug 22, 2024
f79b5ba
lint
Maleclypse Aug 24, 2024
ea2db12
Integrated Pocket
Maleclypse Aug 25, 2024
32b4778
Arms and hands
Maleclypse Aug 25, 2024
903af23
Create gracken_improvements.json
Maleclypse Aug 25, 2024
46798aa
More stuff
Maleclypse Aug 25, 2024
0450c1a
Lint
Maleclypse Aug 25, 2024
58d42b9
Update gracken_improvements.json
Maleclypse Aug 25, 2024
ec86ba6
Update data/mods/Xedra_Evolved/recipes/gracken_improvements.json
Maleclypse Aug 25, 2024
6027ee4
Fixes
Maleclypse Aug 26, 2024
a87ca11
Merge branch 'XE-Gracken-Agent' of https://github.com/Maleclypse/Cata…
Maleclypse Aug 26, 2024
67062e3
Update data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
Maleclypse Aug 27, 2024
cf7b4b2
Apply suggestions from code review
Maleclypse Aug 28, 2024
ec60df9
Update data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
Maleclypse Aug 28, 2024
580ddc1
Update harvest_monster_hunter_gracken.json
Maleclypse Aug 29, 2024
2da3365
Update gracken_trait_improvements.json
Maleclypse Aug 29, 2024
264982e
Update gracken_trait_improvements.json
Maleclypse Aug 29, 2024
68a0490
Update gracken_trait_improvements.json
Maleclypse Aug 30, 2024
be3ce30
Update data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
Maleclypse Aug 30, 2024
80cdd43
Update category.json
Maleclypse Aug 31, 2024
2987680
Update gracken_trait_improvements.json
Maleclypse Sep 2, 2024
6d2c39e
Update gracken_spells.json
Maleclypse Sep 3, 2024
c48f8f1
Fixes
Maleclypse Sep 4, 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
18 changes: 18 additions & 0 deletions data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[
{
"id": "zombie_grabber",
"//": "zombie with long gangly arms",
"type": "harvest",
"message": "<zombie_grabber_harvest>",
"entries": [
{ "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
{ "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 },
{ "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 },
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "grappler_sinew", "mass_ratio": 0.00035 }
]
}
]
18 changes: 18 additions & 0 deletions data/mods/Xedra_Evolved/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,24 @@
"effects": [ "IGNITE" ],
"flags": [ "ZERO_WEIGHT" ]
},
{
"type": "AMMO",
"id": "grappler_sinew",
"category": "spare_parts",
"price": "0 cent",
"price_postapoc": "25 cent",
"name": { "str": "elastic sinew" },
"symbol": "=",
"color": "light_red",
"looks_like": "thread",
"description": "An elastic sinew cut from a corpse, usable as thread.",
"material": [ "flesh" ],
"volume": "250 ml",
"weight": "1 g",
"ammo_type": "thread",
"count": 10,
"stack_size": 200
},
{
"id": "glamour_charge",
"type": "AMMO",
Expand Down
25 changes: 25 additions & 0 deletions data/mods/Xedra_Evolved/items/armor/integrated.json
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,31 @@
],
"flags": [ "INTEGRATED", "PADDED", "SEMITANGIBLE", "ZERO_WEIGHT", "TARDIS", "UNBREAKABLE", "PERSONAL", "SOFT", "WATER_FRIENDLY" ]
},
{
"id": "item_gracken_shadowstuff_pocket",
"type": "GENERIC",
"category": "clothing",
"name": { "str": "shadowstuff organ" },
"description": "You have an organ inside of your body that grows a material you can create improved versions of your body parts with. You must combine it with components taken from monsters with abilities you wish to gain and magickal essence.",
"to_hit": -1,
"material": [ "flesh" ],
"symbol": ")",
"color": "light_gray",
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "scrap_shadowstuff": 3 }, "airtight": true } ],
"relic_data": { "charge_info": { "recharge_type": "periodic", "time": "168 h", "regenerate_ammo": true } },
"flags": [
"INTEGRATED",
"NO_UNLOAD",
"PADDED",
"SEMITANGIBLE",
"ZERO_WEIGHT",
"TARDIS",
"UNBREAKABLE",
"PERSONAL",
"SOFT",
"WATER_FRIENDLY"
]
},
{
"id": "integrated_cloud_skin",
"type": "ARMOR",
Expand Down
124 changes: 124 additions & 0 deletions data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
[
{
"abstract": "gracken_improvement_general",
"type": "COMESTIBLE",
"comestible_type": "INVALID",
"category": "MED",
"name": { "str": "abstract gracken improvement" },
"weight": "2041 g",
"volume": "2500 ml",
"material": [ "flesh", "shadowstuff" ],
"symbol": "!",
"color": "light_gray",
"price_postapoc": "10 USD",
"flags": [ "NO_INGEST", "EDIBLE_FROZEN" ]
},
{
"id": "gracken_shade_arms",
"copy-from": "gracken_improvement_general",
"type": "COMESTIBLE",
"name": { "str_sp": "Gracken Shade Arms" },
"looks_like": "offal",
"description": "An organ that allows a mature Gracken to convert their arms back to a base state.",
"use_action": {
"type": "effect_on_conditions",
"description": "Exchanged the limb back to a base model.",
"effect_on_conditions": [
{
"id": "shade_arms",
"effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_ARMS" } ]
}
]
}
},
{
"id": "gracken_strong_arms",
"copy-from": "gracken_improvement_general",
"type": "COMESTIBLE",
"name": { "str_sp": "Gracken Strong Arms" },
"looks_like": "offal",
"description": "An organ that allows a mature Gracken to convert their arms to a stronger form.",
"use_action": {
"type": "effect_on_conditions",
"description": "Exchanged the limb back for a stronger form factor.",
"effect_on_conditions": [
{
"id": "strong_arms",
"effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_STRONG_ARMS" } ]
}
]
}
},
{
"id": "gracken_long_arms",
"copy-from": "gracken_improvement_general",
"type": "COMESTIBLE",
"name": { "str_sp": "Gracken Long Arms" },
"looks_like": "offal",
"description": "An organ that allows a mature Gracken to convert their arms to a longer form.",
"use_action": {
"type": "effect_on_conditions",
"description": "Exchanged the limb back for a longer form factor.",
"effect_on_conditions": [
{
"id": "long_arms",
"effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_LONG_ARMS" } ]
}
]
}
},
{
"id": "gracken_shade_hands",
"copy-from": "gracken_improvement_general",
"type": "COMESTIBLE",
"name": { "str_sp": "Gracken Shade Hands" },
"looks_like": "offal",
"description": "An organ that allows a mature Gracken to convert their hands back to a base state.",
"use_action": {
"type": "effect_on_conditions",
"description": "Exchanged the limb back to a base model.",
"effect_on_conditions": [
{
"id": "shade_hands",
"effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_ARMS" } ]
}
]
}
},
{
"id": "gracken_sharp_nails",
"copy-from": "gracken_improvement_general",
"type": "COMESTIBLE",
"name": { "str_sp": "Gracken Sharp Nails" },
"looks_like": "offal",
"description": "An organ that allows a mature Gracken to convert their hands to a sharper form.",
"use_action": {
"type": "effect_on_conditions",
"description": "Exchanged the limb back for a sharper form factor.",
"effect_on_conditions": [
{
"id": "sharp_nails",
"effect": [ { "u_message": "You exchanged your previous hands for these." }, { "u_add_trait": "SHADE_SHARP_NAILS" } ]
}
]
}
},
{
"id": "gracken_dextrous_hands",
"copy-from": "gracken_improvement_general",
"type": "COMESTIBLE",
"name": { "str_sp": "Gracken Dextrous Hands" },
"looks_like": "offal",
"description": "An organ that allows a mature Gracken to convert their hands to a more agile form.",
"use_action": {
"type": "effect_on_conditions",
"description": "Exchanged the limb back for a longer form factor.",
"effect_on_conditions": [
{
"id": "dextrous_hands",
"effect": [ { "u_message": "You exchanged your previous hands for these." }, { "u_add_trait": "SHADE_DEXTROUS_HANDS" } ]
}
]
}
}
]
16 changes: 16 additions & 0 deletions data/mods/Xedra_Evolved/mutations/gracken_spells.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[
{
"id": "gracken_arm_push_spell",
"type": "SPELL",
"name": "Gracken Long Arms Spell",
"description": "Push a target away from you.",
"message": "You extend your arms and push the %s away from you!",
"valid_targets": [ "hostile" ],
"flags": [ "SILENT" ],
"effect": "directed_push",
"shape": "blast",
"difficulty": 1,
"min_damage": { "math": [ "(u_val('dexterity') / 2)" ] },
"min_range": { "math": [ "(u_val('dexterity') / 4)" ] }
}
]
33 changes: 33 additions & 0 deletions data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[
{
"type": "effect_on_condition",
"id": "EOC_GRACKEN_CONVERT_RADS_TO_CALORIES",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"recurrence": [ "5 seconds", "15 seconds" ],
"condition": { "u_has_trait": "RADIOTROPHIC" },
"deactivate_condition": { "not": { "u_has_trait": "RADIOTROPHIC" } },
"effect": [
{
"if": { "math": [ "u_val('rad')", ">=", "100" ] },
"then": [ { "math": [ "u_calories()", "+=", "3" ] }, { "math": [ "u_val('rad')", "-=", "1" ] } ]
},
{
"if": { "and": [ { "math": [ "u_val('rad')", "<", "100" ] }, { "math": [ "u_val('rad')", ">", "0" ] } ] },
"then": [ { "math": [ "u_calories()", "+=", "2" ] }, { "math": [ "u_val('rad')", "-=", "1" ] } ]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_GRACKEN_ARM_PUSH1_activated",
"effect": [
{
"run_eoc_with": "EOC_GENERIC_SPELL_MUTATION",
"variables": {
"prep_time": "1",
"spell_to_cast": "gracken_arm_push_spell",
"message_success": { "i18n": true, "str": "You lash out and push your target away!" }
}
}
]
}
]
4 changes: 4 additions & 0 deletions data/mods/Xedra_Evolved/mutations/mutation_category.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
"vitamin": "mutagen_dollkin",
"memorial_message": "Real enough for you?"
},
{
"type": "mutation_type",
"id": "STOMACH"
},
{
"type": "mutation_type",
"id": "MANA_ADD"
Expand Down
Loading
Loading