From 63a2b218f960ab473f781f65c256dde68cdb3bd5 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Wed, 6 Mar 2024 23:10:03 +0530 Subject: [PATCH 1/2] Partial implementation of serpenta origin -added serpenta origin -added 'Boiling Shot' ability for serpenta origin -changed lang for lackofecto death --- .../assets/terraoriginum/lang/en_us.json | 15 +++++-- .../data/origins/origin_layers/origin.json | 1 + .../terraoriginum/damage_type/boiling.json | 5 +++ .../data/terraoriginum/origins/serpenta.json | 19 +++++++++ .../powers/serpenta-powers/boilingshot.json | 40 +++++++++++++++++++ 5 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/data/terraoriginum/damage_type/boiling.json create mode 100644 src/main/resources/data/terraoriginum/origins/serpenta.json create mode 100644 src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 8d389b7..e008e36 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -3,8 +3,11 @@ "item.terraoriginum.mync_eye": "you shouldnt have this", "item.terraoriginum.umbrella": "Umbrella", - "death.attack.lack_of_ectoplasm": "%1$s died to the light.", - "death.attack.lack_of_ectoplasm.player": "%1$s died to the light whilst trying to escape %2$s.", + "death.attack.lack_of_ectoplasm": "%1$s faded away", + "death.attack.lack_of_ectoplasm.player": "%1$s faded away whilst trying to escape %2$s", + + "death.attack.boiling": "%1$s boiled up", + "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s", //-----Immortal Human-----// "origin.terraoriginum.immortal_human.name": "Immortal Human", @@ -70,5 +73,11 @@ "power.terraoriginum.spirit-powers/ectodiff.name": "Luminophobia", "power.terraoriginum.spirit-powers/ectodiff.description": "Light gradually decreases the amount of ectoplasm that you have, which causes you to take damage or die if it becomes too low.", "power.terraoriginum.spirit-powers/skin.name": "Translucent skin", - "power.terraoriginum.spirit-powers/skin.description": "Your skin is slightly translucent, allowing others to see through you." + "power.terraoriginum.spirit-powers/skin.description": "Your skin is slightly translucent, allowing others to see through you.", + + //-----Serpenta-----// + "origin.terraoriginum.serpenta.name": "Serpenta (WIP)", + "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask", + "power.terraoriginum.serpenta-powers/boilingshot.name": "Boiling Shot", + "power.terraoriginum.serpenta-powers/boilingshot.description": "shoot a jet of boiling water, this dehydrates you and has a cooldown of " } \ 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 4b69bef..c756368 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -7,6 +7,7 @@ "terraoriginum:wraith", "terraoriginum:shade", "terraoriginum:merfolk", + "terraoriginum:serpenta", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/damage_type/boiling.json b/src/main/resources/data/terraoriginum/damage_type/boiling.json new file mode 100644 index 0000000..930b5b8 --- /dev/null +++ b/src/main/resources/data/terraoriginum/damage_type/boiling.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "boiling", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/serpenta.json b/src/main/resources/data/terraoriginum/origins/serpenta.json new file mode 100644 index 0000000..f89c97d --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/serpenta.json @@ -0,0 +1,19 @@ +{ + "powers": [ + "terraoriginum:merfolk-powers/hydration", + "terraoriginum:merfolk-powers/hydrodiff", + "terraoriginum:merfolk-powers/lackofhydrodamage", + "terraoriginum:merfolk-powers/waterbreathing", + "terraoriginum:merfolk-powers/webbedfeet", + "terraoriginum:merfolk-powers/webbedfeet2", + "terraoriginum:merfolk-powers/wethands", + "terraoriginum:serpenta-powers/boilingshot", + "origins:swim_speed", + "origins:like_water", + "origins:aqua_affinity", + "origins:water_vision" + ], + "icon": "minecraft:air", + "order": 1005, + "impact": 3 +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json b/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json new file mode 100644 index 0000000..8a4ba32 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json @@ -0,0 +1,40 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:delay", + "action": { + "type": "origins:raycast", + "distance": 20, + "block": false, + "entity": true, + "shape_type": "visual", + "fluid_handling": "any", + "miss_action": { + "type": "origins:nothing" + }, + "command_at_hit": "/execute as @e[distance=..2] run damage @s 6 terraoriginum:boiling", + "command_along_ray": "/particle splash ~ ~ ~ 0 0 0 0 10", + "command_step": 0.3 + }, + "ticks": 0 + }, + { + "type": "origins:play_sound", + "sound": "entity.dolphin.splash", + "volume": 1, + "pitch": 1 + }, + { + "type": "origins:change_resource", + "resource": "terraoriginum:merfolk-powers/hydration", + "change": -50, + "operation": "add" + } + + ] + }, + "key": "secondary" +} \ No newline at end of file From 6fa6b88983dc5089035fe6f9eee68e999b8036af Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Thu, 7 Mar 2024 21:29:33 +0530 Subject: [PATCH 2/2] complete implementation of serpenta origin -finished 'Boiling Shot' ability of the serpenta -fully added 'Scales' ability to serpenta --- src/main/resources/assets/terraoriginum/lang/en_us.json | 6 ++++-- .../resources/data/terraoriginum/origins/serpenta.json | 6 ++++-- .../terraoriginum/powers/serpenta-powers/boilingshot.json | 7 ++++++- .../data/terraoriginum/powers/serpenta-powers/scales.json | 8 ++++++++ 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index e008e36..b85deb2 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -76,8 +76,10 @@ "power.terraoriginum.spirit-powers/skin.description": "Your skin is slightly translucent, allowing others to see through you.", //-----Serpenta-----// - "origin.terraoriginum.serpenta.name": "Serpenta (WIP)", + "origin.terraoriginum.serpenta.name": "Serpenta", "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask", "power.terraoriginum.serpenta-powers/boilingshot.name": "Boiling Shot", - "power.terraoriginum.serpenta-powers/boilingshot.description": "shoot a jet of boiling water, this dehydrates you and has a cooldown of " + "power.terraoriginum.serpenta-powers/boilingshot.description": "shoot a jet of boiling water, this dehydrates you and has a cooldown of 30 seconds", + "power.terraoriginum.serpenta-powers/scales.name": "Scales", + "power.terraoriginum.serpenta-powers/scales.description": "A serpenta has thick scales, giving it some natural armour" } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/serpenta.json b/src/main/resources/data/terraoriginum/origins/serpenta.json index f89c97d..880db2f 100644 --- a/src/main/resources/data/terraoriginum/origins/serpenta.json +++ b/src/main/resources/data/terraoriginum/origins/serpenta.json @@ -1,5 +1,8 @@ { "powers": [ + + "terraoriginum:serpenta-powers/boilingshot", + "terraoriginum:serpenta-powers/scales", "terraoriginum:merfolk-powers/hydration", "terraoriginum:merfolk-powers/hydrodiff", "terraoriginum:merfolk-powers/lackofhydrodamage", @@ -7,13 +10,12 @@ "terraoriginum:merfolk-powers/webbedfeet", "terraoriginum:merfolk-powers/webbedfeet2", "terraoriginum:merfolk-powers/wethands", - "terraoriginum:serpenta-powers/boilingshot", "origins:swim_speed", "origins:like_water", "origins:aqua_affinity", "origins:water_vision" ], - "icon": "minecraft:air", + "icon": "minecraft:ender_eye", "order": 1005, "impact": 3 } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json b/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json index 8a4ba32..01e90d6 100644 --- a/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json +++ b/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json @@ -15,7 +15,7 @@ "miss_action": { "type": "origins:nothing" }, - "command_at_hit": "/execute as @e[distance=..2] run damage @s 6 terraoriginum:boiling", + "command_at_hit": "/execute as @e[distance=..2] run damage @s 10 terraoriginum:boiling", "command_along_ray": "/particle splash ~ ~ ~ 0 0 0 0 10", "command_step": 0.3 }, @@ -36,5 +36,10 @@ ] }, + "cooldown": 600, + "hud_render": { + "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_02.png", + "bar_index": "15" + }, "key": "secondary" } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json b/src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json new file mode 100644 index 0000000..cd22fe7 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json @@ -0,0 +1,8 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.armor", + "value": 4.0, + "operation": "addition" + } + } \ No newline at end of file