From dec3b2bd771f5434f26e2d8ba90770f4e08132bb Mon Sep 17 00:00:00 2001 From: LingASDJ <2735951230@qq.com> Date: Sat, 23 Sep 2023 03:00:53 +0800 Subject: [PATCH] Fixed Less Question --- core/src/main/assets/messages/misc/misc.properties | 4 ++-- core/src/main/assets/messages/windows/windows.properties | 3 +++ .../shatteredpixeldungeon/actors/buffs/ChampionEnemy.java | 5 +---- .../items/weapon/melee/legend/DiedCrossBow.java | 4 +--- .../shatteredpixel/shatteredpixeldungeon/windows/WndDLC.java | 5 ----- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/core/src/main/assets/messages/misc/misc.properties b/core/src/main/assets/messages/misc/misc.properties index 71bc74225..e5813f2e3 100644 --- a/core/src/main/assets/messages/misc/misc.properties +++ b/core/src/main/assets/messages/misc/misc.properties @@ -279,8 +279,8 @@ paswordbadges$badge.reset_day.desc=携带神秘生物的遗物离开地牢，完 paswordbadges$badge.take_item.title=宝藏探索者 paswordbadges$badge.take_item.desc=获得宝藏迷宫的三个隐藏宝藏，切记，对决不是拟态王的本意。 -paswordbadges$badge.allcs.title=履险蹈危 -paswordbadges$badge.allcs.desc=开启13项以上挑战通关，你就是传说中的救世主吗？ +paswordbadges$badge.allcsx.title=履险蹈危 +paswordbadges$badge.allcsx.desc=开启13项以上挑战通关，看来你已准备好踏上新的征途…… paswordbadges$badge.big_x.title=突变风波 paswordbadges$badge.big_x.desc=基因突变开启通关！你见证了地牢的突变体，同时也看见了玩火必自焚的道理……\n\n_奖励：0层随机护甲(四大基座上)_ diff --git a/core/src/main/assets/messages/windows/windows.properties b/core/src/main/assets/messages/windows/windows.properties index b0ef6d083..87bd3fbff 100644 --- a/core/src/main/assets/messages/windows/windows.properties +++ b/core/src/main/assets/messages/windows/windows.properties @@ -506,6 +506,9 @@ conducts.bossrush_desc=被你击败过多次的首领们熟识了英雄的技能 conducts.moneyletgo=黄金时代 conducts.moneyletgo_desc=地牢终于赶上了淘金热的时代，在这个金钱的时代，地牢中几乎所有东西都被明码标价。商人们因此赚的盆满钵满，所以他们打算商店打5折。\n然而，金钱的背后是利益的驱使，她已知晓地牢的现状，现在怪物都会可能额外掉落金币，随着地牢的深入，该项能力越来越弱。\n\n-_深度调查模式仅可选择一种模式游玩。且无法计入多挑徽章中。_ +conducts.seadlc=沧溟与湛蓝遗迹(DLC) +conducts.seadlc_desc= 自冒险家们调查地牢以来，我们经历了诸多事件。\n但世界之广袤，地牢只是其中一个很小的区域。除开地牢自身的重重谜团，世界上仍然有很多未解之事等待我们去揭晓。我们接到了来自霜落帝国的委托，我们将前往远处的大海深处调查有关于湛蓝遗迹的事情。\n相传这里是某位魔女的沉睡之地。废弃的遗址已没入深海，原有的活物已被深海居民吞噬殆尽。这里暗涛汹涌，危机四伏。 + windows.wnddlcx.title=难度选择-Beta difficulty.null=默认难度(一般) difficulty.easy=简单 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java index 4a68ed72a..d4d3a59f3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java @@ -121,7 +121,7 @@ public abstract class ChampionEnemy extends Buff { } else if (randomNumber < 10) { buffCls = ChampionEnemy.Bomber.class; } else { - switch (randomNumber % 6) { + switch (randomNumber % 5) { case 0: default: buffCls = ChampionEnemy.Small.class; break; @@ -134,9 +134,6 @@ public abstract class ChampionEnemy extends Buff { case 3: buffCls = ChampionEnemy.Sider.class; break; - case 4: - buffCls = ChampionEnemy.LongSider.class; - break; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/legend/DiedCrossBow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/legend/DiedCrossBow.java index 135f0fa4b..0a9d869b2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/legend/DiedCrossBow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/legend/DiedCrossBow.java @@ -11,7 +11,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.BlastParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SmokeParticle; import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.darts.Dart; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.darts.TippedDart; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -103,8 +102,7 @@ public class DiedCrossBow extends LegendWeapon { if (target != null) { final Ballistica shot = new Ballistica( curUser.pos, target, target); int cell = shot.collisionPos; - Dart missile = Dungeon.hero.belongings.getItem(Dart.class); - missile.quantity -= 5; + if (Actor.findChar(target) != null) { QuickSlotButton.target(Actor.findChar(target)); } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLC.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLC.java index f73676dc2..3a64da429 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLC.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLC.java @@ -30,11 +30,6 @@ public class WndDLC extends Window { private boolean editable; private ArrayList infos = new ArrayList<>(); private ArrayList boxes = new ArrayList<>(); - private ScrollPane pane; - - public WndDLC( Conducts.Conduct conduct, boolean editable){ - new WndDLC(new Conducts.ConductStorage(conduct), editable); - } public WndDLC(Conducts.ConductStorage conducts, boolean editable ) {