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

v0.9.3a: invis now persists between equip/unequip with light cloak

Browse Source
This commit is contained in:
Evan Debenham 2021-06-11 22:03:39 -04:00
parent 2d8305ed5b
commit 3f4513aa0d
2 changed files with 8 additions and 10 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/Artifact.java
View File

@ -95,11 +95,6 @@ public class Artifact extends KindofMisc {
passiveBuff = null; passiveBuff = null;
} }
if (activeBuff != null){
activeBuff.detach();
activeBuff = null;
}
return true; return true;
} else { } else {

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

@ -110,7 +110,7 @@ public class CloakOfShadows extends Artifact {
@Override @Override
public void activate(Char ch){ public void activate(Char ch){
super.activate(ch); super.activate(ch);
if (activeBuff != null){ if (activeBuff != null && activeBuff.target == null){
activeBuff.attachTo(ch); activeBuff.attachTo(ch);
} }
} }
@ -118,8 +118,11 @@ public class CloakOfShadows extends Artifact {
@Override @Override
public boolean doUnequip(Hero hero, boolean collect, boolean single) { public boolean doUnequip(Hero hero, boolean collect, boolean single) {
if (super.doUnequip(hero, collect, single)){ if (super.doUnequip(hero, collect, single)){
if (hero.hasTalent(Talent.LIGHT_CLOAK)){ if (!collect || !hero.hasTalent(Talent.LIGHT_CLOAK)){
activate(hero); if (activeBuff != null){
activeBuff.detach();
activeBuff = null;
}
} }
return true; return true;
@ -147,7 +150,7 @@ public class CloakOfShadows extends Artifact {
passiveBuff.detach(); passiveBuff.detach();
passiveBuff = null; passiveBuff = null;
} }
if (activeBuff != null){ if (activeBuff != null && !isEquipped((Hero) activeBuff.target)){
activeBuff.detach(); activeBuff.detach();
activeBuff = null; activeBuff = null;
} }
@ -166,7 +169,7 @@ public class CloakOfShadows extends Artifact {
@Override @Override
public void charge(Hero target, float amount) { public void charge(Hero target, float amount) {
if (charge < chargeCap) { if (charge < chargeCap) {
if (!isEquipped(target)) amount *= target.pointsInTalent(Talent.LIGHT_CLOAK)/10f; if (!isEquipped(target)) amount *= 0.4f*target.pointsInTalent(Talent.LIGHT_CLOAK)/3f;
partialCharge += 0.25f*amount; partialCharge += 0.25f*amount;
if (partialCharge >= 1){ if (partialCharge >= 1){
partialCharge--; partialCharge--;