From 2cde5d3ab8dd645c6eacf1099e968ffa77cdf035 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:53:06 +0530 Subject: [PATCH] Complete implementation of Wraith origin -Addition of Torment ability -Addition of Charred property -Added lang for Wraith origin and powers -Changed exhaust amount in Demon's 'Self transfiguration' ability from 2 to 0.5 --- .../assets/terraoriginum/lang/en_us.json | 13 +++++- .../data/terraoriginum/origins/wraith.json | 4 ++ .../demon-powers/self_transfiguration2.json | 2 +- .../powers/wraith-powers/charred.json | 7 +++ .../powers/wraith-powers/soaring2.json | 9 +--- .../powers/wraith-powers/torment1.json | 15 +++++++ .../powers/wraith-powers/torment2.json | 45 +++++++++++++++++++ .../powers/wraith-powers/torment3.json | 27 +++++++++++ 8 files changed, 113 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json create mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json create mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json create mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index d106769..e2af182 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -19,5 +19,16 @@ "power.terraoriginum.demon-powers/stained.name": "Stained", "power.terraoriginum.demon-powers/stained.description": "A demon is stained in the blood of it's victims", "power.terraoriginum.demon-powers/extra_health.name": "Extra Health", - "power.terraoriginum.demon-powers/extra_health.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing" + "power.terraoriginum.demon-powers/extra_health.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing", + + //-----Wraith-----// + "origin.terraoriginum.wraith.name": "Wraith", + "origin.terraoriginum.wraith.description": "A tormented soul brought back to the land of life, hungering to distribute it's agony to the living.", + "power.terraoriginum.wraith-powers/soaring1.name": "Soaring", + "power.terraoriginum.wraith-powers/soaring1.description": "A Wraith has the ability to exhert it's ectoplasm to reduce it's body's response to gravity as well as create a thrust, allowing it to swim through the air.", + "power.terraoriginum.wraith-powers/torment1.name": "Torment", + "power.terraoriginum.wraith-powers/torment1.description": "The Wraith recalls the eons of agony it suffered, causing it's body to respond to the trauma by strengthening itself. Expends ectoplasm quickly.", + "power.terraoriginum.wraith-powers/charred.name": "Charred", + "power.terraoriginum.wraith-powers/charred.description": "Wraiths are burned of torment, which gives them a literally charred appearance." + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/wraith.json b/src/main/resources/data/terraoriginum/origins/wraith.json index 2ddeee8..e125027 100644 --- a/src/main/resources/data/terraoriginum/origins/wraith.json +++ b/src/main/resources/data/terraoriginum/origins/wraith.json @@ -3,6 +3,10 @@ "terraoriginum:wraith-powers/soaring1", "terraoriginum:wraith-powers/soaring2", "terraoriginum:wraith-powers/soaring3", + "terraoriginum:wraith-powers/torment1", + "terraoriginum:wraith-powers/torment2", + "terraoriginum:wraith-powers/torment3", + "terraoriginum:wraith-powers/charred", "terraoriginum:spirit-powers/phasing1", "terraoriginum:spirit-powers/phasing2", "terraoriginum:spirit-powers/phasing3", diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json b/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json index 3e67892..49f8509 100644 --- a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json +++ b/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json @@ -34,7 +34,7 @@ }, { "type": "origins:exhaust", - "amount": 2 + "amount": 0.5 } ] }, diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json new file mode 100644 index 0000000..c6d658c --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json @@ -0,0 +1,7 @@ +{ + "type": "origins:model_color", + "blue": 0.2, + "green": 0.2, + "red": 0.2, + "alpha": 0.9 +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json index 447f271..fc69c01 100644 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json @@ -1,15 +1,10 @@ { "type": "origins:swimming", - "conditions": [{ - "type": "origins:submerged_in", - "fluid": "minecraft:lava", - "inverted": true - }, - { + "condition": { "type": "origins:power_active", "power": "terraoriginum:wraith-powers/soaring1", "inverted": false } - ] + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json new file mode 100644 index 0000000..1defc09 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json @@ -0,0 +1,15 @@ +{ + "type": "origins:toggle", + "active_by_default": false, + "key": { + "key": "key.origins.primary_active", + "continuous": false + }, + "retain_state": false, + "condition": { + "type": "origins:resource", + "resource": "terraoriginum:spirit-powers/ectoplasm", + "comparison": ">=", + "compare_to": 1 + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json new file mode 100644 index 0000000..58bf729 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json @@ -0,0 +1,45 @@ +{ + "type": "origins:action_over_time", + "interval": 5, + "hidden": true, + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:strength", + "duration": 35, + "amplifier": 0, + "show_icon": false + } + }, + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:speed", + "duration": 35, + "amplifier": 1, + "show_icon": false + } + }, + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:resistance", + "duration": 35, + "amplifier": 0, + "show_icon": false + } + }, + { + "type": "origins:exhaust", + "amount": 0.5 + } + ] + }, + "condition": { + "type": "origins:power_active", + "power": "terraoriginum:wraith-powers/torment1" + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json new file mode 100644 index 0000000..6590af3 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json @@ -0,0 +1,27 @@ +{ + "type": "origins:action_over_time", + "interval": 20, + "hidden": true, + "entity_action": { + "type": "origins:if_else_list", + "actions": [ + { + "condition": { + "type": "origins:power_active", + "power": "terraoriginum:wraith-powers/torment1" + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:spirit-powers/ectoplasm", + "change": -9, + "operation": "add" + } + ] + } + } + ] + } + } \ No newline at end of file