konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.4.0: fixed friendly fire badge unlocking from chaos elementals

Browse Source
This commit is contained in:
Evan Debenham
2022-08-23 13:17:06 -04:00
parent 8e86641620
commit 9b84674042
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java
+3 -2
View File
@@ -66,6 +66,7 @@ import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.shatteredpixel.shatteredpixeldungeon.plants.Swiftthistle; import com.shatteredpixel.shatteredpixeldungeon.plants.Swiftthistle;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.BadgesList;
import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
import com.shatteredpixel.shatteredpixeldungeon.ui.TargetHealthIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.TargetHealthIndicator;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -223,12 +224,12 @@ public class CursedWand {
if (toDamage == Dungeon.hero){ if (toDamage == Dungeon.hero){
Sample.INSTANCE.play(Assets.Sounds.CURSED); Sample.INSTANCE.play(Assets.Sounds.CURSED);
if (!toDamage.isAlive()) { if (!toDamage.isAlive()) {
if (origin != null) { if (user == Dungeon.hero && origin != null) {
Badges.validateDeathFromFriendlyMagic(); Badges.validateDeathFromFriendlyMagic();
Dungeon.fail( origin.getClass() ); Dungeon.fail( origin.getClass() );
GLog.n( Messages.get( CursedWand.class, "ondeath", origin.name() ) ); GLog.n( Messages.get( CursedWand.class, "ondeath", origin.name() ) );
} else { } else {
Badges.validateDeathFromFriendlyMagic(); Badges.validateDeathFromEnemyMagic();
Dungeon.fail( toHeal.getClass() ); Dungeon.fail( toHeal.getClass() );
} }
} }