LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding in changes missed in merge

Browse Source
This commit is contained in:
Evan Debenham 2016-05-08 19:17:47 -04:00
parent e6853c9eb6
commit c6ba32075c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
View File

@ -108,7 +108,7 @@ public enum HeroClass {
Dart darts = new Dart( 8 ); Dart darts = new Dart( 8 );
darts.identify().collect(); darts.identify().collect();
if ( Badges.global.contains(Badges.Badge.TUTORIAL_WARRIOR) ){ if ( Badges.isUnlocked(Badges.Badge.TUTORIAL_WARRIOR) ){
if (!Dungeon.isChallenged(Challenges.NO_ARMOR)) if (!Dungeon.isChallenged(Challenges.NO_ARMOR))
hero.belongings.armor.affixSeal(new BrokenSeal()); hero.belongings.armor.affixSeal(new BrokenSeal());
Dungeon.quickslot.setSlot(0, darts); Dungeon.quickslot.setSlot(0, darts);
@ -127,7 +127,7 @@ public enum HeroClass {
private static void initMage( Hero hero ) { private static void initMage( Hero hero ) {
MagesStaff staff; MagesStaff staff;
if ( Badges.global.contains(Badges.Badge.TUTORIAL_MAGE) ){ if ( Badges.isUnlocked(Badges.Badge.TUTORIAL_MAGE) ){
staff = new MagesStaff(new WandOfMagicMissile()); staff = new MagesStaff(new WandOfMagicMissile());
} else { } else {
staff = new MagesStaff(); staff = new MagesStaff();

6
src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
View File

@ -49,10 +49,8 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndTitledMessage;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundlable; import com.watabou.utils.Bundlable;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
@ -125,9 +123,9 @@ public class Heap implements Bundlable {
case TOMB: case TOMB:
Wraith.spawnAround( hero.pos ); Wraith.spawnAround( hero.pos );
break; break;
case SKELETON:
case REMAINS: case REMAINS:
CellEmitter.center( pos ).start( Speck.factory( Speck.RATTLE ), 0.1f, 3 ); case SKELETON:
CellEmitter.center( pos ).start(Speck.factory(Speck.RATTLE), 0.1f, 3);
for (Item item : items) { for (Item item : items) {
if (item.cursed) { if (item.cursed) {
if (Wraith.spawnAt( pos ) == null) { if (Wraith.spawnAt( pos ) == null) {

1
src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
View File

@ -136,6 +136,7 @@ public class RankingsScene extends PixelScene {
noRec.hardlight( 0xCCCCCC ); noRec.hardlight( 0xCCCCCC );
noRec.x = (w - noRec.width()) / 2; noRec.x = (w - noRec.width()) / 2;
noRec.y = (h - noRec.height()) / 2; noRec.y = (h - noRec.height()) / 2;
align(noRec);
add(noRec); add(noRec);
} }

1
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
View File

@ -117,6 +117,7 @@ public class WndLangs extends Window {
title.x = textLeft + (textWidth - title.width())/2f; title.x = textLeft + (textWidth - title.width())/2f;
title.y = 0; title.y = 0;
title.hardlight(TITLE_COLOR); title.hardlight(TITLE_COLOR);
PixelScene.align(title);
add(title); add(title);
if (currLang == Languages.ENGLISH){ if (currLang == Languages.ENGLISH){