Hotfix v1.0.2

ttgc · Dec 17, 2019 · 7f8d226 · 7f8d226
1 parent 9e4a616
commit 7f8d226
Show file tree

Hide file tree

Showing 68 changed files with 52 additions and 29 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Slick"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Galactic-Supremacy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/README.md b/README.md
@@ -1,36 +1,32 @@
 # Galactic Supremacy Lite
 Shoot'em up game called Galactic Supremacy made with Java
-This is the lite edition of the full version of game in master branch
-Please consider by upgrading lite edition that some changes could be not integrated on full version.
-Lite version is a limited version, some functionalities of full version are not implemented
-
-All branches refering to lite version **must** begin with `lite` keyword
+This is the full version of Galactic Supremacy since end of developement of lite version
+You can commit directly based on this version, do not commit based on lite branch.
 
 -------------
 
-## Constraint on Lite version
+## Old constraint on Lite version
 **All the following constraint must be verified by lite version**
 * Usage of Slick2D lib and Java language ✔️
-* Ship located on the bottom of the screen with only left and right moves ✔️
+* ~~Ship located on the bottom of the screen with only left and right moves ✔️~~ 
 * Game playable with Keyboard only ✔️
 * min 3 differents types of ennemies with differents path and shoot's path (3+/3) ✔️
-* no collisions between ennemies or ennemies' shoots ✔️
+* ~~no collisions between ennemies or ennemies' shoots ✔️~~
 * Several shoots can exist at the same time ✔️
 * Usage of abstract class `Ennemy` (do not edit render and update methods) ✔️
 
 -----------
 
-## Possible upgrade
+## Upgrades
 The following list refers to possible upgrade for lite edition
 * Scrolling ✔️
 * Obstacles ✔️
 * Bonus weapons ✔️
-* Score ❌ (Replaced with money system)
+* ~~Score ❌ (Replaced with money system)~~
 * Save system ✔️
 * Difficulties level ✔️
 
 -----------
 
 __**Game is not yet finished, and can have issues, or simply doesn't run properly, please wait release for play it**__<br/>
 __**Release lite-v1.0 is the latest stable version**__
-__**Branch will be merged with master soon (check pull request)**__
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -0,0 +1,2 @@
+/gameplay/
+/states/
diff --git a/bin/Music/credits.txt b/bin/Music/credits.txt
@@ -1,17 +1,17 @@
-Titlescreen music :
-AmperMusic
-
-Battle music :
-Freedom by Karstenholymoly (c) copyright 2017 Licensed under a Creative Commons Attribution Noncommercial  (3.0) license. http://dig.ccmixter.org/files/Karstenholymoly/55921 Ft: MissJudged
-
-Shop music :
-AmperMusic
-
-Settings music :
-AmperMusic
-
-Garage music :
-AmperMusic
-
-Mapmonde music : 
+Titlescreen music :
+AmperMusic
+
+Battle music :
+Freedom by Karstenholymoly (c) copyright 2017 Licensed under a Creative Commons Attribution Noncommercial  (3.0) license. http://dig.ccmixter.org/files/Karstenholymoly/55921 Ft: MissJudged
+
+Shop music :
+AmperMusic
+
+Settings music :
+AmperMusic
+
+Garage music :
+AmperMusic
+
+Mapmonde music : 
 AmperMusic
