diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java index bbe8491b5..96f6d5ed8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java @@ -91,6 +91,11 @@ public class AlchemistsToolkit extends Artifact { public void charge(Hero target) { if (charge < chargeCap){ partialCharge += 0.5f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java index 9f41c8238..bd1552bbf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java @@ -53,6 +53,7 @@ public class CapeOfThorns extends Artifact { public void charge(Hero target) { if (cooldown == 0) { charge += 4; + updateQuickslot(); } if (charge >= chargeCap){ target.buff(Thorns.class).proc(0, null, null); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 84c58a706..fd0e10818 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -139,6 +139,11 @@ public class CloakOfShadows extends Artifact { public void charge(Hero target) { if (charge < chargeCap) { partialCharge += 0.25f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 7112ccc22..a44282caf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -197,6 +197,15 @@ public class DriedRose extends Artifact { public void charge(Hero target) { if (ghost == null && charge < chargeCap){ partialCharge += 0.25f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + if (charge == chargeCap){ + partialCharge = 0f; + GLog.p( Messages.get(DriedRose.class, "charged") ); + } + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java index c4cca7745..6c839fa3d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java @@ -236,6 +236,11 @@ public class EtherealChains extends Artifact { int chargeTarget = 5+(level()*2); if (charge < chargeTarget*2){ partialCharge += 0.5f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 73a156b56..968a342a3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -128,6 +128,15 @@ public class HornOfPlenty extends Artifact { public void charge(Hero target) { if (charge < chargeCap){ partialCharge += 0.25f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + if (charge == chargeCap){ + GLog.p( Messages.get(HornOfPlenty.class, "full") ); + partialCharge = 0; + } + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index 427c7b5b1..7c1250186 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -278,6 +278,11 @@ public class LloydsBeacon extends Artifact { public void charge(Hero target) { if (charge < chargeCap){ partialCharge += 0.25f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java index 183286e0a..204b00e20 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java @@ -48,6 +48,7 @@ public class MasterThievesArmband extends Artifact { public void charge(Hero target) { if (charge < chargeCap){ charge += 10; + updateQuickslot(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index b3a537366..c0f713f58 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -106,7 +106,12 @@ public class TalismanOfForesight extends Artifact { @Override public void charge(Hero target) { if (charge < chargeCap){ - partialCharge += 4f; + charge += 4f; + if (charge >= chargeCap) { + charge = chargeCap; + partialCharge = 0; + GLog.p( Messages.get(this, "full_charge") ); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 4c36d029f..0c2166d7d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -141,6 +141,11 @@ public class TimekeepersHourglass extends Artifact { public void charge(Hero target) { if (charge < chargeCap){ partialCharge += 0.25f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index 2ec28a1b6..4d3deacfb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -175,6 +175,11 @@ public class UnstableSpellbook extends Artifact { public void charge(Hero target) { if (charge < chargeCap){ partialCharge += 0.1f; + if (partialCharge >= 1){ + partialCharge--; + charge++; + updateQuickslot(); + } } }