Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Light2 · Light2 · commit c3cf8713bf78 · 2013-12-16T20:58:14.000+01:00
Conflicts:
	src/services/SimulationService.java
diff --git a/scripts/commands/addfriend.py b/scripts/commands/addfriend.py
@@ -6,5 +6,6 @@ def setup():
 def run(core, actor, target, commandString):
     actorGhost = actor.getSlottedObject("ghost")
     chatSrvc = core.chatService
-    chatSrvc.addFriend(actorGhost, commandString, 1)
+    if chatSrvc and actorGhost and commandString:
+	chatSrvc.addFriend(actorGhost, commandString, 1)
     return
diff --git a/scripts/commands/giveitem.py b/scripts/commands/giveitem.py
@@ -5,6 +5,9 @@ def setup():
 	
 def run(core, actor, target, commandString):
 	
+	if actor.getClient() and actor.getClient().isGM() == False:
+		return
+	
 	if not commandString.startswith('object/tangible') and not commandString.startswith('object/weapon'):
 		return
 		
diff --git a/scripts/commands/inspire.py b/scripts/commands/inspire.py
@@ -13,15 +13,15 @@ def run(core, actor, target, commandString):
 
     print 'x'
     if actor.getPosture() != 0x09:
-      actor.sendSystemMessage('@performance:insp_buff_must_perform')
+      actor.sendSystemMessage('@performance:insp_buff_must_perform', 2)
       return
 
-    if (target.getPerformanceWatchee() != actor):
+    if not target.getPerformanceWatchee() or target.getPerformanceWatchee() != actor:
       if actor.getPerformanceType():
-        actor.sendSystemMessage('@performance:insp_buff_must_watch')
+        actor.sendSystemMessage('@performance:insp_buff_must_watch', 2)
         return
       else:
-        actor.sendSystemMessage('@performance:insp_buff_must_listen')
+        actor.sendSystemMessage('@performance:insp_buff_must_listen', 2)
         return
 
     print ('Buffing Player: ' + str(target.getObjectId()) + ' or: ' + target.getCustomName())
diff --git a/scripts/object/intangible/vehicle/speederbike_swoop_pcd.py b/scripts/object/intangible/vehicle/speederbike_swoop_pcd.py
@@ -1,4 +1,23 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('vehicleId', core.objectService.generateObjectID())
+	object.setAttachment('radial_filename', 'item')
+	return
+
+def use(core, actor, object):
+	if object:
+		vehicleId = object.getAttachment('vehicleId')
+		
+		if not vehicleId:
+			return
+		
+		vehicle = core.objectService.getObject(vehicleId)
+		
+		if vehicle:
+			core.objectService.destroyObject(vehicle)
+		else:
+			core.objectService.createObject('object/mobile/vehicles/shared_speederbike_swoop.iff', vehicleId, actor.getPlanet(), actor.getPosition(), actor.getOrientation())
+			core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
+	
 	return
diff --git a/scripts/object/mobile/vehicle/speederbike_swoop.py b/scripts/object/mobile/vehicle/speederbike_swoop.py
@@ -1,4 +1,16 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'vehicle')
+	return
+
+def use(core, actor, object):
+	vehicle = actor.getContainer()
+	
+	if vehicle:
+		if vehicle.getObjectID() == object.getObjectID():
+			vehicle.remove(actor)
+		else:
+			vehicle.add(actor)
+	
 	return
diff --git a/scripts/object/tangible/deed/vehicle_deed/speederbike_swoop_deed.py b/scripts/object/tangible/deed/vehicle_deed/speederbike_swoop_deed.py
@@ -1,4 +1,19 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'vehicleDeed')
+	return
+
+def use(core, actor, object):
+	datapad = actor.getSlottedObject('datapad')
+	
+	pcd = core.objectService.createObject('object/intangible/vehicle/shared_speederbike_swoop_pcd.iff', actor.getPlanet(), actor.getPosition())
+	
+	if datapad and pcd:
+		datapad.add(pcd)
+		core.objectService.destroyObject(object)
+		vehicle = createObject('object/mobile/vehicle/shared_speederbike_swoop.iff', pcd.getAttachment('vehicleId'), actor.getPlanet(), actor.getPosition(), actor.getOrientation())
+		vehicle.setOwnerId(actor.getObjectID())
+		core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
+	
 	return
