From a294f90827d28c7ae3f4fadc9d3f4b12b23f2127 Mon Sep 17 00:00:00 2001 From: Redacted by Stellabellum INC Date: Thu, 1 Jan 2015 15:37:53 -0800 Subject: [PATCH] Added super function to call original parent function. This was not being called, and the result was many functions not happening in-game as they should(ie. no particle effects floating above pylons in GCW invasions). This now allows the child function to call its parent function's code along with its own. TODO: Add this function to the compiler. --- .../faction_perk/base/factional_deed.script | 2 +- .../script/faction_perk/hq/terminal.script | 18 +++++++++--------- .../faction_perk/hq/turret_control.script | 16 ++++++++-------- .../gambling/saarlac/saarlac_wheel.script | 2 +- .../game/script/gambling/slot/standard.script | 2 +- .../game/script/gambling/table/pazaak.script | 8 ++++---- .../game/script/gambling/wheel/roulette.script | 2 +- .../game/script/item/dice/chance_cube.script | 4 ++-- .../item/dice/configurable_group_dice.script | 4 ++-- .../dice/one_hundred_sided_dice_set.script | 4 ++-- .../script/item/dice/six_sided_dice_set.script | 4 ++-- .../script/item/dice/ten_sided_dice_set.script | 4 ++-- .../item/dice/twelve_sided_dice_set.script | 4 ++-- .../item/dice/twenty_sided_dice_set.script | 4 ++-- .../stage_controller.script | 4 ++-- .../script/item/trap/trap_drowsy_dart.script | 10 +++++----- .../script/item/trap/trap_enraging_spur.script | 10 +++++----- .../script/item/trap/trap_flash_bomb.script | 8 ++++---- .../script/item/trap/trap_melee_def_1.script | 10 +++++----- .../item/trap/trap_melee_ranged_def_1.script | 10 +++++----- .../script/item/trap/trap_noise_maker.script | 10 +++++----- .../script/item/trap/trap_ranged_def_1.script | 10 +++++----- .../script/item/trap/trap_sonic_pulse.script | 10 +++++----- .../script/item/trap/trap_state_def_1.script | 10 +++++----- .../script/item/trap/trap_tranq_dart.script | 12 ++++++------ .../game/script/item/trap/trap_webber.script | 8 ++++---- .../quest/task/ground/assassinate.script | 8 ++++---- .../quest/task/ground/clear_quest.script | 8 ++++---- .../quest/task/ground/comm_player.script | 9 +++++---- .../quest/task/ground/complete_quest.script | 8 ++++---- .../game/script/quest/task/ground/craft.script | 8 ++++---- .../script/quest/task/ground/defend.script | 8 ++++---- .../quest/task/ground/destroy_multi.script | 9 +++++---- .../task/ground/destroy_multi_and_loot.script | 8 ++++---- .../script/quest/task/ground/encounter.script | 8 ++++---- .../script/quest/task/ground/escort.script | 8 ++++---- .../script/quest/task/ground/give_item.script | 8 ++++---- .../quest/task/ground/go_to_location.script | 8 ++++---- .../quest/task/ground/grant_space_quest.script | 10 +++++----- .../script/quest/task/ground/nothing.script | 8 ++++---- .../script/quest/task/ground/perform.script | 8 ++++---- .../task/ground/perform_action_on_npc.script | 8 ++++---- .../quest/task/ground/remote_encounter.script | 8 ++++---- .../quest/task/ground/retrieve_item.script | 8 ++++---- .../script/quest/task/ground/reward.script | 8 ++++---- .../quest/task/ground/show_message_box.script | 8 ++++---- .../game/script/quest/task/ground/spawn.script | 8 ++++---- .../quest/task/ground/static_escort.script | 8 ++++---- .../quest/task/ground/talk_to_npc.script | 8 ++++---- .../script/quest/task/ground/test/debug.script | 2 +- .../task/ground/test/debug_completed.script | 2 +- .../quest/task/ground/test/debug_failed.script | 4 ++-- .../game/script/quest/task/ground/timer.script | 8 ++++---- .../quest/task/ground/wait_for_signal.script | 9 +++++---- .../quest/task/ground/wait_for_tasks.script | 9 ++++----- .../quest/task/ground/wave_event_player.script | 8 ++++---- .../municipal/cloning_facility.script | 6 +++--- .../structure/municipal/starport_city.script | 8 ++++---- .../gcw/gcw_city_pylon_barricade.script | 4 ++-- .../systems/gcw/gcw_city_pylon_patrol.script | 4 ++-- .../systems/gcw/gcw_city_pylon_tower.script | 4 ++-- .../systems/gcw/gcw_city_pylon_turret.script | 4 ++-- .../systems/gcw/gcw_city_pylon_vehicle.script | 4 ++-- .../gcw/gcw_city_pylon_vehicle_boss.script | 4 ++-- .../dropship/emperorsday_lambda.script | 2 +- .../dropship/emperorsday_yt1300.script | 2 +- .../systems/spawning/dropship/lambda.script | 2 +- .../spawning/dropship/player_shuttle.script | 2 +- .../systems/tcg/tcg_varactyl_armor.script | 4 ++-- .../compiled/game/script/terminal/bank.script | 6 +++--- .../terminal/base/terminal_add_use.script | 2 +- .../game/script/terminal/bazaar.script | 4 ++-- .../game/script/terminal/city_vote.script | 6 +++--- .../terminal/gcw_publish_gift_terminal.script | 4 ++-- .../game/script/terminal/greeter.script | 16 ++++++++-------- .../game/script/terminal/insurance.script | 8 ++++---- .../game/script/terminal/mission.script | 2 +- .../game/script/terminal/nonvendor.script | 16 ++++++++-------- .../game/script/terminal/repair.script | 8 ++++---- .../game/script/terminal/shipping.script | 2 +- .../terminal/terminal_gcw_publish_gift.script | 6 +++--- .../game/script/terminal/terminal_guild.script | 10 +++++----- .../game/script/terminal/travel.script | 2 +- .../game/script/terminal/vendor.script | 8 ++++---- 84 files changed, 286 insertions(+), 284 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/faction_perk/base/factional_deed.script b/sku.0/sys.server/compiled/game/script/faction_perk/base/factional_deed.script index 81d15c21e..63855640a 100644 --- a/sku.0/sys.server/compiled/game/script/faction_perk/base/factional_deed.script +++ b/sku.0/sys.server/compiled/game/script/faction_perk/base/factional_deed.script @@ -35,7 +35,7 @@ trigger OnObjectMenuSelect (obj_id player, int item) } } - return SCRIPT_CONTINUE; + return super.OnObjectMenuSelect(self, player, item); } /***** FUNCTIONS *******************************************************/ diff --git a/sku.0/sys.server/compiled/game/script/faction_perk/hq/terminal.script b/sku.0/sys.server/compiled/game/script/faction_perk/hq/terminal.script index c94d6fbc6..bf216c686 100644 --- a/sku.0/sys.server/compiled/game/script/faction_perk/hq/terminal.script +++ b/sku.0/sys.server/compiled/game/script/faction_perk/hq/terminal.script @@ -63,7 +63,7 @@ trigger OnInitialize() if ( hasScript(self, hq.SCRIPT_TERMINAL_DISABLE) ) detachScript(self, hq.SCRIPT_TERMINAL_DISABLE); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } trigger OnObjectMenuRequest(obj_id player, menu_info mi) @@ -71,7 +71,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if (stealth.hasInvisibleBuff(player)) { sendSystemMessage(player, SID_NO_STEALTH); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } if(isGod(player) && getGodLevel(player) >= 15) @@ -83,11 +83,11 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) int intState = getState(player, STATE_FEIGN_DEATH); if (isDead(player) || isIncapacitated(player) || intState > 0) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); obj_id structure = player_structure.getStructure(player); if ( !isIdValid(structure) ) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); string buildingTemplate = getTemplateName(structure); //LOG("hq", "faction_perk.hq.terminal:OnObjectMenuRequest: ********* got template of structure. It came in as: "+buildingTemplate); @@ -97,27 +97,27 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if ( pvpGetType(player) == PVPTYPE_NEUTRAL ) { sendSystemMessage(player, new string_id(STRING_FILE_LOC, "terminal_response01")); // Only declared factional personnel may access this terminal! - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } if ( hasObjVar(structure, hq.VAR_OBJECTIVE_TRACKING) ) { obj_id[] objectives = getObjIdArrayObjVar(structure, hq.VAR_OBJECTIVE_ID); if ( objectives == null || objectives.length == 0 ) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); obj_id[] disabled = getObjIdArrayObjVar(structure, hq.VAR_OBJECTIVE_DISABLED); if ( disabled == null || disabled.length != objectives.length ) { prose_package ppDisableOther = prose.getPackage(hq.PROSE_DISABLE_OTHER, objectives[objectives.length - 1], self); sendSystemMessageProse(player, ppDisableOther); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } int mnuCountdown = mi.addRootMenu(menu_info_types.ITEM_USE, MNU_OVERLOAD); } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } int management_root = mi.addRootMenu (menu_info_types.ITEM_USE, SID_TERMINAL_MANAGEMENT); @@ -169,7 +169,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) } } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/faction_perk/hq/turret_control.script b/sku.0/sys.server/compiled/game/script/faction_perk/hq/turret_control.script index bc835d73f..3da081155 100644 --- a/sku.0/sys.server/compiled/game/script/faction_perk/hq/turret_control.script +++ b/sku.0/sys.server/compiled/game/script/faction_perk/hq/turret_control.script @@ -47,7 +47,7 @@ trigger OnInitialize() utils.removeScriptVar(self, "sui.in_use"); messageTo (self, "handleSetControl", null, 5f, false); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } trigger OnTriggerVolumeExited(string volName, obj_id who) @@ -116,11 +116,11 @@ messageHandler handleSetControl() trigger OnObjectMenuRequest(obj_id player, menu_info mi) { if (isDead(player) || isIncapacitated(player)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); obj_id structure = player_structure.getStructure(player); if ( !isIdValid(structure) ) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); if(utils.hasScriptVar(self, "sui.in_use")) { @@ -130,7 +130,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if (oldPlayer.isLoaded()) { sendSystemMessage(player, IN_USE); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } else { @@ -145,13 +145,13 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if ( pvpGetType(player) != PVPTYPE_DECLARED ) { sendSystemMessage(player, DECLARED_ONLY); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } */ if (factions.isOnLeave(player)) { sendSystemMessage(player, DECLARED_ONLY); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } } @@ -162,13 +162,13 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if (rank < 4 ) { sendSystemMessage(player, ADMIN_ONLY); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } } int mnuControl = mi.addRootMenu(menu_info_types.SERVER_MENU1, MNU_TURRET_CONTROL); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/gambling/saarlac/saarlac_wheel.script b/sku.0/sys.server/compiled/game/script/gambling/saarlac/saarlac_wheel.script index fbd85be77..982f349c3 100644 --- a/sku.0/sys.server/compiled/game/script/gambling/saarlac/saarlac_wheel.script +++ b/sku.0/sys.server/compiled/game/script/gambling/saarlac/saarlac_wheel.script @@ -107,7 +107,7 @@ trigger OnInitialize() { reseed(getGameTime()); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } diff --git a/sku.0/sys.server/compiled/game/script/gambling/slot/standard.script b/sku.0/sys.server/compiled/game/script/gambling/slot/standard.script index 05e563e03..9ecd0ddf6 100644 --- a/sku.0/sys.server/compiled/game/script/gambling/slot/standard.script +++ b/sku.0/sys.server/compiled/game/script/gambling/slot/standard.script @@ -19,7 +19,7 @@ trigger OnInitialize() gameType = getStringObjVar(self, gambling.VAR_PREDEFINED_TYPE); gambling.initializeTable(self, gameType); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } /***** HANDLERS ********************************************************/ diff --git a/sku.0/sys.server/compiled/game/script/gambling/table/pazaak.script b/sku.0/sys.server/compiled/game/script/gambling/table/pazaak.script index a93216e02..ea609f092 100644 --- a/sku.0/sys.server/compiled/game/script/gambling/table/pazaak.script +++ b/sku.0/sys.server/compiled/game/script/gambling/table/pazaak.script @@ -67,7 +67,7 @@ trigger OnInitialize() if (isIdValid(structure)) transferBankCreditsTo(self, structure, table_balance, "noHandler", "noHandler", new dictionary()); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } @@ -183,11 +183,11 @@ messageHandler handleBetVerifiedFailed() messageHandler handlePlayerRemoved() { if ( params == null || params.isEmpty() ) - return SCRIPT_CONTINUE; + return super.handlePlayerRemoved(self, params); obj_id player = params.getObjId("player"); if ( !isIdValid(player) ) - return SCRIPT_CONTINUE; + return super.handlePlayerRemoved(self, params); string ovpath = gambling.VAR_GAME_PLAYERS + "." + player + ".pid"; if ( utils.hasScriptVar(self, ovpath) ) @@ -274,7 +274,7 @@ messageHandler handlePlayerRemoved() } } - return SCRIPT_CONTINUE; + return super.handlePlayerRemoved(self, params); } messageHandler msgPlayPazaakCard() diff --git a/sku.0/sys.server/compiled/game/script/gambling/wheel/roulette.script b/sku.0/sys.server/compiled/game/script/gambling/wheel/roulette.script index c6731c720..66431ac01 100644 --- a/sku.0/sys.server/compiled/game/script/gambling/wheel/roulette.script +++ b/sku.0/sys.server/compiled/game/script/gambling/wheel/roulette.script @@ -44,7 +44,7 @@ trigger OnInitialize() gameType = getStringObjVar(self, gambling.VAR_PREDEFINED_TYPE); gambling.initializeTable(self, gameType); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } /***** HANDLERS ********************************************************/ diff --git a/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.script b/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.script index 3794427a5..9fd87ab6c 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.script @@ -40,7 +40,7 @@ trigger OnInitialize() { debug.debugAllMsg("DEBUG", self, "##########chance_cube initialized##############"); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -72,7 +72,7 @@ trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########chance script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.script b/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.script index 8ec8672ac..3a0a13fb3 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.script @@ -43,7 +43,7 @@ trigger OnInitialize() setObjVar(self, VAR_DICE_COUNT, NUMBER_OF_DICE); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -100,7 +100,7 @@ trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########configurable dice script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.script b/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.script index 76bd9f95f..6a4bc0334 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.script @@ -42,7 +42,7 @@ trigger OnInitialize() setObjVar(self, VAR_FACE_COUNT, FACE_COUNT); setObjVar(self, VAR_DICE_COUNT, DEFAULT_DICE_COUNT); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -83,7 +83,7 @@ trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########one hundred sided dice script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.script b/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.script index 02c5ac209..1dd99976a 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.script @@ -43,7 +43,7 @@ trigger OnInitialize() setObjVar(self, VAR_DICE_COUNT, DEFAULT_DICE_COUNT); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -84,7 +84,7 @@ trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########six sided dice script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.script b/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.script index 03228092a..f159c8c26 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.script @@ -42,7 +42,7 @@ trigger OnInitialize() setObjVar(self, VAR_FACE_COUNT, FACE_COUNT); setObjVar(self, VAR_DICE_COUNT, DEFAULT_DICE_COUNT); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -83,7 +83,7 @@ trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########ten sided dice script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.script b/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.script index 0c3ea3068..e8f334f07 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.script @@ -42,7 +42,7 @@ trigger OnInitialize() setObjVar(self, VAR_FACE_COUNT, FACE_COUNT); setObjVar(self, VAR_DICE_COUNT, DEFAULT_DICE_COUNT); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -82,7 +82,7 @@ messageHandler roll() trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########twelve sided dice script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.script b/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.script index 6b025a6f5..09f259035 100644 --- a/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.script +++ b/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.script @@ -42,7 +42,7 @@ trigger OnInitialize() setObjVar(self, VAR_FACE_COUNT, FACE_COUNT); setObjVar(self, VAR_DICE_COUNT, DEFAULT_DICE_COUNT); setObjVar(self, DICE_TYPE_NAME, TYPE_NAME); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); }//OnInitialize @@ -82,7 +82,7 @@ messageHandler roll() trigger OnDetach() { debug.debugAllMsg("DEBUG", self, "##########twenty sided dice script detached##############"); - return SCRIPT_CONTINUE; + return super.OnDetach(self); }//OnDetach diff --git a/sku.0/sys.server/compiled/game/script/item/entertainer_console/stage_controller.script b/sku.0/sys.server/compiled/game/script/item/entertainer_console/stage_controller.script index 3526e4690..499af4f16 100644 --- a/sku.0/sys.server/compiled/game/script/item/entertainer_console/stage_controller.script +++ b/sku.0/sys.server/compiled/game/script/item/entertainer_console/stage_controller.script @@ -25,14 +25,14 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if(!isIdValid(player)) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } if(checkLocation(self)) { int startController = mi.addRootMenu(menu_info_types.ITEM_USE, SID_START_CONTROLLER); } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_drowsy_dart.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_drowsy_dart.script index e1ec23f53..5579ac8ae 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_drowsy_dart.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_drowsy_dart.script @@ -59,13 +59,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -75,7 +75,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } prose_package pp = prose.getPackage( SID_SYS_EFFECT, target ); sendSystemMessageProse( player, pp ); @@ -110,5 +110,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_enraging_spur.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_enraging_spur.script index e456180ff..11f5cd112 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_enraging_spur.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_enraging_spur.script @@ -61,13 +61,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -77,7 +77,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } prose_package pp = prose.getPackage( SID_SYS_EFFECT, target ); sendSystemMessageProse( player, pp ); @@ -111,6 +111,6 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.15f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_flash_bomb.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_flash_bomb.script index 9ced71a7a..42baa35ee 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_flash_bomb.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_flash_bomb.script @@ -60,14 +60,14 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); obj_id player = params.getObjId( "player" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( ai_lib.isNpc( target ) || ai_lib.isAndroid(target)) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Hit message. int hits = utils.getIntScriptVar( self, "hits" ); @@ -96,5 +96,5 @@ messageHandler trapHit() startCombat( target, self ); } - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_def_1.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_def_1.script index 8e1fed390..c932eef27 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_def_1.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_def_1.script @@ -60,13 +60,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -75,7 +75,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } // Affect the target. @@ -102,5 +102,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_ranged_def_1.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_ranged_def_1.script index 94be50f83..9562c8a31 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_ranged_def_1.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_melee_ranged_def_1.script @@ -59,13 +59,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -74,7 +74,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } // Affect the target. @@ -102,5 +102,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.3f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_noise_maker.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_noise_maker.script index c974e66f5..345f37a1f 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_noise_maker.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_noise_maker.script @@ -60,13 +60,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -76,7 +76,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } prose_package pp = prose.getPackage( SID_SYS_EFFECT, target ); sendSystemMessageProse( player, pp ); @@ -110,5 +110,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.2f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_ranged_def_1.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_ranged_def_1.script index b4f8438f5..4659f5abc 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_ranged_def_1.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_ranged_def_1.script @@ -59,13 +59,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -74,7 +74,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } // Affect the target. @@ -101,5 +101,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.15f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_sonic_pulse.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_sonic_pulse.script index b1b162a6f..91ea20b95 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_sonic_pulse.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_sonic_pulse.script @@ -59,14 +59,14 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); obj_id player = params.getObjId( "player" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( ai_lib.isNpc( target ) || ai_lib.isAndroid(target)) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Hit message. int hits = utils.getIntScriptVar( self, "hits" ); @@ -96,5 +96,5 @@ messageHandler trapHit() startCombat( target, self ); } - return SCRIPT_CONTINUE; -} \ No newline at end of file + return super.trapHit(self, params); +} diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_state_def_1.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_state_def_1.script index 54e192586..ac4272a7c 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_state_def_1.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_state_def_1.script @@ -59,13 +59,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -74,7 +74,7 @@ messageHandler trapHit() { prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } // Affect the target. @@ -103,5 +103,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.2f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_tranq_dart.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_tranq_dart.script index 10ad202dc..9f72c1c79 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_tranq_dart.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_tranq_dart.script @@ -63,13 +63,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -80,12 +80,12 @@ messageHandler trapHit() prose_package pp = prose.getPackage( SID_NO_EFFECT, target ); sendSystemMessageProse( player, pp ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } if (buff.hasBuff(target, "tranqDart")) { - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } /* if ( hasObjVar( target, "ai.snare.snared" ) ) @@ -136,5 +136,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.3f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/item/trap/trap_webber.script b/sku.0/sys.server/compiled/game/script/item/trap/trap_webber.script index 580307872..7fedbf763 100644 --- a/sku.0/sys.server/compiled/game/script/item/trap/trap_webber.script +++ b/sku.0/sys.server/compiled/game/script/item/trap/trap_webber.script @@ -60,13 +60,13 @@ trigger OnAttach() messageHandler trapHit() { if ( params == null ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); obj_id target = params.getObjId( "target" ); if ( (target == null) || (target == obj_id.NULL_ID) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); if ( !ai_lib.isMonster( target ) || isIncapacitated( target ) || isDead( target ) ) - return SCRIPT_CONTINUE; + return super.trapHit(self, params); // Get player. obj_id player = params.getObjId( "player" ); @@ -114,5 +114,5 @@ messageHandler trapHit() float chance = params.getFloat( "chance" ); grantTrapXP( player, target, 1.4f ); - return SCRIPT_CONTINUE; + return super.trapHit(self, params); } diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/assassinate.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/assassinate.script index 51dd3d1cb..34cf5d856 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/assassinate.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/assassinate.script @@ -40,7 +40,7 @@ trigger OnTaskActivated(int questCrc, int taskId) setObjVar(self, baseObjVar + dot + objvarAsassinateTarget, assassinateTarget); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -108,7 +108,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -118,7 +118,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -128,7 +128,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/clear_quest.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/clear_quest.script index edf10509f..64c8e37ab 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/clear_quest.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/clear_quest.script @@ -15,7 +15,7 @@ trigger OnTaskActivated(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + " task activated."); questCompleteTask(questCrc, taskId, self); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -27,7 +27,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) questClearQuest(questCrc, self); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -36,7 +36,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) trigger OnTaskFailed(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -44,7 +44,7 @@ trigger OnTaskFailed(int questCrc, int taskId) trigger OnTaskCleared(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/comm_player.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/comm_player.script index b5ab4a469..08fe06cf3 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/comm_player.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/comm_player.script @@ -17,10 +17,11 @@ const String taskType = "comm_player"; //fires when this task is added to the player trigger OnTaskActivated(int questCrc, int taskId) { + groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + " task activated."); //instantly complete questCompleteTask(questCrc, taskId, self); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -39,7 +40,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) commPlayer(self, self, pp, appearance); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -48,7 +49,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) trigger OnTaskFailed(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -57,7 +58,7 @@ trigger OnTaskFailed(int questCrc, int taskId) trigger OnTaskCleared(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/complete_quest.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/complete_quest.script index f2ded0df8..a56b0c150 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/complete_quest.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/complete_quest.script @@ -15,7 +15,7 @@ trigger OnTaskActivated(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + " task activated."); questCompleteTask(questCrc, taskId, self); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -25,7 +25,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); questCompleteQuest(questCrc, self); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -34,7 +34,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) trigger OnTaskFailed(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -42,7 +42,7 @@ trigger OnTaskFailed(int questCrc, int taskId) trigger OnTaskCleared(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/craft.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/craft.script index 70a21dbbd..8db03d476 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/craft.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/craft.script @@ -25,7 +25,7 @@ trigger OnTaskActivated(int questCrc, int taskId) setObjVar(self, baseObjVar + dot + objvarCount, 0); int count = groundquests.getTaskIntDataEntry(questCrc, taskId, dataTableColumnCount); questSetQuestTaskCounter(self, questGetQuestName(questCrc), taskId, "quest/groundquests:crafting_counter", 0, count); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -103,7 +103,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -113,7 +113,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -122,7 +122,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/defend.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/defend.script index 9bfdcfd77..a16e3f7ee 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/defend.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/defend.script @@ -62,7 +62,7 @@ trigger OnTaskActivated(int questCrc, int taskId) distanceCheckParams.put(QUEST_CRC, questCrc); distanceCheckParams.put(TASK_ID, taskId); messageTo(self, "messageDefendCheckDistance", distanceCheckParams, DEFEND_DISTANCE_TIME_CHECK, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -296,7 +296,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) } cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -319,7 +319,7 @@ trigger OnTaskFailed(int questCrc, int taskId) } cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -342,7 +342,7 @@ trigger OnTaskCleared(int questCrc, int taskId) } cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi.script index e64c5a7fc..2384908bd 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi.script @@ -31,7 +31,7 @@ trigger OnTaskActivated(int questCrc, int taskId) questSetQuestTaskCounter(self, questGetQuestName(questCrc), taskId, "quest/groundquests:destroy_counter", 0, count); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -145,6 +145,7 @@ messageHandler receiveCreditForKill() trigger OnTaskCompleted(int questCrc, int taskId) { + cleanup(self, questCrc, taskId); //give money if appropriate @@ -155,7 +156,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", "Deposited " + bankCredits + " credits into the bank."); } - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -164,7 +165,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -173,7 +174,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi_and_loot.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi_and_loot.script index e9e553d6f..4cbd0aa72 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi_and_loot.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/destroy_multi_and_loot.script @@ -31,7 +31,7 @@ trigger OnTaskActivated(int questCrc, int taskId) questSetQuestTaskCounter(self, questGetQuestName(questCrc), taskId, "quest/groundquests:destroy_and_loot_counter", 0, count); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -177,7 +177,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) money.bankTo(money.ACCT_NEW_PLAYER_QUESTS, self, bankCredits); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", "Deposited " + bankCredits + " credits into the bank."); } - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -186,7 +186,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -195,7 +195,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/encounter.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/encounter.script index 0629caddc..e341a8bea 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/encounter.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/encounter.script @@ -104,7 +104,7 @@ trigger OnTaskActivated(int questCrc, int taskId) setObjVar(self, baseObjVar + dot + objvarSpawnList, spawnList); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -161,7 +161,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -171,7 +171,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -181,7 +181,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/escort.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/escort.script index dbba27751..137cf7ea4 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/escort.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/escort.script @@ -62,7 +62,7 @@ trigger OnTaskActivated(int questCrc, int taskId) distanceCheckParams.put("taskId", taskId); messageTo(self, "messageEscortCheckDistance", distanceCheckParams, escortDistanceTimeCheck, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -205,7 +205,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) ai_lib.aiStopFollowing(escort); cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -221,7 +221,7 @@ trigger OnTaskFailed(int questCrc, int taskId) ai_lib.aiStopFollowing(escort); cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -237,7 +237,7 @@ trigger OnTaskCleared(int questCrc, int taskId) ai_lib.aiStopFollowing(escort); cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/give_item.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/give_item.script index d35854c26..7393391c2 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/give_item.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/give_item.script @@ -76,7 +76,7 @@ trigger OnTaskActivated(int questCrc, int taskId) travel.setTravelBlock(self, allowLaunch); } - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -148,7 +148,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -158,7 +158,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -167,7 +167,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/go_to_location.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/go_to_location.script index f363dcf20..4cf0e2660 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/go_to_location.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/go_to_location.script @@ -52,7 +52,7 @@ trigger OnTaskActivated(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", "Must reach within " + sphereSize + " meters of " + locationX + ", " + locationY + ", " + locationZ + " on " + planetName + "."); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -106,7 +106,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -116,7 +116,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -125,7 +125,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/grant_space_quest.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/grant_space_quest.script index 7f8d3c85d..909f354aa 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/grant_space_quest.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/grant_space_quest.script @@ -31,7 +31,7 @@ trigger OnTaskActivated(int questCrc, int taskId) setObjVar (self, baseObjVar + ".spaceQuestIdentifier" , spaceName ); space_quest.grantQuest( self, spaceType, spaceName); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -60,7 +60,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -70,7 +70,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -79,7 +79,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -150,4 +150,4 @@ void handleSpaceQuestMessaging (obj_id self, dictionary params, int spaceQuestVa } } } -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/nothing.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/nothing.script index 5c415b719..caae89238 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/nothing.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/nothing.script @@ -14,7 +14,7 @@ trigger OnTaskActivated(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + "task entered."); questCompleteTask(questCrc, taskId, self); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -23,7 +23,7 @@ trigger OnTaskActivated(int questCrc, int taskId) trigger OnTaskCompleted(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -32,7 +32,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) trigger OnTaskFailed(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -40,7 +40,7 @@ trigger OnTaskFailed(int questCrc, int taskId) trigger OnTaskCleared(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/perform.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/perform.script index 38958532e..bbab2b864 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/perform.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/perform.script @@ -35,7 +35,7 @@ trigger OnTaskActivated(int questCrc, int taskId) groundquests.setBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId); clearPerformObjVars(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // ---------------------------------------------------------------------- @@ -45,7 +45,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // ---------------------------------------------------------------------- @@ -55,7 +55,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // ---------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/perform_action_on_npc.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/perform_action_on_npc.script index 98a748c7f..aa76c71e7 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/perform_action_on_npc.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/perform_action_on_npc.script @@ -20,7 +20,7 @@ trigger OnTaskActivated(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + " task activated."); groundquests.setBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // ---------------------------------------------------------------------- @@ -29,7 +29,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // ---------------------------------------------------------------------- @@ -38,7 +38,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // ---------------------------------------------------------------------- @@ -47,7 +47,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // ---------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/remote_encounter.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/remote_encounter.script index 6e4426e69..228b2516c 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/remote_encounter.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/remote_encounter.script @@ -108,7 +108,7 @@ trigger OnTaskActivated(int questCrc, int taskId) (int)playerPlayedTimeWhenTimerEnds); } - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -117,7 +117,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -126,7 +126,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -135,7 +135,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/retrieve_item.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/retrieve_item.script index cfe693ed4..9f6434a12 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/retrieve_item.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/retrieve_item.script @@ -38,7 +38,7 @@ trigger OnTaskActivated(int questCrc, int taskId) int count = groundquests.getTaskIntDataEntry(questCrc, taskId, dataTableColumnNumRequired); questSetQuestTaskCounter(self, questGetQuestName(questCrc), taskId, "quest/groundquests:retrieve_item_counter", 0, count); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -173,7 +173,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -183,7 +183,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -192,7 +192,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/reward.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/reward.script index c642f4f2b..53b4fa1fd 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/reward.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/reward.script @@ -24,7 +24,7 @@ trigger OnTaskActivated(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + " task activated."); //instantly complete questCompleteTask(questCrc, taskId, self); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -59,7 +59,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) int[] lootCounts = {lootCount}; groundquests.grantQuestReward(self, questCrc, -1, -1, experienceType, experienceAmount, factionName, factionAmount, false, bankCredits, item, itemCount, weapon, weaponCount, weaponSpeed, weaponDamage, weaponEfficiency, weaponElementalValue, armor, armorCount, armorQuality, lootNames, lootCounts, null, 1, badge, ( questIsQuestForceAccept(questCrc) || !questDoesUseAcceptanceUI(questCrc) )); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -68,7 +68,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) trigger OnTaskFailed(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -76,7 +76,7 @@ trigger OnTaskFailed(int questCrc, int taskId) trigger OnTaskCleared(int questCrc, int taskId) { groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/show_message_box.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/show_message_box.script index 880ae1e55..3c7abe7f6 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/show_message_box.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/show_message_box.script @@ -107,7 +107,7 @@ trigger OnTaskActivated(int questCrc, int taskId) groundquests.setBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -137,7 +137,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -147,7 +147,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -157,7 +157,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + "task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/spawn.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/spawn.script index e90089803..8b7e1e99b 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/spawn.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/spawn.script @@ -89,7 +89,7 @@ trigger OnTaskActivated(int questCrc, int taskId) messageTo(self, "messageStartQuestSpawn", params, timeLeft, true); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // -------------------------------------------------------------------------------- @@ -346,7 +346,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // -------------------------------------------------------------------------------- @@ -355,7 +355,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // -------------------------------------------------------------------------------- @@ -364,7 +364,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // -------------------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/static_escort.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/static_escort.script index d4913db0a..c4f55b964 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/static_escort.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/static_escort.script @@ -98,7 +98,7 @@ trigger OnTaskActivated(int questCrc, int taskId) distanceCheckParams.put("taskId", taskId); messageTo(self, "messageStaticEscortCheckDistance", distanceCheckParams, escortDistanceTimeCheck, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -192,7 +192,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -203,7 +203,7 @@ trigger OnTaskFailed(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -214,7 +214,7 @@ trigger OnTaskCleared(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); cleanup(self, questCrc, taskId); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/talk_to_npc.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/talk_to_npc.script index 6dc37359a..d3fd531ce 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/talk_to_npc.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/talk_to_npc.script @@ -29,7 +29,7 @@ trigger OnTaskActivated(int questCrc, int taskId) groundquests.questOutputDebugInfo(self, taskType, "OnStartConversation", "Player must talk to " + npcName + "."); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -106,7 +106,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -116,7 +116,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -125,7 +125,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug.script index 8afad5004..3fb1a1cf4 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug.script @@ -31,5 +31,5 @@ trigger OnTaskActivated(int questCrc, int taskId) params.put("questCrc", questCrc); params.put("taskId", taskId); messageTo(self, "completeDebugTask", params, 5.0f, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_completed.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_completed.script index 3c8996dc0..4f10b4f1a 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_completed.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_completed.script @@ -31,6 +31,6 @@ trigger OnTaskActivated(int questCrc, int taskId) params.put("questCrc", questCrc); params.put("taskId", taskId); messageTo(self, "failedDebugTask", params, 5.0f, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_failed.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_failed.script index 3206e2a94..b118efe67 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_failed.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/test/debug_failed.script @@ -26,7 +26,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { LOG("groundquests", "quest.task.ground.debug_failed:OnTaskCompleted(" + questCrc + ", " + taskId + ")"); questCompleteQuest(questCrc, self); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } @@ -38,5 +38,5 @@ trigger OnTaskActivated(int questCrc, int taskId) params.put("questCrc", questCrc); params.put("taskId", taskId); messageTo(self, "completeDebugQuest", params, 5.0f, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/timer.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/timer.script index 52d450bea..59023a2a8 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/timer.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/timer.script @@ -53,7 +53,7 @@ trigger OnTaskActivated(int questCrc, int taskId) if(isVisible != 0) questSetQuestTaskTimer(self, questGetQuestName(questCrc), taskId, "quest/groundquests:timer_timertext", (int)playerPlayedTimeWhenTimerEnds); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -92,7 +92,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + "task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -102,7 +102,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + "task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -112,7 +112,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + "task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_signal.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_signal.script index 61bcc4e59..81da6d9ff 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_signal.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_signal.script @@ -44,7 +44,7 @@ trigger OnTaskActivated(int questCrc, int taskId) questSetQuestTaskCounter(self, questGetQuestName(questCrc), taskId, "quest/groundquests:signals_counter", 0, count); } - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -54,7 +54,8 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -64,7 +65,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -73,7 +74,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_tasks.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_tasks.script index 242674e3c..f5d105922 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_tasks.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/wait_for_tasks.script @@ -105,7 +105,7 @@ trigger OnTaskActivated(int questCrc, int taskId) webster.put ("taskId", taskId); messageTo(self, "checkForAlreadyCompletedTasks", webster, 1, false); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -278,7 +278,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -286,10 +286,9 @@ trigger OnTaskCompleted(int questCrc, int taskId) //fires when the task is failed trigger OnTaskFailed(int questCrc, int taskId) { - cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -299,7 +298,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/quest/task/ground/wave_event_player.script b/sku.0/sys.server/compiled/game/script/quest/task/ground/wave_event_player.script index 4dc5d86cc..681e2513b 100644 --- a/sku.0/sys.server/compiled/game/script/quest/task/ground/wave_event_player.script +++ b/sku.0/sys.server/compiled/game/script/quest/task/ground/wave_event_player.script @@ -25,7 +25,7 @@ trigger OnTaskActivated(int questCrc, int taskId) String baseObjVar = groundquests.setBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", taskType + " task activated."); - return SCRIPT_CONTINUE; + return super.OnTaskActivated(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -75,7 +75,7 @@ trigger OnTaskCompleted(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCompleted", taskType + " task completed."); - return SCRIPT_CONTINUE; + return super.OnTaskCompleted(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -85,7 +85,7 @@ trigger OnTaskFailed(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskFailed", taskType + " task failed."); - return SCRIPT_CONTINUE; + return super.OnTaskFailed(self, questCrc, taskId); } // --------------------------------------------------------------------- @@ -94,7 +94,7 @@ trigger OnTaskCleared(int questCrc, int taskId) { cleanup(self, questCrc, taskId); groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskCleared", taskType + " task cleared."); - return SCRIPT_CONTINUE; + return super.OnTaskCleared(self, questCrc, taskId); } // --------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/structure/municipal/cloning_facility.script b/sku.0/sys.server/compiled/game/script/structure/municipal/cloning_facility.script index b1fc0b15a..c1837ec69 100644 --- a/sku.0/sys.server/compiled/game/script/structure/municipal/cloning_facility.script +++ b/sku.0/sys.server/compiled/game/script/structure/municipal/cloning_facility.script @@ -31,7 +31,7 @@ const string DATATABLE_TERMINAL_LIST = "datatables/structure/municipal/clonin trigger OnInitialize() { messageTo( self, "handleTerminalSpawning", null, 5f, false ); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } trigger OnDetach() @@ -44,7 +44,7 @@ trigger OnDetach() messageTo(planet, "unregisterCloningFacility", params, 1.0f, false); } - return SCRIPT_CONTINUE; + return super.OnDetach(self); } @@ -129,4 +129,4 @@ void createCloningDroid(obj_id facility) } } } -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/structure/municipal/starport_city.script b/sku.0/sys.server/compiled/game/script/structure/municipal/starport_city.script index d95a8ba72..2bb90d897 100644 --- a/sku.0/sys.server/compiled/game/script/structure/municipal/starport_city.script +++ b/sku.0/sys.server/compiled/game/script/structure/municipal/starport_city.script @@ -17,7 +17,7 @@ trigger OnAttach() { messageTo( self, "setupStartport", null, 1.f, false ); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } trigger OnInitialize() @@ -29,11 +29,11 @@ trigger OnInitialize() int travel_cost = travel.getTravelCost( self ); if ( travel_point == null || travel_cost == -1 ) - return SCRIPT_CONTINUE; + return super.OnInitialize(self); travel.initializeStarport( self, travel_point, travel_cost, true ); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } messageHandler setupStartport() @@ -82,5 +82,5 @@ trigger OnDestroy() if ( initd ) city.removeStarport( self ); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_barricade.script b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_barricade.script index 1f9d5120b..99c7d3579 100644 --- a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_barricade.script +++ b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_barricade.script @@ -10,7 +10,7 @@ inherits systems.gcw.gcw_city_pylon; trigger OnAttach() { setObjVar(self, gcw.GCW_TOOL_TEMPLATE_OBJVAR, "object/tangible/gcw/crafting_quest/gcw_barricade_tool.iff"); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } string getConstructionQuest() @@ -26,4 +26,4 @@ string getImperialIcon() string getRebelIcon() { return "pt_gcw_quest_rebel_barricade.prt"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_patrol.script b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_patrol.script index e4306fe48..4e1bfee47 100644 --- a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_patrol.script +++ b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_patrol.script @@ -9,7 +9,7 @@ inherits systems.gcw.gcw_city_pylon; trigger OnAttach() { - return SCRIPT_CONTINUE; + return super.OnAttach(self); } string getConstructionQuest() @@ -25,4 +25,4 @@ string getImperialIcon() string getRebelIcon() { return "pt_gcw_quest_rebel_patrol_2.prt"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_tower.script b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_tower.script index d710a20e1..d5f0fbb87 100644 --- a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_tower.script +++ b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_tower.script @@ -10,7 +10,7 @@ inherits systems.gcw.gcw_city_pylon; trigger OnAttach() { setObjVar(self, gcw.GCW_TOOL_TEMPLATE_OBJVAR, "object/tangible/gcw/crafting_quest/gcw_tower_tool.iff"); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } string getConstructionQuest() @@ -26,4 +26,4 @@ string getImperialIcon() string getRebelIcon() { return "pt_gcw_quest_rebel_tower.prt"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_turret.script b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_turret.script index 5461c222f..913a143bb 100644 --- a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_turret.script +++ b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_turret.script @@ -10,7 +10,7 @@ inherits systems.gcw.gcw_city_pylon; trigger OnAttach() { setObjVar(self, gcw.GCW_TOOL_TEMPLATE_OBJVAR, "object/tangible/gcw/crafting_quest/gcw_turret_tool.iff"); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } string getConstructionQuest() @@ -26,4 +26,4 @@ string getImperialIcon() string getRebelIcon() { return "pt_gcw_quest_rebel_turret.prt"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle.script b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle.script index fd60e97e0..94b92c67b 100644 --- a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle.script +++ b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle.script @@ -10,7 +10,7 @@ inherits systems.gcw.gcw_city_pylon; trigger OnAttach() { setObjVar(self, gcw.GCW_TOOL_TEMPLATE_OBJVAR, "object/tangible/gcw/crafting_quest/gcw_vehicle_tool.iff"); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } string getConstructionQuest() @@ -26,4 +26,4 @@ string getImperialIcon() string getRebelIcon() { return "pt_gcw_quest_rebel_vehicle.prt"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle_boss.script b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle_boss.script index c843f73fc..73755c8a0 100644 --- a/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle_boss.script +++ b/sku.0/sys.server/compiled/game/script/systems/gcw/gcw_city_pylon_vehicle_boss.script @@ -10,7 +10,7 @@ inherits systems.gcw.gcw_city_pylon; trigger OnAttach() { setObjVar(self, gcw.GCW_TOOL_TEMPLATE_OBJVAR, "object/tangible/gcw/crafting_quest/gcw_vehicle_tool.iff"); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } string getConstructionQuest() @@ -46,4 +46,4 @@ string getImperialIcon() string getRebelIcon() { return "pt_gcw_quest_rebel_vehicle_boss.prt"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_lambda.script b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_lambda.script index 566d13dbe..79b28c769 100644 --- a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_lambda.script +++ b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_lambda.script @@ -14,7 +14,7 @@ trigger OnAttach() messageTo(self, "handleAttachDelay", null, 2f, false); setHibernationDelay(self, 600.0f); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } messageHandler handleAttachDelay() diff --git a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_yt1300.script b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_yt1300.script index 312f96f13..b3be3baa7 100644 --- a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_yt1300.script +++ b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/emperorsday_yt1300.script @@ -7,7 +7,7 @@ inherits systems.spawning.dropship.base; trigger OnAttach() { messageTo(self, "handleAttachDelay", null, 5.0f, false); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } messageHandler handleAttachDelay() diff --git a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/lambda.script b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/lambda.script index e2dd222aa..57ffbfa85 100644 --- a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/lambda.script +++ b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/lambda.script @@ -9,7 +9,7 @@ inherits systems.spawning.dropship.base; trigger OnAttach() { messageTo(self, "handleAttachDelay", null, 2f, false); - return SCRIPT_CONTINUE; + return super.OnAttach(self); } messageHandler handleAttachDelay() diff --git a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/player_shuttle.script b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/player_shuttle.script index e642f4ab6..99d15584d 100644 --- a/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/player_shuttle.script +++ b/sku.0/sys.server/compiled/game/script/systems/spawning/dropship/player_shuttle.script @@ -5,7 +5,7 @@ inherits systems.spawning.dropship.base; trigger OnAttach() { - return SCRIPT_CONTINUE; + return super.OnAttach(self); } messageHandler landShuttle() diff --git a/sku.0/sys.server/compiled/game/script/systems/tcg/tcg_varactyl_armor.script b/sku.0/sys.server/compiled/game/script/systems/tcg/tcg_varactyl_armor.script index 34607845c..80ef5516b 100644 --- a/sku.0/sys.server/compiled/game/script/systems/tcg/tcg_varactyl_armor.script +++ b/sku.0/sys.server/compiled/game/script/systems/tcg/tcg_varactyl_armor.script @@ -20,14 +20,14 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if(!isIdValid(player)) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } if(checkLocation(self, player)) { int startArmorSwap = mi.addRootMenu(menu_info_types.ITEM_USE, SID_VAC_ARMOR); } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //If the armor swap option is called from the radial, check location again and get a list of varactyle mounts in the diff --git a/sku.0/sys.server/compiled/game/script/terminal/bank.script b/sku.0/sys.server/compiled/game/script/terminal/bank.script index d925f3391..bfee0b9e9 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/bank.script +++ b/sku.0/sys.server/compiled/game/script/terminal/bank.script @@ -47,7 +47,7 @@ const string_id SID_GALACTIC_RESERVE_WITHDRAW = new string_id("sui", "bank_gal trigger OnInitialize() { setObjVar(self, "banking_bankid", getCurrentSceneName()); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } trigger OnObjectMenuRequest(obj_id player, menu_info mi) @@ -57,7 +57,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) menu_info_data mid = mi.getMenuItemByType(menu_info_types.ITEM_USE); if ( mid == null ) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } int mnu = mid.getId(); @@ -87,7 +87,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) mi.addSubMenu(galactic_reserve, menu_info_types.SERVER_MENU48, SID_GALACTIC_RESERVE_WITHDRAW); } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/terminal/base/terminal_add_use.script b/sku.0/sys.server/compiled/game/script/terminal/base/terminal_add_use.script index 0e8280846..75bffe006 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/base/terminal_add_use.script +++ b/sku.0/sys.server/compiled/game/script/terminal/base/terminal_add_use.script @@ -29,7 +29,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) mi.addRootMenu(menu_info_types.ITEM_USE, new string_id("","")); } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } /***** FUNCTIONS *******************************************************/ diff --git a/sku.0/sys.server/compiled/game/script/terminal/bazaar.script b/sku.0/sys.server/compiled/game/script/terminal/bazaar.script index 067b8b429..c2c081f23 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/bazaar.script +++ b/sku.0/sys.server/compiled/game/script/terminal/bazaar.script @@ -23,7 +23,7 @@ const string_id SID_BAZAAR_OPTIONS = new string_id("terminal_ui", "baz trigger OnObjectMenuRequest(obj_id player, menu_info mi) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) @@ -41,7 +41,7 @@ trigger OnInitialize() { setOwner (self, self); attachScript(self, "planet_map.map_loc_attach"); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } /***** FUNCTIONS *******************************************************/ diff --git a/sku.0/sys.server/compiled/game/script/terminal/city_vote.script b/sku.0/sys.server/compiled/game/script/terminal/city_vote.script index d0b1255df..8548f6740 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/city_vote.script +++ b/sku.0/sys.server/compiled/game/script/terminal/city_vote.script @@ -78,7 +78,7 @@ trigger OnInitialize() obj_id city_hall = getTopMostContainer(self); messageTo(city_hall, "registerVoteTerminal", outparams, 0.f, true); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } @@ -185,7 +185,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if(isGod(player)) mi.addSubMenu(menu, menu_info_types.SERVER_MENU6, SID_RESET_VOTING); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //------------------------------------------------ @@ -688,4 +688,4 @@ string convertInterval(int currentInterval) if(currentInterval == 2) return "Election Week"; return "error"; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/terminal/gcw_publish_gift_terminal.script b/sku.0/sys.server/compiled/game/script/terminal/gcw_publish_gift_terminal.script index e3357501c..fde0eb37f 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/gcw_publish_gift_terminal.script +++ b/sku.0/sys.server/compiled/game/script/terminal/gcw_publish_gift_terminal.script @@ -30,7 +30,7 @@ trigger OnDestroy() trigger OnInitialize() { - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } trigger OnGetAttributes(obj_id player, string[] names, string[] attribs) @@ -41,7 +41,7 @@ trigger OnGetAttributes(obj_id player, string[] names, string[] attribs) trigger OnObjectMenuRequest(obj_id player, menu_info mi) { menu_info_data data = mi.getMenuItemByType (menu_info_types.ITEM_USE); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } diff --git a/sku.0/sys.server/compiled/game/script/terminal/greeter.script b/sku.0/sys.server/compiled/game/script/terminal/greeter.script index e40312c26..76827045a 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/greeter.script +++ b/sku.0/sys.server/compiled/game/script/terminal/greeter.script @@ -442,7 +442,7 @@ trigger OnInitialize() if(hasObjVar(controller, vendor_lib.GREETER_CONVERSE) && getBooleanObjVar(controller, vendor_lib.GREETER_CONVERSE) == true) messageTo(self, "handleConverseWithOtherGreeter", null, GREETER_CONVERSATION_LOOP_TIME, false); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } trigger OnGiveItem(obj_id item, obj_id player) @@ -459,22 +459,22 @@ trigger OnObjectMenuRequest( obj_id player, menu_info mi ) blog("vendor.greeter.OnObjectMenuRequest init"); obj_id ownerId = getOwner(self); if(!isValidId(ownerId) || !exists(ownerId)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); blog("vendor.greeter.OnObjectMenuRequest Owner received"); obj_id pInv = utils.getInventoryContainer(player); if(!isValidId(pInv) || !exists(pInv)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); if(player != ownerId) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); if(!hasObjVar(self, vendor_lib.CNTRLR_GREETER_NONVENDOR_ID_OBJVAR)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); obj_id controller = getObjIdObjVar(self, vendor_lib.CNTRLR_GREETER_NONVENDOR_ID_OBJVAR); if(!isValidId(controller) || !exists(controller)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); blog("vendor.greeter.OnObjectMenuRequest validation complete, controller ID received"); @@ -483,7 +483,7 @@ trigger OnObjectMenuRequest( obj_id player, menu_info mi ) { // A person who is NOT our owner and is NOT a god has us in their inventory. BAD! messageTo(self, "handleDestroyGreeter", null, 0, false ); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //check for other greeters in area conversableGreeterInRange(self); @@ -505,7 +505,7 @@ trigger OnObjectMenuRequest( obj_id player, menu_info mi ) mi.addRootMenu(menu_info_types.SERVER_MENU2, SID_REMOVE_GREETER); blog("vendor.greeter.OnObjectMenuRequest Menu created"); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //------------------------------------------------ diff --git a/sku.0/sys.server/compiled/game/script/terminal/insurance.script b/sku.0/sys.server/compiled/game/script/terminal/insurance.script index f7b707ae2..7e773b2f4 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/insurance.script +++ b/sku.0/sys.server/compiled/game/script/terminal/insurance.script @@ -38,7 +38,7 @@ trigger OnInitialize() { destroyObject(self); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } // INSURANCE IS NO MORE, THIS SCRIPT SHOULD NO LONGER BE USED @@ -46,18 +46,18 @@ trigger OnInitialize() trigger OnObjectMenuRequest(obj_id player, menu_info mi) { if (isMob(self)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); menu_info_data mid = mi.getMenuItemByType(menu_info_types.ITEM_USE); if ( mid == null ) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } int mnu = mid.getId(); int sub_insure_all = mi.addSubMenu(mnu, menu_info_types.SERVER_MENU1, SID_MNU_INSURE_ALL); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/terminal/mission.script b/sku.0/sys.server/compiled/game/script/terminal/mission.script index 5e0d44bb4..2863f1cc6 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/mission.script +++ b/sku.0/sys.server/compiled/game/script/terminal/mission.script @@ -26,7 +26,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) { //int mnu = mi.addRootMenu (menu_info_types.SERVER_MISSION_OPTIONS, SID_MISSION_OPTIONS); int mnu = mi.addRootMenu (menu_info_types.MISSION_DETAILS, SID_MISSION_OPTIONS); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/terminal/nonvendor.script b/sku.0/sys.server/compiled/game/script/terminal/nonvendor.script index 65a91ead2..bf0d0db36 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/nonvendor.script +++ b/sku.0/sys.server/compiled/game/script/terminal/nonvendor.script @@ -41,10 +41,10 @@ const string_id SID_NO_USE_WHILE_DEAD = new string_id("player_structure", "wh trigger OnInitialize() { if(!isValidId(self)) - return SCRIPT_CONTINUE; + return super.OnInitialize(self); if(utils.hasScriptVar(self, "messageCompleted")) - return SCRIPT_CONTINUE; + return super.OnInitialize(self); if(!vendor_lib.validateNonVendorInStructure(self)) { @@ -56,7 +56,7 @@ trigger OnInitialize() messageTo(self, "handleDestroyNonVendor", msgparams, 0, false); CustomerServiceLog("tcg", "TCG NonVendor: "+self+" is about to be destroyed and given to the owner. The nonvendor is being destroyed (probably via structure terminal)."); } - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } @@ -104,18 +104,18 @@ trigger OnTransferred(obj_id sourceContainer, obj_id destContainer, obj_id trans trigger OnObjectMenuRequest( obj_id player, menu_info mi ) { if(!isValidId(player) || !exists(player)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); if(isIncapacitated(player) || isDead(player)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); blog("terminal.nonvendor.OnObjectMenuRequest init"); obj_id ownerId = getObjIdObjVar(self, vendor_lib.GREETER_OWNER_OBJVAR); if(!isValidId(ownerId) || !exists(ownerId)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); if(player != ownerId) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //------------------------------------------------ diff --git a/sku.0/sys.server/compiled/game/script/terminal/repair.script b/sku.0/sys.server/compiled/game/script/terminal/repair.script index f47f943ff..23dc3cf2f 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/repair.script +++ b/sku.0/sys.server/compiled/game/script/terminal/repair.script @@ -33,18 +33,18 @@ const string_id SID_MNU_REPAIR_ALL = new string_id("sui", "mnu_repair_all" trigger OnObjectMenuRequest(obj_id player, menu_info mi) { if (isMob(self)) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); menu_info_data mid = mi.getMenuItemByType(menu_info_types.ITEM_USE); if ( mid == null ) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } int mnu = mid.getId(); int repair_all = mi.addSubMenu(mnu, menu_info_types.SERVER_MENU1, SID_MNU_REPAIR_ALL); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) @@ -295,4 +295,4 @@ messageHandler handlePayRepairSuccess() } return SCRIPT_CONTINUE; -} \ No newline at end of file +} diff --git a/sku.0/sys.server/compiled/game/script/terminal/shipping.script b/sku.0/sys.server/compiled/game/script/terminal/shipping.script index 1ef949769..3cbfedc4b 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/shipping.script +++ b/sku.0/sys.server/compiled/game/script/terminal/shipping.script @@ -24,7 +24,7 @@ const string_id SID_SHIPPING_OPTIONS = new string_id("terminal_ui", "s trigger OnObjectMenuRequest(obj_id player, menu_info mi) { int mnu = mi.addRootMenu (menu_info_types.SERVER_SHIPPING_OPTIONS, SID_SHIPPING_OPTIONS); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_gcw_publish_gift.script b/sku.0/sys.server/compiled/game/script/terminal/terminal_gcw_publish_gift.script index 1dfb93472..81ba07ce6 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_gcw_publish_gift.script +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_gcw_publish_gift.script @@ -117,12 +117,12 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if(utils.isNestedWithinAPlayer(self) && getTemplateName(self).equals(WAR_TERMINAL_TEMPLATE)) { sendSystemMessage(player, SID_IN_HOUSE_ONLY); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } else if(!utils.isNestedWithinAPlayer(self) && getTemplateName(self).equals(WAR_INTELPAD_TEMPLATE)) { sendSystemMessage(player, SID_IN_INVENTORY_ONLY); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } } @@ -137,7 +137,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) updateGCWInfo(self); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //If the player is in god mode the player can use the terminal in their diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.script b/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.script index 6ac1550d8..b6a92092a 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.script +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.script @@ -182,14 +182,14 @@ trigger OnInitialize() if(!isIdValid(datapad) || !exists(datapad)) { - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } obj_id player = getContainedBy(datapad); if(!isIdValid(player) || !exists(player)) { - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } if(guild.hasElectionEnded(player)) @@ -197,7 +197,7 @@ trigger OnInitialize() guild.stopElection(player); } - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } //------------------------------------------------ @@ -298,7 +298,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) if (guildId == 0) { - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } const obj_id guildLeader = guildGetLeader(guildId); @@ -430,7 +430,7 @@ trigger OnObjectMenuRequest(obj_id player, menu_info mi) } } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } // ---------------------------------------------------------------------- diff --git a/sku.0/sys.server/compiled/game/script/terminal/travel.script b/sku.0/sys.server/compiled/game/script/terminal/travel.script index f2695075d..7d1d4e0be 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/travel.script +++ b/sku.0/sys.server/compiled/game/script/terminal/travel.script @@ -24,7 +24,7 @@ const string_id SID_TRAVEL_OPTIONS = new string_id("terminal_ui", "tra trigger OnObjectMenuRequest(obj_id player, menu_info mi) { int mnu = mi.addRootMenu (menu_info_types.SERVER_TRAVEL_OPTIONS, SID_TRAVEL_OPTIONS); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } trigger OnObjectMenuSelect(obj_id player, int item) diff --git a/sku.0/sys.server/compiled/game/script/terminal/vendor.script b/sku.0/sys.server/compiled/game/script/terminal/vendor.script index cfe49464d..b20900161 100644 --- a/sku.0/sys.server/compiled/game/script/terminal/vendor.script +++ b/sku.0/sys.server/compiled/game/script/terminal/vendor.script @@ -99,7 +99,7 @@ trigger OnInitialize() // Update our access fee. updateAccessFee( self ); - return SCRIPT_CONTINUE; + return super.OnInitialize(self); } //------------------------------------------------ @@ -289,7 +289,7 @@ trigger OnObjectMenuRequest( obj_id player, menu_info mi ) // Only show these options if the vendor is placed. obj_id inventory = getObjectInSlot( player, "inventory" ); if ( contains( inventory, self ) ) - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); int menu = mi.addRootMenu( menu_info_types.SERVER_MENU1, SID_VENDOR_CONTROL ); @@ -369,11 +369,11 @@ trigger OnObjectMenuRequest( obj_id player, menu_info mi ) // Destroy us. destroyObject( self ); - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } } - return SCRIPT_CONTINUE; + return super.OnObjectMenuRequest(self, player, mi); } //------------------------------------------------