konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.3.4: fixed some text errors

Browse Source
This commit is contained in:
Evan Debenham
2016-02-01 03:29:29 -05:00
committed by Evan Debenham
parent e1cb5ca0ea
commit 5ebe318872
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
+2 -2
View File
@@ -22,11 +22,11 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ShopkeeperSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ShopkeeperSprite;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
@@ -80,7 +80,7 @@ public class Shopkeeper extends NPC {
} }
public static WndBag sell() { public static WndBag sell() {
return GameScene.selectItem( itemSelector, WndBag.Mode.FOR_SALE, "Select an item to sell" ); return GameScene.selectItem( itemSelector, WndBag.Mode.FOR_SALE, Messages.get(Shopkeeper.class, "sell"));
} }
private static WndBag.Listener itemSelector = new WndBag.Listener() { private static WndBag.Listener itemSelector = new WndBag.Listener() {
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java
+6 -7
View File
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Chains; import com.shatteredpixel.shatteredpixeldungeon.effects.Chains;
import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing;
@@ -111,10 +110,10 @@ public class EtherealChains extends Artifact {
final Char affected = Actor.findChar( chain.collisionPos ); final Char affected = Actor.findChar( chain.collisionPos );
int chargeUse = Level.distance(affected.pos, newMobPos); int chargeUse = Level.distance(affected.pos, newMobPos);
if (chargeUse > charge) { if (chargeUse > charge) {
GLog.w( Messages.get(this, "no_charge") ); GLog.w( Messages.get(EtherealChains.class, "no_charge") );
return; return;
} else if (affected.properties().contains(Char.Property.IMMOVABLE)) { } else if (affected.properties().contains(Char.Property.IMMOVABLE)) {
GLog.w( Messages.get(this, "cant_pull") ); GLog.w( Messages.get(EtherealChains.class, "cant_pull") );
return; return;
} else { } else {
charge -= chargeUse; charge -= chargeUse;
@@ -145,12 +144,12 @@ public class EtherealChains extends Artifact {
if (!Level.solid[i] && Actor.findChar(i) == null) newPos = i; if (!Level.solid[i] && Actor.findChar(i) == null) newPos = i;
} }
if (newPos == -1) { if (newPos == -1) {
GLog.w( Messages.get(this, "does_nothing") ); GLog.w( Messages.get(EtherealChains.class, "does_nothing") );
} else { } else {
final int newHeroPos = newPos; final int newHeroPos = newPos;
int chargeUse = Level.distance(curUser.pos, newHeroPos); int chargeUse = Level.distance(curUser.pos, newHeroPos);
if (chargeUse > charge){ if (chargeUse > charge){
GLog.w( Messages.get(this, "no_charge") ); GLog.w( Messages.get(EtherealChains.class, "no_charge") );
return; return;
} else { } else {
charge -= chargeUse; charge -= chargeUse;
@@ -172,7 +171,7 @@ public class EtherealChains extends Artifact {
} }
} else { } else {
GLog.i( Messages.get(this, "nothing_to_grab") ); GLog.i( Messages.get(EtherealChains.class, "nothing_to_grab") );
} }
} }
@@ -181,7 +180,7 @@ public class EtherealChains extends Artifact {
@Override @Override
public String prompt() { public String prompt() {
return Messages.get(this, "prompt"); return Messages.get(EtherealChains.class, "prompt");
} }
}; };
src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties
+2 -1
View File
@@ -41,7 +41,8 @@ scenes.startscene.yes=Yes, start new game
scenes.startscene.no=No, return to main menu scenes.startscene.no=No, return to main menu
scenes.startscene.unlock=To unlock the Huntress,\nslay the boss on floor 15. scenes.startscene.unlock=To unlock the Huntress,\nslay the boss on floor 15.
scenes.startscene.need_to_win=To unlock Challenges, win the game with any character class. scenes.startscene.need_to_win=To unlock Challenges, win the game with any character class.
scenes.surfacesscene.exit=Game Over
scenes.surfacescene.exit=Game Over
scenes.titlescene.play=Play scenes.titlescene.play=Play
scenes.titlescene.rankings=Rankings scenes.titlescene.rankings=Rankings