From 9521b2dab652c468907d8a4d123d12d97d09f3db Mon Sep 17 00:00:00 2001
From: Cekis <cekisswg@gmail.com>
Date: Mon, 16 Jan 2017 04:07:49 +0000
Subject: [PATCH] Adjusted some issues for Golden Ticket.

---
 .../compiled/game/script/library/loot.java    |  5 +---
 .../terminal/terminal_character_builder.java  | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/sku.0/sys.server/compiled/game/script/library/loot.java b/sku.0/sys.server/compiled/game/script/library/loot.java
index 303e53b73..50bf26e53 100755
--- a/sku.0/sys.server/compiled/game/script/library/loot.java
+++ b/sku.0/sys.server/compiled/game/script/library/loot.java
@@ -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");
diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java
index c4e3b3394..727a60cc2 100755
--- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java
+++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java
@@ -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
     {