Graah

Author: SammySemicolon

aseprite/malum_textures.ase

@@ -373,6 +373,8 @@
   "death.attack.voodoo.item": "%1$s had their soul shattered by %2$s using %3$s",
   "death.attack.voodoo_playerless": "%1$s had their soul shattered",
   "death.attack.voodoo_playerless.player": "%1$s had their soul shattered while trying to escape %2$s",
+  "death.attack.warlock_geas": "%1$s had their soul shattered by %2$s",
+  "death.attack.warlock_geas.item": "%1$s had their soul shattered by %2$s using %3$s",
   "effect.malum.aethers_charm": "Aether's Charm",
   "effect.malum.aethers_charm.description": "The heavens call for you, increasing jump height and decreasing gravity.",
   "effect.malum.anglers_lure": "Angler's Lure",
@@ -762,15 +764,14 @@
   "malum.effect.geas.fragile_reach_damage": "The Ruler's Hand Grips Tightly",
   "malum.effect.geas.gleeful_target": "Aliments, Blessings, Curses are Paused When Struck",
   "malum.effect.geas.gleeful_target_arcane_resonance": "Arcane Resonance Aids Stasis Duration",
+  "malum.effect.geas.healing_aura": "Healing is Shared with Nearby Creatures",
+  "malum.effect.geas.healing_aura_no_filter": "Shared Healing Heals All, Ally or Not",
   "malum.effect.geas.high_hunger_more_armor": "Being Well Fed Provides Extra Armor",
   "malum.effect.geas.hunger_as_withdrawal": "Addiction to Slaughter",
   "malum.effect.geas.incoming_fall_damage_auto_attack": "Taking Fall Damage Attacks Nearby Targets",
   "malum.effect.geas.inverted_heart": "Injuries, Emotions, Senses are Shared with Witnesses",
   "malum.effect.geas.inverted_heart_arcane_resonance": "Arcane Resonance Favors Influence Radius",
   "malum.effect.geas.knockback_also_accelerates": "High Momentum Amplifies Received Knockback",
-  "malum.effect.geas.last_stand": "Expiration, Demise, Entropy Is Made Lenient",
-  "malum.effect.geas.last_stand_arcane_resonance": "Arcane Resonance Aids Leniency",
-  "malum.effect.geas.last_stand_patient_death": "Death Comes For Us All... Unless",
   "malum.effect.geas.low_hunger_less_armor": "Starvation Halves Armor",
   "malum.effect.geas.malignant_crit_combo": "Malignant Deliverance Repeatedly Slashes Targets",
   "malum.effect.geas.malignant_crit_healing_overexertion": "Repeated Activations Gradually Diminish All Healing",
@@ -992,6 +993,8 @@
   "malum.gui.book.entry.pact_of_the_fortress.description": "[Fortress]",
   "malum.gui.book.entry.pact_of_the_high_priest": "Pact of The High Priest",
   "malum.gui.book.entry.pact_of_the_high_priest.description": "[High Priest]",
+  "malum.gui.book.entry.pact_of_the_lifeweaver": "Pact of The Lifeweaver",
+  "malum.gui.book.entry.pact_of_the_lifeweaver.description": "[Lifeweaver]",
   "malum.gui.book.entry.pact_of_the_lone_druid": "Pact of The Lone Druid",
   "malum.gui.book.entry.pact_of_the_lone_druid.description": "[Lone Druid]",
   "malum.gui.book.entry.pact_of_the_parasite": "Pact of The Parasite",
@@ -1010,8 +1013,8 @@
   "malum.gui.book.entry.pact_of_the_shield.description": "[Shield]",
   "malum.gui.book.entry.pact_of_the_skybreaker": "Pact of The Skybreaker",
   "malum.gui.book.entry.pact_of_the_skybreaker.description": "Heaven's Falling Down",
-  "malum.gui.book.entry.pact_of_the_sorcerer": "Pact of The Sorcerer",
-  "malum.gui.book.entry.pact_of_the_sorcerer.description": "[Sorcerer]",
+  "malum.gui.book.entry.pact_of_the_warlock": "Pact of The Warlock",
+  "malum.gui.book.entry.pact_of_the_warlock.description": "[Warlock]",
   "malum.gui.book.entry.pact_of_the_windswept": "Pact of The Windswept",
   "malum.gui.book.entry.pact_of_the_windswept.description": "[Windswept]",
   "malum.gui.book.entry.pact_of_wyrd_reconstruction": "Pact of Wyrd Reconstruction",
