projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-06 21:12:59 -04:00
Code Issues Projects Releases Wiki Activity

Bug fix

Browse Source 
Picking up sampling a previously sampled resource, will add the stack to
the according container.
This commit is contained in:
CharonInferar
2014-04-06 14:27:55 +02:00
parent da6af6177f
commit a5ba92cbf1
10 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SurveyService.java
+40 -3
View File
@@ -29,6 +29,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import protocol.swg.PlayClientEffectLocMessage;
import protocol.swg.SceneCreateObjectByCrc;
import protocol.swg.SceneEndBaselines;
@@ -49,6 +50,7 @@ import services.sui.SUIWindow.SUICallback;
import services.sui.SUIWindow.Trigger;
import main.NGECore;
import engine.resources.common.CRC;
import engine.resources.container.Traverser;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Point3D;
import engine.resources.service.INetworkDispatch;
@@ -138,7 +140,14 @@ public class SurveyService implements INetworkDispatch {
GalacticResource sampleResource = surveyTool.getSurveyResource();
int stackCount = 0;
boolean gamblingwon = false;
ResourceContainerObject container = player.getRecentContainer();
//ResourceContainerObject container = player.getRecentContainer();
ResourceContainerObject container = null;
// Attempt to find container with the currently sampled resource in
// player inventory tree
ResourceContainerObject foundContainer = findResourceContainerInInventory(crafter,sampleResource);
if (foundContainer!=null)
container = foundContainer;
if (! surveyTool.isRecoveryMode())
stackCount = core.resourceService.getResourceSampleQuantity(crafter, sampleResource);
else { // handle particularly rich case
@@ -150,7 +159,7 @@ public class SurveyService implements INetworkDispatch {
}
surveyTool.setRecoveryMode(false);
}
if (container!=null) {
if (container.getReferenceID()==sampleResource.getId()) {
int stackCountToUpdate = container.getStackCount();
@@ -177,11 +186,13 @@ public class SurveyService implements INetworkDispatch {
}
} else { // Mismatch -> new container
String resourceContainerIFF = ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[sampleResource.getResourceRoot().getContainerType()];
if ((stackCount > 0) && (!surveyTool.isRecoveryMode())) {
ResourceContainerObject containerObject = (ResourceContainerObject) core.objectService.createObject(resourceContainerIFF, crafter.getPlanet());
containerObject.initializeStats(sampleResource);
containerObject.setProprietor(crafter);
container.setStackCount(stackCount,crafter);
SWGObject crafterInventory = crafter.getSlottedObject("inventory");
crafterInventory.add(containerObject);
player.setRecentContainer(containerObject);
@@ -189,16 +200,19 @@ public class SurveyService implements INetworkDispatch {
}
} else { // create new container, first sample
if ((stackCount > 0) && (!surveyTool.isRecoveryMode())) {
String resourceContainerIFF = ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[sampleResource.getResourceRoot().getContainerType()];
ResourceContainerObject containerObject = (ResourceContainerObject) core.objectService.createObject(resourceContainerIFF, crafter.getPlanet());
containerObject.initializeStats(sampleResource);
containerObject.setProprietor(crafter);
stackCount = core.resourceService.getResourceSampleQuantity(crafter, sampleResource);
//stackCount = core.resourceService.getResourceSampleQuantity(crafter, sampleResource);
containerObject.setStackCount(stackCount,crafter);
SWGObject crafterInventory = crafter.getSlottedObject("inventory");
crafterInventory.add(containerObject);
player.setRecentContainer(containerObject);
}
}
@@ -227,6 +241,29 @@ public class SurveyService implements INetworkDispatch {
}
}
public ResourceContainerObject findResourceContainerInInventory(CreatureObject owner, GalacticResource resource){
ResourceContainerObject foundContainer = null;
final Vector<ResourceContainerObject> found = new Vector<ResourceContainerObject>();
TangibleObject playerInventory = (TangibleObject) owner.getSlottedObject("inventory");
playerInventory.viewChildren(owner, false, false, new Traverser() {
@Override
public void process(SWGObject obj) {
if (obj instanceof ResourceContainerObject){
ResourceContainerObject container = (ResourceContainerObject) obj;
if (container.getReferenceID()==resource.getId()
&& container.getStackCount()<ResourceContainerObject.maximalStackCapacity-10)
found.add(container);
}
}
});
if (found.size()>0)
foundContainer = found.get(0);
return foundContainer;
}
public void requestSurvey(CreatureObject crafter, SWGObject target, String commandArgs){
// Check if crafter has survey skill