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

v0.3.4: fixed TXT_YOU_NOW_HAVE

Browse Source
This commit is contained in:
Evan Debenham 2015-12-28 23:24:55 -05:00 committed by Evan Debenham
parent 39702bbb41
commit 44cead2244
6 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -127,9 +127,6 @@ public class Hero extends Char {
public static final int MAX_LEVEL = 30; public static final int MAX_LEVEL = 30;
//TODO: remove this static variable
public static final String TXT_YOU_NOW_HAVE = Messages.get(Hero.class, "you_now_have");
public static final int STARTING_STR = 10; public static final int STARTING_STR = 10;
private static final float TIME_TO_REST = 1f; private static final float TIME_TO_REST = 1f;
@ -615,9 +612,9 @@ public class Hero extends Char {
((item instanceof ScrollOfUpgrade || item instanceof ScrollOfMagicalInfusion) && ((Scroll)item).isKnown()) || ((item instanceof ScrollOfUpgrade || item instanceof ScrollOfMagicalInfusion) && ((Scroll)item).isKnown()) ||
((item instanceof PotionOfStrength || item instanceof PotionOfMight) && ((Potion)item).isKnown()); ((item instanceof PotionOfStrength || item instanceof PotionOfMight) && ((Potion)item).isKnown());
if (important) { if (important) {
GLog.p( TXT_YOU_NOW_HAVE, item.name() ); GLog.p( Messages.get(this, "you_now_have", item.name()) );
} else { } else {
GLog.i( TXT_YOU_NOW_HAVE, item.name() ); GLog.i( Messages.get(this, "you_now_have", item.name()) );
} }
} }

5
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
View File

@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
import java.util.Collection; import java.util.Collection;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Badges;
@ -29,8 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Journal; import com.shatteredpixel.shatteredpixeldungeon.Journal;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; 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.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.DarkGold; import com.shatteredpixel.shatteredpixeldungeon.items.quest.DarkGold;
@ -101,7 +100,7 @@ public class Blacksmith extends NPC {
Pickaxe pick = new Pickaxe(); Pickaxe pick = new Pickaxe();
if (pick.doPickUp( Dungeon.hero )) { if (pick.doPickUp( Dungeon.hero )) {
GLog.i( Hero.TXT_YOU_NOW_HAVE, pick.name() ); GLog.i( Messages.get(Dungeon.hero, "you_now_have", pick.name() ));
} else { } else {
Dungeon.level.drop( pick, Dungeon.hero.pos ).sprite.drop(); Dungeon.level.drop( pick, Dungeon.hero.pos ).sprite.drop();
} }

3
src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java
View File

@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.quest;
import java.util.ArrayList; import java.util.ArrayList;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@ -113,7 +114,7 @@ public class Pickaxe extends Weapon {
DarkGold gold = new DarkGold(); DarkGold gold = new DarkGold();
if (gold.doPickUp( Dungeon.hero )) { if (gold.doPickUp( Dungeon.hero )) {
GLog.i( Hero.TXT_YOU_NOW_HAVE, gold.name() ); GLog.i( Messages.get(Dungeon.hero, "you_now_have", gold.name()) );
} else { } else {
Dungeon.level.drop( gold, hero.pos ).sprite.drop(); Dungeon.level.drop( gold, hero.pos ).sprite.drop();
} }

4
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java
View File

@ -20,9 +20,9 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.windows; package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.BitmapTextMultiline;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.DwarfToken; import com.shatteredpixel.shatteredpixeldungeon.items.quest.DwarfToken;
@ -81,7 +81,7 @@ public class WndImp extends Window {
reward.identify(); reward.identify();
if (reward.doPickUp( Dungeon.hero )) { if (reward.doPickUp( Dungeon.hero )) {
GLog.i( Hero.TXT_YOU_NOW_HAVE, reward.name() ); GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) );
} else { } else {
Dungeon.level.drop( reward, imp.pos ).sprite.drop(); Dungeon.level.drop( reward, imp.pos ).sprite.drop();
} }

4
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java
View File

@ -22,9 +22,9 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.FetidRatSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.FetidRatSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.GnollTricksterSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.GnollTricksterSprite;
@ -121,7 +121,7 @@ public class WndSadGhost extends Window {
hide(); hide();
if (reward.doPickUp( Dungeon.hero )) { if (reward.doPickUp( Dungeon.hero )) {
GLog.i( Hero.TXT_YOU_NOW_HAVE, reward.name() ); GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) );
} else { } else {
Dungeon.level.drop( reward, ghost.pos ).sprite.drop(); Dungeon.level.drop( reward, ghost.pos ).sprite.drop();
} }

4
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java
View File

@ -22,10 +22,10 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust; import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.Embers; import com.shatteredpixel.shatteredpixeldungeon.items.quest.Embers;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Rotberry; import com.shatteredpixel.shatteredpixeldungeon.plants.Rotberry;
import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.BitmapTextMultiline;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
@ -110,7 +110,7 @@ public class WndWandmaker extends Window {
reward.identify(); reward.identify();
if (reward.doPickUp( Dungeon.hero )) { if (reward.doPickUp( Dungeon.hero )) {
GLog.i( Hero.TXT_YOU_NOW_HAVE, reward.name() ); GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) );
} else { } else {
Dungeon.level.drop( reward, wandmaker.pos ).sprite.drop(); Dungeon.level.drop( reward, wandmaker.pos ).sprite.drop();
} }