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/HornOfPlenty.java
+5 -6
View File
@@ -49,7 +49,6 @@ public class HornOfPlenty extends Artifact {
name = "Horn of Plenty";
image = ItemSpriteSheet.ARTIFACT_HORN1;
level = 0;
levelCap = 30;
charge = 0;
@@ -74,7 +73,7 @@ public class HornOfPlenty extends Artifact {
ArrayList<String> actions = super.actions( hero );
if (isEquipped( hero ) && charge > 0)
actions.add(AC_EAT);
if (isEquipped( hero ) && level < 30 && !cursed)
if (isEquipped( hero ) && level() < 30 && !cursed)
actions.add(AC_STORE);
return actions;
}
@@ -158,7 +157,7 @@ public class HornOfPlenty extends Artifact {
if (!cursed) {
desc += "\n\nThe horn rests at your side and is surprisingly lightweight, even with food in it.";
if (level < 15)
if (level() < 15)
desc += " Perhaps there is a way to increase the horn's power by giving it food energy.";
} else {
desc += "\n\nThe cursed horn has bound itself to your side, " +
@@ -178,7 +177,7 @@ public class HornOfPlenty extends Artifact {
//generates 0.25 food value every round, +0.015 value per level
//to a max of 0.70 food value per round (0.25+0.5, at level 30)
partialCharge += 0.25f + (0.015f*level);
partialCharge += 0.25f + (0.015f*level());
//charge is in increments of 36 food value.
if (partialCharge >= 36) {
@@ -224,8 +223,8 @@ public class HornOfPlenty extends Artifact {
hero.spend( TIME_TO_EAT );
curItem.upgrade(((Food)item).hornValue);
if (curItem.level >= 30){
curItem.level = 30;
if (curItem.level() >= 30){
curItem.level(30);
GLog.p("your horn has consumed all the food it can!");
} else
GLog.p("the horn consumes your food offering and grows in strength!");