diff --git a/src/main/resources/data/aspects/powers/negate_fall_damage.json b/src/main/resources/data/aspects/powers/negate_fall_damage.json index 6379c16..004407d 100644 --- a/src/main/resources/data/aspects/powers/negate_fall_damage.json +++ b/src/main/resources/data/aspects/powers/negate_fall_damage.json @@ -1,298 +1,27 @@ -{ +{ "type": "origins:multiple", - - "slowness_when_fall1": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 100 - } - }, + "fall_immunity": { + "type": "origins:invulnerability", "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 3.0 - } - ] + "type": "origins:name", + "name": "fall" }, - "cooldown": 20 + "cooldown": 1 }, - "slowness_when_flyintowall1": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 100 - } - }, + "kinetic_immunity": { + "type": "origins:invulnerability", "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 3.0 - } - ] + "type": "origins:name", + "name": "flyIntoWall" }, - "cooldown": 20 - }, - - "slowness_when_fall3": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 1, - "duration": 100 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 6.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall3": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 1, - "duration": 100 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 6.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall5": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 2, - "duration": 120 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 10.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall5": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 2, - "duration": 120 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 10.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall7": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 3, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 14.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall7": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 3, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 14.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall9": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 4, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 18.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall9": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 4, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 18.0 - } - ] - }, - "cooldown": 20 - }, - - "reduced_kinetic_damage": { - "type": "origins:modify_damage_taken", - "modifier": { - "name": "More kinetic damage taken", - "value": -99999, - "operation": "multiply_base" - }, - "damage_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:name", - "name": "flyIntoWall" - } - ] - } + "cooldown": 1 }, "name":"Negate Falling", - "description":"You cannot take fall damage, but the more fall damage that is absorbed by the atmosphere, the more your movement speed will temporarily decrease.", + "description":"You cannot take fall damage.", "badges": [ { "sprite": "aspects:textures/gui/badge/equal.png", "text": "Neutral" } - ] + ] } \ No newline at end of file