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/weapon/melee/MagesStaff.java
+8 -6
View File
@@ -69,14 +69,16 @@ public class MagesStaff extends MeleeWeapon {
public MagesStaff() {
//tier 1 weapon with poor base stats.
super(1, 1f, 1f);
MIN = 1;
MAX = 6;
wand = null;
}
@Override
protected int maxBase() {
return 6; //6 base damage instead of 10
}
public MagesStaff(Wand wand){
this();
wand.identify();
@@ -156,15 +158,15 @@ public class MagesStaff extends MeleeWeapon {
}
//syncs the level of the two items.
int targetLevel = Math.max(this.level, wand.level);
int targetLevel = Math.max(this.level(), wand.level());
int staffLevelDiff = targetLevel - this.level;
int staffLevelDiff = targetLevel - this.level();
if (staffLevelDiff > 0)
this.upgrade(staffLevelDiff);
else if (staffLevelDiff < 0)
this.degrade(Math.abs(staffLevelDiff));
int wandLevelDiff = targetLevel - wand.level;
int wandLevelDiff = targetLevel - wand.level();
if (wandLevelDiff > 0)
wand.upgrade(wandLevelDiff);
else if (wandLevelDiff < 0)