konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: moved barkskin properly into drRoll function

Browse Source
This commit is contained in:
Evan Debenham
2022-12-29 12:45:18 -05:00
parent 855dabefe2
commit 4e534fc23c
44 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@@ -325,9 +325,6 @@ public abstract class Char extends Actor {
} else if (hit( this, enemy, accMulti )) {
int dr = Math.round(enemy.drRoll() * AscensionChallenge.statModifier(enemy));
Barkskin bark = enemy.buff(Barkskin.class);
if (bark != null) dr += Random.NormalIntRange( 0 , bark.level() );
if (this instanceof Hero){
Hero h = (Hero)this;
@@ -524,7 +521,12 @@ public abstract class Char extends Actor {
}
public int drRoll() {
return 0;
int dr = 0;
Barkskin bark = buff(Barkskin.class);
if (bark != null) dr += Random.NormalIntRange( 0 , bark.level() );
return dr;
}
public int damageRoll() {

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

@@ -538,7 +538,7 @@ public class Hero extends Char {
@Override
public int drRoll() {
int dr = 0;
int dr = super.drRoll();
if (belongings.armor() != null) {
int armDr = Random.NormalIntRange( belongings.armor().DRMin(), belongings.armor().DRMax());

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java
View File

@@ -170,8 +170,12 @@ public class SmokeBomb extends ArmorAbility {
@Override
public int drRoll() {
return Random.NormalIntRange(Dungeon.hero.pointsInTalent(Talent.BODY_REPLACEMENT),
int dr = super.drRoll();
dr += Random.NormalIntRange(Dungeon.hero.pointsInTalent(Talent.BODY_REPLACEMENT),
3*Dungeon.hero.pointsInTalent(Talent.BODY_REPLACEMENT));
return dr;
}
{

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java
View File

@@ -44,7 +44,7 @@ public class ArmoredBrute extends Brute {
@Override
public int drRoll() {
return Random.NormalIntRange(6, 10);
return super.drRoll() + Random.NormalIntRange(6, 10);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java
View File

@@ -59,7 +59,7 @@ public class Bat extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 4);
return super.drRoll() + Random.NormalIntRange(0, 4);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java
View File

@@ -67,7 +67,7 @@ public class Brute extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 8);
return super.drRoll() + Random.NormalIntRange(0, 8);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java
View File

@@ -54,6 +54,6 @@ public class Crab extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 4);
return super.drRoll() + Random.NormalIntRange(0, 4);
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM100.java
View File

@@ -69,7 +69,7 @@ public class DM100 extends Mob implements Callback {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 4);
return super.drRoll() + Random.NormalIntRange(0, 4);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java
View File

@@ -68,7 +68,7 @@ public class DM200 extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 8);
return super.drRoll() + Random.NormalIntRange(0, 8);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java
View File

@@ -103,7 +103,7 @@ public class DM300 extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 10);
return super.drRoll() + Random.NormalIntRange(0, 10);
}
public int pylonsActivated = 0;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java
View File

@@ -67,7 +67,7 @@ public class DemonSpawner extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 12);
return super.drRoll() + Random.NormalIntRange(0, 12);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java
View File

@@ -96,7 +96,7 @@ public class DwarfKing extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 10);
return super.drRoll() + Random.NormalIntRange(0, 10);
}
private int phase = 1;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
View File

@@ -96,7 +96,7 @@ public abstract class Elemental extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 5);
return super.drRoll() + Random.NormalIntRange(0, 5);
}
protected int rangedCooldown = Random.NormalIntRange( 3, 5 );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java
View File

@@ -79,7 +79,7 @@ public class Eye extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 10);
return super.drRoll() + Random.NormalIntRange(0, 10);
}
private Ballistica beam;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/FetidRat.java
View File

@@ -54,7 +54,7 @@ public class FetidRat extends Rat {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 2);
return super.drRoll() + Random.NormalIntRange(0, 2);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java
View File

@@ -72,7 +72,7 @@ public class Ghoul extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 4);
return super.drRoll() + Random.NormalIntRange(0, 4);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java
View File

@@ -53,6 +53,6 @@ public class Gnoll extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 2);
return super.drRoll() + Random.NormalIntRange(0, 2);
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java
View File

@@ -70,7 +70,7 @@ public class Golem extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 12);
return super.drRoll() + Random.NormalIntRange(0, 12);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
View File

@@ -95,7 +95,7 @@ public class Goo extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 2);
return super.drRoll() + Random.NormalIntRange(0, 2);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java
View File

@@ -137,7 +137,7 @@ public class Guard extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 7);
return super.drRoll() + Random.NormalIntRange(0, 7);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java
View File

@@ -198,7 +198,7 @@ public class Mimic extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 1 + level/2);
return super.drRoll() + Random.NormalIntRange(0, 1 + level/2);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java
View File

@@ -68,7 +68,7 @@ public class Monk extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 2);
return super.drRoll() + Random.NormalIntRange(0, 2);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java
View File

@@ -81,7 +81,7 @@ public class Necromancer extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 5);
return super.drRoll() + Random.NormalIntRange(0, 5);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java
View File

@@ -85,7 +85,7 @@ public class Piranha extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, Dungeon.depth);
return super.drRoll() + Random.NormalIntRange(0, Dungeon.depth);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java
View File

