Cleaned up classes

This commit is contained in:
CharonInferar
2014-08-10 15:17:01 +02:00
parent 058a3549e7
commit 30b521c8bf
13 changed files with 19 additions and 23 deletions
+1 -3
View File
@@ -24,12 +24,10 @@ package protocol.swg;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
import org.apache.mina.core.buffer.IoBuffer;
import services.sui.SUIWindowComponent;
@SuppressWarnings("unused")
public class SUICreateTimerBar extends SWGMessage{
private String script;
@@ -27,6 +27,7 @@ import org.apache.mina.core.buffer.IoBuffer;
import protocol.swg.ObjControllerMessage;
@SuppressWarnings("unused")
public class QuestTaskTimerMessage extends ObjControllerObject {
private long objectId;
@@ -25,9 +25,7 @@ import java.nio.ByteOrder;
import java.util.Map;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.objects.Builder;
import resources.objects.harvester.HarvesterObject;
import resources.objects.tangible.TangibleMessageBuilder;
public class InstallationMessageBuilder extends TangibleMessageBuilder{
@@ -28,10 +28,6 @@ import org.apache.mina.core.buffer.IoBuffer;
import main.NGECore;
import protocol.swg.UpdatePVPStatusMessage;
import protocol.swg.UpdatePostureMessage;
import com.sleepycat.persist.model.Entity;
import engine.clients.Client;
import engine.resources.common.CRC;
import engine.resources.objects.Baseline;
@@ -40,8 +36,6 @@ import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
import resources.datatables.Options;
import resources.objects.ObjectMessageBuilder;
import resources.objects.SWGSet;
import resources.objects.building.BuildingMessageBuilder;
import resources.objects.creature.CreatureObject;
import resources.objects.tangible.TangibleObject;
+1 -1
View File
@@ -33,6 +33,7 @@ import resources.objects.tangible.TangibleObject;
import services.combat.CombatEvents.DamageTaken;
import tools.DevLog;
@SuppressWarnings("unused")
public class LairActor {
private Vector<AIActor> creatures = new Vector<AIActor>();
@@ -163,7 +164,6 @@ public class LairActor {
}
@SuppressWarnings("unused")
private void healLair() {
if(lairObject.getConditionDamage() == 0 || creatures.isEmpty())
+3 -1
View File
@@ -51,6 +51,7 @@ import resources.datatables.FactionStatus;
import java.util.Random;
@SuppressWarnings("unused")
public class TurretAIActor {
private TangibleObject creature;
@@ -81,8 +82,9 @@ public class TurretAIActor {
private TurretAIState intendedPrimaryTurretAIState;
private Point3D lastPositionBeforeStateChange;
private boolean patrolLoop = true; // default
private ScheduledFuture recoveryFuture;
private ScheduledFuture<?> recoveryFuture;
public TurretAIActor(TangibleObject creature, Point3D spawnPosition, ScheduledExecutorService scheduler) {
this.creature = creature;
this.spawnPosition = spawnPosition;
+2 -2
View File
@@ -36,6 +36,7 @@ import resources.objects.weapon.WeaponObject;
import services.ai.AIActor;
import tools.DevLog;
@SuppressWarnings("unused")
public abstract class AIState {
public abstract byte onEnter(AIActor actor) throws Exception;
@@ -414,7 +415,7 @@ public abstract class AIState {
float maxDistance = stopDistance;
boolean finished = false;
float dx, dz, newX = 0, newY = 0, newZ = 0;
@SuppressWarnings("unused") Vector<Point3D> movementPoints = actor.getMovementPoints();
Vector<Point3D> movementPoints = actor.getMovementPoints();
CellObject cell = null;
targetPosition = actor.getLoiterDestination();
@@ -1068,7 +1069,6 @@ public abstract class AIState {
}
@SuppressWarnings("unused")
public void doFollow(AIActor actor) {
//NGECore.getInstance().aiService.logAI("AI STATE doPatrol");
NGECore core = NGECore.getInstance();
-1
View File
@@ -21,7 +21,6 @@
******************************************************************************/
package services.combat;
import resources.objects.creature.CreatureObject;
import engine.resources.common.Event;
import engine.resources.objects.SWGObject;
+4 -4
View File
@@ -263,8 +263,8 @@ public class CombatService implements INetworkDispatch {
return;
}
final Point3D targetPos = target.getPosition();
final SWGObject targetParent = target.getContainer();
//final Point3D targetPos = target.getPosition();
//final SWGObject targetParent = target.getContainer();
if(command.getDelayAttackParticle().length() > 0 || command.getInitialAttackDelay() > -1) {
@@ -547,7 +547,7 @@ public class CombatService implements INetworkDispatch {
if(target.hasBuff("incapWeaken")) {
AIActor aiActor = (AIActor)attacker.getAttachment("AI");
//AIActor aiActor = (AIActor)attacker.getAttachment("AI");
deathblowPlayerFromInstallation(attacker, target);
return;
@@ -828,7 +828,7 @@ public class CombatService implements INetworkDispatch {
private void sendCombatPacketsForInstallation(InstallationObject attacker, TangibleObject target, WeaponObject weapon, CombatCommand command, int actionCounter, float damage, int armorAbsorbed, int hitType) {
String animationStr = command.getRandomAnimation(weapon);
//String animationStr = command.getRandomAnimation(weapon);
int turret_fire = 0xD334C0B8; // 0xA7595B4E
//CombatAction combatAction = new CombatAction(CRC.StringtoCRC(animationStr), attacker.getObjectID(), weapon.getObjectID(), target.getObjectID(), command.getCommandCRC());
CombatAction combatAction = new CombatAction(turret_fire, attacker.getObjectID(), weapon.getObjectID(), target.getObjectID(), command.getCommandCRC());
+5
View File
@@ -28,6 +28,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import main.NGECore;
import protocol.swg.PlayClientEffectObjectTransformMessage;
import engine.clients.Client;
@@ -172,9 +173,13 @@ public class GCWPylon extends TangibleObject{
return spawnLevel;
}
public void createSpawner(){
GCWSpawner spawner = (GCWSpawner) NGECore.getInstance().objectService.createObject("object/tangible/loot/creature_loot/collections/shared_dejarik_table_base.iff", 0, this.getPlanet(), this.getWorldPosition(), this.getOrientation());
NGECore.getInstance().simulationService.add(spawner, spawner.getPosition().x, spawner.getPosition().z, true);
spawner.setCustomName("");
spawner.setStfFilename("battlefield");
spawner.setStfName("battlefield_marker_name");
spawner.setPatrolRoute(getPatrolRoute());
spawner.setDelay(getDelay());
spawner.setSpawnLevel(3);
+1
View File
@@ -110,6 +110,7 @@ public class GCWSpawner extends TangibleObject{
public void setSpawnerType(int spawnerType) {
this.spawnerType = spawnerType;
this.setCustomName("");
if (spawnerType==SpawnerType.SoldierPatrol){
final Future<?>[] fut1 = {null};
fut1[0] = scheduler.scheduleAtFixedRate(new Runnable() {
+1 -1
View File
@@ -282,7 +282,7 @@ public class InvasionService implements INetworkDispatch {
if (invasionPhase==1 && System.currentTimeMillis()>temptimestartreference + 60000 && ! ph2_message1sent){
invasionPhase=2;
preparePhase2();
System.out.println("PHASE 2");
//System.out.println("PHASE 2");
send_Phase2_InvaderMessage1();
send_Phase2_DefenderMessage1();
ph2_message1sent = true;
-2
View File
@@ -38,8 +38,6 @@ import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors;
import resources.common.collidables.CollidableBox;
import resources.common.collidables.CollidableCircle;
import resources.datatables.Options;