Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup todo

Browse Source
This commit is contained in:
Antoine
2021-06-24 19:32:43 +02:00
parent 64bb46d3d5
commit 0a165de74b
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/gameplay/match/match.java
View File

@ -107,13 +107,13 @@ public class match {
timer = 99;
inputsP1 = new InputBuffer(inputBufferSize);
inputsP2 = new InputBuffer(inputBufferSize);
p1.setPos(-750, groundLevel); //TODO : change to better values if needed
p2.setPos((int) (750 - objP2.getWidth() * objP2.getScalingFactor()), groundLevel); //TODO : change to better values if needed
p1.setPos(-750, groundLevel);
p2.setPos((int) (750 - objP2.getWidth() * objP2.getScalingFactor()), groundLevel);
p1.setCurrentHP(p1.getMaxHP());
p2.setCurrentHP(p2.getMaxHP());
objP1.translate(new Vector3f(p1.getPosX(),p1.getPosY(),0));
objP2.translate(new Vector3f(p2.getPosX(),p2.getPosY(),0));
// TODO meilleur implémentation possible
objP1.getShadow().translate(new Vector3f(0f,p1.getPosY(),0));
objP2.getShadow().translate(new Vector3f(0f,p2.getPosY(),0));
// Crée l'InputList
@ -154,7 +154,6 @@ public class match {
/**
* Ends the match.
* Used for playing animations and such.
* TODO : Implement this once we know what to do.
*/
private static void endMatch() {
String victoryTxt = roundsWonP1 > roundsWonP2 ? "P1 won the match" : "P2 won the match";
@ -171,6 +170,8 @@ public class match {
engine.setRunning(false);
}
public static void parse() throws FileNotFoundException {
JSONParser jsonP = new JSONParser();