swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-27 16:56:48 -04:00
Code Issues Projects Releases Wiki Activity

Adjusted some issues for Golden Ticket.

Browse Source
This commit is contained in:
Cekis
2018-03-23 15:57:25 -07:00
committed by CekisSWG
parent fab72dd173
commit 9521b2dab6
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/loot.java
+1 -4
View File
@@ -175,10 +175,7 @@ public class loot extends script.base_script
return hasLoot;
}
public static boolean addGoldenTicket(obj_id player, obj_id corpse) throws InterruptedException{
String goldenTicketActive = getConfigSetting("EventTeam", "goldenTicket");
if(goldenTicketActive != null && goldenTicketActive.equals("true")
&& !hasObjVar(player, "lottery.looted")
&& getIntObjVar(player, "lottery.availableTickets") > 0) {
if(!hasObjVar(player, "lottery.looted") && getIntObjVar(player, "lottery.availableTickets") > 0) {
obj_id broker = getObjIdObjVar(player, "lottery.broker");
if(!isValidId(broker)) return false;
Vector qualifiers = getResizeableObjIdArrayObjVar(broker, "lottery.qualifiers");
sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java
+15 -11
View File
@@ -1504,17 +1504,6 @@ public class terminal_character_builder extends script.base_script
1,
2
};
public int OnAttach(obj_id self) throws InterruptedException{
String goldenTicketActive = getConfigSetting("EventTeam", "goldenTicket");
Vector<String> opts = new Vector<String>(Arrays.asList(stella_options));
if(goldenTicketActive != null && goldenTicketActive.equals("true")){
Vector qualifiers = new Vector();
opts.add(0,"Lottery Status");
setObjVar(self, "lottery.qualifiers", qualifiers);
}
stella_options = opts.toArray(new String[opts.size()]);
return SCRIPT_CONTINUE;
}
public boolean checkConfigSetting(String configString) throws InterruptedException
{
String enabled = toLower(getConfigSetting("CharacterBuilder", configString));
@@ -6378,6 +6367,13 @@ public class terminal_character_builder extends script.base_script
String goldenTicketActive = getConfigSetting("EventTeam", "goldenTicket");
if(goldenTicketActive != null && goldenTicketActive.equals("true")) {
stella_options = new String[] {
"Start Lottery",
"Spec-Ops Pack",
"Buff me",
"Healing Stims",
"Toggle Chronicles Loot"
};
Vector qualifiers = getResizeableObjIdArrayObjVar(self, "lottery.qualifiers");
obj_id playerStationId = utils.stringToObjId("" + getPlayerStationId(player));
boolean playerQualified = (utils.getElementPositionInArray(qualifiers, playerStationId) > -1);
@@ -6389,6 +6385,14 @@ public class terminal_character_builder extends script.base_script
stella_options[0] = "Lottery Status";
}
}
else{
stella_options = new String[] {
"Spec-Ops Pack",
"Buff me",
"Healing Stims",
"Toggle Chronicles Loot"
};
}
}
public void handleStellaOption(obj_id player) throws InterruptedException
{