Merge pull request #345 from madsboddum/77

Cone of Effect attacks #77

src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/CommandLoader.java

@@ -126,6 +126,7 @@ public class CommandLoader extends DataLoader {
 						.withAnimations(WeaponType.POLEARM_SABER, getAnimationList(set.getText("anim_polearmlightsaber")))
 						.withAttackType(AttackType.valueOf(set.getText("attackType")))
 						.withConeLength(set.getReal("coneLength"))
+						.withConeWidth(set.getReal("coneWidth"))
 						.withAddedDamage((int) set.getInt("addedDamage"))
 						.withPercentAddFromWeapon(set.getReal("percentAddFromWeapon"))
 						.withBypassArmor(set.getReal("bypassArmor"))

src/main/java/com/projectswg/holocore/resources/support/global/commands/CombatCommand.java

@@ -61,6 +61,7 @@ public class CombatCommand extends Command {
 	private final int delayAttackLoops;
 	private final DelayAttackEggPosition eggPosition;
 	private final double coneLength;
+	private final double coneWidth;
 	private final HealAttrib healAttrib;
 	private final String specialLine;
 	
@@ -91,6 +92,7 @@ public class CombatCommand extends Command {
 		this.delayAttackLoops = builder.delayAttackLoops;
 		this.eggPosition = builder.eggPosition;
 		this.coneLength = builder.coneLength;
+		this.coneWidth = builder.coneWidth;
 		this.healAttrib = builder.healAttrib;
 		this.specialLine = builder.specialLine;
 	}
@@ -212,6 +214,10 @@ public class CombatCommand extends Command {
 		return coneLength;
 	}
 	
+	public double getConeWidth() {
+		return coneWidth;
+	}
+	
 	public HealAttrib getHealAttrib() {
 		return healAttrib;
 	}
@@ -256,6 +262,7 @@ public class CombatCommand extends Command {
 		private int delayAttackLoops;
 		private DelayAttackEggPosition eggPosition;
 		private double coneLength;
+		private double coneWidth;
 		private HealAttrib healAttrib;
 		private String specialLine;
 		
@@ -393,6 +400,11 @@ public class CombatCommand extends Command {
 			return this;
 		}
 		
+		public CombatCommandBuilder withConeWidth(double coneWidth) {
+			this.coneWidth = coneWidth;
+			return this;
+		}
+		
 		public CombatCommandBuilder withHealAttrib(HealAttrib healAttrib) {
 			this.healAttrib = healAttrib;
 			return this;

src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandAttack.java

@@ -30,6 +30,7 @@ package com.projectswg.holocore.services.gameplay.combat.command;
 import com.projectswg.common.data.RGB;
 import com.projectswg.common.data.combat.*;
 import com.projectswg.common.data.encodables.oob.StringId;
+import com.projectswg.common.data.location.Location;
 import com.projectswg.common.network.packets.swg.zone.object_controller.Animation;
 import com.projectswg.common.network.packets.swg.zone.object_controller.ShowFlyText;
 import com.projectswg.common.network.packets.swg.zone.object_controller.combat.CombatAction;
@@ -79,7 +80,14 @@ enum CombatCommandAttack implements CombatCommandHitType {
 						// Same as AREA, but the target is the destination for the AoE and  can take damage
 						doCombatArea(source, delayEgg != null ? delayEgg : target, info, weapon, command, true);
 					} else {
-						// TODO AoE based on Location instead of delay egg
+						// TODO AoE based on Location instead of delay egg (free-targeting with heavy weapons)
+					}
+					break;
+				case CONE:
+					if (target != null) {
+						doCombatCone(source, target, info, weapon, command);
+					} else {
+						// TODO CoE based on Location (free-targeting with flamethrowers)
 					}
 					break;
 				default:
@@ -88,6 +96,50 @@ enum CombatCommandAttack implements CombatCommandHitType {
 		}
 	}
 	
+	private void doCombatCone(CreatureObject source, Location targetWorldLocation, AttackInfo info, WeaponObject weapon, CombatCommand command) {
+		double coneLength = command.getConeLength();
+		double coneWidth = command.getConeWidth();
+		
+		Location sourceWorldLocation = source.getWorldLocation();
+		
+		double dirX = targetWorldLocation.getX() - sourceWorldLocation.getX();
+		double dirZ = targetWorldLocation.getZ() - sourceWorldLocation.getZ();
+		
+		Set<SWGObject> objectsToCheck = source.getObjectsAware();
+		
+		// TODO line of sight checks between the attacker and each target
+		Set<CreatureObject> targets = objectsToCheck.stream()
+				.filter(CreatureObject.class::isInstance)
+				.map(CreatureObject.class::cast)
+				.filter(candidate -> !candidate.equals(source))	// Make sure the attacker can't damage themselves
+				.filter(source::isAttackable)
+				.filter(candidate -> canPerform(source, candidate, command) == CombatStatus.SUCCESS)
+				.filter(candidate -> sourceWorldLocation.distanceTo(candidate.getLocation()) <= coneLength)
+				.filter(candidate -> {
+					Location candidateWorldLocation = candidate.getWorldLocation();
+					
+					return isInConeAngle(sourceWorldLocation, candidateWorldLocation, coneWidth, dirX, dirZ);
+				})
+				.collect(Collectors.toSet());
+		
+		doCombat(source, targets, weapon, info, command);
+	}
+
+	private void doCombatCone(CreatureObject source, SWGObject target, AttackInfo info, WeaponObject weapon, CombatCommand command) {
+		doCombatCone(source, target.getWorldLocation(), info, weapon, command);
+	}
+
+	boolean isInConeAngle(Location attackerLocation, Location targetLocation, double coneWidth, double directionX, double directionZ) {
+		double targetX = targetLocation.getX() - attackerLocation.getX();
+		double targetZ = targetLocation.getZ() - attackerLocation.getZ();
+		
+		double targetAngle = Math.atan2(targetZ, targetX) - Math.atan2(directionZ, directionX);
+		
+		double degrees = targetAngle * 180 / Math.PI;
+		
+		return !(Math.abs(degrees) > coneWidth);
+	}
+	
 	private static void doCombatSingle(CreatureObject source, SWGObject target, AttackInfo info, WeaponObject weapon, CombatCommand command) {
 		Set<CreatureObject> targets = new HashSet<>();
 		

src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandCommon.java

@@ -125,6 +125,7 @@ public class CombatCommandCommon {
 		
 		switch (c.getAttackType()) {
 			case AREA:
+			case CONE:
 			case TARGET_AREA:
 				return canPerformArea(source, c);
 			case SINGLE_TARGET:

src/test/java/com/projectswg/holocore/services/gameplay/combat/command/TestCombatCommandAttack.java

@@ -0,0 +1,50 @@
+package com.projectswg.holocore.services.gameplay.combat.command;
+
+import com.projectswg.common.data.location.Location;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TestCombatCommandAttack {
+	@Test
+	public void testConeRange() {
+		Location attackerLocation = new Location.LocationBuilder()
+				.setX(0)
+				.setY(0)
+				.setZ(0)
+				.build();
+		
+		Location targetLocation = new Location.LocationBuilder()
+				.setX(20)
+				.setY(0)
+				.setZ(10)
+				.build();
+		
+		Location collateralInsideCone1 = new Location.LocationBuilder()
+				.setX(10)
+				.setY(0)
+				.setZ(5)
+				.build();
+		
+		Location collateralInsideCone2 = new Location.LocationBuilder()
+				.setX(25)
+				.setY(0)
+				.setZ(10)
+				.build();
+		
+		Location collateralOutsideCone = new Location.LocationBuilder()
+				.setX(-20)
+				.setY(0)
+				.setZ(-15)
+				.build();
+		
+		double dirX = targetLocation.getX() - attackerLocation.getX();
+		double dirZ = targetLocation.getZ() - attackerLocation.getZ();
+		
+		CombatCommandAttack instance = CombatCommandAttack.INSTANCE;
+		assertTrue(instance.isInConeAngle(attackerLocation, collateralInsideCone1, 30, dirX, dirZ));
+		assertTrue(instance.isInConeAngle(attackerLocation, collateralInsideCone2, 30, dirX, dirZ));
+		assertFalse(instance.isInConeAngle(attackerLocation, collateralOutsideCone, 30, dirX, dirZ));
+	}
+}