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

v0.4.0: adjusted some item names and descriptions

Browse Source
This commit is contained in:
Evan Debenham
2016-06-05 01:15:11 -04:00
parent 6172b46175
commit 7d97caa406
9 changed files with 34 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+13 -18
View File
@@ -51,11 +51,9 @@ import java.util.Collections;
import java.util.Comparator;
public class Item implements Bundlable {
private static final String TXT_TO_STRING = "%s";
private static final String TXT_TO_STRING_LVL = "%s %+d";
private static final String TXT_TO_STRING_X = "%s x%d";
private static final String TXT_TO_STRING_LVL = "%s%+d";
private static final String TXT_TO_STRING_LVL_X = "%s%+d x%d";
protected static final float TIME_TO_THROW = 1.0f;
protected static final float TIME_TO_PICK_UP = 1.0f;
@@ -345,20 +343,17 @@ public class Item implements Bundlable {
@Override
public String toString() {
if (levelKnown && level != 0) {
if (quantity > 1) {
return Messages.format( TXT_TO_STRING_LVL_X, name(), level, quantity );
} else {
return Messages.format( TXT_TO_STRING_LVL, name(), level );
}
} else {
if (quantity > 1) {
return Messages.format( TXT_TO_STRING_X, name(), quantity );
} else {
return Messages.format( TXT_TO_STRING, name() );
}
}
String name = name();
if (levelKnown && level != 0)
name = Messages.format( TXT_TO_STRING_LVL, name, level );
if (quantity > 1)
name = Messages.format( TXT_TO_STRING_X, name, quantity );
return name;
}
public String name() {