conflit

core/src/sagittarius/SagittariusGame.java

@@ -1,7 +1,6 @@
 package sagittarius;
 
 import com.badlogic.gdx.Game;
-import com.badlogic.gdx.Gdx;
 import com.kotcrab.vis.ui.VisUI;
 import com.badlogic.gdx.audio.Music; 
 import sagittarius.view.*;

core/src/sagittarius/model/Arrow.java

@@ -1,6 +1,8 @@
 package sagittarius.model;
 
 import com.badlogic.gdx.Gdx;
+import java.util.ArrayList;
+
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
@@ -32,7 +34,7 @@ public class Arrow extends EntityQuad {
 
     private Sound arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/sf_fleche_plante_01.mp3"));
     private Sound arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/VOXScrm_Cri wilhelm (ID 0477)_LS.wav"));
-    private Texture texture;
+    private ArrayList<Texture> texture;
 
 // ---------- CONSTRUCTORs ----------
 
@@ -47,30 +49,41 @@ public class Arrow extends EntityQuad {
         super(0, 1, shooter.getColor(), shooter.getPosition());
         this.velocity = new Vector2(power, 0).setAngleDeg(angle);
         this.acceleration = new Vector2();
-        this.setOrigin(80, 2);
-        this.setSize(100, 4);
+        this.setOrigin(40, 2);
+        this.setSize(50, 4);
         this.force = computeForce();
         this.landed = false;
         
         if (!preview) {
-            Pixmap pm = new Pixmap(new FileHandle("core/assets/arrow" + MathUtils.random(2) + ".png"));
-            pm.setBlending(Pixmap.Blending.None);
-            for (int x = 0; x < pm.getWidth(); x++) {
-                for (int y = 0; y < pm.getHeight(); y++) {
+            texture = new ArrayList<>();
+            String path = "core/assets/arrow" + MathUtils.random(2);
 
-                    Color pc = new Color();
-                    Color.rgba8888ToColor(pc, pm.getPixel(x, y));
+            int i = 0;
+            while (true) {
+                try {
+                    Pixmap pm = new Pixmap(new FileHandle(path + "-" + i + ".png"));
+                    pm.setBlending(Pixmap.Blending.None);
+                    for (int x = 0; x < pm.getWidth(); x++) {
+                        for (int y = 0; y < pm.getHeight(); y++) {
             
-                    if (pc.r == 1 && pc.g == 1 && pc.b == 1) {
-                        pc.r = getColor().r;
-                        pc.g = getColor().g;
-                        pc.b = getColor().b;
+                            Color pc = new Color();
+                            Color.rgba8888ToColor(pc, pm.getPixel(x, y));
+            
+                            if (pc.r == 1 && pc.g == 1 && pc.b == 1) {
+                                pc.r = getColor().r;
+                                pc.g = getColor().g;
+                                pc.b = getColor().b;
+                            }
+            
+                            pm.drawPixel(x, y, Color.rgba8888(pc));
+                        }
                     }
-    
-                    pm.drawPixel(x, y, Color.rgba8888(pc));
+                    texture.add(new Texture(pm));
+                    i++;
+                } catch (com.badlogic.gdx.utils.GdxRuntimeException e) {
+                    break;
                 }
             }
-            texture = new Texture(pm);
         }
 
     }
@@ -112,8 +125,9 @@ public class Arrow extends EntityQuad {
 
     @Override
     public void draw(Batch batch, float parentAlpha) {
-        batch.draw(texture, getPosition().x - 0.8f * getWidth(), getPosition().y - getHeight()/2 - 10, 0.8f * this.getWidth(), this.getHeight()/2 + 10, getWidth(), 20 + getHeight(),
-        1, 1, getRotation(), 0, 0, texture.getWidth(), texture.getHeight(), false, false);
+        int i = (int) (TTL * 3) % texture.size();
+        batch.draw(texture.get(i), getPosition().x - getOriginX(), getPosition().y - getWidth()/2, getOriginX(), getWidth()/2, getWidth(), getWidth(),
+                    1, 1, getRotation(), 0, 0, texture.get(i).getWidth(), texture.get(i).getHeight(), false, false);
         super.draw(batch, parentAlpha);
 	}
 
@@ -208,6 +222,7 @@ public class Arrow extends EntityQuad {
                 GameScreen.setFocus(GameScreen.playerCurrent);
                 // Make a sound when an arrow touched
                 
+                GameScreen.removePlayer(player);
                 break;
                                 
             }

core/src/sagittarius/model/Bow.java

@@ -8,7 +8,6 @@ import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.audio.Sound; 
-import com.badlogic.gdx.files.*;
 
 import sagittarius.view.GameScreen;
 import sagittarius.SagittariusGame;

core/src/sagittarius/view/ResumeScreen.java

@@ -3,7 +3,6 @@ package sagittarius.view;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
-import com.badlogic.gdx.utils.Align;
 import com.kotcrab.vis.ui.VisUI;
 import com.kotcrab.vis.ui.widget.VisCheckBox;
 import com.kotcrab.vis.ui.widget.VisTable;
@@ -66,7 +65,6 @@ public class ResumeScreen extends BaseScreen {
                     SagittariusGame.music.stop();
                     SagittariusGame.disableMusic = true;
                 }
-
                 else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){
                     SagittariusGame.music.play();
                     SagittariusGame.disableMusic = false;