diff --git a/Data/font/OptimusPrinceps.ttf b/Data/font/OptimusPrinceps.ttf deleted file mode 100644 index e11017f..0000000 Binary files a/Data/font/OptimusPrinceps.ttf and /dev/null differ diff --git a/Data/font/RobotoSlab-Regular.ttf b/Data/font/RobotoSlab-Regular.ttf deleted file mode 100644 index eb52a79..0000000 Binary files a/Data/font/RobotoSlab-Regular.ttf and /dev/null differ diff --git a/Data/font/Starjedi.ttf b/Data/font/Starjedi.ttf deleted file mode 100644 index 2ac5bb1..0000000 Binary files a/Data/font/Starjedi.ttf and /dev/null differ diff --git a/Data/font/Timeless.ttf b/Data/font/Timeless.ttf deleted file mode 100644 index 0876626..0000000 Binary files a/Data/font/Timeless.ttf and /dev/null differ diff --git a/Data/font/ice_pixel-7.ttf b/Data/font/ice_pixel-7.ttf deleted file mode 100644 index b447fca..0000000 Binary files a/Data/font/ice_pixel-7.ttf and /dev/null differ diff --git a/Data/icon/pokeMudry.ico b/Data/icon/pokeMudry.ico deleted file mode 100644 index 940aae5..0000000 Binary files a/Data/icon/pokeMudry.ico and /dev/null differ diff --git a/Data/icon/pokeMudry.png b/Data/icon/pokeMudry.png deleted file mode 100644 index 17dc75f..0000000 Binary files a/Data/icon/pokeMudry.png and /dev/null differ diff --git a/Data/icon/pokeMudry.xcf b/Data/icon/pokeMudry.xcf deleted file mode 100644 index d5fa83f..0000000 Binary files a/Data/icon/pokeMudry.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 040 Wigglytuff.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 040 Wigglytuff.png deleted file mode 100644 index 354acd7..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 040 Wigglytuff.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 063 Abra.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 063 Abra.png deleted file mode 100644 index ed3787b..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 063 Abra.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 066 Machop.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 066 Machop.png deleted file mode 100644 index 3823445..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 066 Machop.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 067 Machoke.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 067 Machoke.png deleted file mode 100644 index 4bbfed5..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 067 Machoke.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 096 Drowzee.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 096 Drowzee.png deleted file mode 100644 index cfc4cae..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 096 Drowzee.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 125 Electabuzz.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 125 Electabuzz.png deleted file mode 100644 index 3b8ba1f..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 125 Electabuzz.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 132 Ditto.png b/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 132 Ditto.png deleted file mode 100644 index fe40a9c..0000000 Binary files a/Data/img/fichiers_de_travail/Custom Edited - Pokemon Generation 1 Customs - 132 Ditto.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/Player.xcf b/Data/img/fichiers_de_travail/Player.xcf deleted file mode 100644 index bce2b23..0000000 Binary files a/Data/img/fichiers_de_travail/Player.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/branche/allemand.xcf b/Data/img/fichiers_de_travail/branche/allemand.xcf deleted file mode 100644 index b25c448..0000000 Binary files a/Data/img/fichiers_de_travail/branche/allemand.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/branche/electricite.xcf b/Data/img/fichiers_de_travail/branche/electricite.xcf deleted file mode 100644 index 7ab347d..0000000 Binary files a/Data/img/fichiers_de_travail/branche/electricite.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/branche/informatique.xcf b/Data/img/fichiers_de_travail/branche/informatique.xcf deleted file mode 100644 index d3f1fa5..0000000 Binary files a/Data/img/fichiers_de_travail/branche/informatique.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/branche/math.xcf b/Data/img/fichiers_de_travail/branche/math.xcf deleted file mode 100644 index e57824c..0000000 Binary files a/Data/img/fichiers_de_travail/branche/math.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/branche/mecanique.xcf b/Data/img/fichiers_de_travail/branche/mecanique.xcf deleted file mode 100644 index 3e5b79a..0000000 Binary files a/Data/img/fichiers_de_travail/branche/mecanique.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/branche/physique.xcf b/Data/img/fichiers_de_travail/branche/physique.xcf deleted file mode 100644 index 7148ebb..0000000 Binary files a/Data/img/fichiers_de_travail/branche/physique.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/liste professeur.txt b/Data/img/fichiers_de_travail/liste professeur.txt deleted file mode 100644 index a6d5554..0000000 --- a/Data/img/fichiers_de_travail/liste professeur.txt +++ /dev/null @@ -1,31 +0,0 @@ -Informatique : - -Mudry Pierre-André <-- - -Mathématique : - -Epiney Jacques -Evéquoz Gilles -Nicollier Grégoire <-- -Savioz Christian - -Physique : -Ellert Christoph <-- - -Electricité : -Bianchi Christophe <-- -Davide Pavanello - - -Mécanique : -Samuel Rey-Mermet -Paciotti Gabriel <-- -Haifa Sallem -Wittmann Christian -Bezençon Cyrille -Rapillard Laurent - - -Langue : -Gloeckner Caroline <-- -Laffargue-Rieder Laurence \ No newline at end of file diff --git a/Data/img/fichiers_de_travail/prof/Bezencon.xcf b/Data/img/fichiers_de_travail/prof/Bezencon.xcf deleted file mode 100644 index cf168c0..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Bezencon.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Bezençon Cyrille.jpg b/Data/img/fichiers_de_travail/prof/Bezençon Cyrille.jpg deleted file mode 100644 index a9b3909..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Bezençon Cyrille.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Bianchi Christophe.jpg b/Data/img/fichiers_de_travail/prof/Bianchi Christophe.jpg deleted file mode 100644 index 320755b..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Bianchi Christophe.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Bianchi.xcf b/Data/img/fichiers_de_travail/prof/Bianchi.xcf deleted file mode 100644 index de6f05c..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Bianchi.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Collab5118197931.jpg b/Data/img/fichiers_de_travail/prof/Collab5118197931.jpg deleted file mode 100644 index 954c577..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Collab5118197931.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Davide Pavanello.jpg b/Data/img/fichiers_de_travail/prof/Davide Pavanello.jpg deleted file mode 100644 index e9520f0..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Davide Pavanello.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Ellert Christoph.jpg b/Data/img/fichiers_de_travail/prof/Ellert Christoph.jpg deleted file mode 100644 index 9af6db2..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Ellert Christoph.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Ellert.xcf b/Data/img/fichiers_de_travail/prof/Ellert.xcf deleted file mode 100644 index 70e2dfb..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Ellert.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Epiney Jacques.jpg b/Data/img/fichiers_de_travail/prof/Epiney Jacques.jpg deleted file mode 100644 index 86a42e2..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Epiney Jacques.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Epiney.xcf b/Data/img/fichiers_de_travail/prof/Epiney.xcf deleted file mode 100644 index f51a332..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Epiney.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Evequoz.xcf b/Data/img/fichiers_de_travail/prof/Evequoz.xcf deleted file mode 100644 index 3c0eb3e..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Evequoz.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Evéquoz Gilles.jpg b/Data/img/fichiers_de_travail/prof/Evéquoz Gilles.jpg deleted file mode 100644 index 954c577..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Evéquoz Gilles.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Gloeckner Caroline.jpg b/Data/img/fichiers_de_travail/prof/Gloeckner Caroline.jpg deleted file mode 100644 index 69e0e57..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Gloeckner Caroline.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Gloeckner.xcf b/Data/img/fichiers_de_travail/prof/Gloeckner.xcf deleted file mode 100644 index 676386d..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Gloeckner.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Haifa Sallem.jpg b/Data/img/fichiers_de_travail/prof/Haifa Sallem.jpg deleted file mode 100644 index 18d495b..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Haifa Sallem.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Laffargue-Rieder Laurence.jpg b/Data/img/fichiers_de_travail/prof/Laffargue-Rieder Laurence.jpg deleted file mode 100644 index c1fd5d8..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Laffargue-Rieder Laurence.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Laffargue-Rieder.xcf b/Data/img/fichiers_de_travail/prof/Laffargue-Rieder.xcf deleted file mode 100644 index 70c3c38..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Laffargue-Rieder.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Mudry Pierre-André.jpg b/Data/img/fichiers_de_travail/prof/Mudry Pierre-André.jpg deleted file mode 100644 index e91a45a..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Mudry Pierre-André.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Mudry.xcf b/Data/img/fichiers_de_travail/prof/Mudry.xcf deleted file mode 100644 index 1efef7e..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Mudry.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Nicollier Grégoire.jpg b/Data/img/fichiers_de_travail/prof/Nicollier Grégoire.jpg deleted file mode 100644 index a312708..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Nicollier Grégoire.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Nicollier.xcf b/Data/img/fichiers_de_travail/prof/Nicollier.xcf deleted file mode 100644 index 93c9bd2..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Nicollier.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Paciotti Gabriel.jpg b/Data/img/fichiers_de_travail/prof/Paciotti Gabriel.jpg deleted file mode 100644 index 0a1f1af..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Paciotti Gabriel.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Paciotti.xcf b/Data/img/fichiers_de_travail/prof/Paciotti.xcf deleted file mode 100644 index 87e59d8..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Paciotti.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Pavanello.xcf b/Data/img/fichiers_de_travail/prof/Pavanello.xcf deleted file mode 100644 index 6f55a65..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Pavanello.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Rapillard Laurent.jpg b/Data/img/fichiers_de_travail/prof/Rapillard Laurent.jpg deleted file mode 100644 index 23a8896..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Rapillard Laurent.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Rapillard.xcf b/Data/img/fichiers_de_travail/prof/Rapillard.xcf deleted file mode 100644 index 9a4e280..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Rapillard.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Rey-Mermet.xcf b/Data/img/fichiers_de_travail/prof/Rey-Mermet.xcf deleted file mode 100644 index ac98bc5..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Rey-Mermet.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Sallem.xcf b/Data/img/fichiers_de_travail/prof/Sallem.xcf deleted file mode 100644 index ca6731d..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Sallem.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Samuel Rey-Mermet.jpg b/Data/img/fichiers_de_travail/prof/Samuel Rey-Mermet.jpg deleted file mode 100644 index 9729f5c..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Samuel Rey-Mermet.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Savioz Christian.jpg b/Data/img/fichiers_de_travail/prof/Savioz Christian.jpg deleted file mode 100644 index 3d07bfb..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Savioz Christian.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Savioz.xcf b/Data/img/fichiers_de_travail/prof/Savioz.xcf deleted file mode 100644 index 6bd1ed4..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Savioz.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Wittmann Christian.jpg b/Data/img/fichiers_de_travail/prof/Wittmann Christian.jpg deleted file mode 100644 index 2169bca..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Wittmann Christian.jpg and /dev/null differ diff --git a/Data/img/fichiers_de_travail/prof/Wittmann.xcf b/Data/img/fichiers_de_travail/prof/Wittmann.xcf deleted file mode 100644 index 5687556..0000000 Binary files a/Data/img/fichiers_de_travail/prof/Wittmann.xcf and /dev/null differ diff --git a/Data/img/fichiers_de_travail/sacha.png b/Data/img/fichiers_de_travail/sacha.png deleted file mode 100644 index 83846db..0000000 Binary files a/Data/img/fichiers_de_travail/sacha.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/sacha_sprite.png b/Data/img/fichiers_de_travail/sacha_sprite.png deleted file mode 100644 index 49e01a2..0000000 Binary files a/Data/img/fichiers_de_travail/sacha_sprite.png and /dev/null differ diff --git a/Data/img/fichiers_de_travail/sprite_flipper.py b/Data/img/fichiers_de_travail/sprite_flipper.py deleted file mode 100644 index a9ce606..0000000 --- a/Data/img/fichiers_de_travail/sprite_flipper.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -from PIL import Image -import numpy as np -import os - -W, H = 32, 32 - -if __name__ == "__main__": - path = input("Path: ") - - img = Image.open(path).convert() - a = np.array(img) - b = np.zeros((a.shape[1], a.shape[0], *a.shape[2:]), dtype=a.dtype) - - w, h = a.shape[1]//W, a.shape[0]//H - - for y in range(h): - for x in range(w): - b[x*W:x*W+W,y*H:y*H+H] = a[y*H:y*H+H,x*W:x*W+W] - - img.close() - img = Image.fromarray(b) - dirname, basename = os.path.dirname(path), os.path.basename(path) - basename, ext = os.path.splitext(basename) - img.save(os.path.join(dirname, basename+"_flipped"+ext)) diff --git a/Data/map/png/21.xcf b/Data/map/png/21.xcf deleted file mode 100644 index 2d65568..0000000 Binary files a/Data/map/png/21.xcf and /dev/null differ diff --git a/Data/map/png/21N1.PNG b/Data/map/png/21N1.PNG deleted file mode 100644 index d0f19b2..0000000 Binary files a/Data/map/png/21N1.PNG and /dev/null differ diff --git a/Data/map/png/21N2.PNG b/Data/map/png/21N2.PNG deleted file mode 100644 index 4d7141c..0000000 Binary files a/Data/map/png/21N2.PNG and /dev/null differ diff --git a/Data/map/png/21N3.PNG b/Data/map/png/21N3.PNG deleted file mode 100644 index 498d7d6..0000000 Binary files a/Data/map/png/21N3.PNG and /dev/null differ diff --git a/Data/map/png/21N4.PNG b/Data/map/png/21N4.PNG deleted file mode 100644 index 23890f5..0000000 Binary files a/Data/map/png/21N4.PNG and /dev/null differ diff --git a/Data/map/png/21N5.PNG b/Data/map/png/21N5.PNG deleted file mode 100644 index 467ac11..0000000 Binary files a/Data/map/png/21N5.PNG and /dev/null differ diff --git a/Data/map/png/21N6.PNG b/Data/map/png/21N6.PNG deleted file mode 100644 index 41e7cda..0000000 Binary files a/Data/map/png/21N6.PNG and /dev/null differ diff --git a/Data/map/png/21N7.PNG b/Data/map/png/21N7.PNG deleted file mode 100644 index 5cee252..0000000 Binary files a/Data/map/png/21N7.PNG and /dev/null differ diff --git a/Data/map/png/21RI.PNG b/Data/map/png/21RI.PNG deleted file mode 100644 index 4e3e66d..0000000 Binary files a/Data/map/png/21RI.PNG and /dev/null differ diff --git a/Data/map/png/21RS.PNG b/Data/map/png/21RS.PNG deleted file mode 100644 index ca0b067..0000000 Binary files a/Data/map/png/21RS.PNG and /dev/null differ diff --git a/Data/map/png/21SS.PNG b/Data/map/png/21SS.PNG deleted file mode 100644 index 92975d0..0000000 Binary files a/Data/map/png/21SS.PNG and /dev/null differ diff --git a/Data/map/png/23.xcf b/Data/map/png/23.xcf deleted file mode 100644 index 9841fea..0000000 Binary files a/Data/map/png/23.xcf and /dev/null differ diff --git a/Data/map/png/23N1.PNG b/Data/map/png/23N1.PNG deleted file mode 100644 index b5a2033..0000000 Binary files a/Data/map/png/23N1.PNG and /dev/null differ diff --git a/Data/map/png/23N2.PNG b/Data/map/png/23N2.PNG deleted file mode 100644 index f5dfafd..0000000 Binary files a/Data/map/png/23N2.PNG and /dev/null differ diff --git a/Data/map/png/23N3.PNG b/Data/map/png/23N3.PNG deleted file mode 100644 index 3055ae3..0000000 Binary files a/Data/map/png/23N3.PNG and /dev/null differ diff --git a/Data/map/png/23N4.PNG b/Data/map/png/23N4.PNG deleted file mode 100644 index b954a5f..0000000 Binary files a/Data/map/png/23N4.PNG and /dev/null differ diff --git a/Data/map/png/23N5.PNG b/Data/map/png/23N5.PNG deleted file mode 100644 index b656c84..0000000 Binary files a/Data/map/png/23N5.PNG and /dev/null differ diff --git a/Data/map/png/23RI.PNG b/Data/map/png/23RI.PNG deleted file mode 100644 index aceb582..0000000 Binary files a/Data/map/png/23RI.PNG and /dev/null differ diff --git a/Data/map/png/23RS.PNG b/Data/map/png/23RS.PNG deleted file mode 100644 index aa8a9f8..0000000 Binary files a/Data/map/png/23RS.PNG and /dev/null differ diff --git a/Data/map/png/23SS.PNG b/Data/map/png/23SS.PNG deleted file mode 100644 index e472bf3..0000000 Binary files a/Data/map/png/23SS.PNG and /dev/null differ diff --git a/Data/sound/pokemon/106-the road to viridian city - from palette.mp3 b/Data/sound/106-the road to viridian city - from palette.mp3 similarity index 100% rename from Data/sound/pokemon/106-the road to viridian city - from palette.mp3 rename to Data/sound/106-the road to viridian city - from palette.mp3 diff --git a/Data/sound/pokemon/101-opening.mp3 b/Data/sound/pokemon/101-opening.mp3 deleted file mode 100644 index 121d659..0000000 Binary files a/Data/sound/pokemon/101-opening.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/102-palette town theme.mp3 b/Data/sound/pokemon/102-palette town theme.mp3 deleted file mode 100644 index b9ac259..0000000 Binary files a/Data/sound/pokemon/102-palette town theme.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/103-professor oak.mp3 b/Data/sound/pokemon/103-professor oak.mp3 deleted file mode 100644 index a368ad0..0000000 Binary files a/Data/sound/pokemon/103-professor oak.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/104-oak research lab.mp3 b/Data/sound/pokemon/104-oak research lab.mp3 deleted file mode 100644 index 2f80204..0000000 Binary files a/Data/sound/pokemon/104-oak research lab.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/105-rival appears.mp3 b/Data/sound/pokemon/105-rival appears.mp3 deleted file mode 100644 index 33e670b..0000000 Binary files a/Data/sound/pokemon/105-rival appears.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/107-battle (vs wild pokemon).mp3 b/Data/sound/pokemon/107-battle (vs wild pokemon).mp3 deleted file mode 100644 index ab69359..0000000 Binary files a/Data/sound/pokemon/107-battle (vs wild pokemon).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/108-victory (vs wild pokemon).mp3 b/Data/sound/pokemon/108-victory (vs wild pokemon).mp3 deleted file mode 100644 index 9724a24..0000000 Binary files a/Data/sound/pokemon/108-victory (vs wild pokemon).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/109-pewter city's theme.mp3 b/Data/sound/pokemon/109-pewter city's theme.mp3 deleted file mode 100644 index 7630294..0000000 Binary files a/Data/sound/pokemon/109-pewter city's theme.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/110-pokemon center.mp3 b/Data/sound/pokemon/110-pokemon center.mp3 deleted file mode 100644 index ef52032..0000000 Binary files a/Data/sound/pokemon/110-pokemon center.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/111-pokemon recovery.mp3 b/Data/sound/pokemon/111-pokemon recovery.mp3 deleted file mode 100644 index 8065119..0000000 Binary files a/Data/sound/pokemon/111-pokemon recovery.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/112-viridian forest.mp3 b/Data/sound/pokemon/112-viridian forest.mp3 deleted file mode 100644 index 805a803..0000000 Binary files a/Data/sound/pokemon/112-viridian forest.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/113-guidepost.mp3 b/Data/sound/pokemon/113-guidepost.mp3 deleted file mode 100644 index 0a4f8ab..0000000 Binary files a/Data/sound/pokemon/113-guidepost.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/114-trainer appears (girl chapter).mp3 b/Data/sound/pokemon/114-trainer appears (girl chapter).mp3 deleted file mode 100644 index 4200721..0000000 Binary files a/Data/sound/pokemon/114-trainer appears (girl chapter).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/115-battle (vs trainer).mp3 b/Data/sound/pokemon/115-battle (vs trainer).mp3 deleted file mode 100644 index 414ab70..0000000 Binary files a/Data/sound/pokemon/115-battle (vs trainer).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/116-victory (vs trainer).mp3 b/Data/sound/pokemon/116-victory (vs trainer).mp3 deleted file mode 100644 index 09bc097..0000000 Binary files a/Data/sound/pokemon/116-victory (vs trainer).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/117-mt. moon cave.mp3 b/Data/sound/pokemon/117-mt. moon cave.mp3 deleted file mode 100644 index e4c4d08..0000000 Binary files a/Data/sound/pokemon/117-mt. moon cave.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/118-the road to cerulean from mt. moon.mp3 b/Data/sound/pokemon/118-the road to cerulean from mt. moon.mp3 deleted file mode 100644 index bbeb429..0000000 Binary files a/Data/sound/pokemon/118-the road to cerulean from mt. moon.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/119-cerulean city's theme.mp3 b/Data/sound/pokemon/119-cerulean city's theme.mp3 deleted file mode 100644 index 8ab3b02..0000000 Binary files a/Data/sound/pokemon/119-cerulean city's theme.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/120-pokemon gym.mp3 b/Data/sound/pokemon/120-pokemon gym.mp3 deleted file mode 100644 index 1ab0d63..0000000 Binary files a/Data/sound/pokemon/120-pokemon gym.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/121-to bill's origin - from cerulean.mp3 b/Data/sound/pokemon/121-to bill's origin - from cerulean.mp3 deleted file mode 100644 index 66dff91..0000000 Binary files a/Data/sound/pokemon/121-to bill's origin - from cerulean.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/122-jigglypuff's song.mp3 b/Data/sound/pokemon/122-jigglypuff's song.mp3 deleted file mode 100644 index 14541ee..0000000 Binary files a/Data/sound/pokemon/122-jigglypuff's song.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/123-vermillion city's theme.mp3 b/Data/sound/pokemon/123-vermillion city's theme.mp3 deleted file mode 100644 index b340d9d..0000000 Binary files a/Data/sound/pokemon/123-vermillion city's theme.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/124-codename- st. anne.mp3 b/Data/sound/pokemon/124-codename- st. anne.mp3 deleted file mode 100644 index 86cb821..0000000 Binary files a/Data/sound/pokemon/124-codename- st. anne.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/125-the road to lavender town - from vermillion.mp3 b/Data/sound/pokemon/125-the road to lavender town - from vermillion.mp3 deleted file mode 100644 index c18544a..0000000 Binary files a/Data/sound/pokemon/125-the road to lavender town - from vermillion.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/126-pokemon whistle.mp3 b/Data/sound/pokemon/126-pokemon whistle.mp3 deleted file mode 100644 index 7d7d1d1..0000000 Binary files a/Data/sound/pokemon/126-pokemon whistle.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/127-trainer appears (boy chapter).mp3 b/Data/sound/pokemon/127-trainer appears (boy chapter).mp3 deleted file mode 100644 index bde21a9..0000000 Binary files a/Data/sound/pokemon/127-trainer appears (boy chapter).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/128-battle (vs gym leader).mp3 b/Data/sound/pokemon/128-battle (vs gym leader).mp3 deleted file mode 100644 index 335c3af..0000000 Binary files a/Data/sound/pokemon/128-battle (vs gym leader).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/129-victory (vs gym leader).mp3 b/Data/sound/pokemon/129-victory (vs gym leader).mp3 deleted file mode 100644 index e858e25..0000000 Binary files a/Data/sound/pokemon/129-victory (vs gym leader).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/130-cycling.mp3 b/Data/sound/pokemon/130-cycling.mp3 deleted file mode 100644 index ac9c48e..0000000 Binary files a/Data/sound/pokemon/130-cycling.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/131-lavender town's theme.mp3 b/Data/sound/pokemon/131-lavender town's theme.mp3 deleted file mode 100644 index 9ce294e..0000000 Binary files a/Data/sound/pokemon/131-lavender town's theme.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/132-pokemon tower.mp3 b/Data/sound/pokemon/132-pokemon tower.mp3 deleted file mode 100644 index b842d49..0000000 Binary files a/Data/sound/pokemon/132-pokemon tower.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/133-celadon city.mp3 b/Data/sound/pokemon/133-celadon city.mp3 deleted file mode 100644 index ea64a44..0000000 Binary files a/Data/sound/pokemon/133-celadon city.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/134-casino.mp3 b/Data/sound/pokemon/134-casino.mp3 deleted file mode 100644 index b11687f..0000000 Binary files a/Data/sound/pokemon/134-casino.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/135-trainer appears (bad guy chapter).mp3 b/Data/sound/pokemon/135-trainer appears (bad guy chapter).mp3 deleted file mode 100644 index c5e5abd..0000000 Binary files a/Data/sound/pokemon/135-trainer appears (bad guy chapter).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/136-team rocket hideout.mp3 b/Data/sound/pokemon/136-team rocket hideout.mp3 deleted file mode 100644 index cbbddec..0000000 Binary files a/Data/sound/pokemon/136-team rocket hideout.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/137-sylph company.mp3 b/Data/sound/pokemon/137-sylph company.mp3 deleted file mode 100644 index 8921676..0000000 Binary files a/Data/sound/pokemon/137-sylph company.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/138-ocean.mp3 b/Data/sound/pokemon/138-ocean.mp3 deleted file mode 100644 index 196367a..0000000 Binary files a/Data/sound/pokemon/138-ocean.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/139-cinnabar islands' theme.mp3 b/Data/sound/pokemon/139-cinnabar islands' theme.mp3 deleted file mode 100644 index 40468db..0000000 Binary files a/Data/sound/pokemon/139-cinnabar islands' theme.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/140-pokemon mansion.mp3 b/Data/sound/pokemon/140-pokemon mansion.mp3 deleted file mode 100644 index 718351a..0000000 Binary files a/Data/sound/pokemon/140-pokemon mansion.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/141-evolution.mp3 b/Data/sound/pokemon/141-evolution.mp3 deleted file mode 100644 index 1bd3add..0000000 Binary files a/Data/sound/pokemon/141-evolution.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/142-the final road.mp3 b/Data/sound/pokemon/142-the final road.mp3 deleted file mode 100644 index 4db9487..0000000 Binary files a/Data/sound/pokemon/142-the final road.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/143-last battle (vs rival).mp3 b/Data/sound/pokemon/143-last battle (vs rival).mp3 deleted file mode 100644 index 026b2db..0000000 Binary files a/Data/sound/pokemon/143-last battle (vs rival).mp3 and /dev/null differ diff --git a/Data/sound/pokemon/144-into the palace.mp3 b/Data/sound/pokemon/144-into the palace.mp3 deleted file mode 100644 index 94ce9ae..0000000 Binary files a/Data/sound/pokemon/144-into the palace.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/145-ending.mp3 b/Data/sound/pokemon/145-ending.mp3 deleted file mode 100644 index da845e9..0000000 Binary files a/Data/sound/pokemon/145-ending.mp3 and /dev/null differ diff --git a/Data/sound/pokemon/299-sound effect collection.mp3 b/Data/sound/pokemon/299-sound effect collection.mp3 deleted file mode 100644 index a699e6f..0000000 Binary files a/Data/sound/pokemon/299-sound effect collection.mp3 and /dev/null differ diff --git a/src/Entity/Character.java b/src/Entity/Character.java index 5e697f1..5961a25 100644 --- a/src/Entity/Character.java +++ b/src/Entity/Character.java @@ -52,13 +52,13 @@ public abstract class Character extends Entity{ super(name, x, y, map); this.img = img; - imgBattle = "./img/person/" + name + ".png"; + imgBattle = "img/person/" + name + ".png"; } @Override public void init() { super.init(); - ss = new Spritesheet("./img/sprite/" + img + ".png", SPRITE_WIDTH, SPRITE_HEIGHT); + ss = new Spritesheet("img/sprite/" + img + ".png", SPRITE_WIDTH, SPRITE_HEIGHT); } @Override diff --git a/src/Entity/Player.java b/src/Entity/Player.java index 486429a..9cce05b 100644 --- a/src/Entity/Player.java +++ b/src/Entity/Player.java @@ -28,7 +28,7 @@ public class Player extends Character{ * @param map initial map */ public Player(int x, int y, String map) { - super("Player", x, y, "sprite_sacha", map); + super("player", x, y, "sprite_sacha", map); this.pv = Settings.TIME*60; } diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java index c59dcea..1485c5e 100644 --- a/src/Screen/ScreenBattle.java +++ b/src/Screen/ScreenBattle.java @@ -34,8 +34,8 @@ public class ScreenBattle extends RenderingScreen{ @Override public void onInit() { //display the question - ubuntuRegularBlack = generateFont("./Data/font/Ubuntu-Regular.ttf", 30, Color.BLACK); - ubuntuRegularWhite = generateFont("./Data/font/Ubuntu-Regular.ttf", 45, Color.WHITE); + ubuntuRegularBlack = generateFont("font/Ubuntu-Regular.ttf", 30, Color.BLACK); + ubuntuRegularWhite = generateFont("font/Ubuntu-Regular.ttf", 45, Color.WHITE); } @@ -43,7 +43,7 @@ public class ScreenBattle extends RenderingScreen{ public void onGraphicRender(GdxGraphics g) { //color the background in black g.clear(Color.BLACK); - //display the dialog, theenemy and the player + //display the dialog, the enemy and the player displayDialog(g); displayEnemy(g); displayPlayer(g); diff --git a/src/Screen/ScreenEnd.java b/src/Screen/ScreenEnd.java index 64d5d07..761321e 100644 --- a/src/Screen/ScreenEnd.java +++ b/src/Screen/ScreenEnd.java @@ -20,7 +20,7 @@ public class ScreenEnd extends RenderingScreen{ @Override public void onInit() { //generate a new font - unbuntuRegularWhite = generateFont("./Data/font/Ubuntu-Regular.ttf", 30, Color.WHITE); + unbuntuRegularWhite = generateFont("font/Ubuntu-Regular.ttf", 30, Color.WHITE); } diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java index fb10bb0..89a3033 100644 --- a/src/Screen/ScreenMap.java +++ b/src/Screen/ScreenMap.java @@ -36,7 +36,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("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 30cc9e7..ba7b3a7 100644 --- a/src/Text/FightData.java +++ b/src/Text/FightData.java @@ -1,21 +1,21 @@ package Text; import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.Vector; public class FightData { private Vector attacks = new Vector(); - private File file; + private InputStream stream; private static String regex = ";"; public int nbr_line =0; public FightData(String branch) { - file = new File("./data/battle/fight/" + branch + ".csv"); + stream = FightData.class.getResourceAsStream("/battle/fight/" + branch + ".csv"); } public void readFile() { @@ -23,8 +23,7 @@ public class FightData { String line = ""; try { - FileReader f = new FileReader(file, StandardCharsets.UTF_8); - BufferedReader bf = new BufferedReader(f); + BufferedReader bf = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)); //add the line in the vector attacks of attack line = bf.readLine(); diff --git a/src/Text/SpeechData.java b/src/Text/SpeechData.java index cf45f37..ac20da6 100644 --- a/src/Text/SpeechData.java +++ b/src/Text/SpeechData.java @@ -1,18 +1,18 @@ package Text; -import java.util.Vector; import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.util.Vector; public class SpeechData { Vector speechs = new Vector(); - File file; + private InputStream stream; public SpeechData(String name){ - file = new File("./data/battle/speech/" + name + ".txt"); + stream = FightData.class.getResourceAsStream("/battle/speech/" + name + ".txt"); } public void readFile() { @@ -20,8 +20,7 @@ public class SpeechData { // try to read the file of the speech of the enemy try { - FileReader f = new FileReader(file, StandardCharsets.UTF_8); - BufferedReader bf = new BufferedReader(f); + BufferedReader bf = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)); //read and add a new line in the vector speechs line = bf.readLine(); while(line != null){