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/items/Item.java
+4
View File
@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Combo;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.SnipersMark;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@@ -131,6 +132,9 @@ public class Item implements Bundlable {
curUser = hero;
curItem = this;
Combo combo = hero.buff(Combo.class);
if (combo != null) combo.detach();
if (action.equals( AC_DROP )) {