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

v2.0.0: adjusted deadly misstep, now works on disint traps too

Browse Source
This commit is contained in:
Evan Debenham
2022-11-14 14:55:45 -05:00
parent 28341e131d
commit 79771b82bc
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/assets/messages/misc/misc.properties
+1 -1
View File
@@ -65,7 +65,7 @@ badges$badge.death_from_friendly_magic.desc=Die to your own magical item
badges$badge.death_from_sacrifice.title=A Worthy Sacrifice badges$badge.death_from_sacrifice.title=A Worthy Sacrifice
badges$badge.death_from_sacrifice.desc=Die while next to sacrificial fire badges$badge.death_from_sacrifice.desc=Die while next to sacrificial fire
badges$badge.death_from_grim_trap.title=Deadly Misstep badges$badge.death_from_grim_trap.title=Deadly Misstep
badges$badge.death_from_grim_trap.desc=Die to a grim trap badges$badge.death_from_grim_trap.desc=Die to a grim or disintegration trap
badges$badge.death_from_all.title=Yet Another Sad Death badges$badge.death_from_all.title=Yet Another Sad Death
badges$badge.death_from_all.desc=Unlock all of the 'cause of death' badges badges$badge.death_from_all.desc=Unlock all of the 'cause of death' badges
badges$badge.boss_slain_1.title=Slime Janitor badges$badge.boss_slain_1.title=Slime Janitor
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+2 -2
View File
@@ -135,7 +135,7 @@ public class Badges {
BOSS_SLAIN_4 ( 78 ), BOSS_SLAIN_4 ( 78 ),
ALL_RINGS_IDENTIFIED ( 79 ), ALL_RINGS_IDENTIFIED ( 79 ),
ALL_ARTIFACTS_IDENTIFIED ( 80 ), ALL_ARTIFACTS_IDENTIFIED ( 80 ),
DEATH_FROM_GRIM_TRAP ( 81 ), DEATH_FROM_GRIM_TRAP ( 81 ), //also disintegration traps
VICTORY ( 82 ), VICTORY ( 82 ),
BOSS_CHALLENGE_1 ( 83 ), BOSS_CHALLENGE_1 ( 83 ),
BOSS_CHALLENGE_2 ( 84 ), BOSS_CHALLENGE_2 ( 84 ),
@@ -673,7 +673,7 @@ public class Badges {
validateDeathFromAll(); validateDeathFromAll();
} }
public static void validateDeathFromGrimTrap() { public static void validateDeathFromGrimOrDisintTrap() {
Badge badge = Badge.DEATH_FROM_GRIM_TRAP; Badge badge = Badge.DEATH_FROM_GRIM_TRAP;
local.add( badge ); local.add( badge );
displayBadge( badge ); displayBadge( badge );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
+2
View File
@@ -22,6 +22,7 @@
package com.shatteredpixel.shatteredpixeldungeon.levels.traps; package com.shatteredpixel.shatteredpixeldungeon.levels.traps;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -76,6 +77,7 @@ public class DisintegrationTrap extends Trap {
if (target == Dungeon.hero){ if (target == Dungeon.hero){
Hero hero = (Hero)target; Hero hero = (Hero)target;
if (!hero.isAlive()){ if (!hero.isAlive()){
Badges.validateDeathFromGrimOrDisintTrap();
Dungeon.fail( getClass() ); Dungeon.fail( getClass() );
GLog.n( Messages.get(this, "ondeath") ); GLog.n( Messages.get(this, "ondeath") );
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class GrimTrap extends Trap {
if (finalTarget == Dungeon.hero) { if (finalTarget == Dungeon.hero) {
Sample.INSTANCE.play(Assets.Sounds.CURSED); Sample.INSTANCE.play(Assets.Sounds.CURSED);
if (!finalTarget.isAlive()) { if (!finalTarget.isAlive()) {
Badges.validateDeathFromGrimTrap(); Badges.validateDeathFromGrimOrDisintTrap();
Dungeon.fail( GrimTrap.class ); Dungeon.fail( GrimTrap.class );
GLog.n( Messages.get(GrimTrap.class, "ondeath") ); GLog.n( Messages.get(GrimTrap.class, "ondeath") );
} }