konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+2 -5
View File
@@ -127,9 +127,6 @@ public class Hero extends Char {
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;
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 PotionOfStrength || item instanceof PotionOfMight) && ((Potion)item).isKnown());
if (important) {
GLog.p( TXT_YOU_NOW_HAVE, item.name() );
GLog.p( Messages.get(this, "you_now_have", item.name()) );
} else {
GLog.i( TXT_YOU_NOW_HAVE, item.name() );
GLog.i( Messages.get(this, "you_now_have", item.name()) );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
+2 -3
View File
@@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
import java.util.Collection;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
@@ -29,8 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Journal;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
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.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.DarkGold;
@@ -101,7 +100,7 @@ public class Blacksmith extends NPC {
Pickaxe pick = new Pickaxe();
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 {
Dungeon.level.drop( pick, Dungeon.hero.pos ).sprite.drop();
}