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

Merging 1.7.5 Source: items/ changes

Browse Source
This commit is contained in:
Evan Debenham
2015-02-03 22:48:13 -05:00
parent a6c89490b0
commit 41e1f20e95
3 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+15 -8
View File
@@ -270,7 +270,7 @@ public class Item implements Bundlable {
return this;
}
public Item upgrade( int n ) {
final public Item upgrade( int n ) {
for (int i=0; i < n; i++) {
upgrade();
}
@@ -285,7 +285,7 @@ public class Item implements Bundlable {
return this;
}
public Item degrade( int n ) {
final public Item degrade( int n ) {
for (int i=0; i < n; i++) {
degrade();
}
@@ -454,17 +454,24 @@ public class Item implements Bundlable {
final int cell = Ballistica.cast( user.pos, dst, false, true );
user.sprite.zap( cell );
user.busy();
Sample.INSTANCE.play( Assets.SND_MISS, 0.6f, 0.6f, 1.5f );
Char enemy = Actor.findChar( cell );
QuickSlotButton.target(enemy);
// FIXME!!!
float delay = TIME_TO_THROW;
if (this instanceof MissileWeapon) {
// FIXME
delay *= ((MissileWeapon)this).speedFactor( user );
if (enemy != null && enemy.buff( SnipersMark.class ) != null) {
delay *= 0.5f;
if (enemy != null) {
SnipersMark mark = user.buff( SnipersMark.class );
if (mark != null) {
if (mark.object == enemy.id()) {
delay *= 0.5f;
}
user.remove( mark );
}
}
}
final float finalDelay = delay;