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

v0.3.5: first half of gladiator rework (new combo baseline, no finishers yet)

Browse Source
This commit is contained in:
Evan Debenham
2016-04-19 02:41:32 -04:00
parent 637d6b62ee
commit 0cb6e96dee
7 changed files with 101 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+11 -7
View File
@@ -78,7 +78,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
@@ -845,11 +844,6 @@ public class Hero extends Char {
if (wep != null) wep.proc( this, enemy, damage );
switch (subClass) {
case GLADIATOR:
if (wep instanceof MeleeWeapon || wep == null) {
damage += Buff.affect( this, Combo.class ).hit( enemy, damage );
}
break;
case SNIPER:
if (rangedWeapon != null) {
Buff.prolong( this, SnipersMark.class, attackDelay() * 1.1f ).object = enemy.id();
@@ -1330,7 +1324,17 @@ public class Hero extends Char {
AttackIndicator.target(enemy);
attack( enemy );
boolean hit = attack( enemy );
if (subClass == HeroSubClass.GLADIATOR){
if (hit) {
Buff.affect( this, Combo.class ).hit();
} else {
Combo combo = buff(Combo.class);
if (combo != null) combo.miss();
}
}
curAction = null;
Invisibility.dispel();