diff --git a/scripts/radial/item.py b/scripts/radial/item.py
@@ -0,0 +1,16 @@
+from resources.common import RadialOptions
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 21, 1, ''))
+	radials.add(RadialOptions(0, 7, 1, ''))
+	radials.add(RadialOptions(0, 15, 1, ''))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 21 and target:
+		core.objectService.useObject(owner, target)
+	if option == 15 and target:
+		core.objectService.destroyObject(target)
+	return
+	
diff --git a/scripts/radial/lifeday_gift.py b/scripts/radial/lifeday_gift.py
@@ -47,8 +47,8 @@ def handleSelection(core, actor, object, option):
 		if not inventory:
 			return
 		
-		reward1 = core.objectService.createObject('object/holiday/life_day/rewards_09/shared_lifeday_painting.iff', actor.getPlanet())
-		reward2 = core.objectService.createObject('object/holiday/life_day/' + objectName + '.iff', actor.getPlanet())
+		reward1 = core.objectService.createObject('object/tangible/holiday/life_day/rewards_09/shared_lifeday_painting.iff', actor.getPlanet())
+		reward2 = core.objectService.createObject('object/tangible/holiday/life_day/' + objectName + '.iff', actor.getPlanet())
 		
 		inventory.add(reward1)
 		inventory.add(reward2)
diff --git a/scripts/radial/main_lifeday_tree.py b/scripts/radial/main_lifeday_tree.py
@@ -5,9 +5,9 @@ def createRadial(core, owner, target, radials):
 	radials.clear()
 	player = owner.getSlottedObject('ghost')
 	radials.add(RadialOptions(0, 7, 1, ''))
-	if player and core.collectionService.isComplete(owner, 'col_lifeday_tree_tracking_2010') == False:
+	if player and core.collectionService.getCollection(owner, 'col_lifeday_tree_tracking_2010') < 1:
 		radials.add(RadialOptions(0, 21, 3, '@spam:tree_use'))
-	if player and core.collectionService.isComplete(owner, 'lifeday_badge_08') == False:
+	if player and core.collectionService.getCollection(owner, 'lifeday_badge_08') < 1:
 		radials.add(RadialOptions(0, 115, 3, '@spam:tree_badge'))
 	return
 
@@ -27,7 +27,7 @@ def handleSelection(core, owner, target, option):
 	if not player:
 		return
 	
-	if core.collectionService.isComplete(actor, 'lifeday_badge_08'):
+	if core.collectionService.isComplete(actor, 'col_lifeday_tree_tracking_2010'):
 		return
 	
 	inventory = actor.getSlottedObject('inventory')
diff --git a/scripts/radial/vehicle.py b/scripts/radial/vehicle.py
@@ -0,0 +1,17 @@
+from resources.common import RadialOptions
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 7, 1, ''))
+	radials.add(RadialOptions(1, 40, 3, '@pet/pet_menu:menu_enter_exit'))
+	radials.add(RadialOptions(0, 21, 1, ''))
+	radials.add(RadialOptions(0, 60, 3, '@pet/pet_menu:menu_store'))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if target:
+		if option == 21 or option == 40:
+			core.objectService.useObject(owner, target)
+		if option == 60:
+			core.objectService.destroyObject(target)
+	return
diff --git a/scripts/radial/vehicleDeed.py b/scripts/radial/vehicleDeed.py
@@ -0,0 +1,16 @@
+from resources.common import RadialOptions
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 7, 1, ''))
+	radials.add(RadialOptions(0, 15, 1, ''))
+	radials.add(RadialOptions(0, 61, 1, ''))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 61 and target:
+		core.objectService.useObject(owner, target)
+	if option == 15 and target:
+		core.objectService.destroyObject(target)
+	return
+	
diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py
@@ -17,7 +17,6 @@ def addPlanetSpawns(core, planet):
 	bandtat4.setCustomName2('Sunil Eide')
 	stcSvc.spawnObject('object/tangible/instrument/shared_nalargon.iff', 'tatooine', long(0), float(-5045.00), float(75), float(-6555), float(0.999132931232), float(-0.0416347384453)) # Drums
 	stcSvc.spawnObject('object/tangible/instrument/shared_ommni_box.iff', 'tatooine', long(0), float(-5043.00), float(75), float(-6559), float(0.999132931232), float(-0.0416347384453)) # Box
-	stcSvc.spawnObject('object/tangible/holiday/life_day/shared_life_day_tree.iff', 'tatooine', long(0), float(-5083.00), float(75), float(-6619.00), float(0.999132931232), float(-0.0416347384453)) # small tree
 
 	return
 	
diff --git a/src/resources/datatables/PlayerFlags.java b/src/resources/datatables/PlayerFlags.java
@@ -19,7 +19,7 @@
  * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
  * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
  ******************************************************************************/
