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

Merge pull request #38 from zxcPandora/test2

Browse Source 
BUG fixed
This commit is contained in:
JDSA Ling 2023-09-30 23:20:58 +08:00 committed by GitHub
commit db3326416d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java
View File

@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AllyBuff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Dread; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Dread;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Haste; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Haste;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Levitation;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
@ -54,7 +55,6 @@ public class CrystalMimic extends Mimic {
{ {
spriteClass = MimicSprite.Crystal.class; spriteClass = MimicSprite.Crystal.class;
flying = true;
FLEEING = new Fleeing(); FLEEING = new Fleeing();
} }
@ -107,6 +107,7 @@ public class CrystalMimic extends Mimic {
public void stopHiding(){ public void stopHiding(){
state = FLEEING; state = FLEEING;
Buff.affect(this, Levitation.class, Levitation.DURATION/2f);
//haste for 2 turns if attacking //haste for 2 turns if attacking
if (alignment == Alignment.NEUTRAL){ if (alignment == Alignment.NEUTRAL){
Buff.affect(this, Haste.class, 2f); Buff.affect(this, Haste.class, 2f);

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
View File

@ -870,7 +870,7 @@ public abstract class Mob extends Char {
PaswordBadges.loadGlobal(); PaswordBadges.loadGlobal();
List<PaswordBadges.Badge> passwordbadges = PaswordBadges.filtered( true ); List<PaswordBadges.Badge> passwordbadges = PaswordBadges.filtered( true );
if (global.contains( Badges.Badge.KILL_APPLE ) && global.contains( Badges.Badge.KILL_DM720 ) && if (global.contains( Badges.Badge.KILL_APPLE ) && global.contains( Badges.Badge.KILL_DM720 ) &&
global.contains( Badges.Badge.KILL_MG) && passwordbadges.contains(PaswordBadges.Badge.FIREGIRL) && passwordbadges.contains(PaswordBadges.Badge.DRAWF_HEAD) && passwordbadges.contains(PaswordBadges.Badge.SAKA_DIED)) { global.contains( Badges.Badge.KILL_MG) && passwordbadges.contains(PaswordBadges.Badge.FIREGIRL) && passwordbadges.contains(PaswordBadges.Badge.DRAWF_HEAD) && passwordbadges.contains(PaswordBadges.Badge.SAKA_DIED) && !passwordbadges.contains(PaswordBadges.Badge.SPICEALBOSS)) {
PaswordBadges.Badge badge = PaswordBadges.Badge.SPICEALBOSS; PaswordBadges.Badge badge = PaswordBadges.Badge.SPICEALBOSS;
PaswordBadges.displayBadge( badge ); PaswordBadges.displayBadge( badge );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/MIME.java
View File

@ -21,7 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.items.quest; package com.shatteredpixel.shatteredpixeldungeon.items.quest;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
@ -104,7 +103,6 @@ public class MIME extends Item {
public boolean doPickUp(Hero hero, int pos) { public boolean doPickUp(Hero hero, int pos) {
if (super.doPickUp(hero, pos)) { if (super.doPickUp(hero, pos)) {
if(!isMimeSupported){ if(!isMimeSupported){
Statistics.dimandchestmazeCollected++;
isMimeSupported = true; isMimeSupported = true;
} }
return true; return true;

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/ColdChestBossLevel.java
View File

@ -338,6 +338,7 @@ public class ColdChestBossLevel extends Level {
break; break;
} }
} }
Statistics.dimandchestmazeCollected++;
pro = START; pro = START;
break; break;
@ -395,6 +396,7 @@ public class ColdChestBossLevel extends Level {
} }
} }
} }
Statistics.dimandchestmazeCollected++;
switch (Random.NormalIntRange(0,8)){ switch (Random.NormalIntRange(0,8)){
case 0: case 0:
@ -488,6 +490,7 @@ public class ColdChestBossLevel extends Level {
} }
} }
} }
Statistics.dimandchestmazeCollected++;
//生成四个水晶，宝箱王持续回血 //生成四个水晶，宝箱王持续回血
for (int i : FourCrystal) { for (int i : FourCrystal) {

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
View File

@ -287,6 +287,7 @@ public class InterlevelScene extends PixelScene {
break; break;
case ANCITYBOSS: case ANCITYBOSS:
exboss(4); exboss(4);
break;
case GARDEN: case GARDEN:
exboss(5); exboss(5);
break; break;