Changes to MissionObjective, started working on player bounties

scripts/commands/setgodmode.py

@@ -99,11 +99,9 @@ def run(core, actor, target, commandString):
 		if (actor.isInStealth()):
 			actor.setInStealth(False)
 			actor.setRadarVisible(True)
-			actor.sendSystemMessage('You are now visible to other players.', 0)
 		else:
 			actor.setInStealth(True)
 			actor.setRadarVisible(False)
-			actor.sendSystemMessage('You are now hidden from players. "Stealth Effect" is not implemented, however players still won\'t be able to see you. Type /setgodmode stealth again to be visible.', 0)
 	
 	elif command == 'holoEmote' and arg1:
 		playerObject.setHoloEmote('holoemote_' + arg1)
@@ -114,5 +112,9 @@ def run(core, actor, target, commandString):
 		if playerObject.getGodLevel > 0:
 			actor.removeAbility("admin")
 			playerObject.setGodLevel(0)
-			
+	
+	elif command == 'setBounty' and arg1:
+		core.missionService.createNewBounty(actor, int(arg1))
+		return
+	
 	return

scripts/conversation/missions/deliver.py

@@ -44,8 +44,8 @@ def handlePickupStage(core, actor, npc, objective, mission):
 		return
 	
 	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p')
-	objective.createDeliveryItem()
-	objective.update()
+	objective.createDeliveryItem(core, actor)
+	objective.update(core, actor)
 	return
 
 def handleDeliveryStage(core, actor, npc, objective, mission):
@@ -56,7 +56,7 @@ def handleDeliveryStage(core, actor, npc, objective, mission):
 	
 	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r')
 	core.objectService.destroyObject(objective.getDeliveryObject())
-	objective.update()
+	objective.update(core, actor)
 	return
 
 def handleCompletionStage(core, actor, npc, objective, mission):
@@ -66,5 +66,5 @@ def handleCompletionStage(core, actor, npc, objective, mission):
 		return
 	
 	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's')
-	objective.complete()
+	objective.complete(core, actor)
 	return

scripts/object/tangible/terminal/terminal_mission.py

@@ -1,9 +1,7 @@
-from resources.common import TerminalType
 import sys
 
 def setup(core, object):
-
 	core.mapService.addLocation(object.getPlanet(), 'Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 44, 0)
-	object.setAttachment("terminalType", TerminalType.MISSION_GENERIC)
+	object.setAttachment("terminalType", 1)
 	return
 	

scripts/object/tangible/terminal/terminal_mission_bounty.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment("terminalType", 2)
 	return