swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-06 22:12:58 -04:00
Code Issues Projects Releases Wiki Activity

3.1 Config Refactor

Browse Source
This commit is contained in:
AconiteGodOfSWG
2021-03-28 16:44:33 -04:00
parent 694a499356
commit 355796dd48
148 changed files with 900 additions and 6277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/gcw.java
+22 -34
View File
@@ -254,6 +254,11 @@ public class gcw extends script.base_script
public static final String GCW_TUTORIAL_FLAG = "gcw_tutorial_flag.has_received_tutorial";
public static final String COLOR_REBELS = "\\" + colors_hex.COLOR_REBELS;
public static final String COLOR_IMPERIALS = "\\" + colors_hex.COLOR_IMPERIALS;
public static final float GCW_POINT_BONUS = utils.getFloatConfigSetting("GameServer", "gcwPointBonus", 1.0f);
public static final float GCW_TOKEN_BONUS = utils.getFloatConfigSetting("GameServer", "gcwTokenBonus", 1.0f);
public static final int GCW_CYCLE_INVASION_TIME = utils.getIntConfigSetting("GameServer", "gcwInvasionCycleTime", 3);
public static final int GCW_MAX_INVASION_CITY_RUNNING = utils.getIntConfigSetting("GameServer", "gcwInvasionCityMaximumRunning", 3);
public static void assignScanInterests(obj_id npc) throws InterruptedException
{
if (!isIdValid(npc) || isPlayer(npc) || pet_lib.isPet(npc))
@@ -1275,11 +1280,7 @@ public class gcw extends script.base_script
{
return;
}
float multiplier = utils.stringToFloat(getConfigSetting("GameServer", "gcwPointBonus"));
if (multiplier > 1)
{
pointValue *= multiplier;
}
pointValue *= GCW_POINT_BONUS;
pvpModifyCurrentGcwPoints(attacker, pointValue);
prose_package pp = new prose_package();
pp.target.set(getName(victim));
@@ -2455,11 +2456,7 @@ public class gcw extends script.base_script
else {
tokenStaticName = GCW_REBEL_TOKEN;
}
float multiplier = utils.stringToFloat(getConfigSetting("GameServer", "gcwTokenBonus"));
if (multiplier > 1)
{
gcwTokenAmt *= multiplier;
}
gcwTokenAmt *= GCW_TOKEN_BONUS;
for (Object o : participantList) {
if (!isValidId(((obj_id) o)) || !exists(((obj_id) o))) {
CustomerServiceLog("gcw_city_invasion", "gcw.awardGcwInvasionParticipants: Player: " + ((obj_id) o) + " is NOT receiving " + gcwTokenAmt + " " + tokenStaticName + " tokens or " + gcwPointAmt + " " + factionFlag + " GCW points (GCW points only awarded to pure faction players, not factionalHelpers) because this player OID is invalid or doesn't exist. Probably due to the player exiting the battle field, traveling or moving to another server process (crossing server boundary).");
@@ -2637,12 +2634,7 @@ public class gcw extends script.base_script
}
public static int gcwGetTimeToInvasion() throws InterruptedException
{
String timeConfig = getConfigSetting("GameServer", "gcwInvasionCycleTime");
if (timeConfig == null || timeConfig.length() <= 0)
{
return 3;
}
int time = utils.stringToInt(timeConfig);
int time = GCW_CYCLE_INVASION_TIME;
if (time > 6)
{
time = 6;
@@ -2655,13 +2647,7 @@ public class gcw extends script.base_script
}
public static int gcwGetInvasionMaximumRunning() throws InterruptedException
{
String maxConfig = getConfigSetting("GameServer", "gcwInvasionCityMaximumRunning");
int max = 3;
if (maxConfig == null || maxConfig.length() <= 0)
{
return max;
}
return utils.stringToInt(maxConfig);
return GCW_MAX_INVASION_CITY_RUNNING;
}
public static boolean gcwIsInvasionCityOn(String city) throws InterruptedException
{
@@ -2669,17 +2655,20 @@ public class gcw extends script.base_script
{
return false;
}
String cityConfig = getConfigSetting("GameServer", "gcwcity" + city);
if (cityConfig == null || (!cityConfig.equals("1") && !cityConfig.toLowerCase().equals("true")))
{
CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not configured to run a city invasion. Function returning False.");
if (city.equalsIgnoreCase("keren") || city.equalsIgnoreCase("bestine")) {
return utils.checkConfigFlag("GameServer", "gcwcity"+city);
}
else if (city.equalsIgnoreCase("dearic")) {
if(events.isEventActive(events.LIFEDAY)) {
return false;
} else {
return utils.checkConfigFlag("GameServer", "gcwcity"+city);
}
}
else {
WARNING("gcwIsInvasionCityOn() Got call to check invasion for city "+city+" but there is no logic accounting for it here.");
return false;
}
if (city.equalsIgnoreCase("dearic") && utils.checkConfigFlag("GameServer", "lifeday")) {
CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not running because life day is turned on.");
return false;
}
return true;
}
public static int gcwGetNextInvasionHour(String cityName) throws InterruptedException
{
@@ -2849,8 +2838,7 @@ public class gcw extends script.base_script
{
Vector<String> activeCities = new Vector<>();
for (String cityName : INVASION_CITIES){
String value = getConfigSetting("GameServer", "gcwcity" + cityName);
if (value != null && (value.equals("1") || value.toLowerCase().equals("true"))) {
if (utils.checkConfigFlag("GameServer", "gcwcity" + cityName)) {
activeCities.add(cityName);
}
}