diff --git a/public/assets/creeps/demon/spritesheet.png b/public/assets/creeps/demon_spritesheet.png similarity index 100% rename from public/assets/creeps/demon/spritesheet.png rename to public/assets/creeps/demon_spritesheet.png diff --git a/public/assets/creeps/hood/spritesheet.png b/public/assets/creeps/hood_spritesheet.png similarity index 100% rename from public/assets/creeps/hood/spritesheet.png rename to public/assets/creeps/hood_spritesheet.png diff --git a/public/assets/creeps/pumpkin/spritesheet.png b/public/assets/creeps/pumpkin_spritesheet.png similarity index 100% rename from public/assets/creeps/pumpkin/spritesheet.png rename to public/assets/creeps/pumpkin_spritesheet.png diff --git a/public/assets/creeps/skeleton/spritesheet.png b/public/assets/creeps/skeleton_spritesheet.png similarity index 100% rename from public/assets/creeps/skeleton/spritesheet.png rename to public/assets/creeps/skeleton_spritesheet.png diff --git a/public/assets/creeps/wood/spritesheet.png b/public/assets/creeps/wood_spritesheet.png similarity index 100% rename from public/assets/creeps/wood/spritesheet.png rename to public/assets/creeps/wood_spritesheet.png diff --git a/public/assets/creeps/zombie/spritesheet.png b/public/assets/creeps/zombie_spritesheet.png similarity index 100% rename from public/assets/creeps/zombie/spritesheet.png rename to public/assets/creeps/zombie_spritesheet.png diff --git a/public/assets/gui/background_01.png b/public/assets/gui/background_01.png deleted file mode 100755 index 3fa5d9b..0000000 Binary files a/public/assets/gui/background_01.png and /dev/null differ diff --git a/public/assets/gui/banner_03.png b/public/assets/gui/banner_03.png deleted file mode 100755 index 63258b3..0000000 Binary files a/public/assets/gui/banner_03.png and /dev/null differ diff --git a/public/assets/gui/frame_c2_02.png b/public/assets/gui/frame_c2_02.png deleted file mode 100755 index 1adb74d..0000000 Binary files a/public/assets/gui/frame_c2_02.png and /dev/null differ diff --git a/public/assets/gui/gem_frame.png b/public/assets/gui/gem_frame.png deleted file mode 100755 index d3d7f42..0000000 Binary files a/public/assets/gui/gem_frame.png and /dev/null differ diff --git a/public/assets/gui/inventory.png b/public/assets/gui/inventory.png deleted file mode 100755 index ab93a6a..0000000 Binary files a/public/assets/gui/inventory.png and /dev/null differ diff --git a/public/assets/gui/plank_14.png b/public/assets/gui/plank_14.png deleted file mode 100755 index 3a1152d..0000000 Binary files a/public/assets/gui/plank_14.png and /dev/null differ diff --git a/public/assets/gui/shield_01.png b/public/assets/gui/shield_01.png deleted file mode 100755 index 57969ac..0000000 Binary files a/public/assets/gui/shield_01.png and /dev/null differ diff --git a/public/assets/gui/shield_02.png b/public/assets/gui/shield_02.png deleted file mode 100755 index 618adb8..0000000 Binary files a/public/assets/gui/shield_02.png and /dev/null differ diff --git a/public/assets/gui/skull_01.png b/public/assets/gui/skull_01.png deleted file mode 100755 index aeb97cd..0000000 Binary files a/public/assets/gui/skull_01.png and /dev/null differ diff --git a/public/assets/gui/star.png b/public/assets/gui/star.png deleted file mode 100755 index 20ce16c..0000000 Binary files a/public/assets/gui/star.png and /dev/null differ diff --git a/public/assets/gui/star_empty.png b/public/assets/gui/star_empty.png deleted file mode 100755 index 2682b22..0000000 Binary files a/public/assets/gui/star_empty.png and /dev/null differ diff --git a/public/assets/gui/title.png b/public/assets/gui/title.png deleted file mode 100755 index a34a831..0000000 Binary files a/public/assets/gui/title.png and /dev/null differ diff --git a/src/classes/Assets.ts b/src/classes/Assets.ts index 9b708b8..6d77026 100644 --- a/src/classes/Assets.ts +++ b/src/classes/Assets.ts @@ -10,17 +10,13 @@ export default class GameAssets { public static Frame03Texture: PIXI.Texture; public static Frame04Texture: PIXI.Texture; public static Frame05Texture: PIXI.Texture; - public static FrameInventory: PIXI.Texture; - public static FrameBackground: PIXI.Texture; public static FrameTowerTab: PIXI.Texture; - public static VioletBackground: PIXI.Texture; public static RedBackground: PIXI.Texture; public static GreenBackground: PIXI.Texture; public static BlueBackground: PIXI.Texture; public static YellowBackground: PIXI.Texture; public static Button01Texture: PIXI.Texture; public static Button02Texture: PIXI.Texture; - public static ButtonSmallTexture: PIXI.Texture; public static HealthTexture: PIXI.Texture; public static GoldTexture: PIXI.Texture; public static WaveTexture: PIXI.Texture; @@ -40,8 +36,6 @@ export default class GameAssets { public static PauseIconTexture: PIXI.Texture; public static ExclamationIconTexture: PIXI.Texture; public static FastForwardIconTexture: PIXI.Texture; - public static HomeIconTexture: PIXI.Texture; - public static HammerIconTexture: PIXI.Texture; public static XIconTexture: PIXI.Texture; public static PlusIconTexture: PIXI.Texture; public static GemAmountIcons: PIXI.Texture[] = []; @@ -53,8 +47,11 @@ export default class GameAssets { public static Gems: GemDefinition[]; private static text; + private static counter = 0; private static async Load(src) { this.text.text = 'Loading asset: ' + src; + this.counter++; + console.log(this.counter); return await PIXI.Assets.load({ src: src, }); @@ -94,16 +91,12 @@ export default class GameAssets { this.Load('./aclonica.woff2'), this.Load('./assets/gui/button_01.png').then((texture) => (this.Button01Texture = texture)), this.Load('./assets/gui/button_02.png').then((texture) => (this.Button02Texture = texture)), - this.Load('./assets/gui/button_small.png').then((texture) => (this.ButtonSmallTexture = texture)), this.Load('./assets/gui/frame_01.png').then((texture) => (this.Frame01Texture = texture)), this.Load('./assets/gui/frame_02.png').then((texture) => (this.Frame02Texture = texture)), this.Load('./assets/gui/frame_03.png').then((texture) => (this.Frame03Texture = texture)), this.Load('./assets/gui/frame_04.png').then((texture) => (this.Frame04Texture = texture)), this.Load('./assets/gui/frame_05.png').then((texture) => (this.Frame05Texture = texture)), - this.Load('./assets/gui/frame_inv.png').then((texture) => (this.FrameInventory = texture)), - this.Load('./assets/gui/background_01.png').then((texture) => (this.FrameBackground = texture)), this.Load('./assets/gui/background_02.png').then((texture) => (this.FrameTowerTab = texture)), - this.Load('./assets/gui/frame_violet.png').then((texture) => (this.VioletBackground = texture)), this.Load('./assets/gui/frame_red.png').then((texture) => (this.RedBackground = texture)), this.Load('./assets/gui/frame_green.png').then((texture) => (this.GreenBackground = texture)), this.Load('./assets/gui/frame_blue.png').then((texture) => (this.BlueBackground = texture)), @@ -125,10 +118,7 @@ export default class GameAssets { this.Load('./assets/gui/title01.png').then((texture) => (this.TitleTexture = texture)), this.Load('./assets/gui/icons/play.png').then((texture) => (this.PlayIconTexture = texture)), this.Load('./assets/gui/icons/pause.png').then((texture) => (this.PauseIconTexture = texture)), - this.Load('./assets/gui/icons/pause.png').then((texture) => (this.PauseIconTexture = texture)), this.Load('./assets/gui/icons/fastforward.png').then((texture) => (this.FastForwardIconTexture = texture)), - this.Load('./assets/gui/icons/home.png').then((texture) => (this.HomeIconTexture = texture)), - this.Load('./assets/gui/icons/hammer.png').then((texture) => (this.HammerIconTexture = texture)), this.Load('./assets/gui/icons/cross.png').then((texture) => (this.XIconTexture = texture)), this.Load('./assets/gui/icons/plus.png').then((texture) => (this.PlusIconTexture = texture)), this.LoadMissions(), @@ -165,7 +155,7 @@ export default class GameAssets { for (let idx = 0; idx < this.Creeps.length; idx++) { const creep = this.Creeps[idx]; for (let i = 0; i < creep.textureArrayLength; i++) { - const texture = await this.Load(`./assets/creeps/${creep.sprite}/spritesheet.png`); + const texture = await this.Load(`./assets/creeps/${creep.sprite}_spritesheet.png`); const spritesheet = new PIXI.Spritesheet(texture, { frames: { [`${creep.sprite}_${i}.png`]: { @@ -185,7 +175,6 @@ export default class GameAssets { }); await spritesheet.parse(); creep.textures[i] = spritesheet.textures[`${creep.sprite}_${i}.png`]; - // creep.textures[i] = texture; } } } diff --git a/src/scenes/Game.ts b/src/scenes/Game.ts index b208ccf..94c6484 100644 --- a/src/scenes/Game.ts +++ b/src/scenes/Game.ts @@ -191,7 +191,6 @@ export class GameScene extends Scene { ); if (this.currentRound + 1 == this.mission.rounds.length) { Engine.NotificationManager.Notify(`Mission victory!!`, 'reward'); - this.changeRoundButton.buttonIcon.texture = GameAssets.HomeIconTexture; this.playerWon = true; } else { this.OfferPlayerGems();