Voomra/trader
Archived
0
Fork 0
Code Activity

Add missing power states

Browse Source
This commit is contained in:
Mo
2016-04-03 13:35:10 +03:00
parent 156171b679
commit b13a14842e
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/resources/lang/locale.properties
View File

@@ -68,9 +68,11 @@ power.HUDSON=Zachary Hudson
power.TORVAL=Zemina Torval power.TORVAL=Zemina Torval
power.NONE=None power.NONE=None
power.states.CONTROL=Controlling power.states.HEADQUARTERS=Headquarters
power.states.CONTROL=Controlled
power.states.EXPLOITED=Exploited power.states.EXPLOITED=Exploited
power.states.EXPANSION=Expansion power.states.EXPANSION=Expansion
power.states.CONTESTED=Contested
power.states.NONE=None power.states.NONE=None
item.group.chemicals=Chemicals item.group.chemicals=Chemicals

2
client/src/main/resources/lang/locale_ru_RU_FULL.properties
View File

@@ -70,9 +70,11 @@ power.HUDSON=Zachary Hudson
power.TORVAL=Zemina Torval power.TORVAL=Zemina Torval
power.NONE=\u041D\u0435\u0442 power.NONE=\u041D\u0435\u0442
power.states.HEADQUARTERS=\u0428\u0442\u0430\u0431-\u043A\u0432\u0430\u0440\u0442\u0438\u0440\u0430
power.states.CONTROL=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u0438\u0440\u0443\u0435\u0442\u0441\u044F power.states.CONTROL=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u0438\u0440\u0443\u0435\u0442\u0441\u044F
power.states.EXPLOITED=\u042D\u043A\u0441\u043F\u043B\u0443\u0430\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F power.states.EXPLOITED=\u042D\u043A\u0441\u043F\u043B\u0443\u0430\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F
power.states.EXPANSION=\u042D\u043A\u0441\u043F\u0430\u043D\u0441\u0438\u044F power.states.EXPANSION=\u042D\u043A\u0441\u043F\u0430\u043D\u0441\u0438\u044F
power.states.CONTESTED=\u041E\u0441\u043F\u0430\u0440\u0438\u0432\u0430\u0435\u0442\u0441\u044F
power.states.NONE=\u041D\u0435\u0442 power.states.NONE=\u041D\u0435\u0442
item.group.chemicals=\u0425\u0438\u043C\u0438\u043A\u0430\u0442\u044B item.group.chemicals=\u0425\u0438\u043C\u0438\u043A\u0430\u0442\u044B

16
core/src/main/java/ru/trader/core/POWER.java
View File