@@ -1116,6 +1119,7 @@
   "malum.gui.book.entry.page.headline.pact_of_the_continuing_shot": "Pact of The Continuing Shot",
   "malum.gui.book.entry.page.headline.pact_of_the_fortress": "Pact of The Fortress",
   "malum.gui.book.entry.page.headline.pact_of_the_high_priest": "Pact of The High Priest",
+  "malum.gui.book.entry.page.headline.pact_of_the_lifeweaver": "Pact of The Lifeweaver",
   "malum.gui.book.entry.page.headline.pact_of_the_lone_druid": "Pact of The Lone Druid",
   "malum.gui.book.entry.page.headline.pact_of_the_parasite": "Pact of The Parasite",
   "malum.gui.book.entry.page.headline.pact_of_the_profane_ascetic": "Pact of The Profane Ascetic",
@@ -1125,7 +1129,7 @@
   "malum.gui.book.entry.page.headline.pact_of_the_shattering_addict": "Pact of The Shattering Addict",
   "malum.gui.book.entry.page.headline.pact_of_the_shield": "Pact of The Shield",
   "malum.gui.book.entry.page.headline.pact_of_the_skybreaker": "Pact of The Skybreaker",
-  "malum.gui.book.entry.page.headline.pact_of_the_sorcerer": "Pact of The Sorcerer",
+  "malum.gui.book.entry.page.headline.pact_of_the_warlock": "Pact of The Warlock",
   "malum.gui.book.entry.page.headline.pact_of_the_windswept": "Pact of The Windswept",
   "malum.gui.book.entry.page.headline.pact_of_wyrd_reconstruction": "Pact of Wyrd Reconstruction",
   "malum.gui.book.entry.page.headline.primary_arcana.arcane": "Arcane Spirit",
@@ -1858,16 +1862,16 @@
   "malum.gui.crucible.attribute.weakness_tuning": "Weakness Tuning",
   "malum.gui.geas.aqueous_3": "Aqueous 3",
   "malum.gui.geas.aqueous_4": "Aqueous 4",
+  "malum.gui.geas.authority_of_the_gleeful_target": "Authority Of The Gleeful Target",
+  "malum.gui.geas.authority_of_the_gleeful_target.tooltip": "Take it all, let it never stop, more, and more, and more",
+  "malum.gui.geas.authority_of_the_inverted_heart": "Authority Of The Inverted Heart",
+  "malum.gui.geas.authority_of_the_inverted_heart.tooltip": "Your heart is the world, and the world beats",
   "malum.gui.geas.creative": "Creative Item for Debug Purposes.",
   "malum.gui.geas.creative_help": "Use To Swear/Forswear Geas Effect.",
   "malum.gui.geas.creed_of_the_blight_eater": "Creed Of The Blight Eater",
   "malum.gui.geas.creed_of_the_blight_eater.tooltip": "Mmmm... Blight... So Tasty..",
   "malum.gui.geas.infernal_1": "Infernal 1",
   "malum.gui.geas.infernal_2": "Infernal 2",
-  "malum.gui.geas.oath_of_the_gleeful_target": "Oath Of The Gleeful Target",
-  "malum.gui.geas.oath_of_the_gleeful_target.tooltip": "Take it all, let it never stop, more, and more, and more",
-  "malum.gui.geas.oath_of_the_inverted_heart": "Oath Of The Inverted Heart",
-  "malum.gui.geas.oath_of_the_inverted_heart.tooltip": "Your heart is the world, and the world beats",
   "malum.gui.geas.oath_of_the_overburdened_mind": "Oath Of The Overburdened Mind",
   "malum.gui.geas.oath_of_the_overburdened_mind.cons": "The Imbued Insight demands Careful Consideration\n -Staff Charge Recovery Rate is Reduced by Two Fifths",
   "malum.gui.geas.oath_of_the_overburdened_mind.pros": "A Capacity for Arcane Knowledge Imbued onto the Mind\n-Doubles Staff Charge Capacity",
