From 68ab89fb9314d202f1bae0ebe68e65b8f5cd378a Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Thu, 4 Apr 2024 19:16:30 +0200 Subject: [PATCH] added kitsune and yulde --- .../assets/terraoriginum/lang/en_us.json | 45 +++++++++++++--- .../data/origins/origin_layers/origin.json | 2 + .../terraoriginum/damage_type/last_stand.json | 5 ++ .../data/terraoriginum/origins/kitsune.json | 33 ++++++++++++ .../data/terraoriginum/origins/yulde.json | 24 +++++++++ .../powers/kitsune-powers/armor.json | 27 ++++++++++ .../powers/kitsune-powers/diet.json | 36 +++++++++++++ .../powers/kitsune-powers/fox_eyes.json | 10 ++++ .../powers/kitsune-powers/fox_pouch.json | 8 +++ .../kitsune-powers/fox_pouch_sound.json | 22 ++++++++ .../powers/kitsune-powers/fragilefox.json | 10 ++++ .../powers/kitsune-powers/home.json | 6 +++ .../powers/kitsune-powers/hungy.json | 7 +++ .../powers/kitsune-powers/invisibility.json | 9 ++++ .../powers/kitsune-powers/monch.json | 22 ++++++++ .../powers/kitsune-powers/paws.json | 7 +++ .../powers/kitsune-powers/paws_shield.json | 10 ++++ .../powers/kitsune-powers/phantomize.json | 9 ++++ .../powers/kitsune-powers/phase_fix.json | 24 +++++++++ .../powers/kitsune-powers/phasing.json | 18 +++++++ .../powers/kitsune-powers/phasing_jump.json | 12 +++++ .../powers/kitsune-powers/pounce.json | 41 ++++++++++++++ .../kitsune-powers/pounce_aerialdamage.json | 54 +++++++++++++++++++ .../powers/kitsune-powers/pounce_falling.json | 9 ++++ .../powers/kitsune-powers/run.json | 17 ++++++ .../powers/kitsune-powers/smolman.json | 25 +++++++++ .../powers/kitsune-powers/speed.json | 11 ++++ .../powers/kitsune-powers/yum.json | 21 ++++++++ .../powers/kitsune-powers/yummy_berries.json | 21 ++++++++ .../powers/kitsune-powers/zberry_no_hurt.json | 8 +++ .../powers/yulde-powers/last_stand-death.json | 20 +++++++ .../yulde-powers/last_stand-effects.json | 26 +++++++++ .../powers/yulde-powers/last_stand.json | 25 +++++++++ .../terraoriginum/tags/blocks/unphasable.json | 13 +++++ .../data/terraoriginum/tags/items/boots.json | 7 +++ .../terraoriginum/tags/items/chestplate.json | 7 +++ .../data/terraoriginum/tags/items/helmet.json | 7 +++ .../terraoriginum/tags/items/leggings.json | 7 +++ src/main/resources/fabric.mod.json | 5 +- 39 files changed, 661 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/data/terraoriginum/damage_type/last_stand.json create mode 100644 src/main/resources/data/terraoriginum/origins/kitsune.json create mode 100755 src/main/resources/data/terraoriginum/origins/yulde.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json create mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json create mode 100644 src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json create mode 100755 src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json create mode 100755 src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json create mode 100644 src/main/resources/data/terraoriginum/tags/blocks/unphasable.json create mode 100644 src/main/resources/data/terraoriginum/tags/items/boots.json create mode 100644 src/main/resources/data/terraoriginum/tags/items/chestplate.json create mode 100644 src/main/resources/data/terraoriginum/tags/items/helmet.json create mode 100644 src/main/resources/data/terraoriginum/tags/items/leggings.json diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 089bee5..63c7bed 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -12,10 +12,10 @@ //-----Immortal Human-----// "origin.terraoriginum.immortal_human.name": "Immortal Human", "origin.terraoriginum.immortal_human.description": "You hate life, but out of spite, the gods cursed you with being immortal. How unfortunate.", - "power.terraoriginum.immortal_humanpowers/immortal.name": "Immortal", - "power.terraoriginum.immortal_humanpowers/immortal.description": "You cannot die, no matter how hard you try.", - "power.terraoriginum.immortal_humanpowers/pathetic.name": "Pathetic", - "power.terraoriginum.immortal_humanpowers/pathetic.description": "You cannot deal damage to anything.", + "power.terraoriginum.immortal_human-powers/immortal.name": "Immortal", + "power.terraoriginum.immortal_human-powers/immortal.description": "You cannot die, no matter how hard you try.", + "power.terraoriginum.immortal_human-powers/pathetic.name": "Pathetic", + "power.terraoriginum.immortal_human-powers/pathetic.description": "You cannot deal damage to anything.", //-----Demon-----// "origin.terraoriginum.demon.name": "Demon", @@ -128,9 +128,40 @@ "power.terraoriginum.mync-powers/mync_strong.name": "Strong", "power.terraoriginum.mync-powers/mync_strong.description": "You do more damage than regular people.", - "death.attack.burn_in_sun": "%1$s sizzled up in the sun.", - "death.attack.burn_in_sun.player": "%1$s sizzled up in the sun whilst trying to escape %2$s." - + "death.attack.terraoriginum:burn_in_sun": "%1$s sizzled up in the sun.", + "death.attack.terraoriginum:burn_in_sun.player": "%1$s sizzled up in the sun whilst trying to escape %2$s.", + + //-----Kitsune-----// + "origin.terraoriginum.kitsune.name": "Kitsune", + "origin.terraoriginum.kitsune.description": "This race of Spirit Foxes dwell around settlements waiting for for treasure to be left unguarded. Though weak in terms of vitality they use their spiritual power to hide and strengthen their power.", + "power.terraoriginum.kitsune-powers/armor.name": "Rich Man's Armour", + "power.terraoriginum.kitsune-powers/armor.description": "You cannot use chanimail armor or leather armor because mmm, unfancy", + "power.terraoriginum.kitsune-powers/diet.name": "Vulpine Diet", + "power.terraoriginum.kitsune-powers/diet.description": "Kitsune love berries and therefore they cure 4 hunger points and 14.4 saturation points (like golden carrots) & your diet is restricted to meat, fish, and berries, so you can't really eat vegetables.", + "power.terraoriginum.kitsune-powers/fox_pouch.name": "Mighty Mouth", + "power.terraoriginum.kitsune-powers/fox_pouch.description": "You carry a secret stash that no one but you has acccess to. You can access this pouch by using your load hotbar activator key.", + "power.terraoriginum.kitsune-powers/home.name": "Home Sweet Home", + "power.terraoriginum.kitsune-powers/home.description": "Your natural spawnpoint is in the Taiga biome.", + "power.terraoriginum.kitsune-powers/hungy.name": "Fast Metabolism", + "power.terraoriginum.kitsune-powers/hungy.description": "A small body performing great movements requires a large amount of food!", + "power.terraoriginum.kitsune-powers/paws.name": "Paws", + "power.terraoriginum.kitsune-powers/paws.description": "You are unable to hold a shield and deal less damage with projectiles because of how your paws are built.", + "power.terraoriginum.kitsune-powers/phasing.name": "Phasing", + "power.terraoriginum.kitsune-powers/phasing.description": "You can walk through solid material, except obsidian, crying obsidian, barriers and bedrock, BUT you are unable to phase up or down.", + "power.terraoriginum.kitsune-powers/pounce.name": "Pounce", + "power.terraoriginum.kitsune-powers/pounce.description": "You perform a great leap towards the direction you're facing. You also deal more damage while falling.", + "power.terraoriginum.kitsune-powers/run.name": "Scram!", + "power.terraoriginum.kitsune-powers/run.description": "Whenever your health goes below 4 hearts, you gain a small speed boost", + "power.terraoriginum.kitsune-powers/speed.name": "Small Frame", + "power.terraoriginum.kitsune-powers/speed.description": "Your small frame gives little weight, making it easier to move at the cost of health.", + + //-----Yulde-----// + "origin.terraoriginum.yulde.name": "Yulde", + "origin.terraoriginum.yulde.description": "A Yulde is a Lato with the ability to change the tides of battle, at the cost of their lives.", + "power.terraoriginum.yulde-powers/last_stand.name": "Last Stand", + "power.terraoriginum.yulde-powers/last_stand.description": "You gain strength 4 and speed 2 for 60 seconds, after which you will, without fail, die.", + "death.attack.terraoriginum:last_stand": "%1$s made their last stand.", + "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand before dying to %2$s." } \ 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 9db1134..74f45d9 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -9,6 +9,8 @@ "terraoriginum:merfolk", "terraoriginum:serpenta", "terraoriginum:lato", + "terraoriginum:kitsune", + "terraoriginum:yulde", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/damage_type/last_stand.json b/src/main/resources/data/terraoriginum/damage_type/last_stand.json new file mode 100644 index 0000000..321aca1 --- /dev/null +++ b/src/main/resources/data/terraoriginum/damage_type/last_stand.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "last_stand", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/kitsune.json b/src/main/resources/data/terraoriginum/origins/kitsune.json new file mode 100644 index 0000000..52aa41e --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/kitsune.json @@ -0,0 +1,33 @@ +{ + "powers": [ + "terraoriginum:kitsune-powers/pounce", + "terraoriginum:kitsune-powers/pounce_aerialdamage", + "terraoriginum:kitsune-powers/pounce_falling", + "terraoriginum:kitsune-powers/phantomize", + "terraoriginum:kitsune-powers/phasing", + "terraoriginum:kitsune-powers/phasing_jump", + "terraoriginum:kitsune-powers/invisibility", + "terraoriginum:kitsune-powers/fox_pouch", + "terraoriginum:kitsune-powers/fox_pouch_sound", + "terraoriginum:kitsune-powers/run", + "origins:fall_immunity", + "terraoriginum:kitsune-powers/speed", + "terraoriginum:kitsune-powers/diet", + "terraoriginum:kitsune-powers/fragilefox", + "terraoriginum:kitsune-powers/smolman", + "terraoriginum:kitsune-powers/yummy_berries", + "terraoriginum:kitsune-powers/zberry_no_hurt", + "terraoriginum:kitsune-powers/armor", + "terraoriginum:kitsune-powers/paws", + "terraoriginum:kitsune-powers/phase_fix", + "terraoriginum:kitsune-powers/paws_shield", + "terraoriginum:kitsune-powers/hungy", + "terraoriginum:kitsune-powers/fox_eyes", + "terraoriginum:kitsune-powers/monch", + "terraoriginum:kitsune-powers/home", + "terraoriginum:kitsune-powers/yum" + ], + "icon": "minecraft:sweet_berries", + "order": 1006, + "impact": 3 +} diff --git a/src/main/resources/data/terraoriginum/origins/yulde.json b/src/main/resources/data/terraoriginum/origins/yulde.json new file mode 100755 index 0000000..862237d --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/yulde.json @@ -0,0 +1,24 @@ +{ + "powers": [ + "terraoriginum:lato-powers/lato_blooded", + "terraoriginum:lato-powers/twelve_hearts", + "terraoriginum:lato-powers/natural_armor", + "terraoriginum:lato-powers/tailwind", + "terraoriginum:yulde-powers/last_stand", + "terraoriginum:yulde-powers/last_stand-effects", + "terraoriginum:yulde-powers/last_stand-death", + "terraoriginum:lato-powers/perfect_vision", + "terraoriginum:lato-powers/sun_damage", + "terraoriginum:lato-powers/teleport", + "terraoriginum:lato-powers/strong", + "terraoriginum:lato-powers/long_arms", + "terraoriginum:lato-powers/tall", + "terraoriginum:lato-powers/tall_hitbox", + "terraoriginum:lato-powers/tall_width", + "terraoriginum:lato-powers/tall_width_hitbox" + ], + "icon": "netherite_axe", + "order": 998, + "impact": 3 + } + \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json new file mode 100644 index 0000000..4b1f136 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json @@ -0,0 +1,27 @@ +{ + "type": "origins:restrict_armor", + "head": { + "type": "origins:ingredient", + "ingredient": { + "tag": "terraoriginum:helmet" + } + }, + "chest": { + "type": "origins:ingredient", + "ingredient": { + "tag": "terraoriginum:chestplate" + } + }, + "legs": { + "type": "origins:ingredient", + "ingredient": { + "tag": "terraoriginum:leggings" + } + }, + "feet": { + "type": "origins:ingredient", + "ingredient": { + "tag": "terraoriginum:boots" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json new file mode 100644 index 0000000..3a84452 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json @@ -0,0 +1,36 @@ +{ + "type": "origins:prevent_item_use", + "item_condition": { + "type": "origins:and", + "conditions": [ + { + "type": "origins:food" + }, + { + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:fishes" + }, + "inverted": true + }, + { + "type": "origins:meat", + "inverted": true + }, + { + "type": "origins:ingredient", + "ingredient": { + "item": "glow_berries" + }, + "inverted": true + }, + { + "type": "origins:ingredient", + "ingredient": { + "item": "sweet_berries" + }, + "inverted": true + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json new file mode 100644 index 0000000..e7f8119 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json @@ -0,0 +1,10 @@ +{ + "type": "origins:night_vision", + "strength": 0.3, + "condition": { + "type": "origins:submerged_in", + "fluid": "minecraft:water", + "inverted": true + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json new file mode 100644 index 0000000..639cc07 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json @@ -0,0 +1,8 @@ +{ + "type": "origins:inventory", + "drop_on_death": false, + "key": { + "key": "key.loadToolbarActivator", + "continuous": false + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json new file mode 100644 index 0000000..1158268 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json @@ -0,0 +1,22 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:chance", + "action": + { + "type": "origins:execute_command", + "command": "playsound minecraft:entity.fox.eat player @s ~ ~ ~ 1 1 1", + "permission_level": 4 + }, + "chance": 100.0 + }, + "hidden": true, + "key": { + "key": "key.loadToolbarActivator", + "continuous": false + }, + "cooldown": 0, + "hud_render": { + "should_render": false + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json new file mode 100644 index 0000000..711f966 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json @@ -0,0 +1,10 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.max_health", + "value": -8.0, + "operation": "addition" + }, + "hidden": true, + "tick_rate": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json new file mode 100644 index 0000000..21681de --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json @@ -0,0 +1,6 @@ +{ + "type": "origins:modify_player_spawn", + "dimension": "minecraft:overworld", + "biome": "minecraft:taiga", + "spawn_strategy": "default" +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json new file mode 100644 index 0000000..90f0923 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json @@ -0,0 +1,7 @@ +{ + "type": "origins:modify_exhaustion", + "modifier":{ + "value": 5, + "operation": "multiply_base" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json new file mode 100644 index 0000000..f121e2a --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json @@ -0,0 +1,9 @@ +{ + "hidden": true, + "type": "origins:invisibility", + "render_armor": true, + "condition": { + "type": "origins:power_active", + "power": "terraoriginum:kitsune-powers/phantomize" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json new file mode 100644 index 0000000..8c48618 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json @@ -0,0 +1,22 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:chance", + "action": + { + "type": "origins:execute_command", + "command": "playsound minecraft:entity.fox.bite player @a ~ ~ ~ 1 1 0", + "permission_level": 4 + }, + "chance": 100.0 + }, + "hidden": true, + "key": { + "key": "key.attack", + "continuous": false + }, + "cooldown": 0, + "hud_render": { + "should_render": false + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json new file mode 100644 index 0000000..7b36be9 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json @@ -0,0 +1,7 @@ +{ + "type": "origins:modify_projectile_damage", + "modifier": { + "operation": "multiply_total", + "value": -0.5 + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json new file mode 100644 index 0000000..1214dba --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json @@ -0,0 +1,10 @@ +{ + "hidden": true, + "type": "origins:prevent_item_use", + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "tag": "origins:shields" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json new file mode 100644 index 0000000..90b5c04 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json @@ -0,0 +1,9 @@ +{ + "type": "origins:toggle", + "active_by_default": "false", + "hidden": true, + "key": { + "key": "key.origins.secondary_active", + "continuous": false + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json new file mode 100644 index 0000000..08d3cf8 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json @@ -0,0 +1,24 @@ +{ + "type": "origins:multiple", + "hidden": true, + "invulnerabilities": { + "type": "origins:invulnerability", + "condition": { + "type": "origins:power_active", + "power": "terraoriginum:kitsune-powers/phantomize" + }, + "damage_condition": { + "type": "origins:or", + "conditions": [ + { + "type": "origins:name", + "name": "inWall" + }, + { + "type": "origins:name", + "name": "cramming" + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json new file mode 100644 index 0000000..4c221fe --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json @@ -0,0 +1,18 @@ +{ + "type": "origins:phasing", + "blacklist": true, + "render_type": "blindness", + "view_distance": 10, + "block_condition": { + "type": "origins:in_tag", + "tag": "terraoriginum:unphasable" + }, + "phase_down_condition": { + "type": "origins:constant", + "value": false + }, + "condition": { + "type": "origins:power_active", + "power": "terraoriginum:kitsune-powers/phantomize" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json new file mode 100644 index 0000000..73a183f --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json @@ -0,0 +1,12 @@ +{ + "hidden": true, + "type": "origins:modify_jump", + "modifier": { + "operation": "addition", + "value": -1.0 + }, + "condition": { + "type": "origins:power_active", + "power": "terraoriginum:kitsune-powers/phantomize" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json new file mode 100644 index 0000000..171d812 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json @@ -0,0 +1,41 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:execute_command", + "command": "particle minecraft:cloud ~ ~ ~ 0.5 0 0.5 0.2 20 force", + "permission_level": 4 + }, + { + "type": "origins:execute_command", + "command": "playsound minecraft:entity.fox.ambient player @a[distance=..10] ~ ~ ~ 1 1 1", + "permission_level": 4 + }, + { + "type": "origins:add_velocity", + "z": 1, + "space": "local" + }, + { + "type": "origins:add_velocity", + "y": 0.2 + }, + { + "type": "origins:exhaust", + "amount": 0.6 + } + ] + }, + "key": { + "key": "key.origins.primary_active", + "continuous": false + }, + "cooldown": 150, + "hud_render": { + "should_render": true, + "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_03.png", + "bar_index": 23 + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json new file mode 100644 index 0000000..3df047e --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json @@ -0,0 +1,54 @@ +{ + "hidden": true, + "type": "origins:multiple", + + "falling_false": { + "type": "origins:action_on_land", + "entity_action": { + "type": "origins:change_resource", + "resource": "terraoriginum:kitsune-powers/pounce_falling", + "change": -1 + } + }, + + "falling_true": { + "type": "origins:active_self", + "entity_action": { + "type": "origins:change_resource", + "resource": "terraoriginum:kitsune-powers/pounce_falling", + "change": 1 + }, + "key": { + "key": "key.origins.primary_active", + "continuous": false + }, + "cooldown": 100, + "hud_render": { + "should_render": false + } + }, + + "deal_damage": { + "type": "origins:modify_damage_dealt", + "modifier": { + "value": 1.1, + "operation": "multiply_base" + }, + "condition": { + "type": "origins:and", + "conditions": [ + { + "type": "origins:fall_distance", + "comparison": ">", + "compare_to": 0 + }, + { + "type": "origins:resource", + "resource": "terraoriginum:kitsune-powers/pounce_falling", + "comparison": "==", + "compare_to": 1 + } + ] + } + } +} diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json new file mode 100644 index 0000000..c0ea223 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json @@ -0,0 +1,9 @@ +{ + "hidden": true, + "type": "origins:resource", + "min": 0, + "max": 1, + "hud_render": { + "should_render": false + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json new file mode 100644 index 0000000..0d24c9c --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json @@ -0,0 +1,17 @@ +{ + "type":"origins:conditioned_attribute", + "modifier":{ + "attribute": "minecraft:generic.movement_speed", + "value": 0.015, + "operation": "addition" + }, + "condition": + { + "type": "origins:health", + "comparison": "<", + "compare_to": 7 + }, + "tick_rate": 2 +} + + diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json new file mode 100644 index 0000000..2d05a38 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json @@ -0,0 +1,25 @@ +{ + "type": "origins:action_on_callback", + "entity_action_gained":{ + "type": "origins:and", + "actions": [ + { + "type": "origins:execute_command", + "command": "scale set pehkui:height .80 @s", + "permission_level": 4 + }, + { + "type": "origins:execute_command", + "command": "scale set pehkui:width .80 @s", + "permission_level": 4 + }, + { + "type": "origins:execute_command", + "command": "scale persist set true", + "permission_level": 4 + } + ] + }, + "when_orb": true, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json new file mode 100644 index 0000000..79ffc48 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json @@ -0,0 +1,11 @@ +{ + "type":"origins:attribute", + "modifier":{ + "attribute": "minecraft:generic.movement_speed", + "value": 0.02, + "operation": "addition" + }, + "tick_rate": 2 +} + + diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json new file mode 100644 index 0000000..6884c54 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json @@ -0,0 +1,21 @@ +{ + "type": "origins:modify_food", + "item_condition": { + "type": "origins:ingredient", + "ingredient": + { + "item": "minecraft:glow_berries" + } + }, + "food_modifier": + { + "operation": "addition", + "value": 5.0 + }, + "saturation_modifier": + { + "operation": "addition", + "value": 13 + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json new file mode 100644 index 0000000..4a1fe3c --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json @@ -0,0 +1,21 @@ +{ + "type": "origins:modify_food", + "item_condition": { + "type": "origins:ingredient", + "ingredient": + { + "item": "minecraft:sweet_berries" + } + }, + "food_modifier": + { + "operation": "addition", + "value": 5.0 + }, + "saturation_modifier": + { + "operation": "addition", + "value": 13 + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json new file mode 100644 index 0000000..ffdd811 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json @@ -0,0 +1,8 @@ +{ + "type": "origins:invulnerability", + "damage_condition": { + "type": "origins:name", + "name": "sweetBerryBush" + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json new file mode 100644 index 0000000..ac7a357 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json @@ -0,0 +1,20 @@ +{ + + "type": "origins:damage_over_time", + "interval": 40, + "onset_delay": 1200, + "damage": 500, + "damage_easy": 2, + "damage_source": { + "name": "terraoriginum:last_stand", + "unblockable": true, + "bypasses_armor": true + }, + "condition": { + "type": "origins:status_effect", + "effect": "minecraft:strength", + "min_amplifier": 3, + "min_duration": 0 + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json new file mode 100755 index 0000000..f47cee1 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json @@ -0,0 +1,26 @@ +{ + "type": "origins:active_self", + "hidden": "true", + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:speed", + "duration": 1400, + "amplifier": 1 + } + }, + { + "type": "origins:heal", + "amount": 8 + } + ] + }, + "cooldown": 2400, + "hud_render": { + "sprite_location": "terraoriginum:textures/gui/nothing.png", + "bar_index": "0" + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json new file mode 100755 index 0000000..6aa0365 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json @@ -0,0 +1,25 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:strength", + "duration": 1400, + "amplifier": 3 + } + }, + { + "type": "origins:exhaust", + "amount": 5 + } + ] + }, + "cooldown": 2400, + "hud_render": { + "sprite_location": "terraoriginum:textures/gui/ability_bar.png", + "bar_index": "0" + } +} diff --git a/src/main/resources/data/terraoriginum/tags/blocks/unphasable.json b/src/main/resources/data/terraoriginum/tags/blocks/unphasable.json new file mode 100644 index 0000000..702ea38 --- /dev/null +++ b/src/main/resources/data/terraoriginum/tags/blocks/unphasable.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:barrier", + "minecraft:bedrock", + "minecraft:crying_obsidian", + "minecraft:respawn_anchor", + "minecraft:obsidian", + "minecraft:enchanting_table", + "minecraft:ender_chest", + "minecraft:beacon" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/boots.json b/src/main/resources/data/terraoriginum/tags/items/boots.json new file mode 100644 index 0000000..80a471b --- /dev/null +++ b/src/main/resources/data/terraoriginum/tags/items/boots.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:leather_boots", + "minecraft:netherite_boots", + "minecraft:chainmail_boots" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/chestplate.json b/src/main/resources/data/terraoriginum/tags/items/chestplate.json new file mode 100644 index 0000000..e9a52f3 --- /dev/null +++ b/src/main/resources/data/terraoriginum/tags/items/chestplate.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:leather_chestplate", + "minecraft:netherite_chestplate", + "minecraft:chainmail_chestplate" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/helmet.json b/src/main/resources/data/terraoriginum/tags/items/helmet.json new file mode 100644 index 0000000..1d21934 --- /dev/null +++ b/src/main/resources/data/terraoriginum/tags/items/helmet.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:leather_helmet", + "minecraft:netherite_helmet", + "minecraft:chainmail_helmet" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/leggings.json b/src/main/resources/data/terraoriginum/tags/items/leggings.json new file mode 100644 index 0000000..9477cd6 --- /dev/null +++ b/src/main/resources/data/terraoriginum/tags/items/leggings.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:leather_leggings", + "minecraft:netherite_leggings", + "minecraft:chainmail_leggings" + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d7e3f5a..68eadb6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ ], "version": "${version}", "name": "Terra Originum", - "description": "Origins for girth SMP", + "description": "Origins for Celestia SMP", "authors": [ "Gæmer", "CosmoOrSth(or sth)" @@ -34,7 +34,8 @@ "origins": ">=1.10.0", "fabricloader": ">=0.14.0", "fabric": "*", - "minecraft": "1.20.1" + "minecraft": "1.20.1", + "pehkui": ">=3.7.8" }, "conflicts": { }