From b4d8ce858a155fbdd2ae4de13791e96eeea27b0b Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dupuis@etudiant.univ-rennes1.fr>
Date: Sun, 20 Jun 2021 01:20:37 +0200
Subject: [PATCH] =?UTF-8?q?fDash=20+=20variable=20global=20pour=20contr?=
 =?UTF-8?q?=C3=B4ler=20la=20vitesse=20du=20jeu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gameplay/Characters/Blue/BlueBaseFrames.java | 2 +-
 src/gameplay/Characters/Blue/BlueMisc.java       | 4 ++--
 src/gameplay/match/match.java                    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java
index a2a3350..e53f943 100644
--- a/src/gameplay/Characters/Blue/BlueBaseFrames.java
+++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java
@@ -638,6 +638,7 @@ public class BlueBaseFrames {
                 return blueStandframe1;
         }
 
+        // TODO avoir plusieurs sprite pour crée un cycle de marche
         protected static Frame[] blueFWalk() {
                 Frame[] f = new Frame[12];
                 f[0] = walkForwardFrame1();
@@ -652,7 +653,6 @@ public class BlueBaseFrames {
                 f[9] = walkForwardFrame4();
                 f[10] = walkForwardFrame4();
                 f[11] = walkForwardFrame4();
-
                 return f;
         }
 
diff --git a/src/gameplay/Characters/Blue/BlueMisc.java b/src/gameplay/Characters/Blue/BlueMisc.java
index c0e92b7..6d413c3 100644
--- a/src/gameplay/Characters/Blue/BlueMisc.java
+++ b/src/gameplay/Characters/Blue/BlueMisc.java
@@ -38,7 +38,7 @@ public class BlueMisc {
         Frame f = new Frame(0.0,0.0,phb,ahb,pthb,athb,pushB,
                 //cancels (in order : normal, special, jump, move, dash)
                 false,false,false,false,false);
-        f.setSpriteWrap(102,0,102,120);
+        f.setSpriteWrap(14*138,139,138,138); // A 138 on voit les iepds du boug au dessus
         return f;
     }
     private static Frame fDash2() {
@@ -69,7 +69,7 @@ public class BlueMisc {
         Frame f = new Frame(0.0,12.0,phb,ahb,pthb,athb,pushB,
                 //cancels (in order : normal, special, jump, move, dash)
                 false,false,false,false,false);
-        f.setSpriteWrap(816,0,102,120);
+        f.setSpriteWrap(14*138,139,138,138);
         return f;
     }
     private static Frame fDash3() {
diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java
index 4498f1a..de9feb6 100644
--- a/src/gameplay/match/match.java
+++ b/src/gameplay/match/match.java
@@ -84,6 +84,7 @@ public class match {
 	private static boolean showP1Hitbox = true; // TODO modifier pour le rendre activable
 	private static boolean showP2Hitbox = true;
 	private static List<Hitbox> listHitboxObj = new ArrayList<>();
+	private static float slowFactor = 0.5f;
 
 	private static Sprite objP1,objP2;
 	private static Engine engine;
@@ -385,7 +386,7 @@ public class match {
 				timer = 99 - frameCount/60;
 
 				timeStamp2 = System.currentTimeMillis();
-				while(timeStamp2-timeStamp1<(1000/60)) {
+				while(timeStamp2-timeStamp1<(1000/(60 * slowFactor))) {
 					timeStamp2 = System.currentTimeMillis();
 				}
 				frameCount++;