projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-19 09:02:54 -04:00
Code Issues Projects Releases Wiki Activity

Surveying debugging

Browse Source 
Improved surveying
This commit is contained in:
CharonInferar
2014-03-31 19:50:02 +02:00
parent f4527d60f4
commit e692120b8f
9 changed files with 276 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/resource/GalacticResource.java
+5 -3
View File
@@ -213,12 +213,13 @@ public class GalacticResource extends SWGObject implements IPersistent {
setIffFileName(resourceRoot.getResourceFileName());
this.category = resourceRoot.getResourceClass();
this.setGeneralType(resourceRoot.getGeneralType());
this.setResourceRootID(resourceRoot.getResourceRootID()); // FK
//setResourceContainerTemplateID(resourceRoot.getTemplateID());
}
public void generateResourceType(){
// theResource.setResourceType(template.getResourceType());
// theResource.setResourceClass(template.getResourceClass());
// this.setResourceType(template.getResourceType());
// this.setResourceClass(template.getResourceClass());
}
public void generateResourceStats(){
@@ -379,6 +380,7 @@ public class GalacticResource extends SWGObject implements IPersistent {
}
public void constructResourceName(Vector<String> completeResourceNameHistory){
// ToDo: This is where the database check for past names must be added
boolean check=true;
while(check)
{
@@ -592,7 +594,7 @@ public class GalacticResource extends SWGObject implements IPersistent {
this.getresourceType = getresourceType;
}
public GalacticResource convertIntoHistoricResource(){
public GalacticResource convertToHistoricResource(){
GalacticResource historicResource = new GalacticResource();
historicResource.setName(this.getName());
historicResource.setResourceClass(this.getResourceClass());
src/resources/objects/tool/SurveyTool.java
+60 -36
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package resources.objects.tool;
import com.sleepycat.persist.model.NotPersistent;
import com.sleepycat.persist.model.Persistent;
import engine.resources.scene.Planet;
@@ -38,21 +39,32 @@ import resources.objects.tangible.TangibleObject;
public class SurveyTool extends TangibleObject{
private byte toolType;
private String surveyEffectString;
private String sampleEffectString;
private boolean currentlySurveying;
private boolean currentlySampling;
private boolean currentlyCoolingDown;
private boolean exceptionalState;
private boolean RecoveryMode;
private Long lastSurveyTime;
private Long lastSampleTime;
private Long recoveryTime;
private GalacticResource surveyResource;
private CreatureObject user;
private Long tanoID;
private byte SurveyRangeSetting;
@NotPersistent
private String surveyEffectString;
@NotPersistent
private String sampleEffectString;
@NotPersistent
private boolean currentlySurveying;
@NotPersistent
private boolean currentlySampling;
@NotPersistent
private boolean currentlyCoolingDown;
@NotPersistent
private boolean exceptionalState;
@NotPersistent
private boolean recoveryMode;
@NotPersistent
private Long lastSurveyTime;
@NotPersistent
private Long lastSampleTime;
@NotPersistent
private Long recoveryTime;
public static byte MineralSurveyDevice = 1;
public static byte ChemicalSurveyDevice = 2;
public static byte FloraSurveyTool = 3;
@@ -73,6 +85,7 @@ public class SurveyTool extends TangibleObject{
sampleEffectString = "";
this.tanoID = objectID;
this.exceptionalState = false;
this.recoveryMode = false;
switch (template) {
case "object/tangible/survey_tool/shared_survey_tool_mineral.iff" :
toolType = 1;
@@ -84,7 +97,7 @@ public class SurveyTool extends TangibleObject{
surveyEffectString = "clienteffect/survey_tool_lumber.cef";
sampleEffectString = "clienteffect/survey_sample_lumber.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_lumber.iff" :
case "object/tangible/survey_tool/shared_survey_tool_lumber.iff" :
toolType = 3;
surveyEffectString = "clienteffect/survey_tool_lumber.cef";
sampleEffectString = "clienteffect/survey_sample_lumber.cef";
@@ -94,14 +107,26 @@ public class SurveyTool extends TangibleObject{
surveyEffectString = "clienteffect/survey_tool_gas.cef";
sampleEffectString = "clienteffect/survey_sample_gas.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_liquid.iff" :
case "object/tangible/survey_tool/shared_survey_tool_moisture.iff" :
toolType = 5;
surveyEffectString = "clienteffect/survey_tool_liquid.cef";
sampleEffectString = "clienteffect/survey_sample_liquid.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_wind.iff" : toolType = 6; break;
case "object/tangible/survey_tool/shared_survey_tool_solar.iff" : toolType = 7; break;
case "object/tangible/survey_tool/shared_survey_tool_all.iff" : toolType = 8; break;
case "object/tangible/survey_tool/shared_survey_tool_wind.iff" :
toolType = 6;
surveyEffectString = "clienteffect/survey_tool_gas.cef";
sampleEffectString = "clienteffect/survey_sample_gas.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_solar.iff" :
toolType = 7;
surveyEffectString = "clienteffect/survey_tool_moisture.cef";
sampleEffectString = "clienteffect/survey_sample_moisture.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_all.iff" :
toolType = 8;
surveyEffectString = "clienteffect/survey_tool_liquid.cef";
sampleEffectString = "clienteffect/survey_sample_liquid.cef";
break;
default: toolType = -1;
}
System.out.println("TOOLTYPE " + toolType);
@@ -124,7 +149,7 @@ public class SurveyTool extends TangibleObject{
surveyEffectString = "clienteffect/survey_tool_lumber.cef";
sampleEffectString = "clienteffect/survey_sample_lumber.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_lumber.iff" :
case "object/tangible/survey_tool/shared_survey_tool_lumber.iff" :
toolType = 3;
surveyEffectString = "clienteffect/survey_tool_lumber.cef";
sampleEffectString = "clienteffect/survey_sample_lumber.cef";
@@ -134,14 +159,26 @@ public class SurveyTool extends TangibleObject{
surveyEffectString = "clienteffect/survey_tool_gas.cef";
sampleEffectString = "clienteffect/survey_sample_gas.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_liquid.iff" :
case "object/tangible/survey_tool/shared_survey_tool_moisture.iff" :
toolType = 5;
surveyEffectString = "clienteffect/survey_tool_liquid.cef";
sampleEffectString = "clienteffect/survey_sample_liquid.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_wind.iff" : toolType = 6; break;
case "object/tangible/survey_tool/shared_survey_tool_solar.iff" : toolType = 7; break;
case "object/tangible/survey_tool/shared_survey_tool_all.iff" : toolType = 8; break;
case "object/tangible/survey_tool/shared_survey_tool_wind.iff" :
toolType = 6;
surveyEffectString = "clienteffect/survey_tool_gas.cef";
sampleEffectString = "clienteffect/survey_sample_gas.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_solar.iff" :
toolType = 7;
surveyEffectString = "clienteffect/survey_tool_moisture.cef";
sampleEffectString = "clienteffect/survey_sample_moisture.cef";
break;
case "object/tangible/survey_tool/shared_survey_tool_all.iff" :
toolType = 8;
surveyEffectString = "clienteffect/survey_tool_liquid.cef";
sampleEffectString = "clienteffect/survey_sample_liquid.cef";
break;
default: toolType = -1;
}
System.out.println("TOOLTYPE " + toolType);
@@ -244,11 +281,11 @@ public class SurveyTool extends TangibleObject{
}
public boolean isRecoveryMode() {
return RecoveryMode;
return this.recoveryMode;
}
public void setRecoveryMode(boolean recoveryMode) {
RecoveryMode = recoveryMode;
recoveryMode = recoveryMode;
}
public byte getSurveyRangeSetting() {
@@ -258,17 +295,4 @@ public class SurveyTool extends TangibleObject{
public void setSurveyRangeSetting(byte surveyRangeSetting) {
SurveyRangeSetting = surveyRangeSetting;
}
}
//"clienteffect/survey_tool_mineral.cef",
//"clienteffect/survey_tool_lumber.cef",
//"clienteffect/survey_tool_moisture.cef",
//"clienteffect/survey_tool_liquid.cef",
//"clienteffect/survey_tool_gas.cef",
//"clienteffect/survey_sample_mineral.cef",
//"clienteffect/survey_sample_lumber.cef",
//"clienteffect/survey_sample_moisture.cef",
//"clienteffect/survey_sample_liquid.cef",
//"clienteffect/survey_sample_gas.cef",
}