@@ -1928,12 +1932,16 @@
   "malum.gui.geas.pact_of_the_high_priest.cons": "$m0.8/$That which you take is temporary.\n -Reach Effect enters Cooldown State when Struck by a Target\n -When Triggered, you are Struck with an Aqueous Lash",
   "malum.gui.geas.pact_of_the_high_priest.pros": "$m0.8/$Feign Control over the World.\n -Increases Block Reach by Two Fifths and Entity Reach by One Tenth",
   "malum.gui.geas.pact_of_the_high_priest.tooltip": "Become what they believe, so long as they believe",
+  "malum.gui.geas.pact_of_the_lifeweaver": "Pact Of The Lifeweaver",
+  "malum.gui.geas.pact_of_the_lifeweaver.cons": "All creatures are deserving of care.\n -Healing Aura targets Everything, Ally and Enemy alike",
+  "malum.gui.geas.pact_of_the_lifeweaver.pros": "A rare generosity, everything that you are you will share with others.\n -Healing also Heals Nearby Beings",
+  "malum.gui.geas.pact_of_the_lifeweaver.tooltip": "Give yourself to others",
   "malum.gui.geas.pact_of_the_lone_druid": "Pact Of The Lone Druid",
   "malum.gui.geas.pact_of_the_lone_druid.cons": "To be free is a comfort\n -Wearing any Armour Hurts You",
   "malum.gui.geas.pact_of_the_lone_druid.pros": "To be complete is to be free.\n -Each Empty Armor Slot grants Four Armor and Two Armor Toughness",
   "malum.gui.geas.pact_of_the_lone_druid.tooltip": "Shed your second skin",
   "malum.gui.geas.pact_of_the_parasite": "Pact Of The Parasite",
-  "malum.gui.geas.pact_of_the_parasite.cons": "Your fragility is still very much real. \n -Reduces Healing Received by Four Tenths",
+  "malum.gui.geas.pact_of_the_parasite.cons": "Your fragility is still very much real.\n -Reduces Healing Received by Four Tenths",
   "malum.gui.geas.pact_of_the_parasite.pros": "A surplus of confidence imbued onto the mind, your pain is only secondary.\n -Spirit Collection generates Absorption",
   "malum.gui.geas.pact_of_the_parasite.tooltip": "Why work for what others have",
   "malum.gui.geas.pact_of_the_profane_ascetic": "Pact Of The Profane Ascetic",
@@ -2316,6 +2324,7 @@
   "malum.subtitle.wavemaker_pulses": "Wavemaker pulses",
   "malum.subtitle.weavers_workbench_weaves": "Weavers workbench weaves",
   "malum.subtitle.weight_of_worlds_cuts": "Weight of worlds cuts",
+  "malum.subtitle.wicked_energy_bursts_forward": "Wicked energy bursts forward",
   "malum.subtitle.wyrd_reconstruction_reconstructs_body": "Wyrd reconstruction reconstructs body",
   "malum.waveform_artifice.guide.0": "Release Right Button To Confirm",
   "malum.waveform_artifice.guide.1": "Use Left Button To Modify Unit Type",

src/generated/resources/assets/malum/lang/en_us.json

@@ -2073,6 +2073,13 @@
     ],
     "subtitle": "malum.subtitle.weight_of_worlds_cuts"
   },
+  "wicked_energy_bursts_forward": {
+    "sounds": [
+      "malum:curiosities/geas/warlock_impact1",
+      "malum:curiosities/geas/warlock_impact2"
+    ],
+    "subtitle": "malum.subtitle.wicked_energy_bursts_forward"
+  },
   "wyrd_reconstruction_reconstructs_body": {
     "sounds": [
       "malum:curiosities/geas/wyrd_reconstruction1",

src/generated/resources/assets/malum/sounds.json

@@ -5,7 +5,7 @@
     "malum:void",
     "malum:karmic",
     "malum:tyrving",
-    "malum:inverted_heart_propagation",
-    "malum:inverted_heart_retaliation"
+    "malum:warlock_geas",
+    "#malum:soulwashing"
   ]
 }

src/generated/resources/data/c/tags/damage_type/is_magic.json

@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "warlock_geas",
+  "scaling": "when_caused_by_living_non_player"
+}

src/generated/resources/data/malum/damage_type/warlock_geas.json

@@ -6,6 +6,7 @@
     "#malum:soulwashing",
     "malum:voodoo_playerless",
     "malum:voodoo",
