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