diff --git a/data/feathermc/origins/avian.json b/data/feathermc/origins/avian.json index 661a56d..9651294 100644 --- a/data/feathermc/origins/avian.json +++ b/data/feathermc/origins/avian.json @@ -5,11 +5,11 @@ "id": "minecraft:feather" }, "powers": [ + "feathermc:small_size", "feathermc:frail_flight", "origins:fresh_air", "feathermc:armor_slow", - "origins:lay_eggs", - "origins:sprint_jump" + "origins:lay_eggs" ], "order": 0, "impact": 2 diff --git a/data/feathermc/origins/fox.json b/data/feathermc/origins/fox.json index 34cbc61..528d172 100644 --- a/data/feathermc/origins/fox.json +++ b/data/feathermc/origins/fox.json @@ -5,7 +5,7 @@ "id": "minecraft:sweet_berries" }, "powers": [ - "feathermc:fox_size", + "feathermc:small_size", "feathermc:speedy", "feathermc:flammable", "origins:sprint_jump", diff --git a/data/feathermc/powers/dark_vision.json b/data/feathermc/powers/dark_vision.json index f5c49e9..8017f9c 100644 --- a/data/feathermc/powers/dark_vision.json +++ b/data/feathermc/powers/dark_vision.json @@ -1,18 +1,44 @@ { - "type": "origins:night_vision", - "strength": 0.5, - "name": "Darkvision", - "description": "You can see in the dark. Somewhat.", + "type": "origins:multiple", + "name": "Dark Vision", + "description": "You can at will see in the dark. But only if you're not too hurt.", "badges": [ { "type": "origins:tooltip", - "sprite": "minecraft:textures/item/coal.png", - "text": "You gain weak night vision when standing in the dark." + "sprite": "minecraft:textures/gui/sprites/hud/full.png", + "text": "You can not see in the dark when under 3 hearts." } ], - "condition": { - "type": "origins:brightness", - "comparison": "<=", - "compare_to": 0.3 + "toggle": { + "type": "origins:toggle", + "key": { + "key": "key.origins.primary_active", + "continuous": false + }, + "retain_state": false, + "condition": { + "type": "origins:health", + "comparison": ">=", + "compare_to": 6 + } + }, + "vision": { + "type": "origins:night_vision", + "retain_state": false, + "strength": 0.5, + "condition": { + "type": "origins:and", + "conditions": [ + { + "type": "origins:submerged_in", + "fluid": "minecraft:water", + "inverted": true + }, + { + "type": "origins:power_active", + "power": "*:*_toggle" + } + ] + } } } diff --git a/data/feathermc/powers/fox_size.json b/data/feathermc/powers/small_size.json similarity index 96% rename from data/feathermc/powers/fox_size.json rename to data/feathermc/powers/small_size.json index 15e58ae..95e4f82 100644 --- a/data/feathermc/powers/fox_size.json +++ b/data/feathermc/powers/small_size.json @@ -1,6 +1,6 @@ { "type": "origins:action_on_callback", - "name": "Fox sized", + "name": "Tiny stature", "description": "You're small!", "badges": [ {