Merging 1.9.1 source: item changes

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java

@@ -283,10 +283,10 @@ public class Ring extends KindofMisc {
 		}
 
 		if (Random.Float() < 0.3f) {
-			level = -n;
+			level(-n);
 			cursed = true;
 		} else
-			level = n;
+			level(n);
 
 		return this;
 	}
@@ -302,10 +302,10 @@ public class Ring extends KindofMisc {
 			price /= 2;
 		}
 		if (levelKnown) {
-			if (level > 0) {
-				price *= (level + 1);
-			} else if (level < 0) {
-				price /= (1 - level);
+			if (level() > 0) {
+				price *= (level() + 1);
+			} else if (level() < 0) {
+				price /= (1 - level());
 			}
 		}
 		if (price < 1) {
@@ -340,7 +340,7 @@ public class Ring extends KindofMisc {
 		
 		public int level;
 		public RingBuff() {
-			level = Ring.this.level;
+			level = Ring.this.level();
 		}
 		
 		@Override

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java

@@ -43,7 +43,7 @@ public class RingOfForce extends Ring {
 					"When unarmed, at your current strength, ";
 			int str = Dungeon.hero.STR() - 8;
 			desc += levelKnown ?
-					"average damage with this ring is " + (str/2+level + (int)(str*0.5f*level) + str*2)/2 + " points per hit.":
+					"average damage with this ring is " + (str/2+level() + (int)(str*0.5f*level()) + str*2)/2 + " points per hit.":
 					"typical average damage with this ring is" + (str/2+1 + (int)(str*0.5f) + str*2)/2 + " points per hit.";
 			desc += " Wearing a second ring of force would enhance this.";
 			return desc;