Addtional Map with New Content

assets/_saved/image_load_order.txt → assets/_saved/picture_load_order.txt

@@ -119,6 +119,22 @@ sprites/can_control_default_6.png
 sprites/can_control_default_7.png
 sprites/can_control_default_8.png
 sprites/can_control_default_9.png
+sprites/can_pull_default_0.png
+sprites/can_pull_default_1.png
+sprites/can_pull_default_10.png
+sprites/can_pull_default_11.png
+sprites/can_pull_default_12.png
+sprites/can_pull_default_13.png
+sprites/can_pull_default_14.png
+sprites/can_pull_default_15.png
+sprites/can_pull_default_2.png
+sprites/can_pull_default_3.png
+sprites/can_pull_default_4.png
+sprites/can_pull_default_5.png
+sprites/can_pull_default_6.png
+sprites/can_pull_default_7.png
+sprites/can_pull_default_8.png
+sprites/can_pull_default_9.png
 sprites/can_push_default_0.png
 sprites/can_push_default_1.png
 sprites/can_push_default_10.png
@@ -135,6 +151,22 @@ sprites/can_push_default_6.png
 sprites/can_push_default_7.png
 sprites/can_push_default_8.png
 sprites/can_push_default_9.png
+sprites/can_riserdown_default_0.png
+sprites/can_riserdown_default_1.png
+sprites/can_riserdown_default_10.png
+sprites/can_riserdown_default_11.png
+sprites/can_riserdown_default_12.png
+sprites/can_riserdown_default_13.png
+sprites/can_riserdown_default_14.png
+sprites/can_riserdown_default_15.png
+sprites/can_riserdown_default_2.png
+sprites/can_riserdown_default_3.png
+sprites/can_riserdown_default_4.png
+sprites/can_riserdown_default_5.png
+sprites/can_riserdown_default_6.png
+sprites/can_riserdown_default_7.png
+sprites/can_riserdown_default_8.png
+sprites/can_riserdown_default_9.png
 sprites/can_stand_default_0.png
 sprites/can_stand_default_1.png
 sprites/can_stand_default_10.png
@@ -211,7 +243,13 @@ sprites/noisemaker.png
 sprites/dopefish_lives.png
 sprites/door.png
 sprites/police.png
+sprites/riser_large_down_0.png
+sprites/riser_large_down_1.png
+sprites/riser_large_downstand_0.png
+sprites/riser_large_downstand_1.png
 sprites/riser_large_idle.png
+sprites/riser_large_idledown.png
+sprites/riser_large_idledownstand.png
 sprites/riser_large_idlestand.png
 sprites/riser_large_inactive.png
 sprites/riser_large_left_0.png
@@ -539,7 +577,13 @@ sprites/questionblock_hit_4.png
 sprites/questionblock_hit_5.png
 sprites/questionblock_hit_6.png
 sprites/questionblock_hit_7.png
+sprites/riser_small_down_0.png
+sprites/riser_small_down_1.png
+sprites/riser_small_downstand_0.png
+sprites/riser_small_downstand_1.png
 sprites/riser_small_idle.png
+sprites/riser_small_idledown.png
+sprites/riser_small_idledownstand.png
 sprites/riser_small_idlestand.png
 sprites/riser_small_inactive.png
 sprites/riser_small_left_0.png

assets/sprites/_src/rotator.sh

@@ -17,7 +17,7 @@ steps=30
 size=64
 minwidth=4
 
-images="can_carry can_control can_push can_stand can_switch_level"
+images="can_carry can_control can_push can_stand can_switch_level can_pull can_riserdown"
 
 for i in $(seq 0 $((steps/2))); do
 	width=$(echo "c(8 * a(1) * $i / $steps) * $size" | bc -l)

cmd/dumpcps/main.go

@@ -22,7 +22,7 @@ import (
 	"github.com/divVerent/aaaaxy/internal/flag"
 	"github.com/divVerent/aaaaxy/internal/level"
 	"github.com/divVerent/aaaaxy/internal/log"
-	m "github.com/divVerent/aaaaxy/internal/math"
+	m "github.com/divVerent/aaaaxy/internal/m"
 	"github.com/divVerent/aaaaxy/internal/propmap"
 	"github.com/divVerent/aaaaxy/internal/vfs"
 )

