LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.4.0: rebalanced ring of force around new equipment

Browse Source 
also some refactoring to it
This commit is contained in:
Evan Debenham 2016-05-28 20:06:09 -04:00
parent ffe9b6d80a
commit 256cca2e7e
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -319,7 +319,7 @@ public class Hero extends Char {
dmg = wep.damageRoll( this ) + bonus;
} else {
if (bonus != 0){
dmg = Random.NormalIntRange( RingOfForce.min(bonus, STR()), RingOfForce.max(bonus, STR()) );
dmg = RingOfForce.damageRoll(this);
} else {
dmg = Random.NormalIntRange(1, Math.max(STR()-8, 1));
}

42
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java
View File

@ -21,7 +21,10 @@
package com.shatteredpixel.shatteredpixeldungeon.items.rings;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.utils.Random;
public class RingOfForce extends Ring {
@ -30,26 +33,43 @@ public class RingOfForce extends Ring {
return new Force();
}
public static int min(int bonus, int herostr){
if (bonus < 0) return 0;
int STR = herostr-8;
return Math.max(STR/2+bonus, 0);
private static float tier(int str){
return Math.max(1, (str - 8)/2f);
}
public static int max(int bonus, int herostr){
if (bonus < 0) return 0;
int STR = herostr-8;
return Math.max((int)(STR*0.5f*bonus) + STR*2, bonus);
public static int damageRoll( Hero hero ){
int level = 0;
for (Buff buff : hero.buffs( RingOfForce.Force.class )) {
level += ((RingOfForce.Force)buff).level;
}
float tier = tier(hero.STR());
return Random.NormalIntRange(min(level, tier), max(level, tier));
}
//same as equivalent tier weapon
private static int min(int lvl, float tier){
return Math.round(
tier + //base
lvl //level scaling
);
}
//20% reduced from equivalent tier weapon
private static int max(int lvl, float tier){
return Math.round(
4*(tier+1) + //base, 20% reduced from equivalent tier
lvl*(tier) //level scaling, 1 reduced from equivalent tier
);
}
@Override
public String desc() {
String desc = super.desc();
int str = Dungeon.hero.STR();
float tier = tier(Dungeon.hero.STR());
if (levelKnown) {
desc += "\n\n" + Messages.get(this, "avg_dmg", (min(level(), str) + max(level(), str))/2);
desc += "\n\n" + Messages.get(this, "avg_dmg", (min(level(), tier) + max(level(), tier))/2);
} else {
desc += "\n\n" + Messages.get(this, "typical_avg_dmg", (min(1, str) + max(1, str))/2);
desc += "\n\n" + Messages.get(this, "typical_avg_dmg", (min(1, tier) + max(1, tier))/2);
}
return desc;