From a1125af5f4c09612a55f5671e380047f5ac03ef6 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Thu, 22 Jan 2015 21:39:18 -0500 Subject: [PATCH] Zoning in a player now sets their status to PlayerStatus.ZONED_IN, Added minor implementation of delta system to a few CreatureObject variables (cash, bank, posture, height) --- scripts/commands/generic/cmdTip.py | 4 ++++ src/resources/objects/creature/CreatureObject.java | 9 ++++++++- src/services/objects/ObjectManager.java | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 scripts/commands/generic/cmdTip.py diff --git a/scripts/commands/generic/cmdTip.py b/scripts/commands/generic/cmdTip.py new file mode 100644 index 000000000..25353f4bc --- /dev/null +++ b/scripts/commands/generic/cmdTip.py @@ -0,0 +1,4 @@ +import sys + +def execute(objManager, player, target, args): + return \ No newline at end of file diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 6105b2833..aa2eb86a5 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -222,6 +222,7 @@ public class CreatureObject extends TangibleObject { public void setPosture(Posture posture) { this.posture = posture; + sendDelta(3, 14, posture); } public void setRace(Race race) { @@ -230,10 +231,12 @@ public class CreatureObject extends TangibleObject { public void setCashBalance(int cashBalance) { this.cashBalance = cashBalance; + sendDelta(1, 0, cashBalance); } public void setBankBalance(int bankBalance) { this.bankBalance = bankBalance; + sendDelta(1, 1, bankBalance); } public void setUnmodifiedMaxAtributes(int unmodifiedMaxAtributes) { @@ -290,6 +293,7 @@ public class CreatureObject extends TangibleObject { public void setHeight(double height) { this.height = height; + sendDelta(3, 17, height); } public void setPerformanceType(int performanceType) { @@ -437,7 +441,7 @@ public class CreatureObject extends TangibleObject { } public void createBaseline3(Player target, BaselineBuilder bb) { - super.createBaseline3(target, bb); + super.createBaseline3(target, bb); // 13 variables - TANO3 (9) + BASE3 (4) bb.addByte(posture.getId()); bb.addByte(0); // Faction Rank bb.addLong(0); // Owner - mainly used for pets and vehicles @@ -514,4 +518,7 @@ public class CreatureObject extends TangibleObject { super.createBaseline9(target, bb); } + public void sendDelta(int type, int update, Object value) { + sendDelta(BaselineType.CREO, type, update, value); + } } diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 353ab2bcc..76e462502 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -34,6 +34,7 @@ import resources.objects.creature.CreatureObject; import resources.objects.quadtree.QuadTree; import resources.player.Player; import resources.player.PlayerEvent; +import resources.player.PlayerState; import resources.server_info.CachedObjectDatabase; import resources.server_info.ObjectDatabase; import resources.server_info.ObjectDatabase.Traverser; @@ -300,6 +301,7 @@ public class ObjectManager extends Manager { creature.createObject(player); creature.clearAware(); updateAwarenessForObject(creature); + player.setPlayerState(PlayerState.ZONED_IN); new PlayerEventIntent(player, galaxy, PlayerEvent.PE_ZONE_IN).broadcast(); }