Added Precision Shot weapon requirement unit test

Author: theazuresoul

core/src/main/java/com/pipai/wf/battle/action/RifleAttackAction.java

@@ -34,15 +34,11 @@ protected void performImpl() throws IllegalActionException {
 		Agent a = getPerformer();
 		Agent target = getTarget();
 		Weapon w = a.getCurrentWeapon();
-		if (!a.getAbilities().hasAbility(SnapShotAbility.class) && a.hasUsedAP())
-		{
+		if (!a.getAbilities().hasAbility(SnapShotAbility.class) && a.hasUsedAP()) {
 			throw new IllegalActionException("Cannot fire rifle after moving");
 		}
 		if (w.needsAmmunition() && w.currentAmmo() == 0) {
 			throw new IllegalActionException("Not enough ammo to fire " + w.name());
-		}
-		if (a.hasUsedAP()) {
-
 		}
 		DamageResult result = DamageCalculator.rollDamageGeneral(this, new WeaponDamageFunction(w), 0);
 		a.setAP(0);

core/src/test/java/com/pipai/wf/test/battle/AbilityTest.java

@@ -103,7 +103,7 @@ public void testPrecisionShotCooldown() {
 		GridPosition enemyPos = new GridPosition(2, 2);
 		AgentState playerState = AgentStateFactory.newBattleAgentState(Team.PLAYER, playerPos, 3, 5, 2, 5, 65, 0);
 		playerState.abilities.add(new PrecisionShotAbility());
-		playerState.weapons.add(new Pistol());
+		playerState.weapons.add(new Rifle());
 		map.addAgent(playerState);
 		map.addAgent(AgentStateFactory.newBattleAgentState(Team.ENEMY, enemyPos, 3, 5, 2, 5, 65, 0));
 		BattleController battle = new BattleController(map);
@@ -132,6 +132,27 @@ public void testPrecisionShotCooldown() {
 		}
 	}
 
+	@Test
+	public void testPrecisionShotWeaponReq() {
+		BattleMap map = new BattleMap(3, 4);
+		GridPosition playerPos = new GridPosition(1, 0);
+		GridPosition enemyPos = new GridPosition(2, 2);
+		AgentState playerState = AgentStateFactory.newBattleAgentState(Team.PLAYER, playerPos, 3, 5, 2, 5, 65, 0);
+		playerState.abilities.add(new PrecisionShotAbility());
+		playerState.weapons.add(new Pistol());
+		map.addAgent(playerState);
+		map.addAgent(AgentStateFactory.newBattleAgentState(Team.ENEMY, enemyPos, 3, 5, 2, 5, 65, 0));
+		BattleController battle = new BattleController(map);
+		Agent agent = map.getAgentAtPos(playerPos);
+		Agent target = map.getAgentAtPos(enemyPos);
+		try {
+			battle.performAction(new PrecisionShotAction(agent, target));
+			fail("Expected exception not thrown");
+		} catch (IllegalActionException e) {
+		}
+	}
+
+
 	@Test
 	public void testNoSnapShot() {
 		BattleMap map = new BattleMap(5, 5);