@@ -60,7 +60,7 @@ public class Rat extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 1);
return super.drRoll() + Random.NormalIntRange(0, 1);
}
private static final String RAT_ALLY = "rat_ally";

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java
View File

@@ -83,7 +83,7 @@ public class RipperDemon extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 4);
return super.drRoll() + Random.NormalIntRange(0, 4);
}
private static final String LAST_ENEMY_POS = "last_enemy_pos";

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java
View File

@@ -122,7 +122,7 @@ public class RotHeart extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 5);
return super.drRoll() + Random.NormalIntRange(0, 5);
}
{

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java
View File

@@ -102,7 +102,7 @@ public class RotLasher extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 8);
return super.drRoll() + Random.NormalIntRange(0, 8);
}
{

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java
View File

@@ -66,7 +66,7 @@ public class Scorpio extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 16);
return super.drRoll() + Random.NormalIntRange(0, 16);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java
View File

@@ -66,7 +66,7 @@ public abstract class Shaman extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 6);
return super.drRoll() + Random.NormalIntRange(0, 6);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java
View File

@@ -109,7 +109,7 @@ public class Skeleton extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 5);
return super.drRoll() + Random.NormalIntRange(0, 5);
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java
View File

@@ -68,7 +68,7 @@ public class Spinner extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 6);
return super.drRoll() + Random.NormalIntRange(0, 6);
}
private int webCoolDown = 0;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java
View File

@@ -108,7 +108,7 @@ public class Statue extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, Dungeon.depth + weapon.defenseFactor(this));
return super.drRoll() + Random.NormalIntRange(0, Dungeon.depth + weapon.defenseFactor(this));
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java
View File

@@ -159,7 +159,7 @@ public class Succubus extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 10);
return super.drRoll() + Random.NormalIntRange(0, 10);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
View File

@@ -114,7 +114,7 @@ public class Tengu extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 5);
return super.drRoll() + Random.NormalIntRange(0, 5);
}
boolean loading = false;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java
View File

@@ -123,7 +123,7 @@ public class Thief extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 3);
return super.drRoll() + Random.NormalIntRange(0, 3);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java
View File

@@ -72,7 +72,7 @@ public class Warlock extends Mob implements Callback {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 8);
return super.drRoll() + Random.NormalIntRange(0, 8);
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java
View File

@@ -643,7 +643,7 @@ public class YogDzewa extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 4);
return super.drRoll() + Random.NormalIntRange(0, 4);
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java
View File

@@ -158,7 +158,7 @@ public abstract class YogFist extends Mob {
@Override
public int drRoll() {
return Random.NormalIntRange(0, 15);
return super.drRoll() + Random.NormalIntRange(0, 15);
}
{

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java
View File

@@ -141,10 +141,11 @@ public class MirrorImage extends NPC {
@Override
public int drRoll() {
int dr = super.drRoll();
if (hero != null && hero.belongings.weapon() != null){
return Random.NormalIntRange(0, hero.belongings.weapon().defenseFactor(this)/2);
return dr + Random.NormalIntRange(0, hero.belongings.weapon().defenseFactor(this)/2);
} else {
return 0;
return dr;
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java
View File

@@ -176,10 +176,11 @@ public class PrismaticImage extends NPC {
@Override
public int drRoll() {
int dr = super.drRoll();
if (hero != null){
return hero.drRoll();
return dr + hero.drRoll();
} else {
return 0;
return dr;
}
}

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@@ -700,14 +700,14 @@ public class DriedRose extends Artifact {
@Override
public int drRoll() {
int block = 0;
int dr = super.drRoll();
if (rose != null && rose.armor != null){
block += Random.NormalIntRange( rose.armor.DRMin(), rose.armor.DRMax());
dr += Random.NormalIntRange( rose.armor.DRMin(), rose.armor.DRMax());
}
if (rose != null && rose.weapon != null){
block += Random.NormalIntRange( 0, rose.weapon.defenseFactor( this ));
dr += Random.NormalIntRange( 0, rose.weapon.defenseFactor( this ));
}
return block;
return dr;
}
//used in some glyph calculations

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java
View File

@@ -346,10 +346,11 @@ public class WandOfLivingEarth extends DamageWand {
@Override
public int drRoll() {
int dr = super.drRoll();
if (Dungeon.isChallenged(Challenges.NO_ARMOR)){
return Random.NormalIntRange(wandLevel, 2 + wandLevel);
return dr + Random.NormalIntRange(wandLevel, 2 + wandLevel);
} else {
return Random.NormalIntRange(wandLevel, 3 + 3 * wandLevel);
return dr + Random.NormalIntRange(wandLevel, 3 + 3 * wandLevel);
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java
View File

@@ -301,10 +301,11 @@ public class WandOfWarding extends Wand {
@Override
public int drRoll() {
int dr = super.drRoll();
if (tier > 3){
return Math.round(Random.NormalIntRange(0, 3 + Dungeon.scalingDepth()/2) / (7f - tier));
return dr + Math.round(Random.NormalIntRange(0, 3 + Dungeon.scalingDepth()/2) / (7f - tier));
} else {
return 0;
return dr;
}
}