`5a6a9e7`

improve donnyt and ollie interactions (don't always grab attention)

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 5a6a9e74a7a064ca09667cb3d16a0d9c727a829b
Parents: eef876c
Tree: 8373eea

6 changed files

Status	File	+	-
M	`src/renderers/three/gameState.js`	93	0
M	`src/renderers/three/index.js`	4	1
M	`src/renderers/three/narwhal.js`	9	0
M	`src/renderers/three/octopus.js`	9	0
M	`src/renderers/three/shop/items.js`	5	0
M	`src/renderers/three/shop/shopUI.js`	4	0

src/renderers/three/gameState.jsmodified

  const gameState = {
    capturedKoi: parseInt(localStorage.getItem(STORAGE_KEY) || '0'),
++  // Shop approach tracking - only approach Doug when there's a reason
++  shopApproach: {
++    // First emergence this session - creatures should greet player
++    firstEmergence: {
++      donny: true,
++      ollie: true
++    },
++    // Track which items player could afford before last koi capture
++    previousAffordableIds: new Set(),
++    // Flag: player can now afford something new
++    hasNewAffordableItem: false,
++    // Items catalog reference (set by initShopTracking)
++    allItems: null,
++    // Inventory reference for checking owned items
++    inventory: null
++  },
++
++  // Initialize shop tracking with items and inventory references
++  initShopTracking(allItems, inventory) {
++    this.shopApproach.allItems = allItems
++    this.shopApproach.inventory = inventory
++    // Initialize previous affordable set based on current koi
++    this.updateAffordableItems()
++  },
++
++  // Get all purchasable (not owned) items player can afford
++  getAffordableItemIds() {
++    const { allItems, inventory } = this.shopApproach
++    if (!allItems || !inventory) return new Set()
++
++    const affordable = new Set()
++    for (const item of allItems) {
++      // Must not already own it and must be able to afford it
++      if (!inventory.owns(item.id) && item.price <= this.capturedKoi) {
++        affordable.add(item.id)
++      }
++    }
++    return affordable
++  },
++
++  // Update affordable items and check if player unlocked something new
++  updateAffordableItems() {
++    const currentAffordable = this.getAffordableItemIds()
++    const { previousAffordableIds } = this.shopApproach
++
++    // Check if any new items became affordable
++    for (const id of currentAffordable) {
++      if (!previousAffordableIds.has(id)) {
++        this.shopApproach.hasNewAffordableItem = true
++        break
++      }
++    }
++
++    // Update the previous set
++    this.shopApproach.previousAffordableIds = currentAffordable
++  },
++
++  // Check if a creature should approach Doug
++  // Returns true on first emergence or if player can afford something new
++  shouldCreatureApproach(creature) {
++    const { firstEmergence, hasNewAffordableItem } = this.shopApproach
++
++    // First emergence this session
++    if (firstEmergence[creature]) {
++      return true
++    }
++
++    // Player unlocked a new affordable item
++    if (hasNewAffordableItem) {
++      return true
++    }
++
++    return false
++  },
++
++  // Mark that a creature has approached (used after shop interaction starts)
++  markApproachComplete(creature) {
++    // Clear first emergence flag for this creature
++    this.shopApproach.firstEmergence[creature] = false
++
++    // Clear the new affordable flag (both creatures share this trigger)
++    this.shopApproach.hasNewAffordableItem = false
++  },
++
++  // Called when player purchases an item - recalculate affordable items
++  onPurchase() {
++    this.updateAffordableItems()
++  },
++
    addKoi(n = 1) {
      this.capturedKoi += n
      this.save()
      this.notifyListeners()
++    // Check if new items became affordable
++    this.updateAffordableItems()
    },
    spendKoi(n) {
        this.capturedKoi -= n
        this.save()
        this.notifyListeners()
++      // Recalculate affordable items after spending
++      this.updateAffordableItems()
        return true
+     }
      return false

src/renderers/three/index.jsmodified

  import { showDialog, closeDialog, isDialogOpen } from './shop/dialogUI.js'
  import { getDialogForCharacter, getReturnDialog } from './shop/dialogScripts.js'
  import inventory from './shop/inventory.js'
--import { getItem, CHARACTERS } from './shop/items.js'
++import { getItem, CHARACTERS, getAllItems } from './shop/items.js'
  let scene, camera, renderer, composer, outlinePass
  let doug, pond, breadManager, donny, koiSchool, ollie, placementManager
    placementManager = new PlacementManager(scene, pond, camera, toonGradient)
    placementManager.initForbiddenZones(pond.getInitialForbiddenZones())
++  // Initialize shop approach tracking (for smart creature behavior)
++  gameState.initShopTracking(getAllItems(), inventory)
++
    // Post-processing
    composer = new EffectComposer(renderer)
    composer.addPass(new RenderPass(scene, camera))

src/renderers/three/narwhal.jsmodified

  // Donny the Narwhal - distinguished gentleman of the deep
  import * as THREE from 'three'
++import gameState from './gameState.js'
  export function createDonny(scene, gradientMap) {
    const group = new THREE.Group()
    }
    // Try to trigger shop approach (called from main loop)
++  // Only approaches Doug on first emergence or when player unlocked new affordable items
    function tryTriggerShop(koiCount, pond, doug) {
      if (state.shopCooldown > 0) return false
      if (koiCount < SHOP_KOI_THRESHOLD) return false
++    // Check if there's a reason to approach Doug
++    if (!gameState.shouldCreatureApproach('donny')) {
++      return false
++    }
++
      // If waiting, do full approach sequence
      if (state.mode === 'waiting') {
        startShopApproach(pond, doug)
++      gameState.markApproachComplete('donny')
        return true
      }
        state.mode = 'shop_ready'
        state.shopMode = true
        state.timer = 0
++      gameState.markApproachComplete('donny')
        if (state.onShopReady) {
          state.onShopReady('donny')
        }

src/renderers/three/octopus.jsmodified

  // Ollie the Octopus - curious inspector of the pond
  import * as THREE from 'three'
++import gameState from './gameState.js'
  export function createOllie(scene, gradientMap) {
    const group = new THREE.Group()
    }
    // Try to trigger shop approach
++  // Only approaches Doug on first emergence or when player unlocked new affordable items
    function tryTriggerShop(koiCount, pond, doug) {
      if (state.shopCooldown > 0) return false
      if (koiCount < SHOP_KOI_THRESHOLD) return false
++    // Check if there's a reason to approach Doug
++    if (!gameState.shouldCreatureApproach('ollie')) {
++      return false
++    }
++
      // If waiting, do full approach sequence
      if (state.mode === 'waiting') {
        startShopApproach(pond, doug)
++      gameState.markApproachComplete('ollie')
        return true
      }
        state.mode = 'shop_ready'
        state.shopMode = true
        state.timer = 0
++      gameState.markApproachComplete('ollie')
        if (state.onShopReady) {
          state.onShopReady('ollie')
        }

src/renderers/three/shop/items.jsmodified

  export function getItem(itemId) {
    return OUTFITS[itemId] || BUILDINGS[itemId] || null
+ }
++
++// Get all purchasable items (outfits + buildings)
++export function getAllItems() {
++  return [...Object.values(OUTFITS), ...Object.values(BUILDINGS)]
++}

src/renderers/three/shop/shopUI.jsmodified

        if (action === 'buy') {
          if (gameState.spendKoi(item.price)) {
            inventory.purchase(itemId)
++          // Recalculate affordable items after purchase
++          gameState.onPurchase()
            // Auto-equip after buying (this also unequips same-type items)
            const unequippedIds = inventory.equip(item.character, itemId)
            // Notify about unequipped items first
        if (action === 'buy') {
          if (gameState.spendKoi(item.price)) {
            inventory.purchase(itemId)
++          // Recalculate affordable items after purchase
++          gameState.onPurchase()
            if (onPurchaseCallback) onPurchaseCallback(item)
            playPurchase()
            updateShopContent()