projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-27 17:57:22 -04:00
Code Issues Projects Releases Wiki Activity

merge conflict fix 2

Browse Source
This commit is contained in:
CharonInferar
2014-04-13 20:39:36 +02:00
parent 27137c79c7
commit 53c1ea65e9
4 changed files with 0 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/object/intangible/vehicle/speederbike_swoop_pcd.py
-19
View File
@@ -1,34 +1,15 @@
import sys
def setup(core, object):
<<<<<<< HEAD
#object.setAttachment('vehicleId', core.objectService.generateObjectID())
object.setAttachment('radial_filename', 'item')
return
def use(core, actor, object):
if object:
vehicleId = object.getObjectID()
#vehicleId = object.getAttachment('vehicleId')
=======
object.setAttachment('radial_filename', 'vehicle_pcd')
return
def use(core, actor, object):
if object and actor.getAttachment('activeVehicleID') == None:
swoop = core.objectService.createObject('object/mobile/vehicle/shared_speederbike_swoop.iff', 0, actor.getPlanet(), actor.getPosition(), actor.getOrientation())
>>>>>>> upstream/master
swoop.setOwnerId(actor.getObjectID())
actor.setAttachment('activeVehicleID', swoop.getObjectID())
<<<<<<< HEAD
vehicle = core.objectService.getObject(vehicleId)
swoop = core.objectService.createObject('object/mobile/vehicles/shared_speederbike_swoop.iff', vehicleId, actor.getPlanet(), actor.getPosition(), actor.getOrientation())
core.simulationService.add(swoop, swoop.getPosition().x, swoop.getPosition().z, True)
=======
core.simulationService.add(swoop, swoop.getPosition().x, swoop.getPosition().z, True)
>>>>>>> upstream/master
return
scripts/object/tangible/deed/vehicle_deed/speederbike_swoop_deed.py
-12
View File
@@ -6,23 +6,12 @@ def setup(core, object):
def use(core, actor, object):
datapad = actor.getSlottedObject('datapad')
<<<<<<< HEAD
pcd = core.objectService.createObject('object/intangible/vehicle/shared_speederbike_swoop_pcd.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
#actor.sendSystemMessage('actor.getObjectID() %s' % actor.getObjectID(), 0)
=======
pcd = core.objectService.createObject('object/intangible/vehicle/shared_speederbike_swoop_pcd.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
>>>>>>> upstream/master
if datapad and pcd:
datapad.add(pcd)
core.objectService.destroyObject(object)
<<<<<<< HEAD
vehicle = core.objectService.createObject('object/mobile/vehicle/shared_speederbike_swoop.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
vehicle.setOwnerId(actor.getObjectID())
core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
=======
vehicleId = actor.getAttachment('activeVehicleID')
@@ -31,6 +20,5 @@ def use(core, actor, object):
vehicle.setOwnerId(actor.getObjectID())
core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
actor.setAttachment('activeVehicleID', vehicle.getObjectID())
>>>>>>> upstream/master
return
scripts/radial/vehicle.py
-14
View File
@@ -15,19 +15,6 @@ def createRadial(core, owner, target, radials):
def handleSelection(core, owner, target, option):
if target:
<<<<<<< HEAD
if option == 21 or option == 40:
#owner.setPosture(16)
owner.setMounted(1)
#owner.setParent(target)
target.initMount(owner)
#target.add(owner)
#target.setOwner(owner)
#Vehicles.testbike(owner,target)
#target.unmount(owner)
#core.objectService.useObject(owner, target)
=======
if option == 208:
if not owner.isMounted():
owner.setMounted(1)
@@ -35,7 +22,6 @@ def handleSelection(core, owner, target, option):
else:
target.unmount(owner)
>>>>>>> upstream/master
if option == 60:
if owner.isMounted(): vehicleObject.unmount(owner)
core.objectService.destroyObject(target)
src/resources/objects/creature/CreatureObject.java
-45
View File
@@ -68,11 +68,7 @@ import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import services.command.BaseSWGCommand;
<<<<<<< HEAD
@Entity(version=7)
=======
@Entity(version=8)
>>>>>>> upstream/master
public class CreatureObject extends TangibleObject implements IPersistent {
@NotPersistent
@@ -192,10 +188,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
private ConcurrentHashMap<String, Long> cooldowns = new ConcurrentHashMap<String, Long>();
public boolean mounted = false;
<<<<<<< HEAD
=======
@NotPersistent
>>>>>>> upstream/master
public CreatureObject mountedVehicle;
public CreatureObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
@@ -1805,25 +1798,6 @@ public class CreatureObject extends TangibleObject implements IPersistent {
this.mountedVehicle = mountedVehicle;
}
<<<<<<< HEAD
public void mount(CreatureObject owner) {
synchronized(objectMutex) {
if ((this.getOptionsBitmask() & Options.MOUNT) == Options.MOUNT){
UpdateContainmentMessage updateContainmentMessage= new UpdateContainmentMessage(owner.getObjectID(), this.getObjectID(), -1);
owner.getClient().getSession().write(updateContainmentMessage.serialize());
owner.setParent(this);
}
}
}
public void unmount(CreatureObject owner) {
synchronized(objectMutex) {
if ((this.getOptionsBitmask() & Options.MOUNT) == Options.MOUNT){
UpdateContainmentMessage updateContainmentMessage= new UpdateContainmentMessage(owner.getObjectID(), this.getObjectID(), -1);
owner.getClient().getSession().write(updateContainmentMessage.serialize());
}
}
=======
public boolean canMount(CreatureObject vehicle)
{
if(vehicle.getOwnerId() == this.getObjectId()) return true;
@@ -1864,28 +1838,10 @@ public class CreatureObject extends TangibleObject implements IPersistent {
NGECore.getInstance().simulationService.add(owner, getWorldPosition().x, getWorldPosition().z, false);
NGECore.getInstance().simulationService.teleport(owner, getWorldPosition(), getOrientation(), 0);
}
>>>>>>> upstream/master
}
public void initMount(CreatureObject owner) {
synchronized(objectMutex) {
<<<<<<< HEAD
this.ownerId = owner.getObjectID();
setStateBitmask(0x10000000);
owner.setParent(this);
owner.getClient().getSession().write(messageBuilder.buildOwnerIdDelta(ownerId));
owner.setMountedVehicle(this);
this.setOwnerId(owner.getObjectID());
//this.add(owner); // NPE at engine.resources.objects.SWGObject.getCorrectArrangementId(kd:844)
this.mount(owner);
// setStateBitmask(28);
// owner.setStateBitmask(27);
owner.setStateBitmask(0x8000000);
this.setPosture((byte)10);
//this.sendBaselines(owner.getClient());
=======
setStateBitmask(0x10000000);
owner.setMountedVehicle(this);
@@ -1893,7 +1849,6 @@ public class CreatureObject extends TangibleObject implements IPersistent {
owner.setStateBitmask(0x8000000);
this.setPosture((byte)10);
>>>>>>> upstream/master
}
}