From 5bb221ef90cc14182e15d5a1b7c25966384b3d56 Mon Sep 17 00:00:00 2001 From: LingASDJ <2735951230@qq.com> Date: Sun, 7 May 2023 22:02:29 +0800 Subject: [PATCH] Update 0.6.1.0 Beta5.36 --- build.gradle | 4 ++-- core/src/main/assets/messages/actors/actors.properties | 2 +- core/src/main/assets/messages/scenes/scenes.properties | 1 + .../shatteredpixeldungeon/actors/mobs/bosses/DCrystal.java | 2 +- .../shatteredpixeldungeon/items/Generator.java | 6 ++++-- .../shatteredpixel/shatteredpixeldungeon/items/Item.java | 2 +- .../shatteredpixeldungeon/levels/ColdChestBossLevel.java | 3 ++- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 30d38ef00..29a1cb58b 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ allprojects { appName = 'Magic Ling Pixel Dungeon' appPackageName = 'com.ansdomagiclingpixeldungeon.ling' - appVersionCode =800857 - appVersionName = '0.6.1.0-Beta5.35(P3)' + appVersionCode =800858 + appVersionName = '0.6.1.0-Beta5.36(P3)' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 160158850..52dd36aea 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -17,7 +17,7 @@ actors.mobs.bosses.dcrystal.desc=深蓝水晶将缓慢治愈宝箱之王，还 actors.mobs.bosses.tpdoor.name=神秘传送门 actors.mobs.bosses.tpdoor.desc=神秘传送门的力量与拟态王有着千丝万缕的联系，摧毁它也许能对衪造成伤害。 -actors.mobs.bosses.tpdoor.lowdamage=你对传送门造成的伤害太低了，或许需要更强的力量才能击破它。 +actors.mobs.bosses.tpdoor.lowdamage=你对传送门造成的伤害太低了，或许需要更强的力量才能击破它。（单次伤害至少20以上) actors.mobs.salamander.name=深蓝蝾螈 actors.mobs.salamander.desc=来自森林的小生物，由于下方的邪恶力量侵蚀，它们已经由温顺变得凶猛。\n它们锋利的尾巴能穿透敌人，它们十分的聪明，且极其灵活，必须趁其不备将之杀掉。 diff --git a/core/src/main/assets/messages/scenes/scenes.properties b/core/src/main/assets/messages/scenes/scenes.properties index 3d0d82779..5b5020649 100644 --- a/core/src/main/assets/messages/scenes/scenes.properties +++ b/core/src/main/assets/messages/scenes/scenes.properties @@ -196,6 +196,7 @@ scenes.gamenewsscene$articlebutton.desc=恭喜！！！\n你的游戏版本为 scenes.gamenewsscene$articlebutton.download=Π更新版本Π scenes.gamenewsscene$articlebutton.force_download=点我下载正版并关闭游戏 scenes.gamenewsscene$articlebutton.okay=继续游玩 +scenes.gamenewsscene$newsinfo.metered_network=当连接到一个流量计费的网络，比如移动数据时，为了保证你的话费，我们不会发送更新数据给你。\n\n请连接WIFI后再次尝试，现在可以点击下方继续游玩继续游戏。 scenes.rankingsscene.title=最高纪录 scenes.rankingsscene.total=游戏次数： diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DCrystal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DCrystal.java index d890007ce..e5336c7f0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DCrystal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DCrystal.java @@ -54,7 +54,7 @@ public class DCrystal extends Mob { } //困难模式+6血量 治疗血量翻倍 - boss.HP = Math.min(Dungeon.isDIFFICULTY(HARD)?boss.HP+6 : boss.HP + 3, boss.HT/2); + boss.HP = Math.min(Dungeon.isDIFFICULTY(HARD) ? boss.HP+6 : boss.HP + 3, boss.HT/2); if (boss.sprite.visible) boss.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); //不符合的情况下给予3回合激素涌动 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index 530e1ff54..605dcde80 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -145,6 +145,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.SkyShield; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Spear; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Sword; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WarHammer; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WashCrime; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Whip; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WornShortsword; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Bolas; @@ -396,10 +397,11 @@ public class Generator { WarHammer.class, Glaive.class, Greataxe.class, - Greatshield.class + Greatshield.class, + WashCrime.class }; - WEP_T5.probs = new float[]{ 1, 3, 2, 3, 2, 3}; + WEP_T5.probs = new float[]{ 1, 3, 2, 3, 2, 3,2}; WEP_T6.classes = new Class[]{ IceFishSword.class, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 51a627f5e..b96fb70c7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -73,8 +73,8 @@ public class Item implements Bundlable { public int icon = -1; //used as an identifier for items with randomized images public boolean stackable = false; - public int flasks; + public int flasks; protected int quantity = 1; public boolean dropsDownHeap = false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/ColdChestBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/ColdChestBossLevel.java index fff4582f0..d97572de3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/ColdChestBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/ColdChestBossLevel.java @@ -457,6 +457,8 @@ public class ColdChestBossLevel extends Level { if (pro == MAZE_START && boss.HP <= 300) { //动态修改整个房间 宝藏迷宫 changeMap(EndMap); + //在切换房间的时候立刻切换全新坐标 + setMapEnd(); Buff.affect(boss, ChampionEnemy.Halo.class); ScrollOfTeleportation.appear(boss,647); //玩家移动到初始位 @@ -526,7 +528,6 @@ public class ColdChestBossLevel extends Level { if (pro == VSYOU_START && boss.HP <= 100) { pro = WIN; Buff.detach(boss, ChampionEnemy.Halo.class); - setMapEnd(); } } }