Update Beta4.985
This commit is contained in:
parent
e4ecfc6d33
commit
e7aa750af0
|
|
@ -17,8 +17,8 @@ allprojects {
|
|||
appName = 'Magic Ling Pixel Dungeon'
|
||||
appPackageName = 'com.ansdomagiclingpixeldungeon.ling'
|
||||
|
||||
appVersionCode =800088
|
||||
appVersionName = '0.6.1.0-Beta4.95(P3)'
|
||||
appVersionCode =800150
|
||||
appVersionName = '0.6.1.0-Beta4.985(P3)'
|
||||
|
||||
appJavaCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
|
|
|
|||
|
|
@ -1641,8 +1641,12 @@ actors.mobs.npcs.blacksmith.desc=这个巨魔看起来和任何其他巨魔一
|
|||
actors.mobs.npcs.ghost.name=悲伤幽灵
|
||||
actors.mobs.npcs.ghost.rat_1=你好，%s…曾经我像你一样——既强大又自信…但我被一个邪恶的野兽杀死了…我不能离开这个地方……直到我完成我的复仇…杀死_腐臭老鼠_，就是它夺走了我的生命…\n\n它就在这层…四处散播污秽…_小心它的周边的臭云以及带有腐蚀性的撕咬，它产生的粘液可溶于水…_
|
||||
actors.mobs.npcs.ghost.rat_2=请帮助我…杀了那个令人憎恶的东西…\n\n_在水附近与它战斗…躲开它的恶臭…_
|
||||
|
||||
actors.mobs.npcs.ghost.gnoll_1=你好，%s…曾经我像你一样——既强大又自信…但我被一个狡猾的敌人杀死了…我不能离开这个地方……直到我完成我的复仇…杀死_豺狼猎手_，就是它夺走了我的生命…\n\n它与其他豺狼人不同…它会隐藏自己并使用投掷武器… _小心它的毒镖和火镖，尽量靠近它…_
|
||||
actors.mobs.npcs.ghost.gnoll_2=请帮助我……杀了那个诡诈的家伙……\n\n_别让它打到你……离它越近越好……_
|
||||
|
||||
actors.mobs.npcs.ghost.agnoll_2=冒险家，我不知道是不是我的灵魂在地牢的时间太久了，这里最近十分冷清。我希望你能完成我未了结的心愿……
|
||||
|
||||
actors.mobs.npcs.ghost.crab_1=你好，%s…曾经我像你一样——既强大又自信…但我被一个古老的生物杀死了…我不能离开这个地方……直到我完成我的复仇…杀死_巨钳螃蟹_，就是它夺走了我的生命…\n\n它经历了无数岁月的洗礼…有一个巨大的蟹钳和非常厚重的蟹壳…_小心它的蟹钳，你必须偷袭这只巨蟹否则它会用钳子格挡你的攻击..._
|
||||
actors.mobs.npcs.ghost.crab_2=拜托帮助我……杀了那个甲壳类……\n\n_如果它发现你……就会挡住你所有的攻击……_
|
||||
actors.mobs.npcs.ghost.find_me=谢谢你……来找我吧……
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ scenes.interlevelscene.dialog_29=桃林:\n\n你走过的每一步，都或许是
|
|||
scenes.interlevelscene.dialog_30=荨麻心绪：\n\nBOSS太肉无法解决？为什么不试试药水呢。
|
||||
scenes.interlevelscene.dialog_31=荨麻心绪：\n\n半路暴毙也不用灰心，毕竟作者也会翻车（）\n\n绫:听我说，谢谢你，温暖了四季。
|
||||
scenes.interlevelscene.dialog_32=荨麻心绪：\n\n拉Ling去打求生之路2，这样就不能更新啦（）
|
||||
scenes.interlevelscene.dialog_33=CodenameE：\n\n假酒武器，逆天数值，照抄注解，尽在贪玩魔绫像素地牢(绫：在改了.JPG)
|
||||
scenes.interlevelscene.dialog_33=DMZERO,另一个时间线的幕后黑手。
|
||||
scenes.interlevelscene.dialog_34=米缸：\n\n和黑猫一起做薄煎饼，Nya～
|
||||
scenes.interlevelscene.dialog_35=啊哈，猜猜我是谁？：\n\n失败了再爬起来就行了
|
||||
scenes.interlevelscene.dialog_36=楪祈喵：\n\n想不想炼铜？想不想涩涩？想是吧？肘，跟我去警察局解释吧
|
||||
|
|
|
|||
|
|
@ -447,4 +447,6 @@ windows.wndstory.lkxboss=矮人国王的死讯传遍了这个国度的每一个
|
|||
windows.wndstory.fireboss=浊焰魔女并没有像往常那样递给你一块饼干。
|
||||
windows.wndstory.zotboss=万千地牢的邪恶力量汇聚一起，造就了这个恐怖的怪物。Yog-Zot，是世间邪恶的真实映射。
|
||||
windows.wndstory.dmzero=你所经历的一切不过是地牢曾经记忆的投影。打乱的时间被揉成一团，重新展开成这条弯弯曲曲的线。这只打乱时间的手，出现在你的面前。
|
||||
windows.wndstory.end=时间在此停滞。\n\n在这个极度扭曲的空间中，DM-ZERO,被未知生物侵占后的极具威胁的机器，伫立在你的前方。\n\n那是一座铁城，镇压着无法流淌的时间。
|
||||
windows.wndstory.end=时间在此停滞。\n\n在这个极度扭曲的空间中，DM-ZERO,被未知生物侵占后的极具威胁的机器，伫立在你的前方。\n\n那是一座铁城，镇压着无法流淌的时间。
|
||||
|
||||
windows.wndgameinprogress.dlc=娱乐
|
||||
|
|
|
|||
|
|
@ -18,14 +18,25 @@ public class BGMPlayer {
|
|||
|
||||
|
||||
if(Dungeon.isDLC(BOSSRUSH)){
|
||||
switch (d) {
|
||||
case -1:case 0:
|
||||
Music.INSTANCE.play(Assets.SNOWCYON, true);
|
||||
break;
|
||||
case 1:case 3: case 5:case 7:case 9:case 11:case 14:case 15:
|
||||
Music.INSTANCE.play(Assets.BGM_3, true);
|
||||
break;
|
||||
}
|
||||
if (d == -1) {
|
||||
Music.INSTANCE.play(Assets.SNOWCYON, true);
|
||||
}else if (d == 0||d==27) {
|
||||
Music.INSTANCE.play(Assets.SNOWCYON, true);
|
||||
} else if (d > 0 && d <= 5) {
|
||||
Music.INSTANCE.play(Assets.BGM_1, true);
|
||||
} else if (d > 5 && d <= 10) {
|
||||
Music.INSTANCE.play(Assets.BGM_2, true);
|
||||
} else if (d > 10 && d <= 15) {
|
||||
Music.INSTANCE.play(Assets.BGM_3, true);
|
||||
} else if (d > 15 && d <= 20) {
|
||||
Music.INSTANCE.play(Assets.BGM_4, true);
|
||||
} else if (d > 20 && d <= 26) {
|
||||
Music.INSTANCE.play(Assets.BGM_5, true);
|
||||
} else if (d ==-5||d ==-15) {
|
||||
Music.INSTANCE.play(Assets.SNOWCYON, true);
|
||||
} else
|
||||
//default
|
||||
Music.INSTANCE.play(Assets.Music.THEME, true);
|
||||
} else {
|
||||
if (d == -1) {
|
||||
Music.INSTANCE.play(Assets.TOWN, true);
|
||||
|
|
@ -121,6 +132,7 @@ public class BGMPlayer {
|
|||
case 28:
|
||||
Music.INSTANCE.play( Assets.BGM_0, true );
|
||||
break;
|
||||
|
||||
}
|
||||
} else {
|
||||
if (Dungeon.bossLevel() && t == 5) {
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicalSight;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MindVision;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.RandomBuff;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.RevealedArea;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.TestDwarfMasterLock;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
||||
|
|
@ -357,6 +358,7 @@ public class Dungeon {
|
|||
switch (depth) {
|
||||
case 17: case 27:case 0:
|
||||
level = new AncityLevel();
|
||||
Buff.affect(hero, RandomBuff.class).set( (5), 1 );
|
||||
break;
|
||||
case 1: case 3: case 6:case 7:case 9: case 11: case 13: case 15:case 18: case 20: case 24:
|
||||
level = new ItemLevel();
|
||||
|
|
|
|||
|
|
@ -173,12 +173,10 @@ public enum HeroClass {
|
|||
|
||||
if ( Dungeon.isDLC(BOSSRUSH)){
|
||||
Dungeon.gold += 3000;
|
||||
}
|
||||
|
||||
if (Dungeon.isDLC(BOSSRUSH)){
|
||||
new Amulet().quantity(1).identify().collect();
|
||||
}
|
||||
|
||||
|
||||
if (Dungeon.isChallenged(Challenges.PRO)){
|
||||
new WandOfHightHunderStorm().quantity(11).identify().collect();
|
||||
new LockSword().quantity(1).identify().collect();
|
||||
|
|
|
|||
|
|
@ -122,6 +122,11 @@ public abstract class Mob extends Char {
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(Dungeon.depth>=10){
|
||||
Dungeon.level.drop( ( Generator.randomArtifact() ), pos );
|
||||
}
|
||||
|
||||
Dungeon.level.drop( new Food(), pos ).sprite.drop();
|
||||
Dungeon.level.drop( new PotionOfExperience(), pos ).sprite.drop();
|
||||
Dungeon.level.drop( ( new Gold().random() ), pos );
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
|
||||
|
|
@ -102,14 +100,6 @@ public class Salamander extends Mob {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item createLoot() {
|
||||
MissileWeapon drop = (MissileWeapon)super.createLoot();
|
||||
//half quantity, rounded up
|
||||
drop.quantity((drop.quantity()+1)/2);
|
||||
return drop;
|
||||
}
|
||||
|
||||
private static final String COMBO = "combo";
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@
|
|||
|
||||
package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
|
||||
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.DLC.BOSSRUSH;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Badges;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
|
||||
|
|
@ -202,10 +200,6 @@ public class Tengu extends Mob {
|
|||
|
||||
@Override
|
||||
public void die( Object cause ) {
|
||||
if(Dungeon.isDLC(BOSSRUSH)){
|
||||
|
||||
GetBossLoot();
|
||||
}
|
||||
if (Dungeon.hero.subClass == HeroSubClass.NONE) {
|
||||
Dungeon.level.drop( new TengusMask(), pos ).sprite.drop();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -443,8 +443,8 @@ public class DMZERO extends Mob
|
|||
public DM300DeathBall()
|
||||
{
|
||||
spriteClass = DM275Sprite.class;
|
||||
HT = 400;
|
||||
HP = 400;
|
||||
HT = 220;
|
||||
HP = 220;
|
||||
EXP = 400;
|
||||
defenseSkill = 25;
|
||||
Buff.affect(this, ChampionEnemy.AntiMagic.class);
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
|
||||
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.DLC.BOSSRUSH;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
|
|
@ -44,6 +45,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.ScaleArmor;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.journal.Notes;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.ItemLevel;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
|
||||
|
|
@ -137,7 +139,12 @@ public class Ghost extends NPC {
|
|||
GameScene.show(new WndQuest(Ghost.this, Messages.get(Ghost.this, "rat_2")));
|
||||
break;
|
||||
case 2:
|
||||
GameScene.show(new WndQuest(Ghost.this, Messages.get(Ghost.this, "gnoll_2")));
|
||||
if(Dungeon.isDLC(BOSSRUSH)){
|
||||
GameScene.show(new WndQuest(Ghost.this, Messages.get(Ghost.this, "agnoll_2")));
|
||||
} else {
|
||||
GameScene.show(new WndQuest(Ghost.this, Messages.get(Ghost.this, "gnoll_2")));
|
||||
}
|
||||
|
||||
break;
|
||||
case 3:
|
||||
GameScene.show(new WndQuest(Ghost.this, Messages.get(Ghost.this, "crab_2")));
|
||||
|
|
@ -353,6 +360,76 @@ public class Ghost extends NPC {
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
public static void spawnx( ItemLevel level ) {
|
||||
if (!spawned && Dungeon.depth == 3) {
|
||||
|
||||
Ghost ghost = new Ghost();
|
||||
do {
|
||||
ghost.pos = level.randomRespawnCell( ghost );
|
||||
} while (ghost.pos == -1);
|
||||
level.mobs.add( ghost );
|
||||
|
||||
spawned = true;
|
||||
//dungeon depth determines type of quest.
|
||||
//depth2=fetid rat, 3=gnoll trickster, 4=great crab
|
||||
type = Dungeon.depth-1;
|
||||
|
||||
given = false;
|
||||
processed = false;
|
||||
depth = Dungeon.depth;
|
||||
|
||||
//50%:tier2, 30%:tier3, 15%:tier4, 5%:tier5
|
||||
switch (Random.chances(new float[]{0, 0, 10, 6, 3, 1})){
|
||||
default:
|
||||
case 2: armor = new LeatherArmor(); break;
|
||||
case 3: armor = new MailArmor(); break;
|
||||
case 4: armor = new ScaleArmor(); break;
|
||||
case 5: armor = new PlateArmor(); break;
|
||||
}
|
||||
//50%:tier2, 30%:tier3, 15%:tier4, 5%:tier5
|
||||
int wepTier = Random.chances(new float[]{0, 0, 10, 6, 3, 1});
|
||||
Generator.Category c = Generator.wepTiers[wepTier - 1];
|
||||
weapon = (MeleeWeapon) Reflection.newInstance(c.classes[Random.chances(c.probs)]);
|
||||
|
||||
//26%:+0, 25%:+1, 15%:+2, 10%:+3, 5%:+4, 5%+5
|
||||
float itemLevelRoll = Random.Float();
|
||||
int itemLevel;
|
||||
if (itemLevelRoll < 0.74f){
|
||||
itemLevel = 0;
|
||||
} else if (itemLevelRoll < 0.75f){
|
||||
itemLevel = 1;
|
||||
} else if (itemLevelRoll < 0.85f){
|
||||
itemLevel = 2;
|
||||
} else if (itemLevelRoll < 0.90f) {
|
||||
itemLevel = 3;
|
||||
hero.sprite.showStatus( CharSprite.NEGATIVE, "+3!!!" );
|
||||
} else if (itemLevelRoll < 0.95f){
|
||||
hero.sprite.showStatus( CharSprite.POSITIVE, "+5!!!" );
|
||||
if(( !Badges.isUnlocked(Badges.Badge.DAGETO))) {
|
||||
Statistics.dageCollected = 2;
|
||||
Badges.GhostDageCollected();
|
||||
}
|
||||
itemLevel = 5;
|
||||
} else {
|
||||
itemLevel = 4;
|
||||
hero.sprite.showStatus( CharSprite.WARNING, "+4!!!" );
|
||||
if(( !Badges.isUnlocked(Badges.Badge.GHOSTDAGE))) {
|
||||
Statistics.dageCollected = 1;
|
||||
Badges.GhostDageCollected();
|
||||
}
|
||||
}
|
||||
weapon.upgrade(itemLevel);
|
||||
armor.upgrade(itemLevel);
|
||||
|
||||
//10% to be enchanted. We store it separately so enchant status isn't revealed early
|
||||
if (Random.Int(10) == 0){
|
||||
enchant = Weapon.Enchantment.random();
|
||||
glyph = Armor.Glyph.random();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static void process() {
|
||||
if (spawned && given && !processed && (depth == Dungeon.depth)) {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.effects;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.watabou.noosa.Game;
|
||||
import com.watabou.noosa.Image;
|
||||
import com.watabou.noosa.TextureFilm;
|
||||
|
|
@ -312,7 +313,12 @@ public class Speck extends Image {
|
|||
break;
|
||||
|
||||
case DIED:
|
||||
hardlight(0x0);
|
||||
if(Dungeon.depth==27){
|
||||
hardlight(0x0);
|
||||
} else {
|
||||
hardlight(0xff5060);
|
||||
}
|
||||
|
||||
angularSpeed = 30;
|
||||
angle =Random.Float( 360 );
|
||||
lifespan = Random.Float( 1f,3f);
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.depth;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfExperience;
|
||||
|
|
@ -64,6 +65,7 @@ public class ItemLevel extends RegularLevel {
|
|||
|
||||
@Override
|
||||
protected void createItems() {
|
||||
Ghost.Quest.spawnx( this );
|
||||
switch (depth){
|
||||
//T1 补给层
|
||||
case 1: case 3: case 6: case 7:
|
||||
|
|
@ -77,7 +79,6 @@ public class ItemLevel extends RegularLevel {
|
|||
break;
|
||||
//T2 补给层
|
||||
case 9: case 11: case 13:
|
||||
addItemToSpawn(new PotionOfStrength());
|
||||
addItemToSpawn(new PotionOfExperience());
|
||||
addItemToSpawn(new PotionOfHealing());
|
||||
addItemToSpawn(Generator.random(Generator.Category.FOOD));
|
||||
|
|
@ -114,12 +115,25 @@ public class ItemLevel extends RegularLevel {
|
|||
|
||||
@Override
|
||||
public String tilesTex() {
|
||||
return Assets.Environment.TILES_COLD;
|
||||
if(depth>=16){
|
||||
return Assets.Environment.TILES_CITY;
|
||||
} else if(depth>=6){
|
||||
return Assets.Environment.TILES_PRISON;
|
||||
} else {
|
||||
return Assets.Environment.TILES_COLD;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String waterTex() {
|
||||
return Assets.Environment.WATER_COLD;
|
||||
if(depth>=16){
|
||||
return Assets.Environment.WATER_CITY;
|
||||
} else if(depth>=6){
|
||||
return Assets.Environment.WATER_PRISON;
|
||||
} else {
|
||||
return Assets.Environment.WATER_COLD;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -383,7 +383,7 @@ public class GameScene extends PixelScene {
|
|||
|
||||
boss = new BossHealthBar();
|
||||
boss.camera = uiCamera;
|
||||
boss.setPos( 6 + (uiCamera.width - boss.width())/2, 20);
|
||||
boss.setPos( 6 + (uiCamera.width - boss.width())/2, 28);
|
||||
add(boss);
|
||||
|
||||
attack = new AttackIndicator();
|
||||
|
|
|
|||
|
|
@ -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 = 0f;
|
||||
fadeTime = 0.85f;
|
||||
}
|
||||
|
||||
SkinnedBlock bg = new SkinnedBlock(Camera.main.width, Camera.main.height, loadingAsset ){
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public class vM0_6_7_X_Changes {
|
|||
}
|
||||
|
||||
public static void add_v0_6_28_Changes( ArrayList<ChangeInfo> changeInfos ) {
|
||||
ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta4.975(P3)", true, "");
|
||||
ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta4.975-985(P3)", true, "");
|
||||
changes.hardlight(Window.TITLE_COLOR);
|
||||
changeInfos.add(changes);
|
||||
|
||||
|
|
@ -85,6 +85,10 @@ public class vM0_6_7_X_Changes {
|
|||
changes.hardlight(Window.GREEN_COLOR);
|
||||
changeInfos.add(changes);
|
||||
|
||||
changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.ARTIFACT_ROSE3), ("首领对决V1.5"),
|
||||
("1.现在可以在3层完成幽妹的任务，让她和你并肩前行。\n" +
|
||||
"2.T3补给层现在不会再给予力量药水")));
|
||||
|
||||
changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.LANTERNB), ("娱乐模式"),
|
||||
("娱乐模式正式开启测试\n\n第一个娱乐模式为：首领对决(BOSSRUSH)")));
|
||||
|
||||
|
|
@ -103,7 +107,9 @@ public class vM0_6_7_X_Changes {
|
|||
changes.addButton(new ChangeButton(new Image("sprites/spinner.png", 144, 0, 16, 16),
|
||||
Messages.get(ChangesScene.class,
|
||||
"bugfixes"),
|
||||
("修复了很多Bug,我忘了我修了什么了（")));
|
||||
("1.修复天狗10层的错误\n" +
|
||||
"2.修复部分BGM错误运行的问题\n" +
|
||||
"3.其他崩溃修复")));
|
||||
}
|
||||
|
||||
public static void add_v0_6_27_Changes( ArrayList<ChangeInfo> changeInfos ) {
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
|
|||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
|
||||
|
|
@ -109,25 +110,12 @@ public class WndGameInProgress extends Window {
|
|||
RedButton btnGameInfo = new RedButton( Messages.get(this, "gameinfo") ) {
|
||||
@Override
|
||||
protected void onClick() {
|
||||
try {
|
||||
Bundle bundle = FileUtils.bundleFromFile(GamesInProgress.gameFile(slot));
|
||||
String ing =
|
||||
Messages.get(WndGameInProgress.class,"gameversion") + Game.version+"\n\n"+
|
||||
Messages.get(WndGameInProgress.class,"gameseed")+ DungeonSeed.convertToCode(bundle.getLong("seed"))+"\n\n"+
|
||||
Messages.get(WndGameInProgress.class,"gamegold") + bundle.getInt("gold") +"\n\n"+
|
||||
Messages.get(WndGameInProgress.class,"gamenayzi") + bundle.getInt("naiyaziCollected")+
|
||||
Messages.get(WndGameInProgress.class,"gamenayzis") +"\n\n"+
|
||||
Messages.get(WndGameInProgress.class,"gamemimic") + bundle.getInt("goldchest") +"\n\n"+
|
||||
Messages.get(WndGameInProgress.class,"gameinof");
|
||||
ShatteredPixelDungeon.scene().addToFront(new WndMessage(ing));
|
||||
} catch (IOException ignored) {
|
||||
}
|
||||
ShatteredPixelDungeon.scene().addToFront(new WndDLC(SPDSettings.dlc(), true));
|
||||
}
|
||||
};
|
||||
btnGameInfo.icon(new ItemSprite(ItemSpriteSheet.SEED_SKYBLUEFIRE));
|
||||
btnGameInfo.setRect( (WIDTH - btnW)/2+20, pos, btnW , 18 );
|
||||
add( btnGameInfo );
|
||||
|
||||
pos = btnGameInfo.bottom() + GAP;
|
||||
} else {
|
||||
|
||||
|
|
@ -153,7 +141,19 @@ public class WndGameInProgress extends Window {
|
|||
btnGameInfo.icon(new ItemSprite(ItemSpriteSheet.SEED_SKYBLUEFIRE));
|
||||
btnGameInfo.setRect( (WIDTH - btnW)/2, pos, btnW , 18 );
|
||||
add( btnGameInfo );
|
||||
pos = btnGameInfo.bottom() + GAP;
|
||||
|
||||
RedButton btDLC = new RedButton( Messages.get(this, "dlc") ) {
|
||||
@Override
|
||||
protected void onClick() {
|
||||
ShatteredPixelDungeon.scene().addToFront(new WndDLC(SPDSettings.dlc(), true));
|
||||
}
|
||||
};
|
||||
float btnX = btDLC.reqWidth() + 10;
|
||||
btDLC.icon(new ItemSprite(ItemSpriteSheet.LANTERNB));
|
||||
btDLC.setRect( (WIDTH - btnX)/2, pos, btnX , 18 );
|
||||
add( btDLC );
|
||||
|
||||
pos = btDLC.bottom() + GAP;
|
||||
}
|
||||
|
||||
pos += GAP;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Chrome;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.RandomBuff;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ReloadShop;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ReloadShopTwo;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NullDiedTO;
|
||||
|
|
@ -280,8 +279,6 @@ public class WndKingShop extends Window {
|
|||
if(Dungeon.gold >500) {
|
||||
Dungeon.gold-=500;
|
||||
WndKingShop.this.selectReward( item );
|
||||
if (RandomBuff.level-- >= 0) {
|
||||
}
|
||||
Buff.prolong( hero, ReloadShop.class, 1f);
|
||||
//Statistics.naiyaziCollected += 1;
|
||||
WndKingShop.RewardWindow.this.hide();
|
||||
|
|
@ -316,12 +313,10 @@ public class WndKingShop extends Window {
|
|||
RedButton btnConfirm = new RedButton(Messages.get(WndKingShop.class, "buy")){
|
||||
@Override
|
||||
protected void onClick() {
|
||||
if(Dungeon.gold > 500) {
|
||||
if(Dungeon.gold >= 500) {
|
||||
Dungeon.gold-=500;
|
||||
Buff.prolong( hero, ReloadShop.class, 1f);
|
||||
WndKingShop.this.selectReward( item );
|
||||
if (RandomBuff.level-- >= 0) {
|
||||
}
|
||||
//Badges.nyzvalidateGoldCollected();
|
||||
//Statistics.naiyaziCollected += 1;
|
||||
WndKingShop.RewardWindow2.this.hide();
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ public class WndNyzShop extends Window {
|
|||
buff.detach();
|
||||
}
|
||||
}
|
||||
} else if(Dungeon.gold > 720) {
|
||||
} else if(Dungeon.gold >= 720) {
|
||||
Dungeon.gold-=720*Random.Int(2)+hero.lvl/5+10;
|
||||
WndNyzShop.this.selectReward( item );
|
||||
if (RandomBuff.level-- >= 0) {
|
||||
|
|
@ -233,7 +233,7 @@ public class WndNyzShop extends Window {
|
|||
buff.detach();
|
||||
}
|
||||
}
|
||||
} else if(Dungeon.gold > 270) {
|
||||
} else if(Dungeon.gold >= 270) {
|
||||
Dungeon.gold-=270*Random.Int(3);
|
||||
Buff.prolong( hero, ReloadShop.class, 1f);
|
||||
WndNyzShop.this.selectReward( item );
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
package com.shatteredpixel.shatteredpixeldungeon.windows;
|
||||
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.DLC.BOSSRUSH;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.shopOnLevel;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
|
|
@ -148,6 +149,11 @@ public class WndTradeItem extends WndInfoItem {
|
|||
}
|
||||
}
|
||||
};
|
||||
|
||||
if(Dungeon.isDLC(BOSSRUSH)){
|
||||
btnStole.alpha(0.3f);
|
||||
btnStole.active=false;
|
||||
}
|
||||
btnStole.setRect( 0, pos + GAP, width, BTN_HEIGHT );
|
||||
btnStole.icon(Statistics.fireGirlnoshopping && !Statistics.deadshoppingdied ? new FireMagicGirlSprite() :
|
||||
new ShopGuardDead.ShopGuardianRedSprite());
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user