From 4ea80c50dad2d73c4630cfa43c5a764d137369ce Mon Sep 17 00:00:00 2001 From: chardub Date: Mon, 24 Mar 2025 13:11:02 -0400 Subject: [PATCH] Fixes quest icon lingering on map transfers --- Data/Map029.rxdata | Bin 60543 -> 60588 bytes Data/Map462.rxdata | Bin 14882 -> 15295 bytes Data/MapInfos.rxdata | Bin 42713 -> 42713 bytes .../003_Game processing/002_Scene_Map.rb | 9 +++++++++ Data/Scripts/052_AddOns/GeneralUtils.rb | 12 +++++++++++- Data/Scripts/052_AddOns/QuestLogScript.rb | 7 ++++++- Data/Scripts/052_AddOns/quest_icons.rb | 8 ++++---- Data/System.rxdata | Bin 31777 -> 31775 bytes 8 files changed, 30 insertions(+), 6 deletions(-) diff --git a/Data/Map029.rxdata b/Data/Map029.rxdata index d0d8dd7168e3a1bcbb0f6cb82887f42e81f55c0a..5b0b3d3a327cad7658b0ab96ed121e2610eefd11 100644 GIT binary patch literal 60588 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 aO4TZ{{ptSfD$66x#od9M1y-rf#Qq-vfqS6< literal 60543 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 diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb index cdae11475..63bec0c5f 100644 --- a/Data/Scripts/003_Game processing/002_Scene_Map.rb +++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb @@ -81,6 +81,14 @@ class Scene_Map $game_switches[SWITCH_ILEX_FOREST_SPOOKED_POKEMON] = false end + def clear_quest_icons() + for sprite in $scene.spriteset.character_sprites + if sprite.is_a?(Sprite_Character) && sprite.questIcon + sprite.removeQuestIcon + end + end + end + def transfer_player(cancelVehicles = true) reset_switches_for_map_transfer() $game_temp.player_transferring = false @@ -88,6 +96,7 @@ class Scene_Map autofade($game_temp.player_new_map_id) pbBridgeOff @spritesetGlobal.playersprite.clearShadows + clear_quest_icons() if $game_map.map_id != $game_temp.player_new_map_id $MapFactory.setup($game_temp.player_new_map_id) end diff --git a/Data/Scripts/052_AddOns/GeneralUtils.rb b/Data/Scripts/052_AddOns/GeneralUtils.rb index 700c2cfc0..867f199d7 100644 --- a/Data/Scripts/052_AddOns/GeneralUtils.rb +++ b/Data/Scripts/052_AddOns/GeneralUtils.rb @@ -507,4 +507,14 @@ def new_spritepack_was_released() return true end return false -end \ No newline at end of file +end + + +def get_spritecharacter_for_event(event_id) + for sprite in $scene.spriteset.character_sprites + if sprite.character.id == event_id + return sprite + end + end +end + diff --git a/Data/Scripts/052_AddOns/QuestLogScript.rb b/Data/Scripts/052_AddOns/QuestLogScript.rb index 6ad0c8841..b74184d29 100644 --- a/Data/Scripts/052_AddOns/QuestLogScript.rb +++ b/Data/Scripts/052_AddOns/QuestLogScript.rb @@ -107,7 +107,7 @@ QUESTS = { 11 => Quest.new(11, "Powering the Lighthouse", "Catch some Voltorb to power up the lighthouse", QuestBranchHotels, "BW (43)", "Vermillion City", HotelQuestColor), "vermillion_3" => Quest.new("vermillion_3", "Seafood Cocktail ", "Get some steamed Krabby legs from the S.S. Anne's kitchen and bring them back to the hotel before they get cold", QuestBranchHotels, "BW (36)", "Vermillion City", HotelQuestColor), "vermillion_field_1" => Quest.new("vermillion_field_1", "Building Materials ", "Get some wooden planks from Viridian City and some Bricks from Pewter City.", QuestBranchField, "BW (36)", "Vermillion City", FieldQuestColor), - 64 => Quest.new(64, "Waiter on the Water", "The S.S. Anne waiter wants you to take restaurant orders while he went to get a replacement cake.", QuestBranchField, "BW (53)", "S.S. Anne", FieldQuestColor), + "vermillion_field_2" => Quest.new("vermillion_field_2", "Waiter on the Water", "The S.S. Anne waiter wants you to take restaurant orders while he went to get a replacement cake.", QuestBranchField, "BW (53)", "S.S. Anne", FieldQuestColor), #Celadon City 14 => Quest.new(14, "Sun or Moon", "Show the Pokémon that Eevee evolves when exposed to a Moon or Sun stone to help the scientist with her research.", QuestBranchHotels, "BW (82)", "Celadon City", HotelQuestColor), @@ -203,6 +203,8 @@ def pbAcceptNewQuest(id, bubblePosition = 20, show_description=true) title = QUESTS[id].name description = QUESTS[id].desc showNewQuestMessage(title,description,show_description) + character_sprite = get_spritecharacter_for_event(@event_id) + character_sprite.removeQuestIcon if character_sprite pbAddQuest(id) end @@ -238,6 +240,9 @@ def finishQuest(id, silent=false) pbSetQuest(id, true) + character_sprite = get_spritecharacter_for_event(@event_id) + character_sprite.removeQuestIcon if character_sprite + # character_sprite = $scene.spriteset.character_sprites[@event_id] # echoln character_sprite # if character_sprite diff --git a/Data/Scripts/052_AddOns/quest_icons.rb b/Data/Scripts/052_AddOns/quest_icons.rb index 6577c3044..120cad38a 100644 --- a/Data/Scripts/052_AddOns/quest_icons.rb +++ b/Data/Scripts/052_AddOns/quest_icons.rb @@ -9,9 +9,9 @@ class Sprite_Character alias questIcon_init initialize def initialize(viewport, character = nil) questIcon_init(viewport,character) - @quest_switch = detectQuestSwitch(character) - if @quest_switch - echoln "balablbi #{@quest_switch}" + quest_id = detectQuestSwitch(character) + if quest_id + echoln "balablbi #{quest_id}" addQuestMarkerToSprite end end @@ -20,7 +20,7 @@ class Sprite_Character def update questIcon_update positionQuestIndicator if @questIcon - removeQuestIcon if @questIcon && isQuestAlreadyAccepted?(@quest_switch) + #removeQuestIcon if @questIcon && isQuestAlreadyAccepted?(@quest_switch) end # Event name must contain questNPC(x) for a quest icon to be displayed diff --git a/Data/System.rxdata b/Data/System.rxdata index 97eecde4045c679c23ec21625bbb209c451eb89a..f2a895c1ce62b099853368f33233762444318e56 100644 GIT binary patch delta 39 xcmV+?0NDSb_yM2z0kGd34du+=1v(EvWpiU;aAlLgc^R_>9r9ZNAhY^-Cj)Js5b*#2 delta 40 wcmbRLgK^;x#trvncs!S~FkA6Eq!uS97ECUvmfFlJ`ze~4=^W$c9~J7%07>l+PXGV_