projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

Refactored ResourceListForSurveyMessage

Browse Source 
Also updated the survey_tool radial accordingly.
This commit is contained in:
Ziggeh
2014-09-05 22:41:13 +02:00
parent 5f63ec0074
commit 04c4d8819b
2 changed files with 49 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/radial/item/survey_tool.py
+21 -2
View File
@@ -16,8 +16,27 @@ def createRadial(core, owner, target, radials):
def handleSelection(core, owner, target, option):
if option == 21 and target:
if owner is not None:
rlfsm = ResourceListForSurveyMessage(core,target,owner)
if owner is not None:
generalType = None
toolName = target.getDetailName();
if toolName.equals('survey_tool_mineral'):
generalType = 0
elif toolName.equals('survey_tool_inorganic'):
generalType = 1
elif toolName.equals('survey_tool_organic') or toolName.equals('survey_tool_lumber'):
generalType = 2
elif toolName.equals('survey_tool_gas'):
generalType = 3
elif toolName.equals('survey_tool_moisture'):
generalType = 4
elif toolName.equals('survey_tool_solar'):
generalType = 5
elif toolName.equals('survey_tool_wind'):
generalType = 6
elif toolName.equals('survey_tool_liquid'):
generalType = 7
rlfsm = ResourceListForSurveyMessage(owner.getObjectId(), core.resourceService.getSpawnedResourcesByPlanetAndType(surveyor.getPlanetId(), generalType))
owner.getClient().getSession().write(rlfsm.serialize())
return
if option == 132:
src/protocol/swg/ResourceListForSurveyMessage.java
+28 -67
View File
@@ -21,100 +21,61 @@
******************************************************************************/
package protocol.swg;
import java.io.UnsupportedEncodingException;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.nio.charset.StandardCharsets;
import java.util.List;
import main.NGECore;
import org.apache.mina.core.buffer.IoBuffer;
import protocol.swg.SWGMessage;
import resources.objects.creature.CreatureObject;
import resources.common.Opcodes;
import resources.objects.resource.GalacticResource;
import resources.objects.tangible.TangibleObject;
public class ResourceListForSurveyMessage extends SWGMessage {
private TangibleObject tool;
private List<GalacticResource> resourceList;
private long characterId;
public ResourceListForSurveyMessage(TangibleObject tool, List<GalacticResource> resourceList) {
this.tool = tool;
public ResourceListForSurveyMessage(long characterId, List<GalacticResource> resourceList) {
this.characterId = characterId;
this.resourceList = resourceList;
}
public ResourceListForSurveyMessage(NGECore core, TangibleObject tool, CreatureObject surveyor) {
this.tool = tool;
this.resourceList = new ArrayList<GalacticResource>();
byte generalType = 0;
String toolName = tool.getDetailName();
if (toolName.equals("survey_tool_mineral"))
generalType = (byte) 0;
if (toolName.equals("survey_tool_inorganic"))
generalType = (byte) 1;
if (toolName.equals("survey_tool_organic") || toolName.equals("survey_tool_lumber"))
generalType = (byte) 2;
if (toolName.equals("survey_tool_gas"))
generalType = (byte) 3;
if (toolName.equals("survey_tool_moisture"))
generalType = (byte) 4;
if (toolName.equals("survey_tool_solar"))
generalType = (byte) 5;
if (toolName.equals("survey_tool_wind"))
generalType = (byte) 6;
if (toolName.equals("survey_tool_liquid"))
generalType = (byte) 7;
if (core.resourceService == null)
System.out.println("heyyyy guess who's confused?!");
List<GalacticResource> planetVector = core.resourceService.getSpawnedResourcesByPlanetAndType(surveyor.getPlanetId(),generalType);
resourceList = new ArrayList<GalacticResource>(planetVector);
}
public void deserialize(IoBuffer data) {
}
public IoBuffer serialize() {
IoBuffer result = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN);
IoBuffer result = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN);
GalacticResource resourceElement = null;
result.setAutoExpand(true);
result.putShort((short)4);
result.putInt(0x8A64B1D5);
result.putInt(Opcodes.ResourceListForSurveyMessage);
result.putInt(resourceList.size());
GalacticResource resourceElement = null;
for (int i = 0; i < resourceList.size(); i++) {
resourceElement = resourceList.get(i);
try {
result.putShort((short)resourceElement.getName().length()); // CStringesque length ahead
result.put(resourceElement.getName().getBytes("US-ASCII"));
result.putLong(resourceElement.getId());
result.putShort((short)resourceElement.getFileName().length());
result.put(resourceElement.getFileName().getBytes("US-ASCII"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
e.getMessage();
e.getCause();
}
result.putShort((short)resourceElement.getName().length()); // CStringesque length ahead
result.put(resourceElement.getName().getBytes(StandardCharsets.US_ASCII));
result.putLong(resourceElement.getId());
result.putShort((short)resourceElement.getFileName().length());
result.put(resourceElement.getFileName().getBytes(StandardCharsets.US_ASCII));
}
if (resourceElement != null) {
try {
result.putShort((short)resourceElement.getCategory().length());
result.put(resourceElement.getCategory().getBytes("US-ASCII"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} else {
result.putShort((short)0);
}
result.putLong(tool.getObjectID());
if (resourceElement != null) {
result.putShort((short)resourceElement.getCategory().length());
result.put(resourceElement.getCategory().getBytes(StandardCharsets.US_ASCII));
} else
result.putShort((short) 0);
result.putLong(characterId);
// Debugging
int size = result.position();
result.flip();
tools.CharonPacketUtils.printAnalysis(IoBuffer.allocate(size).put(result.array(), 0, size).flip());
return IoBuffer.allocate(size).put(result.array(), 0, size).flip();
// Debugging end
return result.flip();
}
}