Skip to content

Commit

Permalink
Initial commit (#72081)
Browse files Browse the repository at this point in the history
  • Loading branch information
Standing-Storm authored Mar 4, 2024
1 parent 0fa4b09 commit 4b61ec3
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 73 deletions.
79 changes: 14 additions & 65 deletions data/mods/Magiclysm/items/enchanted_cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,69 +94,6 @@
"relic_data": { "passive_effects": [ { "id": "ench_deerform" } ] },
"armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_CLOAK_OF_ELVENKIND_TURN_ON",
"global": true,
"run_for_npcs": true,
"eoc_type": "EVENT",
"required_event": "avatar_moves",
"condition": {
"and": [
"u_is_outside",
{ "not": { "u_has_trait": "FOREST_STEALTH" } },
{ "u_has_effect": "effect_elven_cloak_effect" },
{
"or": [
{ "u_is_on_terrain_with_flag": "SHRUB" },
{ "u_is_on_terrain": "t_tree_young" },
{ "u_is_on_terrain": "t_bamboo_tall" },
{ "u_is_on_terrain": "t_grass_long" },
{ "u_at_om_location": "forest" },
{ "u_at_om_location": "forest_thick" }
]
}
]
},
"effect": [ { "u_add_trait": "FOREST_STEALTH" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_CLOAK_OF_ELVENKIND_TURN_OFF",
"global": true,
"run_for_npcs": true,
"eoc_type": "EVENT",
"required_event": "avatar_moves",
"condition": {
"and": [
{ "u_has_trait": "FOREST_STEALTH" },
{
"or": [
{ "not": "u_is_outside" },
{ "not": { "u_has_effect": "effect_elven_cloak_effect" } },
{
"and": [
{ "not": { "u_is_on_terrain_with_flag": "SHRUB" } },
{ "not": { "u_is_on_terrain": "t_tree_young" } },
{ "not": { "u_is_on_terrain": "t_bamboo_tall" } },
{ "not": { "u_is_on_terrain": "t_grass_long" } },
{ "not": { "u_at_om_location": "forest" } },
{ "not": { "u_at_om_location": "forest_thick" } }
]
}
]
}
]
},
"effect": [ { "u_lose_trait": "FOREST_STEALTH" } ]
},
{
"type": "effect_type",
"id": "effect_elven_cloak_effect",
"//": "This is a dummy effect because EoCs can't tell what you're wearing",
"name": [ "" ],
"desc": [ "" ]
},
{
"id": "cloak_of_elvenkind",
"type": "ARMOR",
Expand Down Expand Up @@ -184,10 +121,22 @@
"environmental_protection": 3,
"relic_data": {
"passive_effects": [
{ "has": "WORN", "condition": "ALWAYS", "ench_effects": [ { "effect": "effect_elven_cloak_effect", "intensity": 1 } ] }
{
"has": "WORN",
"condition": {
"or": [
{ "u_is_on_terrain_with_flag": "SHRUB" },
{ "u_is_on_terrain": "t_tree_young" },
{ "u_is_on_terrain": "t_bamboo_tall" },
{ "u_is_on_terrain": "t_grass_long" },
{ "u_at_om_location": "forest" },
{ "u_at_om_location": "forest_thick" }
]
},
"values": [ { "value": "STEALTH_MODIFIER", "add": 60 } ]
}
]
},
"//": "Enchant provided through EoC, relic_data is just to make it purple",
"flags": [ "BELTED", "OVERSIZE", "NONCONDUCTIVE", "WATER_FRIENDLY", "RAINPROOF" ]
}
]
8 changes: 0 additions & 8 deletions data/mods/Magiclysm/mutations/temporary.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,5 @@
"player_display": false,
"points": 0,
"stomach_size_multiplier": 10.0
},
{
"type": "mutation",
"id": "FOREST_STEALTH",
"name": { "str": "Cloak of Elvenkind: Forest Stealth" },
"description": "You have a much easier time hiding in the forest.",
"points": 2,
"stealth_modifier": 60
}
]
65 changes: 65 additions & 0 deletions data/mods/Magiclysm/obsolete/eocs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"type": "effect_on_condition",
"id": "EOC_CLOAK_OF_ELVENKIND_TURN_ON",
"global": true,
"run_for_npcs": true,
"eoc_type": "EVENT",
"required_event": "avatar_moves",
"condition": {
"and": [
"u_is_outside",
{ "not": { "u_has_trait": "FOREST_STEALTH" } },
{ "u_has_effect": "effect_elven_cloak_effect" },
{
"or": [
{ "u_is_on_terrain_with_flag": "SHRUB" },
{ "u_is_on_terrain": "t_tree_young" },
{ "u_is_on_terrain": "t_bamboo_tall" },
{ "u_is_on_terrain": "t_grass_long" },
{ "u_at_om_location": "forest" },
{ "u_at_om_location": "forest_thick" }
]
}
]
},
"effect": [ { "u_add_trait": "FOREST_STEALTH" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_CLOAK_OF_ELVENKIND_TURN_OFF",
"global": true,
"run_for_npcs": true,
"eoc_type": "EVENT",
"required_event": "avatar_moves",
"condition": {
"and": [
{ "u_has_trait": "FOREST_STEALTH" },
{
"or": [
{ "not": "u_is_outside" },
{ "not": { "u_has_effect": "effect_elven_cloak_effect" } },
{
"and": [
{ "not": { "u_is_on_terrain_with_flag": "SHRUB" } },
{ "not": { "u_is_on_terrain": "t_tree_young" } },
{ "not": { "u_is_on_terrain": "t_bamboo_tall" } },
{ "not": { "u_is_on_terrain": "t_grass_long" } },
{ "not": { "u_at_om_location": "forest" } },
{ "not": { "u_at_om_location": "forest_thick" } }
]
}
]
}
]
},
"effect": [ { "u_lose_trait": "FOREST_STEALTH" } ]
},
{
"type": "effect_type",
"id": "effect_elven_cloak_effect",
"//": "This is a dummy effect because EoCs can't tell what you're wearing",
"name": [ "" ],
"desc": [ "" ]
}
]
10 changes: 10 additions & 0 deletions data/mods/Magiclysm/obsolete/mutations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"type": "mutation",
"id": "FOREST_STEALTH",
"name": { "str": "Cloak of Elvenkind: Forest Stealth" },
"description": "You have a much easier time hiding in the forest.",
"points": 2,
"stealth_modifier": 60
}
]

0 comments on commit 4b61ec3

Please sign in to comment.