From 5b5ebaf11c1943c81affa140c1a7c83088d535d9 Mon Sep 17 00:00:00 2001 From: Treeku Date: Wed, 30 Apr 2014 23:49:55 +0100 Subject: [PATCH] Vehicles now have ranged gb buffs --- scripts/object/mobile/vehicle/barc_speeder_imperial.py | 1 + scripts/object/mobile/vehicle/barc_speeder_rebel.py | 1 + scripts/object/mobile/vehicle/walker_at_rt_camo.py | 1 + scripts/object/mobile/vehicle/walker_at_rt_reg.py | 1 + src/services/pet/MountService.java | 5 ++++- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/object/mobile/vehicle/barc_speeder_imperial.py b/scripts/object/mobile/vehicle/barc_speeder_imperial.py index ccad8904..a923f966 100644 --- a/scripts/object/mobile/vehicle/barc_speeder_imperial.py +++ b/scripts/object/mobile/vehicle/barc_speeder_imperial.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.buffService.addBuffToCreature(object, 'vehicle_pvp_barc_imperial', object) return \ No newline at end of file diff --git a/scripts/object/mobile/vehicle/barc_speeder_rebel.py b/scripts/object/mobile/vehicle/barc_speeder_rebel.py index ccad8904..a4d57462 100644 --- a/scripts/object/mobile/vehicle/barc_speeder_rebel.py +++ b/scripts/object/mobile/vehicle/barc_speeder_rebel.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.buffService.addBuffToCreature(object, 'vehicle_pvp_barc_rebel', object) return \ No newline at end of file diff --git a/scripts/object/mobile/vehicle/walker_at_rt_camo.py b/scripts/object/mobile/vehicle/walker_at_rt_camo.py index ccad8904..e552a13a 100644 --- a/scripts/object/mobile/vehicle/walker_at_rt_camo.py +++ b/scripts/object/mobile/vehicle/walker_at_rt_camo.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.buffService.addBuffToCreature(object, 'vehicle_at_rt', object) return \ No newline at end of file diff --git a/scripts/object/mobile/vehicle/walker_at_rt_reg.py b/scripts/object/mobile/vehicle/walker_at_rt_reg.py index ccad8904..e552a13a 100644 --- a/scripts/object/mobile/vehicle/walker_at_rt_reg.py +++ b/scripts/object/mobile/vehicle/walker_at_rt_reg.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.buffService.addBuffToCreature(object, 'vehicle_at_rt', object) return \ No newline at end of file diff --git a/src/services/pet/MountService.java b/src/services/pet/MountService.java index a8094945..ea82c37e 100644 --- a/src/services/pet/MountService.java +++ b/src/services/pet/MountService.java @@ -33,7 +33,6 @@ import resources.datatables.DisplayType; import resources.datatables.Options; import resources.datatables.Posture; import resources.datatables.State; -import resources.datatables.StateStatus; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; @@ -437,6 +436,8 @@ public class MountService implements INetworkDispatch { // Notify observers and update quadtree mount.notifyObservers(new UpdateContainmentMessage(rider.getObjectID(), mount.getObjectID(), 4), true); core.simulationService.remove(rider, rider.getWorldPosition().x, rider.getWorldPosition().z, false); + + core.buffService.addBuffToCreature(rider, "vehicle_passenger", mount); } public CreatureObject getMount(SWGObject pcd) { @@ -637,6 +638,8 @@ public class MountService implements INetworkDispatch { core.simulationService.teleport(rider, mount.getWorldPosition(), mount.getOrientation(), 0); core.simulationService.add(rider, mount.getWorldPosition().x, mount.getWorldPosition().z, false); + core.buffService.removeBuffFromCreature(rider, rider.getBuffByName("vehicle_passenger")); + // Store mount if it's a creature if (!mount.getTemplate().contains("vehicle") && rider.getObjectID() == mount.getOwnerId()) { store(rider, mount);