diff --git a/sku.0/sys.server/compiled/game/script/library/groundquests.java b/sku.0/sys.server/compiled/game/script/library/groundquests.java index 6c79aebc2..9934e83f5 100755 --- a/sku.0/sys.server/compiled/game/script/library/groundquests.java +++ b/sku.0/sys.server/compiled/game/script/library/groundquests.java @@ -2,6 +2,8 @@ package script.library; import script.*; +import java.util.Arrays; +import java.util.Collections; import java.util.Vector; public class groundquests extends script.base_script @@ -450,18 +452,11 @@ public class groundquests extends script.base_script { return true; } - location here = getLocation(player); - region[] regions = getRegionsAtPoint(here); - if (regions != null) - { - for (region region : regions) { - String regionWeAreIn = region.getName(); - if (regionWeAreIn.equals(requiredRegion)) { - return true; - } - } - } - return false; + final String[] regions = Arrays.stream(getRegionsAtPoint(getLocation(player))) + .map(region::getName) + .toArray(String[]::new); + final String[] options = requiredRegion.split(","); + return !Collections.disjoint(Arrays.asList(regions), Arrays.asList(options)); } public static void sendSignal(obj_id player, String signalName) throws InterruptedException { diff --git a/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_imperials.tab b/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_imperials.tab index abde81d3d..f70ab1a28 100755 --- a/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_imperials.tab +++ b/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_imperials.tab @@ -1,5 +1,5 @@ ATTACH_SCRIPT JOURNAL_ENTRY_TITLE JOURNAL_ENTRY_DESCRIPTION IS_VISIBLE PREREQUISITE_TASKS EXCLUSION_TASKS ALLOW_REPEATS TASKS_ON_COMPLETE TASKS_ON_FAIL TASK_NAME SHOW_SYSTEM_MESSAGES MUSIC_ON_ACTIVATE MUSIC_ON_COMPLETE MUSIC_ON_FAILURE CHANCE_TO_ACTIVATE QUEST_CONTROL_ON_TASK_COMPLETION QUEST_CONTROL_ON_TASK_FAILURE TARGET PARAMETER GRANT_QUEST_ON_COMPLETE GRANT_QUEST_ON_COMPLETE_SHOW_SYSTEM_MESSAGE GRANT_QUEST_ON_FAIL GRANT_QUEST_ON_FAIL_SHOW_SYSTEM_MESSAGE SIGNALS_ON_COMPLETE SIGNALS_ON_FAIL CREATE_WAYPOINT PLANET_NAME LOCATION_X LOCATION_Y LOCATION_Z INTERIOR_WAYPOINT_APPEARANCE WAYPOINT_BUILDING_CELL_NAME WAYPOINT_NAME CREATE_ENTRANCE_WAYPOINT ENTRANCE_LOCATION_X ENTRANCE_LOCATION_Y ENTRANCE_LOCATION_Z ENTRANCE_WAYPOINT_NAME TARGET_SERVER_TEMPLATE SOCIAL_GROUP REQUIRED_REGION COUNT REWARD_CREDITS TIMER_AMOUNT s s s b s s b s s s b s s s i e(none=0,complete=1,clear=2)[none] e(none=0,complete=1,clear=2)[none] s s s b s b s s b s s s s s s s b s s s s s s s i i i quest.task.ground.nothing 0 0 1 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 -quest.task.ground.destroy_multi @quest/ground/gcw_eliminate_imperials:task01_journal_entry_title @quest/ground/gcw_eliminate_imperials:task01_journal_entry_description 1 0 2 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 imperial 10 0 0 +quest.task.ground.destroy_multi @quest/ground/gcw_eliminate_imperials:task01_journal_entry_title @quest/ground/gcw_eliminate_imperials:task01_journal_entry_description 1 0 2 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 imperial @tatooine_region_names:bestine,@naboo_region_names:keren,@talus_region_names:dearic 10 0 0 quest.task.ground.complete_quest @quest/ground/gcw_eliminate_imperials:task02_journal_entry_title @quest/ground/gcw_eliminate_imperials:task02_journal_entry_description 1 0 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 diff --git a/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_rebels.tab b/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_rebels.tab index d5c723f77..fe07d880f 100755 --- a/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_rebels.tab +++ b/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_eliminate_rebels.tab @@ -1,5 +1,5 @@ ATTACH_SCRIPT JOURNAL_ENTRY_TITLE JOURNAL_ENTRY_DESCRIPTION IS_VISIBLE PREREQUISITE_TASKS EXCLUSION_TASKS ALLOW_REPEATS TASKS_ON_COMPLETE TASKS_ON_FAIL TASK_NAME SHOW_SYSTEM_MESSAGES MUSIC_ON_ACTIVATE MUSIC_ON_COMPLETE MUSIC_ON_FAILURE CHANCE_TO_ACTIVATE QUEST_CONTROL_ON_TASK_COMPLETION QUEST_CONTROL_ON_TASK_FAILURE TARGET PARAMETER GRANT_QUEST_ON_COMPLETE GRANT_QUEST_ON_COMPLETE_SHOW_SYSTEM_MESSAGE GRANT_QUEST_ON_FAIL GRANT_QUEST_ON_FAIL_SHOW_SYSTEM_MESSAGE SIGNALS_ON_COMPLETE SIGNALS_ON_FAIL CREATE_WAYPOINT PLANET_NAME LOCATION_X LOCATION_Y LOCATION_Z INTERIOR_WAYPOINT_APPEARANCE WAYPOINT_BUILDING_CELL_NAME WAYPOINT_NAME CREATE_ENTRANCE_WAYPOINT ENTRANCE_LOCATION_X ENTRANCE_LOCATION_Y ENTRANCE_LOCATION_Z ENTRANCE_WAYPOINT_NAME TARGET_SERVER_TEMPLATE SOCIAL_GROUP REQUIRED_REGION COUNT REWARD_CREDITS TIMER_AMOUNT s s s b s s b s s s b s s s i e(none=0,complete=1,clear=2)[none] e(none=0,complete=1,clear=2)[none] s s s b s b s s b s s s s s s s b s s s s s s s i i i quest.task.ground.nothing 0 0 1 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 -quest.task.ground.destroy_multi @quest/ground/gcw_eliminate_rebels:task01_journal_entry_title @quest/ground/gcw_eliminate_rebels:task01_journal_entry_description 1 0 2 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 rebel 10 0 0 +quest.task.ground.destroy_multi @quest/ground/gcw_eliminate_rebels:task01_journal_entry_title @quest/ground/gcw_eliminate_rebels:task01_journal_entry_description 1 0 2 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 rebel @tatooine_region_names:bestine,@naboo_region_names:keren,@talus_region_names:dearic 10 0 0 quest.task.ground.complete_quest @quest/ground/gcw_eliminate_rebels:task02_journal_entry_title @quest/ground/gcw_eliminate_rebels:task02_journal_entry_description 1 0 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0