AndorsTrailRelease/archived-andors-trail
1
0
Fork 0
mirror of https://github.com/AndorsTrailRelease/andors-trail.git synced 2026-02-13 21:28:10 +01:00
Code Issues 9 Packages Projects Releases 6 Wiki Activity

Added an animation when an attack misses

Browse Source
This commit is contained in:
arnaudcoj
2015-03-16 23:39:49 +01:00
parent 0acd31f090
commit 88b4dba796
6 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
AndorsTrail/libs/android-support-v4.jar
View File

Binary file not shown.

BIN
AndorsTrail/res/drawable/effect_miss1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

19
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -173,7 +173,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
startAttackEffect(attack, attackPosition, this, CALLBACK_PLAYERATTACK);
} else {
combatActionListeners.onPlayerAttackMissed(target, attack);
playerAttackCompleted();
startMissedEffect(attack, attackPosition, this, CALLBACK_PLAYERATTACK);
}
}
@@ -393,7 +393,8 @@ public final class CombatController implements VisualEffectCompletedCallback {
startAttackEffect(attack, world.model.player.position, this, CALLBACK_MONSTERATTACK);
} else {
combatActionListeners.onMonsterAttackMissed(currentActiveMonster, attack);
startMissedEffect(attack, world.model.player.position, this, CALLBACK_PLAYERATTACK);
waitForNextMonsterAction();
}
}
@@ -431,6 +432,20 @@ public final class CombatController implements VisualEffectCompletedCallback {
, callback
, callbackValue);
}
private void startMissedEffect(AttackResult attack, final Coord position, VisualEffectCompletedCallback callback, int callbackValue) {
if (controllers.preferences.attackspeed_milliseconds <= 0) {
callback.onVisualEffectCompleted(callbackValue);
return;
}
controllers.effectController.startEffect(
position
, VisualEffectCollection.VisualEffectID.miss
, attack.damage
, callback
, callbackValue);
}
private void endMonsterTurn() {
currentActiveMonster = null;
newPlayerTurn(false);

1
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
View File

@@ -373,5 +373,6 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), defaultTileSize);
loader.prepareTileset(R.drawable.effect_heal2, "effect_heal2", new Size(8, 2), defaultTileSize);
loader.prepareTileset(R.drawable.effect_poison1, "effect_poison1", new Size(8, 2), defaultTileSize);
loader.prepareTileset(R.drawable.effect_miss1, "effect_miss1", new Size(8, 2), defaultTileSize);
}
}

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
View File

@@ -9,7 +9,8 @@ public final class VisualEffectCollection {
public static enum VisualEffectID {
redSplash
,blueSwirl
,greenSplash;
,greenSplash
,miss;;
public static VisualEffectID fromString(String s, VisualEffectID default_) {
if (s == null) return default_;
@@ -23,6 +24,7 @@ public final class VisualEffectCollection {
effects[VisualEffectID.redSplash.ordinal()] = createEffect(loader, R.drawable.effect_blood4, new ConstRange(14, 0), 400, Color.RED);
effects[VisualEffectID.blueSwirl.ordinal()] = createEffect(loader, R.drawable.effect_heal2, new ConstRange(16, 0), 400, Color.rgb(150, 150, 255));
effects[VisualEffectID.greenSplash.ordinal()] = createEffect(loader, R.drawable.effect_poison1, new ConstRange(16, 0), 400, Color.GREEN);
effects[VisualEffectID.miss.ordinal()] = createEffect(loader, R.drawable.effect_miss1, new ConstRange(16, 0), 400, Color.GRAY);
}
public VisualEffect getVisualEffect(VisualEffectID effectID) {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
View File

@@ -57,7 +57,7 @@ public final class TileManager {
public final TileCache tileCache = new TileCache();
public final TileCollection preloadedTiles = new TileCollection(97);
public final TileCollection preloadedTiles = new TileCollection(113);
public TileCollection currentMapTiles;
public TileCollection adjacentMapTiles;
private final HashSet<Integer> preloadedTileIDs = new HashSet<Integer>();