diff --git a/build.gradle b/build.gradle index 01d760263..2e971c9ea 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { appPackageName = 'com.ansdomagiclingpixeldungeon.ling' appVersionCode =14030 - appVersionName = '0.6.0.0-BetaX' + appVersionName = '0.6.0.0-BetaXIV' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 34d40ff91..9a3c66ad2 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -2,6 +2,9 @@ items.scrolls.exotic.scrollofpolymorph.name=羊化秘卷 items.scrolls.exotic.scrollofpolymorph.desc=这张秘卷富含强大的转换能力。当使用时，所有在使用者视野范围内的单位都将变形成一只魔法绵羊！\n\n这种变形过程是不可逆的，但不是所有敌人都会被影响。强大的敌人将抵抗这种魔法。同时变形后目标敌人身上的物品将会消失。 +items.stones.stoneofdeepenedsleep.name=沉睡符石 +items.stones.stoneofdeepenedsleep.desc=这颗符石被扔出后会对附近睡眠中的敌人施加魔法睡眠。陷入魔法睡眠的敌人会永远沉睡下去，除非受到外界打扰。 + items.scrolls.exotic.scrollofaffection.name=魅惑秘卷 items.scrolls.exotic.scrollofaffection.desc=阅读这张秘卷会释放出一段诱人的魔音，使所有听到它的人陷入魅惑之中。 diff --git a/core/src/main/assets/messages/windows/windows.properties b/core/src/main/assets/messages/windows/windows.properties index ccbefcdea..242181bea 100644 --- a/core/src/main/assets/messages/windows/windows.properties +++ b/core/src/main/assets/messages/windows/windows.properties @@ -218,6 +218,14 @@ windows.wndresurrect.message=死亡正在降临，所幸重生十字架正努力 windows.wndresurrect.prompt=选择一件物品 windows.wndresurrect.confirm=保留这些物品 +journal.notes$landmark.redagron=红龙之王 + +items.heap.black_chest=黑金宝箱 +items.heap.black_chest_desc=矮人大师留给你的宝藏，虽然矮人王国已经没落。但大师仍然相信有希望。毕竟，矮人王国并不是所有知道真相的人都不在了…… + +items.keys.blackkey.name=黑金钥匙 +items.keys.blackkey.desc=这个钥匙是矮人大师“奖励”你的，尽管你不知道这钥匙的来源。但它确实能打开黑金宝箱! + windows.wndsadghost.rat_title=击败腐臭老鼠 windows.wndsadghost.gnoll_title=击败豺狼诡术师 windows.wndsadghost.crab_title=击败巨大螃蟹 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 d6770d7b1..37f62be17 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.RandomBuff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sanity; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.huntress.NaturesPower; @@ -150,6 +151,17 @@ public enum HeroClass { new Ankh().quantity(1).identify().collect(); } + if ( Badges.isUnlocked(Badges.Badge.NYZ_SHOP)){ + Buff.affect(hero, RandomBuff.class).set( (5), 1 ); + System.out.println(RandomBuff.level); + Dungeon.gold+=1200; + } + + if ( Badges.isUnlocked(Badges.Badge.EXSG)){ + Dungeon.gold += 1500; + new PotionOfExperience().quantity(2).identify().collect(); + } + if (Dungeon.isChallenged(Challenges.PRO)){ new FrozenCarpaccio().quantity(11).identify().collect(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java index a1b9146d6..c779cb35e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.shatteredpixel.shatteredpixeldungeon.windows.WndSupportPrompt; import com.watabou.noosa.Game; import com.watabou.utils.Callback; @@ -55,7 +54,7 @@ public class SkeletonKey extends Key { Game.runOnRenderThread(new Callback() { @Override public void call() { - ShatteredPixelDungeon.scene().add(new WndSupportPrompt()); + //ShatteredPixelDungeon.scene().add(new WndSupportPrompt()); } }); } catch (IOException e) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WornShortsword.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WornShortsword.java index c3bc50ed0..450c6d73e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WornShortsword.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WornShortsword.java @@ -30,7 +30,7 @@ public class WornShortsword extends MeleeWeapon { image = ItemSpriteSheet.WORN_SHORTSWORD; hitSound = Assets.Sounds.HIT_SLASH; hitSoundPitch = 1.1f; - + RCH = 3; //lots of extra reach tier = 1; bones = false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index 609bb62df..3b4f1b5e3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -23,16 +23,13 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Badges; -import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Chrome; -import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress; import com.shatteredpixel.shatteredpixeldungeon.Rankings; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites; import com.shatteredpixel.shatteredpixeldungeon.effects.Fireball; import com.shatteredpixel.shatteredpixeldungeon.journal.Document; -import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; @@ -40,7 +37,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.StyledButton; import com.shatteredpixel.shatteredpixeldungeon.windows.WndError; import com.shatteredpixel.shatteredpixeldungeon.windows.WndHardNotification; -import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; import com.watabou.glwrap.Blending; import com.watabou.noosa.Camera; import com.watabou.noosa.ColorBlock; @@ -49,8 +45,6 @@ import com.watabou.noosa.Image; import com.watabou.noosa.audio.Music; import com.watabou.utils.FileUtils; -import java.util.ArrayList; - public class WelcomeScene extends PixelScene { private static final int LATEST_UPDATE = ShatteredPixelDungeon.v1_2_0; @@ -129,16 +123,14 @@ public class WelcomeScene extends PixelScene { signs.x = title.x + (title.width() - signs.width())/2f; signs.y = title.y; add( signs ); - + StyledButton okay = new StyledButton(Chrome.Type.GREY_BUTTON_TR, Messages.get(this, "continue")){ @Override protected void onClick() { super.onClick(); if (previousVersion == 0 || SPDSettings.intro()){ SPDSettings.version(ShatteredPixelDungeon.versionCode); - GamesInProgress.selectedClass = null; - GamesInProgress.curSlot = 1; - ShatteredPixelDungeon.switchScene(HeroSelectScene.class); + ShatteredPixelDungeon.switchScene(TitleScene.class); } else { updateVersion(previousVersion); ShatteredPixelDungeon.switchScene(TitleScene.class); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java index fee7d1773..d77e3ff6e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java @@ -215,6 +215,8 @@ public class ItemSprite extends MovieClip { return view( ItemSpriteSheet.BONES, null ); case REMAINS: return view( ItemSpriteSheet.REMAINS, null ); + case BLACK: + return view( ItemSpriteSheet.EBONY_CHEST, null ); default: return view( 0, null ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java index 03f0ccc06..72de4ee15 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java @@ -53,7 +53,7 @@ import java.util.Locale; public class WndHero extends WndTabbed { - private static final int WIDTH = 160; + private static final int WIDTH = 130; private static final int HEIGHT = 120; private StatsTab stats;