From bc9f7d37a092b7a510dafec5c97a9b39709704cf Mon Sep 17 00:00:00 2001 From: Retera Date: Sun, 8 Nov 2020 19:08:01 -0500 Subject: [PATCH] Remove code from behaviortest branch --- .../handlers/w3x/simulation/CUnit.java | 8 ---- .../w3x/simulation/test/BaseBehavior.java | 5 --- .../w3x/simulation/test/BaseState.java | 5 --- .../w3x/simulation/test/IAbility.java | 28 ------------ .../w3x/simulation/test/IBehavior.java | 5 --- .../handlers/w3x/simulation/test/IState.java | 5 --- .../test/ability/AttackAbility.java | 28 ------------ .../simulation/test/ability/MoveAbility.java | 22 --------- .../test/behavior/AttackTarget.java | 22 --------- .../simulation/test/behavior/MoveToPoint.java | 45 ------------------- .../w3x/simulation/test/state/MoveState.java | 28 ------------ 11 files changed, 201 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseBehavior.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseState.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IAbility.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IBehavior.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IState.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/AttackAbility.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/MoveAbility.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/AttackTarget.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/MoveToPoint.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/state/MoveState.java diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index a9e9d98..0baebe2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -27,8 +27,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.COrder; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IState; public class CUnit extends CWidget { private static final Rectangle tempRect = new Rectangle(); @@ -72,8 +70,6 @@ public class CUnit extends CWidget { private transient CBehaviorFollow followBehavior; private transient CBehaviorPatrol patrolBehavior; private transient CBehaviorStop stopBehavior; - private IBehavior behavior; - private IState state; public CUnit(final int handleId, final int playerIndex, final float x, final float y, final float life, final War3ID typeId, final float facing, final float mana, final int maximumLife, final int maximumMana, @@ -664,8 +660,4 @@ public class CUnit extends CWidget { return getCurrentBehavior() instanceof CBehaviorMove; } - public void setBehavior(final IBehavior behavior) { - this.behavior = behavior; - this.state = behavior.resolveNext(); - } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseBehavior.java deleted file mode 100644 index 8db5d76..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseBehavior.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test; - -public abstract class BaseBehavior { - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseState.java deleted file mode 100644 index 3ea24f6..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/BaseState.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test; - -public abstract class BaseState implements IState { - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IAbility.java deleted file mode 100644 index c8c82e6..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IAbility.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test; - -import java.awt.Point; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; - -/* - * IAbility - Execute(unit caster, int orderId, unit targetUnit, point targetPoint); - -IBehavior - ResolveNext(); - -IState - Execute(); - -abstract BaseState - ctor(unit unit, IBehavior behavior) - abstract Execute(); - -abstract BaseBehavior - ctor(unit unit) - - */ -public interface IAbility { - void execute(CUnit caster, int orderId, CWidget targetUnit, Point targetPoint); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IBehavior.java deleted file mode 100644 index ff9e07e..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IBehavior.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test; - -public interface IBehavior { - IState resolveNext(); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IState.java deleted file mode 100644 index 7c351ca..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/IState.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test; - -public interface IState { - void execute(); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/AttackAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/AttackAbility.java deleted file mode 100644 index 83d2ba1..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/AttackAbility.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.ability; - -import java.awt.Point; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.behavior.AttackTarget; - -public class AttackAbility implements IAbility { - - @Override - public void execute(final CUnit caster, final int orderId, final CWidget target, final Point targetPoint) { - if (target != null) { - new AttackTarget(caster, target); - } - else if (targetPoint != null) { - if (orderId == OrderIds.attackground) { - // TODO some stuff - } - else if (orderId == OrderIds.attack) { - - } - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/MoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/MoveAbility.java deleted file mode 100644 index e12eb86..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/ability/MoveAbility.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.ability; - -import java.awt.Point; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.behavior.MoveToPoint; - -public class MoveAbility implements IAbility { - - @Override - public void execute(final CUnit caster, final int orderId, final CWidget targetUnit, final Point targetPoint) { - if (targetUnit == null) { - caster.setBehavior(new MoveToPoint(caster, targetPoint)); - } - else { - - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/AttackTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/AttackTarget.java deleted file mode 100644 index 639f53e..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/AttackTarget.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.behavior; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IState; - -public class AttackTarget implements IBehavior { - private final CUnit attackingUnit; - private final CWidget targetUnit; - - public AttackTarget(final CUnit attackingUnit, final CWidget targetUnit) { - this.attackingUnit = attackingUnit; - this.targetUnit = targetUnit; - } - - @Override - public IState resolveNext() { - return null; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/MoveToPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/MoveToPoint.java deleted file mode 100644 index 5e2cfa9..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/behavior/MoveToPoint.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.behavior; - -import java.awt.Point; -import java.awt.geom.Point2D; -import java.awt.geom.Point2D.Float; -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.state.MoveState; - -public class MoveToPoint implements IBehavior { - - private final CSimulation simulation; - private final CUnit unit; - private final Point point; - private final MoveState moveState; - private final List waypointList; - - public MoveToPoint(final CSimulation simulation, final CUnit unit, final Point point) { - this.simulation = simulation; - this.unit = unit; - this.point = point; - this.waypointList = this.simulation.findNaiveSlowPath(unit, null, unit.getX(), unit.getY(), - new Point2D.Float(point.x, point.y), unit.getUnitType().getMovementType(), - unit.getUnitType().getCollisionSize(), true); - this.moveState = new MoveState(); - this.unit.setBehavior(this); - this.unit.setState(this.moveState); - resolveNext(); - } - - @Override - public void resolveNext() { - if (this.waypointList.isEmpty()) { - this.unit.setState(state); - } - else { - final Float firstWaypoint = this.waypointList.remove(0); - this.unit.setState(this.moveState.reset(this, this.unit, firstWaypoint.x, firstWaypoint.y)); - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/state/MoveState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/state/MoveState.java deleted file mode 100644 index b1758db..0000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/test/state/MoveState.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.state; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.test.IState; - -public class MoveState implements IState { - public IBehavior behavior; - public CUnit unit; - public float targetX; - public float targetY; - - public MoveState reset(final IBehavior behavior, final CUnit unit, final float targetX, final float targetY) { - this.behavior = behavior; - this.unit = unit; - this.targetX = targetX; - this.targetY = targetY; - return this; - } - - @Override - public void execute() { - final float dx = this.targetX - this.unit.getX(); - final float dy = this.targetY - this.unit.getY(); - this.unit.setX(this.unit.getX(), collision); - } - -}