diff --git a/sku.0/sys.server/compiled/game/script/conversation/imperial_general.java b/sku.0/sys.server/compiled/game/script/conversation/imperial_general.java index 44754b142..074fb018a 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/imperial_general.java +++ b/sku.0/sys.server/compiled/game/script/conversation/imperial_general.java @@ -1131,6 +1131,24 @@ public class imperial_general extends script.base_script { return SCRIPT_OVERRIDE; } + if(groundquests.isQuestActive(player, "gcw_eliminate_rebels")) + { + if(groundquests.isTaskActive(player, "gcw_eliminate_rebels", "returnToGeneral")) + { + chat.chat(npc, player, new string_id("conversation/imperial_general", "s_117")); + groundquests.completeQuest(player, "gcw_eliminate_rebels"); + return SCRIPT_CONTINUE; + } + } + if(groundquests.isQuestActive(player, "gcw_entertain_fatigue")) + { + if(groundquests.isTaskActive(player, "gcw_entertain_fatigue", "returnToGeneral")) + { + chat.chat(npc, player, new string_id("conversation/imperial_general", "s_137")); + groundquests.completeQuest(player, "gcw_entertain_fatigue"); + return SCRIPT_CONTINUE; + } + } if (imperial_general_condition_isPlayerNeutral(player, npc)) { string_id message = new string_id(c_stringFile, "s_25"); diff --git a/sku.0/sys.server/compiled/game/script/conversation/rebel_general.java b/sku.0/sys.server/compiled/game/script/conversation/rebel_general.java index 955c7d7ea..ee06a2e17 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/rebel_general.java +++ b/sku.0/sys.server/compiled/game/script/conversation/rebel_general.java @@ -1097,6 +1097,24 @@ public class rebel_general extends script.base_script { return SCRIPT_OVERRIDE; } + if(groundquests.isQuestActive(player, "gcw_eliminate_imperials")) + { + if(groundquests.isTaskActive(player, "gcw_eliminate_imperials", "returnToGeneral")) + { + chat.chat(npc, player, new string_id("conversation/rebel_general", "s_108")); + groundquests.completeQuest(player, "gcw_eliminate_imperials"); + return SCRIPT_CONTINUE; + } + } + if(groundquests.isQuestActive(player, "gcw_entertain_fatigue")) + { + if(groundquests.isTaskActive(player, "gcw_entertain_fatigue", "returnToGeneral")) + { + chat.chat(npc, player, new string_id("conversation/rebel_general", "s_128")); + groundquests.completeQuest(player, "gcw_entertain_fatigue"); + return SCRIPT_CONTINUE; + } + } if (rebel_general_condition_isPlayerNeutral(player, npc)) { string_id message = new string_id(c_stringFile, "s_44"); diff --git a/sku.0/sys.shared/compiled/game/datatables/questlist/quest/gcw_entertain_rallying.tab b/sku.0/sys.shared/compiled/game/datatables/questlist/quest/gcw_entertain_rallying.tab index 827c92989..9eac3cd55 100755 --- a/sku.0/sys.shared/compiled/game/datatables/questlist/quest/gcw_entertain_rallying.tab +++ b/sku.0/sys.shared/compiled/game/datatables/questlist/quest/gcw_entertain_rallying.tab @@ -1,3 +1,3 @@ LEVEL TIER TYPE JOURNAL_ENTRY_TITLE JOURNAL_ENTRY_DESCRIPTION CATEGORY VISIBLE JOURNAL_ENTRY_COMPLETION_SUMMARY PREREQUISITE_QUESTS EXCLUSION_QUESTS ALLOW_REPEATS QUEST_REWARD_EXPERIENCE_TYPE QUEST_REWARD_EXPERIENCE_AMOUNT QUEST_REWARD_FACTION_NAME QUEST_REWARD_FACTION_AMOUNT GRANT_GCW QUEST_GCW_REWARD_OVERWRITE_AMOUNT QUEST_GCW_REWARD_OVERWRITE_SF_MODIFIER QUEST_GCW_REBEL_REWARD_LOOT_NAME QUEST_REWARD_REBEL_LOOT_COUNT QUEST_GCW_IMPERIAL_REWARD_LOOT_NAME QUEST_REWARD_IMPERIAL_LOOT_COUNT QUEST_GCW_REWARD_COUNT_SF_MULTIPLIER QUEST_REWARD_BANK_CREDITS QUEST_REWARD_LOOT_NAME QUEST_REWARD_LOOT_COUNT QUEST_REWARD_LOOT_NAME_2 QUEST_REWARD_LOOT_COUNT_2 QUEST_REWARD_LOOT_NAME_3 QUEST_REWARD_LOOT_COUNT_3 QUEST_REWARD_EXCLUSIVE_LOOT_NAME QUEST_REWARD_EXCLUSIVE_LOOT_COUNT QUEST_REWARD_EXCLUSIVE_LOOT_NAME_2 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_2 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_3 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_3 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_4 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_4 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_5 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_5 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_6 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_6 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_7 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_7 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_8 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_8 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_9 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_9 QUEST_REWARD_EXCLUSIVE_LOOT_NAME_10 QUEST_REWARD_EXCLUSIVE_LOOT_COUNT_10 QUEST_REWARD_ITEM QUEST_REWARD_COUNT QUEST_REWARD_WEAPON QUEST_REWARD_COUNT_WEAPON QUEST_REWARD_SPEED QUEST_REWARD_DAMAGE QUEST_REWARD_EFFICIENCY QUEST_REWARD_ELEMENTAL_VALUE QUEST_REWARD_ARMOR QUEST_REWARD_COUNT_ARMOR QUEST_REWARD_QUALITY REWARD_BADGE QUEST_PENALTY_FACTION_NAME QUEST_PENALTY_FACTION_AMOUNT TARGET PARAMETER COMPLETE_WHEN_TASKS_COMPLETE CONDITIONAL_QUEST_GRANT_QUEST CONDITIONAL_QUEST_GRANT_QUEST_LIST_OF_COMPLETED_QUESTS i i s s s s b s s s b s i s i b i i s i s i i i s i s i s i s i s i s i s i s i s i s i s i s i s i s i s i S S S S s i i s s i s s b s s -60 -1 solo @quest/ground/gcw_entertain_rallying:journal_entry_title @quest/ground/gcw_entertain_rallying:journal_entry_description @quest/ground/gcw_entertain_rallying:category 1 @quest/ground/gcw_entertain_rallying:journal_entry_completion_summary 1 quest_social 500 Rebel 0 1 12 2 item_gcw_rebel_token 5 item_gcw_imperial_token 5 2 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0.1 0.1 0.1 0.1 1 1 Rebel 0 1 +60 -1 solo @quest/ground/gcw_entertain_rallying:journal_entry_title @quest/ground/gcw_entertain_rallying:journal_entry_description @quest/ground/gcw_entertain_rallying:category 1 @quest/ground/gcw_entertain_rallying:journal_entry_completion_summary 1 quest_social 500 Rebel 0 1 250 2 item_gcw_rebel_token 5 item_gcw_imperial_token 5 2 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0.1 0.1 0.1 0.1 1 1 Rebel 0 1 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 f70ab1a28..37bbff92d 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 @@ -2,4 +2,5 @@ ATTACH_SCRIPT JOURNAL_ENTRY_TITLE JOURNAL_ENTRY_DESCRIPTION IS_VISIBLE PREREQUIS 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 @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 +quest.task.ground.wait_for_signal @quest/ground/gcw_eliminate_imperials:task02_journal_entry_title @quest/ground/gcw_eliminate_imperials:task02_journal_entry_description 1 0 returnToGeneral 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 +quest.task.ground.complete_quest @quest/ground/gcw_eliminate_imperials:task02_journal_entry_title @quest/ground/gcw_eliminate_imperials:task03_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 fe07d880f..8770d2649 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 @@ -2,4 +2,5 @@ ATTACH_SCRIPT JOURNAL_ENTRY_TITLE JOURNAL_ENTRY_DESCRIPTION IS_VISIBLE PREREQUIS 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 @tatooine_region_names:bestine,@naboo_region_names:keren,@talus_region_names:dearic 10 0 0 +quest.task.ground.wait_for_signal @quest/ground/gcw_eliminate_rebels:task02_journal_entry_title @quest/ground/gcw_eliminate_rebels:task02_journal_entry_description 1 0 returnToGeneral 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 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 diff --git a/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_entertain_fatigue.tab b/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_entertain_fatigue.tab index c78976f2f..14febf8ae 100755 --- a/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_entertain_fatigue.tab +++ b/sku.0/sys.shared/compiled/game/datatables/questtask/quest/gcw_entertain_fatigue.tab @@ -1,4 +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 SIGNAL_NAME NUM_REQUIRED WAIT_MARKER_CREATE WAIT_MARKER_TEMPLATE WAIT_MARKER_PLANET_NAME WAIT_MARKER_BUILDING WAIT_MARKER_CELL_NAME WAIT_MARKER_X WAIT_MARKER_Y WAIT_MARKER_Z 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 i b s s s s f f f i -quest.task.ground.wait_for_signal @quest/ground/gcw_entertain_fatigue:task00_journal_entry_title @quest/ground/gcw_entertain_fatigue:task00_journal_entry_description 1 0 1 cureFatigue 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 cureFatigue 10 0 0 0 0 0 0 -quest.task.ground.complete_quest @quest/ground/gcw_entertain_fatigue:task01_journal_entry_title @quest/ground/gcw_entertain_fatigue:task01_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 +quest.task.ground.wait_for_signal @quest/ground/gcw_entertain_fatigue:task00_journal_entry_title @quest/ground/gcw_entertain_fatigue:task00_journal_entry_description 1 0 1 cureFatigue 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 cureFatigue 20 0 0 0 0 0 0 +quest.task.ground.wait_for_signal @quest/ground/gcw_entertain_fatigue:task01_journal_entry_title @quest/ground/gcw_entertain_fatigue:task01_journal_entry_description 1 0 returnToGeneral 0 0 none none 1 1 0 tatooine 0.0 0.0 0.0 0 0.0 0.0 0.0 0 0 0 0 +quest.task.ground.complete_quest @quest/ground/gcw_entertain_fatigue:task02_journal_entry_title @quest/ground/gcw_entertain_fatigue: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