Bug Fixes: Issue #215 + #235 & Minor improvements.

(BugFix) Officer group buff's will now check ranges
(BugFix) Group buffs applied when a player joins a group as long as they
are within range
(BugFix) /inspire will now take a command string for target
(BugFix) /imagedesign will now take a command string for target

scripts/commands/holoemote.py

@@ -27,7 +27,10 @@ def run(core, actor, target, commandString):
 	
 	if commandString == "kitty":
 		commandString = "technokitty"
-
+	
+	if commandString is None or commandString == "":
+		commandString == installedEmote
+	
 	if commandString != installedEmote and installedEmote != 'all':
 		actor.sendSystemMessage('Your installed Holo-Emote generator does not support that emote.', 0)
 		return
@@ -47,7 +50,7 @@ def holoPrompt(player, emote):
 	if player.getHoloEmoteUses() == 1:
 		remainingCharges = "You have 1 charge remaining.\n"
 	
-	body = "To play a Holo-Emote, type /holoemote <name>." \
+	body = "To play a Holo-Emote, type /holoemote <name>.\n" \
 "To delete your Holo-Emote type /holoemote delete.\n" \
 "Purchasing a new Holo-Emote will automatically delete your current Holo-Emote.\n" \
 "\n" \

scripts/commands/imagedesign.py

@@ -7,13 +7,18 @@ def setup():
 	
 def run(core, actor, target, commandString):
 
-	if target is None:
+	if target is None and commandString is None:
 		design = ImageDesignStartMessage(actor.getObjectId(), actor.getObjectId(), target.getObjectId())
 		obj = ObjControllerMessage(11, design)
 		actor.getClient().getSession().write(obj.serialize())
 		return
 	
 	else:
+		if target is None and commandString is not None:
+			target = core.chatService.getObjectByFirstName(commandString)
+			if target is None:
+				return
+
 		if target.getGroupId() == actor.getGroupId():
 
 			tDesign = ImageDesignStartMessage(target.getObjectId(), actor.getObjectId(), target.getObjectId())

scripts/commands/inspire.py

@@ -17,6 +17,11 @@ def run(core, actor, target, commandString):
     	actor.getClient().getSession().write(objController.serialize())
     	return
     
+    if target is None and commandString is not None:
+    	target = core.chatService.getObjectByFirstName(commandString)
+    	if target is None:
+    		return
+    
     if actor.getPosture() != 0x09 and target.getObjectId() != actor.getObjectId():
       actor.sendSystemMessage('@performance:insp_buff_must_perform', 2)
       return

scripts/commands/of_buff_def_1.py

@@ -4,6 +4,9 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_1')
+	if target is None:
+		target = actor
+	
+	core.buffService.addGroupBuff(target, 'of_buff_def_1', actor)
 	return
 	

scripts/commands/of_buff_def_2.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_2')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_2', actor)
 	return
 	

scripts/commands/of_buff_def_3.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_3')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_3', actor)
 	return
 	

scripts/commands/of_buff_def_4.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_4')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_4', actor)
 	return
 	

scripts/commands/of_buff_def_5.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_5')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_5', actor)
 	return
 	

scripts/commands/of_buff_def_6.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_6')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_6', actor)
 	return
 	

scripts/commands/of_buff_def_7.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_7')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_7', actor)
 	return
 	

scripts/commands/of_buff_def_8.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_8')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_8', actor)
 	return
 	

scripts/commands/of_buff_def_9.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_buff_def_9')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_buff_def_9', actor)
 	return
 	

scripts/commands/of_drillmaster_1.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_drillmaster_1')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_drillmaster_1', actor)
 	return
 	

scripts/commands/of_focus_fire_1.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_focus_fire_1')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_focus_fire_1', actor)
 	return
 	

scripts/commands/of_focus_fire_2.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_focus_fire_2')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_focus_fire_2', actor)
 	return
 	

scripts/commands/of_focus_fire_3.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_focus_fire_3')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_focus_fire_3', actor)
 	return
 	

scripts/commands/of_focus_fire_4.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_focus_fire_4')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_focus_fire_4', actor)
 	return
 	

scripts/commands/of_focus_fire_5.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_focus_fire_5')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_focus_fire_5', actor)
 	return
 	

scripts/commands/of_focus_fire_6.py

@@ -4,6 +4,8 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'of_focus_fire_6')
+	if target is None:
+		target = actor
+	core.buffService.addGroupBuff(target, 'of_focus_fire_6', actor)
 	return