diff --git a/source/core/assets/images/background.png b/source/core/assets/images/background/background.png similarity index 100% rename from source/core/assets/images/background.png rename to source/core/assets/images/background/background.png diff --git a/source/core/assets/images/background1.png b/source/core/assets/images/background/background1.png similarity index 100% rename from source/core/assets/images/background1.png rename to source/core/assets/images/background/background1.png diff --git a/source/core/assets/images/building1.png b/source/core/assets/images/background/building1.png similarity index 100% rename from source/core/assets/images/building1.png rename to source/core/assets/images/background/building1.png diff --git a/source/core/assets/images/building2.png b/source/core/assets/images/background/building2.png similarity index 100% rename from source/core/assets/images/building2.png rename to source/core/assets/images/background/building2.png diff --git a/source/core/assets/images/mountain.png b/source/core/assets/images/background/mountain.png similarity index 100% rename from source/core/assets/images/mountain.png rename to source/core/assets/images/background/mountain.png diff --git a/source/core/assets/images/scrap.png b/source/core/assets/images/economy/scrap.png similarity index 100% rename from source/core/assets/images/scrap.png rename to source/core/assets/images/economy/scrap.png diff --git a/source/core/assets/images/scrapsUI.png b/source/core/assets/images/economy/scrapsUI.png similarity index 100% rename from source/core/assets/images/scrapsUI.png rename to source/core/assets/images/economy/scrapsUI.png diff --git a/source/core/assets/images/Attack_1.png b/source/core/assets/images/mobs/Attack_1.png similarity index 100% rename from source/core/assets/images/Attack_1.png rename to source/core/assets/images/mobs/Attack_1.png diff --git a/source/core/assets/images/Attack_2.png b/source/core/assets/images/mobs/Attack_2.png similarity index 100% rename from source/core/assets/images/Attack_2.png rename to source/core/assets/images/mobs/Attack_2.png diff --git a/source/core/assets/images/Charge_1.png b/source/core/assets/images/mobs/Charge_1.png similarity index 100% rename from source/core/assets/images/Charge_1.png rename to source/core/assets/images/mobs/Charge_1.png diff --git a/source/core/assets/images/Charge_2.png b/source/core/assets/images/mobs/Charge_2.png similarity index 100% rename from source/core/assets/images/Charge_2.png rename to source/core/assets/images/mobs/Charge_2.png diff --git a/source/core/assets/images/Dead.png b/source/core/assets/images/mobs/Dead.png similarity index 100% rename from source/core/assets/images/Dead.png rename to source/core/assets/images/mobs/Dead.png diff --git a/source/core/assets/images/Enabling-5.png b/source/core/assets/images/mobs/Enabling-5.png similarity index 100% rename from source/core/assets/images/Enabling-5.png rename to source/core/assets/images/mobs/Enabling-5.png diff --git a/source/core/assets/images/Enabling.png b/source/core/assets/images/mobs/Enabling.png similarity index 100% rename from source/core/assets/images/Enabling.png rename to source/core/assets/images/mobs/Enabling.png diff --git a/source/core/assets/images/Hurt.png b/source/core/assets/images/mobs/Hurt.png similarity index 100% rename from source/core/assets/images/Hurt.png rename to source/core/assets/images/mobs/Hurt.png diff --git a/source/core/assets/images/Idle.png b/source/core/assets/images/mobs/Idle.png similarity index 100% rename from source/core/assets/images/Idle.png rename to source/core/assets/images/mobs/Idle.png diff --git a/source/core/assets/images/Shot_1.png b/source/core/assets/images/mobs/Shot_1.png similarity index 100% rename from source/core/assets/images/Shot_1.png rename to source/core/assets/images/mobs/Shot_1.png diff --git a/source/core/assets/images/Shot_2.png b/source/core/assets/images/mobs/Shot_2.png similarity index 100% rename from source/core/assets/images/Shot_2.png rename to source/core/assets/images/mobs/Shot_2.png diff --git a/source/core/assets/images/Shutdown.png b/source/core/assets/images/mobs/Shutdown.png similarity index 100% rename from source/core/assets/images/Shutdown.png rename to source/core/assets/images/mobs/Shutdown.png diff --git a/source/core/assets/images/Walk.png b/source/core/assets/images/mobs/Walk.png similarity index 100% rename from source/core/assets/images/Walk.png rename to source/core/assets/images/mobs/Walk.png diff --git a/source/core/assets/images/boss_health.png b/source/core/assets/images/mobs/boss_health.png similarity index 100% rename from source/core/assets/images/boss_health.png rename to source/core/assets/images/mobs/boss_health.png diff --git a/source/core/assets/images/ghost_king.png b/source/core/assets/images/mobs/ghost_king.png similarity index 100% rename from source/core/assets/images/ghost_king.png rename to source/core/assets/images/mobs/ghost_king.png diff --git a/source/core/assets/images/rangeBossRight.atlas b/source/core/assets/images/mobs/rangeBossRight.atlas similarity index 100% rename from source/core/assets/images/rangeBossRight.atlas rename to source/core/assets/images/mobs/rangeBossRight.atlas diff --git a/source/core/assets/images/rangeBossRight.png b/source/core/assets/images/mobs/rangeBossRight.png similarity index 100% rename from source/core/assets/images/rangeBossRight.png rename to source/core/assets/images/mobs/rangeBossRight.png diff --git a/source/core/assets/images/robot.atlas b/source/core/assets/images/mobs/robot.atlas similarity index 100% rename from source/core/assets/images/robot.atlas rename to source/core/assets/images/mobs/robot.atlas diff --git a/source/core/assets/images/robot.png b/source/core/assets/images/mobs/robot.png similarity index 100% rename from source/core/assets/images/robot.png rename to source/core/assets/images/mobs/robot.png diff --git a/source/core/assets/images/satyr.png b/source/core/assets/images/mobs/satyr.png similarity index 100% rename from source/core/assets/images/satyr.png rename to source/core/assets/images/mobs/satyr.png diff --git a/source/core/assets/images/xeno-grunt-attack-1.png b/source/core/assets/images/mobs/xeno-grunt-attack-1.png similarity index 100% rename from source/core/assets/images/xeno-grunt-attack-1.png rename to source/core/assets/images/mobs/xeno-grunt-attack-1.png diff --git a/source/core/assets/images/xeno-grunt-attack-2.png b/source/core/assets/images/mobs/xeno-grunt-attack-2.png similarity index 100% rename from source/core/assets/images/xeno-grunt-attack-2.png rename to source/core/assets/images/mobs/xeno-grunt-attack-2.png diff --git a/source/core/assets/images/xeno-grunt-death-falling.png b/source/core/assets/images/mobs/xeno-grunt-death-falling.png similarity index 100% rename from source/core/assets/images/xeno-grunt-death-falling.png rename to source/core/assets/images/mobs/xeno-grunt-death-falling.png diff --git a/source/core/assets/images/xeno-grunt-death-grounded.png b/source/core/assets/images/mobs/xeno-grunt-death-grounded.png similarity index 100% rename from source/core/assets/images/xeno-grunt-death-grounded.png rename to source/core/assets/images/mobs/xeno-grunt-death-grounded.png diff --git a/source/core/assets/images/xeno-grunt-death.png b/source/core/assets/images/mobs/xeno-grunt-death.png similarity index 100% rename from source/core/assets/images/xeno-grunt-death.png rename to source/core/assets/images/mobs/xeno-grunt-death.png diff --git a/source/core/assets/images/xeno-grunt-falling.png b/source/core/assets/images/mobs/xeno-grunt-falling.png similarity index 100% rename from source/core/assets/images/xeno-grunt-falling.png rename to source/core/assets/images/mobs/xeno-grunt-falling.png diff --git a/source/core/assets/images/xeno-grunt-idle.png b/source/core/assets/images/mobs/xeno-grunt-idle.png similarity index 100% rename from source/core/assets/images/xeno-grunt-idle.png rename to source/core/assets/images/mobs/xeno-grunt-idle.png diff --git a/source/core/assets/images/xeno-grunt-jump-effect.png b/source/core/assets/images/mobs/xeno-grunt-jump-effect.png similarity index 100% rename from source/core/assets/images/xeno-grunt-jump-effect.png rename to source/core/assets/images/mobs/xeno-grunt-jump-effect.png diff --git a/source/core/assets/images/xeno-grunt-jumping.png b/source/core/assets/images/mobs/xeno-grunt-jumping.png similarity index 100% rename from source/core/assets/images/xeno-grunt-jumping.png rename to source/core/assets/images/mobs/xeno-grunt-jumping.png diff --git a/source/core/assets/images/xeno-grunt-knockback.png b/source/core/assets/images/mobs/xeno-grunt-knockback.png similarity index 100% rename from source/core/assets/images/xeno-grunt-knockback.png rename to source/core/assets/images/mobs/xeno-grunt-knockback.png diff --git a/source/core/assets/images/xeno-grunt-melee-attack.png b/source/core/assets/images/mobs/xeno-grunt-melee-attack.png similarity index 100% rename from source/core/assets/images/xeno-grunt-melee-attack.png rename to source/core/assets/images/mobs/xeno-grunt-melee-attack.png diff --git a/source/core/assets/images/xeno-grunt-prep-jump.png b/source/core/assets/images/mobs/xeno-grunt-prep-jump.png similarity index 100% rename from source/core/assets/images/xeno-grunt-prep-jump.png rename to source/core/assets/images/mobs/xeno-grunt-prep-jump.png diff --git a/source/core/assets/images/xeno-grunt-projectile-explosion.png b/source/core/assets/images/mobs/xeno-grunt-projectile-explosion.png similarity index 100% rename from source/core/assets/images/xeno-grunt-projectile-explosion.png rename to source/core/assets/images/mobs/xeno-grunt-projectile-explosion.png diff --git a/source/core/assets/images/xeno-grunt-range-attack.png b/source/core/assets/images/mobs/xeno-grunt-range-attack.png similarity index 100% rename from source/core/assets/images/xeno-grunt-range-attack.png rename to source/core/assets/images/mobs/xeno-grunt-range-attack.png diff --git a/source/core/assets/images/xeno-grunt-range-projectile.png b/source/core/assets/images/mobs/xeno-grunt-range-projectile.png similarity index 100% rename from source/core/assets/images/xeno-grunt-range-projectile.png rename to source/core/assets/images/mobs/xeno-grunt-range-projectile.png diff --git a/source/core/assets/images/xeno-grunt-run-damaged.png b/source/core/assets/images/mobs/xeno-grunt-run-damaged.png similarity index 100% rename from source/core/assets/images/xeno-grunt-run-damaged.png rename to source/core/assets/images/mobs/xeno-grunt-run-damaged.png diff --git a/source/core/assets/images/xeno-grunt-run.png b/source/core/assets/images/mobs/xeno-grunt-run.png similarity index 100% rename from source/core/assets/images/xeno-grunt-run.png rename to source/core/assets/images/mobs/xeno-grunt-run.png diff --git a/source/core/assets/images/xenoGruntDeath.atlas b/source/core/assets/images/mobs/xenoGruntDeath.atlas similarity index 100% rename from source/core/assets/images/xenoGruntDeath.atlas rename to source/core/assets/images/mobs/xenoGruntDeath.atlas diff --git a/source/core/assets/images/xenoGruntMeleeAttack.atlas b/source/core/assets/images/mobs/xenoGruntMeleeAttack.atlas similarity index 100% rename from source/core/assets/images/xenoGruntMeleeAttack.atlas rename to source/core/assets/images/mobs/xenoGruntMeleeAttack.atlas diff --git a/source/core/assets/images/xenoGruntRangedAttack.atlas b/source/core/assets/images/mobs/xenoGruntRangedAttack.atlas similarity index 100% rename from source/core/assets/images/xenoGruntRangedAttack.atlas rename to source/core/assets/images/mobs/xenoGruntRangedAttack.atlas diff --git a/source/core/assets/images/xenoGruntRunning.atlas b/source/core/assets/images/mobs/xenoGruntRunning.atlas similarity index 100% rename from source/core/assets/images/xenoGruntRunning.atlas rename to source/core/assets/images/mobs/xenoGruntRunning.atlas diff --git a/source/core/assets/images/xenoGruntRunningDamaged.atlas b/source/core/assets/images/mobs/xenoGruntRunningDamaged.atlas similarity index 100% rename from source/core/assets/images/xenoGruntRunningDamaged.atlas rename to source/core/assets/images/mobs/xenoGruntRunningDamaged.atlas diff --git a/source/core/assets/images/projectile.png b/source/core/assets/images/projectiles/projectile.png similarity index 100% rename from source/core/assets/images/projectile.png rename to source/core/assets/images/projectiles/projectile.png diff --git a/source/core/assets/images/mine_tower.png b/source/core/assets/images/towers/mine_tower.png similarity index 100% rename from source/core/assets/images/mine_tower.png rename to source/core/assets/images/towers/mine_tower.png diff --git a/source/core/assets/images/turret.atlas b/source/core/assets/images/towers/turret.atlas similarity index 100% rename from source/core/assets/images/turret.atlas rename to source/core/assets/images/towers/turret.atlas diff --git a/source/core/assets/images/turret.png b/source/core/assets/images/towers/turret.png similarity index 100% rename from source/core/assets/images/turret.png rename to source/core/assets/images/towers/turret.png diff --git a/source/core/assets/images/turret01.atlas b/source/core/assets/images/towers/turret01.atlas similarity index 100% rename from source/core/assets/images/turret01.atlas rename to source/core/assets/images/towers/turret01.atlas diff --git a/source/core/assets/images/turret01.png b/source/core/assets/images/towers/turret01.png similarity index 100% rename from source/core/assets/images/turret01.png rename to source/core/assets/images/towers/turret01.png diff --git a/source/core/assets/images/turret_deployed.png b/source/core/assets/images/towers/turret_deployed.png similarity index 100% rename from source/core/assets/images/turret_deployed.png rename to source/core/assets/images/towers/turret_deployed.png diff --git a/source/core/assets/images/wallTower.png b/source/core/assets/images/towers/wallTower.png similarity index 100% rename from source/core/assets/images/wallTower.png rename to source/core/assets/images/towers/wallTower.png diff --git a/source/core/assets/images/Logo2.png b/source/core/assets/images/ui/Logo2.png similarity index 100% rename from source/core/assets/images/Logo2.png rename to source/core/assets/images/ui/Logo2.png diff --git a/source/core/assets/images/MainLogo.png b/source/core/assets/images/ui/MainLogo.png similarity index 100% rename from source/core/assets/images/MainLogo.png rename to source/core/assets/images/ui/MainLogo.png diff --git a/source/core/assets/sounds/BGM_03_mp3.mp3 b/source/core/assets/sounds/BGM_03_mp3.mp3 deleted file mode 100644 index 25f08259b..000000000 Binary files a/source/core/assets/sounds/BGM_03_mp3.mp3 and /dev/null differ diff --git a/source/core/assets/sounds/Sci-Fi 1.ogg b/source/core/assets/sounds/Sci-Fi 1.ogg deleted file mode 100644 index eb13d0913..000000000 Binary files a/source/core/assets/sounds/Sci-Fi 1.ogg and /dev/null differ diff --git a/source/core/assets/sounds/Sci-Fi1.ogg b/source/core/assets/sounds/background/Sci-Fi1.ogg similarity index 100% rename from source/core/assets/sounds/Sci-Fi1.ogg rename to source/core/assets/sounds/background/Sci-Fi1.ogg diff --git a/source/core/assets/sounds/projectile firing.mp3 b/source/core/assets/sounds/projectiles/projectile firing.mp3 similarity index 100% rename from source/core/assets/sounds/projectile firing.mp3 rename to source/core/assets/sounds/projectiles/projectile firing.mp3 diff --git a/source/core/assets/sounds/deploy.mp3 b/source/core/assets/sounds/towers/deploy.mp3 similarity index 100% rename from source/core/assets/sounds/deploy.mp3 rename to source/core/assets/sounds/towers/deploy.mp3 diff --git a/source/core/assets/sounds/gun_shot_trimmed.mp3 b/source/core/assets/sounds/towers/gun_shot_trimmed.mp3 similarity index 100% rename from source/core/assets/sounds/gun_shot_trimmed.mp3 rename to source/core/assets/sounds/towers/gun_shot_trimmed.mp3 diff --git a/source/core/assets/sounds/stow.mp3 b/source/core/assets/sounds/towers/stow.mp3 similarity index 100% rename from source/core/assets/sounds/stow.mp3 rename to source/core/assets/sounds/towers/stow.mp3 diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java index 67790531c..c3e93e6ef 100644 --- a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java +++ b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java @@ -48,14 +48,14 @@ public class ForestGameArea extends GameArea { // Required to load assets before using them private static final String[] forestTextures = { - "images/projectile.png", + "images/projectiles/projectile.png", "images/box_boy_leaf.png", - "images/building1.png", + "images/background/building1.png", "images/ghost_1.png", "images/grass_2.png", "images/grass_3.png", "images/hex_grass_1.png", - "images/mountain.png", + "images/background/mountain.png", "images/ghost_king.png", "images/ghost_1.png", "images/terrain 2 normal.png", @@ -65,41 +65,44 @@ public class ForestGameArea extends GameArea { "images/iso_grass_1.png", "images/iso_grass_2.png", "images/iso_grass_3.png", - "images/turret.png", - "images/turret01.png", - "images/turret_deployed.png", - "images/building2.png", - "images/wall.png", - "images/robot.png", - "images/Attack_1.png", - "images/Attack_2.png", - "images/Charge_1.png", - "images/Charge_2.png", - "images/Dead.png", - "images/Enabling-5.png", - "images/satyr.png", - "images/Hurt.png", - "images/Idle.png", - "images/rangeBossRight.png", - "images/wallTower.png", - "images/building2.png", + "images/towers/turret.png", + "images/towers/turret01.png", + "images/towers/turret_deployed.png", + "images/background/building2.png", + "images/mobs/robot.png", + "images/mobs/Attack_1.png", + "images/mobs/Attack_2.png", + "images/mobs/Charge_1.png", + "images/mobs/Charge_2.png", + "images/mobs/Dead.png", + "images/mobs/Enabling-5.png", + "images/mobs/satyr.png", + "images/mobs/Hurt.png", + "images/mobs/Idle.png", + "images/mobs/rangeBossRight.png", + "images/towers/wallTower.png", + "images/background/building2.png", "images/iso_grass_3.png", - "images/scrap.png", - "images/mine_tower.png" + "images/economy/scrap.png", + "images/towers/mine_tower.png" }; private static final String[] forestTextureAtlases = { - "images/terrain_iso_grass.atlas", "images/ghost.atlas", "images/ghostKing.atlas", "images/turret.atlas", - "images/turret01.atlas", "images/xenoGruntRunning.atlas", - "images/robot.atlas", - "images/rangeBossRight.atlas" + "images/terrain_iso_grass.atlas", + "images/ghost.atlas", + "images/ghostKing.atlas", + "images/towers/turret.atlas", + "images/towers/turret01.atlas", + "images/mobs/xenoGruntRunning.atlas", + "images/mobs/robot.atlas", + "images/mobs/rangeBossRight.atlas" }; private static final String[] forestSounds = { "sounds/Impact4.ogg", - "sounds/gun_shot_trimmed.mp3", - "sounds/deploy.mp3", - "sounds/stow.mp3" + "sounds/towers/gun_shot_trimmed.mp3", + "sounds/towers/deploy.mp3", + "sounds/towers/stow.mp3" }; - private static final String backgroundMusic = "sounds/Sci-Fi1.ogg"; + private static final String backgroundMusic = "sounds/background/Sci-Fi1.ogg"; private static final String[] forestMusic = {backgroundMusic}; private final TerrainFactory terrainFactory; diff --git a/source/core/src/main/com/csse3200/game/components/gamearea/CurrencyDisplay.java b/source/core/src/main/com/csse3200/game/components/gamearea/CurrencyDisplay.java index c6d3c8a47..2c784593c 100644 --- a/source/core/src/main/com/csse3200/game/components/gamearea/CurrencyDisplay.java +++ b/source/core/src/main/com/csse3200/game/components/gamearea/CurrencyDisplay.java @@ -43,7 +43,7 @@ private void addActors() { table.padTop(50f).padLeft(20f); // create text button style - Drawable drawable = new TextureRegionDrawable(new TextureRegion(new Texture("images/scrapsUI.png"))); + Drawable drawable = new TextureRegionDrawable(new TextureRegion(new Texture("images/economy/scrapsUI.png"))); TextButton.TextButtonStyle textButtonStyle = new TextButton.TextButtonStyle( drawable, drawable, drawable, new BitmapFont()); diff --git a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java index da8a603c3..d15392b23 100644 --- a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java +++ b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java @@ -32,7 +32,7 @@ private void addActors() { Image title = new Image( ServiceLocator.getResourceService() - .getAsset("images/Logo2.png", Texture.class)); + .getAsset("images/ui/Logo2.png", Texture.class)); TextButton startBtn = new TextButton("Start", skin); TextButton loadBtn = new TextButton("Help", skin); diff --git a/source/core/src/main/com/csse3200/game/components/npc/BossStatsDisplay.java b/source/core/src/main/com/csse3200/game/components/npc/BossStatsDisplay.java index 2c5d56013..264f544fd 100644 --- a/source/core/src/main/com/csse3200/game/components/npc/BossStatsDisplay.java +++ b/source/core/src/main/com/csse3200/game/components/npc/BossStatsDisplay.java @@ -38,7 +38,7 @@ private void addActors() { // Heart image float bossSideLength = 30f; - bossImage = new Image(ServiceLocator.getResourceService().getAsset("images/boss_health.png", Texture.class)); + bossImage = new Image(ServiceLocator.getResourceService().getAsset("images/mobs/boss_health.png", Texture.class)); // Health text int health = entity.getComponent(CombatStatsComponent.class).getHealth(); diff --git a/source/core/src/main/com/csse3200/game/components/tower/TowerAnimationController.java b/source/core/src/main/com/csse3200/game/components/tower/TowerAnimationController.java index 80855c894..a53084434 100644 --- a/source/core/src/main/com/csse3200/game/components/tower/TowerAnimationController.java +++ b/source/core/src/main/com/csse3200/game/components/tower/TowerAnimationController.java @@ -21,9 +21,9 @@ public class TowerAnimationController extends Component { private static final String FIRE_ANIM = "firing"; private static final String STOW_ANIM = "stow"; // Sound effects constants - private static final String DEPLOY_SFX = "sounds/deploy.mp3"; - private static final String FIRE_SFX = "sounds/gun_shot_trimmed.mp3"; - private static final String STOW_SFX = "sounds/stow.mp3"; + private static final String DEPLOY_SFX = "sounds/towers/deploy.mp3"; + private static final String FIRE_SFX = "sounds/towers/gun_shot_trimmed.mp3"; + private static final String STOW_SFX = "sounds/towers/stow.mp3"; AnimationRenderComponent animator; Sound deploySound = ServiceLocator.getResourceService().getAsset( @@ -33,6 +33,10 @@ public class TowerAnimationController extends Component { Sound stowSound = ServiceLocator.getResourceService().getAsset( STOW_SFX, Sound.class); + /** + * Creation call for a TowerAnimationController, fetches the animationRenderComponent that this controller will + * be attached to and registers all the event listeners required to trigger the animations and sounds. + */ @Override public void create() { super.create(); @@ -43,6 +47,9 @@ public void create() { entity.getEvents().addListener(FIRING, this::animateFiring); } + /** + * Starts the + */ void animateIdle() { animator.startAnimation(IDLE_ANIM); } diff --git a/source/core/src/main/com/csse3200/game/currency/Scrap.java b/source/core/src/main/com/csse3200/game/currency/Scrap.java index 958babaa5..cc4ded817 100644 --- a/source/core/src/main/com/csse3200/game/currency/Scrap.java +++ b/source/core/src/main/com/csse3200/game/currency/Scrap.java @@ -4,7 +4,7 @@ public class Scrap extends Currency { private static final int STARTING_CURRENCY = 100; - private static final String LOGO_FILE_PATH = "images/scrap.png"; // The file path of the logo + private static final String LOGO_FILE_PATH = "images/economy/scrap.png"; // The file path of the logo /** * Constructor for the scrap currency object. diff --git a/source/core/src/main/com/csse3200/game/entities/factories/BossKingFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/BossKingFactory.java index 11ea658ee..1bd29a628 100644 --- a/source/core/src/main/com/csse3200/game/entities/factories/BossKingFactory.java +++ b/source/core/src/main/com/csse3200/game/entities/factories/BossKingFactory.java @@ -50,7 +50,7 @@ public static Entity createBossKing1(Entity target) { AnimationRenderComponent animator1 = new AnimationRenderComponent( ServiceLocator.getResourceService() - .getAsset("images/rangeBossRight.atlas", TextureAtlas.class)); + .getAsset("images/mobs/rangeBossRight.atlas", TextureAtlas.class)); animator1.addAnimation("Walk", 0.3f, Animation.PlayMode.LOOP); @@ -78,7 +78,7 @@ public static Entity createBossKing2(Entity target) { AnimationRenderComponent animator2 = new AnimationRenderComponent( ServiceLocator.getResourceService() - .getAsset("images/robot.atlas", TextureAtlas.class)); + .getAsset("images/mobs/robot.atlas", TextureAtlas.class)); animator2.addAnimation("Walk", 0.3f, Animation.PlayMode.LOOP); bossKing2 diff --git a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java index be12b14e4..dd7777f79 100644 --- a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java +++ b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java @@ -62,7 +62,7 @@ public static Entity createGhost(Entity target) { ghost .addComponent(new CombatStatsComponent(config.health, config.baseAttack)) // .addComponent(animator) - .addComponent(new TextureRenderComponent("images/satyr.png")); + .addComponent(new TextureRenderComponent("images/mobs/satyr.png")); // .addComponent(new GhostAnimationController()); ghost.getComponent(TextureRenderComponent.class).scaleEntity(); @@ -111,7 +111,7 @@ public static Entity createXenoGrunt(Entity target) { AnimationRenderComponent animator = new AnimationRenderComponent( - ServiceLocator.getResourceService().getAsset("images/xenoGruntRunning.atlas", TextureAtlas.class)); + ServiceLocator.getResourceService().getAsset("images/mobs/xenoGruntRunning.atlas", TextureAtlas.class)); animator.addAnimation("xeno_run", 0.1f, Animation.PlayMode.LOOP); animator.addAnimation("xeno_shoot", 0.1f, Animation.PlayMode.NORMAL); animator.addAnimation("xeno_melee", 0.1f, Animation.PlayMode.NORMAL); diff --git a/source/core/src/main/com/csse3200/game/entities/factories/ObstacleFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/ObstacleFactory.java index 913cf346a..f863cbfb2 100644 --- a/source/core/src/main/com/csse3200/game/entities/factories/ObstacleFactory.java +++ b/source/core/src/main/com/csse3200/game/entities/factories/ObstacleFactory.java @@ -22,7 +22,7 @@ public class ObstacleFactory { public static Entity createBuilding1() { Entity building1 = new Entity() - .addComponent(new TextureRenderComponent("images/building1.png")) + .addComponent(new TextureRenderComponent("images/background/building1.png")) .addComponent(new PhysicsComponent()) .addComponent(new ColliderComponent().setLayer(PhysicsLayer.OBSTACLE)); @@ -35,7 +35,7 @@ public static Entity createBuilding1() { public static Entity createBuilding2() { Entity building2 = new Entity() - .addComponent(new TextureRenderComponent("images/building2.png")) + .addComponent(new TextureRenderComponent("images/background/building2.png")) .addComponent(new PhysicsComponent()) .addComponent(new ColliderComponent().setLayer(PhysicsLayer.OBSTACLE)); @@ -49,7 +49,7 @@ public static Entity createBuilding2() { public static Entity createMountain() { Entity mountain = new Entity() - .addComponent(new TextureRenderComponent("images/mountain.png")) + .addComponent(new TextureRenderComponent("images/background/mountain.png")) .addComponent(new PhysicsComponent()) .addComponent(new ColliderComponent().setLayer(PhysicsLayer.OBSTACLE)); diff --git a/source/core/src/main/com/csse3200/game/entities/factories/ProjectileFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/ProjectileFactory.java index ff861fdb4..33d596599 100644 --- a/source/core/src/main/com/csse3200/game/entities/factories/ProjectileFactory.java +++ b/source/core/src/main/com/csse3200/game/entities/factories/ProjectileFactory.java @@ -24,7 +24,7 @@ public class ProjectileFactory { private static final NPCConfigs configs = - FileLoader.readClass(NPCConfigs.class, "configs/NPCS.json"); + FileLoader.readClass(NPCConfigs.class, "configs/NPCs.json"); /** * Creates a fireball Entity. @@ -40,7 +40,7 @@ public static Entity createFireBall(Entity target, Vector2 destination, Vector2 Entity projectile = createBaseProjectile(target, destination); projectile - .addComponent(new TextureRenderComponent("images/projectile.png")) + .addComponent(new TextureRenderComponent("images/projectiles/projectile.png")) .addComponent(new ColliderComponent().setSensor(true)) // This is the component that allows the projectile to damage a specified target. diff --git a/source/core/src/main/com/csse3200/game/entities/factories/TowerFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/TowerFactory.java index 77b29bb45..04dab2a54 100644 --- a/source/core/src/main/com/csse3200/game/entities/factories/TowerFactory.java +++ b/source/core/src/main/com/csse3200/game/entities/factories/TowerFactory.java @@ -36,8 +36,8 @@ public class TowerFactory { private static final int COMBAT_TASK_PRIORITY = 2; private static final int WEAPON_TOWER_MAX_RANGE = 40; - private static final String WALL_IMAGE = "images/wallTower.png"; - private static final String TURRET_ATLAS = "images/turret01.atlas"; + private static final String WALL_IMAGE = "images/towers/wallTower.png"; + private static final String TURRET_ATLAS = "images/towers/turret01.atlas"; private static final String IDLE_ANIM = "idle"; private static final float IDLE_SPEED = 0.3f; private static final String DEPLOY_ANIM = "deploy"; @@ -69,7 +69,7 @@ public static Entity createIncomeTower() { income .addComponent(new CombatStatsComponent(config.health, config.baseAttack)) .addComponent(new CostComponent(config.cost)) - .addComponent(new TextureRenderComponent("images/mine_tower.png")) + .addComponent(new TextureRenderComponent("images/towers/mine_tower.png")) .addComponent(aiTaskComponent); diff --git a/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java b/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java index be9c88a21..651909937 100644 --- a/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java +++ b/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java @@ -185,7 +185,7 @@ private void loadAssets() { logger.debug("Loading assets"); ResourceService resourceService = ServiceLocator.getResourceService(); resourceService.loadTextures(mainGameTextures); - backgroundTexture = new Texture("images/background1.png"); // Load the background image + backgroundTexture = new Texture("images/background/background1.png"); // Load the background image ServiceLocator.getResourceService().loadAll(); } diff --git a/source/core/src/main/com/csse3200/game/screens/MainMenuScreen.java b/source/core/src/main/com/csse3200/game/screens/MainMenuScreen.java index dfe7ff2f7..a7bcc40f9 100644 --- a/source/core/src/main/com/csse3200/game/screens/MainMenuScreen.java +++ b/source/core/src/main/com/csse3200/game/screens/MainMenuScreen.java @@ -31,7 +31,7 @@ public class MainMenuScreen extends ScreenAdapter { private final Renderer renderer; private Texture backgroundTexture; private final SpriteBatch batch; - private static final String[] mainMenuTextures = {"images/Logo2.png"}; + private static final String[] mainMenuTextures = {"images/ui/Logo2.png"}; public MainMenuScreen(GdxGame game) { this.game = game; @@ -97,7 +97,7 @@ private void loadAssets() { logger.debug("Loading assets"); ResourceService resourceService = ServiceLocator.getResourceService(); resourceService.loadTextures(mainMenuTextures); - backgroundTexture = new Texture("images/background1.png"); // Load the background image + backgroundTexture = new Texture("images/background/background1.png"); // Load the background image ServiceLocator.getResourceService().loadAll(); } diff --git a/source/core/src/test/com/csse3200/game/currency/CurrencyTest.java b/source/core/src/test/com/csse3200/game/currency/CurrencyTest.java index 8fa375e4e..fff7d0c0a 100644 --- a/source/core/src/test/com/csse3200/game/currency/CurrencyTest.java +++ b/source/core/src/test/com/csse3200/game/currency/CurrencyTest.java @@ -21,7 +21,7 @@ @ExtendWith(GameExtension.class) class CurrencyTest { private Entity scrap; - private String[] texture = {"images/scrap.png"}; + private String[] texture = {"images/economy/scrap.png"}; @BeforeEach public void setUp() { diff --git a/source/core/src/test/com/csse3200/game/entities/factories/ProjectileFactoryTest.java b/source/core/src/test/com/csse3200/game/entities/factories/ProjectileFactoryTest.java index eba56f0ee..1e5c4fb27 100644 --- a/source/core/src/test/com/csse3200/game/entities/factories/ProjectileFactoryTest.java +++ b/source/core/src/test/com/csse3200/game/entities/factories/ProjectileFactoryTest.java @@ -30,7 +30,7 @@ @ExtendWith(GameExtension.class) class ProjectileFactoryTest { - private String[] texture = {"images/projectile.png"}; + private String[] texture = {"images/projectiles/projectile.png"}; private Entity projectile; @BeforeEach @@ -47,7 +47,7 @@ public void setUp() { resourceService.loadTextures(texture); resourceService.loadAll(); ServiceLocator.getResourceService() - .getAsset("images/projectile.png", Texture.class); + .getAsset("images/projectiles/projectile.png", Texture.class); Vector2 destination = new Vector2(0.1f, 0.1f); Vector2 speed = new Vector2(0.2f, 0.2f); diff --git a/source/core/src/test/com/csse3200/game/entities/factories/TowerFactoryTest.java b/source/core/src/test/com/csse3200/game/entities/factories/TowerFactoryTest.java index b25fcc1f2..0924d2667 100644 --- a/source/core/src/test/com/csse3200/game/entities/factories/TowerFactoryTest.java +++ b/source/core/src/test/com/csse3200/game/entities/factories/TowerFactoryTest.java @@ -40,15 +40,15 @@ public class TowerFactoryTest { private Entity weaponTower; private Entity wallTower; private String[] texture = { - "images/turret_deployed.png", - "images/turret01.png", - "images/wallTower.png" + "images/towers/turret_deployed.png", + "images/towers/turret01.png", + "images/towers/wallTower.png" }; - private String[] atlas = {"images/turret01.atlas"}; + private String[] atlas = {"images/towers/turret01.atlas"}; private static final String[] sounds = { - "sounds/gun_shot_trimmed.mp3", - "sounds/deploy.mp3", - "sounds/stow.mp3" + "sounds/towers/gun_shot_trimmed.mp3", + "sounds/towers/deploy.mp3", + "sounds/towers/stow.mp3" }; @BeforeEach @@ -67,7 +67,7 @@ public void setUp() { resourceService.loadSounds(sounds); resourceService.loadAll(); ServiceLocator.getResourceService() - .getAsset("images/turret01.atlas", TextureAtlas.class); + .getAsset("images/towers/turret01.atlas", TextureAtlas.class); baseTower = TowerFactory.createBaseTower(); weaponTower = TowerFactory.createWeaponTower(); wallTower = TowerFactory.createWallTower();