-    "malum:tyrving"
+    "malum:tyrving",
+    "malum:warlock_geas"
   ]
 }

src/generated/resources/data/malum/tags/damage_type/can_soul_shatter.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "malum:authority_of_the_gleeful_target",
+    "malum:authority_of_the_inverted_heart"
+  ]
+}

src/generated/resources/data/malum/tags/malum/geas_types/is_authority.json

@@ -1,12 +1,10 @@
 {
   "values": [
+    "malum:oath_of_unsighted_resistance",
+    "malum:oath_of_the_overkeen_eye",
+    "malum:oath_of_the_overeager_fist",
     "malum:oath_of_unmakers_disdain",
-    "malum:oath_of_the_inverted_heart",
-    "malum:oath_of_the_undiscerned_maw",
-    "malum:oath_of_the_gleeful_target",
     "malum:oath_of_the_overburdened_mind",
-    "malum:oath_of_the_overkeen_eye",
-    "malum:oath_of_unsighted_resistance",
-    "malum:oath_of_the_overeager_fist"
+    "malum:oath_of_the_undiscerned_maw"
   ]
 }

src/generated/resources/data/malum/tags/malum/geas_types/is_oath.json

@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.systems.*;
 import com.mojang.blaze3d.vertex.*;
-import com.mojang.datafixers.util.*;
 import com.sammy.malum.client.screen.codex.screens.*;
 import com.sammy.malum.common.item.spirit.*;
 import com.sammy.malum.core.systems.geas.*;
@@ -11,6 +10,7 @@
 import com.sammy.malum.core.systems.spirit.*;
 import com.sammy.malum.registry.client.*;
 import com.sammy.malum.registry.common.*;
+import com.sammy.malum.registry.common.tag.*;
 import net.minecraft.*;
 import net.minecraft.client.*;
 import net.minecraft.client.gui.*;
@@ -173,6 +173,7 @@ public static void renderGeasIcon(ResourceLocation location, PoseStack stack, Ge
             //Other spirits are brighter which leads to the effect looking extremely blurry since the outline is more significant than the main layer
             mainColor = ColorHelper.brighter(mainColor, 1);
         }
+
         builder.setColor(colorSupplier.get().getPrimaryColor()).multiplyColor(0.24f).setAlpha(0.6f);
         shaderInstance.safeGetUniform("Speed").set(2000f);
         renderTexture(location, stack, builder, x - 1, y, 0, 0, 0, textureWidth, textureHeight);

src/main/java/com/sammy/malum/client/screen/codex/ArcanaCodexHelper.java

@@ -1,4 +1,4 @@
-package com.sammy.malum.common.geas.oath;
+package com.sammy.malum.common.geas.authority;
 
 import com.google.common.collect.*;
 import com.sammy.malum.common.packets.geas.*;
@@ -20,12 +20,12 @@
 
 import java.util.function.*;
 
-public class GleefulTargetOath extends GeasEffect {
+public class GleefulTargetAuthority extends GeasEffect {
 
     public int lionsHeartDuration;
 
-    public GleefulTargetOath() {
-        super(MalumGeasEffectTypeRegistry.OATH_OF_THE_GLEEFUL_TARGET.get());
+    public GleefulTargetAuthority() {
+        super(MalumGeasEffectTypeRegistry.AUTHORITY_OF_THE_GLEEFUL_TARGET.get());
     }
 
     @Override
@@ -61,8 +61,8 @@ public void incomingDamageEvent(LivingDamageEvent.Pre event, LivingEntity attack
     }
 
     public static boolean pausePotionEffects(LivingEntity entity, MobEffectInstance instance) {
-        var geasEffect = GeasEffectHandler.getGeasEffect(entity, MalumGeasEffectTypeRegistry.OATH_OF_THE_GLEEFUL_TARGET);
-        if (geasEffect instanceof GleefulTargetOath effect) {
+        var geasEffect = GeasEffectHandler.getGeasEffect(entity, MalumGeasEffectTypeRegistry.AUTHORITY_OF_THE_GLEEFUL_TARGET);
+        if (geasEffect instanceof GleefulTargetAuthority effect) {
             if (effect.lionsHeartDuration > 0) {
                 final MobEffect type = instance.getEffect().value();
                 return !type.isInstantenous();