diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 79b78ba..eb3a989 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -35,6 +35,17 @@ "origin.terraoriginum.shade.name": "Shade", "origin.terraoriginum.shade.description": "Shades are shy ghostly entities, generally choosing to remain hidden from other non-ghostly entities.", "power.terraoriginum.shade-powers/invisibility1.name": "Invisibility", - "power.terraoriginum.shade-powers/invisibility1.description": "Shades have the ability to turn their entire bodies, including any armour they are wearing, entirely invisible. The invisibility is counteracted by the glowing effect and expends some ectoplasm" + "power.terraoriginum.shade-powers/invisibility1.description": "Shades have the ability to turn their entire bodies, including any armour they are wearing, entirely invisible. The invisibility is counteracted by the glowing effect and expends some ectoplasm", + //-----Merfolk-----// + "origin.terraoriginum.merfolk.name": "Merfolk", + "origin.terraoriginum.merfolk.description": "A creature well adapted to live in the seas. They are much like humans, if humans were aquatic", + "power.terraoriginum.merfolk-powers/hydration.name": "Hydration", + "power.terraoriginum.merfolk-powers/hydration.description": "A merfolk needs to remain hydrated in order to survive. Being in rain or water will increase hydration, whilst being outside both will dry you out", + "power.terraoriginum.merfolk-powers/waterbreathing.name": "Water Breathing", + "power.terraoriginum.merfolk-powers/waterbreathing.description": "A merfolk has the ability to breath underwater", + "power.terraoriginum.merfolk-powers/webbedfeet.name": "Webbed Feet", + "power.terraoriginum.merfolk-powers/webbedfeet.description": "A merfolk has webbed feet to help it swim under water. however, this makes it walk slower on land and also makes it not be able to jump as high as more land creatures.", + "power.terraoriginum.merfolk-powers/wethands.name": "Wet Hands", + "power.terraoriginum.merfolk-powers/wethands.description": "A merfolk's hands are made for use underwater, making it harder to break blocks on dry land. Also a great song" } \ 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 cc7a12a..4b69bef 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -6,6 +6,7 @@ "terraoriginum:spirit", "terraoriginum:wraith", "terraoriginum:shade", + "terraoriginum:merfolk", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/origins/merfolk.json b/src/main/resources/data/terraoriginum/origins/merfolk.json new file mode 100644 index 0000000..4253ca7 --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/merfolk.json @@ -0,0 +1,18 @@ +{ + "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", + "origins:swim_speed", + "origins:like_water", + "origins:aqua_affinity", + "origins:water_vision" + ], + "icon": "minecraft:prismarine_shard", + "order": 1005, + "impact": 3 +} diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json new file mode 100644 index 0000000..3910a00 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json @@ -0,0 +1,11 @@ +{ + "type": "origins:resource", + "min": 0, + "max": 200, + "start_value": 100, + "hud_render": { + "should_render": true, + "sprite_location": "origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index": 16 + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json new file mode 100644 index 0000000..49b11ca --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json @@ -0,0 +1,79 @@ +{ + "type": "origins:action_over_time", + "interval": 20, + "hidden": true, + "entity_action": { + "type": "origins:if_else_list", + "actions": [ + { + "condition": + { + "type": "origins:submerged_in", + "fluid": "minecraft:water" + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:merfolk-powers/hydration", + "change": 10, + "operation": "add" + } + ] + } + }, + { + "condition": + { + "type": "origins:in_rain" + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:merfolk-powers/hydration", + "change": 4, + "operation": "add" + } + ] + } + }, + { + "condition": { + "type": "origins:on_fire" + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:merfolk-powers/hydration", + "change": -10, + "operation": "add" + } + ] + } + }, + { + "condition": { + "type": "origins:submerged_in", + "fluid": "minecraft:water", + "inverted": true + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:merfolk-powers/hydration", + "change": -1, + "operation": "add" + } + ] + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json new file mode 100644 index 0000000..43ddf01 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json @@ -0,0 +1,24 @@ +{ + "type": "origins:action_over_time", + "interval": 20, + "hidden": true, + "entity_action": { + "type": "origins:if_else_list", + "actions": [ + { + "condition": { + "type": "origins:resource", + "resource": "terraoriginum:merfolk-powers/hydration", + "comparison": "<", + "compare_to": 1 + }, + "action": { + "type": "origins:damage", + "amount": 1, + "damage_type": "minecraft:dry_out" + } + + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json new file mode 100644 index 0000000..f40cf63 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json @@ -0,0 +1,12 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:gain_air", + "value": 20 + }, + "interval": 1, + "condition": { + "type": "origins:submerged_in", + "fluid": "minecraft:water" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json new file mode 100644 index 0000000..fcb79e9 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json @@ -0,0 +1,14 @@ +{ + "type": "origins:conditioned_attribute", + "hidden": true, + "modifier": { + "operation": "addition", + "condition": { + "type": "origins:submerged_in", + "fluid": "minecraft:water", + "inverted": true + }, + "value": -0.035, + "attribute": "generic.movement_speed" + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json new file mode 100644 index 0000000..6eae40f --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json @@ -0,0 +1,12 @@ +{ + "type": "origins:modify_jump", + "hidden": true, + "modifier": { + "operation": "addition", + "value": -0.05 + }, + "entity_action": { + "type": "origins:execute_command", + "command": "particle splash ~ ~ ~ 0.3 0.3 0.3 0.01 16 normal @a" + } +} diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json new file mode 100644 index 0000000..e5f4aab --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json @@ -0,0 +1,12 @@ +{ + "type": "origins:modify_break_speed", + "modifier": { + "operation": "multiply_base", + "value": -0.5 + }, + "condition": { + "type": "origins:submerged_in", + "fluid": "minecraft:water", + "inverted": true + } +} \ No newline at end of file