projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-08 23:13:25 -04:00
Code Issues Projects Releases Wiki Activity

Merged in M4SS/holocore/skillmods (pull request #106)

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureObject.java
This commit is contained in:
Obique PSWG
2016-02-03 11:22:15 -06:00
parent df8755c6eb efe58bd1e3
commit 3f53c83612
5 changed files with 231 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+25 -3
View File
@@ -40,6 +40,7 @@ import resources.HologramColour;
import resources.Posture;
import resources.PvpFlag;
import resources.Race;
import resources.SkillMod;
import resources.collections.SWGList;
import resources.collections.SWGMap;
import resources.encodables.player.Equipment;
@@ -55,7 +56,7 @@ import utilities.Encoder.StringType;
public class CreatureObject extends TangibleObject {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 2L;
private transient GroupInviterData inviterData = new GroupInviterData(0, null, "", 0);
private transient long lastReserveOperation = 0;
@@ -112,12 +113,11 @@ public class CreatureObject extends TangibleObject {
private SWGList<Equipment> equipmentList = new SWGList<Equipment>(6, 23);
private SWGList<Equipment> appearanceList = new SWGList<Equipment>(6, 33);
private SWGMap<String, Long> skillMods = new SWGMap<>(4, 3, StringType.ASCII); // TODO: SkillMod structure
private SWGMap<String, SkillMod> skillMods = new SWGMap<>(4, 3, StringType.ASCII); // TODO: SkillMod structure
private SWGMap<Long, Long> missionCriticalObjs = new SWGMap<>(4, 13);
private SWGMap<String, Integer> abilities = new SWGMap<>(4, 14, StringType.ASCII);
private SWGMap<Integer, Long> buffs = new SWGMap<>(6, 26); // TODO: Buff structure
public CreatureObject(long objectId) {
super(objectId, BaselineType.CREO);
initMaxAttributes();
@@ -630,6 +630,28 @@ public class CreatureObject extends TangibleObject {
sendDelta(3, 18, statesBitmask);
}
public void adjustSkillmod(String skillModName, int base, int modifier) {
SkillMod skillMod = skillMods.get(skillModName);
if(skillMod == null) {
// They didn't have this SkillMod already.
// Therefore, we send a full delta.
skillMods.put(skillModName, new SkillMod(base, modifier));
skillMods.sendDeltaMessage(this);
} else {
// They already had this skillmod.
// All we need to do is adjust the base and the modifier and send an update from the SWGMap
skillMod.adjustBase(base);
skillMod.adjustModifier(modifier);
skillMods.update(skillModName, this);
}
}
public int getSkillModValue(String skillModName) {
SkillMod skillMod = skillMods.get(skillModName);
return skillMod != null ? skillMod.getValue() : 0;
}
public boolean isVisible() {
return visible;
}