internal/game/interfaces/actionpresseder.go

@@ -21,4 +21,5 @@ import (
 type ActionPresseder interface {
 	engine.EntityImpl
 	ActionPressed() bool
+	GetUpDown() int
 }

internal/game/player/player.go

@@ -52,6 +52,7 @@ type Player struct {
 	JumpingUp      bool
 	LookUp         bool
 	LookDown       bool
+	LookPressTime  time.Time
 	Respawning     bool
 	WasOnGround    bool
 	PrevVelocity   m.Delta
@@ -488,12 +489,21 @@ func (p *Player) LookPos() m.Pos {
 		X: p.Entity.Rect.Origin.X + PlayerEyeDX,
 		Y: p.LastGroundPos.Y + p.eyeDY(),
 	}
+
 	if p.LookUp {
-		focus.Y -= LookDistance
+		if time.Since(p.LookPressTime) > 125*time.Millisecond { // Delay movement
+			focus.Y -= LookDistance
+		}
 	}
 	if p.LookDown {
-		focus.Y += LookDistance
+		if time.Since(p.LookPressTime) > 125*time.Millisecond { // Delay movement
+			focus.Y += LookDistance
+		}
 	}
+	if !p.LookUp && !p.LookDown {
+		p.LookPressTime = time.Now()
+	}
+
 	return focus
 }
 
@@ -523,6 +533,20 @@ func (p *Player) ActionPressed() bool {
 	return input.Action.Held
 }
 
+func (p *Player) GetUpDown() int {
+	if p.Goal != nil {
+		return 0
+	}
+
+	result := 0
+	if input.Up.Held {
+		result += 1
+	} else if input.Down.Held {
+		result -= 1
+	}
+	return result
+}
+
 func (p *Player) SetVelocityForJump(velocity m.Delta) {
 	p.Physics.SetVelocityForJump(velocity)
 	p.JumpingUp = false

internal/game/riser/riser.go

@@ -34,7 +34,9 @@ type riserState int
 const (
 	Inactive riserState = iota
 	IdlingUp
+	IdlingDown
 	MovingUp
+	MovingDown
 	MovingLeft
 	MovingRight
 	GettingCarried
@@ -49,6 +51,7 @@ type Riser struct {
 	CarriedSize m.Delta
 
 	State riserState
+	RiserDown bool
 
 	Anim      animation.State
 	FadeFrame int
@@ -96,7 +99,7 @@ const (
 	// UpSpeed is the speed the riser moves upwards when the player is standing on it.
 	UpSpeed = 60 * constants.SubPixelScale / engine.GameTPS
 
-	// SideSpeed is the speed of the riser when pushed away.
+	// SideSpeed is the speed of the riser when pushed away/pulled closer.
 	SideSpeed = 60 * constants.SubPixelScale / engine.GameTPS
 
 	// FadeFrames is how many frames risers take to fade in or out.
@@ -171,6 +174,12 @@ func (r *Riser) Spawn(w *engine.World, sp *level.SpawnableProps, e *engine.Entit
 			NextInterval:  16,
 			NextAnim:      "idle",
 		},
+		"idledown": {
+			Frames:        1,
+			FrameInterval: 16,
+			NextInterval:  16,
+			NextAnim:      "idledown",
+		},
 		"left": {
 			Frames:        2,
 			FrameInterval: 16,
@@ -189,12 +198,24 @@ func (r *Riser) Spawn(w *engine.World, sp *level.SpawnableProps, e *engine.Entit
 			NextInterval:  32,
 			NextAnim:      "up",
 		},
+		"down": {
+			Frames:        2,
+			FrameInterval: 16,
+			NextInterval:  32,
+			NextAnim:      "down",
+		},
 		"idlestand": {
 			Frames:        1,
 			FrameInterval: 16,
 			NextInterval:  16,
 			NextAnim:      "idlestand",
 		},
+		"idledownstand": {
+			Frames:        1,
+			FrameInterval: 16,
+			NextInterval:  16,
+			NextAnim:      "idledownstand",
+		},
 		"leftstand": {
 			Frames:        2,
 			FrameInterval: 16,
@@ -213,6 +234,12 @@ func (r *Riser) Spawn(w *engine.World, sp *level.SpawnableProps, e *engine.Entit
 			NextInterval:  32,
 			NextAnim:      "upstand",
 		},
+		"downstand": {
+			Frames:        2,
+			FrameInterval: 16,
+			NextInterval:  32,
+			NextAnim:      "downstand",
+		},
 	}, "inactive")
 	if err != nil {
 		return fmt.Errorf("could not initialize riser animation: %w", err)
@@ -306,11 +333,23 @@ func (r *Riser) Update() {
 	canPush := playerAbilities.HasAbility("push")
 	canPull := playerAbilities.HasAbility("pull")
 	canStand := playerAbilities.HasAbility("stand")
+	canRiserDown := playerAbilities.HasAbility("riserdown")
 	actionPressed := playerButtons.ActionPressed()
+	upDownInput := playerButtons.GetUpDown();
 	playerOnMe := playerPhysics.ReadGroundEntity() == r.Entity
 	playerDelta := r.World.Player.Rect.Delta(r.Entity.Rect)
 	playerAboveMe := playerDelta.DX == 0 && playerDelta.Dot(r.OnGroundVec) < 0
 
+	if canRiserDown {
+		if upDownInput == 1 {
+			r.RiserDown = false
+		} else if upDownInput == -1 {
+			r.RiserDown = true
+		}
+	} else {
+		r.RiserDown = false
+	}
+
 	if canCarry && !playerOnMe && actionPressed && (playerDelta.IsZero() || (r.State == GettingCarried && playerDelta.Norm1() <= FollowMaxDistance)) {
 		r.State = GettingCarried
 	} else if canPush && actionPressed {
@@ -319,16 +358,40 @@ func (r *Riser) Update() {
 		} else {
 			r.State = MovingLeft
 		}
-	} else if canPull && actionPressed {
-		if r.World.Player.Rect.Center().X < r.Entity.Rect.Center().X {
-			r.State = MovingLeft
-		} else {
-			r.State = MovingRight
+	} else if canPull && actionPressed { // Surely this code can be better improved
+		if !playerOnMe {
+			if r.World.Player.Rect.Center().X < r.Entity.Rect.Center().X { // Deadzone implementation
+				r.State = MovingLeft
+			} else if r.World.Player.Rect.Center().X > r.Entity.Rect.Center().X {
+				r.State = MovingRight
+			} else {
+				if r.RiserDown && !playerAboveMe {
+					r.State = MovingDown
+				} else if r.RiserDown {
+					r.State = IdlingDown
+				} else if !r.RiserDown {
+					r.State = IdlingUp
+				}
+			}
+		} else { // Remove the deadzone if player stands on it
+			if r.World.Player.Rect.Center().X < r.Entity.Rect.Center().X {
+				r.State = MovingLeft
+			} else {
+				r.State = MovingRight
+			}
 		}
 	} else if canStand && playerAboveMe {
-		r.State = MovingUp
+		if r.RiserDown {
+			r.State = MovingDown
+		} else {
+			r.State = MovingUp
+		}
 	} else if canCarry || canPush || canStand {
-		r.State = IdlingUp
+		if r.RiserDown {
+			r.State = IdlingDown
+		} else {
+			r.State = IdlingUp
+		}
 	} else {
 		r.State = Inactive
 	}
@@ -345,15 +408,29 @@ func (r *Riser) Update() {
 	case IdlingUp:
 		r.Anim.SetGroup("idle" + suffix)
 		r.Velocity = r.OnGroundVec.Mul(-IdleSpeed)
+	case IdlingDown:
+		r.Anim.SetGroup("idledown" + suffix)
+		r.Velocity = r.OnGroundVec.Mul(IdleSpeed)
 	case MovingUp:
 		r.Anim.SetGroup("up" + suffix)
 		r.Velocity = r.OnGroundVec.Mul(-UpSpeed)
+	case MovingDown:
+		r.Anim.SetGroup("down" + suffix)
+		r.Velocity = r.OnGroundVec.Mul(UpSpeed)
 	case MovingLeft:
 		r.Anim.SetGroup("left" + suffix)
-		r.Velocity = r.OnGroundVec.Mul(-IdleSpeed).Add(m.Delta{DX: -SideSpeed, DY: 0})
+		if r.RiserDown {
+			r.Velocity = r.OnGroundVec.Mul(IdleSpeed).Add(m.Delta{DX: -SideSpeed, DY: 0})
+		} else {
+			r.Velocity = r.OnGroundVec.Mul(-IdleSpeed).Add(m.Delta{DX: -SideSpeed, DY: 0})
+		}
 	case MovingRight:
 		r.Anim.SetGroup("right" + suffix)
-		r.Velocity = r.OnGroundVec.Mul(-IdleSpeed).Add(m.Delta{DX: SideSpeed, DY: 0})
+		if r.RiserDown {
+			r.Velocity = r.OnGroundVec.Mul(IdleSpeed).Add(m.Delta{DX: SideSpeed, DY: 0})
+		} else {
+			r.Velocity = r.OnGroundVec.Mul(-IdleSpeed).Add(m.Delta{DX: SideSpeed, DY: 0})
+		}
 	case GettingCarried:
 		r.Anim.SetGroup("idle" + suffix)
 		// r.Velocity = playerPhysics.ReadVelocity() // Hacky carry physics; good enough?
@@ -463,7 +540,7 @@ func (r *Riser) Update() {
 	r.carrySound.update(r.State == GettingCarried)
 	// For push and moving up, decide sound by whether we're actually moving.
 	r.pushSound.update((r.State == MovingLeft || r.State == MovingRight) && r.Velocity.DX != 0)
-	r.riseSound.update(r.State == MovingUp && (r.Velocity.DY == UpSpeed || r.Velocity.DY == -UpSpeed))
+	r.riseSound.update((r.State == MovingUp || r.State == MovingDown) && (r.Velocity.DY == UpSpeed || r.Velocity.DY == -UpSpeed))
 
 	r.Anim.Update(r.Entity)
 

scripts/build-generated-assets.sh

@@ -49,9 +49,9 @@ if [ x"$AAAAXY_GENERATE_ASSETS" = x'true' ]; then
 	fi
 	${GO} run ${GO_FLAGS} github.com/divVerent/aaaaxy/cmd/dumpluts --palette_max_cycles=inf
 
-	sh scripts/image-load-order.sh assets/generated/image_load_order.txt assets/tiles assets/sprites third_party/grafxkid_classic_hero_and_baddies_pack/assets/sprites
+	sh scripts/image-load-order.sh assets/generated/picture_load_order.txt assets/tiles assets/sprites third_party/grafxkid_classic_hero_and_baddies_pack/assets/sprites
 	if [ x"$AAAAXY_DIFF_ASSETS" != x'false' ]; then
-		diff -u assets/_saved/image_load_order.txt assets/generated/image_load_order.txt
+		diff -u assets/_saved/picture_load_order.txt assets/generated/picture_load_order.txt
 	fi
 
 	if [ x"$AAAAXY_DIFF_ASSETS" != x'false' ]; then

scripts/generate-checkpoints-only.sh

@@ -0,0 +1,20 @@
+set -ex
+
+: ${GO:=go}
+
+# Run go natively.
+export GOOS=
+export GOARCH=
+
+for lfile in assets/maps/*.tmx; do
+	lname=${lfile%.tmx}
+	lname=${lname##*/}
+
+	trap 'rm -f "assets/generated/$lname.cp.json"' EXIT
+	# Using |cat> instead of > because snapcraft for some reason doesn't allow using a regular > shell redirection with "go run".
+	${GO} run ${GO_FLAGS} github.com/divVerent/aaaaxy/cmd/dumpcps -level="$lname" |cat> "assets/generated/$lname.cp.dot"
+	grep -c . "assets/generated/$lname.cp.dot"
+	neato -Tjson assets/generated/$lname.cp.dot > assets/generated/$lname.cp.json
+	grep -c . "assets/generated/$lname.cp.json"
+	trap - EXIT
+done