From 18c419c8bc700df363287bc06096a2788a3239a9 Mon Sep 17 00:00:00 2001 From: LingASDJ <2735951230@qq.com> Date: Wed, 26 Oct 2022 14:09:57 +0800 Subject: [PATCH] hotfixed 21 p.2.7 --- .../assets/messages/actors/actors.properties | 18 +++++++++--------- .../actors/buffs/ChampionHero.java | 7 ++++--- .../actors/hero/HeroClass.java | 10 +++++++++- .../shatteredpixeldungeon/actors/mobs/Mob.java | 2 +- .../scenes/InterlevelScene.java | 2 +- .../sprites/FireGhostSprite.java | 13 ------------- 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 6c8208795..653d4dfd9 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -322,21 +322,21 @@ actors.mobs.npcs.whitenpc.nonono=你处于娱乐模式，这是最后一层了 actors.buffs.championhero.warn=你感受到了无尽的力量。 actors.buffs.championhero$light.name=雷霆祝福 -actors.buffs.championhero$light.desc=雷霆祝福使玩家完全免疫闪电类元素伤害。 +actors.buffs.championhero$light.desc=雷霆祝福使玩家完全免疫闪电类元素伤害。\n\n剩余回合时长： actors.buffs.championhero$halo.name=鬼磷祝福 -actors.buffs.championhero$halo.desc=鬼磷祝福造成 35% 额外近战伤害，会使用更强大的磷火点燃攻击目标，免疫火焰，免疫磷火。 +actors.buffs.championhero$halo.desc=鬼磷祝福造成 35% 额外近战伤害，会使用更强大的磷火点燃攻击目标，免疫火焰，免疫磷火。\n\n剩余回合时长： actors.buffs.championhero$blazing.name=烈焰祝福 -actors.buffs.championhero$blazing.desc=烈焰祝福造成 25% 额外近战伤害，会点燃攻击目标，免疫火焰，且会在死亡时引燃周遭。 +actors.buffs.championhero$blazing.desc=烈焰祝福造成 25% 额外近战伤害，会点燃攻击目标，免疫火焰，且会在死亡时引燃周遭。\n\n剩余回合时长： actors.buffs.championhero$projecting.name=索敌祝福 -actors.buffs.championhero$projecting.desc=索敌祝福拥有 25% 额外近战伤害。 +actors.buffs.championhero$projecting.desc=索敌祝福拥有 25% 额外近战伤害。\n\n剩余回合时长： actors.buffs.championhero$antimagic.name=敌法祝福 -actors.buffs.championhero$antimagic.desc=敌法祝福拥有 25% 的伤害减免，且完全免疫所有魔法效果。 +actors.buffs.championhero$antimagic.desc=敌法祝福拥有 25% 的伤害减免，且完全免疫所有魔法效果。\n\n剩余回合时长： actors.buffs.championhero$giant.name=无畏祝福 -actors.buffs.championhero$giant.desc=无畏祝福拥有 75% 的伤害减免。 +actors.buffs.championhero$giant.desc=无畏祝福拥有 75% 的伤害减免。\n\n剩余回合时长： actors.buffs.championhero$blessed.name=天佑祝福 -actors.buffs.championhero$blessed.desc=天佑祝福拥有 200% 额外精准与躲避。 -actors.buffs.championhero$growing.name=成长祝福 -actors.buffs.championhero$growing.desc=成长祝福拥有额外精准、躲避、近战伤害与伤害减免。\n\n当前精准、躲避、近战伤害加成：%1$d%%\n当前伤害减免：%2$d%% +actors.buffs.championhero$blessed.desc=天佑祝福拥有 200% 额外精准与躲避。\n\n剩余回合时长： +actors.buffs.championhero$growing.name=英雄祝福 +actors.buffs.championhero$growing.desc=英雄祝福拥有额外精准、躲避、近战伤害与伤害减免。\n\n当前精准、躲避、近战伤害加成：%1$d%%\n当前伤害减免：%2$d%%\n\n剩余回合时长： actors.mobs.dimandking.name=钻石宝箱王 actors.mobs.dimandking.notice=翼绫？是你？不，你不是翼绫！你为何前来？ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionHero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionHero.java index 7211c46da..1afd51188 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionHero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionHero.java @@ -67,7 +67,8 @@ public abstract class ChampionHero extends FlavourBuff { @Override public String desc() { - return Messages.get(this, "desc",DURATION); + //todo 取负数，通过绝对值获取,以显示为正数 并通过INT省略后面的小数点 + return Messages.get(this, "desc")+(int)(Math.abs(1.0f - visualcooldown())+1f); } @@ -254,7 +255,7 @@ public abstract class ChampionHero extends FlavourBuff { // } - private float multiplier = 1.19f; + private float multiplier = 1.15f; @Override public boolean act() { @@ -281,7 +282,7 @@ public abstract class ChampionHero extends FlavourBuff { @Override public String desc() { - return Messages.get(this, "desc", (int)(100*(multiplier-1)), (int)(100*(1 - 1f/multiplier))); + return Messages.get(this, "desc", (int)(100*(multiplier-1)), (int)(100*(1 - 1f/multiplier)))+(int)(Math.abs(1.0f - visualcooldown())+1f); } private static final String MULTIPLIER = "multiplier"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index fae54ac40..f56fd29c3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.QuickSlot; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ChampionHero; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.RandomBuff; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.huntress.NaturesPower; @@ -172,7 +173,14 @@ public enum HeroClass { new FireFishSword().quantity(1).identify().collect(); new PotionOfInvisibility().quantity(45).identify().collect(); new LockSword().quantity(1).identify().collect(); - //Buff.affect(hero, ChampionHero.AntiMagic.class, 50000f); + Buff.affect(hero, ChampionHero.AntiMagic.class, 50000f); +// Buff.affect(hero, ChampionHero.Blazing.class, ChampionHero.DURATION); +// Buff.affect(hero, ChampionHero.Halo.class, ChampionHero.DURATION); +// Buff.affect(hero, ChampionHero.Light.class, ChampionHero.DURATION); +// Buff.affect(hero, ChampionHero.Blessed.class, ChampionHero.DURATION); +// Buff.affect(hero, ChampionHero.Projecting.class, ChampionHero.DURATION); +// Buff.affect(hero, ChampionHero.Giant.class, ChampionHero.DURATION); +// Buff.affect(hero, ChampionHero.Growing.class, ChampionHero.DURATION); new Gauntlet().quantity(1).identify().collect(); new GoldIron().quantity(1).identify().collect(); new ScrollOfIdentify().quantity(45).identify().collect(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index d8c8dca2f..085f08850 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -183,7 +183,7 @@ public abstract class Mob extends Char { //TODO 突变巨兽NEW if (Dungeon.isChallenged(Challenges.SBSG) && scaleFactor == 1f && !properties().contains(Property.NOBIG) && !properties().contains(Property.BOSS)&& !properties().contains(Property.MINIBOSS) ){ - scaleFactor = Random.Float(1f, 1.8f); + scaleFactor = Random.Float(1f, 1.6f); HT = (int) (HT * scaleFactor); if (scaleFactor >= 1.4f){ HP = HT = (int) (HT * 1.45f); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java index 4c1e544d9..2b49109fd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java @@ -182,7 +182,7 @@ public class InterlevelScene extends PixelScene { fadeTime += 0.9f; //adds 1 second total //speed up transition when debugging } else if (DeviceCompat.isDebug()){ - fadeTime = 0.1f; + fadeTime = 0.9f; } SkinnedBlock bg = new SkinnedBlock(Camera.main.width, Camera.main.height, loadingAsset ){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireGhostSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireGhostSprite.java index 182aa6472..33c517e22 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireGhostSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireGhostSprite.java @@ -5,7 +5,6 @@ package com.shatteredpixel.shatteredpixeldungeon.sprites; -import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.watabou.noosa.TextureFilm; public class FireGhostSprite extends MobSprite { @@ -32,16 +31,4 @@ public class FireGhostSprite extends MobSprite { public int blood() { return 0xFFFF7D13; } - - @Override - public void link( Char ch ) { - super.link( ch ); - add( CharSprite.State.BURNING ); - } - - @Override - public void die() { - super.die(); - remove( CharSprite.State.BURNING ); - } }