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

Merging 1.9.1 source: item changes

Browse Source
This commit is contained in:
Evan Debenham
2015-11-11 02:01:25 -05:00
parent bc1e3ee17a
commit 366dce1610
86 changed files with 409 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
+6 -6
View File
@@ -188,7 +188,7 @@ public class Artifact extends KindofMisc {
@Override
public int visiblyUpgraded() {
return ((level*10)/levelCap);
return ((level()*10)/levelCap);
}
//transfers upgrades from another artifact, transfer level will equal the displayed level
@@ -212,7 +212,7 @@ public class Artifact extends KindofMisc {
@Override
public String toString() {
if (levelKnown && level/levelCap != 0) {
if (levelKnown && level()/levelCap != 0) {
if (chargeCap > 0) {
return Utils.format( TXT_TO_STRING_LVL_CHARGE, name(), visiblyUpgraded(), charge, chargeCap );
} else {
@@ -273,8 +273,8 @@ public class Artifact extends KindofMisc {
@Override
public int price() {
int price = 100;
if (level > 0)
price += 50*((level*10)/levelCap);
if (level() > 0)
price += 50*((level()*10)/levelCap);
if (cursed && cursedKnown) {
price /= 2;
}
@@ -293,8 +293,8 @@ public class Artifact extends KindofMisc {
public class ArtifactBuff extends Buff {
public int level() {
return level;
public int itemLevel() {
return level();
}
public boolean isCursed() {