diff --git a/resources/Battle/Fight/allemand.csv b/Data/Battle/Fight/allemand.csv similarity index 100% rename from resources/Battle/Fight/allemand.csv rename to Data/Battle/Fight/allemand.csv diff --git a/resources/Battle/Fight/data_branche.xlsx b/Data/Battle/Fight/data_branche.xlsx similarity index 100% rename from resources/Battle/Fight/data_branche.xlsx rename to Data/Battle/Fight/data_branche.xlsx diff --git a/resources/Battle/Fight/electricite.csv b/Data/Battle/Fight/electricite.csv similarity index 100% rename from resources/Battle/Fight/electricite.csv rename to Data/Battle/Fight/electricite.csv diff --git a/resources/Battle/Fight/enemy.csv b/Data/Battle/Fight/enemy.csv similarity index 100% rename from resources/Battle/Fight/enemy.csv rename to Data/Battle/Fight/enemy.csv diff --git a/resources/Battle/Fight/informatique.csv b/Data/Battle/Fight/informatique.csv similarity index 100% rename from resources/Battle/Fight/informatique.csv rename to Data/Battle/Fight/informatique.csv diff --git a/resources/Battle/Fight/mathematique.csv b/Data/Battle/Fight/mathematique.csv similarity index 100% rename from resources/Battle/Fight/mathematique.csv rename to Data/Battle/Fight/mathematique.csv diff --git a/resources/Battle/Fight/mecanique.csv b/Data/Battle/Fight/mecanique.csv similarity index 100% rename from resources/Battle/Fight/mecanique.csv rename to Data/Battle/Fight/mecanique.csv diff --git a/resources/Battle/Fight/physique.csv b/Data/Battle/Fight/physique.csv similarity index 100% rename from resources/Battle/Fight/physique.csv rename to Data/Battle/Fight/physique.csv diff --git a/resources/Battle/Speech/enemy.txt b/Data/Battle/Speech/enemy.txt similarity index 100% rename from resources/Battle/Speech/enemy.txt rename to Data/Battle/Speech/enemy.txt diff --git a/resources/Battle/Speech/mudry.txt b/Data/Battle/Speech/mudry.txt similarity index 100% rename from resources/Battle/Speech/mudry.txt rename to Data/Battle/Speech/mudry.txt diff --git a/resources/font/OptimusPrinceps.ttf b/Data/font/OptimusPrinceps.ttf similarity index 100% rename from resources/font/OptimusPrinceps.ttf rename to Data/font/OptimusPrinceps.ttf diff --git a/resources/font/RobotoSlab-Regular.ttf b/Data/font/RobotoSlab-Regular.ttf similarity index 100% rename from resources/font/RobotoSlab-Regular.ttf rename to Data/font/RobotoSlab-Regular.ttf diff --git a/resources/font/Starjedi.ttf b/Data/font/Starjedi.ttf similarity index 100% rename from resources/font/Starjedi.ttf rename to Data/font/Starjedi.ttf diff --git a/resources/font/Timeless.ttf b/Data/font/Timeless.ttf similarity index 100% rename from resources/font/Timeless.ttf rename to Data/font/Timeless.ttf diff --git a/resources/font/Ubuntu-Medium.ttf b/Data/font/Ubuntu-Medium.ttf similarity index 100% rename from resources/font/Ubuntu-Medium.ttf rename to Data/font/Ubuntu-Medium.ttf diff --git a/resources/font/Ubuntu-Regular.ttf b/Data/font/Ubuntu-Regular.ttf similarity index 100% rename from resources/font/Ubuntu-Regular.ttf rename to Data/font/Ubuntu-Regular.ttf diff --git a/resources/font/ice_pixel-7.ttf b/Data/font/ice_pixel-7.ttf similarity index 100% rename from resources/font/ice_pixel-7.ttf rename to Data/font/ice_pixel-7.ttf diff --git a/resources/icon/pokeMudry.ico b/Data/icon/pokeMudry.ico similarity index 100% rename from resources/icon/pokeMudry.ico rename to Data/icon/pokeMudry.ico diff --git a/resources/icon/pokeMudry.png b/Data/icon/pokeMudry.png similarity index 100% rename from resources/icon/pokeMudry.png rename to Data/icon/pokeMudry.png diff --git a/resources/icon/pokeMudry.xcf b/Data/icon/pokeMudry.xcf similarity index 100% rename from resources/icon/pokeMudry.xcf rename to Data/icon/pokeMudry.xcf diff --git a/resources/Character.png b/Data/img/Character.png similarity index 100% rename from resources/Character.png rename to Data/img/Character.png diff --git a/resources/Character_flipped.png b/Data/img/Character_flipped.png similarity index 100% rename from resources/Character_flipped.png rename to Data/img/Character_flipped.png diff --git a/resources/Data/Image_prof/Bezençon Cyrille.jpg b/Data/img/Image_prof/Bezençon Cyrille.jpg similarity index 100% rename from resources/Data/Image_prof/Bezençon Cyrille.jpg rename to Data/img/Image_prof/Bezençon Cyrille.jpg diff --git a/resources/Data/Image_prof/Bianchi Christophe.jpg b/Data/img/Image_prof/Bianchi Christophe.jpg similarity index 100% rename from resources/Data/Image_prof/Bianchi Christophe.jpg rename to Data/img/Image_prof/Bianchi Christophe.jpg diff --git a/resources/Data/Image_prof/Collab5118197931.jpg b/Data/img/Image_prof/Collab5118197931.jpg similarity index 100% rename from resources/Data/Image_prof/Collab5118197931.jpg rename to Data/img/Image_prof/Collab5118197931.jpg diff --git a/resources/Data/Image_prof/Davide Pavanello.jpg b/Data/img/Image_prof/Davide Pavanello.jpg similarity index 100% rename from resources/Data/Image_prof/Davide Pavanello.jpg rename to Data/img/Image_prof/Davide Pavanello.jpg diff --git a/resources/Data/Image_prof/Ellert Christoph.jpg b/Data/img/Image_prof/Ellert Christoph.jpg similarity index 100% rename from resources/Data/Image_prof/Ellert Christoph.jpg rename to Data/img/Image_prof/Ellert Christoph.jpg diff --git a/resources/Data/Image_prof/Epiney Jacques.jpg b/Data/img/Image_prof/Epiney Jacques.jpg similarity index 100% rename from resources/Data/Image_prof/Epiney Jacques.jpg rename to Data/img/Image_prof/Epiney Jacques.jpg diff --git a/resources/Data/Image_prof/Evéquoz Gilles.jpg b/Data/img/Image_prof/Evéquoz Gilles.jpg similarity index 100% rename from resources/Data/Image_prof/Evéquoz Gilles.jpg rename to Data/img/Image_prof/Evéquoz Gilles.jpg diff --git a/resources/Data/Image_prof/Gloeckner Caroline.jpg b/Data/img/Image_prof/Gloeckner Caroline.jpg similarity index 100% rename from resources/Data/Image_prof/Gloeckner Caroline.jpg rename to Data/img/Image_prof/Gloeckner Caroline.jpg diff --git a/resources/Data/Image_prof/Haifa Sallem.jpg b/Data/img/Image_prof/Haifa Sallem.jpg similarity index 100% rename from resources/Data/Image_prof/Haifa Sallem.jpg rename to Data/img/Image_prof/Haifa Sallem.jpg diff --git a/resources/Data/Image_prof/Laffargue-Rieder Laurence.jpg b/Data/img/Image_prof/Laffargue-Rieder Laurence.jpg similarity index 100% rename from resources/Data/Image_prof/Laffargue-Rieder Laurence.jpg rename to Data/img/Image_prof/Laffargue-Rieder Laurence.jpg diff --git a/resources/Data/Image_prof/Mudry Pierre-André.jpg b/Data/img/Image_prof/Mudry Pierre-André.jpg similarity index 100% rename from resources/Data/Image_prof/Mudry Pierre-André.jpg rename to Data/img/Image_prof/Mudry Pierre-André.jpg diff --git a/resources/Data/Image_prof/Nicollier Grégoire.jpg b/Data/img/Image_prof/Nicollier Grégoire.jpg similarity index 100% rename from resources/Data/Image_prof/Nicollier Grégoire.jpg rename to Data/img/Image_prof/Nicollier Grégoire.jpg diff --git a/resources/Data/Image_prof/Paciotti Gabriel.jpg b/Data/img/Image_prof/Paciotti Gabriel.jpg similarity index 100% rename from resources/Data/Image_prof/Paciotti Gabriel.jpg rename to Data/img/Image_prof/Paciotti Gabriel.jpg diff --git a/resources/Data/Image_prof/Rapillard Laurent.jpg b/Data/img/Image_prof/Rapillard Laurent.jpg similarity index 100% rename from resources/Data/Image_prof/Rapillard Laurent.jpg rename to Data/img/Image_prof/Rapillard Laurent.jpg diff --git a/resources/Data/Image_prof/Samuel Rey-Mermet.jpg b/Data/img/Image_prof/Samuel Rey-Mermet.jpg similarity index 100% rename from resources/Data/Image_prof/Samuel Rey-Mermet.jpg rename to Data/img/Image_prof/Samuel Rey-Mermet.jpg diff --git a/resources/Data/Image_prof/Savioz Christian.jpg b/Data/img/Image_prof/Savioz Christian.jpg similarity index 100% rename from resources/Data/Image_prof/Savioz Christian.jpg rename to Data/img/Image_prof/Savioz Christian.jpg diff --git a/resources/Data/Image_prof/Wittmann Christian.jpg b/Data/img/Image_prof/Wittmann Christian.jpg similarity index 100% rename from resources/Data/Image_prof/Wittmann Christian.jpg rename to Data/img/Image_prof/Wittmann Christian.jpg diff --git a/resources/Data/liste professeur.txt b/Data/img/liste professeur.txt similarity index 100% rename from resources/Data/liste professeur.txt rename to Data/img/liste professeur.txt diff --git a/resources/lumberjack_sheet32.png b/Data/img/lumberjack_sheet32.png similarity index 100% rename from resources/lumberjack_sheet32.png rename to Data/img/lumberjack_sheet32.png diff --git a/resources/sprite_flipper.py b/Data/img/sprite_flipper.py similarity index 100% rename from resources/sprite_flipper.py rename to Data/img/sprite_flipper.py diff --git a/resources/map/21N1.tmx b/Data/map/21N1.tmx similarity index 100% rename from resources/map/21N1.tmx rename to Data/map/21N1.tmx diff --git a/resources/map/21N2.tmx b/Data/map/21N2.tmx similarity index 100% rename from resources/map/21N2.tmx rename to Data/map/21N2.tmx diff --git a/resources/map/21N205.tmx b/Data/map/21N205.tmx similarity index 100% rename from resources/map/21N205.tmx rename to Data/map/21N205.tmx diff --git a/resources/map/21N3.tmx b/Data/map/21N3.tmx similarity index 100% rename from resources/map/21N3.tmx rename to Data/map/21N3.tmx diff --git a/resources/map/21N304.tmx b/Data/map/21N304.tmx similarity index 100% rename from resources/map/21N304.tmx rename to Data/map/21N304.tmx diff --git a/resources/map/21N307.tmx b/Data/map/21N307.tmx similarity index 100% rename from resources/map/21N307.tmx rename to Data/map/21N307.tmx diff --git a/resources/map/21N308.tmx b/Data/map/21N308.tmx similarity index 100% rename from resources/map/21N308.tmx rename to Data/map/21N308.tmx diff --git a/resources/map/21RI.tmx b/Data/map/21RI.tmx similarity index 100% rename from resources/map/21RI.tmx rename to Data/map/21RI.tmx diff --git a/resources/map/21RS.tmx b/Data/map/21RS.tmx similarity index 100% rename from resources/map/21RS.tmx rename to Data/map/21RS.tmx diff --git a/resources/map/23N1.tmx b/Data/map/23N1.tmx similarity index 100% rename from resources/map/23N1.tmx rename to Data/map/23N1.tmx diff --git a/resources/map/23N2.tmx b/Data/map/23N2.tmx similarity index 100% rename from resources/map/23N2.tmx rename to Data/map/23N2.tmx diff --git a/resources/map/23N215.tmx b/Data/map/23N215.tmx similarity index 100% rename from resources/map/23N215.tmx rename to Data/map/23N215.tmx diff --git a/resources/map/23N3.tmx b/Data/map/23N3.tmx similarity index 100% rename from resources/map/23N3.tmx rename to Data/map/23N3.tmx diff --git a/resources/map/23N308.tmx b/Data/map/23N308.tmx similarity index 100% rename from resources/map/23N308.tmx rename to Data/map/23N308.tmx diff --git a/resources/map/23RI.tmx b/Data/map/23RI.tmx similarity index 100% rename from resources/map/23RI.tmx rename to Data/map/23RI.tmx diff --git a/resources/map/23RS.tmx b/Data/map/23RS.tmx similarity index 100% rename from resources/map/23RS.tmx rename to Data/map/23RS.tmx diff --git a/resources/map/Maps.tiled-project b/Data/map/Maps.tiled-project similarity index 100% rename from resources/map/Maps.tiled-project rename to Data/map/Maps.tiled-project diff --git a/resources/map/SS.tmx b/Data/map/SS.tmx similarity index 100% rename from resources/map/SS.tmx rename to Data/map/SS.tmx diff --git a/resources/Base.png b/Data/map/assets/Base.png similarity index 100% rename from resources/Base.png rename to Data/map/assets/Base.png diff --git a/resources/map/assets/Character.png b/Data/map/assets/Character.png similarity index 100% rename from resources/map/assets/Character.png rename to Data/map/assets/Character.png diff --git a/resources/map/assets/Dungeon.png b/Data/map/assets/Dungeon.png similarity index 100% rename from resources/map/assets/Dungeon.png rename to Data/map/assets/Dungeon.png diff --git a/resources/map/assets/Dungeon.tsx b/Data/map/assets/Dungeon.tsx similarity index 100% rename from resources/map/assets/Dungeon.tsx rename to Data/map/assets/Dungeon.tsx diff --git a/resources/map/assets/Dungeon_v2.png b/Data/map/assets/Dungeon_v2.png similarity index 100% rename from resources/map/assets/Dungeon_v2.png rename to Data/map/assets/Dungeon_v2.png diff --git a/resources/map/assets/Dungeon_v2.tsx b/Data/map/assets/Dungeon_v2.tsx similarity index 100% rename from resources/map/assets/Dungeon_v2.tsx rename to Data/map/assets/Dungeon_v2.tsx diff --git a/resources/map/assets/Interior_v2.png b/Data/map/assets/Interior_v2.png similarity index 100% rename from resources/map/assets/Interior_v2.png rename to Data/map/assets/Interior_v2.png diff --git a/resources/map/assets/Interior_v2.tsx b/Data/map/assets/Interior_v2.tsx similarity index 100% rename from resources/map/assets/Interior_v2.tsx rename to Data/map/assets/Interior_v2.tsx diff --git a/resources/map/assets/MegaPixelArt_v2.png b/Data/map/assets/MegaPixelArt_v2.png similarity index 100% rename from resources/map/assets/MegaPixelArt_v2.png rename to Data/map/assets/MegaPixelArt_v2.png diff --git a/resources/map/assets/MegaPixelArt_v2.tsx b/Data/map/assets/MegaPixelArt_v2.tsx similarity index 100% rename from resources/map/assets/MegaPixelArt_v2.tsx rename to Data/map/assets/MegaPixelArt_v2.tsx diff --git a/resources/map/assets/Slates_v2.png b/Data/map/assets/Slates_v2.png similarity index 100% rename from resources/map/assets/Slates_v2.png rename to Data/map/assets/Slates_v2.png diff --git a/resources/map/assets/Slates_v2.tsx b/Data/map/assets/Slates_v2.tsx similarity index 100% rename from resources/map/assets/Slates_v2.tsx rename to Data/map/assets/Slates_v2.tsx diff --git a/resources/map/assets/TileSet_V2.tsx b/Data/map/assets/TileSet_V2.tsx similarity index 100% rename from resources/map/assets/TileSet_V2.tsx rename to Data/map/assets/TileSet_V2.tsx diff --git a/resources/map/assets/desert.png b/Data/map/assets/desert.png similarity index 100% rename from resources/map/assets/desert.png rename to Data/map/assets/desert.png diff --git a/resources/map/assets/pokemon_v2.png b/Data/map/assets/pokemon_v2.png similarity index 100% rename from resources/map/assets/pokemon_v2.png rename to Data/map/assets/pokemon_v2.png diff --git a/resources/map/assets/pokemon_v2.tsx b/Data/map/assets/pokemon_v2.tsx similarity index 100% rename from resources/map/assets/pokemon_v2.tsx rename to Data/map/assets/pokemon_v2.tsx diff --git a/resources/map/assets/test.png b/Data/map/assets/test.png similarity index 100% rename from resources/map/assets/test.png rename to Data/map/assets/test.png diff --git a/resources/map/assets/test.tsx b/Data/map/assets/test.tsx similarity index 100% rename from resources/map/assets/test.tsx rename to Data/map/assets/test.tsx diff --git a/resources/map/assets/tpq_v2.png b/Data/map/assets/tpq_v2.png similarity index 100% rename from resources/map/assets/tpq_v2.png rename to Data/map/assets/tpq_v2.png diff --git a/resources/map/assets/tpq_v2.tsx b/Data/map/assets/tpq_v2.tsx similarity index 100% rename from resources/map/assets/tpq_v2.tsx rename to Data/map/assets/tpq_v2.tsx diff --git a/resources/map/desert.tmx b/Data/map/desert.tmx similarity index 100% rename from resources/map/desert.tmx rename to Data/map/desert.tmx diff --git a/resources/map/png/21.xcf b/Data/map/png/21.xcf similarity index 100% rename from resources/map/png/21.xcf rename to Data/map/png/21.xcf diff --git a/resources/map/png/21N1.PNG b/Data/map/png/21N1.PNG similarity index 100% rename from resources/map/png/21N1.PNG rename to Data/map/png/21N1.PNG diff --git a/resources/map/png/21N2.PNG b/Data/map/png/21N2.PNG similarity index 100% rename from resources/map/png/21N2.PNG rename to Data/map/png/21N2.PNG diff --git a/resources/map/png/21N3.PNG b/Data/map/png/21N3.PNG similarity index 100% rename from resources/map/png/21N3.PNG rename to Data/map/png/21N3.PNG diff --git a/resources/map/png/21N4.PNG b/Data/map/png/21N4.PNG similarity index 100% rename from resources/map/png/21N4.PNG rename to Data/map/png/21N4.PNG diff --git a/resources/map/png/21N5.PNG b/Data/map/png/21N5.PNG similarity index 100% rename from resources/map/png/21N5.PNG rename to Data/map/png/21N5.PNG diff --git a/resources/map/png/21N6.PNG b/Data/map/png/21N6.PNG similarity index 100% rename from resources/map/png/21N6.PNG rename to Data/map/png/21N6.PNG diff --git a/resources/map/png/21N7.PNG b/Data/map/png/21N7.PNG similarity index 100% rename from resources/map/png/21N7.PNG rename to Data/map/png/21N7.PNG diff --git a/resources/map/png/21RI.PNG b/Data/map/png/21RI.PNG similarity index 100% rename from resources/map/png/21RI.PNG rename to Data/map/png/21RI.PNG diff --git a/resources/map/png/21RS.PNG b/Data/map/png/21RS.PNG similarity index 100% rename from resources/map/png/21RS.PNG rename to Data/map/png/21RS.PNG diff --git a/resources/map/png/21SS.PNG b/Data/map/png/21SS.PNG similarity index 100% rename from resources/map/png/21SS.PNG rename to Data/map/png/21SS.PNG diff --git a/resources/map/png/23.xcf b/Data/map/png/23.xcf similarity index 100% rename from resources/map/png/23.xcf rename to Data/map/png/23.xcf diff --git a/resources/map/png/23N1.PNG b/Data/map/png/23N1.PNG similarity index 100% rename from resources/map/png/23N1.PNG rename to Data/map/png/23N1.PNG diff --git a/resources/map/png/23N2.PNG b/Data/map/png/23N2.PNG similarity index 100% rename from resources/map/png/23N2.PNG rename to Data/map/png/23N2.PNG diff --git a/resources/map/png/23N3.PNG b/Data/map/png/23N3.PNG similarity index 100% rename from resources/map/png/23N3.PNG rename to Data/map/png/23N3.PNG diff --git a/resources/map/png/23N4.PNG b/Data/map/png/23N4.PNG similarity index 100% rename from resources/map/png/23N4.PNG rename to Data/map/png/23N4.PNG diff --git a/resources/map/png/23N5.PNG b/Data/map/png/23N5.PNG similarity index 100% rename from resources/map/png/23N5.PNG rename to Data/map/png/23N5.PNG diff --git a/resources/map/png/23RI.PNG b/Data/map/png/23RI.PNG similarity index 100% rename from resources/map/png/23RI.PNG rename to Data/map/png/23RI.PNG diff --git a/resources/map/png/23RS.PNG b/Data/map/png/23RS.PNG similarity index 100% rename from resources/map/png/23RS.PNG rename to Data/map/png/23RS.PNG diff --git a/resources/map/png/23SS.PNG b/Data/map/png/23SS.PNG similarity index 100% rename from resources/map/png/23SS.PNG rename to Data/map/png/23SS.PNG diff --git a/resources/map/propertytypes.json b/Data/map/propertytypes.json similarity index 100% rename from resources/map/propertytypes.json rename to Data/map/propertytypes.json diff --git a/resources/map/test.tmx b/Data/map/test.tmx similarity index 100% rename from resources/map/test.tmx rename to Data/map/test.tmx diff --git a/resources/map/test_couloir.tmx b/Data/map/test_couloir.tmx similarity index 100% rename from resources/map/test_couloir.tmx rename to Data/map/test_couloir.tmx diff --git a/resources/map/texture_splitter_v2.py b/Data/map/texture_splitter_v2.py similarity index 100% rename from resources/map/texture_splitter_v2.py rename to Data/map/texture_splitter_v2.py diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/101-opening.mp3 b/Data/sound/pokemon/101-opening.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/101-opening.mp3 rename to Data/sound/pokemon/101-opening.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/102-palette town theme.mp3 b/Data/sound/pokemon/102-palette town theme.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/102-palette town theme.mp3 rename to Data/sound/pokemon/102-palette town theme.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/103-professor oak.mp3 b/Data/sound/pokemon/103-professor oak.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/103-professor oak.mp3 rename to Data/sound/pokemon/103-professor oak.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/104-oak research lab.mp3 b/Data/sound/pokemon/104-oak research lab.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/104-oak research lab.mp3 rename to Data/sound/pokemon/104-oak research lab.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/105-rival appears.mp3 b/Data/sound/pokemon/105-rival appears.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/105-rival appears.mp3 rename to Data/sound/pokemon/105-rival appears.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/106-the road to viridian city - from palette.mp3 b/Data/sound/pokemon/106-the road to viridian city - from palette.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/106-the road to viridian city - from palette.mp3 rename to Data/sound/pokemon/106-the road to viridian city - from palette.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/107-battle (vs wild pokemon).mp3 b/Data/sound/pokemon/107-battle (vs wild pokemon).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/107-battle (vs wild pokemon).mp3 rename to Data/sound/pokemon/107-battle (vs wild pokemon).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/108-victory (vs wild pokemon).mp3 b/Data/sound/pokemon/108-victory (vs wild pokemon).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/108-victory (vs wild pokemon).mp3 rename to Data/sound/pokemon/108-victory (vs wild pokemon).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/109-pewter city's theme.mp3 b/Data/sound/pokemon/109-pewter city's theme.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/109-pewter city's theme.mp3 rename to Data/sound/pokemon/109-pewter city's theme.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/110-pokemon center.mp3 b/Data/sound/pokemon/110-pokemon center.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/110-pokemon center.mp3 rename to Data/sound/pokemon/110-pokemon center.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/111-pokemon recovery.mp3 b/Data/sound/pokemon/111-pokemon recovery.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/111-pokemon recovery.mp3 rename to Data/sound/pokemon/111-pokemon recovery.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/112-viridian forest.mp3 b/Data/sound/pokemon/112-viridian forest.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/112-viridian forest.mp3 rename to Data/sound/pokemon/112-viridian forest.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/113-guidepost.mp3 b/Data/sound/pokemon/113-guidepost.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/113-guidepost.mp3 rename to Data/sound/pokemon/113-guidepost.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/114-trainer appears (girl chapter).mp3 b/Data/sound/pokemon/114-trainer appears (girl chapter).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/114-trainer appears (girl chapter).mp3 rename to Data/sound/pokemon/114-trainer appears (girl chapter).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/115-battle (vs trainer).mp3 b/Data/sound/pokemon/115-battle (vs trainer).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/115-battle (vs trainer).mp3 rename to Data/sound/pokemon/115-battle (vs trainer).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/116-victory (vs trainer).mp3 b/Data/sound/pokemon/116-victory (vs trainer).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/116-victory (vs trainer).mp3 rename to Data/sound/pokemon/116-victory (vs trainer).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/117-mt. moon cave.mp3 b/Data/sound/pokemon/117-mt. moon cave.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/117-mt. moon cave.mp3 rename to Data/sound/pokemon/117-mt. moon cave.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/118-the road to cerulean from mt. moon.mp3 b/Data/sound/pokemon/118-the road to cerulean from mt. moon.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/118-the road to cerulean from mt. moon.mp3 rename to Data/sound/pokemon/118-the road to cerulean from mt. moon.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/119-cerulean city's theme.mp3 b/Data/sound/pokemon/119-cerulean city's theme.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/119-cerulean city's theme.mp3 rename to Data/sound/pokemon/119-cerulean city's theme.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/120-pokemon gym.mp3 b/Data/sound/pokemon/120-pokemon gym.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/120-pokemon gym.mp3 rename to Data/sound/pokemon/120-pokemon gym.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/121-to bill's origin - from cerulean.mp3 b/Data/sound/pokemon/121-to bill's origin - from cerulean.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/121-to bill's origin - from cerulean.mp3 rename to Data/sound/pokemon/121-to bill's origin - from cerulean.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/122-jigglypuff's song.mp3 b/Data/sound/pokemon/122-jigglypuff's song.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/122-jigglypuff's song.mp3 rename to Data/sound/pokemon/122-jigglypuff's song.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/123-vermillion city's theme.mp3 b/Data/sound/pokemon/123-vermillion city's theme.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/123-vermillion city's theme.mp3 rename to Data/sound/pokemon/123-vermillion city's theme.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/124-codename- st. anne.mp3 b/Data/sound/pokemon/124-codename- st. anne.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/124-codename- st. anne.mp3 rename to Data/sound/pokemon/124-codename- st. anne.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/125-the road to lavender town - from vermillion.mp3 b/Data/sound/pokemon/125-the road to lavender town - from vermillion.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/125-the road to lavender town - from vermillion.mp3 rename to Data/sound/pokemon/125-the road to lavender town - from vermillion.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/126-pokemon whistle.mp3 b/Data/sound/pokemon/126-pokemon whistle.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/126-pokemon whistle.mp3 rename to Data/sound/pokemon/126-pokemon whistle.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/127-trainer appears (boy chapter).mp3 b/Data/sound/pokemon/127-trainer appears (boy chapter).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/127-trainer appears (boy chapter).mp3 rename to Data/sound/pokemon/127-trainer appears (boy chapter).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/128-battle (vs gym leader).mp3 b/Data/sound/pokemon/128-battle (vs gym leader).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/128-battle (vs gym leader).mp3 rename to Data/sound/pokemon/128-battle (vs gym leader).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/129-victory (vs gym leader).mp3 b/Data/sound/pokemon/129-victory (vs gym leader).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/129-victory (vs gym leader).mp3 rename to Data/sound/pokemon/129-victory (vs gym leader).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/130-cycling.mp3 b/Data/sound/pokemon/130-cycling.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/130-cycling.mp3 rename to Data/sound/pokemon/130-cycling.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/131-lavender town's theme.mp3 b/Data/sound/pokemon/131-lavender town's theme.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/131-lavender town's theme.mp3 rename to Data/sound/pokemon/131-lavender town's theme.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/132-pokemon tower.mp3 b/Data/sound/pokemon/132-pokemon tower.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/132-pokemon tower.mp3 rename to Data/sound/pokemon/132-pokemon tower.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/133-celadon city.mp3 b/Data/sound/pokemon/133-celadon city.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/133-celadon city.mp3 rename to Data/sound/pokemon/133-celadon city.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/134-casino.mp3 b/Data/sound/pokemon/134-casino.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/134-casino.mp3 rename to Data/sound/pokemon/134-casino.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/135-trainer appears (bad guy chapter).mp3 b/Data/sound/pokemon/135-trainer appears (bad guy chapter).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/135-trainer appears (bad guy chapter).mp3 rename to Data/sound/pokemon/135-trainer appears (bad guy chapter).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/136-team rocket hideout.mp3 b/Data/sound/pokemon/136-team rocket hideout.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/136-team rocket hideout.mp3 rename to Data/sound/pokemon/136-team rocket hideout.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/137-sylph company.mp3 b/Data/sound/pokemon/137-sylph company.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/137-sylph company.mp3 rename to Data/sound/pokemon/137-sylph company.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/138-ocean.mp3 b/Data/sound/pokemon/138-ocean.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/138-ocean.mp3 rename to Data/sound/pokemon/138-ocean.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/139-cinnabar islands' theme.mp3 b/Data/sound/pokemon/139-cinnabar islands' theme.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/139-cinnabar islands' theme.mp3 rename to Data/sound/pokemon/139-cinnabar islands' theme.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/140-pokemon mansion.mp3 b/Data/sound/pokemon/140-pokemon mansion.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/140-pokemon mansion.mp3 rename to Data/sound/pokemon/140-pokemon mansion.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/141-evolution.mp3 b/Data/sound/pokemon/141-evolution.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/141-evolution.mp3 rename to Data/sound/pokemon/141-evolution.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/142-the final road.mp3 b/Data/sound/pokemon/142-the final road.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/142-the final road.mp3 rename to Data/sound/pokemon/142-the final road.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/143-last battle (vs rival).mp3 b/Data/sound/pokemon/143-last battle (vs rival).mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/143-last battle (vs rival).mp3 rename to Data/sound/pokemon/143-last battle (vs rival).mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/144-into the palace.mp3 b/Data/sound/pokemon/144-into the palace.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/144-into the palace.mp3 rename to Data/sound/pokemon/144-into the palace.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/145-ending.mp3 b/Data/sound/pokemon/145-ending.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/145-ending.mp3 rename to Data/sound/pokemon/145-ending.mp3 diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/299-sound effect collection.mp3 b/Data/sound/pokemon/299-sound effect collection.mp3 similarity index 100% rename from resources/sound/Pokemon Gameboy Sound Collection (MP3)/299-sound effect collection.mp3 rename to Data/sound/pokemon/299-sound effect collection.mp3 diff --git a/resources/Base_flipped.png b/resources/Base_flipped.png deleted file mode 100644 index 3123e12..0000000 Binary files a/resources/Base_flipped.png and /dev/null differ diff --git a/resources/map/Maps.tiled-session b/resources/map/Maps.tiled-session deleted file mode 100644 index 69e699a..0000000 --- a/resources/map/Maps.tiled-session +++ /dev/null @@ -1,532 +0,0 @@ -{ - "Map/SizeTest": { - "height": 4300, - "width": 2 - }, - "activeFile": "", - "expandedProjectPaths": [ - "assets", - "png", - "." - ], - "file.lastUsedOpenFilter": "Tous les Fichiers (*)", - "fileStates": { - "": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "21N1.tmx": { - "scale": 0.75, - "selectedLayer": 4, - "viewCenter": { - "x": 177.99999999999994, - "y": 178 - } - }, - "21N2.tmx": { - "expandedObjectLayers": [ - 6 - ], - "scale": 0.75, - "selectedLayer": 3, - "viewCenter": { - "x": 385.99999999999994, - "y": 167.33333333333331 - } - }, - "21N205.tmx": { - "expandedObjectLayers": [ - 7 - ], - "scale": 2, - "selectedLayer": 3, - "viewCenter": { - "x": 150.75, - "y": 315.75 - } - }, - "21N3.tmx": { - "expandedObjectLayers": [ - 6 - ], - "scale": 2, - "selectedLayer": 2, - "viewCenter": { - "x": 1057.75, - "y": 361.75 - } - }, - "21N304.tmx": { - "expandedObjectLayers": [ - 7 - ], - "scale": 2.0908482142857143, - "selectedLayer": 3, - "viewCenter": { - "x": 126.02540834845733, - "y": 270.94267107932103 - } - }, - "21N307.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 1.5, - "selectedLayer": 3, - "viewCenter": { - "x": 173.66666666666666, - "y": 52.333333333333314 - } - }, - "21N308.tmx": { - "expandedObjectLayers": [ - 7 - ], - "scale": 1.5, - "selectedLayer": 4, - "viewCenter": { - "x": 257, - "y": 214.33333333333331 - } - }, - "21N3_v2.tmx": { - "scale": 3, - "selectedLayer": 3, - "viewCenter": { - "x": 404.3333333333333, - "y": 137.5 - } - }, - "21RI.tmx": { - "expandedObjectLayers": [ - 6 - ], - "scale": 0.75, - "selectedLayer": 3, - "viewCenter": { - "x": 711.3333333333333, - "y": 527.3333333333333 - } - }, - "21RS.tmx": { - "expandedObjectLayers": [ - 6 - ], - "scale": 0.5, - "selectedLayer": 3, - "viewCenter": { - "x": 639, - "y": 367 - } - }, - "23N1.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 0.75, - "selectedLayer": 3, - "viewCenter": { - "x": 2450, - "y": 692.6666666666666 - } - }, - "23N2.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 2, - "selectedLayer": 3, - "viewCenter": { - "x": 2822.75, - "y": 538.25 - } - }, - "23N215.tmx": { - "expandedObjectLayers": [ - 7 - ], - "scale": 2.0908482142857143, - "selectedLayer": 0, - "viewCenter": { - "x": 198.72317711113482, - "y": 164.7656667022526 - } - }, - "23N3.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 1, - "selectedLayer": 3, - "viewCenter": { - "x": 2175.5, - "y": 582.5 - } - }, - "23N308.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 1.5, - "selectedLayer": 4, - "viewCenter": { - "x": 197.66666666666666, - "y": 255.66666666666666 - } - }, - "23RI.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 0.5, - "selectedLayer": 0, - "viewCenter": { - "x": 939, - "y": 983 - } - }, - "23RS.tmx": { - "expandedObjectLayers": [ - 5 - ], - "scale": 0.75, - "selectedLayer": 3, - "viewCenter": { - "x": 582, - "y": 336.66666666666663 - } - }, - "C:/Users/remi/AppData/Roaming/Tiled/#Tests": { - "dynamicWrapping": true - }, - "C:/Users/remi/Desktop/16x16 dungeon ii wall reconfig v04 spritesheet.tsx": { - "scaleInDock": 2, - "scaleInEditor": 3 - }, - "C:/Users/remi/Desktop/Tests.tsx": { - "dynamicWrapping": false, - "scaleInDock": 1, - "scaleInEditor": 0.33 - }, - "C:/Users/remi/Desktop/desert.tmx": { - "scale": 0.56109375, - "selectedLayer": 1, - "viewCenter": { - "x": 640.7128933444724, - "y": 640.7128933444724 - } - }, - "C:/Users/remi/Desktop/desert.tmx#Desert": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/Desktop/dungeon.tmx": { - "scale": 3, - "selectedLayer": 0, - "viewCenter": { - "x": -77.16666666666667, - "y": -39.5 - } - }, - "C:/Users/remi/Desktop/pokemon.tsx": { - "scaleInDock": 2, - "scaleInEditor": 2 - }, - "C:/Users/remi/Desktop/pokemon_rbgy__gen_1__complete_tileset_for_rmxp_by_cynthiacelestic_d97m9jw-pre.tsx": { - "scaleInDock": 1, - "scaleInEditor": 4 - }, - "C:/Users/remi/Desktop/test.tmx": { - "scale": 0.75, - "selectedLayer": 0, - "viewCenter": { - "x": 253.3333333333333, - "y": 234 - } - }, - "C:/Users/remi/Desktop/test.tmx#test": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/Desktop/test.tsx": { - "scaleInDock": 2 - }, - "C:/Users/remi/Desktop/tmw_desert_spacing.tsx": { - "scaleInDock": 1, - "scaleInEditor": 3 - }, - "C:/Users/remi/Downloads/desert.tsx": { - "scaleInDock": 1, - "scaleInEditor": 2 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/32x32 first tileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/Dungeon_Tileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/InteriorTileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1.5 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/OuterTileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/RPG Nature Tileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/TileSet_V2.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/Tiny Platform Quest Tiles.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1.5 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/pokemon.tsx": { - "scaleInDock": 1, - "scaleInEditor": 3 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/sRandomWorldItems.tsx": { - "scaleInDock": 1, - "scaleInEditor": 3 - }, - "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/transparent-bg-tiles.tsx": { - "scaleInDock": 1, - "scaleInEditor": 5.5 - }, - "I21N3.tmx": { - "expandedObjectLayers": [ - 6 - ], - "scale": 0.75, - "selectedLayer": 1, - "viewCenter": { - "x": 397.3333333333333, - "y": 347.3333333333333 - } - }, - "SS.tmx": { - "expandedObjectLayers": [ - 6 - ], - "scale": 0.75, - "selectedLayer": 3, - "viewCenter": { - "x": 4220.666666666666, - "y": 542 - } - }, - "assets/32x32 first tileset.tsx": { - "dynamicWrapping": false, - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/Dungeon.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/Dungeon_Tileset.tsx": { - "dynamicWrapping": false, - "scaleInDock": 1.5, - "scaleInEditor": 1 - }, - "assets/Dungeon_v2.tsx": { - "scaleInDock": 1.5, - "scaleInEditor": 1.5 - }, - "assets/HKU tileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/Interior.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/InteriorTileset.tsx": { - "dynamicWrapping": false, - "scaleInDock": 1, - "scaleInEditor": 2 - }, - "assets/Interior_v2.tsx": { - "scaleInDock": 1, - "scaleInEditor": 3 - }, - "assets/MegaPixelArt_v2.tsx": { - "scaleInDock": 1, - "scaleInEditor": 3 - }, - "assets/OuterTileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/PokeMudry.tsx": { - "dynamicWrapping": true, - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/RPG Nature Tileset.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/Slates v.2 [32x32px orthogonal tileset by Ivan Voirol].tsx": { - "dynamicWrapping": false, - "scaleInDock": 2, - "scaleInEditor": 2 - }, - "assets/Slates_v2.tsx": { - "scaleInDock": 3, - "scaleInEditor": 3 - }, - "assets/TileSet_V2.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "assets/Tiny Platform Quest Tiles.tsx": { - "dynamicWrapping": false, - "scaleInDock": 1, - "scaleInEditor": 1.5 - }, - "assets/pokemon.tsx": { - "dynamicWrapping": false, - "scaleInDock": 2, - "scaleInEditor": 1.5 - }, - "assets/pokemon_v2.tsx": { - "dynamicWrapping": false, - "scaleInDock": 1.5, - "scaleInEditor": 1 - }, - "assets/tpq_v2.tsx": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "desert.tmx": { - "expandedObjectLayers": [ - 3 - ], - "scale": 0.75, - "selectedLayer": 1, - "viewCenter": { - "x": 18, - "y": 524.6666666666666 - } - }, - "desert.tmx#Desert": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test.tmx": { - "expandedObjectLayers": [ - 2 - ], - "scale": 1.5, - "selectedLayer": 1, - "viewCenter": { - "x": 208.66666666666663, - "y": 17 - } - }, - "test.tmx#test": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx": { - "expandedObjectLayers": [ - 9 - ], - "scale": 1.5, - "selectedLayer": 0, - "viewCenter": { - "x": 285.99999999999994, - "y": 60.333333333333314 - } - }, - "test_couloir.tmx#Dungeon_Tileset": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#Dungeon_v2": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#InteriorTileset": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#Interior_v2": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#Slates v.2": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#Slates_v2": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#TPQT": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#pokemon": { - "scaleInDock": 2, - "scaleInEditor": 1 - }, - "test_couloir.tmx#pokemon_v2": { - "scaleInDock": 1, - "scaleInEditor": 1 - }, - "test_couloir.tmx#tpq_v2": { - "scaleInDock": 1 - } - }, - "last.exportedFilePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/tests_gdx2d_gradle/app/src/main/java/test_map/data", - "last.externalTilesetPath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/PokeMudry/resources/map/assets", - "last.imagePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/PokeMudry/resources/map/assets", - "last.objectTypesPath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map/propertytypes.json", - "last.worldFilePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map", - "lastUsedTilesetExportFilter": "Tous les Fichiers (*)", - "loadedWorlds": [ - ], - "map.fixedSize": true, - "map.height": 20, - "map.lastUsedExportFilter": "Fichiers de carte Tiled (*.tmx *.xml)", - "map.lastUsedFormat": "tmx", - "map.tileHeight": 32, - "map.tileWidth": 32, - "map.width": 20, - "openFiles": [ - ], - "project": "Maps.tiled-project", - "property.type": "string", - "recentFiles": [ - "21RS.tmx", - "21N2.tmx", - "21RI.tmx", - "23RI.tmx", - "23RS.tmx", - "23N2.tmx", - "23N215.tmx", - "23N308.tmx", - "23N3.tmx", - "23N1.tmx", - "21N3.tmx", - "SS.tmx" - ], - "resizeMap.removeObjects": true, - "tileset.lastUsedFilter": "Fichiers de jeu de tuiles Tiled (*.tsx *.xml)", - "tileset.lastUsedFormat": "tsx", - "tileset.margin": 0, - "tileset.spacing": 0, - "tileset.tileSize": { - "height": 32, - "width": 32 - }, - "tileset.type": 0 -} diff --git a/resources/map/assets/Base.png b/resources/map/assets/Base.png deleted file mode 100644 index 3485b12..0000000 Binary files a/resources/map/assets/Base.png and /dev/null differ diff --git a/resources/map/texture_splitter.py b/resources/map/texture_splitter.py deleted file mode 100644 index 8cb16fb..0000000 --- a/resources/map/texture_splitter.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -import os -from PIL import Image -import numpy as np - -W, H = 32, 32 - -def split(path): - if not os.path.exists(path): - print(f"File '{path}' not found") - return - - dir_ = os.path.dirname(path) - base = os.path.basename(path) - base, ext = os.path.splitext(base) - - try: - img = Image.open(path) - - except: - print(f"Could not load '{path}'. Maybe its not an image") - return - - a = np.array(img) - w, h = a.shape[1]//W, a.shape[0]//H - n = 0 - - for y in range(h): - for x in range(w): - try: - i = Image.fromarray(a[y*H:y*H+H, x*W:x*W+W]) - i.save(os.path.join(dir_, f"{base}_{x+y*w}{ext}")) - - except: - print(f"Could not create texture {x+y*w}") - - else: - n += 1 - - img.close() - - print(f"Succesfully created {n} textures") - - if a.shape[1] % 32 or a.shape[0] % 32: - print(f"The texture's shape was not a multiple of 32x32 ({a.shape[1]}x{a.shape[0]}). Only fully visible tiles have been extracted.") - -if __name__ == "__main__": - path = input("Path to tileset texture: ") - - split(path) \ No newline at end of file diff --git a/src/Entity/Character.java b/src/Entity/Character.java index c3098f3..9740196 100644 --- a/src/Entity/Character.java +++ b/src/Entity/Character.java @@ -48,7 +48,7 @@ public abstract class Character extends Entity{ @Override public void init() { super.init(); - ss = new Spritesheet("./" + img + ".png", SPRITE_WIDTH, SPRITE_HEIGHT); + ss = new Spritesheet("./Data/img/" + img + ".png", SPRITE_WIDTH, SPRITE_HEIGHT); } @Override diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java index 2c0c073..436b59d 100644 --- a/src/Screen/ScreenBattle.java +++ b/src/Screen/ScreenBattle.java @@ -30,7 +30,7 @@ public class ScreenBattle extends RenderingScreen{ @Override public void onInit() { //display the question - generateFont("./font/Ubuntu-Regular.ttf", 30, Color.BLACK); + generateFont("./Data/font/Ubuntu-Regular.ttf", 30, Color.BLACK); } diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java index 2767860..cdecbac 100644 --- a/src/Screen/ScreenMap.java +++ b/src/Screen/ScreenMap.java @@ -38,7 +38,7 @@ public class ScreenMap extends RenderingScreen{ private Player player; private void createMap(String name){ - TiledMap tm =new TmxMapLoader().load("./map/"+ name + ".tmx"); + TiledMap tm =new TmxMapLoader().load("./Data/map/"+ name + ".tmx"); tMap.put(name,tm); tMapRenderer.put(name,new OrthogonalTiledMapRenderer(tm)); } diff --git a/src/Text/FightData.java b/src/Text/FightData.java index 4fe2a09..3a2840e 100644 --- a/src/Text/FightData.java +++ b/src/Text/FightData.java @@ -16,7 +16,7 @@ public class FightData { public int nbre_line =0; public FightData(String branch) { - file = new File("./Battle/Fight/" + branch + ".csv"); + file = new File("./Data/Battle/Fight/" + branch + ".csv"); } diff --git a/src/Text/SpeechData.java b/src/Text/SpeechData.java index 5de0d2e..a6dad1e 100644 --- a/src/Text/SpeechData.java +++ b/src/Text/SpeechData.java @@ -12,7 +12,7 @@ public class SpeechData { public SpeechData(String name){ - file = new File("./Battle/Speech/" + name + ".txt"); + file = new File("./Data/Battle/Speech/" + name + ".txt"); } public void readFile() {