@@ -6,7 +6,7 @@ public enum POWER {
// Control Systems: Imperial Slaves banned // Control Systems: Imperial Slaves banned
@Override @Override
public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) { public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL || state == POWER_STATE.EXPLOITED){ if (state != null && (state.isControl() || state.isExploited())){
String itemId = item.getName(); String itemId = item.getName();
return itemId != null && IMPERIAL_SLAVES.equals(itemId); return itemId != null && IMPERIAL_SLAVES.equals(itemId);
} }
@@ -17,7 +17,7 @@ public enum POWER {
// Control Systems: All weapons/slaves/narcotics/medicals legalised // Control Systems: All weapons/slaves/narcotics/medicals legalised
@Override @Override
public boolean isLegal(FACTION faction, Item item, POWER_STATE state) { public boolean isLegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL){ if (state != null && state.isControl()){
String groupId = item.getGroup() != null ? item.getGroup().getName() : null; String groupId = item.getGroup() != null ? item.getGroup().getName() : null;
return groupId != null && (WEAPONS_GRP.equals(groupId) || SLAVES_GRP.equals(groupId) || NARCOTICS_GRP.equals(groupId) || MEDICINE_GRP.equals(groupId)); return groupId != null && (WEAPONS_GRP.equals(groupId) || SLAVES_GRP.equals(groupId) || NARCOTICS_GRP.equals(groupId) || MEDICINE_GRP.equals(groupId));
} }
@@ -29,7 +29,7 @@ public enum POWER {
// Control Systems: Imperial Slaves legalised // Control Systems: Imperial Slaves legalised
@Override @Override
public boolean isLegal(FACTION faction, Item item, POWER_STATE state) { public boolean isLegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL){ if (state != null && state.isControl()){
String itemId = item.getName(); String itemId = item.getName();
return itemId != null && IMPERIAL_SLAVES.equals(itemId); return itemId != null && IMPERIAL_SLAVES.equals(itemId);
} }
@@ -43,11 +43,11 @@ public enum POWER {
// Control Systems: Imperial Slaves banned // Control Systems: Imperial Slaves banned
@Override @Override
public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) { public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL){ if (state != null && state.isControl()){
String itemId = item.getName(); String itemId = item.getName();
return itemId != null && IMPERIAL_SLAVES.equals(itemId); return itemId != null && IMPERIAL_SLAVES.equals(itemId);
} else } else
if (state == POWER_STATE.EXPLOITED){ if (state != null && state.isExploited()){
String itemId = item.getName(); String itemId = item.getName();
return itemId != null && IMPERIAL_SLAVES.equals(itemId) && (faction != null && faction != FACTION.EMPIRE); return itemId != null && IMPERIAL_SLAVES.equals(itemId) && (faction != null && faction != FACTION.EMPIRE);
} }
@@ -60,7 +60,7 @@ public enum POWER {
// Control Systems: All Slaves, Narcotics and non-basic/agri medicines banned // Control Systems: All Slaves, Narcotics and non-basic/agri medicines banned
@Override @Override
public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) { public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL || state == POWER_STATE.EXPLOITED){ if (state != null && (state.isControl() || state.isExploited())){
String groupId = item.getGroup() != null ? item.getGroup().getName() : null; String groupId = item.getGroup() != null ? item.getGroup().getName() : null;
String itemId = item.getName(); String itemId = item.getName();
return groupId != null && (SLAVES_GRP.equals(groupId) || NARCOTICS_GRP.equals(groupId) return groupId != null && (SLAVES_GRP.equals(groupId) || NARCOTICS_GRP.equals(groupId)
@@ -74,7 +74,7 @@ public enum POWER {
// Control Systems: Imperial Slaves banned // Control Systems: Imperial Slaves banned
@Override @Override
public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) { public boolean isIllegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL){ if (state != null && state.isControl()){
String itemId = item.getName(); String itemId = item.getName();
return itemId != null && IMPERIAL_SLAVES.equals(itemId); return itemId != null && IMPERIAL_SLAVES.equals(itemId);
} }
@@ -85,7 +85,7 @@ public enum POWER {
// Control Systems: Imperial Slaves legalised // Control Systems: Imperial Slaves legalised
@Override @Override
public boolean isLegal(FACTION faction, Item item, POWER_STATE state) { public boolean isLegal(FACTION faction, Item item, POWER_STATE state) {
if (state == POWER_STATE.CONTROL){ if (state != null && state.isControl()){
String itemId = item.getName(); String itemId = item.getName();
return itemId != null && IMPERIAL_SLAVES.equals(itemId); return itemId != null && IMPERIAL_SLAVES.equals(itemId);
} }

10
core/src/main/java/ru/trader/core/POWER_STATE.java
View File

@@ -1,5 +1,13 @@
package ru.trader.core; package ru.trader.core;
public enum POWER_STATE { public enum POWER_STATE {
CONTROL, EXPLOITED, EXPANSION, NONE CONTROL, EXPLOITED, EXPANSION, NONE, CONTESTED, HEADQUARTERS;
boolean isControl(){
return this == CONTROL || this == HEADQUARTERS;
}
boolean isExploited(){
return this == EXPLOITED;
}
} }