diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index a7529a0..d106769 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -18,6 +18,6 @@ "power.terraoriginum.demon-powers/self_transfiguration1.description": "A demon has the innate ability to transfigure it's own body to temporarily increase it's physical capabilities, but beware whilst using it, because it rapidly drains ectoplasm", "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/rigid.name": "", - "power.terraoriginum.demon-powers/regid.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.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" } \ No newline at end of file diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json index cdf03ad..169e331 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -4,6 +4,7 @@ "terraoriginum:immortal_human", "terraoriginum:demon", "terraoriginum:spirit", + "terraoriginum:wraith", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/origins/demon.json b/src/main/resources/data/terraoriginum/origins/demon.json index d4657df..ea89847 100644 --- a/src/main/resources/data/terraoriginum/origins/demon.json +++ b/src/main/resources/data/terraoriginum/origins/demon.json @@ -4,7 +4,7 @@ "terraoriginum:demon-powers/self_transfiguration2", "terraoriginum:demon-powers/self_transfiguration3", "terraoriginum:demon-powers/stained", - "terraoriginum:demon-powers/rigid", + "terraoriginum:demon-powers/extra_health", "terraoriginum:spirit-powers/phasing1", "terraoriginum:spirit-powers/phasing2", "terraoriginum:spirit-powers/phasing3", @@ -17,5 +17,5 @@ ], "icon": "minecraft:bone", "order": 1002, - "impact": 2 + "impact": 3 } diff --git a/src/main/resources/data/terraoriginum/origins/wraith.json b/src/main/resources/data/terraoriginum/origins/wraith.json new file mode 100644 index 0000000..2ddeee8 --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/wraith.json @@ -0,0 +1,19 @@ +{ + "powers": [ + "terraoriginum:wraith-powers/soaring1", + "terraoriginum:wraith-powers/soaring2", + "terraoriginum:wraith-powers/soaring3", + "terraoriginum:spirit-powers/phasing1", + "terraoriginum:spirit-powers/phasing2", + "terraoriginum:spirit-powers/phasing3", + "terraoriginum:spirit-powers/ectoplasm", + "terraoriginum:spirit-powers/ectodiff", + "terraoriginum:spirit-powers/lackofectodmg", + "terraoriginum:spirit-powers/undead", + "terraoriginum:spirit-powers/nightvis", + "terraoriginum:ectotest" + ], + "icon": "minecraft:phantom_membrane", + "order": 1003, + "impact": 3 +} diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/rigid.json b/src/main/resources/data/terraoriginum/powers/demon-powers/extra_health.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/demon-powers/rigid.json rename to src/main/resources/data/terraoriginum/powers/demon-powers/extra_health.json diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json new file mode 100644 index 0000000..728af96 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json @@ -0,0 +1,15 @@ +{ + "type": "origins:toggle", + "active_by_default": false, + "key": { + "key": "key.origins.ternary_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/soaring2.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json new file mode 100644 index 0000000..447f271 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json @@ -0,0 +1,15 @@ +{ + "type": "origins:swimming", + "conditions": [{ + "type": "origins:submerged_in", + "fluid": "minecraft:lava", + "inverted": true + }, + { + "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/soaring3.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring3.json new file mode 100644 index 0000000..72e2395 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring3.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/soaring1" + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:spirit-powers/ectoplasm", + "change": -6, + "operation": "add" + } + ] + } + } + ] + } + } \ No newline at end of file