From 64084db19ff9f6760d33db6044bd47ba960b2013 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sun, 15 Jan 2017 18:01:47 +0000 Subject: [PATCH] Added extra logging and removed old logging. --- .../compiled/game/script/library/loot.java | 1 - .../script/terminal/terminal_character_builder.java | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 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 9ace17c3d..a49f02652 100755 --- a/sku.0/sys.server/compiled/game/script/library/loot.java +++ b/sku.0/sys.server/compiled/game/script/library/loot.java @@ -185,7 +185,6 @@ public class loot extends script.base_script obj_id playerStationId = utils.stringToObjId(new String("" + getPlayerStationId(player))); if(qualifiers != null && utils.getElementPositionInArray(qualifiers, playerStationId) > -1) return false; int rng = rand(1,100); - sendSystemMessage(player, "Rolled a " + rng, null); int dropChance = 2; try { dropChance = Integer.parseInt(getConfigSetting("EventTeam", "goldenTicketDropChance")); 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 722806011..31d1e7f05 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 @@ -6378,9 +6378,12 @@ public class terminal_character_builder extends script.base_script String goldenTicketActive = getConfigSetting("EventTeam", "goldenTicket"); if(goldenTicketActive != null && goldenTicketActive.equals("true")) { - if (!hasObjVar(player, "lottery.broker") && !hasObjVar(self, "lottery.over")) { + Vector qualifiers = getResizeableObjIdArrayObjVar(self, "lottery.qualifiers"); + obj_id playerStationId = utils.stringToObjId("" + getPlayerStationId(player)); + boolean playerQualified = (utils.getElementPositionInArray(qualifiers, playerStationId) > -1); + if (!hasObjVar(player, "lottery.broker") && !hasObjVar(self, "lottery.over") && !playerQualified) { stella_options[0] = "Start Lottery"; - } else if (hasObjVar(player, "lottery.looted") && !hasObjVar(player, "lottery.position") && !hasObjVar(self, "lottery.over")) { + } else if (hasObjVar(player, "lottery.looted") && !hasObjVar(player, "lottery.position") && !hasObjVar(self, "lottery.over") && !playerQualified) { stella_options[0] = "Turn In Ticket"; } else { stella_options[0] = "Lottery Status"; @@ -6444,6 +6447,7 @@ public class terminal_character_builder extends script.base_script case 0: Vector qualifiers = getResizeableObjIdArrayObjVar(self, "lottery.qualifiers"); obj_id playerStationId = utils.stringToObjId("" + getPlayerStationId(player)); + boolean playerQualified = (utils.getElementPositionInArray(qualifiers, playerStationId) > -1); int maxTickets = 1000; try { @@ -6460,7 +6464,7 @@ public class terminal_character_builder extends script.base_script } dictionary tickets = new dictionary(); if(!hasObjVar(player, "lottery.broker")){ - if(qualifiers != null && utils.getElementPositionInArray(qualifiers, playerStationId) > -1){ + if(playerQualified){ sendSystemMessage(player, "You've already qualified. Only one entry per account is allowed.", null); break; } @@ -6469,9 +6473,10 @@ public class terminal_character_builder extends script.base_script setObjVar(player, "lottery.availableTickets", availableTickets); messageTo(player, "setupLotteryListener", params, 1.0f, true); tickets.put("availableTickets", availableTickets); + sendSystemMessage(player, "You have successfully submitted your entry to the hunt for the Golden Ticket... Happy Hunting!", null); } else if(hasObjVar(player, "lottery.looted") && !hasObjVar(player, "lottery.position")) { - if(qualifiers != null && utils.getElementPositionInArray(qualifiers, playerStationId) > -1){ + if(playerQualified){ sendSystemMessage(player, "You've already qualified. Only one entry per account is allowed.", null); break; }