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

Revert "Changed Race request to enum"

Browse Source 
This reverts commit 71fbdf39ab.
This commit is contained in:
dennise1975
2017-07-16 21:51:24 -05:00
parent 71fbdf39ab
commit d2135a22b4
1 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/galaxy/SkillModService.java
+29 -36
View File
@@ -117,23 +117,23 @@ public class SkillModService extends Service {
PlayerObject playerObject = creature.getPlayerObject();
String profession = playerObject.getProfession();
profession = profession.substring(0,profession.length()-3);
RaceAbbr race = RaceAbbr.valueOf(creature.getRace().toString());
String race = getRaceColumnAbbr(creature.getRace().toString());
int newLevel = creature.getLevel();
updateLevelHAMValues(creature, newLevel, profession);
updateLevelSkillModValues(creature, newLevel, profession, race.getRaceAbbr());
updateLevelSkillModValues(creature, newLevel, profession, race);
}
private void handleLevelChangedIntent(LevelChangedIntent lci){
CreatureObject creature = lci.getCreatureObject();
PlayerObject playerObject = creature.getPlayerObject();
String profession = playerObject.getProfession();
profession = profession.substring(0,profession.length()-3);
RaceAbbr race = RaceAbbr.valueOf(creature.getRace().toString());
profession = profession.substring(0,profession.length()-3);
String race = getRaceColumnAbbr(creature.getRace().toString());
int newLevel = lci.getNewLevel();
updateLevelHAMValues(creature, newLevel, profession);
updateLevelSkillModValues(creature, newLevel, profession, race.getRaceAbbr());
updateLevelSkillModValues(creature, newLevel, profession, race);
}
private void handleSkillModIntent(SkillModIntent smi) {
@@ -261,38 +261,31 @@ public class SkillModService extends Service {
}
}
public enum RaceAbbr {
HUMAN_MALE ("hum"),
HUMAN_FEMALE ("hum"),
TRANDOSHAN_MALE ("tran"),
TRANDOSHAN_FEMALE ("tran"),
TWILEK_MALE ("twi"),
TWILEK_FEMALE ("twi"),
BOTHAN_MALE ("both"),
BOTHAN_FEMALE ("both"),
ZABRAK_MALE ("zab"),
ZABRAK_FEMALE ("zab"),
RODIAN_MALE ("rod"),
RODIAN_FEMALE ("rod"),
MONCAL_MALE ("mon"),
MONCAL_FEMALE ("mon"),
WOOKIEE_MALE ("wok"),
WOOKIEE_FEMALE ("wok"),
SULLUSTAN_MALE ("sul"),
SULLUSTAN_FEMALE ("sul"),
ITHORIAN_MALE ("ith"),
ITHORIAN_FEMALE ("ith");
private String getRaceColumnAbbr(String race){
private final String raceAbbr;
RaceAbbr(String race){
this.raceAbbr = race;
if (race.contains("HUMAN")){
return "hum";
}else if (race.contains("RODIAN")){
return "rod";
}else if (race.contains("TRANDOSHAN")){
return "tran";
}else if (race.contains("MONCAL")){
return "mon";
}else if (race.contains("WOOKIE")){
return "wok";
}else if (race.contains("BOTHAN")){
return "both";
}else if (race.contains("TWILEK")){
return "twi";
}else if (race.contains("ZABRAK")){
return "zab";
}else if (race.contains("ITHORIAN")){
return "ith";
}else if (race.contains("SULLUSTAN")){
return "sul";
}
public String getRaceAbbr(){
return this.raceAbbr;
}
return "";
}
public enum SkillModTypes{