From a41645db5574c9928613be623f625c3fc4f0353a Mon Sep 17 00:00:00 2001 From: Fishplex Date: Mon, 24 Oct 2022 19:07:11 -0300 Subject: [PATCH] Clean up + balancing --- .gitignore | 2 - README.md | 6 -- build.gradle | 5 +- gradle.properties | 2 +- .../net/fabricmc/fishplex/Aspects.java | 35 +++++++++++ .../fabricmc/fishplex/mixin/AspectsMixin.java | 16 +++++ .../java/net/fabricmc/fishplex/Aspects.java | 2 - src/main/resources/aspects.mixins.json | 2 +- .../data/aspects/origin_layers/elements.json | 12 ++-- .../data/aspects/origin_layers/origins.json | 28 ++++----- .../aspects/origins/anemo_layers/anemo.json | 16 +++++ .../aspects/origins/anemo_layers/tempus.json | 14 +++++ .../aspects/origins/geo_layers/dendro.json | 16 +++++ .../data/aspects/origins/geo_layers/geo.json | 14 +++++ .../aspects/origins/hydro_layers/altum.json | 10 ++++ .../aspects/origins/hydro_layers/cryo.json | 13 ++++ .../aspects/origins/hydro_layers/hydro.json | 15 +++++ .../aspects/origins/ordo_layers/ordo.json | 17 ++++++ .../aspects/origins/ordo_layers/solus.json | 15 +++++ .../aspects/origins/perditio_layers/luna.json | 16 +++++ .../origins/perditio_layers/perditio.json | 17 ++++++ .../aspects/origins/pyro_layers/ignis.json | 13 ++++ .../aspects/origins/pyro_layers/magmus.json | 14 +++++ .../aspects/origins/pyro_layers/pyro.json | 17 ++++++ .../data/aspects/powers/anemo/anemo_team.json | 15 +++++ .../data/aspects/powers/anemo/chained.json | 23 ++++++++ .../aspects/powers/anemo/fleet_footed.json | 16 +++++ .../powers/anemo/negate_fall_damage.json | 16 +++++ .../aspects/powers/anemo/tempus/fleet.json | 17 ++++++ .../anemo/tempus/lightning_immunity.json | 12 ++++ .../powers/anemo/tempus/storm_strength.json | 21 +++++++ .../powers/anemo/tempus/tempus_primary.json | 35 +++++++++++ .../powers/anemo/tempus/tempus_secondary.json | 58 ++++++++++++++++++ .../data/aspects/powers/anemo/windborn.json | 6 ++ .../data/aspects/powers/anemo/wise.json | 15 +++++ .../powers/geo/dendro/dendro_primary.json | 23 ++++++++ .../powers/geo/dendro/dendro_secondary.json | 28 +++++++++ .../powers/geo/dendro/flower_regen.json | 34 +++++++++++ .../powers/geo/dendro/golem_expire.json | 16 +++++ .../powers/geo/dendro/golem_resource.json | 8 +++ .../powers/geo/dendro/grass_speed.json | 24 ++++++++ .../powers/geo/dendro/poison_resistance.json | 21 +++++++ .../data/aspects/powers/geo/earthborn.json | 6 ++ .../aspects/powers/geo/explosion_damage.json | 24 ++++++++ .../data/aspects/powers/geo/geo_team.json | 15 +++++ .../data/aspects/powers/geo/resistance.json | 16 +++++ .../aspects/powers/hydro/constitution.json | 17 ++++++ .../powers/hydro/cryo/cold_biomes.json | 25 ++++++++ .../powers/hydro/cryo/cryo_primary.json | 38 ++++++++++++ .../powers/hydro/cryo/cryo_secondary.json | 42 +++++++++++++ .../powers/hydro/cryo/frost_walker.json | 41 +++++++++++++ .../aspects/powers/hydro/fire_damage.json | 24 ++++++++ .../data/aspects/powers/hydro/hydro_team.json | 15 +++++ .../aspects/powers/hydro/water_breathing.json | 21 +++++++ .../data/aspects/powers/hydro/waterborn.json | 6 ++ .../aspects/powers/ordo/darkness_damage.json | 23 ++++++++ .../data/aspects/powers/ordo/holy.json | 24 ++++++++ .../data/aspects/powers/ordo/holy_light.json | 20 +++++++ .../data/aspects/powers/ordo/lightborn.json | 6 ++ .../aspects/powers/ordo/night_aversion.json | 21 +++++++ .../data/aspects/powers/ordo/ordo_team.json | 15 +++++ .../powers/ordo/positive_influence.json | 27 +++++++++ .../data/aspects/powers/ordo/solus/decay.json | 10 ++++ .../powers/ordo/solus/fire_resistance.json | 17 ++++++ .../powers/ordo/solus/solus_primary.json | 29 +++++++++ .../powers/ordo/solus/solus_secondary.json | 59 +++++++++++++++++++ .../aspects/powers/ordo/solus/sun_bar.json | 29 +++++++++ .../aspects/powers/ordo/solus/sunbaked.json | 37 ++++++++++++ .../aspects/powers/perditio/day_aversion.json | 20 +++++++ .../powers/perditio/luna/full_moon.json | 31 ++++++++++ .../powers/perditio/luna/invisibility.json | 9 +++ .../powers/perditio/luna/luna_primary.json | 11 ++++ .../powers/perditio/luna/luna_secondary.json | 25 ++++++++ .../powers/perditio/luna/nightwalker.json | 21 +++++++ .../powers/perditio/luna/wither_immunity.json | 21 +++++++ .../powers/perditio/luna/wolf_affinity.json | 30 ++++++++++ .../powers/perditio/night_strength.json | 21 +++++++ .../powers/perditio/perditio_team.json | 15 +++++ .../data/aspects/powers/perditio/undead.json | 12 ++++ .../data/aspects/powers/perditio/void.json | 37 ++++++++++++ .../aspects/powers/perditio/voidborn.json | 6 ++ .../powers/perditio/wither_damage.json | 19 ++++++ .../aspects/powers/pyro/fire_immunity.json | 19 ++++++ .../data/aspects/powers/pyro/flameborn.json | 6 ++ .../powers/pyro/ignis/fire_strength.json | 21 +++++++ .../aspects/powers/pyro/ignis/hot_biomes.json | 25 ++++++++ .../powers/pyro/ignis/ignis_primary.json | 25 ++++++++ .../powers/pyro/ignis/ignis_secondary.json | 37 ++++++++++++ .../data/aspects/powers/pyro/lava_vision.json | 6 ++ .../powers/pyro/magmus/increased_health.json | 10 ++++ .../pyro/magmus/knockback_resistance.json | 17 ++++++ .../powers/pyro/magmus/magma_regen.json | 23 ++++++++ .../powers/pyro/magmus/magmus_primary.json | 30 ++++++++++ .../powers/pyro/magmus/magmus_secondary.json | 30 ++++++++++ .../data/aspects/powers/pyro/melt.json | 44 ++++++++++++++ .../data/aspects/powers/pyro/nether_buff.json | 23 ++++++++ .../data/aspects/powers/pyro/pyro_team.json | 15 +++++ .../aspects/powers/pyro/water_damage.json | 36 +++++++++++ src/main/resources/fabric.mod.json | 12 ++-- 99 files changed, 1931 insertions(+), 38 deletions(-) create mode 100644 remappedSrc/net/fabricmc/fishplex/Aspects.java create mode 100644 remappedSrc/net/fabricmc/fishplex/mixin/AspectsMixin.java create mode 100644 src/main/resources/data/aspects/origins/anemo_layers/anemo.json create mode 100644 src/main/resources/data/aspects/origins/anemo_layers/tempus.json create mode 100644 src/main/resources/data/aspects/origins/geo_layers/dendro.json create mode 100644 src/main/resources/data/aspects/origins/geo_layers/geo.json create mode 100644 src/main/resources/data/aspects/origins/hydro_layers/altum.json create mode 100644 src/main/resources/data/aspects/origins/hydro_layers/cryo.json create mode 100644 src/main/resources/data/aspects/origins/hydro_layers/hydro.json create mode 100644 src/main/resources/data/aspects/origins/ordo_layers/ordo.json create mode 100644 src/main/resources/data/aspects/origins/ordo_layers/solus.json create mode 100644 src/main/resources/data/aspects/origins/perditio_layers/luna.json create mode 100644 src/main/resources/data/aspects/origins/perditio_layers/perditio.json create mode 100644 src/main/resources/data/aspects/origins/pyro_layers/ignis.json create mode 100644 src/main/resources/data/aspects/origins/pyro_layers/magmus.json create mode 100644 src/main/resources/data/aspects/origins/pyro_layers/pyro.json create mode 100644 src/main/resources/data/aspects/powers/anemo/anemo_team.json create mode 100644 src/main/resources/data/aspects/powers/anemo/chained.json create mode 100644 src/main/resources/data/aspects/powers/anemo/fleet_footed.json create mode 100644 src/main/resources/data/aspects/powers/anemo/negate_fall_damage.json create mode 100644 src/main/resources/data/aspects/powers/anemo/tempus/fleet.json create mode 100644 src/main/resources/data/aspects/powers/anemo/tempus/lightning_immunity.json create mode 100644 src/main/resources/data/aspects/powers/anemo/tempus/storm_strength.json create mode 100644 src/main/resources/data/aspects/powers/anemo/tempus/tempus_primary.json create mode 100644 src/main/resources/data/aspects/powers/anemo/tempus/tempus_secondary.json create mode 100644 src/main/resources/data/aspects/powers/anemo/windborn.json create mode 100644 src/main/resources/data/aspects/powers/anemo/wise.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/dendro_primary.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/dendro_secondary.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/flower_regen.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/golem_expire.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/golem_resource.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/grass_speed.json create mode 100644 src/main/resources/data/aspects/powers/geo/dendro/poison_resistance.json create mode 100644 src/main/resources/data/aspects/powers/geo/earthborn.json create mode 100644 src/main/resources/data/aspects/powers/geo/explosion_damage.json create mode 100644 src/main/resources/data/aspects/powers/geo/geo_team.json create mode 100644 src/main/resources/data/aspects/powers/geo/resistance.json create mode 100644 src/main/resources/data/aspects/powers/hydro/constitution.json create mode 100644 src/main/resources/data/aspects/powers/hydro/cryo/cold_biomes.json create mode 100644 src/main/resources/data/aspects/powers/hydro/cryo/cryo_primary.json create mode 100644 src/main/resources/data/aspects/powers/hydro/cryo/cryo_secondary.json create mode 100644 src/main/resources/data/aspects/powers/hydro/cryo/frost_walker.json create mode 100644 src/main/resources/data/aspects/powers/hydro/fire_damage.json create mode 100644 src/main/resources/data/aspects/powers/hydro/hydro_team.json create mode 100644 src/main/resources/data/aspects/powers/hydro/water_breathing.json create mode 100644 src/main/resources/data/aspects/powers/hydro/waterborn.json create mode 100644 src/main/resources/data/aspects/powers/ordo/darkness_damage.json create mode 100644 src/main/resources/data/aspects/powers/ordo/holy.json create mode 100644 src/main/resources/data/aspects/powers/ordo/holy_light.json create mode 100644 src/main/resources/data/aspects/powers/ordo/lightborn.json create mode 100644 src/main/resources/data/aspects/powers/ordo/night_aversion.json create mode 100644 src/main/resources/data/aspects/powers/ordo/ordo_team.json create mode 100644 src/main/resources/data/aspects/powers/ordo/positive_influence.json create mode 100644 src/main/resources/data/aspects/powers/ordo/solus/decay.json create mode 100644 src/main/resources/data/aspects/powers/ordo/solus/fire_resistance.json create mode 100644 src/main/resources/data/aspects/powers/ordo/solus/solus_primary.json create mode 100644 src/main/resources/data/aspects/powers/ordo/solus/solus_secondary.json create mode 100644 src/main/resources/data/aspects/powers/ordo/solus/sun_bar.json create mode 100644 src/main/resources/data/aspects/powers/ordo/solus/sunbaked.json create mode 100644 src/main/resources/data/aspects/powers/perditio/day_aversion.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/full_moon.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/invisibility.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/luna_primary.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/luna_secondary.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/nightwalker.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/wither_immunity.json create mode 100644 src/main/resources/data/aspects/powers/perditio/luna/wolf_affinity.json create mode 100644 src/main/resources/data/aspects/powers/perditio/night_strength.json create mode 100644 src/main/resources/data/aspects/powers/perditio/perditio_team.json create mode 100644 src/main/resources/data/aspects/powers/perditio/undead.json create mode 100644 src/main/resources/data/aspects/powers/perditio/void.json create mode 100644 src/main/resources/data/aspects/powers/perditio/voidborn.json create mode 100644 src/main/resources/data/aspects/powers/perditio/wither_damage.json create mode 100644 src/main/resources/data/aspects/powers/pyro/fire_immunity.json create mode 100644 src/main/resources/data/aspects/powers/pyro/flameborn.json create mode 100644 src/main/resources/data/aspects/powers/pyro/ignis/fire_strength.json create mode 100644 src/main/resources/data/aspects/powers/pyro/ignis/hot_biomes.json create mode 100644 src/main/resources/data/aspects/powers/pyro/ignis/ignis_primary.json create mode 100644 src/main/resources/data/aspects/powers/pyro/ignis/ignis_secondary.json create mode 100644 src/main/resources/data/aspects/powers/pyro/lava_vision.json create mode 100644 src/main/resources/data/aspects/powers/pyro/magmus/increased_health.json create mode 100644 src/main/resources/data/aspects/powers/pyro/magmus/knockback_resistance.json create mode 100644 src/main/resources/data/aspects/powers/pyro/magmus/magma_regen.json create mode 100644 src/main/resources/data/aspects/powers/pyro/magmus/magmus_primary.json create mode 100644 src/main/resources/data/aspects/powers/pyro/magmus/magmus_secondary.json create mode 100644 src/main/resources/data/aspects/powers/pyro/melt.json create mode 100644 src/main/resources/data/aspects/powers/pyro/nether_buff.json create mode 100644 src/main/resources/data/aspects/powers/pyro/pyro_team.json create mode 100644 src/main/resources/data/aspects/powers/pyro/water_damage.json diff --git a/.gitignore b/.gitignore index 82c69e4..1db5bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,3 @@ /saves Aspects.code-workspace .DS_Store -/libs -/remappedSrc \ No newline at end of file diff --git a/README.md b/README.md index 5a15f8e..5a30156 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ ## Introduction Aspects is an element-based Origins addon, meaning it expands the functions and features of the Origins mod created by Apace100. -Thank you to [AbyssDweller](https://github.com/AbyssDweller) and Perseus#0745 on Discord for help with fixing issues. :) ## Requirements @@ -11,8 +10,3 @@ Thank you to [AbyssDweller](https://github.com/AbyssDweller) and Perseus#0745 on - [Origins](https://www.curseforge.com/minecraft/mc-mods/origins) - [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds) -## Further Support -[https://discord.gg/p533EcFTSx](https://discord.gg/p533EcFTSx) - - - diff --git a/build.gradle b/build.gradle index ce30b9e..7158046 100644 --- a/build.gradle +++ b/build.gradle @@ -53,6 +53,10 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modApi("me.shedaniel.cloth:cloth-config-fabric:8.2.88") { + exclude(group: "net.fabricmc.fabric-api") + } + } processResources { @@ -64,7 +68,6 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. it.options.release = 17 } diff --git a/gradle.properties b/gradle.properties index bfbe6d0..752072a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ loader_version=0.14.9 fabric_version=0.60.0+1.19.2 # Mod Properties - mod_version = 1.0.7-1.19.x + mod_version = 1.0.8 maven_group = com.aspects archives_base_name = aspects diff --git a/remappedSrc/net/fabricmc/fishplex/Aspects.java b/remappedSrc/net/fabricmc/fishplex/Aspects.java new file mode 100644 index 0000000..919f082 --- /dev/null +++ b/remappedSrc/net/fabricmc/fishplex/Aspects.java @@ -0,0 +1,35 @@ +package net.fabricmc.fishplex; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class Aspects implements ModInitializer { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Item ANEMO_FEATHER = new Item(new FabricItemSettings()); + public static final Item PYRO_FIRE = new Item(new FabricItemSettings()); + public static final Item HYDRO_KELP = new Item(new FabricItemSettings()); + public static final Item GEO_DIAMOND = new Item(new FabricItemSettings()); + public static final Item ORDO_STAR = new Item(new FabricItemSettings()); + public static final Item PERDITIO_BONE = new Item(new FabricItemSettings()); + public static final Logger LOGGER = LogManager.getLogger("aspects"); + + @Override + public void onInitialize() { + Registry.register(Registry.ITEM, new Identifier("aspects", "anemo_feather"), ANEMO_FEATHER); + Registry.register(Registry.ITEM, new Identifier("aspects", "pyro_fire"), PYRO_FIRE); + Registry.register(Registry.ITEM, new Identifier("aspects", "hydro_kelp"), HYDRO_KELP); + Registry.register(Registry.ITEM, new Identifier("aspects", "geo_diamond"), GEO_DIAMOND); + Registry.register(Registry.ITEM, new Identifier("aspects", "ordo_star"), ORDO_STAR); + Registry.register(Registry.ITEM, new Identifier("aspects", "perditio_bone"), PERDITIO_BONE); + LOGGER.info("Hello from Aspects :D"); + + } +} diff --git a/remappedSrc/net/fabricmc/fishplex/mixin/AspectsMixin.java b/remappedSrc/net/fabricmc/fishplex/mixin/AspectsMixin.java new file mode 100644 index 0000000..9c269b0 --- /dev/null +++ b/remappedSrc/net/fabricmc/fishplex/mixin/AspectsMixin.java @@ -0,0 +1,16 @@ +package net.fabricmc.fishplex.mixin; + +import net.fabricmc.fishplex.Aspects; +import net.minecraft.client.gui.screen.TitleScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(TitleScreen.class) +public class AspectsMixin { + @Inject(at = @At("HEAD"), method = "init()V") + private void init(CallbackInfo info) { + Aspects.LOGGER.info("Hello from Aspects! :D"); + } +} diff --git a/src/main/java/net/fabricmc/fishplex/Aspects.java b/src/main/java/net/fabricmc/fishplex/Aspects.java index 919f082..04bad4e 100644 --- a/src/main/java/net/fabricmc/fishplex/Aspects.java +++ b/src/main/java/net/fabricmc/fishplex/Aspects.java @@ -29,7 +29,5 @@ public void onInitialize() { Registry.register(Registry.ITEM, new Identifier("aspects", "geo_diamond"), GEO_DIAMOND); Registry.register(Registry.ITEM, new Identifier("aspects", "ordo_star"), ORDO_STAR); Registry.register(Registry.ITEM, new Identifier("aspects", "perditio_bone"), PERDITIO_BONE); - LOGGER.info("Hello from Aspects :D"); - } } diff --git a/src/main/resources/aspects.mixins.json b/src/main/resources/aspects.mixins.json index 514b170..1f4dd34 100644 --- a/src/main/resources/aspects.mixins.json +++ b/src/main/resources/aspects.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "net.fabricmc.fishplex.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_16", "mixins": [ ], "client": [ diff --git a/src/main/resources/data/aspects/origin_layers/elements.json b/src/main/resources/data/aspects/origin_layers/elements.json index f87fc50..b8677d9 100644 --- a/src/main/resources/data/aspects/origin_layers/elements.json +++ b/src/main/resources/data/aspects/origin_layers/elements.json @@ -1,12 +1,12 @@ { "order": 0, "origins": [ - "aspects:anemo", - "aspects:hydro", - "aspects:geo", - "aspects:pyro", - "aspects:ordo", - "aspects:perditio", + "aspects:anemo_layers/anemo", + "aspects:hydro_layers/hydro", + "aspects:geo_layers/geo", + "aspects:pyro_layers/pyro", + "aspects:ordo_layers/ordo", + "aspects:perditio_layers/perditio", "aspects:vacuos" ], "name": "Aspect", diff --git a/src/main/resources/data/aspects/origin_layers/origins.json b/src/main/resources/data/aspects/origin_layers/origins.json index 0d80813..c1e8463 100644 --- a/src/main/resources/data/aspects/origin_layers/origins.json +++ b/src/main/resources/data/aspects/origin_layers/origins.json @@ -4,68 +4,68 @@ { "condition": { "type": "origins:origin", - "origin": "aspects:pyro", + "origin": "aspects:pyro_layers/pyro", "layer": "aspects:elements" }, "origins": [ - "aspects:pyro/magmus", - "aspects:pyro/ignis", + "aspects:pyro_layers/magmus", + "aspects:pyro_layers/ignis", "aspects:imp" ] }, { "condition": { "type": "origins:origin", - "origin": "aspects:hydro", + "origin": "aspects:hydro_layers/hydro", "layer": "aspects:elements" }, "origins": [ - "aspects:hydro/cryo", + "aspects:hydro_layers/cryo", "aspects:imp" ] }, { "condition": { "type":"origins:origin", - "origin":"aspects:anemo", + "origin":"aspects:anemo_layers/anemo", "layer":"aspects:elements" }, "origins": [ - "aspects:anemo/tempus", - "aspects:anemo/avis", + "aspects:anemo_layers/tempus", + "aspects:anemo_layers/avis", "aspects:imp" ] }, { "condition": { "type":"origins:origin", - "origin":"aspects:geo", + "origin":"aspects:geo_layers/geo", "layer":"aspects:elements" }, "origins": [ - "aspects:geo/dendro", + "aspects:geo_layers/dendro", "aspects:imp" ] }, { "condition": { "type":"origins:origin", - "origin":"aspects:perditio", + "origin":"aspects:perditio_layers/perditio", "layer":"aspects:elements" }, "origins": [ - "aspects:perditio/luna", + "aspects:perditio_layers/luna", "aspects:imp" ] }, { "condition": { "type":"origins:origin", - "origin":"aspects:ordo", + "origin":"aspects:ordo_layers/ordo", "layer":"aspects:elements" }, "origins": [ - "aspects:ordo/solus", + "aspects:ordo_layers/solus", "aspects:imp" ] } diff --git a/src/main/resources/data/aspects/origins/anemo_layers/anemo.json b/src/main/resources/data/aspects/origins/anemo_layers/anemo.json new file mode 100644 index 0000000..c6b661a --- /dev/null +++ b/src/main/resources/data/aspects/origins/anemo_layers/anemo.json @@ -0,0 +1,16 @@ +{ + "powers": [ + "aspects:anemo/fleet_footed", + "aspects:anemo/negate_fall_damage", + "aspects:anemo/chained", + "aspects:anemo/windborn", + "aspects:anemo/wise", + "aspects:start", + "aspects:anemo/anemo_team" + ], + "icon": { + "item": "aspects:anemo_feather" + }, + "name": "§aAnemo", + "description": "A lone wind whipped explorer sits perched on a cliff side, a thick book fit for an academic's mind in hand. There they sit, absently watching as the pages detailing the grand discoveries of generations comprised of scholars and adventurers flip from the movement of the wind." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/anemo_layers/tempus.json b/src/main/resources/data/aspects/origins/anemo_layers/tempus.json new file mode 100644 index 0000000..94f27f5 --- /dev/null +++ b/src/main/resources/data/aspects/origins/anemo_layers/tempus.json @@ -0,0 +1,14 @@ +{ + "powers": [ + "aspects:anemo/tempus/fleet", + "aspects:anemo/tempus/storm_strength", + "aspects:anemo/tempus/lightning_immunity", + "aspects:anemo/tempus/tempus_primary", + "aspects:anemo/tempus/tempus_secondary" + ], + "icon": { + "item": "minecraft:amethyst_shard" + }, + "name": "§5Tempus", + "description": "Dark minds crackling and churning, Tempus types have always been misunderstood by the rest. Crowds gather and watch in horror as lightning explodes across the sky, thunder booming from above. The Tempus user stands unafraid at the top of the hill, watching as a storm approaches the horizon." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/geo_layers/dendro.json b/src/main/resources/data/aspects/origins/geo_layers/dendro.json new file mode 100644 index 0000000..51e1b3f --- /dev/null +++ b/src/main/resources/data/aspects/origins/geo_layers/dendro.json @@ -0,0 +1,16 @@ +{ + "powers": [ + "aspects:geo/dendro/flower_regen", + "aspects:geo/dendro/poison_resistance", + "aspects:geo/dendro/grass_speed", + "aspects:geo/dendro/dendro_primary", + "aspects:geo/dendro/dendro_secondary", + "aspects:geo/dendro/golem_expire", + "aspects:geo/dendro/golem_resource" + ], + "icon": { + "item": "minecraft:wheat_seeds" + }, + "name": "§2Dendro", + "description": "Lovers of art, nature and all things beautiful, the Dendro people inhabit local forests. Every now and then, a brave adventurer will venture into the woods to witness their song." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/geo_layers/geo.json b/src/main/resources/data/aspects/origins/geo_layers/geo.json new file mode 100644 index 0000000..048ebb9 --- /dev/null +++ b/src/main/resources/data/aspects/origins/geo_layers/geo.json @@ -0,0 +1,14 @@ +{ + "powers": [ + "aspects:geo/resistance", + "aspects:geo/explosion_damage", + "aspects:geo/earthborn", + "aspects:start", + "aspects:geo/geo_team" + ], + "icon": { + "item": "aspects:geo_diamond" + }, + "name": "§eGeo", + "description": "Tales are told of the rock-people who used to dwell deep below the land, feeding off ore and slate where they could. Creatures of massive size, the people of Geo are more than a legend." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/hydro_layers/altum.json b/src/main/resources/data/aspects/origins/hydro_layers/altum.json new file mode 100644 index 0000000..f700fb6 --- /dev/null +++ b/src/main/resources/data/aspects/origins/hydro_layers/altum.json @@ -0,0 +1,10 @@ +{ + "powers": [ + + ], + "icon": { + "item": "minecraft:snowball" + }, + "name": "§bAltum", + "description": "Far from any source of illumination, darkly lit faces reflect off the spectral ocean's view. The deep sea shines in the eyes of the Altum." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/hydro_layers/cryo.json b/src/main/resources/data/aspects/origins/hydro_layers/cryo.json new file mode 100644 index 0000000..7284351 --- /dev/null +++ b/src/main/resources/data/aspects/origins/hydro_layers/cryo.json @@ -0,0 +1,13 @@ +{ + "powers": [ + "aspects:hydro/cryo/cold_biomes", + "aspects:hydro/cryo/frost_walker", + "aspects:hydro/cryo/cryo_primary", + "aspects:hydro/cryo/cryo_secondary" + ], + "icon": { + "item": "minecraft:snowball" + }, + "name": "§bCryo", + "description": "A lone traveller drags their heels across the frozen lake, their sole companion the red-collared friend trailing behind. Ever-persistent and unbothered by the shards of glass ripping at their skin, the Cryo users are said to be the most resilient of their Aspect." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/hydro_layers/hydro.json b/src/main/resources/data/aspects/origins/hydro_layers/hydro.json new file mode 100644 index 0000000..cba7192 --- /dev/null +++ b/src/main/resources/data/aspects/origins/hydro_layers/hydro.json @@ -0,0 +1,15 @@ +{ + "powers": [ + "aspects:hydro/water_breathing", + "aspects:hydro/constitution", + "aspects:hydro/fire_damage", + "aspects:hydro/waterborn", + "aspects:hydro/hydro_team", + "aspects:start" + ], + "icon": { + "item": "aspects:hydro_kelp" + }, + "name": "§9Hydro", + "description": "The siren song of the ever-changing Hydro in the depths is echoed throughout deep and shallow waters, whispered to the unlucky sailor lost at sea." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/ordo_layers/ordo.json b/src/main/resources/data/aspects/origins/ordo_layers/ordo.json new file mode 100644 index 0000000..02244d2 --- /dev/null +++ b/src/main/resources/data/aspects/origins/ordo_layers/ordo.json @@ -0,0 +1,17 @@ +{ + "powers": [ + "aspects:ordo/holy_light", + "aspects:ordo/positive_influence", + "aspects:ordo/darkness_damage", + "aspects:ordo/night_aversion", + "aspects:ordo/holy", + "aspects:ordo/lightborn", + "aspects:start", + "aspects:ordo/ordo_team" + ], + "icon": { + "item": "aspects:ordo_star" + }, + "name": "Ordo", + "description": "Tales of old speak of mages and paladins with healing properties and the power of light in their palms, besting their foes and aiding allies in need." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/ordo_layers/solus.json b/src/main/resources/data/aspects/origins/ordo_layers/solus.json new file mode 100644 index 0000000..fcd5aec --- /dev/null +++ b/src/main/resources/data/aspects/origins/ordo_layers/solus.json @@ -0,0 +1,15 @@ +{ + "powers": [ + "aspects:ordo/solus/fire_resistance", + "aspects:ordo/solus/sunbaked", + "aspects:ordo/solus/sun_bar", + "aspects:ordo/solus/decay", + "aspects:ordo/solus/solus_primary", + "aspects:ordo/solus/solus_secondary" + ], + "icon": { + "item": "minecraft:sunflower" + }, + "name": "§6Solus", + "description": "Sons, daughters and children of the bright solar divinity themselves, Solus users hold the power of the universe's light within them." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/perditio_layers/luna.json b/src/main/resources/data/aspects/origins/perditio_layers/luna.json new file mode 100644 index 0000000..91494ee --- /dev/null +++ b/src/main/resources/data/aspects/origins/perditio_layers/luna.json @@ -0,0 +1,16 @@ +{ + "powers": [ + "aspects:perditio/luna/full_moon", + "aspects:perditio/luna/nightwalker", + "aspects:perditio/luna/wolf_affinity", + "aspects:perditio/luna/invisibility", + "aspects:perditio/luna/wither_immunity", + "aspects:perditio/luna/luna_primary", + "aspects:perditio/luna/luna_secondary" + ], + "icon": { + "item": "minecraft:lily_of_the_valley" + }, + "name": "§7Luna", + "description": "The Luna users are beings of such beauty that it is perceived by the magicless as the result of the blood of the otherworldly." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/perditio_layers/perditio.json b/src/main/resources/data/aspects/origins/perditio_layers/perditio.json new file mode 100644 index 0000000..88c5ae5 --- /dev/null +++ b/src/main/resources/data/aspects/origins/perditio_layers/perditio.json @@ -0,0 +1,17 @@ +{ + "powers": [ + "aspects:perditio/void", + "aspects:perditio/undead", + "aspects:perditio/night_strength", + "aspects:perditio/day_aversion", + "aspects:perditio/voidborn", + "aspects:perditio/wither_damage", + "aspects:start", + "aspects:perditio/perditio_team" + ], + "icon": { + "item": "aspects:perditio_bone" + }, + "name": "§4Perditio", + "description": "Shrouded in darkness and mystery, Perditio users are said to have bones derived from the void, their ancestors the creators of the worlds." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/pyro_layers/ignis.json b/src/main/resources/data/aspects/origins/pyro_layers/ignis.json new file mode 100644 index 0000000..81c1bf4 --- /dev/null +++ b/src/main/resources/data/aspects/origins/pyro_layers/ignis.json @@ -0,0 +1,13 @@ +{ + "powers": [ + "aspects:pyro/ignis/hot_biomes", + "aspects:pyro/ignis/fire_strength", + "aspects:pyro/ignis/ignis_primary", + "aspects:pyro/ignis/ignis_secondary" + ], + "icon": { + "item": "minecraft:fire_charge" + }, + "name": "§6Ignis", + "description": "The true power of flame is revealed in the core of bright, destructive fires that rack the evergreen forests, the simmering airwaves of the driest deserts, and in the hands of the Ignis users." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/pyro_layers/magmus.json b/src/main/resources/data/aspects/origins/pyro_layers/magmus.json new file mode 100644 index 0000000..ab7666d --- /dev/null +++ b/src/main/resources/data/aspects/origins/pyro_layers/magmus.json @@ -0,0 +1,14 @@ +{ + "powers": [ + "aspects:pyro/magmus/magma_regen", + "aspects:pyro/magmus/knockback_resistance", + "aspects:pyro/magmus/increased_health", + "aspects:pyro/magmus/magmus_primary", + "aspects:pyro/magmus/magmus_secondary" + ], + "icon": { + "item": "minecraft:magma_block" + }, + "name": "§4Magmus", + "description": "Juggernauts - the strongest of warriors, the steadfast heroes, the blood of the Magmus users whisper of the oozing lava slipping between ancient volcanic rock." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/origins/pyro_layers/pyro.json b/src/main/resources/data/aspects/origins/pyro_layers/pyro.json new file mode 100644 index 0000000..2e8e428 --- /dev/null +++ b/src/main/resources/data/aspects/origins/pyro_layers/pyro.json @@ -0,0 +1,17 @@ +{ + "powers": [ + "aspects:pyro/fire_immunity", + "aspects:pyro/nether_buff", + "aspects:pyro/water_damage", + "aspects:pyro/lava_vision", + "aspects:pyro/flameborn", + "aspects:start", + "aspects:pyro/melt", + "aspects:pyro/pyro_team" + ], + "icon": { + "item": "aspects:pyro_fire" + }, + "name": "§cPyro", + "description": "A new adventure awaits the seasoned traveller, one who seems to never tire of the endless paths they travel. After a long day of trudging through harsh terrain, a seat by the warm light of the campfire is most comforting." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/anemo_team.json b/src/main/resources/data/aspects/powers/anemo/anemo_team.json new file mode 100644 index 0000000..a997b0c --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/anemo_team.json @@ -0,0 +1,15 @@ +{ + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:execute_command", + "command": "team join Anemo @s", + "permission_level": 4 + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "team leave @s", + "permission_level": 4 + }, + "execute_chosen_when_orb": true, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/chained.json b/src/main/resources/data/aspects/powers/anemo/chained.json new file mode 100644 index 0000000..1c07e12 --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/chained.json @@ -0,0 +1,23 @@ +{ + "type": "origins:conditioned_attribute", + "condition": { + "type": "origins:exposed_to_sky", + "inverted": "true" + }, + "modifier": + { + "attribute": "minecraft:generic.attack_speed", + "operation": "addition", + "value": -0.2 + }, + + "tick_rate": 20, + "name":"Chained", + "description":"When you aren't exposed to the sky, you become slower in combat. / -0.02 off your attack speed when not exposed to skylight", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/fleet_footed.json b/src/main/resources/data/aspects/powers/anemo/fleet_footed.json new file mode 100644 index 0000000..20fa64f --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/fleet_footed.json @@ -0,0 +1,16 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.movement_speed", + "value": 0.02, + "operation": "addition" + }, + "name":"Fleet Footed", + "description":"You are quicker on your feet than others. / +0.02 movement speed", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/negate_fall_damage.json b/src/main/resources/data/aspects/powers/anemo/negate_fall_damage.json new file mode 100644 index 0000000..9adf412 --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/negate_fall_damage.json @@ -0,0 +1,16 @@ +{ + "type": "origins:invulnerability", + "damage_condition": { + "type": "origins:name", + "name": "fall" + }, + "cooldown": 1, + "name":"Fall Damage Invulnerability", + "description":"Fall damage does not affect you.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/tempus/fleet.json b/src/main/resources/data/aspects/powers/anemo/tempus/fleet.json new file mode 100644 index 0000000..7a7a5ab --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/tempus/fleet.json @@ -0,0 +1,17 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.movement_speed", + "value": 0.01, + "operation": "addition" + }, + "name":"Like Lightning", + "description":"You are an even faster variant of Anemo. / +0.01 movement speed", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] + +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/tempus/lightning_immunity.json b/src/main/resources/data/aspects/powers/anemo/tempus/lightning_immunity.json new file mode 100644 index 0000000..e99b566 --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/tempus/lightning_immunity.json @@ -0,0 +1,12 @@ +{ + "type": "origins:modify_damage_taken", + "damage_condition": { + "type": "origins:name", + "name":"lightningBolt" + }, + "modifier": { + "operation": "addition", + "value": -1000 + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/tempus/storm_strength.json b/src/main/resources/data/aspects/powers/anemo/tempus/storm_strength.json new file mode 100644 index 0000000..de48e0a --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/tempus/storm_strength.json @@ -0,0 +1,21 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 0.3 + }, + "tick_rate": 10, + "condition": { + "type": "origins:predicate", + "predicate": "aspects:weather/is_thunderstorm" + }, + "name":"Storm Strength", + "description":"During thunderstorms, you do significantly more damage to others. / +0.3 attack damage during storms", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/tempus/tempus_primary.json b/src/main/resources/data/aspects/powers/anemo/tempus/tempus_primary.json new file mode 100644 index 0000000..ec87ccc --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/tempus/tempus_primary.json @@ -0,0 +1,35 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:raycast", + "distance": 8, + "block": true, + "entity": true, + "shape_type": "visual", + "fluid_handling": "any", + "bientity_action": { + "type": "origins:target_action", + "action":{ + "type":"origins:damage", + "amount": 2, + "source": { + "name": "lightningBolt", + "bypasses_armor": false + } + } + }, + "command_at_hit": "function aspects:lightning_bolt", + "command_step": 1 + }, + "cooldown": 500, + "hud_render": { + "should_render": true, + "sprite_location": "origins:textures/gui/resource_bar.png", + "bar_index":2, + "inverted":true + }, + "key":"key.origins.ternary_active", + "name":"Lightning Bolt", + "description":"When pressing the [Ternary] key, you will summon a lightning bolt at the block or entity you are looking at, doing damage and setting nearby blocks on fire as well." + + } diff --git a/src/main/resources/data/aspects/powers/anemo/tempus/tempus_secondary.json b/src/main/resources/data/aspects/powers/anemo/tempus/tempus_secondary.json new file mode 100644 index 0000000..7f36672 --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/tempus/tempus_secondary.json @@ -0,0 +1,58 @@ + +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:area_of_effect", + "radius": 10, + "bientity_action": { + "type": "origins:target_action", + "action": { + "type": "origins:add_velocity", + "z": 5 + } + }, + "bientity_condition": { + "type": "origins:can_see" + } + }, + { + "type": "origins:area_of_effect", + "radius": 10, + "bientity_action": { + "type": "origins:damage", + "amount": 3, + "source": { + "name": "lightningBolt", + "bypasses_armor": true + } + }, + "bientity_condition": { + "type": "origins:can_see" + } + + }, + { + "type": "origins:heal", + "amount": 6 + }, + { + "type":"origins:execute_command", + "command":"function aspects:raging_gales" + } +] +}, + "hud_render": { + "should_render": true, + "inverted":true, + "sprite_location": "origins:textures/gui/resource_bar.png", + "bar_index":3 + + }, + "key": "key.origins.quaternary_active", + "cooldown": 700, + "name":"Raging Gales", + "description":"As your secondary ability, you can push enemies away by a few blocks whilst healing yourself and dealing damage to others with your [Quaternary] key." + } \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/windborn.json b/src/main/resources/data/aspects/powers/anemo/windborn.json new file mode 100644 index 0000000..7e63e94 --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/windborn.json @@ -0,0 +1,6 @@ +{ + "type": "origins:particle", + "particle": "minecraft:cloud", + "frequency": 80, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/anemo/wise.json b/src/main/resources/data/aspects/powers/anemo/wise.json new file mode 100644 index 0000000..983a388 --- /dev/null +++ b/src/main/resources/data/aspects/powers/anemo/wise.json @@ -0,0 +1,15 @@ +{ + "type": "origins:modify_xp_gain", + "modifier": { + "operation": "multiply_base", + "value": 0.2 + }, + "name":"Wise", + "description":"Anemo is also the aspect of wisdom and knowledge. You gain a little more experience upon picking up an experience orb. Way to go, smarty pants.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/dendro/dendro_primary.json b/src/main/resources/data/aspects/powers/geo/dendro/dendro_primary.json new file mode 100644 index 0000000..8fbda14 --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/dendro_primary.json @@ -0,0 +1,23 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:spawn_effect_cloud", + "radius": 10.0, + "wait_time": 40, + "effect": { + "effect": "minecraft:poison", + "amplifier": 2, + "duration": 20 + } + }, + "cooldown": 500, + "hud_render": { + "should_render": true, + "sprite_location":"origins:textures/gui/resource_bar.png", + "bar_index":8, + "inverted":true + }, + "key":"key.origins.ternary_active", + "name":"Poison Cloud", + "description":"As your primary ability, you can spawn a poison cloud around you with your [Ternary] key." +} diff --git a/src/main/resources/data/aspects/powers/geo/dendro/dendro_secondary.json b/src/main/resources/data/aspects/powers/geo/dendro/dendro_secondary.json new file mode 100644 index 0000000..f50479c --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/dendro_secondary.json @@ -0,0 +1,28 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:execute_command", + "command": "function aspects:summon_golems" + }, + { + "type": "origins:trigger_cooldown", + "power": "aspects:geo/dendro/golem_resource" + } + ] + }, + "cooldown": 3400, + "hud_render": { + "should_render": true, + "inverted": true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index":8 + }, + "key": { + "key": "key.origins.quaternary_active" + }, + "name":"Friendly Assistance", + "description":"As your secondary ability, you can spawn in a temporary (20 second lifespan) Iron Golem to help you fight off enemies with your [Quaternary] key." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/dendro/flower_regen.json b/src/main/resources/data/aspects/powers/geo/dendro/flower_regen.json new file mode 100644 index 0000000..4da498c --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/flower_regen.json @@ -0,0 +1,34 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type":"origins:and", + "actions": [ + { + "type": "origins:heal", + "amount": 0.3 + } + ] + }, + "interval": 20, + "condition": { + "type": "origins:block_in_radius", + "block_condition": { + "type": "origins:in_tag", + "tag": "minecraft:flowers" + }, + "radius": 5, + "shape": "cube", + "comparison": ">=", + "compare_to": 1 + }, + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ], + "name":"Flower Regeneration", + "description":"You are healed when you are nearby flowers. / +0.3 health every 20 ticks" + } + + diff --git a/src/main/resources/data/aspects/powers/geo/dendro/golem_expire.json b/src/main/resources/data/aspects/powers/geo/dendro/golem_expire.json new file mode 100644 index 0000000..370b62b --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/golem_expire.json @@ -0,0 +1,16 @@ +{ + "type": "origins:action_over_time", + + "entity_action": { + "type": "origins:execute_command", + "command": "function aspects:expire" + }, + "interval": 20, + "condition": { + "type": "origins:resource", + "resource": "aspects:geo/dendro/golem_resource", + "comparison": "<=", + "compare_to": 1 + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/dendro/golem_resource.json b/src/main/resources/data/aspects/powers/geo/dendro/golem_resource.json new file mode 100644 index 0000000..eb5c23c --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/golem_resource.json @@ -0,0 +1,8 @@ +{ + "type": "origins:cooldown", + "cooldown": 400, + "hud_render": { + "should_render": false + }, + "hidden": true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/dendro/grass_speed.json b/src/main/resources/data/aspects/powers/geo/dendro/grass_speed.json new file mode 100644 index 0000000..08958e2 --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/grass_speed.json @@ -0,0 +1,24 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.movement_speed", + "operation": "addition", + "value": 0.02 + }, + "tick_rate": 20, + "condition": { + "type": "origins:on_block", + "block_condition": { + "type": "origins:block", + "block": "minecraft:grass_block" + } + }, + "name":"Grassfeet", + "description":"When on grass blocks, your movement speed is increased. / +0.02 movement speed when touching grass", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/dendro/poison_resistance.json b/src/main/resources/data/aspects/powers/geo/dendro/poison_resistance.json new file mode 100644 index 0000000..796ff0b --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/dendro/poison_resistance.json @@ -0,0 +1,21 @@ +{ + "type": "origins:action_when_damage_taken", + "entity_action": { + "type": "origins:clear_effect", + "effect": "minecraft:poison" + }, + "damage_condition": { + "type": "origins:name", + "name":"magic" + }, + "cooldown": 0.2, + "name":"Poison Ivy", + "hidden": true, + "description":"Poison damage doesn't hurt as much.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/earthborn.json b/src/main/resources/data/aspects/powers/geo/earthborn.json new file mode 100644 index 0000000..d6f9572 --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/earthborn.json @@ -0,0 +1,6 @@ +{ + "type": "origins:particle", + "particle": "minecraft:falling_spore_blossom", + "frequency": 80, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/explosion_damage.json b/src/main/resources/data/aspects/powers/geo/explosion_damage.json new file mode 100644 index 0000000..b9348cf --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/explosion_damage.json @@ -0,0 +1,24 @@ +{ + "type": "origins:action_when_damage_taken", + "entity_action": { + "type": "origins:damage", + "amount": 2, + "source": { + "name": "explosion", + "bypasses_armor": false + } + }, + "damage_condition": { + "type": "origins:name", + "name": "inWall" + }, + "cooldown": 1, + "name":"Crystalline", + "description":"You take more damage from explosions. / +2 explosion damage", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/geo_team.json b/src/main/resources/data/aspects/powers/geo/geo_team.json new file mode 100644 index 0000000..28020be --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/geo_team.json @@ -0,0 +1,15 @@ +{ + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:execute_command", + "command": "team join Geo @s", + "permission_level": 4 + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "team leave @s", + "permission_level": 4 + }, + "execute_chosen_when_orb": true, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/geo/resistance.json b/src/main/resources/data/aspects/powers/geo/resistance.json new file mode 100644 index 0000000..2ec9939 --- /dev/null +++ b/src/main/resources/data/aspects/powers/geo/resistance.json @@ -0,0 +1,16 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.armor", + "value": 4, + "operation": "addition" + }, + "name":"Resistance", + "description":"You have more natural armour points than other aspect users. / +4 armor points", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/constitution.json b/src/main/resources/data/aspects/powers/hydro/constitution.json new file mode 100644 index 0000000..f89f111 --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/constitution.json @@ -0,0 +1,17 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.max_health", + "value": 2, + "operation": "addition" + }, + + "name":"Watery Persistence", + "description":"You have slightly increased max health. / +2 max base health", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/cryo/cold_biomes.json b/src/main/resources/data/aspects/powers/hydro/cryo/cold_biomes.json new file mode 100644 index 0000000..e916ff7 --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/cryo/cold_biomes.json @@ -0,0 +1,25 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 0.4 + }, +"tick_rate": 20, +"condition": { + "type": "origins:biome", + "condition": { + "type": "origins:temperature", + "comparison": "<=", + "compare_to": 0.05 + } + }, + "name":"Cold Affinity", + "description":"You get a decent attack boost in cold biomes. (N)ice ;) / +0.4 attack damage when in cold (<=0.05 temperature) biomes", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/cryo/cryo_primary.json b/src/main/resources/data/aspects/powers/hydro/cryo/cryo_primary.json new file mode 100644 index 0000000..87fa88b --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/cryo/cryo_primary.json @@ -0,0 +1,38 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:raycast", + "distance": 8, + "block": true, + "entity": true, + "shape_type": "visual", + "fluid_handling": "any", + "bientity_action": { + "type": "origins:target_action", + "action":{ + "type":"origins:damage", + "amount": 8, + "source": { + "name": "freeze", + "bypasses_armor": false + } + } + }, + "command_at_hit": "function aspects:freeze_focus", + "command_along_ray": "function aspects:freeze_ray", + "command_step": 1, + "command_along_ray_only_on_hit": false + }, + "cooldown": 240, + "hud_render": { + "should_render": true, + "sprite_location": "origins:textures/gui/resource_bar.png", + "bar_index":5, + "inverted":true + }, + "key":"key.origins.ternary_active", + "name":"Freeze Focus", + "description":"When pressing the [Ternary] key, you will fire a ray of ice in the direction you are facing that will deal eight points of freeze damage to the target and freeze over water on impact." + + } + diff --git a/src/main/resources/data/aspects/powers/hydro/cryo/cryo_secondary.json b/src/main/resources/data/aspects/powers/hydro/cryo/cryo_secondary.json new file mode 100644 index 0000000..bb54c3b --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/cryo/cryo_secondary.json @@ -0,0 +1,42 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type":"origins:and", + "actions": [ + { + "type": "origins:area_of_effect", + "radius": 8, + "bientity_action": { + "type": "origins:damage", + "amount": 6, + "source": { + "name": "freeze", + "bypasses_armor": true + } + }, + "bientity_condition": { + "type": "origins:can_see" + } +}, + { +"type":"origins:execute_command", +"command":"function aspects:icy_aura" + + } +] + }, + + "cooldown": 800, + "hud_render": { + "should_render": true, + "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_02.png", + "bar_index":8, + "inverted":true + }, + "key": { + "key": "key.origins.quaternary_active" + }, + "name":"Icy Aura", + "description":"With your [Quaternary] key, you can deal six points of freeze damage to those around you within an 8 block radius." + +} diff --git a/src/main/resources/data/aspects/powers/hydro/cryo/frost_walker.json b/src/main/resources/data/aspects/powers/hydro/cryo/frost_walker.json new file mode 100644 index 0000000..7f70599 --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/cryo/frost_walker.json @@ -0,0 +1,41 @@ +{ + "type": "origins:action_over_time", + "interval": 5, + "entity_action": { + "type": "origins:if_else", + "condition": { + "type": "origins:or", + "inverted":true, + "conditions": [ + { + "type": "origins:sneaking" + + }, + { + "type": "origins:fall_distance", + "comparison": ">=", + "compare_to": 4 + }, + { + "type": "origins:in_block", + "block_condition": { + "type": "origins:block", + "block": "minecraft:water" + } + } + ] + }, + "if_action": { + "type":"origins:execute_command", + "command": "fill ~1 ~-1 ~1 ~-1 ~-1 ~-1 minecraft:frosted_ice replace water[level=0]" + } +}, +"name":"Frost Walker", +"description":"Water beneath you will turn into ice. Deactivates when you are falling, sneaking, or under the water.", +"badges": [ + { + "sprite": "aspects:textures/gui/badge/equal.png", + "text": "Neutral" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/fire_damage.json b/src/main/resources/data/aspects/powers/hydro/fire_damage.json new file mode 100644 index 0000000..f2240e9 --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/fire_damage.json @@ -0,0 +1,24 @@ +{ + "type": "origins:action_when_damage_taken", + "entity_action": { + "type": "origins:damage", + "amount": 2, + "source": { + "name": "onFire", + "fire": true, + "bypasses_armor": true + } + }, + "damage_condition": { + "type": "origins:fire" + }, + "cooldown": 20, + "name":"Evaporation", + "description":"Fire hurts you a lot more than it normally would. / +2 fire damage when bursting into flames", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/hydro_team.json b/src/main/resources/data/aspects/powers/hydro/hydro_team.json new file mode 100644 index 0000000..3d1270f --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/hydro_team.json @@ -0,0 +1,15 @@ +{ + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:execute_command", + "command": "team join Hydro @s", + "permission_level": 4 + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "team leave @s", + "permission_level": 4 + }, + "execute_chosen_when_orb": true, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/water_breathing.json b/src/main/resources/data/aspects/powers/hydro/water_breathing.json new file mode 100644 index 0000000..1ab345d --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/water_breathing.json @@ -0,0 +1,21 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:gain_air", + "value": 200 + }, + "interval": 20, + "condition": { + "type": "origins:submerged_in", + "fluid": "minecraft:water" + }, + +"name":"Gills", +"description":"You can breathe underwater.", +"badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/hydro/waterborn.json b/src/main/resources/data/aspects/powers/hydro/waterborn.json new file mode 100644 index 0000000..4322da3 --- /dev/null +++ b/src/main/resources/data/aspects/powers/hydro/waterborn.json @@ -0,0 +1,6 @@ +{ + "type": "origins:particle", + "particle": "minecraft:bubble", + "frequency": 80, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/darkness_damage.json b/src/main/resources/data/aspects/powers/ordo/darkness_damage.json new file mode 100644 index 0000000..f4f9cce --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/darkness_damage.json @@ -0,0 +1,23 @@ +{ + "type": "origins:action_when_damage_taken", + "entity_action": { + "type": "origins:damage", + "amount": 2, + "source": { + "name": "generic" + } + }, + "damage_condition": { + "type": "origins:name", + "name":"wither" + }, + "cooldown": 1, + "name":"Darkness Damage", + "description":"You take more damage from wither damage. / +2 generic damage when taking wither damage", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/holy.json b/src/main/resources/data/aspects/powers/ordo/holy.json new file mode 100644 index 0000000..d839d5c --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/holy.json @@ -0,0 +1,24 @@ +{ + "type": "origins:action_on_hit", + "bientity_action": { + "type": "origins:damage", + "amount": 3, + "source": { + "name": "generic", + "bypasses_armor": true + } + }, + "condition": { + "type": "origins:entity_group", + "group": "undead" + }, + "name":"Holy Affinity", + "description":"You do more damage against the undead. / +3 generic damage against the undead", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] + +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/holy_light.json b/src/main/resources/data/aspects/powers/ordo/holy_light.json new file mode 100644 index 0000000..d36a064 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/holy_light.json @@ -0,0 +1,20 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 1 + }, + "tick_rate": 20, + "condition": { + "type": "origins:daytime" + }, + "name":"Holy Light", + "description":"You do more damage during the daytime. / +1 attack damage during day", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/lightborn.json b/src/main/resources/data/aspects/powers/ordo/lightborn.json new file mode 100644 index 0000000..3d87e2b --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/lightborn.json @@ -0,0 +1,6 @@ +{ + "type": "origins:particle", + "particle": "minecraft:enchant", + "frequency": 20, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/night_aversion.json b/src/main/resources/data/aspects/powers/ordo/night_aversion.json new file mode 100644 index 0000000..57985f2 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/night_aversion.json @@ -0,0 +1,21 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": -0.05 + }, + "tick_rate": 20, + "condition": { + "type": "origins:daytime", + "inverted":true + }, + "name":"Night Aversion", + "description":"You are weakened at nighttime. / -0.05 attack damage at night", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/ordo_team.json b/src/main/resources/data/aspects/powers/ordo/ordo_team.json new file mode 100644 index 0000000..855051e --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/ordo_team.json @@ -0,0 +1,15 @@ +{ + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:execute_command", + "command": "team join Ordo @s", + "permission_level": 4 + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "team leave @s", + "permission_level": 4 + }, + "execute_chosen_when_orb": true, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/positive_influence.json b/src/main/resources/data/aspects/powers/ordo/positive_influence.json new file mode 100644 index 0000000..72578ab --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/positive_influence.json @@ -0,0 +1,27 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:chance", + "chance": 0.05, + "action": { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:hero_of_the_village", + "duration": 12000, + "amplifier": 0 + } + } + }, + "interval": 24000, + "condition": { + "type": "origins:daytime" + }, + "name":"Positive Influence", + "description":"As every natural morning passes, you have a small chance to gain the Hero of the Village effect.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/solus/decay.json b/src/main/resources/data/aspects/powers/ordo/solus/decay.json new file mode 100644 index 0000000..3a9b493 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/solus/decay.json @@ -0,0 +1,10 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:change_resource", + "resource": "aspects:ordo/solus/sun_bar", + "change": -0.5 + }, + "interval": 150, + "hidden":true + } \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/solus/fire_resistance.json b/src/main/resources/data/aspects/powers/ordo/solus/fire_resistance.json new file mode 100644 index 0000000..dd78f04 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/solus/fire_resistance.json @@ -0,0 +1,17 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:fire_resistance", + "duration": 200, + "amplifier": 0 + } + }, + "interval": 20, + "condition": { + "type": "origins:on_fire" + }, + "name":"Heat of the Sun", + "description":"Fire doesn't hurt as much. / Base level Fire Resistance applied when on fire" +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/solus/solus_primary.json b/src/main/resources/data/aspects/powers/ordo/solus/solus_primary.json new file mode 100644 index 0000000..82e9b06 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/solus/solus_primary.json @@ -0,0 +1,29 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:area_of_effect", + "radius": 40, + "bientity_action": { + "type": "origins:target_action", + "action": { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:glowing", + "duration": 100, + "amplifier": 0, + "show_particles":false + } + } + } + }, + "cooldown": 600, + "hud_render": { + "should_render": true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index":10, + "inverted":true + }, + "key":"key.origins.ternary_active", + "name":"Solar Revealing", + "description":"All entities within a 40 block radius of you will be highlighted with your primary ability [Ternary] key. What an eyesore." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/solus/solus_secondary.json b/src/main/resources/data/aspects/powers/ordo/solus/solus_secondary.json new file mode 100644 index 0000000..42227c3 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/solus/solus_secondary.json @@ -0,0 +1,59 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type":"origins:and", + "actions":[ + { + "type":"origins:execute_command", + "command":"function aspects:icarus" + }, + { + "type": "origins:area_of_effect", + "radius": 15, + "bientity_action": { + "type":"origins:and", + "actions":[ + { + "type": "origins:target_action", + "action": { + "type": "origins:damage", + "amount": 10, + "source": { + "name": "onFire", + "bypasses_armor": true, + "fire":true + } + } + }, + { + "type": "origins:target_action", + "action": { + "type": "origins:add_velocity", + "y": 1 + } + }, + { + "type": "origins:target_action", + "action": { + "type": "origins:set_on_fire", + "duration": 6 + } + } + ] +} + } + ] +}, + "cooldown": 800, + "hud_render": { + "should_render": true, + "inverted":true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index":20 + }, + "key": { + "key": "key.origins.quaternary_active" + }, + "name":"Icarus", + "description":"Send all surrounding enemies multiple blocks into the air, and then light them on fire with your [Quaternary] key. They shouldn't have strayed so close to the sun!" +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/solus/sun_bar.json b/src/main/resources/data/aspects/powers/ordo/solus/sun_bar.json new file mode 100644 index 0000000..6f21548 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/solus/sun_bar.json @@ -0,0 +1,29 @@ +{ + "type": "origins:resource", + "min": 0, + "max": 30, + "hud_render": { + "should_render": true, + "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_01.png", + "condition": { + "type": "origins:resource", + "resource": "aspects:sun_bar", + "comparison": ">", + "compare_to": 0 + } + }, + "max_action": { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:strength", + "show_particles":false, + "duration": 999999999, + "amplifier": 1 + } + }, + "min_action": { + "type": "origins:clear_effect", + "effect": "minecraft:strength" + }, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/ordo/solus/sunbaked.json b/src/main/resources/data/aspects/powers/ordo/solus/sunbaked.json new file mode 100644 index 0000000..6c15445 --- /dev/null +++ b/src/main/resources/data/aspects/powers/ordo/solus/sunbaked.json @@ -0,0 +1,37 @@ +{ + "type":"origins:multiple", + "addition":{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:change_resource", + "resource": "aspects:ordo/solus/sun_bar", + "change": 1 + }, + "interval": 25, + "condition": { + "type": "origins:exposed_to_sun" + } +}, + "subtraction":{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:change_resource", + "resource": "aspects:ordo/solus/sun_bar", + "change": -1 + }, + "interval": 50, + "condition": { + "type": "origins:brightness", + "comparison": "<", + "compare_to": 0.5 + } + }, + "name":"Sunbaked", + "description":"When you stay in the sun for long enough, you will become strengthened.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/day_aversion.json b/src/main/resources/data/aspects/powers/perditio/day_aversion.json new file mode 100644 index 0000000..bb96cc7 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/day_aversion.json @@ -0,0 +1,20 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": -0.03 + }, + "tick_rate": 20, + "condition": { + "type": "origins:daytime" + }, + "name":"Day Aversion", + "description":"You are weakened at daytime. / -0.03 attack damage during daytime", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/luna/full_moon.json b/src/main/resources/data/aspects/powers/perditio/luna/full_moon.json new file mode 100644 index 0000000..fbfb5ad --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/full_moon.json @@ -0,0 +1,31 @@ +{ + "type": "origins:multiple", + "speed": { + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.movement_speed", + "operation": "addition", + "value": 0.05 + } + }, + "strength":{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 2 + } + }, + "condition": { + "type": "origins:predicate", + "predicate": "moon-phase:at_night/is_full_moon" + }, + "name":"Full Moon", + "description":"On full moons, your speed and strength are greatly increased. / +0.05 movement speed & +2 attack damage during full moons", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} diff --git a/src/main/resources/data/aspects/powers/perditio/luna/invisibility.json b/src/main/resources/data/aspects/powers/perditio/luna/invisibility.json new file mode 100644 index 0000000..dccef92 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/invisibility.json @@ -0,0 +1,9 @@ +{ + "type": "origins:invisibility", + "render_armor": false, + "condition": { + "type": "origins:power_active", + "power": "aspects:perditio/luna/luna_primary" + }, + "hidden":true + } \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/luna/luna_primary.json b/src/main/resources/data/aspects/powers/perditio/luna/luna_primary.json new file mode 100644 index 0000000..56fa353 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/luna_primary.json @@ -0,0 +1,11 @@ +{ + "type": "origins:toggle", + "active_by_default": false, + "key": { + "key":"key.origins.ternary_active", + "continuous": false + }, + "retain_state": false, + "name":"Invisibility", + "description":"As your primary ability, you can toggle invisibility with your [Ternary] key." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/luna/luna_secondary.json b/src/main/resources/data/aspects/powers/perditio/luna/luna_secondary.json new file mode 100644 index 0000000..f672942 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/luna_secondary.json @@ -0,0 +1,25 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type": "origins:spawn_effect_cloud", + "radius": 10.0, + "wait_time": 40, + "effect": { + "effect": "minecraft:wither", + "amplifier": 3, + "duration": 20 + } + }, + "cooldown": 1400, + "hud_render": { + "should_render": true, + "inverted":true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index":9 + }, + "key": { + "key": "key.origins.quaternary_active" + }, + "name":"Dark Shroud", + "description":"With your secondary ability, you can disperse a shroud of wither with your [Quaternary] key." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/luna/nightwalker.json b/src/main/resources/data/aspects/powers/perditio/luna/nightwalker.json new file mode 100644 index 0000000..27e7db6 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/nightwalker.json @@ -0,0 +1,21 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.movement_speed", + "operation": "addition", + "value": 0.005 + }, + "tick_rate": 20, + "condition": { + "type": "origins:daytime", + "inverted": true + }, + "name":"Nightwalker", + "description":"Your movement speed is increased at night. / +0.005 movement speed at night", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/luna/wither_immunity.json b/src/main/resources/data/aspects/powers/perditio/luna/wither_immunity.json new file mode 100644 index 0000000..e8d8e7d --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/wither_immunity.json @@ -0,0 +1,21 @@ +{ + "type": "origins:action_when_damage_taken", + "entity_action": { + "type": "origins:clear_effect", + "effect": "minecraft:wither" + }, + "damage_condition": { + "type": "origins:name", + "name":"wither" + }, + "cooldown": 0.2, + "name":"Withered Away", + "description":"You have wither resistance.", + "hidden": true, + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/luna/wolf_affinity.json b/src/main/resources/data/aspects/powers/perditio/luna/wolf_affinity.json new file mode 100644 index 0000000..40bab11 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/luna/wolf_affinity.json @@ -0,0 +1,30 @@ +{ + "type": "origins:multiple", + "tame_wolf": + { + "type": "origins:action_on_entity_use", + "bientity_action": + { + "type": "origins:tame" + }, + "condition": + { + "type": "origins:sneaking" + }, + "bientity_condition": { + "type": "origins:target_condition", + "condition": { + "type": "origins:entity_type", + "entity_type": "minecraft:wolf" + } + } + }, + "name":"Wolf Affinity", + "description":"You can now tame wolves using shift + use. Weird, huh?", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/night_strength.json b/src/main/resources/data/aspects/powers/perditio/night_strength.json new file mode 100644 index 0000000..eb42fa9 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/night_strength.json @@ -0,0 +1,21 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 1 + }, + "tick_rate": 20, + "condition": { + "type": "origins:daytime", + "inverted": true + }, + "name":"Night Strength", + "description":"You do more damage during the nighttime. / +1 attack damage at night", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/perditio_team.json b/src/main/resources/data/aspects/powers/perditio/perditio_team.json new file mode 100644 index 0000000..4f62404 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/perditio_team.json @@ -0,0 +1,15 @@ +{ + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:execute_command", + "command": "team join Perditio @s", + "permission_level": 4 + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "team leave @s", + "permission_level": 4 + }, + "execute_chosen_when_orb": true, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/undead.json b/src/main/resources/data/aspects/powers/perditio/undead.json new file mode 100644 index 0000000..21676f3 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/undead.json @@ -0,0 +1,12 @@ +{ + "type": "origins:entity_group", + "group": "undead", + "name":"Undead", + "description":"You are undead. You don't burn in the sun, but you have the other side effects of being deceased, such as reversed health and damage potions.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/equal.png", + "text": "Neutral" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/void.json b/src/main/resources/data/aspects/powers/perditio/void.json new file mode 100644 index 0000000..7e6ef13 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/void.json @@ -0,0 +1,37 @@ +{ + "type": "origins:action_when_damage_taken", + "entity_action": { + "type": "origins:and", + "actions":[ +{ + "type": "origins:execute_command", + "command": "execute as @s in minecraft:overworld run teleport 0 190 0" + }, +{ + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:slow_falling", + "duration": 400, + "amplifier": 2 + } +} + + + ] + + + }, + "damage_condition": { + "type": "origins:name", + "name":"outOfWorld" + }, + "cooldown": 1, + "name":"Void Teleport", + "description":"When you fall into the void, you will be teleported high up into the air in the center of the overworld regardless of the dimension you are currently in.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/equal.png", + "text": "Neutral" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/voidborn.json b/src/main/resources/data/aspects/powers/perditio/voidborn.json new file mode 100644 index 0000000..f7115fc --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/voidborn.json @@ -0,0 +1,6 @@ +{ + "type": "origins:particle", + "particle": "minecraft:mycelium", + "frequency": 20, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/perditio/wither_damage.json b/src/main/resources/data/aspects/powers/perditio/wither_damage.json new file mode 100644 index 0000000..0a39e66 --- /dev/null +++ b/src/main/resources/data/aspects/powers/perditio/wither_damage.json @@ -0,0 +1,19 @@ +{ + "type": "origins:action_on_hit", + "bientity_action": { + "type": "origins:damage", + "amount": 0.05, + "source": { + "name": "wither", + "bypasses_armor": true + } + }, + "name":"Wither", + "description":"Your attacks do wither damage. / +0.05 wither damage every hit", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/fire_immunity.json b/src/main/resources/data/aspects/powers/pyro/fire_immunity.json new file mode 100644 index 0000000..843265c --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/fire_immunity.json @@ -0,0 +1,19 @@ +{ + "type": "origins:modify_damage_taken", + "damage_condition": { + "type": "origins:fire" + }, + "modifier": { + "operation": "multiply_total", + "value": -1 + }, + + "name":"Fire Immunity", + "description":"You are immune to fire damage.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/flameborn.json b/src/main/resources/data/aspects/powers/pyro/flameborn.json new file mode 100644 index 0000000..93acce3 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/flameborn.json @@ -0,0 +1,6 @@ +{ + "type": "origins:particle", + "particle": "minecraft:flame", + "frequency": 80, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/ignis/fire_strength.json b/src/main/resources/data/aspects/powers/pyro/ignis/fire_strength.json new file mode 100644 index 0000000..39ab4b2 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/ignis/fire_strength.json @@ -0,0 +1,21 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 3 + }, + "tick_rate": 20, + "condition": { + "type": "origins:on_fire" + }, + + "name":"Heated Strength", + "description":"Being on fire grants you an attack damage bonus. / +3 generic damage when on fire", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} diff --git a/src/main/resources/data/aspects/powers/pyro/ignis/hot_biomes.json b/src/main/resources/data/aspects/powers/pyro/ignis/hot_biomes.json new file mode 100644 index 0000000..30d1dd2 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/ignis/hot_biomes.json @@ -0,0 +1,25 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 0.4 + }, +"tick_rate": 20, +"condition": { + "type": "origins:biome", + "condition": { + "type": "origins:temperature", + "comparison": ">=", + "compare_to": 1.0 + } + }, + "name":"Heat Affinity", + "description":"You get a decent attack boost in hot biomes. / +0.4 attack damage in hot biomes", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/ignis/ignis_primary.json b/src/main/resources/data/aspects/powers/pyro/ignis/ignis_primary.json new file mode 100644 index 0000000..92083fe --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/ignis/ignis_primary.json @@ -0,0 +1,25 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type":"origins:and", + "actions": [ + { + "type": "origins:set_on_fire", + "duration": 15 + }, + { + "type":"origins:execute_command", + "command":"function aspects:fire_light" + } + ], + "cooldown": 500, + "hud_render": { + "should_render": true, + "bar_index": 7, + "inverted":true + } +}, +"key":"key.origins.ternary_active", + "name":"Ignition", + "description":"Using your primary active ability, you can light yourself on fire for a short duration, granting you an attack buff with your [Ternary] key." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/ignis/ignis_secondary.json b/src/main/resources/data/aspects/powers/pyro/ignis/ignis_secondary.json new file mode 100644 index 0000000..5904934 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/ignis/ignis_secondary.json @@ -0,0 +1,37 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type":"origins:and", + "actions": [ + { + "type": "origins:area_of_effect", + "radius": 10, + "bientity_action": { + "type": "origins:target_action", + "action": { + "type": "origins:set_on_fire", + "duration": 5 + } + }, + "bientity_condition": { + "type": "origins:can_see" + } + }, + { + "type":"origins:execute_command", + "command":"function aspects:ring_of_fire" + + } + ] + }, + "hud_render": { + "inverted":true, + "should_render": true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index":15 + }, + "key": "key.origins.quaternary_active", + "cooldown": 900, + "name":"Ring of Fire", + "description":"As your secondary ability, you can light entities around you on fire for a few seconds with your [Quaternary] key." +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/lava_vision.json b/src/main/resources/data/aspects/powers/pyro/lava_vision.json new file mode 100644 index 0000000..298cd4d --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/lava_vision.json @@ -0,0 +1,6 @@ +{ + "type": "origins:lava_vision", + "s": 0, + "v": 15, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/magmus/increased_health.json b/src/main/resources/data/aspects/powers/pyro/magmus/increased_health.json new file mode 100644 index 0000000..6338f16 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/magmus/increased_health.json @@ -0,0 +1,10 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.max_health", + "value": 4, + "operation": "addition" + }, + "name":"Lavablood", + "description":"Your max health is significantly increased. / +4 health points" +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/magmus/knockback_resistance.json b/src/main/resources/data/aspects/powers/pyro/magmus/knockback_resistance.json new file mode 100644 index 0000000..3d2bfd5 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/magmus/knockback_resistance.json @@ -0,0 +1,17 @@ +{ + "type": "origins:attribute", + "modifier": { + "name": "Knockback Resistance", + "attribute": "minecraft:generic.knockback_resistance", + "value": 10, + "operation": "addition" + }, + "name":"Stable Footing", + "description":"Knockback doesn't bother you. / +10 knockback resistance", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/magmus/magma_regen.json b/src/main/resources/data/aspects/powers/pyro/magmus/magma_regen.json new file mode 100644 index 0000000..03bb8fd --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/magmus/magma_regen.json @@ -0,0 +1,23 @@ +{ + "type": "origins:action_over_time", + "entity_action": { + "type": "origins:heal", + "amount": 1 + }, + "interval": 20, + "condition": { + "type": "origins:on_block", + "block_condition": { + "type": "origins:block", + "block": "minecraft:magma_block" + } + }, + "name":"Back to the Source", + "description":"As a being of magma, standing on magma blocks gives you regeneration. / +1 health every 20 ticks", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} diff --git a/src/main/resources/data/aspects/powers/pyro/magmus/magmus_primary.json b/src/main/resources/data/aspects/powers/pyro/magmus/magmus_primary.json new file mode 100644 index 0000000..ff85558 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/magmus/magmus_primary.json @@ -0,0 +1,30 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type":"origins:and", + "actions":[ + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:strength", + "duration": 400, + "amplifier": 3 + } + }, + { + "type":"origins:execute_command", + "command":"function aspects:magma_resistance" + } + ] + }, + "key": "key.origins.ternary_active", + "cooldown": 800, + "name":"Molten Fists", + "description":"As your primary ability, you can grant yourself an amplified strength effect with the [Ternary] key. / Strength 3 for 400 ticks", + "hud_render": { + "inverted":true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png", + "bar_index":5, + "should_render": true + } +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/magmus/magmus_secondary.json b/src/main/resources/data/aspects/powers/pyro/magmus/magmus_secondary.json new file mode 100644 index 0000000..59fd1d0 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/magmus/magmus_secondary.json @@ -0,0 +1,30 @@ +{ + "type": "origins:active_self", + "entity_action": { + "type":"origins:and", + "actions":[ + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:resistance", + "duration": 700, + "amplifier": 3 + } + }, + { + "type":"origins:execute_command", + "command":"function aspects:magma_resistance" + } + ] + }, + "key": "key.origins.quaternary_active", + "cooldown": 1400, + "name":"Magmaskin", + "description":"With your secondary ability [Quaternary] key, you may grant yourself a highly amplified resistance effect. / Resistance 3 for 700 ticks", + "hud_render": { + "inverted":true, + "sprite_location":"origins:textures/gui/community/huang/resource_bar_01.png", + "bar_index":7, + "should_render": true + } +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/melt.json b/src/main/resources/data/aspects/powers/pyro/melt.json new file mode 100644 index 0000000..b46d5f5 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/melt.json @@ -0,0 +1,44 @@ +{ + "type":"origins:multiple", + "ice":{ + "type": "origins:action_over_time", + "interval": 5, + "entity_action": { + "type": "origins:if_else", + "condition": { + "inverted":true, + "type": "origins:sneaking" + + }, + "if_action": { + "type":"origins:and", + "actions": [ + { + "type":"origins:execute_command", + "command": "fill ~1 ~-1 ~1 ~-1 ~-1 ~-1 water replace minecraft:frosted_ice" + }, + { + "type":"origins:execute_command", + "command": "fill ~1 ~-1 ~1 ~-1 ~-1 ~-1 air replace minecraft:snow" + }, + { + "type":"origins:execute_command", + "command": "fill ~1 ~-1 ~1 ~-1 ~-1 ~-1 water replace minecraft:ice" + }, + { + "type":"origins:execute_command", + "command": "fill ~1 ~1 ~1 ~1 ~1 ~1 air replace minecraft:snow" + } + ] + } + } + }, + "name":"Hot Feet", + "description":"Ice and snow underneath you will melt.", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/equal.png", + "text": "Neutral" + } + ] + } \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/nether_buff.json b/src/main/resources/data/aspects/powers/pyro/nether_buff.json new file mode 100644 index 0000000..852d862 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/nether_buff.json @@ -0,0 +1,23 @@ +{ + "type": "origins:conditioned_attribute", + "modifier": { + "attribute": "minecraft:generic.attack_damage", + "operation": "addition", + "value": 0.4 + }, +"condition": { + "type": "origins:biome", + "condition": { + "type": "origins:category", + "category": "nether" + } +}, +"name":"Homely Strength", +"description":"You do more damage whilst in the Nether. / +0.4 generic damage in the Nether", +"badges": [ + { + "sprite": "aspects:textures/gui/badge/check.png", + "text": "Positive" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/pyro_team.json b/src/main/resources/data/aspects/powers/pyro/pyro_team.json new file mode 100644 index 0000000..6e2c5e0 --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/pyro_team.json @@ -0,0 +1,15 @@ +{ + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:execute_command", + "command": "team join Pyro @s", + "permission_level": 4 + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "team leave @s", + "permission_level": 4 + }, + "execute_chosen_when_orb": true, + "hidden":true +} \ No newline at end of file diff --git a/src/main/resources/data/aspects/powers/pyro/water_damage.json b/src/main/resources/data/aspects/powers/pyro/water_damage.json new file mode 100644 index 0000000..2d28b5a --- /dev/null +++ b/src/main/resources/data/aspects/powers/pyro/water_damage.json @@ -0,0 +1,36 @@ +{ + "type": "origins:damage_over_time", + "interval": 40, + "onset_delay": 1, + "damage": 1, + "damage_easy": 1, + "damage_source": { + "name": "hurt_by_water", + "unblockable": true, + "bypasses_armor": true + }, + "protection_enchantment": "origins:water_protection", + "protection_effectiveness": 1.0, + "condition": { + "type": "origins:or", + "conditions": [ + { + "type": "origins:fluid_height", + "fluid": "minecraft:water", + "comparison": ">", + "compare_to": 0.0 + }, + { + "type": "origins:in_rain" + } + ] + }, + "name":"Water Damage", + "description":"When you touch water, you receive damage. / +1 damage every 40 ticks", + "badges": [ + { + "sprite": "aspects:textures/gui/badge/cross.png", + "text": "Negative" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fc29970..8c5829a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,9 +9,9 @@ "Fishplex" ], "contact": { - "homepage": "https://github.com/Fishplex/Aspects", - "sources": "https://github.com/Fishplex/Aspects", - "issues": "https://github.com/Fishplex/Aspects/issues" + "homepage": "https://github.com/missingbinary/Aspects", + "sources": "https://github.com/missingbinary/Aspects", + "issues": "https://github.com/missingbinary/Aspects/issues" }, "license": "CC0-1.0", @@ -30,9 +30,11 @@ "depends": { "fabricloader": ">=0.14.9", "fabric": "*", - "minecraft": "1.19.*", + "minecraft": "1.19.2", "java": ">=17", "extrakeybinds":"*", - "origins": ">=1.6.2" + "origins": ">=1.7.0" } + + }