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

/**** 
* Classes
****/ 
var Bird1 = Container.expand(function () {
	var self = Container.call(this);
	var birdGraphics = self.attachAsset('bird1-right', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	// From old version
	self.speed = Math.random() * 1.6 + 1;
	self.lastY = self.y;
	self.lastX = storage.lastX || self.x;
	// From new version movement system
	self.update = function () {
		self.y += self.speed;
		self.x += Math.sin(self.y / 100) * 6.5;
		// Boundary checking from old version
		if (self.lastY <= 2732 && self.y > 2732) {
			self.y = -self.height;
			self.x = Math.random() < 0.33 ? Math.random() * 2048 : Math.random() < 0.5 ? 0 : 2048;
		}
		// Texture switching from old version
		if (self.lastX <= 2048 / 2 && self.x > 2048 / 2) {
			birdGraphics.texture = LK.getAsset('bird1-right', {}).texture;
		} else if (self.lastX > 2048 / 2 && self.x <= 2048 / 2) {
			birdGraphics.texture = LK.getAsset('bird1-left', {}).texture;
		}
		self.lastY = self.y;
		storage.lastX = self.x;
	};
});
var Bird2 = Container.expand(function () {
	var self = Container.call(this);
	var birdGraphics = self.attachAsset('bird2-right', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	// Combined movement logic
	self.speed = Math.random() * 1.6 + 1;
	self.lastY = self.y;
	self.update = function () {
		self.y += self.speed;
		self.x += Math.sin(self.y / 100) * 6.5;
		// New version's random respawn logic
		if (self.lastY <= 2732 && self.y > 2732) {
			self.y = Math.random() * 2732;
			self.x = Math.random() < 0.5 ? 0 : 2048;
		}
		// Texture switching
		if (self.lastX <= 2048 / 2 && self.x > 2048 / 2) {
			birdGraphics.texture = LK.getAsset('bird2-right', {}).texture;
		} else if (self.lastX > 2048 / 2 && self.x <= 2048 / 2) {
			birdGraphics.texture = LK.getAsset('bird2-left', {}).texture;
		}
		self.lastY = self.y;
		self.lastX = self.x;
	};
});
var Cat = Container.expand(function () {
	var self = Container.call(this);
	var catGraphics = self.attachAsset('cat', {
		anchorX: 0.5,
		anchorY: 1
	});
	self.update = function () {
		// Add any specific update logic for the cat here
	};
});
var Cloud = Container.expand(function () {
	var self = Container.call(this);
	var cloudGraphics = self.attachAsset('cloud', {
		anchorX: 0.5,
		anchorY: 0.5,
		alpha: 0.8
	});
	self.speed = Math.random() * 0.55 + 0.25;
	self.hasAccelerated = false;
	self.direction = Math.random() < 0.5 ? 1 : -1;
	self.lastX = storage.lastX || self.x;
	self.lastIntersecting = false;
	self.update = function () {
		self.x += self.speed * self.direction;
		if (self.lastX <= 2048 + self.width / 2 && self.x > 2048 + self.width / 2) {
			self.x = -self.width / 2;
		} else if (self.lastX >= -self.width / 2 && self.x < -self.width / 2) {
			self.x = 2048 + self.width / 2;
		}
		for (var i = 0; i < clouds.length; i++) {
			if (clouds[i] !== self && self.intersects(clouds[i])) {
				if (!self.hasAccelerated) {
					self.speed *= 1.5;
					self.hasAccelerated = true;
				}
				break;
			} else if (self.hasAccelerated && !self.intersects(clouds[i])) {
				self.speed /= 1.5;
				self.hasAccelerated = false;
			}
		}
		if (!self.lastIntersecting && self.intersects(sun)) {
			self.speed *= 2;
			tween(cloudGraphics, {
				alpha: 0.5
			}, {
				duration: 3000,
				easing: tween.linear
			});
		} else if (self.lastIntersecting && !self.intersects(sun)) {
			self.speed /= 2;
			tween(cloudGraphics, {
				alpha: 1.0
			}, {
				duration: 3000,
				easing: tween.linear
			});
		}
		self.lastIntersecting = self.intersects(sun);
		storage.lastX = self.x;
	};
});
var Grass = Container.expand(function () {
	var self = Container.call(this);
	var grassGraphics = self.attachAsset('grass', {
		anchorX: 0.5,
		anchorY: 1
	});
	self.update = function () {
		self.x += Math.sin((LK.ticks + 100) / 90) * 0.15;
	};
});
var Grass2 = Container.expand(function () {
	var self = Container.call(this);
	var grass2Graphics = self.attachAsset('grass2', {
		anchorX: 0.5,
		anchorY: 1
	});
	self.lastX = self.x;
	self.update = function () {
		self.x += Math.sin((LK.ticks + 50) / 100) * 0.125;
		self.lastX = self.x;
	};
});
var Laser = Container.expand(function (startX, startY, targetX, targetY) {
	var self = Container.call(this);
	var laserGraphics = self.attachAsset('laser2', {
		anchorX: 0.5,
		anchorY: 0.5,
		brightness: 2.0
	});
	// Combined laser logic
	LK.getSound('laser1').play();
	var dx = targetX - startX;
	var dy = targetY - startY;
	var distance = Math.sqrt(dx * dx + dy * dy);
	var speed = 60;
	self.vx = dx / distance * speed;
	self.vy = dy / distance * speed;
	self.x = startX;
	self.y = startY;
	self.update = function () {
		self.x += self.vx;
		self.y += self.vy;
		if (self.x < 0 || self.x > 2048 || self.y < 0 || self.y > 2732) {
			self.destroy();
		}
	};
});
var Reticle = Container.expand(function () {
	var self = Container.call(this);
	var reticleGraphics = self.attachAsset('reticle1', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.update = function () {
		// Add any specific update logic for the reticle here
	};
});
var ScoreDisplay = Container.expand(function () {
	var self = Container.call(this);
	var scoreGraphics = self.attachAsset('scoreImage', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	var scoreText = new Text2('0', {
		size: 175,
		fill: 0x00FF00,
		font: "Courier New, Courier, monospace",
		stroke: 0x000000,
		strokeThickness: 5,
		dropShadow: true,
		dropShadowColor: 0x000000,
		dropShadowBlur: 5,
		dropShadowAngle: Math.PI / 6,
		dropShadowDistance: 6
	});
	scoreText.y = -100;
	scoreText.x = -155;
	self.addChild(scoreText);
	self.updateScore = function (newScore) {
		scoreText.setText(newScore);
	};
});
var Sun = Container.expand(function () {
	var self = Container.call(this);
	var sunGraphics = self.attachAsset('sun', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	startPulsating(self);
});
var Tree = Container.expand(function () {
	var self = Container.call(this);
	var treeGraphics = self.attachAsset('tree', {
		anchorX: 0.5,
		anchorY: 1,
		antialias: true
	});
	self.update = function () {
		// Add any specific update logic for the tree here
	};
});
var UFO = Container.expand(function () {
	var self = Container.call(this);
	var ufoGraphics = self.attachAsset('ufo2', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.speed = 3.2;
	self.direction = Math.random() < 0.5 ? 1 : -1;
	self.lastX = storage.lastX || self.x;
	self.update = function () {
		self.x += self.speed * self.direction;
		self.y = 100 + Math.sin(self.x / 70) * 165;
		if (self.lastX <= 2048 + self.width / 2 && self.x > 2048 + self.width / 2 || self.lastX >= -self.width / 2 && self.x < -self.width / 2) {
			self.destroy();
			ufo = null;
		}
		self.lastX = self.x;
	};
});

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

/**** 
* Game Code
****/ 
// Music and Sounds from both versions
// Combined assets from both versions
/***** 
* Game Systems - Adapted from new version
*****/ 
var EntityManager = {
	cleanup: function cleanup(entity) {
		if (entity.parent) {
			entity.parent.removeChild(entity);
		}
	}
};
var SoundManager = {
	play: function play(soundName) {
		var sound = LK.getSound(soundName);
		if (sound) {
			sound.play();
		}
	}
};
/***** 
* Main Game Logic
*****/ 
var clouds = [];
var birds = [];
var score = 0;
var ufo = null;
// Combined initialization
var background = LK.getAsset('background', {
	anchorX: 0.5,
	anchorY: 0.5
});
background.x = 2048 / 2;
background.y = 2732 / 2 - 200;
game.addChild(background);
var sun = game.addChild(new Sun());
sun.x = 480;
sun.y = 590;
var sunChildIndex = 1;
game.setChildIndex(sun, sunChildIndex);
function addUFO() {
	var ufo = game.addChild(new UFO());
	ufo.x = Math.random() < 0.5 ? 2048 + ufo.width / 2 : -ufo.width / 2;
	ufo.y = Math.random() * 500;
	ufo.customUpdate = function () {
		ufo.update();
	};
	return ufo;
}
for (var i = 0; i < 4; i++) {
	var cloud = new Cloud();
	cloud.x = Math.random() * 2048;
	cloud.y = Math.random() * (2732 / 2);
	clouds.push(cloud);
	game.addChild(cloud);
	var cloudChildIndex = 2;
	game.setChildIndex(cloud, cloudChildIndex);
}
function spawnBird1() {
	var bird = new Bird1();
	bird.x = Math.random() * 2048;
	bird.y = -bird.height;
	bird.speed = 1 + Math.random() * 0.6;
	bird.lastIntersecting = false;
	bird.type = 'Bird1';
	bird.color = 0x746130;
	LK.setTimeout(function () {
		game.addChild(bird);
		var bird1ChildIndex = 5;
		game.setChildIndex(bird, bird1ChildIndex);
		birds.push(bird);
	}, 2000);
}
function spawnBird2() {
	var bird = new Bird2();
	bird.y = Math.random() * 2732;
	bird.x = Math.random() < 0.5 ? 0 : 2048;
	bird.speed = 1 + Math.random() * 0.6;
	bird.lastIntersecting = false;
	bird.type = 'Bird2';
	bird.color = 0xFFFFFF;
	LK.setTimeout(function () {
		game.addChild(bird);
		var bird2ChildIndex = game.getChildIndex(tree) + 1;
		game.setChildIndex(bird, bird2ChildIndex);
		birds.push(bird);
	}, 2000);
}
spawnBird1();
spawnBird2();
var ufoTimer = LK.setTimeout(function () {
	addUFO();
}, Math.random() * 10000 + 20000);
game.update = function () {
	for (var i = 0; i < clouds.length; i++) {
		clouds[i].update();
	}
	if (ufo) {
		ufo.customUpdate();
		game.children.forEach(function (child) {
			if (child instanceof Laser) {
				child.update();
				birds.forEach(function (bird) {
					if (!child.lastIntersecting && child.intersects(bird)) {
						if (bird instanceof Bird1) {
							score += 5;
						} else if (bird instanceof Bird2) {
							score += 1;
						}
						scoreDisplay.updateScore(score);
						bird.destroy();
						birds.splice(birds.indexOf(bird), 1);
						child.destroy();
					}
					child.lastIntersecting = birds.some(function (bird) {
						return child.intersects(bird);
					});
				});
				if (ufo && !child.lastIntersecting && child.intersects(ufo)) {
					score += 25;
					score.updateScore(score);
					child.destroy();
				}
				child.lastIntersecting = birds.some(function (bird) {
					return child.intersects(bird);
				}) || ufo && child.intersects(ufo);
			}
		});
		if (ufo.lastX <= 2048 + ufo.width / 2 && ufo.x > 2048 + ufo.width / 2 || ufo.lastX >= -ufo.width / 2 && ufo.x < -ufo.width / 2) {
			ufo.destroy();
			ufo = null;
			ufoTimer = LK.setTimeout(function () {
				ufo = addUFO();
			}, Math.random() * 20000 + 30000);
		} else {
			storage.lastX = ufo.x;
		}
	}
};
var tree = game.addChild(new Tree());
tree.x = 2048 / 2 + 500;
tree.y = 2765;
var treeChildIndex = Math.min(7, game.children.length - 1);
game.setChildIndex(tree, treeChildIndex);
var grass = new Grass();
grass.x = 1020;
grass.y = 2735;
game.addChild(grass);
var grassChildIndex = Math.min(9, game.getChildIndex(tree) - 1);
game.setChildIndex(grass, grassChildIndex);
var grass2 = new Grass2();
grass2.x = 1020;
grass2.y = 2735;
game.addChild(grass2);
var grass2ChildIndex = game.getChildIndex(tree) + 1;
game.setChildIndex(grass2, grass2ChildIndex);
var scoreDisplay = new ScoreDisplay();
scoreDisplay.x = 2048 / 2 + 520;
scoreDisplay.y = 2732 - 185;
game.addChild(scoreDisplay);
game.setChildIndex(scoreDisplay, game.getChildIndex(tree) + 1);
var cat = game.addChild(new Cat());
cat.x = 200;
cat.y = 2732;
var catChildIndex = Math.min(10, game.children.length - 1);
game.setChildIndex(cat, catChildIndex);
LK.playMusic('bgm1', {
	loop: false,
	fade: {
		start: 0,
		end: 0.02,
		duration: 4000
	},
	onEnd: function onEnd() {
		LK.setTimeout(function () {
			LK.playMusic('bgm1', {
				loop: false,
				fade: {
					start: 0,
					end: 0.5,
					duration: 4000
				},
				onEnd: onEnd
			});
		}, Math.random() * 30000 + 20000);
	}
});
var wingsTimer = LK.setTimeout(function () {
	LK.getSound('wings1').play();
	wingsTimer = LK.setTimeout(arguments.callee, Math.random() * 20000 + 10000);
}, Math.random() * 20000 + 10000);
var sounds = ['cricket1', 'frog1', 'wings1', 'songbird1'];
var currentAmbientSound = null;
sounds.forEach(function (soundId) {
	var sound = LK.getSound(soundId);
	var ambientSoundTimer = LK.setTimeout(function () {
		if (currentAmbientSound) {
			currentAmbientSound.stop();
		}
		sound.play();
		currentAmbientSound = sound;
		LK.setTimeout(function () {
			currentAmbientSound = null;
		}, sound.duration * 1000);
		ambientSoundTimer = LK.setTimeout(arguments.callee, Math.random() * 20000 + 30000 + 5000);
	}, Math.random() * 20000 + 30000);
});
game.down = function (x, y, obj) {
	if (!game.reticle) {
		game.reticle = game.addChild(new Reticle());
		var reticleChildIndex = 1;
		game.setChildIndex(game.reticle, reticleChildIndex);
	}
	game.reticle.x = x;
	game.reticle.y = y;
	var laser = new Laser(cat.x, cat.y - 430, x, y);
	game.addChild(laser);
	var laserChildIndex = Math.min(game.getChildIndex(game.reticle) + 2, game.children.length - 1);
	game.setChildIndex(laser, laserChildIndex);
};
game.move = function (x, y, obj) {
	if (!game.reticle) {
		game.reticle = game.addChild(new Reticle());
	}
	if (obj.event) {
		var x = obj.event.x;
		var y = obj.event.y;
	}
	game.reticle.x = x;
	game.reticle.y = y;
};
function startPulsating(target) {
	function pulsate() {
		tween(target, {
			scaleX: 1.1,
			scaleY: 1.1
		}, {
			duration: 444,
			easing: tween.easeInOut,
			onFinish: function onFinish() {
				tween(target, {
					scaleX: 1.0,
					scaleY: 1.0
				}, {
					duration: 444,
					easing: tween.easeInOut,
					onFinish: pulsate
				});
			}
		});
	}
	pulsate();
}

===================================================================
--- original.js
+++ change.js
@@ -1,8 +1,9 @@
 /**** 
 * Plugins
 ****/ 
 var tween = LK.import("@upit/tween.v1");
+var storage = LK.import("@upit/storage.v1");
 
 /**** 
 * Classes
 ****/ 
@@ -14,9 +15,9 @@
 	});
 	// From old version
 	self.speed = Math.random() * 1.6 + 1;
 	self.lastY = self.y;
-	self.lastX = self.x;
+	self.lastX = storage.lastX || self.x;
 	// From new version movement system
 	self.update = function () {
 		self.y += self.speed;
 		self.x += Math.sin(self.y / 100) * 6.5;
@@ -31,9 +32,9 @@
 		} else if (self.lastX > 2048 / 2 && self.x <= 2048 / 2) {
 			birdGraphics.texture = LK.getAsset('bird1-left', {}).texture;
 		}
 		self.lastY = self.y;
-		self.lastX = self.x;
+		storage.lastX = self.x;
 	};
 });
 var Bird2 = Container.expand(function () {
 	var self = Container.call(this);
@@ -81,9 +82,9 @@
 	});
 	self.speed = Math.random() * 0.55 + 0.25;
 	self.hasAccelerated = false;
 	self.direction = Math.random() < 0.5 ? 1 : -1;
-	self.lastX = self.x;
+	self.lastX = storage.lastX || self.x;
 	self.lastIntersecting = false;
 	self.update = function () {
 		self.x += self.speed * self.direction;
 		if (self.lastX <= 2048 + self.width / 2 && self.x > 2048 + self.width / 2) {
@@ -120,9 +121,9 @@
 				easing: tween.linear
 			});
 		}
 		self.lastIntersecting = self.intersects(sun);