diff --git a/bin/basics/Hitbox.class b/bin/basics/Hitbox.class
diff --git a/bin/basics/Jauge.class b/bin/basics/Jauge.class
diff --git a/bin/basics/Path.class b/bin/basics/Path.class
diff --git a/bin/basics/Points.class b/bin/basics/Points.class
diff --git a/bin/basics/ProgressJauge.class b/bin/basics/ProgressJauge.class
diff --git a/bin/basics/RoundHitbox.class b/bin/basics/RoundHitbox.class
diff --git a/bin/exceptions/ShopException.class b/bin/exceptions/ShopException.class
diff --git a/bin/exceptions/SpawnException.class b/bin/exceptions/SpawnException.class
diff --git a/bin/gameplay/Dialog.class b/bin/gameplay/Dialog.class
diff --git a/bin/gameplay/HUD.class b/bin/gameplay/HUD.class
diff --git a/bin/gameplay/MapPath.class b/bin/gameplay/MapPath.class
diff --git a/bin/gameplay/Shoot.class b/bin/gameplay/Shoot.class
diff --git a/bin/gameplay/World.class b/bin/gameplay/World.class
diff --git a/bin/gameplay/ennemies/Boss.class b/bin/gameplay/ennemies/Boss.class
diff --git a/bin/gameplay/ennemies/Ennemy.class b/bin/gameplay/ennemies/Ennemy.class
diff --git a/bin/gameplay/ennemies/PathedEnnemy.class b/bin/gameplay/ennemies/PathedEnnemy.class
diff --git a/bin/gameplay/ennemies/Starball.class b/bin/gameplay/ennemies/Starball.class
diff --git a/bin/gameplay/ennemies/Starcup.class b/bin/gameplay/ennemies/Starcup.class
diff --git a/bin/gameplay/ennemies/StarcupBoss.class b/bin/gameplay/ennemies/StarcupBoss.class
diff --git a/bin/gameplay/ennemies/Starroll.class b/bin/gameplay/ennemies/Starroll.class
diff --git a/bin/gameplay/player/Player.class b/bin/gameplay/player/Player.class
diff --git a/bin/gameplay/player/Rocket.class b/bin/gameplay/player/Rocket.class
diff --git a/bin/gameplay/player/Shield.class b/bin/gameplay/player/Shield.class
diff --git a/bin/gameplay/player/Ship.class b/bin/gameplay/player/Ship.class
diff --git a/bin/gameplay/player/canon/BasicCanon.class b/bin/gameplay/player/canon/BasicCanon.class
diff --git a/bin/gameplay/player/canon/Canon.class b/bin/gameplay/player/canon/Canon.class
diff --git a/bin/gameplay/player/canon/DoubleCanon.class b/bin/gameplay/player/canon/DoubleCanon.class
diff --git a/bin/gameplay/player/canon/QuintupleCanon.class b/bin/gameplay/player/canon/QuintupleCanon.class
diff --git a/bin/gameplay/player/canon/TripleCanon.class b/bin/gameplay/player/canon/TripleCanon.class
diff --git a/bin/gameplay/player/superpower/RayPower.class b/bin/gameplay/player/superpower/RayPower.class
diff --git a/bin/gameplay/player/superpower/SuperPower.class b/bin/gameplay/player/superpower/SuperPower.class
diff --git a/bin/gameplay/player/superpower/WavePower.class b/bin/gameplay/player/superpower/WavePower.class
diff --git a/bin/gameplay/powerup/Powerup.class b/bin/gameplay/powerup/Powerup.class
diff --git a/bin/gameplay/powerup/PowerupBurn.class b/bin/gameplay/powerup/PowerupBurn.class
diff --git a/bin/gameplay/powerup/PowerupCooldown.class b/bin/gameplay/powerup/PowerupCooldown.class
diff --git a/bin/gameplay/powerup/PowerupEnergy.class b/bin/gameplay/powerup/PowerupEnergy.class
diff --git a/bin/gameplay/powerup/PowerupHealth.class b/bin/gameplay/powerup/PowerupHealth.class
diff --git a/bin/gameplay/powerup/PowerupHeat.class b/bin/gameplay/powerup/PowerupHeat.class
diff --git a/bin/gameplay/powerup/PowerupLife.class b/bin/gameplay/powerup/PowerupLife.class
diff --git a/bin/gameplay/powerup/PowerupMoney.class b/bin/gameplay/powerup/PowerupMoney.class
diff --git a/bin/gameplay/powerup/PowerupPower.class b/bin/gameplay/powerup/PowerupPower.class
diff --git a/bin/gameplay/powerup/PowerupRepair.class b/bin/gameplay/powerup/PowerupRepair.class
diff --git a/bin/gameplay/shop/Shop.class b/bin/gameplay/shop/Shop.class
diff --git a/bin/gameplay/shop/ShopManager.class b/bin/gameplay/shop/ShopManager.class
diff --git a/bin/gameplay/shop/ShopSave.class b/bin/gameplay/shop/ShopSave.class
diff --git a/bin/main/Game.class b/bin/main/Game.class
diff --git a/bin/settings/KeyType.class b/bin/settings/KeyType.class
diff --git a/bin/settings/Keymap.class b/bin/settings/Keymap.class
diff --git a/bin/settings/Settings.class b/bin/settings/Settings.class
diff --git a/bin/settings/SettingsRoom.class b/bin/settings/SettingsRoom.class
diff --git a/bin/settings/SettingsType.class b/bin/settings/SettingsType.class
diff --git a/bin/states/GameOverScreen.class b/bin/states/GameOverScreen.class
diff --git a/bin/states/Garage.class b/bin/states/Garage.class
diff --git a/bin/states/LoadingScreen.class b/bin/states/LoadingScreen.class
diff --git a/bin/states/TitleScreen.class b/bin/states/TitleScreen.class
diff --git a/bin/states/Worldmap.class b/bin/states/Worldmap.class
diff --git a/bin/states/levels/Level.class b/bin/states/levels/Level.class
diff --git a/bin/states/levels/Level_1.class b/bin/states/levels/Level_1.class
diff --git a/bin/states/levels/Level_2.class b/bin/states/levels/Level_2.class
diff --git a/bin/states/levels/Level_3.class b/bin/states/levels/Level_3.class
diff --git a/settings.conf b/settings.conf
diff --git a/src/gameplay/shop/ShopManager.java b/src/gameplay/shop/ShopManager.java
@@ -238,6 +238,7 @@ public static ShopSave export_data() {
 	public static void import_data() {
 		ShopSave sav = ShopSave.load();
 		if (sav == null) {
+			ShopManager.export_data();
 			return;
 		}
 		bought = sav.getBougth();

diff --git a/src/states/levels/Level.java b/src/states/levels/Level.java
@@ -285,7 +285,7 @@ public void update(GameContainer gc, StateBasedGame sbg, int delta)
 				screen.update(400, 300);
 				if (!player.getShip().getHitbox().check_collision(screen)) {
 					afterlevel = true;
-					if (player.getPower().isUsed()) {
+					if (player.getPower() != null && player.getPower().isUsed()) {
 						player.getPower().resetuse();
 					}
 				}
@@ -530,7 +530,7 @@ private void ennemy_col() {
 				if (ennemies.get(i).getRhitbox().check_collision(ennemies.get(k).getRhitbox())) {
 					ennemies.get(i).bounce(ennemies.get(i).getRhitbox().angle_tan(ennemies.get(i).getDirection())); 
 					ennemies.get(k).bounce(ennemies.get(k).getRhitbox().angle_tan(ennemies.get(k).getDirection())); 
-					System.out.println(ennemies.get(i).getRhitbox());
+					//System.out.println(ennemies.get(i).getRhitbox());
 				}
 			}