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] Add more pooka changeling traits #76503

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 @@ -907,5 +907,30 @@
"encumbrance": 0
}
]
},
{
"id": "integrated_antlers",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "deer antlers" },
"description": "You have a majestic crown of antlers.",
"weight": "2000 g",
"volume": "2500 ml",
"price": "0 cent",
"price_postapoc": "0 cent",
"material": [ "bone" ],
"symbol": "V",
"color": "dark_gray",
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "AURA", "PADDED", "NO_SALVAGE" ],
"armor": [
{
"material": [ { "type": "bone", "covered_by_mat": 100, "thickness": 3 } ],
"covers": [ "head" ],
"specifically_covers": [ "head_crown" ],
"coverage": 20,
"encumbrance": 2
}
],
"melee_damage": { "bash": 6 }
}
]
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/jmath.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,6 @@
"type": "jmath_function",
"id": "pooka_shapeshift_traits",
"num_args": 0,
"return": "u_has_trait('ANTLERS') + u_has_trait('LUPINE_EARS') + u_has_trait('CLAWS') + u_has_trait('CLAWS_ST') + u_has_trait('TAIL_FLUFFY') + u_has_trait('TAIL_LONG')"
"return": "u_has_trait('ANTLERS') + u_has_trait('HORNS_CURLED') + u_has_trait('LUPINE_EARS') + u_has_trait('FELINE_EARS') + u_has_trait('CLAWS') + u_has_trait('CLAWS_ST') + u_has_trait('WINGS_BIRD') + u_has_trait('URSINE_FUR') + u_has_trait('CHITIN2') + u_has_trait('POOKA_QUADRUPED_TRAITS') + u_has_trait('LEAPING_LEGS') + u_has_trait('TAIL_FLUFFY') + u_has_trait('TAIL_LONG')"
}
]
4 changes: 2 additions & 2 deletions data/mods/Xedra_Evolved/mutations/mutations.json
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
]
},
{
"condition": { "and": [ { "u_has_flag": "QUADRUPED_CROUCH" }, { "u_has_flag": "QUADRUPED_RUN" }, { "not": "u_can_drop_weapon" } ] },
"condition": { "and": [ { "not": "u_can_drop_weapon" } ] },
"values": [ { "value": "MOVE_COST", "multiply": -0.15 } ],
"ench_effects": [ { "effect": "natural_stance", "intensity": 1 }, { "effect": "quadruped_full", "intensity": 1 } ]
},
Expand All @@ -677,7 +677,7 @@
"values": [ { "value": "MELEE_DAMAGE", "multiply": -1 }, { "value": "RANGE", "multiply": -1 } ]
}
],
"flags": [ "MUTE", "PRED3", "QUADRUPED_CROUCH", "QUADRUPED_RUN", "TEMPORARY_SHAPESHIFT" ],
"flags": [ "MUTE", "PRED3", "QUADRUPED_CROUCH", "QUADRUPED_RUN", "TOUGH_FEET", "TEMPORARY_SHAPESHIFT" ],
"override_look": { "id": "mon_wolf", "tile_category": "monster" },
"integrated_armor": [ "integrated_fangs", "integrated_lupine_fur" ]
},
Expand Down
Loading
Loading