-		self.lastX = self.x;
+		storage.lastX = self.x;
 	};
 });
 var Grass = Container.expand(function () {
 	var self = Container.call(this);
@@ -232,9 +233,9 @@
 		anchorY: 0.5
 	});
 	self.speed = 3.2;
 	self.direction = Math.random() < 0.5 ? 1 : -1;
-	self.lastX = self.x;
+	self.lastX = storage.lastX || self.x;
 	self.update = function () {
 		self.x += self.speed * self.direction;
 		self.y = 100 + Math.sin(self.x / 70) * 165;
 		if (self.lastX <= 2048 + self.width / 2 && self.x > 2048 + self.width / 2 || self.lastX >= -self.width / 2 && self.x < -self.width / 2) {
@@ -257,13 +258,13 @@
 
 /**** 
 * Game Code
 ****/ 
+// Music and Sounds from both versions
+// Combined assets from both versions
 /***** 
 * Game Systems - Adapted from new version
 *****/ 
-// Combined assets from both versions
-// Music and Sounds from both versions
 var EntityManager = {
 	cleanup: function cleanup(entity) {
 		if (entity.parent) {
 			entity.parent.removeChild(entity);
@@ -392,9 +393,9 @@
 			ufoTimer = LK.setTimeout(function () {
 				ufo = addUFO();
 			}, Math.random() * 20000 + 30000);
 		} else {
-			ufo.lastX = ufo.x;
+			storage.lastX = ufo.x;
 		}
 	}
 };
 var tree = game.addChild(new Tree());