From d7d2f327a5b7884a4cfa8ca0d1fe993d0c7c0e8b Mon Sep 17 00:00:00 2001 From: Treeku Date: Mon, 16 Dec 2013 13:41:47 +0000 Subject: [PATCH] Fixed lifeday gifts, swoop deed, inspire, +fixme --- scripts/commands/inspire.py | 2 +- .../tangible/deed/vehicle_deed/speederbike_swoop_deed.py | 2 +- scripts/radial/lifeday_gift.py | 4 ++-- scripts/radial/main_lifeday_tree.py | 6 +++--- src/services/SimulationService.java | 3 +++ src/services/SkillService.java | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/commands/inspire.py b/scripts/commands/inspire.py index 8e820c1f..30df2e29 100644 --- a/scripts/commands/inspire.py +++ b/scripts/commands/inspire.py @@ -16,7 +16,7 @@ def run(core, actor, target, commandString): 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', 2) 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 index 2d03147f..3edccbd5 100644 --- a/scripts/object/tangible/deed/vehicle_deed/speederbike_swoop_deed.py +++ b/scripts/object/tangible/deed/vehicle_deed/speederbike_swoop_deed.py @@ -7,7 +7,7 @@ def setup(core, object): def use(core, actor, object): pcd = actor.getSlottedObject('datapad') - pcd = createObject('object/intangible/vehicle/shared_speederbike_swoop_pcd.iff', actor.getPlanet(), actor.getPosition) + pcd = core.objectService.createObject('object/intangible/vehicle/shared_speederbike_swoop_pcd.iff', actor.getPlanet(), actor.getPosition) if datapad and pcd: datapad.add(pcd) diff --git a/scripts/radial/lifeday_gift.py b/scripts/radial/lifeday_gift.py index 55b2d057..696d7662 100644 --- 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 index 6082489f..c996a9b5 100644 --- 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/src/services/SimulationService.java b/src/services/SimulationService.java index eff8e68a..4b3a47d6 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -572,6 +572,9 @@ public class SimulationService implements INetworkDispatch { ghost.toggleFlag(PlayerFlags.LD); + // FIXME IllegalArgumentException: References to entities are not allowed: resources.objects.creature.CreatureObject + // FIXME ProtocolDecoderException + // FIXME LockTimeoutException object.createTransaction(core.getCreatureODB().getEnvironment()); core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction()); object.getTransaction().commitSync(); diff --git a/src/services/SkillService.java b/src/services/SkillService.java index cccd6734..75385d8c 100644 --- a/src/services/SkillService.java +++ b/src/services/SkillService.java @@ -100,7 +100,7 @@ public class SkillService implements INetworkDispatch { } //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; }