update p2.920
This commit is contained in:
parent
fdd01311f1
commit
bbfeb335f0
BIN
core/src/main/assets/interfaces/loading_gold.png
Normal file
BIN
core/src/main/assets/interfaces/loading_gold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 730 B |
|
|
@ -560,13 +560,13 @@ actors.hero.ondeath=你死了……
|
|||
|
||||
actors.mobs.redswarm.name=血红巨蝇
|
||||
actors.mobs.redswarm.desc=被_冻得通红_的_巨型苍蝇_，加上被地牢的_黑魔法_影响。已经变得_极度危险_。必须_小心行事_。\n他们会用_行动证明_这里谁才是老大。
|
||||
actors.mobs.redswarm.fire_kill=冰火两重天的攻击下，你"幸福的"上天了。
|
||||
actors.mobs.redswarm$darkbolt.rankings_desc=冰火魔力，助你上天！
|
||||
actors.mobs.redswarm.fire_kill=冰火两重天的攻击下，你"幸福的"去世了……
|
||||
actors.mobs.redswarm$darkbolt.rankings_desc=在血红焰波下死去……
|
||||
|
||||
actors.mobs.npcs.ren.name=REN-33
|
||||
actors.mobs.npcs.ren.desc=由那无法知晓的远方渡来的旅人，口中流传着骆越与暹罗的洽语、手捧着莲穗的清香，向你问候了。
|
||||
actors.mobs.npcs.ren.message1=一直以来，我知道更多的灾难正在发生。你是否也是失去的那一位？
|
||||
actors.mobs.npcs.ren.message2=你好，我是REN-33!我是唯一的个体……,有一些时候，你是否在想这个世界发生了什么吗？那就是你最好的方式！
|
||||
actors.mobs.npcs.ren.message1=一直以来，我知道更多的灾难正在发生。你是否也是灾难中失去挚友的那一位？
|
||||
actors.mobs.npcs.ren.message2=你好，我是REN-33!我是唯一的个体……,有一些时候，你是否在想这个世界发生了什么吗？其实，你应该试着放松，那就是你最好的方式！
|
||||
actors.mobs.npcs.ren.message3=猎枪击毙了穹顶天上的椋鸟群落，此时即可眺望繁星、即可观测天津星肆、即可瞭望海之灯塔，为之祈祷。
|
||||
actors.mobs.npcs.ren.def_verb=随机应变
|
||||
|
||||
|
|
@ -575,6 +575,7 @@ actors.mobs.npcs.goonpc.name=粘咕-天痕座
|
|||
actors.mobs.npcs.slyl.name=冷群
|
||||
actors.mobs.npcs.slyl.message1=我叫冷群，这是我的真名。
|
||||
actors.mobs.npcs.slyl.message2=地牢最深处的黑暗……似乎有点忘记了。但据说最近有冒险者在地牢新发现了一批特别的书籍，它们或多或少都沾染过魔法。
|
||||
actors.mobs.npcs.slyl.message3=地牢已经有成千上万的冒险者为了“水晶之心”而前往，但没有一个人回来……我不清楚他的做法是否正确，但风暴就要到来了……我们别无选择，我们只能继续这样……
|
||||
actors.mobs.npcs.slyl.tips=温馨提示:若要选择其他Boss,请打开染血金币终端。否则请忽略此消息。
|
||||
|
||||
actors.mobs.npcs.slyl.def_verb=风暴将临
|
||||
|
|
@ -605,15 +606,15 @@ actors.mobs.npcs.nyz.desc=自翼绫事件后就一直在地牢调查的商人。
|
|||
actors.mobs.npcs.nyz.greetings=奈亚子:早上好,中午好,晚上好，冒险者。欢迎来到这个危险且神秘的地牢。
|
||||
|
||||
actors.mobs.npcs.nxhynpc.name=那些回忆
|
||||
actors.mobs.npcs.nxhynpc.message1=新的一年，调查继续进行！
|
||||
actors.mobs.npcs.nxhynpc.message1=如果你要前往地牢，不用担心物资问题！
|
||||
actors.mobs.npcs.nxhynpc.message2=如果你在地牢里面缺少物资，来找我。我的大商店在地牢的各个楼层，随时欢迎您的到来。\n\n但是，你如果想图谋不轨，将会万劫不复！
|
||||
actors.mobs.npcs.nxhynpc.def_verb=……
|
||||
actors.mobs.npcs.nxhynpc.desc=这是一个拥有很多东西的商人，他的名字叫那些回忆。据说他知道300年前这地牢究竟发生了什么事情的，他在这里等着每一位冒险者的前来。他会给予冒险者相应的补给，但是他从来不告诉冒险者这个地牢的危险程度是多么的高。传言说，他曾经是一个侠客，只不过现在他已经成为了一个商人了。
|
||||
|
||||
|
||||
actors.mobs.npcs.obsir.name=ZIOM_Observe-sir
|
||||
actors.mobs.npcs.obsir.message1=黑骑士正在派人前来调查，我需要你帮我剿灭他们
|
||||
actors.mobs.npcs.obsir.message2=好的，你准备好迎接战斗了吗？
|
||||
actors.mobs.npcs.obsir.message1=我不属于这个世界的人，但是，我一直都在思考生与死的意义
|
||||
actors.mobs.npcs.obsir.message2=更多的是利益的驱使！年轻人，你还没有看透危机的到来吗？
|
||||
actors.mobs.npcs.obsir.def_verb=哦！有趣！！！
|
||||
actors.mobs.npcs.obsir.desc=穿着黑西装的神秘人，头上戴着有各种颜色的帽子，而且他的样子的皮肤根本不像人类。\n据说他跟"奸商"有一些有趣的事情。\n这人本身就不存在这个世界，但究竟为什么会在这里始终是个谜。\n——死亡不是终点
|
||||
|
||||
|
|
@ -1204,6 +1205,11 @@ actors.hero.abilities.ratmogrify$transmograt.rankings_desc=死于：鼠化敌人
|
|||
##main hero
|
||||
actors.hero.hero.name=你
|
||||
actors.hero.hero.leave=现在还不能离去，埋藏在地牢之下的名利正呼唤着你！
|
||||
|
||||
actors.hero.hero.leave2=魔法入口已经被关闭了，属于我的试炼已经开始了。\n或许只有拿到传说中的水晶之心，我才能回去……
|
||||
|
||||
actors.hero.hero.acs=冒险者，你应该知道地牢的危险，所以我们封印了那里。\n如果你确定要前往地牢的话，这个魔法入口会带你进入危机四伏的地牢。\n一旦你准备好了，就可以继续前进了！\n当然，出发所需要的东西带上，因为你去了后就不能回头了……
|
||||
|
||||
actors.hero.hero.level_up=升级！
|
||||
actors.hero.hero.new_level=升级！精准+，闪避+，最大生命值 +5！
|
||||
actors.hero.hero.new_talent=天赋点 +1！
|
||||
|
|
|
|||
|
|
@ -483,4 +483,7 @@ ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x36=-P2.9\n1.修复史莱姆王可能
|
|||
|
||||
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x37=-P2.910\n1.修复基因突变的怪物双倍攻速问题\n2.修复自动售货机被腐化的问题\n3.修复房间生成错误的问题\n4.部分文案描述错误修复
|
||||
|
||||
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x38=-P2.920\n1.修复水晶钥匙可能不见的问题\n2.修复一些更小的错误崩溃
|
||||
|
||||
|
||||
//ui.changelist.mlpd.vm0_5_x_changes.xxx//
|
||||
|
|
@ -386,7 +386,7 @@ windows.wndstory.new=在击败了Yog古神后，似乎一切变得平静下来
|
|||
\nMLPD\
|
||||
-上半段-完。\n\n敬请期待下半段-真相。
|
||||
|
||||
windows.wndstory.forest=300年前，一场大火让这个地牢不复存在。地牢的创始人：翼绫也不见踪影。\n\n300年后，随着地牢原住民对地牢的维修和重建，地牢渐渐的有了生机。\n特别是和矮人他们共同从300年的灾难逃出来的古神YOG,是让地牢重新振兴的核心人员。\n随着时间的推移，YOG他们有了一个疯狂的想法，并将这个想法交给了地表三巨头。\n霜落女帝当即批准该建议，并发布猎杀的悬赏令。\n然而，人人都知道亵渎她的后果，可仍然顶风作案。\n你也是参与的一员，你现在来到了地牢的入口，现在，开始你的旅途了。
|
||||
windows.wndstory.forest=地牢入口前的海报：\n广大的冒险家们，你们好。众所周知，地牢里面的环境是不可预料的，但“水晶之心”在这个危险而又未知的地牢中，谁能拿到这个被怪物保护的宝物，谁就能终身荣华富贵。但是，进入地牢前需要签署一份"死亡预证明"。\n这是一场试炼，更是对失去一切的你们的一次救赎。正如以前她在的时候所说:“一些问题之所以难以解决，是因为我们根本还没有抓住重点。一些人可能失去太多，因此早已疲惫，但要知道，他们都是不想失去某物才会想继续去活着！\n\n冒险者们，如果你们已经做好准备。那就前往这里吧！\n\n ---By 深渊魔都管理者：血魔伯爵
|
||||
windows.wndtradeitem.stole=抢劫商店
|
||||
windows.wndtradeitem.oks=进行对话
|
||||
windows.wndstory.dm920=Yog-Dzewa的陨落，其实背后有太多的秘密。\nYog的后面，是一个连Yog都害怕的一个DM终极实验品，\n它是造成矮人国度堕落的元凶，它是灾难的象征！！！\n它是曾经的死灵军团的杀手锏，它是死亡的代言词！！！\n它是连Yog-Dzewa都要敬畏它三分的DM920,\n你需直面，你不可逃避，你的路途就是为此而来。\n已经没有退路，唯有放手一搏，无论它是真是假！！！\n但你明白，不击败他，死的就只能是自己！！！
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ public class Assets {
|
|||
|
||||
public static final String SURFACE = "interfaces/surface.png";
|
||||
|
||||
public static final String LOADING_GOLD = "interfaces/loading_gold.png";
|
||||
public static final String LOADING_SEWERS = "interfaces/loading_sewers.png";
|
||||
public static final String LOADING_PRISON = "interfaces/loading_prison.png";
|
||||
public static final String LOADING_COLD = "interfaces/loading_cold.png";
|
||||
|
|
|
|||
|
|
@ -66,6 +66,9 @@ public class Statistics {
|
|||
//TODO BUG修复同步
|
||||
public static boolean bugsyncfixed = false;
|
||||
|
||||
//TODO 警告
|
||||
public static boolean tipsgodungeon = false;
|
||||
|
||||
public static int dageCollected;
|
||||
|
||||
//Directly add float time will cause accuracy lose and stop timing if time is long enough
|
||||
|
|
@ -99,6 +102,8 @@ public class Statistics {
|
|||
|
||||
amuletObtained = false;
|
||||
|
||||
tipsgodungeon = false;
|
||||
|
||||
fireGirlnoshopping = false;
|
||||
|
||||
deadshoppingdied = false;
|
||||
|
|
@ -153,10 +158,14 @@ public class Statistics {
|
|||
//TODO BUG修复的机制
|
||||
private static final String BUG_SYNC_FIXED = "bugsyncfixed";
|
||||
|
||||
private static final String TIPSGO = "tipsgo";
|
||||
|
||||
public static void storeInBundle( Bundle bundle ) {
|
||||
bundle.put( LANTERACTIVE, lanterfireactive );
|
||||
|
||||
|
||||
|
||||
bundle.put( TIPSGO, tipsgodungeon );
|
||||
//TODO BUG修复的机制
|
||||
bundle.put( BUG_SYNC_FIXED, bugsyncfixed );
|
||||
|
||||
|
|
@ -226,6 +235,8 @@ public class Statistics {
|
|||
|
||||
bugsyncfixed = bundle.getBoolean( BUG_SYNC_FIXED );
|
||||
|
||||
tipsgodungeon = bundle.getBoolean(TIPSGO);
|
||||
|
||||
//SPD
|
||||
second_elapsed = bundle.getFloat("real_time_passed");
|
||||
real_seconds = bundle.getLong("real_seconds_passed");
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Challenges.PRO;
|
|||
import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.SPDSettings.HelpSettings;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.Statistics.lanterfireactive;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.Statistics.tipsgodungeon;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.levels.Level.set;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
|
|
@ -95,6 +96,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Monk;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Snake;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.lb.BlackSoul;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Slyl;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.custom.ch.GameTracker;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.effects.CheckedCell;
|
||||
|
|
@ -175,6 +177,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.StatusPane;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndHero;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndStory;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndTradeItem;
|
||||
|
|
@ -1206,6 +1209,16 @@ public class Hero extends Char {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private void tell(String text) {
|
||||
Game.runOnRenderThread(new Callback() {
|
||||
@Override
|
||||
public void call() {
|
||||
GameScene.show(new WndQuest(new Slyl(), text));
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private boolean actDescend( HeroAction.Descend action ) {
|
||||
int stairs = action.dst;
|
||||
|
|
@ -1217,28 +1230,41 @@ public class Hero extends Char {
|
|||
//there can be multiple exit tiles, so descend on any of them
|
||||
//TODO this is slightly brittle, it assumes there are no disjointed sets of exit tiles
|
||||
} else if ((Dungeon.level.map[pos] == Terrain.EXIT || Dungeon.level.map[pos] == Terrain.UNLOCKED_EXIT)) {
|
||||
|
||||
curAction = null;
|
||||
|
||||
TimekeepersHourglass.timeFreeze timeFreeze = buff(TimekeepersHourglass.timeFreeze.class);
|
||||
if (timeFreeze != null) timeFreeze.disarmPressedTraps();
|
||||
Swiftthistle.TimeBubble timeBubble = buff(Swiftthistle.TimeBubble.class);
|
||||
if (timeBubble != null) timeBubble.disarmPressedTraps();
|
||||
|
||||
InterlevelScene.mode = InterlevelScene.Mode.DESCEND;
|
||||
Game.switchScene( InterlevelScene.class );
|
||||
if (Dungeon.depth == 0 && !tipsgodungeon) {
|
||||
|
||||
return false;
|
||||
if (!tipsgodungeon) {
|
||||
Game.runOnRenderThread(new Callback() {
|
||||
@Override
|
||||
public void call() {
|
||||
tell(Messages.get(Hero.this, "acs"));
|
||||
}
|
||||
});
|
||||
ready();
|
||||
tipsgodungeon = true;
|
||||
}
|
||||
} else {
|
||||
|
||||
curAction = null;
|
||||
|
||||
TimekeepersHourglass.timeFreeze timeFreeze = buff(TimekeepersHourglass.timeFreeze.class);
|
||||
if (timeFreeze != null) timeFreeze.disarmPressedTraps();
|
||||
Swiftthistle.TimeBubble timeBubble = buff(Swiftthistle.TimeBubble.class);
|
||||
if (timeBubble != null) timeBubble.disarmPressedTraps();
|
||||
|
||||
InterlevelScene.mode = InterlevelScene.Mode.DESCEND;
|
||||
Game.switchScene(InterlevelScene.class);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
} else if (getCloser( stairs )) {
|
||||
|
||||
return true;
|
||||
|
||||
} else {
|
||||
ready();
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
ready();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean actAscend( HeroAction.Ascend action ) {
|
||||
int stairs = action.dst;
|
||||
|
|
@ -1253,22 +1279,42 @@ public class Hero extends Char {
|
|||
} else if (Dungeon.level.map[pos] == Terrain.ENTRANCE) {
|
||||
|
||||
if (Dungeon.depth == 0) {
|
||||
|
||||
if (belongings.getItem( Amulet.class ) == null) {
|
||||
|
||||
if (belongings.getItem(Amulet.class) == null) {
|
||||
Game.runOnRenderThread(new Callback() {
|
||||
@Override
|
||||
public void call() {
|
||||
GameScene.show( new WndMessage( Messages.get(Hero.this, "leave") ) );
|
||||
GameScene.show(new WndMessage(Messages.get(Hero.this, "leave")));
|
||||
}
|
||||
});
|
||||
ready();
|
||||
} else {
|
||||
Badges.silentValidateHappyEnd();
|
||||
Dungeon.win( Amulet.class );
|
||||
Dungeon.deleteGame( GamesInProgress.curSlot, true );
|
||||
Game.switchScene( SurfaceScene.class );
|
||||
Dungeon.win(Amulet.class);
|
||||
Dungeon.deleteGame(GamesInProgress.curSlot, true);
|
||||
Game.switchScene(SurfaceScene.class);
|
||||
}
|
||||
} else if (Dungeon.depth == 1) {
|
||||
|
||||
if (belongings.getItem( Amulet.class ) == null) {
|
||||
Game.runOnRenderThread(new Callback() {
|
||||
@Override
|
||||
public void call() {
|
||||
GameScene.show( new WndMessage( Messages.get(Hero.this, "leave2") ) );
|
||||
}
|
||||
});
|
||||
ready();
|
||||
} else {
|
||||
curAction = null;
|
||||
|
||||
TimekeepersHourglass.timeFreeze timeFreeze = buff(TimekeepersHourglass.timeFreeze.class);
|
||||
if (timeFreeze != null) timeFreeze.disarmPressedTraps();
|
||||
Swiftthistle.TimeBubble timeBubble = buff(Swiftthistle.TimeBubble.class);
|
||||
if (timeBubble != null) timeBubble.disarmPressedTraps();
|
||||
|
||||
InterlevelScene.mode = InterlevelScene.Mode.ASCEND;
|
||||
Game.switchScene( InterlevelScene.class );
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
curAction = null;
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@ public enum HeroClass {
|
|||
// Buff.affect(hero, ChampionHero.Giant.class, ChampionHero.DURATION);
|
||||
// Buff.affect(hero, ChampionHero.Growing.class, ChampionHero.DURATION);
|
||||
new Gauntlet().quantity(1).identify().collect();
|
||||
|
||||
new Cake().quantity(100).identify().collect();
|
||||
new TengusMask().quantity(1).identify().collect();
|
||||
new KingsCrown().quantity(1).identify().collect();
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Firebomb;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Flashbang;
|
||||
|
|
@ -20,7 +17,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.IceCityBoo
|
|||
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.MagicGirlBooks;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.NoKingMobBooks;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.YellowSunBooks;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.journal.Notes;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.NyzSprites;
|
||||
|
|
@ -92,23 +88,6 @@ public class Nyz extends NPC {
|
|||
return 1000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void damage( int dmg, Object src ) {
|
||||
flee();
|
||||
}
|
||||
|
||||
public void flee() {
|
||||
destroy();
|
||||
Notes.remove(Notes.Landmark.SHOP);
|
||||
sprite.killAndErase();
|
||||
CellEmitter.get( pos ).burst( ElmoParticle.FACTORY, 6 );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add( Buff buff ) {
|
||||
flee();
|
||||
}
|
||||
|
||||
private void tell(String text) {
|
||||
Game.runOnRenderThread(new Callback() {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import com.watabou.utils.Random;
|
|||
|
||||
public class Slyl extends NPC {
|
||||
|
||||
private static final String[] TXT_RANDOM = {"始作俑者是……","继续调查，她快来了","风暴正在袭来，何处才有我们的结局？"};
|
||||
private static final String[] TXT_RANDOM = {"始作俑者是……","我们真的在做正确的事吗？","风暴正在袭来，何处才有我们的结局？"};
|
||||
|
||||
{
|
||||
spriteClass = SlylSprite.class;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ public class CrystalKey extends Key {
|
|||
{
|
||||
image = ItemSpriteSheet.CRYSTAL_KEY;
|
||||
}
|
||||
|
||||
public CrystalKey() {
|
||||
this( 0 );
|
||||
}
|
||||
|
||||
public CrystalKey( int depth ) {
|
||||
super();
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.RunicBlade;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Sai;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Scimitar;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Shortsword;
|
||||
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;
|
||||
|
|
@ -203,7 +204,7 @@ public enum Catalog {
|
|||
WEAPONS.seen.put( Gauntlet.class, false);
|
||||
//WEAPONS.seen.put( GreenSword.class, false);
|
||||
WEAPONS.seen.put( LockSword.class, false);
|
||||
//WEAPONS.seen.put( RedBloodMoon.class, false);
|
||||
WEAPONS.seen.put( SkyShield.class, false);
|
||||
WEAPONS.seen.put( Dairikyan.class, false);
|
||||
WEAPONS.seen.put( BlackDog.class, false);
|
||||
WEAPONS.seen.put( IceFishSword.class, false);
|
||||
|
|
|
|||
|
|
@ -177,11 +177,11 @@ public class ZeroLevel extends Level {
|
|||
}
|
||||
|
||||
public String tilesTex() {
|
||||
return Assets.Environment.TILES_COLD;
|
||||
return Assets.Environment.TILES_GOLD;
|
||||
}
|
||||
|
||||
public String waterTex() {
|
||||
return Assets.Environment.WATER_COLD;
|
||||
return Assets.Environment.WATER_PRISON;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special;
|
||||
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.Challenges.EXSG;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.levels.RegularLevel.Holiday.HWEEN;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.levels.RegularLevel.Holiday.XMAS;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.AutoShopRoom.Holiday.HWEENX;
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.AutoShopRoom.Holiday.XMASX;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
|
||||
|
|
@ -12,11 +12,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.keys.GoldenKey;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.RegularLevel;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
|
||||
import com.watabou.utils.Random;
|
||||
|
|
@ -25,9 +23,6 @@ import java.util.Calendar;
|
|||
|
||||
public class AutoShopRoom extends SpecialRoom {
|
||||
|
||||
public AutoShopRoom() {
|
||||
}
|
||||
|
||||
public int minWidth() {
|
||||
return 9;
|
||||
}
|
||||
|
|
@ -36,43 +31,43 @@ public class AutoShopRoom extends SpecialRoom {
|
|||
return 9;
|
||||
}
|
||||
|
||||
private static RegularLevel.Holiday holiday;
|
||||
private static Holiday holiday;
|
||||
|
||||
public enum Holiday{
|
||||
NONE,
|
||||
ZQJ, //TBD
|
||||
HWEEN,//2nd week of october though first day of november
|
||||
XMAS //3rd week of december through first week of january
|
||||
ZQJX, //TBD
|
||||
HWEENX,//2nd week of october though first day of november
|
||||
XMASX //3rd week of december through first week of january
|
||||
}
|
||||
|
||||
static{
|
||||
|
||||
holiday = RegularLevel.Holiday.NONE;
|
||||
holiday = Holiday.NONE;
|
||||
|
||||
final Calendar calendar = Calendar.getInstance();
|
||||
switch(calendar.get(Calendar.MONTH)){
|
||||
case Calendar.JANUARY:
|
||||
if (calendar.get(Calendar.WEEK_OF_MONTH) == 1)
|
||||
holiday = XMAS;
|
||||
holiday = XMASX;
|
||||
break;
|
||||
//2022 9.10-10.1
|
||||
case Calendar.SEPTEMBER:
|
||||
if (calendar.get(Calendar.DAY_OF_MONTH) >= 10 ){
|
||||
holiday = RegularLevel.Holiday.ZQJ;
|
||||
holiday = Holiday.ZQJX;
|
||||
} else {
|
||||
holiday = RegularLevel.Holiday.NONE;
|
||||
holiday = Holiday.NONE;
|
||||
}
|
||||
break;
|
||||
case Calendar.OCTOBER:
|
||||
if (calendar.get(Calendar.DAY_OF_MONTH) == 1 ){
|
||||
holiday = RegularLevel.Holiday.ZQJ;
|
||||
holiday = Holiday.ZQJX;
|
||||
} else {
|
||||
holiday = RegularLevel.Holiday.NONE;
|
||||
holiday = Holiday.NONE;
|
||||
}
|
||||
break;
|
||||
case Calendar.DECEMBER:
|
||||
if (calendar.get(Calendar.WEEK_OF_MONTH) >= 3)
|
||||
holiday = XMAS;
|
||||
holiday = XMASX;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -81,16 +76,16 @@ public class AutoShopRoom extends SpecialRoom {
|
|||
Painter.fill(level, this, 4);
|
||||
Painter.fill(level, this, 1, 14);
|
||||
|
||||
if(holiday == HWEEN || holiday == XMAS|| Dungeon.isChallenged(EXSG)) {
|
||||
if(holiday == HWEENX || holiday == XMASX|| Dungeon.isChallenged(EXSG)) {
|
||||
placeShopkeeper(level);
|
||||
}
|
||||
|
||||
for (Room.Door door : this.connected.values()) {
|
||||
door.set(Door.Type.LOCKED);
|
||||
door.set(Door.Type.REGULAR);
|
||||
}
|
||||
Door entrance = entrance();
|
||||
entrance.set( Door.Type.LOCKED );
|
||||
level.addItemToSpawn( new IronKey( Dungeon.depth ) );
|
||||
entrance.set( Door.Type.REGULAR );
|
||||
//level.addItemToSpawn( new IronKey( Dungeon.depth ) );
|
||||
int door = entrance.x + entrance.y * level.width();
|
||||
|
||||
//布局 x2 箱子 左
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ public class InterlevelScene extends PixelScene {
|
|||
loadingDepth = returnDepth;
|
||||
break;
|
||||
}
|
||||
if (loadingDepth == 1) loadingAsset = Assets.Interfaces.LOADING_COLD;
|
||||
if (Dungeon.depth == 0) loadingAsset = Assets.Interfaces.LOADING_GOLD;
|
||||
else if (loadingDepth <= 5) loadingAsset = Assets.Interfaces.LOADING_SEWERS;
|
||||
else if (loadingDepth <= 10) loadingAsset = Assets.Interfaces.LOADING_PRISON;
|
||||
else if (loadingDepth <= 15) loadingAsset = Assets.Interfaces.LOADING_COLD;
|
||||
|
|
|
|||
|
|
@ -11,10 +11,8 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Flare;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.services.news.News;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.services.updates.Updates;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.ColdGuardSprite;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.MolotovHuntsmanSprite;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ui.Archs;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ui.EndButton;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ui.StyledButton;
|
||||
|
|
@ -185,7 +183,7 @@ public class TitleScene extends PixelScene {
|
|||
return super.onLongClick();
|
||||
}
|
||||
};
|
||||
btnPlay.icon(new ItemSprite(ItemSpriteSheet.ENDDIED, null));
|
||||
btnPlay.icon(new ItemSprite(ItemSpriteSheet.MAGICGIRLBOOKS, null));
|
||||
add(btnPlay);
|
||||
|
||||
StyledButton btnRankings = new StyledButton(GREY_TR,Messages.get(this, "rankings")) {
|
||||
|
|
@ -194,7 +192,7 @@ public class TitleScene extends PixelScene {
|
|||
ShatteredPixelDungeon.switchNoFade(RankingsScene.class);
|
||||
}
|
||||
};
|
||||
btnRankings.icon(new ItemSprite(ItemSpriteSheet.ANKH, null));
|
||||
btnRankings.icon(new ItemSprite(ItemSpriteSheet.BREDBOOK, null));
|
||||
add(btnRankings);
|
||||
|
||||
StyledButton btnBadges = new StyledButton(GREY_TR, Messages.get(this, "badges")) {
|
||||
|
|
@ -203,7 +201,7 @@ public class TitleScene extends PixelScene {
|
|||
ShatteredPixelDungeon.switchNoFade(BadgesScene.class);
|
||||
}
|
||||
};
|
||||
btnBadges.icon(new ItemSprite(ItemSpriteSheet.DG12, null));
|
||||
btnBadges.icon(new ItemSprite(ItemSpriteSheet.GREENBOOKS, null));
|
||||
add(btnBadges);
|
||||
|
||||
StyledButton btnSupport = new SupportButton(GREY_TR, Messages.get(this, "support"));
|
||||
|
|
@ -222,7 +220,7 @@ public class TitleScene extends PixelScene {
|
|||
ShatteredPixelDungeon.switchNoFade( AboutSelectScene.class );
|
||||
}
|
||||
};
|
||||
btnAbout.icon(new ItemSprite(ItemSpriteSheet.MAGICGIRLBOOKS, null));
|
||||
btnAbout.icon(new ItemSprite(ItemSpriteSheet.FIRELIYD, null));
|
||||
add(btnAbout);
|
||||
|
||||
StyledButton btnNews = new NewsButton(GREY_TR, Messages.get(this, "news"));
|
||||
|
|
@ -283,13 +281,13 @@ public class TitleScene extends PixelScene {
|
|||
}
|
||||
|
||||
private void placeTorch2( float x, float y ) {
|
||||
Image fb = (new MolotovHuntsmanSprite());
|
||||
Image fb = (new ItemSprite(ItemSpriteSheet.CAKE));
|
||||
fb.setPos( x, y );
|
||||
add( fb );
|
||||
}
|
||||
|
||||
private void placeTorch3( float x, float y ) {
|
||||
Image fb = (new ColdGuardSprite());
|
||||
Image fb = (new ItemSprite(ItemSpriteSheet.SWTR));
|
||||
fb.setPos( x, y );
|
||||
add( fb );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,6 +87,26 @@ public class vM0_6_7_X_Changes {
|
|||
}
|
||||
|
||||
public static void add_v0_6_19_Changes( ArrayList<ChangeInfo> changeInfos ) {
|
||||
|
||||
ChangeInfo changesx = new ChangeInfo("v0.6.0.0-Beta21-p2.920", true, "");
|
||||
changesx.hardlight(Window.TITLE_COLOR);
|
||||
changeInfos.add(changesx);
|
||||
|
||||
changesx = new ChangeInfo("新内容", false, null);
|
||||
changesx.hardlight(Window.GREEN_COLOR);
|
||||
changeInfos.add(changesx);
|
||||
|
||||
changesx.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.AMULET), ("0层改动"),
|
||||
("现在0层不可以随进随出了，且水晶之心的背景故事略做调整" )));
|
||||
|
||||
changesx = new ChangeInfo("修复", false, null);
|
||||
changesx.hardlight(Window.CYELLOW);
|
||||
changeInfos.add(changesx);
|
||||
|
||||
changesx.addButton(new ChangeButton(new Image("sprites/spinner.png", 144, 0, 16, 16),
|
||||
(Messages.get(ChangesScene.class, "bugfixes")),
|
||||
Messages.get(vM0_6_7_X_Changes.class, "bug_06X38")));
|
||||
|
||||
ChangeInfo changes = new ChangeInfo("v0.6.0.0-Beta21-p2.910", true, "");
|
||||
changes.hardlight(Window.TITLE_COLOR);
|
||||
changeInfos.add(changes);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user