/**** 
* Plugins
****/ 
var tween = LK.import("@upit/tween.v1");
var storage = LK.import("@upit/storage.v1");

/**** 
* Classes
****/ 
var Bullet = Container.expand(function () {
	var self = Container.call(this);
	var bulletGraphics = self.attachAsset('bullet', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.speed = 15;
	self.damage = 10;
	self.directionX = 0;
	self.directionY = -1;
	self.update = function () {
		self.x += self.directionX * self.speed;
		self.y += self.directionY * self.speed;
	};
	return self;
});
var Coin = Container.expand(function () {
	var self = Container.call(this);
	var coinGraphics = self.attachAsset('coin', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.value = Math.floor(Math.random() * 10) + 5;
	self.update = function () {
		self.rotation += 0.05;
	};
	return self;
});
var EnemyBullet = Container.expand(function () {
	var self = Container.call(this);
	var bulletGraphics = self.attachAsset('enemyBullet', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.speed = 8;
	self.damage = 5;
	self.directionX = 0;
	self.directionY = 0;
	self.update = function () {
		self.x += self.directionX * self.speed;
		self.y += self.directionY * self.speed;
	};
	return self;
});
var NPC = Container.expand(function () {
	var self = Container.call(this);
	var npcGraphics = self.attachAsset('npc', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.questType = Math.random() < 0.5 ? 'trade' : 'delivery';
	self.reward = Math.floor(Math.random() * 50) + 20;
	self.baseY = 0;
	self.moveSpeed = 1 + Math.random() * 2;
	self.moveAngle = Math.random() * Math.PI * 2;
	self.wanderTimer = 0;
	self.update = function () {
		// Wander movement
		self.wanderTimer++;
		if (self.wanderTimer > 120 + Math.random() * 120) {
			self.moveAngle = Math.random() * Math.PI * 2;
			self.wanderTimer = 0;
		}
		self.x += Math.cos(self.moveAngle) * self.moveSpeed;
		self.y += Math.sin(self.moveAngle) * self.moveSpeed;
		// Float animation on top of movement
		self.y += Math.sin(LK.ticks * 0.05) * 0.5;
	};
	return self;
});
var Pirate = Container.expand(function () {
	var self = Container.call(this);
	var pirateGraphics = self.attachAsset('pirate', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.health = 30;
	self.speed = 2;
	self.fireRate = 60;
	self.lastFire = 0;
	self.loot = Math.floor(Math.random() * 30) + 10;
	self.moveAngle = Math.random() * Math.PI * 2;
	self.patrolTimer = 0;
	self.aggroRange = 600;
	self.takeDamage = function (amount) {
		self.health -= amount;
		LK.effects.flashObject(self, 0xffffff, 100);
	};
	self.update = function () {
		// Movement AI
		self.patrolTimer++;
		if (self.patrolTimer > 180) {
			self.moveAngle = Math.random() * Math.PI * 2;
			self.patrolTimer = 0;
		}
		// Patrol movement
		self.x += Math.cos(self.moveAngle) * self.speed * 0.5;
		self.y += Math.sin(self.moveAngle) * self.speed * 0.5;
	};
	return self;
});
var Resource = Container.expand(function () {
	var self = Container.call(this);
	var resourceGraphics = self.attachAsset('resource', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.type = Math.random() < 0.5 ? 'metal' : 'energy';
	self.amount = Math.floor(Math.random() * 5) + 1;
	self.update = function () {
		self.rotation += 0.03;
	};
	return self;
});
var Ship = Container.expand(function () {
	var self = Container.call(this);
	var shipGraphics = self.attachAsset('ship', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.health = 100;
	self.maxHealth = 100;
	self.speed = 5;
	self.fireRate = 10;
	self.damage = 10;
	self.lastFire = 0;
	self.takeDamage = function (amount) {
		self.health -= amount;
		LK.effects.flashObject(self, 0xff0000, 200);
		if (self.health <= 0) {
			self.health = 0;
			LK.showGameOver();
		}
	};
	return self;
});
var Star = Container.expand(function () {
	var self = Container.call(this);
	var starGraphics = self.attachAsset('star', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.speed = Math.random() * 2 + 0.5;
	starGraphics.alpha = Math.random() * 0.8 + 0.2;
	self.vx = (Math.random() - 0.5) * 0.5;
	self.vy = (Math.random() - 0.5) * 0.5;
	self.update = function () {
		// Slow floating movement
		self.x += self.vx;
		self.y += self.vy;
	};
	return self;
});

/**** 
* Initialize Game
****/ 
var game = new LK.Game({
	backgroundColor: 0x000033
});

/**** 
* Game Code
****/ 
// Game variables
var ship;
var joystickBase;
var joystickHandle;
var isDragging = false;
var bullets = [];
var enemyBullets = [];
var npcs = [];
var pirates = [];
var coins = [];
var resources = [];
var stars = [];
var camera = {
	x: 0,
	y: 0
};
// Player stats
var playerCoins = storage.coins || 0;
var playerMetal = storage.metal || 0;
var playerEnergy = storage.energy || 0;
var questsCompleted = storage.questsCompleted || 0;
// UI Elements
var coinText = new Text2('Coins: ' + playerCoins, {
	size: 50,
	fill: 0xFFFF00
});
coinText.anchor.set(0, 0);
coinText.x = 20;
coinText.y = 20;
LK.gui.topRight.addChild(coinText);
var resourceText = new Text2('Metal: ' + playerMetal + ' Energy: ' + playerEnergy, {
	size: 40,
	fill: 0xFFFFFF
});
resourceText.anchor.set(0, 0);
resourceText.x = 20;
resourceText.y = 80;
LK.gui.topRight.addChild(resourceText);
var healthText = new Text2('Health: 100/100', {
	size: 50,
	fill: 0x00FF00
});
healthText.anchor.set(0.5, 0);
LK.gui.top.addChild(healthText);
// Create joystick
joystickBase = game.addChild(LK.getAsset('joystickBase', {
	anchorX: 0.5,
	anchorY: 0.5,
	x: 300,
	y: 2432
}));
joystickBase.alpha = 0.5;
joystickHandle = game.addChild(LK.getAsset('joystickHandle', {
	anchorX: 0.5,
	anchorY: 0.5,
	x: 300,
	y: 2432
}));
joystickHandle.alpha = 0.7;
// Create ship
ship = game.addChild(new Ship());
ship.x = 1024;
ship.y = 1366;
// Start background music
LK.playMusic('bgmusic');
// Initialize star field
for (var i = 0; i < 50; i++) {
	spawnStar();
}
// Helper functions
function spawnStar() {
	var star = new Star();
	// Spawn from edges of visible area
	var edge = Math.floor(Math.random() * 4);
	switch (edge) {
		case 0:
			// Top
			star.x = ship.x + (Math.random() - 0.5) * 2500;
			star.y = ship.y - 1500;
			break;
		case 1:
			// Right
			star.x = ship.x + 1500;
			star.y = ship.y + (Math.random() - 0.5) * 2500;
			break;
		case 2:
			// Bottom
			star.x = ship.x + (Math.random() - 0.5) * 2500;
			star.y = ship.y + 1500;
			break;
		case 3:
			// Left
			star.x = ship.x - 1500;
			star.y = ship.y + (Math.random() - 0.5) * 2500;
			break;
	}
	stars.push(star);
	game.addChild(star);
}
function spawnNPC() {
	var npc = new NPC();
	// Spawn from edges of visible area
	var edge = Math.floor(Math.random() * 4);
	switch (edge) {
		case 0:
			// Top
			npc.x = ship.x + (Math.random() - 0.5) * 2000;
			npc.y = ship.y - 1500;
			break;
		case 1:
			// Right
			npc.x = ship.x + 1500;
			npc.y = ship.y + (Math.random() - 0.5) * 2000;
			break;
		case 2:
			// Bottom
			npc.x = ship.x + (Math.random() - 0.5) * 2000;
			npc.y = ship.y + 1500;
			break;
		case 3:
			// Left
			npc.x = ship.x - 1500;
			npc.y = ship.y + (Math.random() - 0.5) * 2000;
			break;
	}
	npc.baseY = npc.y;
	npcs.push(npc);
	game.addChild(npc);
}
function spawnPirate() {
	var pirate = new Pirate();
	// Spawn from edges of visible area
	var edge = Math.floor(Math.random() * 4);
	switch (edge) {
		case 0:
			// Top
			pirate.x = ship.x + (Math.random() - 0.5) * 1800;
			pirate.y = ship.y - 1400;
			break;
		case 1:
			// Right
			pirate.x = ship.x + 1400;
			pirate.y = ship.y + (Math.random() - 0.5) * 1800;
			break;
		case 2:
			// Bottom
			pirate.x = ship.x + (Math.random() - 0.5) * 1800;
			pirate.y = ship.y + 1400;
			break;
		case 3:
			// Left
			pirate.x = ship.x - 1400;
			pirate.y = ship.y + (Math.random() - 0.5) * 1800;
			break;
	}
	pirates.push(pirate);
	game.addChild(pirate);
}
function updateUI() {
	coinText.setText('Coins: ' + playerCoins);
	resourceText.setText('Metal: ' + playerMetal + ' Energy: ' + playerEnergy);
	healthText.setText('Health: ' + ship.health + '/' + ship.maxHealth);
	// Update health text color
	if (ship.health > 60) {
		healthText.fill = 0x00ff00;
	} else if (ship.health > 30) {
		healthText.fill = 0xffff00;
	} else {
		healthText.fill = 0xff0000;
	}
}
function saveProgress() {
	storage.coins = playerCoins;
	storage.metal = playerMetal;
	storage.energy = playerEnergy;
	storage.questsCompleted = questsCompleted;
}
// Event handlers
game.down = function (x, y, obj) {
	if (Math.sqrt(Math.pow(x - joystickBase.x, 2) + Math.pow(y - joystickBase.y, 2)) < 100) {
		isDragging = true;
		joystickHandle.x = x;
		joystickHandle.y = y;
	}
};
game.move = function (x, y, obj) {
	if (isDragging) {
		var dx = x - joystickBase.x;
		var dy = y - joystickBase.y;
		var distance = Math.sqrt(dx * dx + dy * dy);
		if (distance > 100) {
			dx = dx / distance * 100;
			dy = dy / distance * 100;
		}
		joystickHandle.x = joystickBase.x + dx;
		joystickHandle.y = joystickBase.y + dy;
	}
};
game.up = function (x, y, obj) {
	isDragging = false;
	joystickHandle.x = joystickBase.x;
	joystickHandle.y = joystickBase.y;
};
// Main game loop
game.update = function () {
	// Ship movement
	var shipDX = 0;
	var shipDY = 0;
	if (isDragging) {
		var dx = joystickHandle.x - joystickBase.x;
		var dy = joystickHandle.y - joystickBase.y;
		var distance = Math.sqrt(dx * dx + dy * dy);
		if (distance > 10) {
			shipDX = dx / 100 * ship.speed;
			shipDY = dy / 100 * ship.speed;
			ship.rotation = Math.atan2(dy, dx) + Math.PI / 2;
		}
	}
	// Update camera to follow ship movement
	camera.x += shipDX;
	camera.y += shipDY;
	// Move all world objects opposite to ship movement to create camera effect
	for (var i = 0; i < stars.length; i++) {
		stars[i].x -= shipDX;
		stars[i].y -= shipDY;
	}
	for (var i = 0; i < npcs.length; i++) {
		npcs[i].x -= shipDX;
		npcs[i].y -= shipDY;
	}
	for (var i = 0; i < pirates.length; i++) {
		pirates[i].x -= shipDX;
		pirates[i].y -= shipDY;
	}
	for (var i = 0; i < coins.length; i++) {
		coins[i].x -= shipDX;
		coins[i].y -= shipDY;
	}
	for (var i = 0; i < resources.length; i++) {
		resources[i].x -= shipDX;
		resources[i].y -= shipDY;
	}
	for (var i = 0; i < bullets.length; i++) {
		bullets[i].x -= shipDX;
		bullets[i].y -= shipDY;
	}
	for (var i = 0; i < enemyBullets.length; i++) {
		enemyBullets[i].x -= shipDX;
		enemyBullets[i].y -= shipDY;
	}
	// Auto fire
	if (LK.ticks - ship.lastFire > ship.fireRate && pirates.length > 0) {
		var bullet = new Bullet();
		bullet.x = ship.x;
		bullet.y = ship.y;
		// Find nearest pirate
		var nearestPirate = null;
		var nearestDistance = Infinity;
		for (var i = 0; i < pirates.length; i++) {
			var dist = Math.sqrt(Math.pow(pirates[i].x - ship.x, 2) + Math.pow(pirates[i].y - ship.y, 2));
			if (dist < nearestDistance) {
				nearestDistance = dist;
				nearestPirate = pirates[i];
			}
		}
		if (nearestPirate) {
			var angle = Math.atan2(nearestPirate.y - ship.y, nearestPirate.x - ship.x);
			bullet.directionX = Math.cos(angle);
			bullet.directionY = Math.sin(angle);
			bullet.rotation = angle + Math.PI / 2;
		}
		bullets.push(bullet);
		game.addChild(bullet);
		ship.lastFire = LK.ticks;
		LK.getSound('shoot').play();
	}
	// Update bullets
	for (var i = bullets.length - 1; i >= 0; i--) {
		var bullet = bullets[i];
		if (bullet.x < -50 || bullet.x > 2098 || bullet.y < -50 || bullet.y > 2782) {
			bullet.destroy();
			bullets.splice(i, 1);
			continue;
		}
		// Check collision with pirates
		for (var j = pirates.length - 1; j >= 0; j--) {
			if (bullet.intersects(pirates[j])) {
				pirates[j].takeDamage(bullet.damage);
				if (pirates[j].health <= 0) {
					// Drop loot
					var coin = new Coin();
					coin.x = pirates[j].x;
					coin.y = pirates[j].y;
					coins.push(coin);
					game.addChild(coin);
					if (Math.random() < 0.3) {
						var resource = new Resource();
						resource.x = pirates[j].x + (Math.random() - 0.5) * 50;
						resource.y = pirates[j].y + (Math.random() - 0.5) * 50;
						resources.push(resource);
						game.addChild(resource);
					}
					pirates[j].destroy();
					pirates.splice(j, 1);
				}
				bullet.destroy();
				bullets.splice(i, 1);
				LK.getSound('hit').play();
				break;
			}
		}
	}
	// Update enemy bullets
	for (var i = enemyBullets.length - 1; i >= 0; i--) {
		var bullet = enemyBullets[i];
		if (bullet.x < -50 || bullet.x > 2098 || bullet.y < -50 || bullet.y > 2782) {
			bullet.destroy();
			enemyBullets.splice(i, 1);
			continue;
		}
		if (bullet.intersects(ship)) {
			ship.takeDamage(bullet.damage);
			updateUI();
			bullet.destroy();
			enemyBullets.splice(i, 1);
			LK.getSound('hit').play();
		}
	}
	// Update pirates
	for (var i = 0; i < pirates.length; i++) {
		var pirate = pirates[i];
		// Update pirate AI
		var dist = Math.sqrt(Math.pow(ship.x - pirate.x, 2) + Math.pow(ship.y - pirate.y, 2));
		// Chase ship if in aggro range
		if (dist < pirate.aggroRange && dist > 100) {
			var angle = Math.atan2(ship.y - pirate.y, ship.x - pirate.x);
			pirate.x += Math.cos(angle) * pirate.speed;
			pirate.y += Math.sin(angle) * pirate.speed;
			pirate.rotation = angle + Math.PI / 2;
		}
		// Pirate shooting
		if (LK.ticks - pirate.lastFire > pirate.fireRate) {
			if (dist < 800) {
				var bullet = new EnemyBullet();
				bullet.x = pirate.x;
				bullet.y = pirate.y;
				var angle = Math.atan2(ship.y - pirate.y, ship.x - pirate.x);
				bullet.directionX = Math.cos(angle);
				bullet.directionY = Math.sin(angle);
				enemyBullets.push(bullet);
				game.addChild(bullet);
				pirate.lastFire = LK.ticks;
			}
		}
		if (dist > 2000) {
			pirate.destroy();
			pirates.splice(i, 1);
			i--;
		}
	}
	// Update NPCs
	for (var i = npcs.length - 1; i >= 0; i--) {
		var npc = npcs[i];
		// Remove NPCs that are too far away
		var dist = Math.sqrt(Math.pow(npc.x - ship.x, 2) + Math.pow(npc.y - ship.y, 2));
		if (dist > 2500) {
			npc.destroy();
			npcs.splice(i, 1);
		}
	}
	// Collect items
	for (var i = coins.length - 1; i >= 0; i--) {
		if (coins[i].intersects(ship)) {
			playerCoins += coins[i].value;
			coins[i].destroy();
			coins.splice(i, 1);
			LK.getSound('collect').play();
			updateUI();
			saveProgress();
		}
	}
	for (var i = resources.length - 1; i >= 0; i--) {
		if (resources[i].intersects(ship)) {
			if (resources[i].type === 'metal') {
				playerMetal += resources[i].amount;
			} else {
				playerEnergy += resources[i].amount;
			}
			resources[i].destroy();
			resources.splice(i, 1);
			LK.getSound('collect').play();
			updateUI();
			saveProgress();
		}
	}
	// Update stars
	for (var i = stars.length - 1; i >= 0; i--) {
		var dist = Math.sqrt(Math.pow(stars[i].x - ship.x, 2) + Math.pow(stars[i].y - ship.y, 2));
		if (dist > 2000) {
			stars[i].destroy();
			stars.splice(i, 1);
		}
	}
	// Spawn entities
	if (LK.ticks % 20 === 0) {
		spawnStar();
	}
	if (LK.ticks % 180 === 0) {
		var spawnRoll = Math.random();
		if (spawnRoll < 0.5) {
			spawnPirate();
		} else if (spawnRoll < 0.8) {
			spawnNPC();
		} else {
			// Spawn multiple entities occasionally
			spawnPirate();
			spawnNPC();
		}
	}
	if (LK.ticks % 240 === 0 && Math.random() < 0.3) {
		// Extra pirate wave
		for (var j = 0; j < 2 + Math.floor(Math.random() * 2); j++) {
			spawnPirate();
		}
	}
	// Update score
	LK.setScore(playerCoins + questsCompleted * 100);
};

===================================================================
--- original.js
+++ change.js
@@ -58,10 +58,22 @@
 		anchorY: 0.5
 	});
 	self.questType = Math.random() < 0.5 ? 'trade' : 'delivery';
 	self.reward = Math.floor(Math.random() * 50) + 20;
+	self.baseY = 0;
+	self.moveSpeed = 1 + Math.random() * 2;
+	self.moveAngle = Math.random() * Math.PI * 2;
+	self.wanderTimer = 0;
 	self.update = function () {
-		// Float animation
+		// Wander movement
+		self.wanderTimer++;
+		if (self.wanderTimer > 120 + Math.random() * 120) {
+			self.moveAngle = Math.random() * Math.PI * 2;
+			self.wanderTimer = 0;
+		}
+		self.x += Math.cos(self.moveAngle) * self.moveSpeed;
+		self.y += Math.sin(self.moveAngle) * self.moveSpeed;
+		// Float animation on top of movement
 		self.y += Math.sin(LK.ticks * 0.05) * 0.5;
 	};
 	return self;
 });
@@ -75,12 +87,26 @@
 	self.speed = 2;
 	self.fireRate = 60;
 	self.lastFire = 0;
 	self.loot = Math.floor(Math.random() * 30) + 10;
+	self.moveAngle = Math.random() * Math.PI * 2;
+	self.patrolTimer = 0;
+	self.aggroRange = 600;
 	self.takeDamage = function (amount) {
 		self.health -= amount;
 		LK.effects.flashObject(self, 0xffffff, 100);
 	};
+	self.update = function () {
+		// Movement AI
+		self.patrolTimer++;
+		if (self.patrolTimer > 180) {
+			self.moveAngle = Math.random() * Math.PI * 2;
+			self.patrolTimer = 0;
+		}
+		// Patrol movement
+		self.x += Math.cos(self.moveAngle) * self.speed * 0.5;
+		self.y += Math.sin(self.moveAngle) * self.speed * 0.5;
+	};
 	return self;
 });
 var Resource = Container.expand(function () {
 	var self = Container.call(this);
@@ -124,10 +150,14 @@
 		anchorY: 0.5
 	});
 	self.speed = Math.random() * 2 + 0.5;
 	starGraphics.alpha = Math.random() * 0.8 + 0.2;
+	self.vx = (Math.random() - 0.5) * 0.5;
+	self.vy = (Math.random() - 0.5) * 0.5;
 	self.update = function () {
-		// Stars will now move based on ship movement
+		// Slow floating movement
+		self.x += self.vx;
+		self.y += self.vy;
 	};
 	return self;
 });
 
