LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.1c: fixed various incorrect charging interactions with mystical energy

Browse Source
This commit is contained in:
Evan Debenham 2019-01-11 17:21:52 -05:00
parent 7dffe6bf23
commit 34d150d682
11 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java
View File

@ -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();
}
}
}

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java
View File

@ -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);

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
View File

@ -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();
}
}
}

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -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") );
}
}
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java
View File

@ -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();
}
}
}

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
View File

@ -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;
}
}
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java
View File

@ -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();
}
}
}

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java
View File

@ -48,6 +48,7 @@ public class MasterThievesArmband extends Artifact {
public void charge(Hero target) {
if (charge < chargeCap){
charge += 10;
updateQuickslot();
}
}

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java
View File

@ -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") );
}
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
View File

@ -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();
}
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java
View File

@ -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();
}
}
}