diff --git a/CMakeLists.txt b/CMakeLists.txt index 29a51fe..191c60d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,9 @@ project(STANK add_executable(stank src/client.cpp src/client/ClientNetwork.h src/common/Constants.h - src/client/ClientNetwork.cpp) + src/client/ClientNetwork.cpp + src/client/Player.h + src/client/Player.cpp) find_package(gf 1.2.0 REQUIRED COMPONENTS graphics net) diff --git a/data/stank/sprite/PNG/Default size/barrelBlack_side.png b/data/stank/sprite/PNG/default/barrelBlack_side.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelBlack_side.png rename to data/stank/sprite/PNG/default/barrelBlack_side.png diff --git a/data/stank/sprite/PNG/Default size/barrelBlack_top.png b/data/stank/sprite/PNG/default/barrelBlack_top.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelBlack_top.png rename to data/stank/sprite/PNG/default/barrelBlack_top.png diff --git a/data/stank/sprite/PNG/Default size/barrelGreen_side.png b/data/stank/sprite/PNG/default/barrelGreen_side.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelGreen_side.png rename to data/stank/sprite/PNG/default/barrelGreen_side.png diff --git a/data/stank/sprite/PNG/Default size/barrelGreen_top.png b/data/stank/sprite/PNG/default/barrelGreen_top.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelGreen_top.png rename to data/stank/sprite/PNG/default/barrelGreen_top.png diff --git a/data/stank/sprite/PNG/Default size/barrelRed_side.png b/data/stank/sprite/PNG/default/barrelRed_side.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelRed_side.png rename to data/stank/sprite/PNG/default/barrelRed_side.png diff --git a/data/stank/sprite/PNG/Default size/barrelRed_top.png b/data/stank/sprite/PNG/default/barrelRed_top.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelRed_top.png rename to data/stank/sprite/PNG/default/barrelRed_top.png diff --git a/data/stank/sprite/PNG/Default size/barrelRust_side.png b/data/stank/sprite/PNG/default/barrelRust_side.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelRust_side.png rename to data/stank/sprite/PNG/default/barrelRust_side.png diff --git a/data/stank/sprite/PNG/Default size/barrelRust_top.png b/data/stank/sprite/PNG/default/barrelRust_top.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barrelRust_top.png rename to data/stank/sprite/PNG/default/barrelRust_top.png diff --git a/data/stank/sprite/PNG/Default size/barricadeMetal.png b/data/stank/sprite/PNG/default/barricadeMetal.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barricadeMetal.png rename to data/stank/sprite/PNG/default/barricadeMetal.png diff --git a/data/stank/sprite/PNG/Default size/barricadeWood.png b/data/stank/sprite/PNG/default/barricadeWood.png similarity index 100% rename from data/stank/sprite/PNG/Default size/barricadeWood.png rename to data/stank/sprite/PNG/default/barricadeWood.png diff --git a/data/stank/sprite/PNG/Default size/bulletBlue1.png b/data/stank/sprite/PNG/default/bulletBlue1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletBlue1.png rename to data/stank/sprite/PNG/default/bulletBlue1.png diff --git a/data/stank/sprite/PNG/Default size/bulletBlue1_outline.png b/data/stank/sprite/PNG/default/bulletBlue1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletBlue1_outline.png rename to data/stank/sprite/PNG/default/bulletBlue1_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletBlue2.png b/data/stank/sprite/PNG/default/bulletBlue2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletBlue2.png rename to data/stank/sprite/PNG/default/bulletBlue2.png diff --git a/data/stank/sprite/PNG/Default size/bulletBlue2_outline.png b/data/stank/sprite/PNG/default/bulletBlue2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletBlue2_outline.png rename to data/stank/sprite/PNG/default/bulletBlue2_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletBlue3.png b/data/stank/sprite/PNG/default/bulletBlue3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletBlue3.png rename to data/stank/sprite/PNG/default/bulletBlue3.png diff --git a/data/stank/sprite/PNG/Default size/bulletBlue3_outline.png b/data/stank/sprite/PNG/default/bulletBlue3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletBlue3_outline.png rename to data/stank/sprite/PNG/default/bulletBlue3_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletDark1.png b/data/stank/sprite/PNG/default/bulletDark1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletDark1.png rename to data/stank/sprite/PNG/default/bulletDark1.png diff --git a/data/stank/sprite/PNG/Default size/bulletDark1_outline.png b/data/stank/sprite/PNG/default/bulletDark1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletDark1_outline.png rename to data/stank/sprite/PNG/default/bulletDark1_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletDark2.png b/data/stank/sprite/PNG/default/bulletDark2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletDark2.png rename to data/stank/sprite/PNG/default/bulletDark2.png diff --git a/data/stank/sprite/PNG/Default size/bulletDark2_outline.png b/data/stank/sprite/PNG/default/bulletDark2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletDark2_outline.png rename to data/stank/sprite/PNG/default/bulletDark2_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletDark3.png b/data/stank/sprite/PNG/default/bulletDark3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletDark3.png rename to data/stank/sprite/PNG/default/bulletDark3.png diff --git a/data/stank/sprite/PNG/Default size/bulletDark3_outline.png b/data/stank/sprite/PNG/default/bulletDark3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletDark3_outline.png rename to data/stank/sprite/PNG/default/bulletDark3_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletGreen1.png b/data/stank/sprite/PNG/default/bulletGreen1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletGreen1.png rename to data/stank/sprite/PNG/default/bulletGreen1.png diff --git a/data/stank/sprite/PNG/Default size/bulletGreen1_outline.png b/data/stank/sprite/PNG/default/bulletGreen1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletGreen1_outline.png rename to data/stank/sprite/PNG/default/bulletGreen1_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletGreen2.png b/data/stank/sprite/PNG/default/bulletGreen2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletGreen2.png rename to data/stank/sprite/PNG/default/bulletGreen2.png diff --git a/data/stank/sprite/PNG/Default size/bulletGreen2_outline.png b/data/stank/sprite/PNG/default/bulletGreen2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletGreen2_outline.png rename to data/stank/sprite/PNG/default/bulletGreen2_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletGreen3.png b/data/stank/sprite/PNG/default/bulletGreen3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletGreen3.png rename to data/stank/sprite/PNG/default/bulletGreen3.png diff --git a/data/stank/sprite/PNG/Default size/bulletGreen3_outline.png b/data/stank/sprite/PNG/default/bulletGreen3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletGreen3_outline.png rename to data/stank/sprite/PNG/default/bulletGreen3_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletRed1.png b/data/stank/sprite/PNG/default/bulletRed1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletRed1.png rename to data/stank/sprite/PNG/default/bulletRed1.png diff --git a/data/stank/sprite/PNG/Default size/bulletRed1_outline.png b/data/stank/sprite/PNG/default/bulletRed1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletRed1_outline.png rename to data/stank/sprite/PNG/default/bulletRed1_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletRed2.png b/data/stank/sprite/PNG/default/bulletRed2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletRed2.png rename to data/stank/sprite/PNG/default/bulletRed2.png diff --git a/data/stank/sprite/PNG/Default size/bulletRed2_outline.png b/data/stank/sprite/PNG/default/bulletRed2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletRed2_outline.png rename to data/stank/sprite/PNG/default/bulletRed2_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletRed3.png b/data/stank/sprite/PNG/default/bulletRed3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletRed3.png rename to data/stank/sprite/PNG/default/bulletRed3.png diff --git a/data/stank/sprite/PNG/Default size/bulletRed3_outline.png b/data/stank/sprite/PNG/default/bulletRed3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletRed3_outline.png rename to data/stank/sprite/PNG/default/bulletRed3_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletSand1.png b/data/stank/sprite/PNG/default/bulletSand1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletSand1.png rename to data/stank/sprite/PNG/default/bulletSand1.png diff --git a/data/stank/sprite/PNG/Default size/bulletSand1_outline.png b/data/stank/sprite/PNG/default/bulletSand1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletSand1_outline.png rename to data/stank/sprite/PNG/default/bulletSand1_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletSand2.png b/data/stank/sprite/PNG/default/bulletSand2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletSand2.png rename to data/stank/sprite/PNG/default/bulletSand2.png diff --git a/data/stank/sprite/PNG/Default size/bulletSand2_outline.png b/data/stank/sprite/PNG/default/bulletSand2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletSand2_outline.png rename to data/stank/sprite/PNG/default/bulletSand2_outline.png diff --git a/data/stank/sprite/PNG/Default size/bulletSand3.png b/data/stank/sprite/PNG/default/bulletSand3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletSand3.png rename to data/stank/sprite/PNG/default/bulletSand3.png diff --git a/data/stank/sprite/PNG/Default size/bulletSand3_outline.png b/data/stank/sprite/PNG/default/bulletSand3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/bulletSand3_outline.png rename to data/stank/sprite/PNG/default/bulletSand3_outline.png diff --git a/data/stank/sprite/PNG/Default size/crateMetal.png b/data/stank/sprite/PNG/default/crateMetal.png similarity index 100% rename from data/stank/sprite/PNG/Default size/crateMetal.png rename to data/stank/sprite/PNG/default/crateMetal.png diff --git a/data/stank/sprite/PNG/Default size/crateMetal_side.png b/data/stank/sprite/PNG/default/crateMetal_side.png similarity index 100% rename from data/stank/sprite/PNG/Default size/crateMetal_side.png rename to data/stank/sprite/PNG/default/crateMetal_side.png diff --git a/data/stank/sprite/PNG/Default size/crateWood.png b/data/stank/sprite/PNG/default/crateWood.png similarity index 100% rename from data/stank/sprite/PNG/Default size/crateWood.png rename to data/stank/sprite/PNG/default/crateWood.png diff --git a/data/stank/sprite/PNG/Default size/crateWood_side.png b/data/stank/sprite/PNG/default/crateWood_side.png similarity index 100% rename from data/stank/sprite/PNG/Default size/crateWood_side.png rename to data/stank/sprite/PNG/default/crateWood_side.png diff --git a/data/stank/sprite/PNG/Default size/explosion1.png b/data/stank/sprite/PNG/default/explosion1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosion1.png rename to data/stank/sprite/PNG/default/explosion1.png diff --git a/data/stank/sprite/PNG/Default size/explosion2.png b/data/stank/sprite/PNG/default/explosion2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosion2.png rename to data/stank/sprite/PNG/default/explosion2.png diff --git a/data/stank/sprite/PNG/Default size/explosion3.png b/data/stank/sprite/PNG/default/explosion3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosion3.png rename to data/stank/sprite/PNG/default/explosion3.png diff --git a/data/stank/sprite/PNG/Default size/explosion4.png b/data/stank/sprite/PNG/default/explosion4.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosion4.png rename to data/stank/sprite/PNG/default/explosion4.png diff --git a/data/stank/sprite/PNG/Default size/explosion5.png b/data/stank/sprite/PNG/default/explosion5.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosion5.png rename to data/stank/sprite/PNG/default/explosion5.png diff --git a/data/stank/sprite/PNG/Default size/explosionSmoke1.png b/data/stank/sprite/PNG/default/explosionSmoke1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosionSmoke1.png rename to data/stank/sprite/PNG/default/explosionSmoke1.png diff --git a/data/stank/sprite/PNG/Default size/explosionSmoke2.png b/data/stank/sprite/PNG/default/explosionSmoke2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosionSmoke2.png rename to data/stank/sprite/PNG/default/explosionSmoke2.png diff --git a/data/stank/sprite/PNG/Default size/explosionSmoke3.png b/data/stank/sprite/PNG/default/explosionSmoke3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosionSmoke3.png rename to data/stank/sprite/PNG/default/explosionSmoke3.png diff --git a/data/stank/sprite/PNG/Default size/explosionSmoke4.png b/data/stank/sprite/PNG/default/explosionSmoke4.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosionSmoke4.png rename to data/stank/sprite/PNG/default/explosionSmoke4.png diff --git a/data/stank/sprite/PNG/Default size/explosionSmoke5.png b/data/stank/sprite/PNG/default/explosionSmoke5.png similarity index 100% rename from data/stank/sprite/PNG/Default size/explosionSmoke5.png rename to data/stank/sprite/PNG/default/explosionSmoke5.png diff --git a/data/stank/sprite/PNG/Default size/fenceRed.png b/data/stank/sprite/PNG/default/fenceRed.png similarity index 100% rename from data/stank/sprite/PNG/Default size/fenceRed.png rename to data/stank/sprite/PNG/default/fenceRed.png diff --git a/data/stank/sprite/PNG/Default size/fenceYellow.png b/data/stank/sprite/PNG/default/fenceYellow.png similarity index 100% rename from data/stank/sprite/PNG/Default size/fenceYellow.png rename to data/stank/sprite/PNG/default/fenceYellow.png diff --git a/data/stank/sprite/PNG/Default size/oilSpill_large.png b/data/stank/sprite/PNG/default/oilSpill_large.png similarity index 100% rename from data/stank/sprite/PNG/Default size/oilSpill_large.png rename to data/stank/sprite/PNG/default/oilSpill_large.png diff --git a/data/stank/sprite/PNG/Default size/oilSpill_small.png b/data/stank/sprite/PNG/default/oilSpill_small.png similarity index 100% rename from data/stank/sprite/PNG/Default size/oilSpill_small.png rename to data/stank/sprite/PNG/default/oilSpill_small.png diff --git a/data/stank/sprite/PNG/Default size/sandbagBeige.png b/data/stank/sprite/PNG/default/sandbagBeige.png similarity index 100% rename from data/stank/sprite/PNG/Default size/sandbagBeige.png rename to data/stank/sprite/PNG/default/sandbagBeige.png diff --git a/data/stank/sprite/PNG/Default size/sandbagBeige_open.png b/data/stank/sprite/PNG/default/sandbagBeige_open.png similarity index 100% rename from data/stank/sprite/PNG/Default size/sandbagBeige_open.png rename to data/stank/sprite/PNG/default/sandbagBeige_open.png diff --git a/data/stank/sprite/PNG/Default size/sandbagBrown.png b/data/stank/sprite/PNG/default/sandbagBrown.png similarity index 100% rename from data/stank/sprite/PNG/Default size/sandbagBrown.png rename to data/stank/sprite/PNG/default/sandbagBrown.png diff --git a/data/stank/sprite/PNG/Default size/sandbagBrown_open.png b/data/stank/sprite/PNG/default/sandbagBrown_open.png similarity index 100% rename from data/stank/sprite/PNG/Default size/sandbagBrown_open.png rename to data/stank/sprite/PNG/default/sandbagBrown_open.png diff --git a/data/stank/sprite/PNG/Default size/shotLarge.png b/data/stank/sprite/PNG/default/shotLarge.png similarity index 100% rename from data/stank/sprite/PNG/Default size/shotLarge.png rename to data/stank/sprite/PNG/default/shotLarge.png diff --git a/data/stank/sprite/PNG/Default size/shotOrange.png b/data/stank/sprite/PNG/default/shotOrange.png similarity index 100% rename from data/stank/sprite/PNG/Default size/shotOrange.png rename to data/stank/sprite/PNG/default/shotOrange.png diff --git a/data/stank/sprite/PNG/Default size/shotRed.png b/data/stank/sprite/PNG/default/shotRed.png similarity index 100% rename from data/stank/sprite/PNG/Default size/shotRed.png rename to data/stank/sprite/PNG/default/shotRed.png diff --git a/data/stank/sprite/PNG/Default size/shotThin.png b/data/stank/sprite/PNG/default/shotThin.png similarity index 100% rename from data/stank/sprite/PNG/Default size/shotThin.png rename to data/stank/sprite/PNG/default/shotThin.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel1.png b/data/stank/sprite/PNG/default/specialBarrel1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel1.png rename to data/stank/sprite/PNG/default/specialBarrel1.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel1_outline.png b/data/stank/sprite/PNG/default/specialBarrel1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel1_outline.png rename to data/stank/sprite/PNG/default/specialBarrel1_outline.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel2.png b/data/stank/sprite/PNG/default/specialBarrel2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel2.png rename to data/stank/sprite/PNG/default/specialBarrel2.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel2_outline.png b/data/stank/sprite/PNG/default/specialBarrel2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel2_outline.png rename to data/stank/sprite/PNG/default/specialBarrel2_outline.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel3.png b/data/stank/sprite/PNG/default/specialBarrel3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel3.png rename to data/stank/sprite/PNG/default/specialBarrel3.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel3_outline.png b/data/stank/sprite/PNG/default/specialBarrel3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel3_outline.png rename to data/stank/sprite/PNG/default/specialBarrel3_outline.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel4.png b/data/stank/sprite/PNG/default/specialBarrel4.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel4.png rename to data/stank/sprite/PNG/default/specialBarrel4.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel4_outline.png b/data/stank/sprite/PNG/default/specialBarrel4_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel4_outline.png rename to data/stank/sprite/PNG/default/specialBarrel4_outline.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel5.png b/data/stank/sprite/PNG/default/specialBarrel5.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel5.png rename to data/stank/sprite/PNG/default/specialBarrel5.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel5_outline.png b/data/stank/sprite/PNG/default/specialBarrel5_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel5_outline.png rename to data/stank/sprite/PNG/default/specialBarrel5_outline.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel6.png b/data/stank/sprite/PNG/default/specialBarrel6.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel6.png rename to data/stank/sprite/PNG/default/specialBarrel6.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel6_outline.png b/data/stank/sprite/PNG/default/specialBarrel6_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel6_outline.png rename to data/stank/sprite/PNG/default/specialBarrel6_outline.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel7.png b/data/stank/sprite/PNG/default/specialBarrel7.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel7.png rename to data/stank/sprite/PNG/default/specialBarrel7.png diff --git a/data/stank/sprite/PNG/Default size/specialBarrel7_outline.png b/data/stank/sprite/PNG/default/specialBarrel7_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/specialBarrel7_outline.png rename to data/stank/sprite/PNG/default/specialBarrel7_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBlue_barrel1.png b/data/stank/sprite/PNG/default/tankBlue_barrel1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBlue_barrel1.png rename to data/stank/sprite/PNG/default/tankBlue_barrel1.png diff --git a/data/stank/sprite/PNG/Default size/tankBlue_barrel1_outline.png b/data/stank/sprite/PNG/default/tankBlue_barrel1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBlue_barrel1_outline.png rename to data/stank/sprite/PNG/default/tankBlue_barrel1_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBlue_barrel2.png b/data/stank/sprite/PNG/default/tankBlue_barrel2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBlue_barrel2.png rename to data/stank/sprite/PNG/default/tankBlue_barrel2.png diff --git a/data/stank/sprite/PNG/Default size/tankBlue_barrel2_outline.png b/data/stank/sprite/PNG/default/tankBlue_barrel2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBlue_barrel2_outline.png rename to data/stank/sprite/PNG/default/tankBlue_barrel2_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBlue_barrel3.png b/data/stank/sprite/PNG/default/tankBlue_barrel3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBlue_barrel3.png rename to data/stank/sprite/PNG/default/tankBlue_barrel3.png diff --git a/data/stank/sprite/PNG/Default size/tankBlue_barrel3_outline.png b/data/stank/sprite/PNG/default/tankBlue_barrel3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBlue_barrel3_outline.png rename to data/stank/sprite/PNG/default/tankBlue_barrel3_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_bigRed.png b/data/stank/sprite/PNG/default/tankBody_bigRed.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_bigRed.png rename to data/stank/sprite/PNG/default/tankBody_bigRed.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_bigRed_outline.png b/data/stank/sprite/PNG/default/tankBody_bigRed_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_bigRed_outline.png rename to data/stank/sprite/PNG/default/tankBody_bigRed_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_blue.png b/data/stank/sprite/PNG/default/tankBody_blue.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_blue.png rename to data/stank/sprite/PNG/default/tankBody_blue.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_blue_outline.png b/data/stank/sprite/PNG/default/tankBody_blue_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_blue_outline.png rename to data/stank/sprite/PNG/default/tankBody_blue_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_dark.png b/data/stank/sprite/PNG/default/tankBody_dark.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_dark.png rename to data/stank/sprite/PNG/default/tankBody_dark.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_darkLarge.png b/data/stank/sprite/PNG/default/tankBody_darkLarge.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_darkLarge.png rename to data/stank/sprite/PNG/default/tankBody_darkLarge.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_darkLarge_outline.png b/data/stank/sprite/PNG/default/tankBody_darkLarge_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_darkLarge_outline.png rename to data/stank/sprite/PNG/default/tankBody_darkLarge_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_dark_outline.png b/data/stank/sprite/PNG/default/tankBody_dark_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_dark_outline.png rename to data/stank/sprite/PNG/default/tankBody_dark_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_green.png b/data/stank/sprite/PNG/default/tankBody_green.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_green.png rename to data/stank/sprite/PNG/default/tankBody_green.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_green_outline.png b/data/stank/sprite/PNG/default/tankBody_green_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_green_outline.png rename to data/stank/sprite/PNG/default/tankBody_green_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_huge.png b/data/stank/sprite/PNG/default/tankBody_huge.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_huge.png rename to data/stank/sprite/PNG/default/tankBody_huge.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_huge_outline.png b/data/stank/sprite/PNG/default/tankBody_huge_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_huge_outline.png rename to data/stank/sprite/PNG/default/tankBody_huge_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_red.png b/data/stank/sprite/PNG/default/tankBody_red.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_red.png rename to data/stank/sprite/PNG/default/tankBody_red.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_red_outline.png b/data/stank/sprite/PNG/default/tankBody_red_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_red_outline.png rename to data/stank/sprite/PNG/default/tankBody_red_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_sand.png b/data/stank/sprite/PNG/default/tankBody_sand.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_sand.png rename to data/stank/sprite/PNG/default/tankBody_sand.png diff --git a/data/stank/sprite/PNG/Default size/tankBody_sand_outline.png b/data/stank/sprite/PNG/default/tankBody_sand_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankBody_sand_outline.png rename to data/stank/sprite/PNG/default/tankBody_sand_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankDark_barrel1.png b/data/stank/sprite/PNG/default/tankDark_barrel1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankDark_barrel1.png rename to data/stank/sprite/PNG/default/tankDark_barrel1.png diff --git a/data/stank/sprite/PNG/Default size/tankDark_barrel1_outline.png b/data/stank/sprite/PNG/default/tankDark_barrel1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankDark_barrel1_outline.png rename to data/stank/sprite/PNG/default/tankDark_barrel1_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankDark_barrel2.png b/data/stank/sprite/PNG/default/tankDark_barrel2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankDark_barrel2.png rename to data/stank/sprite/PNG/default/tankDark_barrel2.png diff --git a/data/stank/sprite/PNG/Default size/tankDark_barrel2_outline.png b/data/stank/sprite/PNG/default/tankDark_barrel2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankDark_barrel2_outline.png rename to data/stank/sprite/PNG/default/tankDark_barrel2_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankDark_barrel3.png b/data/stank/sprite/PNG/default/tankDark_barrel3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankDark_barrel3.png rename to data/stank/sprite/PNG/default/tankDark_barrel3.png diff --git a/data/stank/sprite/PNG/Default size/tankDark_barrel3_outline.png b/data/stank/sprite/PNG/default/tankDark_barrel3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankDark_barrel3_outline.png rename to data/stank/sprite/PNG/default/tankDark_barrel3_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankGreen_barrel1.png b/data/stank/sprite/PNG/default/tankGreen_barrel1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankGreen_barrel1.png rename to data/stank/sprite/PNG/default/tankGreen_barrel1.png diff --git a/data/stank/sprite/PNG/Default size/tankGreen_barrel1_outline.png b/data/stank/sprite/PNG/default/tankGreen_barrel1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankGreen_barrel1_outline.png rename to data/stank/sprite/PNG/default/tankGreen_barrel1_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankGreen_barrel2.png b/data/stank/sprite/PNG/default/tankGreen_barrel2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankGreen_barrel2.png rename to data/stank/sprite/PNG/default/tankGreen_barrel2.png diff --git a/data/stank/sprite/PNG/Default size/tankGreen_barrel2_outline.png b/data/stank/sprite/PNG/default/tankGreen_barrel2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankGreen_barrel2_outline.png rename to data/stank/sprite/PNG/default/tankGreen_barrel2_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankGreen_barrel3.png b/data/stank/sprite/PNG/default/tankGreen_barrel3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankGreen_barrel3.png rename to data/stank/sprite/PNG/default/tankGreen_barrel3.png diff --git a/data/stank/sprite/PNG/Default size/tankGreen_barrel3_outline.png b/data/stank/sprite/PNG/default/tankGreen_barrel3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankGreen_barrel3_outline.png rename to data/stank/sprite/PNG/default/tankGreen_barrel3_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankRed_barrel1.png b/data/stank/sprite/PNG/default/tankRed_barrel1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankRed_barrel1.png rename to data/stank/sprite/PNG/default/tankRed_barrel1.png diff --git a/data/stank/sprite/PNG/Default size/tankRed_barrel1_outline.png b/data/stank/sprite/PNG/default/tankRed_barrel1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankRed_barrel1_outline.png rename to data/stank/sprite/PNG/default/tankRed_barrel1_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankRed_barrel2.png b/data/stank/sprite/PNG/default/tankRed_barrel2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankRed_barrel2.png rename to data/stank/sprite/PNG/default/tankRed_barrel2.png diff --git a/data/stank/sprite/PNG/Default size/tankRed_barrel2_outline.png b/data/stank/sprite/PNG/default/tankRed_barrel2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankRed_barrel2_outline.png rename to data/stank/sprite/PNG/default/tankRed_barrel2_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankRed_barrel3.png b/data/stank/sprite/PNG/default/tankRed_barrel3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankRed_barrel3.png rename to data/stank/sprite/PNG/default/tankRed_barrel3.png diff --git a/data/stank/sprite/PNG/Default size/tankRed_barrel3_outline.png b/data/stank/sprite/PNG/default/tankRed_barrel3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankRed_barrel3_outline.png rename to data/stank/sprite/PNG/default/tankRed_barrel3_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankSand_barrel1.png b/data/stank/sprite/PNG/default/tankSand_barrel1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankSand_barrel1.png rename to data/stank/sprite/PNG/default/tankSand_barrel1.png diff --git a/data/stank/sprite/PNG/Default size/tankSand_barrel1_outline.png b/data/stank/sprite/PNG/default/tankSand_barrel1_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankSand_barrel1_outline.png rename to data/stank/sprite/PNG/default/tankSand_barrel1_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankSand_barrel2.png b/data/stank/sprite/PNG/default/tankSand_barrel2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankSand_barrel2.png rename to data/stank/sprite/PNG/default/tankSand_barrel2.png diff --git a/data/stank/sprite/PNG/Default size/tankSand_barrel2_outline.png b/data/stank/sprite/PNG/default/tankSand_barrel2_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankSand_barrel2_outline.png rename to data/stank/sprite/PNG/default/tankSand_barrel2_outline.png diff --git a/data/stank/sprite/PNG/Default size/tankSand_barrel3.png b/data/stank/sprite/PNG/default/tankSand_barrel3.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankSand_barrel3.png rename to data/stank/sprite/PNG/default/tankSand_barrel3.png diff --git a/data/stank/sprite/PNG/Default size/tankSand_barrel3_outline.png b/data/stank/sprite/PNG/default/tankSand_barrel3_outline.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tankSand_barrel3_outline.png rename to data/stank/sprite/PNG/default/tankSand_barrel3_outline.png diff --git a/data/stank/sprite/PNG/Default size/tank_bigRed.png b/data/stank/sprite/PNG/default/tank_bigRed.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_bigRed.png rename to data/stank/sprite/PNG/default/tank_bigRed.png diff --git a/data/stank/sprite/PNG/Default size/tank_blue.png b/data/stank/sprite/PNG/default/tank_blue.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_blue.png rename to data/stank/sprite/PNG/default/tank_blue.png diff --git a/data/stank/sprite/PNG/Default size/tank_dark.png b/data/stank/sprite/PNG/default/tank_dark.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_dark.png rename to data/stank/sprite/PNG/default/tank_dark.png diff --git a/data/stank/sprite/PNG/Default size/tank_darkLarge.png b/data/stank/sprite/PNG/default/tank_darkLarge.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_darkLarge.png rename to data/stank/sprite/PNG/default/tank_darkLarge.png diff --git a/data/stank/sprite/PNG/Default size/tank_green.png b/data/stank/sprite/PNG/default/tank_green.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_green.png rename to data/stank/sprite/PNG/default/tank_green.png diff --git a/data/stank/sprite/PNG/Default size/tank_huge.png b/data/stank/sprite/PNG/default/tank_huge.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_huge.png rename to data/stank/sprite/PNG/default/tank_huge.png diff --git a/data/stank/sprite/PNG/Default size/tank_red.png b/data/stank/sprite/PNG/default/tank_red.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_red.png rename to data/stank/sprite/PNG/default/tank_red.png diff --git a/data/stank/sprite/PNG/Default size/tank_sand.png b/data/stank/sprite/PNG/default/tank_sand.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tank_sand.png rename to data/stank/sprite/PNG/default/tank_sand.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass1.png b/data/stank/sprite/PNG/default/tileGrass1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass1.png rename to data/stank/sprite/PNG/default/tileGrass1.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass2.png b/data/stank/sprite/PNG/default/tileGrass2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass2.png rename to data/stank/sprite/PNG/default/tileGrass2.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadCornerLL.png b/data/stank/sprite/PNG/default/tileGrass_roadCornerLL.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadCornerLL.png rename to data/stank/sprite/PNG/default/tileGrass_roadCornerLL.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadCornerLR.png b/data/stank/sprite/PNG/default/tileGrass_roadCornerLR.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadCornerLR.png rename to data/stank/sprite/PNG/default/tileGrass_roadCornerLR.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadCornerUL.png b/data/stank/sprite/PNG/default/tileGrass_roadCornerUL.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadCornerUL.png rename to data/stank/sprite/PNG/default/tileGrass_roadCornerUL.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadCornerUR.png b/data/stank/sprite/PNG/default/tileGrass_roadCornerUR.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadCornerUR.png rename to data/stank/sprite/PNG/default/tileGrass_roadCornerUR.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadCrossing.png b/data/stank/sprite/PNG/default/tileGrass_roadCrossing.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadCrossing.png rename to data/stank/sprite/PNG/default/tileGrass_roadCrossing.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadCrossingRound.png b/data/stank/sprite/PNG/default/tileGrass_roadCrossingRound.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadCrossingRound.png rename to data/stank/sprite/PNG/default/tileGrass_roadCrossingRound.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadEast.png b/data/stank/sprite/PNG/default/tileGrass_roadEast.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadEast.png rename to data/stank/sprite/PNG/default/tileGrass_roadEast.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadNorth.png b/data/stank/sprite/PNG/default/tileGrass_roadNorth.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadNorth.png rename to data/stank/sprite/PNG/default/tileGrass_roadNorth.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadSplitE.png b/data/stank/sprite/PNG/default/tileGrass_roadSplitE.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadSplitE.png rename to data/stank/sprite/PNG/default/tileGrass_roadSplitE.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadSplitN.png b/data/stank/sprite/PNG/default/tileGrass_roadSplitN.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadSplitN.png rename to data/stank/sprite/PNG/default/tileGrass_roadSplitN.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadSplitS.png b/data/stank/sprite/PNG/default/tileGrass_roadSplitS.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadSplitS.png rename to data/stank/sprite/PNG/default/tileGrass_roadSplitS.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadSplitW.png b/data/stank/sprite/PNG/default/tileGrass_roadSplitW.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadSplitW.png rename to data/stank/sprite/PNG/default/tileGrass_roadSplitW.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionE.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionE.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionE.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionE.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionE_dirt.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionE_dirt.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionE_dirt.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionE_dirt.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionN.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionN.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionN.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionN.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionN_dirt.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionN_dirt.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionN_dirt.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionN_dirt.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionS.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionS.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionS.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionS.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionS_dirt.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionS_dirt.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionS_dirt.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionS_dirt.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionW.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionW.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionW.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionW.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_roadTransitionW_dirt.png b/data/stank/sprite/PNG/default/tileGrass_roadTransitionW_dirt.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_roadTransitionW_dirt.png rename to data/stank/sprite/PNG/default/tileGrass_roadTransitionW_dirt.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_transitionE.png b/data/stank/sprite/PNG/default/tileGrass_transitionE.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_transitionE.png rename to data/stank/sprite/PNG/default/tileGrass_transitionE.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_transitionN.png b/data/stank/sprite/PNG/default/tileGrass_transitionN.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_transitionN.png rename to data/stank/sprite/PNG/default/tileGrass_transitionN.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_transitionS.png b/data/stank/sprite/PNG/default/tileGrass_transitionS.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_transitionS.png rename to data/stank/sprite/PNG/default/tileGrass_transitionS.png diff --git a/data/stank/sprite/PNG/Default size/tileGrass_transitionW.png b/data/stank/sprite/PNG/default/tileGrass_transitionW.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileGrass_transitionW.png rename to data/stank/sprite/PNG/default/tileGrass_transitionW.png diff --git a/data/stank/sprite/PNG/Default size/tileSand1.png b/data/stank/sprite/PNG/default/tileSand1.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand1.png rename to data/stank/sprite/PNG/default/tileSand1.png diff --git a/data/stank/sprite/PNG/Default size/tileSand2.png b/data/stank/sprite/PNG/default/tileSand2.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand2.png rename to data/stank/sprite/PNG/default/tileSand2.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadCornerLL.png b/data/stank/sprite/PNG/default/tileSand_roadCornerLL.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadCornerLL.png rename to data/stank/sprite/PNG/default/tileSand_roadCornerLL.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadCornerLR.png b/data/stank/sprite/PNG/default/tileSand_roadCornerLR.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadCornerLR.png rename to data/stank/sprite/PNG/default/tileSand_roadCornerLR.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadCornerUL.png b/data/stank/sprite/PNG/default/tileSand_roadCornerUL.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadCornerUL.png rename to data/stank/sprite/PNG/default/tileSand_roadCornerUL.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadCornerUR.png b/data/stank/sprite/PNG/default/tileSand_roadCornerUR.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadCornerUR.png rename to data/stank/sprite/PNG/default/tileSand_roadCornerUR.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadCrossing.png b/data/stank/sprite/PNG/default/tileSand_roadCrossing.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadCrossing.png rename to data/stank/sprite/PNG/default/tileSand_roadCrossing.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadCrossingRound.png b/data/stank/sprite/PNG/default/tileSand_roadCrossingRound.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadCrossingRound.png rename to data/stank/sprite/PNG/default/tileSand_roadCrossingRound.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadEast.png b/data/stank/sprite/PNG/default/tileSand_roadEast.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadEast.png rename to data/stank/sprite/PNG/default/tileSand_roadEast.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadNorth.png b/data/stank/sprite/PNG/default/tileSand_roadNorth.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadNorth.png rename to data/stank/sprite/PNG/default/tileSand_roadNorth.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadSplitE.png b/data/stank/sprite/PNG/default/tileSand_roadSplitE.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadSplitE.png rename to data/stank/sprite/PNG/default/tileSand_roadSplitE.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadSplitN.png b/data/stank/sprite/PNG/default/tileSand_roadSplitN.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadSplitN.png rename to data/stank/sprite/PNG/default/tileSand_roadSplitN.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadSplitS.png b/data/stank/sprite/PNG/default/tileSand_roadSplitS.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadSplitS.png rename to data/stank/sprite/PNG/default/tileSand_roadSplitS.png diff --git a/data/stank/sprite/PNG/Default size/tileSand_roadSplitW.png b/data/stank/sprite/PNG/default/tileSand_roadSplitW.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tileSand_roadSplitW.png rename to data/stank/sprite/PNG/default/tileSand_roadSplitW.png diff --git a/data/stank/sprite/PNG/Default size/tracksDouble.png b/data/stank/sprite/PNG/default/tracksDouble.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tracksDouble.png rename to data/stank/sprite/PNG/default/tracksDouble.png diff --git a/data/stank/sprite/PNG/Default size/tracksLarge.png b/data/stank/sprite/PNG/default/tracksLarge.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tracksLarge.png rename to data/stank/sprite/PNG/default/tracksLarge.png diff --git a/data/stank/sprite/PNG/Default size/tracksSmall.png b/data/stank/sprite/PNG/default/tracksSmall.png similarity index 100% rename from data/stank/sprite/PNG/Default size/tracksSmall.png rename to data/stank/sprite/PNG/default/tracksSmall.png diff --git a/data/stank/sprite/PNG/Default size/treeBrown_large.png b/data/stank/sprite/PNG/default/treeBrown_large.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeBrown_large.png rename to data/stank/sprite/PNG/default/treeBrown_large.png diff --git a/data/stank/sprite/PNG/Default size/treeBrown_leaf.png b/data/stank/sprite/PNG/default/treeBrown_leaf.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeBrown_leaf.png rename to data/stank/sprite/PNG/default/treeBrown_leaf.png diff --git a/data/stank/sprite/PNG/Default size/treeBrown_small.png b/data/stank/sprite/PNG/default/treeBrown_small.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeBrown_small.png rename to data/stank/sprite/PNG/default/treeBrown_small.png diff --git a/data/stank/sprite/PNG/Default size/treeBrown_twigs.png b/data/stank/sprite/PNG/default/treeBrown_twigs.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeBrown_twigs.png rename to data/stank/sprite/PNG/default/treeBrown_twigs.png diff --git a/data/stank/sprite/PNG/Default size/treeGreen_large.png b/data/stank/sprite/PNG/default/treeGreen_large.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeGreen_large.png rename to data/stank/sprite/PNG/default/treeGreen_large.png diff --git a/data/stank/sprite/PNG/Default size/treeGreen_leaf.png b/data/stank/sprite/PNG/default/treeGreen_leaf.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeGreen_leaf.png rename to data/stank/sprite/PNG/default/treeGreen_leaf.png diff --git a/data/stank/sprite/PNG/Default size/treeGreen_small.png b/data/stank/sprite/PNG/default/treeGreen_small.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeGreen_small.png rename to data/stank/sprite/PNG/default/treeGreen_small.png diff --git a/data/stank/sprite/PNG/Default size/treeGreen_twigs.png b/data/stank/sprite/PNG/default/treeGreen_twigs.png similarity index 100% rename from data/stank/sprite/PNG/Default size/treeGreen_twigs.png rename to data/stank/sprite/PNG/default/treeGreen_twigs.png diff --git a/data/stank/sprite/PNG/Default size/wireCrooked.png b/data/stank/sprite/PNG/default/wireCrooked.png similarity index 100% rename from data/stank/sprite/PNG/Default size/wireCrooked.png rename to data/stank/sprite/PNG/default/wireCrooked.png diff --git a/data/stank/sprite/PNG/Default size/wireStraight.png b/data/stank/sprite/PNG/default/wireStraight.png similarity index 100% rename from data/stank/sprite/PNG/Default size/wireStraight.png rename to data/stank/sprite/PNG/default/wireStraight.png diff --git a/src/client.cpp b/src/client.cpp index 6706675..f0bcb6c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -13,6 +13,7 @@ #include "common/Constants.h" #include "client/ClientNetwork.h" +#include "client/Player.h" int main() { std::cout << "Hello, World Client!" << std::endl; @@ -20,24 +21,61 @@ int main() { ClientNetwork networking; networking.start(); + Player player; + gf::Window window("Example", { 640, 480 }); gf::RenderWindow renderer(window); renderer.clear(gf::Color::White); + gf::Texture texture("sprite/PNG/default/barrelRed_side.png"); + gf::Sprite sprite(texture); + gf::Font font("DroidSans.ttf"); gf::Text text("Hello gf!", font, 50); text.setColor(gf::Color4f(0.0f,0.0f,0.0f,1.0f)); text.setPosition({ 100, 100 }); + sprite.setPosition({ player.x, player.y }); + + gf::Clock clock; while (window.isOpen()) { // Process events + float dt = clock.restart().asSeconds(); gf::Event event; while (window.pollEvent(event)) { switch (event.type) { case gf::EventType::Closed: window.close(); networking.stop(); + break; // TODO: Séparé input & update + case gf::EventType::KeyPressed: + if (event.key.keycode == gf::Keycode::Right) { + player.move(100.0f * dt, 0); + } + if (event.key.keycode == gf::Keycode::Left) { + player.move(-100.0f * dt, 0); + } + if (event.key.keycode == gf::Keycode::Up) { + player.move(0, -100.0f * dt); + } + if (event.key.keycode == gf::Keycode::Down) { + player.move(0, 100.0f * (float) dt); + } + break; + case gf::EventType::KeyRepeated: + if (event.key.keycode == gf::Keycode::Right) { + player.move(100.0f * dt, 0); + } + if (event.key.keycode == gf::Keycode::Left) { + player.move(-100.0f * dt, 0); + } + if (event.key.keycode == gf::Keycode::Up) { + player.move(0, -100.0f * dt); + } + if (event.key.keycode == gf::Keycode::Down) { + player.move(0, 100.0f * (float) dt); + } break; default: break; @@ -45,7 +83,8 @@ int main() { } // Draw the entities renderer.clear(); - //renderer.draw(sprite); + sprite.setPosition({ player.x, player.y }); + renderer.draw(sprite); renderer.draw(text); renderer.display(); } diff --git a/src/client/Player.cpp b/src/client/Player.cpp new file mode 100644 index 0000000..cb12b16 --- /dev/null +++ b/src/client/Player.cpp @@ -0,0 +1,10 @@ +// +// Created by azrotho on 20/10/2026. +// + +#include "Player.h" + +void Player::move(float dx, float dy) { + x += dx; + y += dy; +} \ No newline at end of file diff --git a/src/client/Player.h b/src/client/Player.h new file mode 100644 index 0000000..eeb9302 --- /dev/null +++ b/src/client/Player.h @@ -0,0 +1,17 @@ +// +// Created by azrotho on 20/10/2026. +// + +#ifndef STANK_PLAYER_H +#define STANK_PLAYER_H + + +class Player { + public: + float x = 0; + float y = 0; + void move(float dx, float dy); +}; + + +#endif //STANK_PLAYER_H