diff --git a/.gitignore b/.gitignore index 32858aa..2196f39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*.class +bin/* # Mobile Tools for Java (J2ME) .mtj.tmp/ diff --git a/.travis.yml b/.travis.yml new file mode 100755 index 0000000..684811b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: java +jdk: + - oraclejdk8 diff --git a/README.md b/README.md new file mode 100755 index 0000000..f248aa6 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Bifrost Saver's + +Compile status: ![Status](https://travis-ci.org/mrdev023/Global-Game-Jam.svg?branch=master) + +Ce projet a ete creer durant la Global Game Jam de 2015 a limoges avec MrDev023,Aliths,dikaios,Fiesta87 et TheKitolex + +[Global Game Jam #1](http://globalgamejam.org/2016/games/bifrost-savers) + +![Image](http://globalgamejam.org/sites/default/files/styles/game_content__wide/public/games/screenshots/sr.png?itok=b_DVasVv) diff --git a/build.xml b/build.xml new file mode 100755 index 0000000..1b1eed3 --- /dev/null +++ b/build.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/global game jam/bin/Audio/AudioManager.class b/global game jam/bin/Audio/AudioManager.class deleted file mode 100644 index a2480f6..0000000 Binary files a/global game jam/bin/Audio/AudioManager.class and /dev/null differ diff --git a/global game jam/bin/Entity/Boss.class b/global game jam/bin/Entity/Boss.class deleted file mode 100644 index 7c73e5b..0000000 Binary files a/global game jam/bin/Entity/Boss.class and /dev/null differ diff --git a/global game jam/bin/Entity/Bullet.class b/global game jam/bin/Entity/Bullet.class deleted file mode 100644 index 3ebd83c..0000000 Binary files a/global game jam/bin/Entity/Bullet.class and /dev/null differ diff --git a/global game jam/bin/Entity/Entity.class b/global game jam/bin/Entity/Entity.class deleted file mode 100644 index 683dd71..0000000 Binary files a/global game jam/bin/Entity/Entity.class and /dev/null differ diff --git a/global game jam/bin/Entity/Monster.class b/global game jam/bin/Entity/Monster.class deleted file mode 100644 index e999cae..0000000 Binary files a/global game jam/bin/Entity/Monster.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_bas.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_bas.class deleted file mode 100644 index f757f72..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_bas.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_bomb.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_bomb.class deleted file mode 100644 index f957162..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_bomb.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_cross.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_cross.class deleted file mode 100644 index 572506e..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_cross.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_cube.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_cube.class deleted file mode 100644 index e29935c..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_cube.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_feint.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_feint.class deleted file mode 100644 index 7064391..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_feint.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_loop.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_loop.class deleted file mode 100644 index 6c0ed0f..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_loop.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_trace.class b/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_trace.class deleted file mode 100644 index 296410f..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_chauve_souris_focus_trace.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_monstre.class b/global game jam/bin/Entity/MonsterModel_monstre.class deleted file mode 100644 index 3c85f2b..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_monstre.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_squelette_focus_bomb.class b/global game jam/bin/Entity/MonsterModel_squelette_focus_bomb.class deleted file mode 100644 index f3a7d55..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_squelette_focus_bomb.class and /dev/null differ diff --git a/global game jam/bin/Entity/MonsterModel_squelette_focus_loop.class b/global game jam/bin/Entity/MonsterModel_squelette_focus_loop.class deleted file mode 100644 index b3abfd3..0000000 Binary files a/global game jam/bin/Entity/MonsterModel_squelette_focus_loop.class and /dev/null differ diff --git a/global game jam/bin/Entity/Player.class b/global game jam/bin/Entity/Player.class deleted file mode 100644 index 3858344..0000000 Binary files a/global game jam/bin/Entity/Player.class and /dev/null differ diff --git a/global game jam/bin/Entity/ShootingPattern.class b/global game jam/bin/Entity/ShootingPattern.class deleted file mode 100644 index aba4522..0000000 Binary files a/global game jam/bin/Entity/ShootingPattern.class and /dev/null differ diff --git a/global game jam/bin/Entity/ShootingPattern_0.class b/global game jam/bin/Entity/ShootingPattern_0.class deleted file mode 100644 index 9e4c831..0000000 Binary files a/global game jam/bin/Entity/ShootingPattern_0.class and /dev/null differ diff --git a/global game jam/bin/Entity/ShootingPattern_1.class b/global game jam/bin/Entity/ShootingPattern_1.class deleted file mode 100644 index a9e3d86..0000000 Binary files a/global game jam/bin/Entity/ShootingPattern_1.class and /dev/null differ diff --git a/global game jam/bin/Entity/TimedBullet.class b/global game jam/bin/Entity/TimedBullet.class deleted file mode 100644 index 9142f1d..0000000 Binary files a/global game jam/bin/Entity/TimedBullet.class and /dev/null differ diff --git a/global game jam/bin/Entity/Ulti.class b/global game jam/bin/Entity/Ulti.class deleted file mode 100644 index e2a0e66..0000000 Binary files a/global game jam/bin/Entity/Ulti.class and /dev/null differ diff --git a/global game jam/bin/Gui/Boutons.class b/global game jam/bin/Gui/Boutons.class deleted file mode 100644 index e655306..0000000 Binary files a/global game jam/bin/Gui/Boutons.class and /dev/null differ diff --git a/global game jam/bin/IO/IOFile.class b/global game jam/bin/IO/IOFile.class deleted file mode 100644 index e4d4e0c..0000000 Binary files a/global game jam/bin/IO/IOFile.class and /dev/null differ diff --git a/global game jam/bin/Input/EcranListeners.class b/global game jam/bin/Input/EcranListeners.class deleted file mode 100644 index 0bb127e..0000000 Binary files a/global game jam/bin/Input/EcranListeners.class and /dev/null differ diff --git a/global game jam/bin/Input/Joystick.class b/global game jam/bin/Input/Joystick.class deleted file mode 100644 index 3118086..0000000 Binary files a/global game jam/bin/Input/Joystick.class and /dev/null differ diff --git a/global game jam/bin/Input/KeyCode.class b/global game jam/bin/Input/KeyCode.class deleted file mode 100644 index 742331e..0000000 Binary files a/global game jam/bin/Input/KeyCode.class and /dev/null differ diff --git a/global game jam/bin/Items/Items.class b/global game jam/bin/Items/Items.class deleted file mode 100644 index 1512348..0000000 Binary files a/global game jam/bin/Items/Items.class and /dev/null differ diff --git a/global game jam/bin/Items/PowerItems.class b/global game jam/bin/Items/PowerItems.class deleted file mode 100644 index e02dfd7..0000000 Binary files a/global game jam/bin/Items/PowerItems.class and /dev/null differ diff --git a/global game jam/bin/Items/SpellItems.class b/global game jam/bin/Items/SpellItems.class deleted file mode 100644 index 35b98e9..0000000 Binary files a/global game jam/bin/Items/SpellItems.class and /dev/null differ diff --git a/global game jam/bin/Jeu/Jeu$1.class b/global game jam/bin/Jeu/Jeu$1.class deleted file mode 100644 index d6ff2d9..0000000 Binary files a/global game jam/bin/Jeu/Jeu$1.class and /dev/null differ diff --git a/global game jam/bin/Jeu/Jeu.class b/global game jam/bin/Jeu/Jeu.class deleted file mode 100644 index e76d7d6..0000000 Binary files a/global game jam/bin/Jeu/Jeu.class and /dev/null differ diff --git a/global game jam/bin/Tools/Coord.class b/global game jam/bin/Tools/Coord.class deleted file mode 100644 index c541370..0000000 Binary files a/global game jam/bin/Tools/Coord.class and /dev/null differ diff --git a/global game jam/bin/Tools/CoordD.class b/global game jam/bin/Tools/CoordD.class deleted file mode 100644 index 3d69a62..0000000 Binary files a/global game jam/bin/Tools/CoordD.class and /dev/null differ diff --git a/global game jam/bin/Tools/ImagePhysics.class b/global game jam/bin/Tools/ImagePhysics.class deleted file mode 100644 index 94377ea..0000000 Binary files a/global game jam/bin/Tools/ImagePhysics.class and /dev/null differ diff --git a/global game jam/bin/World/MonsterSpawnPattern.class b/global game jam/bin/World/MonsterSpawnPattern.class deleted file mode 100644 index 4884bce..0000000 Binary files a/global game jam/bin/World/MonsterSpawnPattern.class and /dev/null differ diff --git a/global game jam/bin/World/Replique.class b/global game jam/bin/World/Replique.class deleted file mode 100644 index e06b06e..0000000 Binary files a/global game jam/bin/World/Replique.class and /dev/null differ diff --git a/global game jam/bin/World/Speach.class b/global game jam/bin/World/Speach.class deleted file mode 100644 index fc1162b..0000000 Binary files a/global game jam/bin/World/Speach.class and /dev/null differ diff --git a/global game jam/bin/World/Stage1.class b/global game jam/bin/World/Stage1.class deleted file mode 100644 index 69ea459..0000000 Binary files a/global game jam/bin/World/Stage1.class and /dev/null differ diff --git a/global game jam/bin/World/World.class b/global game jam/bin/World/World.class deleted file mode 100644 index cfc30b3..0000000 Binary files a/global game jam/bin/World/World.class and /dev/null differ diff --git a/global game jam/bin/test/Coord.class b/global game jam/bin/test/Coord.class deleted file mode 100644 index 981edce..0000000 Binary files a/global game jam/bin/test/Coord.class and /dev/null differ diff --git a/global game jam/bin/test/EcranListeners.class b/global game jam/bin/test/EcranListeners.class deleted file mode 100644 index 186a894..0000000 Binary files a/global game jam/bin/test/EcranListeners.class and /dev/null differ diff --git a/global game jam/bin/test/Jeu.class b/global game jam/bin/test/Jeu.class deleted file mode 100644 index 1b181d9..0000000 Binary files a/global game jam/bin/test/Jeu.class and /dev/null differ diff --git a/global game jam/bin/test/main.class b/global game jam/bin/test/main.class deleted file mode 100644 index a3c9b30..0000000 Binary files a/global game jam/bin/test/main.class and /dev/null differ diff --git a/global game jam/lib/Output.jar b/global game jam/lib/Output.jar deleted file mode 100644 index 7afcf5f..0000000 Binary files a/global game jam/lib/Output.jar and /dev/null differ diff --git a/global game jam/lib/acm.jar b/global game jam/lib/acm.jar deleted file mode 100644 index 424c902..0000000 Binary files a/global game jam/lib/acm.jar and /dev/null differ diff --git a/global game jam/lib/jinput.jar b/global game jam/lib/jinput.jar deleted file mode 100644 index 7c2b6b0..0000000 Binary files a/global game jam/lib/jinput.jar and /dev/null differ diff --git a/global game jam/lib/OpenAL32.dll b/libs/OpenAL32.dll similarity index 100% rename from global game jam/lib/OpenAL32.dll rename to libs/OpenAL32.dll diff --git a/global game jam/lib/OpenAL64.dll b/libs/OpenAL64.dll similarity index 100% rename from global game jam/lib/OpenAL64.dll rename to libs/OpenAL64.dll diff --git a/global game jam/lib/jinput-dx8.dll b/libs/jinput-dx8.dll similarity index 100% rename from global game jam/lib/jinput-dx8.dll rename to libs/jinput-dx8.dll diff --git a/global game jam/lib/jinput-dx8_64.dll b/libs/jinput-dx8_64.dll similarity index 100% rename from global game jam/lib/jinput-dx8_64.dll rename to libs/jinput-dx8_64.dll diff --git a/global game jam/lib/jinput-raw.dll b/libs/jinput-raw.dll similarity index 100% rename from global game jam/lib/jinput-raw.dll rename to libs/jinput-raw.dll diff --git a/global game jam/lib/jinput-raw_64.dll b/libs/jinput-raw_64.dll similarity index 100% rename from global game jam/lib/jinput-raw_64.dll rename to libs/jinput-raw_64.dll diff --git a/global game jam/lib/libjinput-linux.so b/libs/libjinput-linux.so similarity index 100% rename from global game jam/lib/libjinput-linux.so rename to libs/libjinput-linux.so diff --git a/global game jam/lib/libjinput-linux64.so b/libs/libjinput-linux64.so similarity index 100% rename from global game jam/lib/libjinput-linux64.so rename to libs/libjinput-linux64.so diff --git a/global game jam/lib/libjinput-osx.dylib b/libs/libjinput-osx.dylib similarity index 100% rename from global game jam/lib/libjinput-osx.dylib rename to libs/libjinput-osx.dylib diff --git a/global game jam/lib/liblwjgl.dylib b/libs/liblwjgl.dylib similarity index 100% rename from global game jam/lib/liblwjgl.dylib rename to libs/liblwjgl.dylib diff --git a/global game jam/lib/liblwjgl.so b/libs/liblwjgl.so similarity index 100% rename from global game jam/lib/liblwjgl.so rename to libs/liblwjgl.so diff --git a/global game jam/lib/liblwjgl64.so b/libs/liblwjgl64.so similarity index 100% rename from global game jam/lib/liblwjgl64.so rename to libs/liblwjgl64.so diff --git a/global game jam/lib/libopenal.so b/libs/libopenal.so similarity index 100% rename from global game jam/lib/libopenal.so rename to libs/libopenal.so diff --git a/global game jam/lib/libopenal64.so b/libs/libopenal64.so similarity index 100% rename from global game jam/lib/libopenal64.so rename to libs/libopenal64.so diff --git a/global game jam/lib/lwjgl.dll b/libs/lwjgl.dll similarity index 100% rename from global game jam/lib/lwjgl.dll rename to libs/lwjgl.dll diff --git a/global game jam/lib/lwjgl64.dll b/libs/lwjgl64.dll similarity index 100% rename from global game jam/lib/lwjgl64.dll rename to libs/lwjgl64.dll diff --git a/global game jam/lib/openal.dylib b/libs/openal.dylib similarity index 100% rename from global game jam/lib/openal.dylib rename to libs/openal.dylib diff --git a/global game jam/pattern_mob.txt b/pattern_mob.txt similarity index 100% rename from global game jam/pattern_mob.txt rename to pattern_mob.txt diff --git a/global game jam/res/audio/boss_1.wav b/res/audio/boss_1.wav similarity index 100% rename from global game jam/res/audio/boss_1.wav rename to res/audio/boss_1.wav diff --git a/global game jam/res/audio/boss_2.wav b/res/audio/boss_2.wav similarity index 100% rename from global game jam/res/audio/boss_2.wav rename to res/audio/boss_2.wav diff --git a/global game jam/res/audio/boss_3.wav b/res/audio/boss_3.wav similarity index 100% rename from global game jam/res/audio/boss_3.wav rename to res/audio/boss_3.wav diff --git a/global game jam/res/audio/intro.wav b/res/audio/intro.wav similarity index 100% rename from global game jam/res/audio/intro.wav rename to res/audio/intro.wav diff --git a/global game jam/res/audio/sonBouton.wav b/res/audio/sonBouton.wav similarity index 100% rename from global game jam/res/audio/sonBouton.wav rename to res/audio/sonBouton.wav diff --git a/global game jam/res/audio/stage_1.wav b/res/audio/stage_1.wav similarity index 100% rename from global game jam/res/audio/stage_1.wav rename to res/audio/stage_1.wav diff --git a/global game jam/res/audio/stage_3.wav b/res/audio/stage_3.wav similarity index 100% rename from global game jam/res/audio/stage_3.wav rename to res/audio/stage_3.wav diff --git a/global game jam/res/donnees/fin_stage_1_0m.txt b/res/donnees/fin_stage_1_0m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_1_0m.txt rename to res/donnees/fin_stage_1_0m.txt diff --git a/global game jam/res/donnees/fin_stage_1_1m.txt b/res/donnees/fin_stage_1_1m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_1_1m.txt rename to res/donnees/fin_stage_1_1m.txt diff --git a/global game jam/res/donnees/fin_stage_1_2m.txt b/res/donnees/fin_stage_1_2m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_1_2m.txt rename to res/donnees/fin_stage_1_2m.txt diff --git a/global game jam/res/donnees/fin_stage_1_3m.txt b/res/donnees/fin_stage_1_3m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_1_3m.txt rename to res/donnees/fin_stage_1_3m.txt diff --git a/global game jam/res/donnees/fin_stage_1_4m.txt b/res/donnees/fin_stage_1_4m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_1_4m.txt rename to res/donnees/fin_stage_1_4m.txt diff --git a/global game jam/res/donnees/fin_stage_2_0m_0m.txt b/res/donnees/fin_stage_2_0m_0m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_0m_0m.txt rename to res/donnees/fin_stage_2_0m_0m.txt diff --git a/global game jam/res/donnees/fin_stage_2_0m_1m.txt b/res/donnees/fin_stage_2_0m_1m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_0m_1m.txt rename to res/donnees/fin_stage_2_0m_1m.txt diff --git a/global game jam/res/donnees/fin_stage_2_0m_2m.txt b/res/donnees/fin_stage_2_0m_2m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_0m_2m.txt rename to res/donnees/fin_stage_2_0m_2m.txt diff --git a/global game jam/res/donnees/fin_stage_2_0m_3m.txt b/res/donnees/fin_stage_2_0m_3m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_0m_3m.txt rename to res/donnees/fin_stage_2_0m_3m.txt diff --git a/global game jam/res/donnees/fin_stage_2_1m_0m.txt b/res/donnees/fin_stage_2_1m_0m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_1m_0m.txt rename to res/donnees/fin_stage_2_1m_0m.txt diff --git a/global game jam/res/donnees/fin_stage_2_1m_2m.txt b/res/donnees/fin_stage_2_1m_2m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_1m_2m.txt rename to res/donnees/fin_stage_2_1m_2m.txt diff --git a/global game jam/res/donnees/fin_stage_2_1m_3m.txt b/res/donnees/fin_stage_2_1m_3m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_1m_3m.txt rename to res/donnees/fin_stage_2_1m_3m.txt diff --git a/global game jam/res/donnees/fin_stage_2_2m_0m.txt b/res/donnees/fin_stage_2_2m_0m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_2m_0m.txt rename to res/donnees/fin_stage_2_2m_0m.txt diff --git a/global game jam/res/donnees/fin_stage_2_2m_3m.txt b/res/donnees/fin_stage_2_2m_3m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_2m_3m.txt rename to res/donnees/fin_stage_2_2m_3m.txt diff --git a/global game jam/res/donnees/fin_stage_2_3m_0m.txt b/res/donnees/fin_stage_2_3m_0m.txt similarity index 100% rename from global game jam/res/donnees/fin_stage_2_3m_0m.txt rename to res/donnees/fin_stage_2_3m_0m.txt diff --git a/global game jam/res/donnees/highscore.txt b/res/donnees/highscore.txt similarity index 100% rename from global game jam/res/donnees/highscore.txt rename to res/donnees/highscore.txt diff --git a/global game jam/res/donnees/intro.txt b/res/donnees/intro.txt similarity index 100% rename from global game jam/res/donnees/intro.txt rename to res/donnees/intro.txt diff --git a/global game jam/res/donnees/pattern mob.txt b/res/donnees/pattern mob.txt similarity index 100% rename from global game jam/res/donnees/pattern mob.txt rename to res/donnees/pattern mob.txt diff --git a/global game jam/res/donnees/pattern_0.txt b/res/donnees/pattern_0.txt similarity index 100% rename from global game jam/res/donnees/pattern_0.txt rename to res/donnees/pattern_0.txt diff --git a/global game jam/res/donnees/pattern_1.txt b/res/donnees/pattern_1.txt similarity index 100% rename from global game jam/res/donnees/pattern_1.txt rename to res/donnees/pattern_1.txt diff --git a/global game jam/res/donnees/pattern_boss_0.txt b/res/donnees/pattern_boss_0.txt similarity index 100% rename from global game jam/res/donnees/pattern_boss_0.txt rename to res/donnees/pattern_boss_0.txt diff --git a/res/donnees/pattern_mob.txt b/res/donnees/pattern_mob.txt new file mode 100644 index 0000000..61609fd --- /dev/null +++ b/res/donnees/pattern_mob.txt @@ -0,0 +1,458 @@ +957 -170 +957 -160 +957 -150 +957 -140 +957 -130 +957 -120 +957 -110 +957 -100 +957 -90 +957 -80 +957 -70 +957 -60 +957 -50 +957 -40 +957 -30 +957 -20 +957 -10 +957 0 +957 5 +957 5 +957 5 +957 5 +957 5 +957 5 +957 5 +957 8 +957 8 +957 8 +957 8 +957 8 +957 8 +957 8 +957 11 +957 14 +957 17 +957 20 +957 20 +957 20 +957 20 +957 20 +957 26 +957 26 +957 26 +957 26 +957 29 +957 32 +957 32 +957 32 +957 32 +957 35 +957 35 +957 38 +957 38 +957 41 +957 44 +957 44 +957 44 +957 47 +957 47 +954 50 +954 50 +954 50 +954 53 +954 53 +954 56 +954 56 +954 56 +954 59 +954 59 +954 59 +954 62 +954 62 +954 62 +954 65 +954 65 +954 68 +954 71 +954 71 +954 71 +954 74 +954 74 +954 77 +954 77 +954 77 +954 80 +954 83 +954 83 +954 83 +954 86 +954 89 +954 89 +954 89 +954 89 +954 92 +954 92 +954 95 +954 95 +954 98 +954 98 +954 98 +954 98 +954 101 +954 101 +954 107 +954 107 +954 110 +954 110 +954 113 +954 113 +954 113 +954 116 +954 116 +954 119 +954 119 +954 122 +954 125 +954 125 +954 128 +954 128 +954 131 +954 131 +954 131 +954 131 +954 134 +954 137 +954 137 +954 137 +954 137 +954 137 +954 137 +954 140 +954 140 +954 143 +954 143 +954 143 +954 152 +954 152 +954 152 +954 152 +954 152 +954 152 +954 155 +954 155 +954 158 +954 161 +954 161 +954 161 +954 164 +954 167 +954 167 +954 170 +954 170 +954 173 +954 176 +954 176 +954 182 +954 182 +954 185 +954 188 +954 191 +954 194 +954 194 +954 197 +954 197 +954 200 +954 200 +954 203 +954 203 +954 203 +954 206 +954 209 +954 209 +954 209 +954 209 +954 209 +954 212 +954 215 +954 215 +954 218 +954 218 +954 221 +954 221 +954 221 +954 224 +954 224 +954 227 +954 230 +954 233 +951 236 +951 239 +951 242 +951 242 +951 248 +951 254 +951 257 +951 257 +951 260 +951 263 +951 266 +951 269 +948 272 +948 275 +948 275 +948 278 +948 281 +945 284 +945 284 +945 287 +945 290 +945 293 +942 296 +942 299 +942 299 +939 305 +939 308 +936 311 +936 314 +933 317 +930 323 +927 329 +927 329 +924 332 +924 335 +918 344 +915 347 +915 350 +915 350 +912 356 +909 359 +906 362 +906 368 +903 374 +903 377 +900 383 +897 389 +894 398 +894 398 +894 401 +888 410 +885 413 +882 416 +882 416 +882 419 +876 425 +873 428 +873 428 +867 434 +864 443 +861 443 +861 446 +855 452 +849 461 +846 467 +846 470 +843 470 +843 473 +843 479 +840 485 +837 488 +837 491 +837 497 +837 500 +837 500 +837 503 +837 509 +837 512 +837 512 +837 515 +837 518 +840 521 +840 524 +843 524 +843 530 +846 533 +849 536 +852 539 +855 545 +858 545 +861 548 +867 551 +873 554 +876 554 +876 554 +885 560 +894 563 +900 566 +900 566 +903 566 +909 566 +915 569 +918 572 +921 572 +921 572 +930 575 +936 578 +936 578 +942 578 +948 581 +951 581 +954 581 +960 584 +969 584 +972 584 +975 584 +981 587 +984 587 +990 590 +996 590 +999 590 +999 593 +1005 593 +1011 593 +1014 593 +1020 596 +1026 596 +1029 596 +1035 596 +1038 596 +1044 596 +1050 596 +1053 596 +1056 596 +1059 596 +1065 596 +1068 596 +1071 596 +1074 594 +1077 594 +1083 594 +1089 591 +1095 591 +1104 588 +1110 588 +1116 585 +1122 585 +1125 582 +1131 582 +1134 579 +1137 579 +1137 579 +1140 576 +1140 576 +1143 573 +1146 570 +1146 570 +1146 567 +1146 567 +1149 567 +1149 564 +1149 561 +1152 561 +1152 558 +1152 555 +1152 552 +1152 552 +1152 549 +1152 546 +1152 543 +1152 537 +1152 534 +1152 531 +1152 528 +1152 528 +1152 525 +1152 519 +1152 516 +1152 510 +1149 510 +1146 504 +1146 504 +1143 501 +1143 498 +1140 498 +1137 495 +1134 492 +1131 489 +1128 486 +1125 483 +1119 480 +1119 477 +1116 477 +1116 474 +1116 474 +1113 474 +1113 471 +1110 468 +1110 468 +1104 462 +1104 459 +1101 456 +1098 453 +1095 450 +1092 447 +1089 444 +1086 441 +1086 438 +1080 435 +1077 432 +1074 429 +1071 426 +1068 423 +1062 417 +1062 417 +1059 414 +1056 411 +1050 405 +1047 402 +1041 396 +1038 393 +1035 390 +1032 387 +1026 381 +1020 378 +1017 375 +1014 372 +1011 369 +1008 363 +1002 357 +999 351 +996 348 +993 342 +990 339 +990 336 +987 333 +987 333 +987 330 +981 321 +975 312 +975 312 +972 309 +966 297 +960 294 +960 291 +957 291 +957 291 +957 291 +957 288 +957 285 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 +954 282 diff --git a/global game jam/res/donnees/pattern_mob_bomb.txt b/res/donnees/pattern_mob_bomb.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_bomb.txt rename to res/donnees/pattern_mob_bomb.txt diff --git a/global game jam/res/donnees/pattern_mob_bomb1.txt b/res/donnees/pattern_mob_bomb1.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_bomb1.txt rename to res/donnees/pattern_mob_bomb1.txt diff --git a/global game jam/res/donnees/pattern_mob_cross.txt b/res/donnees/pattern_mob_cross.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_cross.txt rename to res/donnees/pattern_mob_cross.txt diff --git a/global game jam/res/donnees/pattern_mob_cube.txt b/res/donnees/pattern_mob_cube.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_cube.txt rename to res/donnees/pattern_mob_cube.txt diff --git a/global game jam/res/donnees/pattern_mob_droit.txt b/res/donnees/pattern_mob_droit.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_droit.txt rename to res/donnees/pattern_mob_droit.txt diff --git a/global game jam/res/donnees/pattern_mob_feint.txt b/res/donnees/pattern_mob_feint.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_feint.txt rename to res/donnees/pattern_mob_feint.txt diff --git a/global game jam/res/donnees/pattern_mob_loop (2).txt b/res/donnees/pattern_mob_loop (2).txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_loop (2).txt rename to res/donnees/pattern_mob_loop (2).txt diff --git a/global game jam/res/donnees/pattern_mob_loop.txt b/res/donnees/pattern_mob_loop.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_loop.txt rename to res/donnees/pattern_mob_loop.txt diff --git a/global game jam/res/donnees/pattern_mob_trace.txt b/res/donnees/pattern_mob_trace.txt similarity index 100% rename from global game jam/res/donnees/pattern_mob_trace.txt rename to res/donnees/pattern_mob_trace.txt diff --git a/global game jam/res/donnees/pattern_mobftcubedroite.txt b/res/donnees/pattern_mobftcubedroite.txt similarity index 100% rename from global game jam/res/donnees/pattern_mobftcubedroite.txt rename to res/donnees/pattern_mobftcubedroite.txt diff --git a/global game jam/res/donnees/pattern_mobftcubegauche.txt b/res/donnees/pattern_mobftcubegauche.txt similarity index 100% rename from global game jam/res/donnees/pattern_mobftcubegauche.txt rename to res/donnees/pattern_mobftcubegauche.txt diff --git a/global game jam/res/textures/Asg intro 1.png b/res/textures/Asg intro 1.png similarity index 100% rename from global game jam/res/textures/Asg intro 1.png rename to res/textures/Asg intro 1.png diff --git a/global game jam/res/textures/Astrid.png b/res/textures/Astrid.png similarity index 100% rename from global game jam/res/textures/Astrid.png rename to res/textures/Astrid.png diff --git a/global game jam/res/textures/Bjorn.png b/res/textures/Bjorn.png similarity index 100% rename from global game jam/res/textures/Bjorn.png rename to res/textures/Bjorn.png diff --git a/global game jam/res/textures/Eskil.png b/res/textures/Eskil.png similarity index 100% rename from global game jam/res/textures/Eskil.png rename to res/textures/Eskil.png diff --git a/global game jam/res/textures/Gue intro 3.png b/res/textures/Gue intro 3.png similarity index 100% rename from global game jam/res/textures/Gue intro 3.png rename to res/textures/Gue intro 3.png diff --git a/global game jam/res/textures/Jurgen.png b/res/textures/Jurgen.png similarity index 100% rename from global game jam/res/textures/Jurgen.png rename to res/textures/Jurgen.png diff --git a/global game jam/res/textures/Le mage.png b/res/textures/Le mage.png similarity index 100% rename from global game jam/res/textures/Le mage.png rename to res/textures/Le mage.png diff --git a/global game jam/res/textures/Sans titre.png b/res/textures/Sans titre.png similarity index 100% rename from global game jam/res/textures/Sans titre.png rename to res/textures/Sans titre.png diff --git a/global game jam/res/textures/Svenn.png b/res/textures/Svenn.png similarity index 100% rename from global game jam/res/textures/Svenn.png rename to res/textures/Svenn.png diff --git a/global game jam/res/textures/Ygg intro 2.png b/res/textures/Ygg intro 2.png similarity index 100% rename from global game jam/res/textures/Ygg intro 2.png rename to res/textures/Ygg intro 2.png diff --git a/global game jam/res/textures/abg.png b/res/textures/abg.png similarity index 100% rename from global game jam/res/textures/abg.png rename to res/textures/abg.png diff --git a/global game jam/res/textures/ahero dialogue.png b/res/textures/ahero dialogue.png similarity index 100% rename from global game jam/res/textures/ahero dialogue.png rename to res/textures/ahero dialogue.png diff --git a/global game jam/res/textures/amis1.png b/res/textures/amis1.png similarity index 100% rename from global game jam/res/textures/amis1.png rename to res/textures/amis1.png diff --git a/global game jam/res/textures/amis2.png b/res/textures/amis2.png similarity index 100% rename from global game jam/res/textures/amis2.png rename to res/textures/amis2.png diff --git a/global game jam/res/textures/amis3.png b/res/textures/amis3.png similarity index 100% rename from global game jam/res/textures/amis3.png rename to res/textures/amis3.png diff --git a/global game jam/res/textures/amis4.png b/res/textures/amis4.png similarity index 100% rename from global game jam/res/textures/amis4.png rename to res/textures/amis4.png diff --git a/global game jam/res/textures/arbre.png b/res/textures/arbre.png similarity index 100% rename from global game jam/res/textures/arbre.png rename to res/textures/arbre.png diff --git a/global game jam/res/textures/barre-horizontale-graduations.png b/res/textures/barre-horizontale-graduations.png similarity index 100% rename from global game jam/res/textures/barre-horizontale-graduations.png rename to res/textures/barre-horizontale-graduations.png diff --git a/global game jam/res/textures/barre-horizontale.png b/res/textures/barre-horizontale.png similarity index 100% rename from global game jam/res/textures/barre-horizontale.png rename to res/textures/barre-horizontale.png diff --git a/global game jam/res/textures/barre.png b/res/textures/barre.png similarity index 100% rename from global game jam/res/textures/barre.png rename to res/textures/barre.png diff --git a/global game jam/res/textures/bg1.png b/res/textures/bg1.png similarity index 100% rename from global game jam/res/textures/bg1.png rename to res/textures/bg1.png diff --git a/global game jam/res/textures/boite dialogues.png b/res/textures/boite dialogues.png similarity index 100% rename from global game jam/res/textures/boite dialogues.png rename to res/textures/boite dialogues.png diff --git a/global game jam/res/textures/boss.png b/res/textures/boss.png similarity index 100% rename from global game jam/res/textures/boss.png rename to res/textures/boss.png diff --git a/global game jam/res/textures/boutonjouer.png b/res/textures/boutonjouer.png similarity index 100% rename from global game jam/res/textures/boutonjouer.png rename to res/textures/boutonjouer.png diff --git a/global game jam/res/textures/boutonquitter.png b/res/textures/boutonquitter.png similarity index 100% rename from global game jam/res/textures/boutonquitter.png rename to res/textures/boutonquitter.png diff --git a/global game jam/res/textures/bullet_default.png b/res/textures/bullet_default.png similarity index 100% rename from global game jam/res/textures/bullet_default.png rename to res/textures/bullet_default.png diff --git a/global game jam/res/textures/cadre perso.png b/res/textures/cadre perso.png similarity index 100% rename from global game jam/res/textures/cadre perso.png rename to res/textures/cadre perso.png diff --git a/global game jam/res/textures/carre_rouge.png b/res/textures/carre_rouge.png similarity index 100% rename from global game jam/res/textures/carre_rouge.png rename to res/textures/carre_rouge.png diff --git a/global game jam/res/textures/carre_test.png b/res/textures/carre_test.png similarity index 100% rename from global game jam/res/textures/carre_test.png rename to res/textures/carre_test.png diff --git a/global game jam/res/textures/carre_vert.png b/res/textures/carre_vert.png similarity index 100% rename from global game jam/res/textures/carre_vert.png rename to res/textures/carre_vert.png diff --git a/global game jam/res/textures/cercleblanc.png b/res/textures/cercleblanc.png similarity index 100% rename from global game jam/res/textures/cercleblanc.png rename to res/textures/cercleblanc.png diff --git a/global game jam/res/textures/chauve-souris.png b/res/textures/chauve-souris.png similarity index 100% rename from global game jam/res/textures/chauve-souris.png rename to res/textures/chauve-souris.png diff --git a/global game jam/res/textures/chauvesouri.png b/res/textures/chauvesouri.png similarity index 100% rename from global game jam/res/textures/chauvesouri.png rename to res/textures/chauvesouri.png diff --git a/global game jam/res/textures/cote droit.png b/res/textures/cote droit.png similarity index 100% rename from global game jam/res/textures/cote droit.png rename to res/textures/cote droit.png diff --git a/global game jam/res/textures/ennemis-puissant.png b/res/textures/ennemis-puissant.png similarity index 100% rename from global game jam/res/textures/ennemis-puissant.png rename to res/textures/ennemis-puissant.png diff --git a/global game jam/res/textures/ennemis.png b/res/textures/ennemis.png similarity index 100% rename from global game jam/res/textures/ennemis.png rename to res/textures/ennemis.png diff --git a/global game jam/res/textures/fboss dialogue.png b/res/textures/fboss dialogue.png similarity index 100% rename from global game jam/res/textures/fboss dialogue.png rename to res/textures/fboss dialogue.png diff --git a/global game jam/res/textures/fboss.png b/res/textures/fboss.png similarity index 100% rename from global game jam/res/textures/fboss.png rename to res/textures/fboss.png diff --git a/global game jam/res/textures/fondMenu.png b/res/textures/fondMenu.png similarity index 100% rename from global game jam/res/textures/fondMenu.png rename to res/textures/fondMenu.png diff --git a/global game jam/res/textures/foxy.png b/res/textures/foxy.png similarity index 100% rename from global game jam/res/textures/foxy.png rename to res/textures/foxy.png diff --git a/global game jam/res/textures/gameover.png b/res/textures/gameover.png similarity index 100% rename from global game jam/res/textures/gameover.png rename to res/textures/gameover.png diff --git a/global game jam/res/textures/glace verticale.png b/res/textures/glace verticale.png similarity index 100% rename from global game jam/res/textures/glace verticale.png rename to res/textures/glace verticale.png diff --git a/global game jam/res/textures/grosse boule.png b/res/textures/grosse boule.png similarity index 100% rename from global game jam/res/textures/grosse boule.png rename to res/textures/grosse boule.png diff --git a/global game jam/res/textures/joueur.png b/res/textures/joueur.png similarity index 100% rename from global game jam/res/textures/joueur.png rename to res/textures/joueur.png diff --git a/global game jam/res/textures/monster.png b/res/textures/monster.png similarity index 100% rename from global game jam/res/textures/monster.png rename to res/textures/monster.png diff --git a/global game jam/res/textures/perso.png b/res/textures/perso.png similarity index 100% rename from global game jam/res/textures/perso.png rename to res/textures/perso.png diff --git a/global game jam/res/textures/power.png b/res/textures/power.png similarity index 100% rename from global game jam/res/textures/power.png rename to res/textures/power.png diff --git a/global game jam/res/textures/scene intro.png b/res/textures/scene intro.png similarity index 100% rename from global game jam/res/textures/scene intro.png rename to res/textures/scene intro.png diff --git a/global game jam/res/textures/spell drop.png b/res/textures/spell drop.png similarity index 100% rename from global game jam/res/textures/spell drop.png rename to res/textures/spell drop.png diff --git a/global game jam/res/textures/spell.png b/res/textures/spell.png similarity index 100% rename from global game jam/res/textures/spell.png rename to res/textures/spell.png diff --git a/global game jam/res/textures/squelette.png b/res/textures/squelette.png similarity index 100% rename from global game jam/res/textures/squelette.png rename to res/textures/squelette.png diff --git a/global game jam/res/textures/squelette_puissant.png b/res/textures/squelette_puissant.png similarity index 100% rename from global game jam/res/textures/squelette_puissant.png rename to res/textures/squelette_puissant.png diff --git a/global game jam/res/textures/stage clear.png b/res/textures/stage clear.png similarity index 100% rename from global game jam/res/textures/stage clear.png rename to res/textures/stage clear.png diff --git a/global game jam/res/textures/symboles.png b/res/textures/symboles.png similarity index 100% rename from global game jam/res/textures/symboles.png rename to res/textures/symboles.png diff --git a/global game jam/res/textures/tir joueur.png b/res/textures/tir joueur.png similarity index 100% rename from global game jam/res/textures/tir joueur.png rename to res/textures/tir joueur.png diff --git a/global game jam/res/textures/tireau.png b/res/textures/tireau.png similarity index 100% rename from global game jam/res/textures/tireau.png rename to res/textures/tireau.png diff --git a/global game jam/res/textures/tireau_0.png b/res/textures/tireau_0.png similarity index 100% rename from global game jam/res/textures/tireau_0.png rename to res/textures/tireau_0.png diff --git a/global game jam/res/textures/ulti.png b/res/textures/ulti.png similarity index 100% rename from global game jam/res/textures/ulti.png rename to res/textures/ulti.png diff --git a/global game jam/res/textures/vieux.png b/res/textures/vieux.png similarity index 100% rename from global game jam/res/textures/vieux.png rename to res/textures/vieux.png diff --git a/global game jam/src/Audio/AudioManager.java b/src/Audio/AudioManager.java similarity index 100% rename from global game jam/src/Audio/AudioManager.java rename to src/Audio/AudioManager.java diff --git a/global game jam/src/Entity/Boss.java b/src/Entity/Boss.java similarity index 84% rename from global game jam/src/Entity/Boss.java rename to src/Entity/Boss.java index 3635860..8b40ebb 100644 --- a/global game jam/src/Entity/Boss.java +++ b/src/Entity/Boss.java @@ -29,35 +29,35 @@ public class Boss extends Monster{ // si le boss est static if(inMotion <= 0){ - // on fait un test aléatoire pour savoir si il va commencer un déplacement + // on fait un test aleatoire pour savoir si il va commencer un deplacement double testDepla = actualRandRange * Math.random(); // si oui if(testDepla < 1.0){ - // on réinitialise le test + // on reinitialise le test actualRandRange = maxRandRange; - // on détermine où on va + // on determine ou on va int indiceSpot = randG.nextInt(spotCoordDs.size()); - //on calcule le vercteur de déplacement pour y allez - double longDeplaTT = spotCoordDs.get(indiceSpot).x - (x + (image.getWidth() / 2) / Jeu.Jeu.resolution.getWidth()); // orienté - double hautDeplaTT = spotCoordDs.get(indiceSpot).y - (y + (image.getHeight() / 2) / Jeu.Jeu.resolution.getHeight()); // orienté + //on calcule le vercteur de deplacement pour y allez + double longDeplaTT = spotCoordDs.get(indiceSpot).x - (x + (image.getWidth() / 2) / Jeu.Jeu.resolution.getWidth()); // oriente + double hautDeplaTT = spotCoordDs.get(indiceSpot).y - (y + (image.getHeight() / 2) / Jeu.Jeu.resolution.getHeight()); // oriente double hypo = Math.sqrt((longDeplaTT * longDeplaTT) + (hautDeplaTT * hautDeplaTT)); setVectorX(longDeplaTT / hypo); setVectorY(hautDeplaTT / hypo); - // on détermine le nombre de déplacement à faire pour rejoindre le spot + // on determine le nombre de deplacement a faire pour rejoindre le spot inMotion = (int)(hypo / moveSpeed); } //sinon else{ - // on augmente la probabilité de réussir le test + // on augmente la probabilite de reussir le test actualRandRange *= 0.99; } } - // sinon il poursuit juste son déplacement + // sinon il poursuit juste son deplacement else{ inMotion --; move(getVectorX() * moveSpeed, getVectorY() * moveSpeed); diff --git a/global game jam/src/Entity/Bullet.java b/src/Entity/Bullet.java similarity index 90% rename from global game jam/src/Entity/Bullet.java rename to src/Entity/Bullet.java index df47b3b..45e68ae 100644 --- a/global game jam/src/Entity/Bullet.java +++ b/src/Entity/Bullet.java @@ -16,8 +16,8 @@ public class Bullet extends Entity{ setPosition(xStart, yStart); - double longDeplaTT = xTarget - x; // orienté - double hautDeplaTT = yTarget - y; // orienté + double longDeplaTT = xTarget - x; // oriente + double hautDeplaTT = yTarget - y; // oriente double hypo = Math.sqrt((longDeplaTT * longDeplaTT) + (hautDeplaTT * hautDeplaTT)); setVectorX(longDeplaTT / hypo); setVectorY(hautDeplaTT / hypo); diff --git a/global game jam/src/Entity/Entity.java b/src/Entity/Entity.java similarity index 100% rename from global game jam/src/Entity/Entity.java rename to src/Entity/Entity.java diff --git a/global game jam/src/Entity/Monster.java b/src/Entity/Monster.java similarity index 100% rename from global game jam/src/Entity/Monster.java rename to src/Entity/Monster.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_bas.java b/src/Entity/MonsterModel_chauve_souris_focus_bas.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_bas.java rename to src/Entity/MonsterModel_chauve_souris_focus_bas.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_bomb.java b/src/Entity/MonsterModel_chauve_souris_focus_bomb.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_bomb.java rename to src/Entity/MonsterModel_chauve_souris_focus_bomb.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_cross.java b/src/Entity/MonsterModel_chauve_souris_focus_cross.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_cross.java rename to src/Entity/MonsterModel_chauve_souris_focus_cross.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_cube.java b/src/Entity/MonsterModel_chauve_souris_focus_cube.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_cube.java rename to src/Entity/MonsterModel_chauve_souris_focus_cube.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_feint.java b/src/Entity/MonsterModel_chauve_souris_focus_feint.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_feint.java rename to src/Entity/MonsterModel_chauve_souris_focus_feint.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_loop.java b/src/Entity/MonsterModel_chauve_souris_focus_loop.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_loop.java rename to src/Entity/MonsterModel_chauve_souris_focus_loop.java diff --git a/global game jam/src/Entity/MonsterModel_chauve_souris_focus_trace.java b/src/Entity/MonsterModel_chauve_souris_focus_trace.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_chauve_souris_focus_trace.java rename to src/Entity/MonsterModel_chauve_souris_focus_trace.java diff --git a/global game jam/src/Entity/MonsterModel_monstre.java b/src/Entity/MonsterModel_monstre.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_monstre.java rename to src/Entity/MonsterModel_monstre.java diff --git a/global game jam/src/Entity/MonsterModel_squelette_focus_bomb.java b/src/Entity/MonsterModel_squelette_focus_bomb.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_squelette_focus_bomb.java rename to src/Entity/MonsterModel_squelette_focus_bomb.java diff --git a/global game jam/src/Entity/MonsterModel_squelette_focus_loop.java b/src/Entity/MonsterModel_squelette_focus_loop.java similarity index 100% rename from global game jam/src/Entity/MonsterModel_squelette_focus_loop.java rename to src/Entity/MonsterModel_squelette_focus_loop.java diff --git a/global game jam/src/Entity/Player.java b/src/Entity/Player.java similarity index 100% rename from global game jam/src/Entity/Player.java rename to src/Entity/Player.java diff --git a/global game jam/src/Entity/ShootingPattern.java b/src/Entity/ShootingPattern.java similarity index 100% rename from global game jam/src/Entity/ShootingPattern.java rename to src/Entity/ShootingPattern.java diff --git a/global game jam/src/Entity/ShootingPattern_0.java b/src/Entity/ShootingPattern_0.java similarity index 100% rename from global game jam/src/Entity/ShootingPattern_0.java rename to src/Entity/ShootingPattern_0.java diff --git a/global game jam/src/Entity/ShootingPattern_1.java b/src/Entity/ShootingPattern_1.java similarity index 100% rename from global game jam/src/Entity/ShootingPattern_1.java rename to src/Entity/ShootingPattern_1.java diff --git a/global game jam/src/Entity/TimedBullet.java b/src/Entity/TimedBullet.java similarity index 100% rename from global game jam/src/Entity/TimedBullet.java rename to src/Entity/TimedBullet.java diff --git a/global game jam/src/Entity/Ulti.java b/src/Entity/Ulti.java similarity index 100% rename from global game jam/src/Entity/Ulti.java rename to src/Entity/Ulti.java diff --git a/global game jam/src/Gui/Boutons.java b/src/Gui/Boutons.java similarity index 88% rename from global game jam/src/Gui/Boutons.java rename to src/Gui/Boutons.java index a9176e8..ff1d66f 100644 --- a/global game jam/src/Gui/Boutons.java +++ b/src/Gui/Boutons.java @@ -6,8 +6,8 @@ import java.awt.Dimension; import java.awt.Image; public class Boutons { - private GImage bouton; // la GImage du bouton qui est affiché sur l'écran - private Image boutonSurvole, boutonNormal; // les différentes textures du bouton + private GImage bouton; // la GImage du bouton qui est affiche sur l'ecran + private Image boutonSurvole, boutonNormal; // les differentes textures du bouton private GLabel texte; // le texte du bouton private double posiX, posiY, tailleX, tailleY; // la position et les dimension du bouton private boolean survole = false, affiche = false; @@ -20,7 +20,7 @@ public class Boutons { boutonNormal = new GImage("Ressources Editeur/HUD/Boutons/" + nomImage + ".png").getImage(); - boutonSurvole = new GImage("Ressources Editeur/HUD/Boutons/" + nomImage + "_survolé.png").getImage(); + boutonSurvole = new GImage("Ressources Editeur/HUD/Boutons/" + nomImage + "_survole.png").getImage(); bouton = new GImage(boutonNormal, posiX, posiY); bouton.setSize((bouton.getWidth() * dim.getWidth() / 1920), (bouton.getHeight() * dim.getHeight() / 1080)); @@ -66,7 +66,7 @@ public class Boutons { texte.setLocation(posiX + tailleX/2 - (int)texte.getWidth()/2, posiY + tailleY/2 + (int)texte.getHeight()/2 -7); } - public boolean hitBox(int x,int y){ // méthode qui renvoie vrai si la sourie est sur le bouton ( pour le clic par exemple ) + public boolean hitBox(int x,int y){ // methode qui renvoie vrai si la sourie est sur le bouton ( pour le clic par exemple ) if(x>=posiX && x<= posiX + tailleX && y>=posiY && y<=posiY+tailleY){ return true; } diff --git a/global game jam/src/IO/IOFile.java b/src/IO/IOFile.java similarity index 100% rename from global game jam/src/IO/IOFile.java rename to src/IO/IOFile.java diff --git a/global game jam/src/Input/EcranListeners.java b/src/Input/EcranListeners.java similarity index 86% rename from global game jam/src/Input/EcranListeners.java rename to src/Input/EcranListeners.java index feaebef..af9bc52 100644 --- a/global game jam/src/Input/EcranListeners.java +++ b/src/Input/EcranListeners.java @@ -1,7 +1,7 @@ package Input; /* - * Cette classe sert a récupérer les actions de la souris et a déclancher le timer qui lui correspond. - * Ce timer est ensuite utilisé dans la classe Jeu de la meme manière qu'un " public void mouseClicked(MouseEvent e) " + * Cette classe sert a recuperer les actions de la souris et a declancher le timer qui lui correspond. + * Ce timer est ensuite utilise dans la classe Jeu de la meme maniere qu'un " public void mouseClicked(MouseEvent e) " */ import java.awt.Dimension; diff --git a/global game jam/src/Input/Joystick.java b/src/Input/Joystick.java similarity index 100% rename from global game jam/src/Input/Joystick.java rename to src/Input/Joystick.java diff --git a/global game jam/src/Input/KeyCode.java b/src/Input/KeyCode.java similarity index 100% rename from global game jam/src/Input/KeyCode.java rename to src/Input/KeyCode.java diff --git a/global game jam/src/Items/Items.java b/src/Items/Items.java similarity index 100% rename from global game jam/src/Items/Items.java rename to src/Items/Items.java diff --git a/global game jam/src/Items/PowerItems.java b/src/Items/PowerItems.java similarity index 100% rename from global game jam/src/Items/PowerItems.java rename to src/Items/PowerItems.java diff --git a/global game jam/src/Items/SpellItems.java b/src/Items/SpellItems.java similarity index 100% rename from global game jam/src/Items/SpellItems.java rename to src/Items/SpellItems.java diff --git a/global game jam/src/Jeu/Jeu.java b/src/Jeu/Jeu.java similarity index 97% rename from global game jam/src/Jeu/Jeu.java rename to src/Jeu/Jeu.java index 18f93c2..4a6268b 100644 --- a/global game jam/src/Jeu/Jeu.java +++ b/src/Jeu/Jeu.java @@ -323,7 +323,7 @@ public class Jeu extends JFrame implements ActionListener, KeyListener{ @Override public void keyPressed(KeyEvent e) { // TODO keyPressed - // System.out.println("Code touche pressée : " + e.getKeyCode()); + // System.out.println("Code touche pressee : " + e.getKeyCode()); switch(e.getKeyCode()){ case KeyCode.KEY_UP: keyUp = true; @@ -727,7 +727,7 @@ public class Jeu extends JFrame implements ActionListener, KeyListener{ } // permet de faire spawn le boss quand tout le stage est fini - // n'est exécuté qu'une fois + // n'est execute qu'une fois if(world != null) if(!world.getBossSpawned() && world.getMonstersList().size() == 0 && world.getMonsterSpawnPattern().size() == 0){ world.setBossSpawned(true); diff --git a/global game jam/src/Tools/Coord.java b/src/Tools/Coord.java similarity index 100% rename from global game jam/src/Tools/Coord.java rename to src/Tools/Coord.java diff --git a/global game jam/src/Tools/CoordD.java b/src/Tools/CoordD.java similarity index 100% rename from global game jam/src/Tools/CoordD.java rename to src/Tools/CoordD.java diff --git a/global game jam/src/Tools/ImagePhysics.java b/src/Tools/ImagePhysics.java similarity index 100% rename from global game jam/src/Tools/ImagePhysics.java rename to src/Tools/ImagePhysics.java diff --git a/global game jam/src/World/MonsterSpawnPattern.java b/src/World/MonsterSpawnPattern.java similarity index 81% rename from global game jam/src/World/MonsterSpawnPattern.java rename to src/World/MonsterSpawnPattern.java index b5e4f24..a4c9161 100644 --- a/global game jam/src/World/MonsterSpawnPattern.java +++ b/src/World/MonsterSpawnPattern.java @@ -4,7 +4,7 @@ import Entity.Monster; /* - * définit le momant d'apparition d'un mob et le mob lui-même + * definit le moment d apparition d'un mob et le mob lui-meme */ public class MonsterSpawnPattern { private Monster monster; diff --git a/global game jam/src/World/Replique.java b/src/World/Replique.java similarity index 100% rename from global game jam/src/World/Replique.java rename to src/World/Replique.java diff --git a/global game jam/src/World/Speach.java b/src/World/Speach.java similarity index 100% rename from global game jam/src/World/Speach.java rename to src/World/Speach.java diff --git a/global game jam/src/World/Stage1.java b/src/World/Stage1.java similarity index 100% rename from global game jam/src/World/Stage1.java rename to src/World/Stage1.java diff --git a/global game jam/src/World/World.java b/src/World/World.java similarity index 100% rename from global game jam/src/World/World.java rename to src/World/World.java diff --git a/global game jam/src/test/Coord.java b/src/test/Coord.java similarity index 100% rename from global game jam/src/test/Coord.java rename to src/test/Coord.java diff --git a/global game jam/src/test/EcranListeners.java b/src/test/EcranListeners.java similarity index 86% rename from global game jam/src/test/EcranListeners.java rename to src/test/EcranListeners.java index 5cae398..72d1847 100644 --- a/global game jam/src/test/EcranListeners.java +++ b/src/test/EcranListeners.java @@ -1,7 +1,7 @@ package test; /* - * Cette classe sert a récupérer les actions de la souris et a déclancher le timer qui lui correspond. - * Ce timer est ensuite utilisé dans la classe Jeu de la meme manière qu'un " public void mouseClicked(MouseEvent e) " + * Cette classe sert a recuperer les actions de la souris et a declancher le timer qui lui correspond. + * Ce timer est ensuite utilise dans la classe Jeu de la meme maniere qu'un " public void mouseClicked(MouseEvent e) " */ import java.awt.Dimension; diff --git a/global game jam/src/test/Jeu.java b/src/test/Jeu.java similarity index 100% rename from global game jam/src/test/Jeu.java rename to src/test/Jeu.java diff --git a/global game jam/src/test/main.java b/src/test/main.java similarity index 100% rename from global game jam/src/test/main.java rename to src/test/main.java