Merging 1.9.1 source: item changes

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
@@ -86,11 +86,10 @@ public class LloydsBeacon extends Artifact {
name = "lloyd's beacon";
image = ItemSpriteSheet.ARTIFACT_BEACON;
level = 0;
levelCap = 3;
charge = 0;
chargeCap = 3+level;
chargeCap = 3+level();
defaultAction = AC_ZAP;
usesTargeting = true;