-package resources.common;
+package resources.datatables;
 
 public class PlayerFlags {
 	public static final int LFG = 0x01;
diff --git a/src/resources/objects/player/PlayerMessageBuilder.java b/src/resources/objects/player/PlayerMessageBuilder.java
@@ -28,7 +28,6 @@
 
 import engine.resources.common.CRC;
 
-import resources.common.StringUtilities;
 import resources.objects.ObjectMessageBuilder;
 import resources.objects.waypoint.WaypointObject;
 
@@ -357,7 +356,6 @@ public IoBuffer buildCollectionsDelta(byte[] collections, int highestSetBit) {
 		int size = buffer.position();
 		buffer.flip();
 		buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 16, buffer, size + 4);
-		System.out.println(StringUtilities.bytesToHex(buffer.array()));
 		return buffer;		
 	}
 	
diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java
@@ -698,4 +698,13 @@ public void toggleFlag(int flag) {
 		}
 	}
 	
+	/*
+	 * @return True if specified flag(s) are enabled
+	 */
+	public boolean isSet(int flags) {
+		synchronized(objectMutex) {
+			return ((flagBitmask & flags) == flags);
+		}
+	}
+	
 }
diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java
@@ -53,6 +53,7 @@
 import engine.resources.service.INetworkRemoteEvent;
 import resources.common.*;
 import resources.common.collidables.AbstractCollidable;
+import resources.datatables.PlayerFlags;
 import resources.objects.creature.CreatureObject;
 import resources.objects.player.PlayerObject;
 
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
@@ -79,6 +79,7 @@
 import resources.objects.tangible.TangibleObject;
 import resources.common.*;
 import resources.common.collidables.AbstractCollidable;
+import resources.datatables.PlayerFlags;
 import services.ai.LairActor;
 import toxi.geom.Line3D;
 import toxi.geom.Ray3D;
@@ -571,7 +572,8 @@ public void handleDisconnect(final IoSession session) {
 		
 		ghost.toggleFlag(PlayerFlags.LD);
 		
-		/*object.createTransaction(core.getCreatureODB().getEnvironment());
+		/*
+		object.createTransaction(core.getCreatureODB().getEnvironment());
 		core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction());
 		object.getTransaction().commitSync();*/
 		
@@ -615,15 +617,18 @@ public void handleZoneIn(Client client) {
 		
 		PlayerObject ghost = (PlayerObject) object.getSlottedObject("ghost");
 		
+		if (ghost.isSet(PlayerFlags.LD)) {
+			ghost.toggleFlag(PlayerFlags.LD);
+		}
+		
 		core.weatherService.sendWeather(object);
 		
 		if (!object.hasSkill(ghost.getProfessionWheelPosition())) {
 			object.showFlyText("cbt_spam", "skill_up", (float) 2.5, new RGB(154, 205, 50), 0);
 			object.playEffectObject("clienteffect/skill_granted.cef", "");
 			object.playMusic("sound/music_acq_bountyhunter.snd");
 			core.skillService.addSkill(object, ghost.getProfessionWheelPosition());
-		}
-		
+		}		
 	}
 		
 	public void transferToPlanet(SWGObject object, Planet planet, Point3D newPos, Quaternion newOrientation, SWGObject newParent) {
diff --git a/src/services/SkillService.java b/src/services/SkillService.java
@@ -100,7 +100,7 @@ public void addSkill(CreatureObject creature, String skill) {
 						}
 
 						//exempt species skills from being returned -- they're marked godOnly but really meant to be granted
-						if ((!speciesSkill) && ( godOnly  || isHidden)) {
+						if ((!speciesSkill) && (godOnly  || isHidden)) {
 							return;
 						}
 						
diff --git a/src/services/gcw/FactionService.java b/src/services/gcw/FactionService.java
@@ -39,6 +39,7 @@
 import resources.objects.creature.CreatureObject;
 import resources.objects.player.PlayerObject;
 
+import engine.clientdata.StfTable;
 import engine.clients.Client;
 import engine.resources.common.CRC;
 import engine.resources.service.INetworkDispatch;
@@ -54,7 +55,6 @@ public FactionService(NGECore core) {
 		this.core = core;
 		
 		try {
-			/*
 			StfTable stf = new StfTable("clientdata/string/en/faction/faction_names.stf");
 			
 			for (int s = 1; s < stf.getRowCount(); s++) {
@@ -64,7 +64,6 @@ public FactionService(NGECore core) {
 					factionMap.put(faction, CRC.StringtoCRC(faction));
 				}
 			}
-			*/
         } catch (Exception e) {
                 e.printStackTrace();
         }
diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
@@ -44,6 +44,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import resources.common.*;
+import resources.datatables.PlayerFlags;
 
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
