From 77bea7604e8e4aa25b38ab33d9f859e5e51ec980 Mon Sep 17 00:00:00 2001 From: Seefo Date: Wed, 16 Apr 2014 13:35:00 -0400 Subject: [PATCH] Fixed an error in the setgodmode command --- scripts/commands/meditate.py | 4 ++-- scripts/commands/setgodmode.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/commands/meditate.py b/scripts/commands/meditate.py index 9c02f74f..8e0ed60f 100644 --- a/scripts/commands/meditate.py +++ b/scripts/commands/meditate.py @@ -6,8 +6,8 @@ def setup(): def run(core, actor, target, commandString): ##To do make it reset moodanimations when meditation is cancled. - if core.collectionService.isComplete(actor, 'inv_holocron_collection_02') is False: - return + # if core.collectionService.isComplete(actor, 'inv_holocron_collection_02') is False: + # return if actor.getPosture() != 0x08: actor.sendSystemMessage('You need to sit',0) diff --git a/scripts/commands/setgodmode.py b/scripts/commands/setgodmode.py index 84f981c7..e66d7982 100644 --- a/scripts/commands/setgodmode.py +++ b/scripts/commands/setgodmode.py @@ -57,14 +57,13 @@ def run(core, actor, target, commandString): position = Point3D(float(arg3), float(arg4), float(arg5)) core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName(arg2), position, player.getOrientation(), None) - elif command == 'credits' and arg1: actor.setCashCredits(actor.getCashCredits() + int(arg1)) actor.sendSystemMessage('The Galactic Empire has transferred ' + arg1 + ' credits to you for your service.', 0) elif command == 'addability' and arg1: actor.addAbility(str(arg1)) - actor.sendSystemMessage('You have learned ' + arg1 + '') + actor.sendSystemMessage('You have learned ' + arg1 + '.', 0) elif command == 'anim' and arg1: actor.doSkillAnimation(arg1) @@ -110,8 +109,10 @@ def run(core, actor, target, commandString): playerObject.setHoloEmote('holoemote_' + arg1) playerObject.setHoloEmoteUses(20) actor.sendSystemMessage('Holo-Emote Generator set to ' + 'holoemote_' + arg1, 0) + elif command == 'off': if playerObject.getGodLevel > 0: actor.removeAbility("admin") playerObject.setGodLevel(0) + return