`5bc00e6`

phantom web fix, balloon rethink

Authored by

espadonne 8 months ago

SHA: 5bc00e6d2a1624a86c15700be5602f9bc03d53b6
Parents: 92578dd
Tree: de13afb

2 changed files

Status	File	+	-
M	`js/entities.js`	83	16
M	`js/game.js`	59	15

js/entities.jsmodified

      this.land()
+   }
--  land () {
++  land() {
--    this.vel.mult(0)
++        this.vel.mult(0);
--    this.isAirborne = false
++        this.isAirborne = false;
--    this.canJump = true
++        this.canJump = true;
++
++        // FIX: Check if we're actually landing on something valid
++        let landedOnSomething = false;
++
++        // Check if on ground
++        if (this.pos.y >= height - this.radius - 5) {
++            landedOnSomething = true;
++        }
++
++        // Check if on an obstacle
++        for (let obstacle of obstacles) {
++            if (this.checkObstacleCollision(obstacle)) {
++                landedOnSomething = true;
++                break;
++            }
++        }
++
++        // Check if on a web strand
++        for (let strand of webStrands) {
++            if (strand !== currentStrand && !strand.broken && this.checkStrandCollision(strand)) {
++                landedOnSomething = true;
++                break;
++            }
++        }
++
++        // Check if on home branch
++        if (window.homeBranch) {
++            let branch = window.homeBranch;
++            let branchStart = Math.min(branch.startX, branch.endX);
++            let branchEnd = Math.max(branch.startX, branch.endX);
++
++            if (this.pos.x >= branchStart - 10 && this.pos.x <= branchEnd + 10) {
++                let t = (this.pos.x - branchStart) / (branchEnd - branchStart);
++                t = constrain(t, 0, 1);
++                let branchTopThickness = lerp(branch.thickness * 0.9, branch.thickness * 0.35, t);
++                let branchSurfaceY = branch.y - branchTopThickness;
++                let angleCorrection = (this.pos.x - branchStart) * branch.angle;
++                branchSurfaceY += angleCorrection;
++
++                if (abs(this.pos.y - branchSurfaceY) < this.radius + 10) {
++                    landedOnSomething = true;
++                }
++            }
++        }
++
++        // FIX: If we're deploying web but didn't land on anything valid, destroy the web
++        if (currentStrand && isDeployingWeb && (spacePressed || touchHolding)) {
++            if (landedOnSomething) {
++                // Valid landing - finalize the web
++                currentStrand.end = this.pos.copy();
++                if (!currentStrand.path || currentStrand.path.length === 0) {
++                    currentStrand.path = [this.pos.copy()];
++                } else {
++                    currentStrand.path.push(this.pos.copy());
++                }
++                webNodes.push(new WebNode(this.pos.x, this.pos.y));
++            } else {
++                // Invalid landing in mid-air - destroy the web!
++                if (webStrands.length > 0 && webStrands[webStrands.length - 1] === currentStrand) {
++                    webStrands.pop(); // Remove the invalid strand
++
++                    // Create poof particles
++                    for (let i = 0; i < 8; i++) {
++                        let p = new Particle(this.pos.x, this.pos.y);
++                        p.color = color(255, 255, 255, 150);
++                        p.vel = createVector(random(-3, 3), random(-3, 3));
++                        p.size = 4;
++                        particles.push(p);
++                    }
++
++                    // Notification
++                    if (notifications.length < 3) {
++                        notifications.push(new Notification("Web needs anchor point!", color(255, 150, 150)));
++                    }
++                }
++            }
++        }
--    if (currentStrand && isDeployingWeb && (spacePressed || touchHolding)) {
++        currentStrand = null;
--      // Ensure the strand has a valid end and a final node on landing
++        isDeployingWeb = false;
--      currentStrand.end = this.pos.copy()
--      if (!currentStrand.path || currentStrand.path.length === 0) {
--        currentStrand.path = [this.pos.copy()]
--      } else {
--        currentStrand.path.push(this.pos.copy())
--      }
--      webNodes.push(new WebNode(this.pos.x, this.pos.y))
+     }
--    currentStrand = null
--    isDeployingWeb = false
--  }
    display () {
      push()

js/game.jsmodified

+   }
+ }
--function keyReleased () {
++function keyReleased() {
--  if (key === ' ') {
++    if (key === ' ') {
--    spacePressed = false
++        spacePressed = false;
--    isDeployingWeb = false
++
--    return false
++        // FIX: Check if web is floating when released
--  }
++        if (isDeployingWeb && currentStrand && spider.isAirborne) {
++            // Spider is still airborne - this would create a floating web
++            // Remove the incomplete strand
++            if (webStrands.length > 0 && webStrands[webStrands.length - 1] === currentStrand) {
++                webStrands.pop();
++
++                // Poof effect
++                for (let i = 0; i < 5; i++) {
++                    let p = new Particle(spider.pos.x, spider.pos.y);
++                    p.color = color(255, 200, 200, 100);
++                    p.vel = createVector(random(-2, 2), random(-2, 2));
++                    p.size = 3;
++                    particles.push(p);
++                }
++            }
++        }
++
++        isDeployingWeb = false;
++        currentStrand = null;
++        return false;
++    }
+ }
  function mousePressed () {
    return false // Prevent default
+ }
--function touchEnded () {
++function touchEnded() {
--  touchHolding = false
++    touchHolding = false;
--
++    touchProcessing = false;
--  // Stop web deployment when releasing touch
++
--  if (isDeployingWeb && spider.isAirborne) {
++    // Power jump handling...
--    isDeployingWeb = false
++    if (chargingJump && !spider.isAirborne) {
--  }
++        // ... existing power jump code ...
--
++    }
--  return false // Prevent default
++    chargingJump = false;
++    jumpChargeTime = 0;
++
++    // FIX: Check if web is floating when touch released
++    if (isDeployingWeb && currentStrand && spider.isAirborne) {
++        // Spider is still airborne - this would create a floating web
++        // Remove the incomplete strand
++        if (webStrands.length > 0 && webStrands[webStrands.length - 1] === currentStrand) {
++            webStrands.pop();
++
++            // Poof effect
++            for (let i = 0; i < 5; i++) {
++                let p = new Particle(spider.pos.x, spider.pos.y);
++                p.color = color(255, 200, 200, 100);
++                p.vel = createVector(random(-2, 2), random(-2, 2));
++                p.size = 3;
++                particles.push(p);
++            }
++        }
++    }
++
++    isDeployingWeb = false;
++    currentStrand = null;
++
++    return false;
+ }
  function windowResized () {