projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Removed printAnalysis for CREO3 baseline, Added SWGList for Skills"

Browse Source 
This reverts commit d9ca531c5d.
This commit is contained in:
Zing
2014-08-07 21:47:43 -07:00
parent 5cbdfa7551
commit 04f41a0f41
2 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+3 -36
View File
@@ -24,7 +24,6 @@ package resources.objects.creature;
import java.io.Serializable;
import java.lang.System;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -56,7 +55,6 @@ import resources.objects.ObjectMessageBuilder;
import resources.objects.SWGList;
import resources.objects.SWGMap;
import engine.resources.common.CRC;
import engine.resources.objects.Baseline;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Planet;
import engine.resources.scene.Point3D;
@@ -74,7 +72,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
// CREO 1
private int bankCredits = 0;
private int cashCredits = 0;
private SWGList<String> skills;
private List<String> skills;
@NotPersistent
private transient int skillsUpdateCounter = 0;
@@ -194,7 +192,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
super(objectID, planet, position, orientation, Template);
messageBuilder = new CreatureMessageBuilder(this);
loadTemplateData();
skills = new SWGList<String>();
skills = new ArrayList<String>();
skillMods = new SWGMap<String, SkillMod>(this, 4, 3, true);
abilities = new SWGMap<String, Integer>(this, 4, 14, true);
missionCriticalObjects = new SWGMap<Long, Long>(this, 4, 13, false);
@@ -237,38 +235,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
setTurnRadius((float) getTemplateData().getAttribute("turnRate"));*/
}
/*@Override
public Baseline getBaseline1() {
Baseline baseline = super.getBaseline1();
baseline.put("bankCredits", 0);
baseline.put("cashCredits", 0);
// HAM base list stuff
baseline.put("baseHAM", 6); // list size
baseline.put("unk1", 0); // udpate count?
baseline.put("health", 1000);
baseline.put("spacer1", 0);
baseline.put("action", 300);
baseline.put("spacer2", 0);
baseline.put("unk2", 0x2C01);
baseline.put("unk3", 0);
baseline.put("skills", new SWGList<String>());
return baseline;
}
@Override
public Baseline getBaseline3() {
Baseline baseline = super.getBaseline3();
baseline.put("posture", (byte) 0);
baseline.put("creo3unk1", (byte) 0);
baseline.put("ownerId", (long) 0);
baseline.put("height", (float) 1.3);
baseline.put("battleFatigue", 0);
baseline.put("stateBitmask", new BitSet());
return baseline;
}*/
public int getBankCredits() {
synchronized(objectMutex) {
return bankCredits;
@@ -332,7 +299,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
}
}
public SWGList<String> getSkills() {
public List<String> getSkills() {
return skills;
}