diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index b85deb2..6b21854 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -24,7 +24,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/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/rigid.name": "", @@ -58,7 +57,6 @@ "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", - //-----Spirit-----// "origin.terraoriginum.spirit.name": "Spirit", "origin.terraoriginum.spirit.description": "A ghostly creature which has not been build for any specific purpoes (Gotta figure this one out)", @@ -81,5 +79,17 @@ "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 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" + "power.terraoriginum.serpenta-powers/scales.description": "A serpenta has thick scales, giving it some natural armour", + + //-----Fairy-----// + "origin.terraoriginum.fairy.name": "Fairy", + "origin.terraoriginum.fairy.description": "A tiny humanoid creature that has wings.", + "power.terraoriginum.fairy-powers/smallheight.name": "Small", + "power.terraoriginum.fairy-powers/smallheight.description": "You are only about one block tall", + "power.terraoriginum.fairy-powers/fragile.name": "Fragile", + "power.terraoriginum.fairy-powers/fragile.description": "You only have half the usual health", + "power.terraoriginum.fairy-powers/yummyhoney.name": "Yummy Honey", + "power.terraoriginum.fairy-powers/yummyhoney.description": "honey is extremely good for you, providing a lot of food and topping up your saturation", + "power.terraoriginum.fairy-powers/nimble.name": "Nimble", + "power.terraoriginum.fairy-powers/nimble.description": "You must remain lightweight to fly, this means you cannot wear armour stronger than chainmail." } \ 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 c756368..8fad706 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -8,6 +8,7 @@ "terraoriginum:shade", "terraoriginum:merfolk", "terraoriginum:serpenta", + "terraoriginum:fairy", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/origins/fairy.json b/src/main/resources/data/terraoriginum/origins/fairy.json new file mode 100644 index 0000000..8c0c2d9 --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/fairy.json @@ -0,0 +1,16 @@ +{ + "powers": [ + "terraoriginum:fairy-powers/smallheight", + "terraoriginum:fairy-powers/smallwidth", + "terraoriginum:fairy-powers/smallhitboxheight", + "terraoriginum:fairy-powers/smallhitboxwidth", + "terraoriginum:fairy-powers/fragile", + "terraoriginum:fairy-powers/yummyhoney", + "terraoriginum:fairy-powers/nimble", + "origins:elytra", + "origins:launch_into_air" + ], + "icon": "minecraft:air", + "order": 1007, + "impact": 3 +} diff --git a/src/main/resources/data/terraoriginum/origins/serpenta.json b/src/main/resources/data/terraoriginum/origins/serpenta.json index 880db2f..17c87b0 100644 --- a/src/main/resources/data/terraoriginum/origins/serpenta.json +++ b/src/main/resources/data/terraoriginum/origins/serpenta.json @@ -16,6 +16,6 @@ "origins:water_vision" ], "icon": "minecraft:ender_eye", - "order": 1005, + "order": 1006, "impact": 3 } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json new file mode 100644 index 0000000..e4f34e7 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json @@ -0,0 +1,8 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.max_health", + "value": -10, + "operation": "addition" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json new file mode 100644 index 0000000..46444a0 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json @@ -0,0 +1,23 @@ +{ + "type": "origins:restrict_armor", + "head": { + "type": "origins:armor_value", + "comparison": ">", + "compare_to": 2 + }, + "chest": { + "type": "origins:armor_value", + "comparison": ">", + "compare_to": 5 + }, + "legs": { + "type": "origins:armor_value", + "comparison": ">", + "compare_to": 4 + }, + "feet": { + "type": "origins:armor_value", + "comparison": ">", + "compare_to": 1 + } +} diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json new file mode 100644 index 0000000..3809db5 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json @@ -0,0 +1,8 @@ +{ + "type": "origins:action_over_time", + "interval": 20, + "entity_action": { + "type": "origins:execute_command", + "command": "/scale set pehkui:height 0.5" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json new file mode 100644 index 0000000..9198854 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json @@ -0,0 +1,9 @@ +{ + "hidden": true, + "type": "origins:action_over_time", + "interval": 20, + "entity_action": { + "type": "origins:execute_command", + "command": "/scale set pehkui:hitbox_height 0.5" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json new file mode 100644 index 0000000..9198854 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json @@ -0,0 +1,9 @@ +{ + "hidden": true, + "type": "origins:action_over_time", + "interval": 20, + "entity_action": { + "type": "origins:execute_command", + "command": "/scale set pehkui:hitbox_height 0.5" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json new file mode 100644 index 0000000..0693a89 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json @@ -0,0 +1,9 @@ +{ + "type": "origins:action_over_time", + "interval": 20, + "hidden": true, + "entity_action": { + "type": "origins:execute_command", + "command": "/scale set pehkui:width 0.5" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json new file mode 100644 index 0000000..133e52b --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json @@ -0,0 +1,20 @@ +{ + "type": "origins:modify_food", + "item_condition": { + "type": "origins:ingredient", + "ingredient": + { + "item": "minecraft:honey_bottle" + } + }, + "food_modifier": + { + "operation": "addition", + "value": 4.0 + }, + "saturation_modifier": + { + "operation": "addition", + "value": 20 + } + } \ No newline at end of file