projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-03 18:13:11 -04:00
Code Issues Projects Releases Wiki Activity

Added time delay for surveying map display

Browse Source 
- QA stuff like countering frequent mindless button hacking and
preventing the tool to lockup as a consequence
This commit is contained in:
CharonInferar
2014-04-03 03:58:23 +02:00
parent 531acac7c6
commit d4876fc87f
2 changed files with 86 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tool/SurveyTool.java
+35
View File
@@ -21,6 +21,8 @@
******************************************************************************/
package resources.objects.tool;
import java.util.Vector;
import com.sleepycat.persist.model.NotPersistent;
import com.sleepycat.persist.model.Persistent;
@@ -29,6 +31,7 @@ import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
import resources.objects.creature.CreatureObject;
import resources.objects.resource.GalacticResource;
import resources.objects.resource.ResourceConcentration;
import resources.objects.tangible.TangibleObject;
/**
@@ -295,4 +298,36 @@ public class SurveyTool extends TangibleObject{
public void setSurveyRangeSetting(byte surveyRangeSetting) {
SurveyRangeSetting = surveyRangeSetting;
}
public void sendConstructSurveyMapMessage(){
float surveyRadius = 64.0f;
int surveyToolRangeSetting = this.getSurveyRangeSetting();
//surveyToolRangeSetting = 4;
int divisor = 0;
if (surveyToolRangeSetting==0) {
divisor = 2;
surveyRadius = 64.0f;
} else if (surveyToolRangeSetting==1) {
divisor = 3;
surveyRadius = 128.0f;
} else if (surveyToolRangeSetting==2) {
divisor = 3;
surveyRadius = 192.0f;
} else if (surveyToolRangeSetting==3) {
divisor = 4;
surveyRadius = 256.0f;
} else if (surveyToolRangeSetting==4) {
divisor = 4;
surveyRadius = 320.0f;
} else {
divisor = 5;
surveyRadius = 3072.0f;
}
float differential = surveyRadius / (float) divisor;
GalacticResource resourceToSurvey = this.getSurveyResource();
Vector<ResourceConcentration> concentrationMap = resourceToSurvey.buildConcentrationsCollection(this.getUser().getPosition(),resourceToSurvey, surveyRadius, differential, this.getUser().getPlanetId());
this.getSurveyResource().constructSurveyMapMessage(this.getUser(), concentrationMap, surveyRadius);
this.getUser().sendSystemMessage("Distance to nearest Deposit : " + this.getSurveyResource().getHelperMinDist(), (byte) 0);
}
}
src/services/SurveyService.java
+51 -35
View File
@@ -85,6 +85,7 @@ public class SurveyService implements INetworkDispatch {
}
public void ServiceProcessing(){
// All tools sampling
SurveyTool removeTool=null;
for (SurveyTool surveyTool : activeSurveyTools){
if (surveyTool.getCurrentlySurveying()){
@@ -92,6 +93,7 @@ public class SurveyService implements INetworkDispatch {
if (System.currentTimeMillis()>surveyTool.getLastSurveyTime()+3000){
removeTool = surveyTool;
surveyTool.setCurrentlySurveying(false);
surveyTool.sendConstructSurveyMapMessage();
}
}
if (surveyTool.getCurrentlySampling()){
@@ -123,6 +125,8 @@ public class SurveyService implements INetworkDispatch {
if (removeTool!=null)
activeSurveyTools.remove(removeTool); // remove after notification
}
public void handleSamplingStages(SurveyTool surveyTool){
@@ -247,6 +251,12 @@ public class SurveyService implements INetworkDispatch {
return;
}
// QA tool lockup countermeasure
if(surveyTool.getCurrentlySurveying() && surveyTool.getLastSurveyTime()<System.currentTimeMillis()-3000){
surveyTool.setCurrentlySurveying(false);
surveyTool.setLastSurveyTime(System.currentTimeMillis());
}
// Counter too frequent survey button activation
if(surveyTool.getCurrentlySurveying()){
return;
@@ -273,35 +283,35 @@ public class SurveyService implements INetworkDispatch {
crafter.getClient().getSession().write(cEffMsg.serialize());
crafter.sendSystemMessage("You begin to survey for " + commandArgs, (byte) 0);
float surveyRadius = 64.0f;
int surveyToolRangeSetting = surveyTool.getSurveyRangeSetting();
//surveyToolRangeSetting = 4;
int divisor = 0;
if (surveyToolRangeSetting==0) {
divisor = 2;
surveyRadius = 64.0f;
} else if (surveyToolRangeSetting==1) {
divisor = 3;
surveyRadius = 128.0f;
} else if (surveyToolRangeSetting==2) {
divisor = 3;
surveyRadius = 192.0f;
} else if (surveyToolRangeSetting==3) {
divisor = 4;
surveyRadius = 256.0f;
} else if (surveyToolRangeSetting==4) {
divisor = 4;
surveyRadius = 320.0f;
} else {
divisor = 5;
surveyRadius = 3072.0f;
}
float differential = surveyRadius / (float) divisor;
GalacticResource resourceToSurvey = surveyTool.getSurveyResource();
Vector<ResourceConcentration> concentrationMap = resourceToSurvey.buildConcentrationsCollection(crafter.getPosition(),resourceToSurvey, surveyRadius, differential, crafter.getPlanetId());
resourceToSurvey.constructSurveyMapMessage(crafter, concentrationMap, surveyRadius);
crafter.sendSystemMessage("Distance to nearest Deposit : " + resourceToSurvey.getHelperMinDist(), (byte) 0);
// float surveyRadius = 64.0f;
// int surveyToolRangeSetting = surveyTool.getSurveyRangeSetting();
// //surveyToolRangeSetting = 4;
// int divisor = 0;
// if (surveyToolRangeSetting==0) {
// divisor = 2;
// surveyRadius = 64.0f;
// } else if (surveyToolRangeSetting==1) {
// divisor = 3;
// surveyRadius = 128.0f;
// } else if (surveyToolRangeSetting==2) {
// divisor = 3;
// surveyRadius = 192.0f;
// } else if (surveyToolRangeSetting==3) {
// divisor = 4;
// surveyRadius = 256.0f;
// } else if (surveyToolRangeSetting==4) {
// divisor = 4;
// surveyRadius = 320.0f;
// } else {
// divisor = 5;
// surveyRadius = 3072.0f;
// }
//
// float differential = surveyRadius / (float) divisor;
// GalacticResource resourceToSurvey = surveyTool.getSurveyResource();
// Vector<ResourceConcentration> concentrationMap = resourceToSurvey.buildConcentrationsCollection(crafter.getPosition(),resourceToSurvey, surveyRadius, differential, crafter.getPlanetId());
// resourceToSurvey.constructSurveyMapMessage(crafter, concentrationMap, surveyRadius);
// crafter.sendSystemMessage("Distance to nearest Deposit : " + resourceToSurvey.getHelperMinDist(), (byte) 0);
}
public void requestSampling(CreatureObject crafter, SWGObject target, SurveyCommand command, int actionCounter, String commandArgs){
@@ -309,6 +319,11 @@ public class SurveyService implements INetworkDispatch {
PlayerObject player = (PlayerObject) crafter.getSlottedObject("ghost");
SurveyTool surveyTool = player.getLastUsedSurveyTool();
if (surveyTool.getCurrentlySurveying()){
crafter.sendSystemMessage("@survey:sample_survey", (byte) 0);
return;
}
if (crafter.getPosture()!=1) // QA
surveyTool.setCurrentlySampling(false);
@@ -351,11 +366,11 @@ public class SurveyService implements INetworkDispatch {
crafter.sendSystemMessage("You will be able to sample again in " + remaining + " seconds.", (byte) 0); // "@survey:tool_recharge_time"
} else {
// ToDo:
if (sampleResource.getResourceRoot().getResourceClass().equals("Radioactive")){ //resourceRoot.getResourceClass("Radioactive");
createRadioactivityWarningSUIWindow(crafter, surveyTool);
return;
}
// ToDo: Find out if NGE really still did this
// if (sampleResource.getResourceRoot().getResourceClass().equals("Radioactive")){ //resourceRoot.getResourceClass("Radioactive");
// createRadioactivityWarningSUIWindow(crafter, surveyTool);
// return;
// }
crafter.setPosture((byte) 1);
crafter.sendSystemMessage("You kneel", (byte) 0);
@@ -544,7 +559,8 @@ public class SurveyService implements INetworkDispatch {
}
public void addActiveSurveyTool(SurveyTool tool){
activeSurveyTools.add(tool);
if (! activeSurveyTools.contains(tool))
activeSurveyTools.add(tool);
}
public Vector<SurveyTool> getActiveSurveyTools(){