Merging 1.9.1 source: item changes

2015-11-11 02:01:25 -05:00
parent bc1e3ee17a
commit 366dce1610
86 changed files with 409 additions and 352 deletions
@@ -60,8 +60,8 @@ public class WandOfLightning extends Wand {
 		float multipler = 0.4f + (0.6f/affected.size());
 		if (Level.water[bolt.collisionPos]) multipler *= 1.5f;

-		int min = 5+level;
-		int max = Math.round(10 + (level * level / 4f));
+		int min = 5+level();
+		int max = Math.round(10 + (level() * level() / 4f));

 		for (Char ch : affected){
 			processSoulMark(ch, chargesPerCast());