Fix #63 force redraw tooltips when stored material amount changes

Author: Scarabol

src/event/EventKeyEnum.ts

@@ -30,6 +30,7 @@ export const enum EventKey {
 
     // GUI command events
     COMMAND_TOOLTIP_CHANGE = 'command-tooltip-change',
+    COMMAND_TOOLTIP_FORCE_REDRAW = 'command-tooltip-force-redraw',
     COMMAND_TOOLTIP_HIDE = 'command-tooltip-hide',
     COMMAND_PLAY_SOUND = 'command-play-sound',
     COMMAND_CREATE_POWER_PATH = 'command-create-power-path',

src/event/EventTypeMap.ts

@@ -1,6 +1,6 @@
 import { AdvanceAfterRewardsEvent, BuildingsChangedEvent, DeselectAll, FollowerSetCanvasEvent, FollowerSetLookAtEvent, GuiBackButtonClicked, GuiBuildButtonClicked, GuiButtonBlinkEvent, GuiGetToolButtonClicked, GuiTrainRaiderButtonClicked, InitRadarMap, RaidersAmountChangedEvent, RaiderTrainingCompleteEvent, SelectionChanged, SelectionFrameChangeEvent, SetSpaceToContinueEvent, ShowGameResultEvent, ShowMissionAdvisorEvent, ShowMissionBriefingEvent, ShowOptionsEvent, UpdateRadarCamera, UpdateRadarEntityEvent, UpdateRadarSurface, UpdateRadarTerrain, VehicleUpgradeCompleteEvent } from './LocalEvents'
 import { AirLevelChanged, CavernDiscovered, DynamiteExplosionEvent, GameResultEvent, JobCreateEvent, LevelSelectedEvent, MaterialAmountChanged, MonsterEmergeEvent, MonsterLaserHitEvent, NerpMessageEvent, NerpSuppressArrowEvent, OreFoundEvent, RequestedRaidersChanged, RequestedVehiclesChanged, RestartGameEvent, ShootLaserEvent, ToggleAlarmEvent, UpdatePriorities, UsedCrystalsChanged, WorldLocationEvent } from './WorldEvents'
-import { CameraControl, CancelBuilding, CancelSurfaceJobs, ChangeBuildingPowerState, ChangeCameraEvent, ChangePreferences, ChangeTooltip, CreateClearRubbleJob, CreateDrillJob, CreateDynamiteJob, CreatePowerPath, CreateReinforceJob, DropBirdScarer, HideTooltip, MakeRubble, PickTool, PlaceFence, PlaySoundEvent, RaiderBeamUp, RaiderDrop, RaiderEat, RaiderUpgrade, RepairBuilding, RepairLava, SelectBuildMode, TrainRaider, UpgradeBuilding, UpgradeVehicle, VehicleBeamUp, VehicleCallMan, VehicleDriverGetOut, VehicleLoad, VehicleUnload } from './GuiCommand'
+import { CameraControl, CancelBuilding, CancelSurfaceJobs, ChangeBuildingPowerState, ChangeCameraEvent, ChangePreferences, ChangeTooltip, CreateClearRubbleJob, CreateDrillJob, CreateDynamiteJob, CreatePowerPath, CreateReinforceJob, DropBirdScarer, ForceRedrawTooltip, HideTooltip, MakeRubble, PickTool, PlaceFence, PlaySoundEvent, RaiderBeamUp, RaiderDrop, RaiderEat, RaiderUpgrade, RepairBuilding, RepairLava, SelectBuildMode, TrainRaider, UpgradeBuilding, UpgradeVehicle, VehicleBeamUp, VehicleCallMan, VehicleDriverGetOut, VehicleLoad, VehicleUnload } from './GuiCommand'
 
 export class BaseEvent {
     constructor(readonly type: keyof EventTypeMap) {
@@ -41,6 +41,7 @@ export interface DefaultEventMap {
     'advance-after-rewards': AdvanceAfterRewardsEvent
 
     'command-tooltip-change': ChangeTooltip
+    'command-tooltip-force-redraw': ForceRedrawTooltip
     'command-tooltip-hide': HideTooltip
     'command-play-sound': PlaySoundEvent
     'command-create-power-path': CreatePowerPath

src/event/GuiCommand.ts

@@ -30,6 +30,20 @@ export class ChangeTooltip extends BaseEvent {
     }
 }
 
+export class ForceRedrawTooltip extends BaseEvent {
+    tooltipKey: string
+
+    constructor(
+        public tooltipText: string,
+        readonly getTooltipTextImg: () => Promise<SpriteImage> = () => {
+            return TooltipSpriteBuilder.getTooltipSprite(this.tooltipText, 0)
+        },
+    ) {
+        super(EventKey.COMMAND_TOOLTIP_FORCE_REDRAW)
+        this.tooltipKey = tooltipText
+    }
+}
+
 export class HideTooltip extends BaseEvent {
     constructor(readonly tooltipText?: string) {
         super(EventKey.COMMAND_TOOLTIP_HIDE)

src/game/component/TooltipComponent.ts

@@ -1,6 +1,6 @@
 import { AbstractGameComponent, GameEntity } from '../ECS'
 import { SpriteImage } from '../../core/Sprite'
-import { ChangeTooltip } from '../../event/GuiCommand'
+import { ChangeTooltip, ForceRedrawTooltip } from '../../event/GuiCommand'
 import { TOOLTIP_DELAY_SFX, TOOLTIP_DELAY_TEXT_SCENE } from '../../params'
 
 export class TooltipComponent extends AbstractGameComponent {
@@ -13,4 +13,10 @@ export class TooltipComponent extends AbstractGameComponent {
         result.tooltipKey = this.tooltipText + this.entity // change key to make it unique per entity
         return result
     }
+
+    createForceRedrawEvent(): ForceRedrawTooltip {
+        const result = new ForceRedrawTooltip(this.tooltipText, this.getTextImg)
+        result.tooltipKey = this.tooltipText + this.entity // change key to make it unique per entity
+        return result
+    }
 }

src/game/model/building/BuildingSite.ts

@@ -108,11 +108,15 @@ export class BuildingSite {
         this.onSiteByType.getOrUpdate(item.entityType, () => []).push(item)
         this.worldMgr.entityMgr.removeEntity(item.entity)
         this.checkComplete()
+        const event = this.worldMgr.ecs.getComponents(this.entity).get(TooltipComponent)?.createForceRedrawEvent()
+        if (event) EventBroker.publish(event)
     }
 
     removeItem(item: MaterialEntity) {
         this.unAssign(item)
         this.onSiteByType.getOrUpdate(item.entityType, () => []).remove(item)
+        const event = this.worldMgr.ecs.getComponents(this.entity).get(TooltipComponent)?.createForceRedrawEvent()
+        if (event) EventBroker.publish(event)
     }
 
     checkComplete() {

src/gui/main/IconPanelButton.ts

@@ -1,5 +1,5 @@
 import { Button } from '../base/Button'
-import { ChangeTooltip } from '../../event/GuiCommand'
+import { ChangeTooltip, HideTooltip } from '../../event/GuiCommand'
 import { DEV_MODE, TOOLTIP_DELAY_SFX } from '../../params'
 import { SpriteContext, SpriteImage } from '../../core/Sprite'
 import { EntityType, getEntityTypeByName } from '../../game/model/EntityType'
@@ -88,7 +88,14 @@ export class IconPanelButton extends Button {
         const targetState = this.isDisabled()
         const stateChanged = this.disabled !== targetState
         this.disabled = targetState
-        if (stateChanged && autoRedraw) this.notifyRedraw()
+        if (stateChanged) {
+            if (autoRedraw) this.notifyRedraw()
+            if (this.disabled) {
+                this.publishEvent(new HideTooltip(this.tooltip))
+            } else {
+                this.publishEvent(new HideTooltip(this.tooltipDisabled))
+            }
+        }
         return stateChanged
     }
 

src/gui/main/select/SelectBuildingPanel.ts

@@ -1,5 +1,5 @@
 import { EventKey } from '../../../event/EventKeyEnum'
-import { BeamUpBuilding, ChangeBuildingPowerState, ChangeTooltip, RepairBuilding, UpgradeBuilding } from '../../../event/GuiCommand'
+import { BeamUpBuilding, ChangeBuildingPowerState, ChangeTooltip, ForceRedrawTooltip, RepairBuilding, UpgradeBuilding } from '../../../event/GuiCommand'
 import { SelectionChanged } from '../../../event/LocalEvents'
 import { Panel } from '../../base/Panel'
 import { IconPanelToggleButton } from '../IconPanelToggleButton'
@@ -51,6 +51,13 @@ export class SelectBuildingPanel extends IconSubPanel {
             this.buildingCanUpgrade = event.buildingCanUpgrade
             this.buildingMissingOreForUpgrade = event.buildingMissingOreForUpgrade
             this.updateAllButtonStates()
+            if (this.buildingMissingOreForUpgrade) {
+                this.iconPanelButtons.forEach((b) => {
+                    b.publishEvent(new ForceRedrawTooltip(upgradeItem.tooltipDisabled, () => {
+                        return TooltipSpriteBuilder.getBuildingMissingOreForUpgradeTooltipSprite(this.buildingMissingOreForUpgrade)
+                    }))
+                })
+            }
         })
         this.registerEventListener(EventKey.MATERIAL_AMOUNT_CHANGED, () => {
             this.updateAllButtonStates()

src/screen/layer/TooltipLayer.ts

@@ -1,5 +1,5 @@
 import { EventKey } from '../../event/EventKeyEnum'
-import { ChangeTooltip, HideTooltip } from '../../event/GuiCommand'
+import { ChangeTooltip, ForceRedrawTooltip, HideTooltip } from '../../event/GuiCommand'
 import { ScreenLayer } from './ScreenLayer'
 import { CURSOR_MAX_HEIGHT, NATIVE_SCREEN_HEIGHT, NATIVE_SCREEN_WIDTH } from '../../params'
 import { clearTimeoutSafe } from '../../core/Util'
@@ -37,6 +37,10 @@ export class TooltipLayer extends ScreenLayer {
                 this.tooltipTimeoutSfx = setTimeout(() => SoundManager.playVoice(tooltipSfx), event.timeoutSfx)
             }
         })
+        EventBroker.subscribe(EventKey.COMMAND_TOOLTIP_FORCE_REDRAW, async (event: ForceRedrawTooltip) => {
+            if (this.cursorLeft || !this.active || event.tooltipKey !== this.lastTooltipKey) return
+            this.changeTooltipImage(await event.getTooltipTextImg())
+        })
         EventBroker.subscribe(EventKey.COMMAND_TOOLTIP_HIDE, (event: HideTooltip) => {
             if (event.tooltipText && event.tooltipText !== this.lastTooltipKey) return
             this.removeTooltip()