@@ -212,28 +242,91 @@
 }
 // Helper functions
 function spawnStar() {
 	var star = new Star();
-	star.x = Math.random() * 2048;
-	star.y = Math.random() * 2732;
+	// Spawn from edges of visible area
+	var edge = Math.floor(Math.random() * 4);
+	switch (edge) {
+		case 0:
+			// Top
+			star.x = ship.x + (Math.random() - 0.5) * 2500;
+			star.y = ship.y - 1500;
+			break;
+		case 1:
+			// Right
+			star.x = ship.x + 1500;
+			star.y = ship.y + (Math.random() - 0.5) * 2500;
+			break;
+		case 2:
+			// Bottom
+			star.x = ship.x + (Math.random() - 0.5) * 2500;
+			star.y = ship.y + 1500;
+			break;
+		case 3:
+			// Left
+			star.x = ship.x - 1500;
+			star.y = ship.y + (Math.random() - 0.5) * 2500;
+			break;
+	}
 	stars.push(star);
 	game.addChild(star);
 }
 function spawnNPC() {
 	var npc = new NPC();
-	var angle = Math.random() * Math.PI * 2;
-	var distance = 800 + Math.random() * 400;
-	npc.x = ship.x + Math.cos(angle) * distance;
-	npc.y = ship.y + Math.sin(angle) * distance;
+	// Spawn from edges of visible area
+	var edge = Math.floor(Math.random() * 4);
+	switch (edge) {
+		case 0:
+			// Top
+			npc.x = ship.x + (Math.random() - 0.5) * 2000;
+			npc.y = ship.y - 1500;
+			break;
+		case 1:
+			// Right
+			npc.x = ship.x + 1500;
+			npc.y = ship.y + (Math.random() - 0.5) * 2000;
+			break;
+		case 2:
+			// Bottom
+			npc.x = ship.x + (Math.random() - 0.5) * 2000;
+			npc.y = ship.y + 1500;
+			break;
+		case 3:
+			// Left
+			npc.x = ship.x - 1500;
+			npc.y = ship.y + (Math.random() - 0.5) * 2000;
+			break;
+	}
+	npc.baseY = npc.y;
 	npcs.push(npc);
 	game.addChild(npc);
 }
 function spawnPirate() {
 	var pirate = new Pirate();
-	var angle = Math.random() * Math.PI * 2;
-	var distance = 600 + Math.random() * 400;
-	pirate.x = ship.x + Math.cos(angle) * distance;
-	pirate.y = ship.y + Math.sin(angle) * distance;
+	// Spawn from edges of visible area
+	var edge = Math.floor(Math.random() * 4);
+	switch (edge) {
+		case 0:
+			// Top
+			pirate.x = ship.x + (Math.random() - 0.5) * 1800;
+			pirate.y = ship.y - 1400;
+			break;
+		case 1:
+			// Right
+			pirate.x = ship.x + 1400;
+			pirate.y = ship.y + (Math.random() - 0.5) * 1800;
+			break;
+		case 2:
+			// Bottom
+			pirate.x = ship.x + (Math.random() - 0.5) * 1800;
+			pirate.y = ship.y + 1400;
+			break;
+		case 3:
+			// Left
+			pirate.x = ship.x - 1400;
+			pirate.y = ship.y + (Math.random() - 0.5) * 1800;
+			break;
+	}
 	pirates.push(pirate);
 	game.addChild(pirate);
 }
 function updateUI() {
@@ -408,12 +501,19 @@
 	}
 	// Update pirates
 	for (var i = 0; i < pirates.length; i++) {
 		var pirate = pirates[i];
-		// Pirates move in world space, not automatically downward
+		// Update pirate AI
+		var dist = Math.sqrt(Math.pow(ship.x - pirate.x, 2) + Math.pow(ship.y - pirate.y, 2));
+		// Chase ship if in aggro range
+		if (dist < pirate.aggroRange && dist > 100) {
+			var angle = Math.atan2(ship.y - pirate.y, ship.x - pirate.x);
+			pirate.x += Math.cos(angle) * pirate.speed;
+			pirate.y += Math.sin(angle) * pirate.speed;
+			pirate.rotation = angle + Math.PI / 2;
+		}
 		// Pirate shooting
 		if (LK.ticks - pirate.lastFire > pirate.fireRate) {
-			var dist = Math.sqrt(Math.pow(ship.x - pirate.x, 2) + Math.pow(ship.y - pirate.y, 2));
 			if (dist < 800) {
 				var bullet = new EnemyBullet();
 				bullet.x = pirate.x;
 				bullet.y = pirate.y;
@@ -424,9 +524,8 @@
 				game.addChild(bullet);
 				pirate.lastFire = LK.ticks;
 			}
 		}
-		var dist = Math.sqrt(Math.pow(pirate.x - ship.x, 2) + Math.pow(pirate.y - ship.y, 2));
 		if (dist > 2000) {
 			pirate.destroy();
 			pirates.splice(i, 1);
 			i--;
@@ -434,10 +533,11 @@
 	}
 	// Update NPCs
 	for (var i = npcs.length - 1; i >= 0; i--) {
 		var npc = npcs[i];
-		// NPCs stay in their world position
-		if (npc.y - camera.y > 2800) {
+		// Remove NPCs that are too far away
+		var dist = Math.sqrt(Math.pow(npc.x - ship.x, 2) + Math.pow(npc.y - ship.y, 2));
+		if (dist > 2500) {
 			npc.destroy();
 			npcs.splice(i, 1);
 		}
 	}
@@ -474,17 +574,28 @@
 			stars.splice(i, 1);
 		}
 	}
 	// Spawn entities
-	if (LK.ticks % 30 === 0) {
+	if (LK.ticks % 20 === 0) {
 		spawnStar();
 	}
-	if (LK.ticks % 300 === 0) {
-		if (Math.random() < 0.6) {
+	if (LK.ticks % 180 === 0) {
+		var spawnRoll = Math.random();
+		if (spawnRoll < 0.5) {
 			spawnPirate();
+		} else if (spawnRoll < 0.8) {
+			spawnNPC();
 		} else {
+			// Spawn multiple entities occasionally
+			spawnPirate();
 			spawnNPC();
 		}
 	}
+	if (LK.ticks % 240 === 0 && Math.random() < 0.3) {
+		// Extra pirate wave
+		for (var j = 0; j < 2 + Math.floor(Math.random() * 2); j++) {
+			spawnPirate();
+		}
+	}
 	// Update score
 	LK.setScore(playerCoins + questsCompleted * 100);
 };
\ No newline at end of file