`db1e11e`

undisclosed updates

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 1 month ago

SHA: db1e11ea17331e53dc5b54044b57cf0f6ba97399
Parents: 054467b
Tree: cc20753

2 changed files

Status	File	+	-
M	`js/entities.js`	311	233
M	`js/game.js`	53	12

js/entities.jsmodified

      this.bobSpeed = random(0.02, 0.04)
      this.bobAmount = 0
++    // Wind effect properties
++    this.windSway = 0 // Current sway amount
++    this.windSwayTarget = 0 // Target sway for smooth animation
++    this.windBob = 0 // Additional vertical movement from wind
++    this.basketSwing = 0 // For balloon basket swinging
++
      // Type-specific initialization
      if (this.type === 'balloon') {
        this.bobAmount = 8 // Balloons bob more
      let bob = sin(frameCount * this.bobSpeed + this.bobOffset) * this.bobAmount
      this.y = this.originalY + bob
++    // ENHANCED: Apply wind effects
++    if (windActive) {
++      // Different wind responses by type
++      if (this.type === 'balloon') {
++        // Balloons are highly affected by wind
++        this.windSwayTarget = cos(windDirection) * windStrength * 15 // Strong horizontal push
++        this.windBob =
++          sin(frameCount * 0.04 + this.bobOffset) * windStrength * 3 // Extra vertical movement
++
++        // Basket swings opposite to balloon movement (pendulum effect)
++        this.basketSwing =
++          -this.windSway * 0.5 + sin(frameCount * 0.06) * windStrength * 0.3
++
++        // Actually move the balloon
++        this.originalX += cos(windDirection) * windStrength * 0.08
++
++        // Keep on screen with stronger resistance at edges
++        if (this.originalX < 50) {
++          this.originalX = 50
++          this.windSwayTarget *= -0.5 // Bounce back effect
++        }
++        if (this.originalX > width - 50) {
++          this.originalX = width - 50
++          this.windSwayTarget *= -0.5
++        }
++      } else if (this.type === 'beetle') {
++        // Beetles resist but still affected
++        this.windSwayTarget = cos(windDirection) * windStrength * 3
++        // Fight against wind
++        this.driftAngle -= cos(windDirection) * windStrength * 0.01
++      } else if (this.type === 'leaf') {
++        // Leaves flutter in wind
++        this.windSwayTarget = cos(windDirection) * windStrength * 5
++        this.rotation += windStrength * 0.02 // Spin faster
++      }
++    } else {
++      // No wind, return to normal
++      this.windSwayTarget = 0
++      this.windBob = 0
++      this.basketSwing = 0
++    }
++
++    // Smooth sway animation
++    this.windSway = lerp(this.windSway, this.windSwayTarget, 0.1)
++
++    // Apply wind sway to position
++    this.x = this.originalX + this.windSway
++
++    // Apply wind bob to vertical position
++    this.y = this.originalY + bob + this.windBob
++
      // Beetle-specific drift
      if (this.type === 'beetle') {
        // Store initial position if not set
      // ============================================
      push()
++    // ENHANCED: Tilt balloon based on wind
++    if (windActive) {
++      rotate(this.windSway * 0.01)  // Slight tilt in wind direction
++    }
++
      // Balloon shadow
      noStroke()
      fill(0, 0, 0, 30)
      pop()
--      // BIGGER, MORE DETAILED BASKET
++    // BIGGER, MORE DETAILED BASKET WITH SWING
      push()
      translate(0, this.radius + 25)
++    // ENHANCED: Apply basket swing
++    if (windActive) {
++      rotate(this.basketSwing * 0.02)
++    }
++
      // Basket shadow
      noStroke()
      fill(0, 0, 0, 20)
      push()
      translate(0, this.radius + 28)
++    // ENHANCED: Ant holds on tighter in wind
++    if (windActive) {
++      rotate(-this.basketSwing * 0.01)  // Ant leans opposite to basket
++    }
++
      // Ant body
      fill(20)
      noStroke()
      // Sandbags hanging from basket (optional detail)
      push()
      translate(0, this.radius + 25)
++
++    // ENHANCED: Sandbags swing in wind
++    if (windActive) {
++      rotate(this.basketSwing * 0.03)
++    }
++
      fill(80, 60, 40)
      noStroke()
      ellipse(-12, 10, 4, 5)

js/game.jsmodified

    // PHASE 4B: Apply wind to airborne entities
    if (windActive) {
--    // Push spider if airborne
++    // Push spider if airborne - MORE DRAMATIC
      if (spider.isAirborne) {
--      spider.vel.x += cos(windDirection) * windStrength * 0.1
++      spider.vel.x += cos(windDirection) * windStrength * 0.15 // Increased from 0.1
++      spider.vel.y += sin(frameCount * 0.05) * windStrength * 0.03 // Add vertical wobble
+     }
--    // Push flies
++    // Push flies - MORE VISIBLE
      for (let fly of flies) {
        if (!fly.stuck && !fly.caught) {
--        fly.vel.x += cos(windDirection) * windStrength * 0.05
++        fly.vel.x += cos(windDirection) * windStrength * 0.08 // Increased from 0.05
++        fly.vel.y += sin(frameCount * 0.1 + fly.wingPhase) * windStrength * 0.02 // Turbulence
+       }
+     }
--    // Make webs sway
++    // ENHANCED: Make webs sway and stretch
      for (let strand of webStrands) {
        if (!strand.broken) {
--        strand.vibrate(windStrength * 0.5)
++        // Stronger vibration
++        strand.vibrate(windStrength * 0.8) // Increased from 0.5
++
++        // Apply lateral force to web path points for realistic sway
++        if (strand.path && strand.path.length > 2) {
++          for (let i = 1; i < strand.path.length - 1; i++) {
++            let point = strand.path[i]
++            // Middle points sway more than ends
++            let swayFactor = sin((i / strand.path.length) * PI)
++            point.x += cos(windDirection) * windStrength * swayFactor * 0.3
++            // Add some vertical movement too
++            point.y +=
++              sin(frameCount * 0.08 + i * 0.1) *
++              windStrength *
++              swayFactor *
++              0.15
++          }
++        }
++
          // Check if strand is overstretched and should break
--        if (strand.tension > 1.2 && windStrength > 3) {
++        if (strand.tension > 1.0 && windStrength > 4) {
--          if (random() < 0.01) {
++          // Lowered from 1.2
--            // Small chance per frame
++          if (random() < (0.02 * windStrength) / 5) {
++            // Increased chance based on wind strength
              strand.broken = true
              notifications.push(
                new Notification('Wind snapped a web!', color(255, 150, 100))
+             )
++            // Add dramatic snap particles
++            for (let j = 0; j < 8; j++) {
++              let p = new Particle(
++                strand.path[Math.floor(strand.path.length / 2)].x,
++                strand.path[Math.floor(strand.path.length / 2)].y
++              )
++              p.vel = createVector(
++                cos(windDirection) * random(3, 6),
++                random(-2, 2)
++              )
++              p.color = color(255, 255, 255)
++              p.size = random(2, 5)
++              particles.push(p)
++            }
+           }
+         }
+       }
  function startWindGust () {
    windActive = true
    windDirection = random() < 0.5 ? 0 : PI // Left or right
--  windStrength = random(2, 5) // Variable strength
++  windStrength = random(3, 6)  // Increased from (2, 5)
    windDuration = random(300, 600) // 5-10 seconds
    windTimer = 0
    windParticles = []
--  // Notification
++  // More dramatic notification
    let direction = windDirection === 0 ? '→' : '←'
++  let intensity = windStrength > 4.5 ? 'Strong' : windStrength > 3.5 ? 'Moderate' : 'Light'
    notifications.push(
--    new Notification(`Wind gust ${direction}`, color(200, 200, 255))
++    new Notification(`${intensity} wind gust ${direction}`, color(200, 200, 255))
+   )
++
++  // Screen shake for strong winds
++  if (windStrength > 4.5) {
++    screenShake = 5
++  }
+ }
  function updateWind () {