From 9ebac7d1d72aeb17ecd70244fddcc7d417e4508b Mon Sep 17 00:00:00 2001 From: Pandro Date: Thu, 9 Oct 2025 15:23:48 +0200 Subject: [PATCH] Reworked gato night vision, removed reverse_logic Removed power "reverse_logic" Merged all the "night_vision" files for "El Gato" into "night_vision_focus.json" Removed "fox_jump_height" because it is obsolete. --- datapack/data/feathermc/origins/gato.json | 4 +- datapack/data/feathermc/origins/protogen.json | 3 +- .../feathermc/powers/fox_jump_height.json | 10 ---- .../hunger_when_night_vision_drain.json | 11 ----- .../data/feathermc/powers/night_vision.json | 11 ----- .../powers/night_vision_concentrate.json | 15 ------ .../night_vision_concentrate_callback.json | 17 ------- .../feathermc/powers/night_vision_drain.json | 29 ------------ .../feathermc/powers/night_vision_focus.json | 46 +++++++++++++++++++ .../data/feathermc/powers/reverse_logic.json | 27 ----------- 10 files changed, 48 insertions(+), 125 deletions(-) delete mode 100644 datapack/data/feathermc/powers/fox_jump_height.json delete mode 100644 datapack/data/feathermc/powers/hunger_when_night_vision_drain.json delete mode 100644 datapack/data/feathermc/powers/night_vision.json delete mode 100644 datapack/data/feathermc/powers/night_vision_concentrate.json delete mode 100644 datapack/data/feathermc/powers/night_vision_concentrate_callback.json delete mode 100644 datapack/data/feathermc/powers/night_vision_drain.json create mode 100644 datapack/data/feathermc/powers/night_vision_focus.json delete mode 100644 datapack/data/feathermc/powers/reverse_logic.json diff --git a/datapack/data/feathermc/origins/gato.json b/datapack/data/feathermc/origins/gato.json index 09f2891..da10282 100644 --- a/datapack/data/feathermc/origins/gato.json +++ b/datapack/data/feathermc/origins/gato.json @@ -5,9 +5,7 @@ "origins:sprint_jump", "origins:nine_lives", "feathermc:fall_immunity_or_death", - "feathermc:night_vision_drain", - "feathermc:night_vision_concentrate", - "feathermc:hunger_when_night_vision_drain", + "feathermc:night_vision_focus", "origins:velvet_paws", "origins:scare_creepers" ], diff --git a/datapack/data/feathermc/origins/protogen.json b/datapack/data/feathermc/origins/protogen.json index 92c66c8..692fc3a 100644 --- a/datapack/data/feathermc/origins/protogen.json +++ b/datapack/data/feathermc/origins/protogen.json @@ -2,8 +2,7 @@ "name": "Protogen", "description": "An artificial creature designed to adapt to its surroundings.", "powers": [ - "feathermc:pumpkin_hate", - "feathermc:reverse_logic" + "feathermc:pumpkin_hate" ], "order": 9, "impact": 2 diff --git a/datapack/data/feathermc/powers/fox_jump_height.json b/datapack/data/feathermc/powers/fox_jump_height.json deleted file mode 100644 index 89089a5..0000000 --- a/datapack/data/feathermc/powers/fox_jump_height.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "origins:attribute", - "hidden": true, - "modifier": { - "id": "small_size_compensation", - "attribute": "minecraft:generic.jump_strength", - "amount": 0.1, - "operation": "add_value" - } -} diff --git a/datapack/data/feathermc/powers/hunger_when_night_vision_drain.json b/datapack/data/feathermc/powers/hunger_when_night_vision_drain.json deleted file mode 100644 index fce2c8b..0000000 --- a/datapack/data/feathermc/powers/hunger_when_night_vision_drain.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "origins:exhaust", - "hidden": true, - "interval": 20, - "exhaustion": 0.812, - "condition": { - "type": "origins:power_active", - "power": "feathermc:night_vision_drain" - } -} - diff --git a/datapack/data/feathermc/powers/night_vision.json b/datapack/data/feathermc/powers/night_vision.json deleted file mode 100644 index 678ecbc..0000000 --- a/datapack/data/feathermc/powers/night_vision.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "origins:night_vision", - "strength": 0.5, - "name": "Darkvision", - "description": "You can see in the dark. Somewhat.", - "condition": { - "type": "origins:brightness", - "comparison": "<=", - "compare_to": 0.3 - } -} diff --git a/datapack/data/feathermc/powers/night_vision_concentrate.json b/datapack/data/feathermc/powers/night_vision_concentrate.json deleted file mode 100644 index cfd180a..0000000 --- a/datapack/data/feathermc/powers/night_vision_concentrate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Night Vision", - "description": "Able to see in the dark at will. The effort does make you hungry more quickly though and requires certain level of hunger to be used!", - "type": "origins:toggle", - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "retain_state": false, - "condition": { - "type": "apoli:food_level", - "comparison": ">", - "compare_to": 6 - } -} diff --git a/datapack/data/feathermc/powers/night_vision_concentrate_callback.json b/datapack/data/feathermc/powers/night_vision_concentrate_callback.json deleted file mode 100644 index 3282e1d..0000000 --- a/datapack/data/feathermc/powers/night_vision_concentrate_callback.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "origins:action_on_callback", - "entity_action_respawned": { - "type": "origins:if_else", - "condition": { - "type": "origins:power_active", - "power": "feathermc:night_vision_concentrate", - "inverted": true - }, - "if_action": { - "type": "origins:toggle", - "power": "feathermc:night_vision_concentrate" - } - }, - "hidden": true -} - diff --git a/datapack/data/feathermc/powers/night_vision_drain.json b/datapack/data/feathermc/powers/night_vision_drain.json deleted file mode 100644 index 4a6f6d6..0000000 --- a/datapack/data/feathermc/powers/night_vision_drain.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "hidden": true, - "type": "origins:night_vision", - "retain_state": false, - "strength": 1.0, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:submerged_in", - "fluid": "minecraft:water", - "inverted": true - }, - { - "type": "apoli:food_level", - "comparison": ">", - "compare_to": 6 - }, - { - "type": "origins:power_active", - "power": "feathermc:night_vision_concentrate" - } - ] - } -} diff --git a/datapack/data/feathermc/powers/night_vision_focus.json b/datapack/data/feathermc/powers/night_vision_focus.json new file mode 100644 index 0000000..1c54d35 --- /dev/null +++ b/datapack/data/feathermc/powers/night_vision_focus.json @@ -0,0 +1,46 @@ +{ + "type": "origins:multiple", + "name": "Night Vision", + "description": "If you concentrate enough, you can see in the dark. It is draining you though.", + "toggle": { + "type": "origins:toggle", + "key": { + "key": "key.origins.primary_active", + "continuous": false + }, + "retain_state": false, + "condition": { + "type": "apoli:food_level", + "comparison": ">", + "compare_to": 6 + } + }, + "vision": { + "type": "origins:night_vision", + "retain_state": false, + "strength": 1.0, + "condition": { + "type": "origins:and", + "conditions": [ + { + "type": "origins:submerged_in", + "fluid": "minecraft:water", + "inverted": true + }, + { + "type": "origins:power_active", + "power": "feathermc:night_vision_toggle" + } + ] + } + }, + "drain": { + "type": "origins:exhaust", + "interval": 80, + "exhaustion": 1.0, + "condition": { + "type": "origins:power_active", + "power": "feathermc:night_vision_toggle" + } + } +} diff --git a/datapack/data/feathermc/powers/reverse_logic.json b/datapack/data/feathermc/powers/reverse_logic.json deleted file mode 100644 index bd6ee19..0000000 --- a/datapack/data/feathermc/powers/reverse_logic.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:multiple", - "toggle": { - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.primary_active" - } - }, - "reversed_velocity": { - "type": "origins:modify_velocity", - "modifier": { - "id": "reverse_logic_mod", - "amount": -2, - "operation": "multiply_base_multiplicative" - }, - "axes": [ - "x", - "y", - "z" - ], - "condition": { - "type": "origins:power_active", - "power": "*:toggle" - } - } -}