/**** 
* Plugins
****/ 
var tween = LK.import("@upit/tween.v1");
var storage = LK.import("@upit/storage.v1", {
	petLevel: 1,
	petXp: 0,
	lastFed: 0,
	lastCleaned: 0,
	lastPlayed: 0
});

/**** 
* Classes
****/ 
var ActionButton = Container.expand(function (actionType, position) {
	var self = Container.call(this);
	var buttonShape;
	if (actionType === 'feed') {
		buttonShape = self.attachAsset('foodItem', {
			anchorX: 0.5,
			anchorY: 0.5
		});
	} else if (actionType === 'clean') {
		buttonShape = self.attachAsset('cleaningItem', {
			anchorX: 0.5,
			anchorY: 0.5
		});
	} else if (actionType === 'play') {
		buttonShape = self.attachAsset('playItem', {
			anchorX: 0.5,
			anchorY: 0.5
		});
	}
	self.buttonType = actionType;
	self.interactive = true;
	self.down = function (x, y, obj) {
		tween(buttonShape, {
			scaleX: 0.8,
			scaleY: 0.8
		}, {
			duration: 100
		});
	};
	self.up = function (x, y, obj) {
		tween(buttonShape, {
			scaleX: 1,
			scaleY: 1
		}, {
			duration: 100,
			onFinish: function onFinish() {
				if (self.buttonType === 'feed') {
					performFeedAction();
				} else if (self.buttonType === 'clean') {
					performCleanAction();
				} else if (self.buttonType === 'play') {
					performPlayAction();
				}
			}
		});
	};
	return self;
});
var MainMenu = Container.expand(function () {
	var self = Container.call(this);
	// Background image
	var background = self.attachAsset('menu_background', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	background.x = 2048 / 2;
	background.y = 2732 / 2;
	// Game logo
	var gameLogo = self.attachAsset('game_logo', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	gameLogo.x = 2048 / 2;
	gameLogo.y = 800;
	// Play button image
	var playButton = self.attachAsset('play_button', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	playButton.x = 2048 / 2;
	playButton.y = 2732 / 2 + 200;
	playButton.interactive = true;
	// Reset button
	var resetButton = new Text2("Reset Game", {
		size: 60,
		fill: 0xFFFFFF
	});
	resetButton.anchor.set(0.5, 0.5);
	resetButton.x = 2048 / 2;
	resetButton.y = 2732 / 2 + 400;
	resetButton.interactive = true;
	self.addChild(resetButton);
	// Button animations and interaction
	playButton.down = function (x, y, obj) {
		tween(playButton, {
			scaleX: 0.95,
			scaleY: 0.95
		}, {
			duration: 100
		});
	};
	playButton.up = function (x, y, obj) {
		tween(playButton, {
			scaleX: 1,
			scaleY: 1
		}, {
			duration: 100,
			onFinish: function onFinish() {
				if (self.onStartGame) {
					self.onStartGame();
				}
			}
		});
	};
	// Reset button interactions
	resetButton.down = function (x, y, obj) {
		tween(resetButton, {
			scaleX: 0.95,
			scaleY: 0.95
		}, {
			duration: 100
		});
	};
	resetButton.up = function (x, y, obj) {
		tween(resetButton, {
			scaleX: 1,
			scaleY: 1
		}, {
			duration: 100,
			onFinish: function onFinish() {
				if (self.onResetGame) {
					self.onResetGame();
				}
			}
		});
	};
	// Add some animation to the logo
	function animateLogo() {
		tween(gameLogo, {
			y: gameLogo.y - 15
		}, {
			duration: 1500,
			easing: tween.easeInOut,
			onFinish: function onFinish() {
				tween(gameLogo, {
					y: gameLogo.y + 15
				}, {
					duration: 1500,
					easing: tween.easeInOut,
					onFinish: animateLogo
				});
			}
		});
	}
	// Start the animation
	animateLogo();
	return self;
});
var Pet = Container.expand(function () {
	var self = Container.call(this);
	var currentLevel = storage.petLevel || 1;
	var petAssetId = 'pet_baby';
	// Determine which asset to use based on level
	if (currentLevel === 1) {
		petAssetId = 'pet_baby';
	} else if (currentLevel === 2) {
		petAssetId = 'pet_child';
	} else if (currentLevel === 3) {
		petAssetId = 'pet_teen';
	} else if (currentLevel >= 4) {
		petAssetId = 'pet_adult';
	}
	var petGraphics = self.attachAsset(petAssetId, {
		anchorX: 0.5,
		anchorY: 0.5
	});
	self.happy = function () {
		// Bounce animation
		tween(self, {
			y: self.y - 50
		}, {
			duration: 300,
			easing: tween.easeOut,
			onFinish: function onFinish() {
				tween(self, {
					y: self.y + 50
				}, {
					duration: 300,
					easing: tween.bounceOut,
					onFinish: function onFinish() {
						petPosition.x = self.x;
						petPosition.y = self.y;
					}
				});
			}
		});
	};
	self.evolve = function () {
		// Evolution animation
		LK.getSound('evolve').play();
		// Flash and grow
		LK.effects.flashObject(self, 0xFFFFFF, 1000);
		tween(petGraphics, {
			scaleX: 1.5,
			scaleY: 1.5
		}, {
			duration: 500,
			easing: tween.easeOut,
			onFinish: function onFinish() {
				// Update to new visual based on new level
				currentLevel = storage.petLevel;
				var newPetAssetId;
				if (currentLevel === 2) {
					newPetAssetId = 'pet_child';
				} else if (currentLevel === 3) {
					newPetAssetId = 'pet_teen';
				} else if (currentLevel >= 4) {
					newPetAssetId = 'pet_adult';
				}
				// Remove old graphic and add new one
				self.removeChild(petGraphics);
				petGraphics = self.attachAsset(newPetAssetId, {
					anchorX: 0.5,
					anchorY: 0.5,
					scaleX: 1.5,
					scaleY: 1.5
				});
				// Reset scale with animation
				tween(petGraphics, {
					scaleX: 1,
					scaleY: 1
				}, {
					duration: 300,
					easing: tween.easeOut
				});
			}
		});
	};
	return self;
});
var ProgressBar = Container.expand(function () {
	var self = Container.call(this);
	var barBackground = self.attachAsset('progressBar_bg', {
		anchorX: 0,
		anchorY: 0.5
	});
	var barFill = self.attachAsset('progressBar_fill', {
		anchorX: 0,
		anchorY: 0.5
	});
	// Set initial width to zero
	barFill.width = 0;
	self.update = function (current, max) {
		console.log("ProgressBar.update called with:", current, "/", max);
		// Check for undefined or invalid values
		if (current === undefined || max === undefined || max === 0) {
			console.log("Invalid parameters for progress bar update, using default values");
			current = 0;
			max = 1;
		}
		var fillPercentage = current / max;
		var targetWidth = fillPercentage * barBackground.width;
		console.log("ProgressBar calculation - fillPercentage:", fillPercentage, "targetWidth:", targetWidth, "barBackground.width:", barBackground.width, "current barFill.width:", barFill.width);
		// Stop any existing tween on the barFill width
		console.log("Stopping existing tween on barFill");
		tween.stop(barFill, {
			width: true
		});
		// Animate the progress bar fill using tween
		console.log("Starting new tween animation on barFill from width:", barFill.width, "to width:", targetWidth);
		tween(barFill, {
			width: targetWidth
		}, {
			duration: 500,
			easing: tween.easeOut,
			onFinish: function onFinish() {
				console.log("ProgressBar fill animation completed - final width:", barFill.width);
			}
		});
	};
	return self;
});
var StatusText = Text2.expand(function (initialText) {
	var self = Text2.call(this, initialText, {
		size: 60,
		fill: 0xFFFFFF
	});
	self.anchor.set(0.5, 0.5);
	self.showMessage = function (message) {
		self.setText(message);
		self.alpha = 1;
		tween(self, {
			alpha: 0
		}, {
			duration: 3000,
			easing: tween.linear
		});
	};
	return self;
});

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

/**** 
* Game Code
****/ 
// Game state - load these first
var petLevel = storage.petLevel || 1;
var petXp = storage.petXp || 0;
var lastFed = storage.lastFed || 0;
var lastCleaned = storage.lastCleaned || 0;
var lastPlayed = storage.lastPlayed || 0;
// Game constants - calculate after loading state
var BASE_XP_PER_LEVEL = 100;
var XP_PER_LEVEL = BASE_XP_PER_LEVEL * Math.pow(2, petLevel - 1); // Doubles with each level
var XP_GAIN_FEED = 20;
var XP_GAIN_CLEAN = 15;
var XP_GAIN_PLAY = 25;
var COOLDOWN_TIME = 10000; // 10 seconds cooldown between actions
var hpText; // Define hpText in global scope
// Vector2 positions for pet at different evolution levels
var petBabyPosition = {
	x: 2048 / 2,
	y: 2732 / 2 + 250
};
var petChildPosition = {
	x: 2048 / 2,
	y: 2732 / 2 + 200
};
var petTeenPosition = {
	x: 2048 / 2,
	y: 2732 / 2 + 150
};
var petAdultPosition = {
	x: 2048 / 2,
	y: 2732 / 2 + 150
};
// Track current game state
var currentScreen = "menu";
var mainMenu, pet, progressBar, statusText, levelText;
var feedButton, cleanButton, playButton;
// Current pet position based on level
var petPosition = petBabyPosition;
// Initialize progress bar only once, not re-initialized by other functions
progressBar = new ProgressBar();
// Initialize menu
function initMainMenu() {
	// Clear previous game elements if they exist
	clearGameElements();
	// Create and setup main menu
	mainMenu = new MainMenu();
	game.addChild(mainMenu);
	// Set up start game callback
	mainMenu.onStartGame = function () {
		currentScreen = "game";
		initGameScreen();
	};
	// Set up reset game callback
	mainMenu.onResetGame = function () {
		// Reset all storage values
		storage.petLevel = 1;
		storage.petXp = 0;
		storage.lastFed = 0;
		storage.lastCleaned = 0;
		storage.lastPlayed = 0;
		// Show confirmation text
		var confirmText = new Text2("Game data reset!", {
			size: 60,
			fill: 0xFFFFFF
		});
		confirmText.anchor.set(0.5, 0.5);
		confirmText.x = 2048 / 2;
		confirmText.y = 2732 / 2 + 500;
		mainMenu.addChild(confirmText);
		// Fade out confirmation text
		tween(confirmText, {
			alpha: 0
		}, {
			duration: 2000,
			onFinish: function onFinish() {
				mainMenu.removeChild(confirmText);
			}
		});
	};
	// Play background music
	LK.playMusic('bgmusic');
}
// Initialize game screen
function initGameScreen() {
	console.log("Initializing game screen");
	// Clear previous elements
	clearGameElements();
	// Add game background
	var gameBackground = LK.getAsset('game_background', {
		anchorX: 0.5,
		anchorY: 0.5
	});
	gameBackground.x = 2048 / 2;
	gameBackground.y = 2732 / 2;
	game.addChild(gameBackground);
	// Create game elements
	pet = new Pet();
	pet.x = petPosition.x;
	pet.y = petPosition.y;
	game.addChild(pet);
	// Create progress bar
	console.log("Creating progress bar");
	progressBar.x = (2048 - progressBar.children[0].width) / 2;
	progressBar.y = 2732 - 200;
	console.log("Progress bar created:", progressBar);
	console.log("Progress bar elements - barBackground:", progressBar.children[0], "barFill:", progressBar.children[1]);
	game.addChild(progressBar);
	// Status text
	statusText = new StatusText("");
	statusText.x = 2048 / 2;
	statusText.y = progressBar.y + 100;
	statusText.alpha = 0;
	game.addChild(statusText);
	// Level text
	levelText = new Text2("Level " + petLevel, {
		size: 80,
		fill: 0xFFFFFF
	});
	levelText.anchor.set(0.5, 0.5);
	levelText.x = 2048 / 2;
	levelText.y = 200;
	game.addChild(levelText);
	// Create action buttons
	feedButton = new ActionButton('feed');
	feedButton.x = 2048 / 4;
	feedButton.y = 2732 - 400;
	game.addChild(feedButton);
	cleanButton = new ActionButton('clean');
	cleanButton.x = 2048 / 2;
	cleanButton.y = 2732 - 400;
	game.addChild(cleanButton);
	playButton = new ActionButton('play');
	playButton.x = 2048 * 3 / 4;
	playButton.y = 2732 - 400;
	game.addChild(playButton);
	// Recalculate XP_PER_LEVEL based on current level
	XP_PER_LEVEL = BASE_XP_PER_LEVEL * Math.pow(2, petLevel - 1);
	console.log("Current petLevel:", petLevel, "XP_PER_LEVEL:", XP_PER_LEVEL);
	// Create HP text display
	console.log("Creating HP text with petXp:", petXp, "XP_PER_LEVEL:", XP_PER_LEVEL);
	hpText = new Text2("XP: " + petXp + "/" + XP_PER_LEVEL, {
		size: 60,
		fill: 0xFFFFFF
	});
	hpText.anchor.set(0, 0.5);
	hpText.x = progressBar.x + 10;
	hpText.y = progressBar.y - 50;
	game.addChild(hpText);
	// Make sure all values are calculated before updating progress bar
	XP_PER_LEVEL = BASE_XP_PER_LEVEL * Math.pow(2, petLevel - 1);
	// Update the progress bar on start
	console.log("Initial progress bar update with petXp:", petXp, "XP_PER_LEVEL:", XP_PER_LEVEL);
	// Ensure values are defined before calling update
	if (petXp !== undefined && XP_PER_LEVEL !== undefined) {
		progressBar.update(petXp, XP_PER_LEVEL);
	} else {
		console.log("Warning: petXp or XP_PER_LEVEL is undefined");
		progressBar.update(0, 1); // Use safe defaults
	}
	console.log("Game screen initialization complete");
}
// Clear all game elements
function clearGameElements() {
	while (game.children.length > 0) {
		game.removeChild(game.children[0]);
	}
}
// Start with main menu
initMainMenu();
// Play background music
LK.playMusic('bgmusic');
function performFeedAction() {
	console.log("performFeedAction called");
	var currentTime = Date.now();
	if (currentTime - lastFed < COOLDOWN_TIME) {
		statusText.showMessage("Pet is still full! Wait a moment.");
		console.log("Action on cooldown, can't feed yet");
		return;
	}
	console.log("Feeding pet, adding XP:", XP_GAIN_FEED);
	LK.getSound('feed').play();
	pet.happy();
	lastFed = currentTime;
	storage.lastFed = lastFed;
	console.log("Before addXp call - progressBar:", progressBar);
	addXp(XP_GAIN_FEED);
	console.log("After addXp call");
	statusText.showMessage("Pet fed! +20 XP");
}
function performCleanAction() {
	var currentTime = Date.now();
	if (currentTime - lastCleaned < COOLDOWN_TIME) {
		statusText.showMessage("Pet is already clean! Wait a moment.");
		return;
	}
	LK.getSound('clean').play();
	pet.happy();
	lastCleaned = currentTime;
	storage.lastCleaned = lastCleaned;
	addXp(XP_GAIN_CLEAN);
	statusText.showMessage("Pet cleaned! +15 XP");
}
function performPlayAction() {
	var currentTime = Date.now();
	if (currentTime - lastPlayed < COOLDOWN_TIME) {
		statusText.showMessage("Pet is tired! Wait a moment.");
		return;
	}
	LK.getSound('play').play();
	pet.happy();
	lastPlayed = currentTime;
	storage.lastPlayed = lastPlayed;
	addXp(XP_GAIN_PLAY);
	statusText.showMessage("Played with pet! +25 XP");
}
function addXp(amount) {
	console.log("addXp called with amount:", amount);
	petXp += amount;
	storage.petXp = petXp;
	// Check for level up
	if (petXp >= XP_PER_LEVEL) {
		console.log("Level up condition met!");
		petLevel += 1;
		petXp = 0;
		storage.petLevel = petLevel;
		storage.petXp = petXp;
		// Recalculate XP_PER_LEVEL for next level - doubles with each level
		XP_PER_LEVEL = BASE_XP_PER_LEVEL * Math.pow(2, petLevel - 1);
		console.log("New level:", petLevel, "New XP_PER_LEVEL:", XP_PER_LEVEL);
		// Update pet position based on new level
		if (petLevel === 2) {
			petPosition = petChildPosition;
		} else if (petLevel === 3) {
			petPosition = petTeenPosition;
		} else if (petLevel >= 4) {
			petPosition = petAdultPosition;
		}
		// Update pet position
		pet.x = petPosition.x;
		pet.y = petPosition.y;
		levelText.setText("Level " + petLevel);
		pet.evolve();
		if (petLevel >= 4) {
			statusText.showMessage("Maximum level reached!");
		} else {
			statusText.showMessage("Pet evolved to level " + petLevel + "! Next level: " + XP_PER_LEVEL + " XP");
		}
	}
	// Update progress bar with current percentage
	// Update the HP text with current XP
	if (hpText) {
		hpText.setText("XP: " + petXp + "/" + XP_PER_LEVEL);
	} else {
		console.log("hpText is undefined or null");
	}
}
// Game update function
game.update = function () {
	// Screen-specific updates
	if (currentScreen === "game") {
		// Any per-frame updates for gameplay can go here
		progressBar.update(petXp, XP_PER_LEVEL);
	} else if (currentScreen === "menu") {
		// Any per-frame updates for menu can go here
	}
};

===================================================================
--- original.js
+++ change.js
@@ -561,9 +561,8 @@
 			statusText.showMessage("Pet evolved to level " + petLevel + "! Next level: " + XP_PER_LEVEL + " XP");
 		}
 	}
 	// Update progress bar with current percentage
-	progressBar.update(petXp, XP_PER_LEVEL);
 	// Update the HP text with current XP
 	if (hpText) {
 		hpText.setText("XP: " + petXp + "/" + XP_PER_LEVEL);
 	} else {
@@ -574,8 +573,9 @@
 game.update = function () {
 	// Screen-specific updates
 	if (currentScreen === "game") {
 		// Any per-frame updates for gameplay can go here
+		progressBar.update(petXp, XP_PER_LEVEL);
 	} else if (currentScreen === "menu") {
 		// Any per-frame updates for menu can go here
 	}
 };
\ No newline at end of file