swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

Fixed some issues with the Restuss Event

Browse Source
This commit is contained in:
Cekis
2019-04-18 06:47:12 +01:00
parent 6ea82db9c3
commit 956eaed2f9
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sku.0/sys.server/compiled/game/script/library/restuss_event.java
View File

@@ -73,7 +73,7 @@ public class restuss_event extends script.base_script
return getIntObjVar(object, "base_builder.current_phase");
}
obj_id parent = trial.getParent(object);
if (!isIdValid(parent))
if (!isIdValid(parent) || parent == object)
{
return -1;
}

1
sku.0/sys.server/compiled/game/script/theme_park/restuss_event/pvp_region.java
View File

@@ -29,7 +29,6 @@ public class pvp_region extends script.base_script
removeObjVar(self, trial.PARENT);
}
if(getRegion("rori", restuss_event.PVP_REGION_NAME) == null) {
persistObject(self);
createCircleRegion(
getLocation(self),
400,

26
sku.0/sys.server/compiled/game/script/theme_park/restuss_event/restuss_event_manager.java
View File

@@ -51,43 +51,43 @@ public class restuss_event_manager extends script.base_script
if (name.contains(elementName[IMP_BAR])) {
elementList[IMP_BAR] = dungeon_datum;
}
if (name.contains(elementName[IMP_HQ])) {
else if (name.contains(elementName[IMP_HQ])) {
elementList[IMP_HQ] = dungeon_datum;
}
if (name.contains(elementName[IMP_COMM])) {
else if (name.contains(elementName[IMP_COMM])) {
elementList[IMP_COMM] = dungeon_datum;
}
if (name.contains(elementName[IMP_LOG])) {
else if (name.contains(elementName[IMP_LOG])) {
elementList[IMP_LOG] = dungeon_datum;
}
if (name.contains(elementName[IMP_MED])) {
else if (name.contains(elementName[IMP_MED])) {
elementList[IMP_MED] = dungeon_datum;
}
if (name.contains(elementName[IMP_WALL])) {
else if (name.contains(elementName[IMP_WALL])) {
elementList[IMP_WALL] = dungeon_datum;
}
if (name.contains(elementName[REB_BAR])) {
else if (name.contains(elementName[REB_BAR])) {
elementList[REB_BAR] = dungeon_datum;
}
if (name.contains(elementName[REB_HQ])) {
else if (name.contains(elementName[REB_HQ])) {
elementList[REB_HQ] = dungeon_datum;
}
if (name.contains(elementName[REB_COMM])) {
else if (name.contains(elementName[REB_COMM])) {
elementList[REB_COMM] = dungeon_datum;
}
if (name.contains(elementName[REB_LOG])) {
else if (name.contains(elementName[REB_LOG])) {
elementList[REB_LOG] = dungeon_datum;
}
if (name.contains(elementName[REB_MED])) {
else if (name.contains(elementName[REB_MED])) {
elementList[REB_MED] = dungeon_datum;
}
if (name.contains(elementName[REB_WALL])) {
else if (name.contains(elementName[REB_WALL])) {
elementList[REB_WALL] = dungeon_datum;
}
}
int sum_imp_phase = 0;
int sum_reb_phase = 0;
if ((getStringObjVar(self, "element")).contains("imp"))
if ((getStringObjVar(self, "element")).contains("_imp_"))
{
int imp_bar_phase = restuss_event.getPhase(elementList[IMP_BAR]);
int imp_hq_phase = restuss_event.getPhase(elementList[IMP_HQ]);
@@ -137,7 +137,7 @@ public class restuss_event_manager extends script.base_script
break;
}
}
else
else if ((getStringObjVar(self, "element")).contains("_reb_"))
{
int reb_bar_phase = restuss_event.getPhase(elementList[REB_BAR]);
int reb_hq_phase = restuss_event.getPhase(elementList[REB_HQ]);

2
sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java
View File

@@ -43,7 +43,7 @@ public class stage_two_controller extends script.base_script
LOG("events", "Restuss Event - Config set to put Restuss into phase " + phaseVal);
String progressionOn = getConfigSetting("EventTeam", "restussProgressionOn");
// Check if the user wants to progress through stage one or not. If so, start the cycle.
if(progressionOn != null && !progressionOn.equals("false") || !progressionOn.equals("0")) {
if(progressionOn != null && (!progressionOn.equals("false") || !progressionOn.equals("0"))) {
dictionary dict = trial.getSessionDict(self);
switch(phase){
case 0: