From 73f8ad85bc436670cfdd0871beae230533479341 Mon Sep 17 00:00:00 2001 From: Treeku Date: Tue, 29 Apr 2014 04:49:42 +0100 Subject: [PATCH] useObject adds the UseTarget --- scripts/radial/deeds/harvesterDeed.py | 2 +- src/main/NGECore.java | 2 +- src/services/object/ObjectService.java | 2 ++ src/services/resources/HarvesterService.java | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/radial/deeds/harvesterDeed.py b/scripts/radial/deeds/harvesterDeed.py index d25e0503..9d85158b 100644 --- a/scripts/radial/deeds/harvesterDeed.py +++ b/scripts/radial/deeds/harvesterDeed.py @@ -11,10 +11,10 @@ def createRadial(core, owner, target, radials): def handleSelection(core, owner, target, option): if option == 21 and target: + core.objectService.useObject(owner, target) core.harvesterService.enterStructurePlacementMode(owner, target) if option == 61 and target: object5 = core.harvesterService.constructionSite(owner, target) - core.objectService.useObject(owner, target) if option == 15 and target: core.objectService.destroyObject(target) return diff --git a/src/main/NGECore.java b/src/main/NGECore.java index c99d4912..7cbf266b 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -363,6 +363,7 @@ public class NGECore { zoneDispatch.addService(bazaarService); zoneDispatch.addService(lootService); zoneDispatch.addService(mountService); + zoneDispatch.addService(housingService); zoneDispatch.addService(playerCityService); if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) { @@ -482,7 +483,6 @@ public class NGECore { spawnService.loadLairGroups(); spawnService.loadSpawnAreas(); - housingService.loadHousingTemplates(); equipmentService.loadBonusSets(); retroService.run(); diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index e46c047f..8cfc50f4 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -638,6 +638,8 @@ public class ObjectService implements INetworkDispatch { return; } + creature.setUseTarget(object); + int reuse_time; try { diff --git a/src/services/resources/HarvesterService.java b/src/services/resources/HarvesterService.java index f8838be1..151a6d67 100644 --- a/src/services/resources/HarvesterService.java +++ b/src/services/resources/HarvesterService.java @@ -944,19 +944,19 @@ public class HarvesterService implements INetworkDispatch { quaternion = resources.common.MathUtilities.rotateQuaternion(quaternion, (float)((Math.PI/2) * dir), new Point3D(0, 1, 0)); InstallationObject installation = (InstallationObject) core.objectService.createObject(constructorTemplate, 0, actor.getPlanet(), new Point3D(posX, positionY, posZ), quaternion); - if (usedDeed.getAttributes().containsKey("examine_extractionrate")) { + if (!usedDeed.getAttributes().containsKey("examine_extractionrate")) { usedDeed.setIntAttribute("examine_extractionrate", 0); } - if (usedDeed.getAttributes().containsKey("examine_hoppersize")) { + if (!usedDeed.getAttributes().containsKey("examine_hoppersize")) { usedDeed.setIntAttribute("examine_hoppersize", 0); } - if (usedDeed.getAttributes().containsKey("examine_maintenance")) { + if (!usedDeed.getAttributes().containsKey("examine_maintenance")) { usedDeed.setIntAttribute("examine_maintenance", 0); } - if (usedDeed.getAttributes().containsKey("examine_power")) { + if (!usedDeed.getAttributes().containsKey("examine_power")) { usedDeed.setIntAttribute("examine_power", 0); }