From 6a078550b2d71f8166f85b4a2e5fd33bfd9cd9e3 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 21:06:11 +0200
Subject: [PATCH] timeout stuff

---
 core/assets/hit.png                           | Bin 0 -> 2628 bytes
 core/assets/{ => sound}/earrape.mp3           | Bin
 core/assets/sound/hit.mp3                     | Bin 0 -> 27095 bytes
 core/assets/{ => sound}/music.mp3             | Bin
 .../src/netwerkprog/game/client/MainGame.java |   8 ++++-
 .../game/client/game/characters/Team.java     |   6 ++++
 .../client/game/map/GameInputProcessor.java   |   8 +++--
 .../game/client/game/map/MapRenderer.java     |  11 ++++++-
 .../game/util/application/Timer.java          |   6 +++-
 .../game/util/game/GameCharacter.java         |  29 +++++++++++++++++-
 10 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 core/assets/hit.png
 rename core/assets/{ => sound}/earrape.mp3 (100%)
 create mode 100644 core/assets/sound/hit.mp3
 rename core/assets/{ => sound}/music.mp3 (100%)

diff --git a/core/assets/hit.png b/core/assets/hit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce2d65d671e6e5c99686bece0f8149851ee212b1
GIT binary patch
literal 2628
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

literal 0
HcmV?d00001

diff --git a/core/assets/earrape.mp3 b/core/assets/sound/earrape.mp3
similarity index 100%
rename from core/assets/earrape.mp3
rename to core/assets/sound/earrape.mp3
diff --git a/core/assets/sound/hit.mp3 b/core/assets/sound/hit.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..ff586b934d241beab6f33d7989d0cfb11c276907
GIT binary patch
literal 27095
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
QfNBOna;o_Qw9*Ft0RSp~@c;k-

literal 0
HcmV?d00001

diff --git a/core/assets/music.mp3 b/core/assets/sound/music.mp3
similarity index 100%
rename from core/assets/music.mp3
rename to core/assets/sound/music.mp3
diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index f15ff4a..1b6b858 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -12,6 +12,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.utils.TimeUtils;
 import netwerkprog.game.client.game.GAMESTATE;
 import netwerkprog.game.client.game.characters.Agent;
 import netwerkprog.game.client.game.characters.Hacker;
@@ -44,6 +45,7 @@ public class MainGame extends ApplicationAdapter {
     private GlyphLayout layout;
     private GAMESTATE gamestate;
     private Faction chosenFaction;
+    private long lastTimeCounted = 0;
 
     private Map map;
     public MapRenderer mapRenderer;
@@ -101,7 +103,7 @@ public class MainGame extends ApplicationAdapter {
 //        this.tree.insert(new Hacker(,new BodySwap()));
 
 
-        playSong();
+//        playSong();
 
 
 //        connectToServer();
@@ -113,6 +115,7 @@ public class MainGame extends ApplicationAdapter {
         Texture texture = assets.get("core/assets/characters.png");
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
         this.team = new Team();
+        this.enemyTeam = new Team();
 
         for (int i = 1; i <= 5; i++) {
             GameCharacter temp = new Hacker("hacker" + i, characters[5][0], new BodySwap("test"));
@@ -195,9 +198,12 @@ public class MainGame extends ApplicationAdapter {
      * update method that does all calculation before something is being drawn
      */
     public void update() {
+
         frameRate.update();
         camera.update();
         this.gameInputProcessor.update();
+        this.team.update(Gdx.graphics.getDeltaTime());
+        this.enemyTeam.update(Gdx.graphics.getDeltaTime());
     }
 
     @Override
diff --git a/core/src/netwerkprog/game/client/game/characters/Team.java b/core/src/netwerkprog/game/client/game/characters/Team.java
index daa3a01..caf9145 100644
--- a/core/src/netwerkprog/game/client/game/characters/Team.java
+++ b/core/src/netwerkprog/game/client/game/characters/Team.java
@@ -54,6 +54,12 @@ public class Team {
         return null;
     }
 
+    public void update(double deltaTime) {
+        for (GameCharacter character : this.members) {
+            character.update(deltaTime);
+        }
+    }
+
     public boolean isDead() {
         int dead = 0;
         for (GameCharacter character : this.members) {
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index 3fa795d..b5ce136 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -125,7 +125,7 @@ public class GameInputProcessor implements InputProcessor {
                 System.out.println("HACKER");
                 mainGame.setChosenFaction(Faction.HACKER);
                 mainGame.initCharacters();
-                camera.translate(-400,0);
+                camera.translate(-400, 0);
                 mainGame.setGamestate(GAMESTATE.PLAYING);
             }
 
@@ -163,8 +163,10 @@ public class GameInputProcessor implements InputProcessor {
                             }
 //                            clicking on enemy
                             if (mainGame.hasCharacterSelected() && gameTile.containsCharacter() && gameTile.getCharacter().getFaction() != mainGame.getChosenFaction()) {
-                                if (mainGame.mapRenderer.getSurroundedTilesOfCurrentCharacter().contains(gameTile))
-                                gameTile.getCharacter().damage(10);
+                                if (mainGame.mapRenderer.getSurroundedTilesOfCurrentCharacter().contains(gameTile)) {
+                                    gameTile.getCharacter().damage(10);
+
+                                }
                             }
                             // set selected character
                             if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index d745a88..0e69407 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -27,6 +27,7 @@ public class MapRenderer implements Renderable {
     private MainGame mainGame;
     private Texture square;
     private Texture square2;
+    private Texture hitMarker;
 
 
     public static TextureRegion FLOOR_TILE;
@@ -62,9 +63,11 @@ public class MapRenderer implements Renderable {
         mainGame.assets.load("square.png", Texture.class);
         mainGame.assets.load("square2.png", Texture.class);
         mainGame.assets.load(tilePath, Texture.class);
+        mainGame.assets.load("hit.png",Texture.class);
         mainGame.assets.finishLoading();
         square = mainGame.assets.get("square.png");
         square2 = mainGame.assets.get("square2.png");
+        hitMarker = mainGame.assets.get("hit.png");
 
         Texture texture = mainGame.assets.get(tilePath);
         TextureRegion[][] tileTextures = TextureRegion.split(texture, 32, 32);
@@ -118,7 +121,13 @@ public class MapRenderer implements Renderable {
                 batch.draw(cur.getTextureRegion(), cur.x, cur.y);
 
                 if (cur.containsCharacter()) {
-                    batch.draw(cur.getCharacter().getTextureRegion(), cur.x, cur.y);
+                    GameCharacter character = cur.getCharacter();
+                    batch.draw(character.getTextureRegion(), cur.x, cur.y);
+                    if (character.isShowingAnimation()) {
+//                        System.out.println("animation");
+                        batch.draw(hitMarker,cur.x,cur.y);
+                    }
+
 
                     if (cur.getCharacter().equals(mainGame.getSelectedCharacter())) {
                         batch.draw(square, cur.x, cur.y);
diff --git a/core/src/netwerkprog/game/util/application/Timer.java b/core/src/netwerkprog/game/util/application/Timer.java
index 11d61fb..2d8174f 100644
--- a/core/src/netwerkprog/game/util/application/Timer.java
+++ b/core/src/netwerkprog/game/util/application/Timer.java
@@ -38,6 +38,7 @@ public class Timer implements Updatable {
 
     public void start() {
         this.timeout = 0;
+        System.out.println("starting timer for " + wait + ", timeout is " + this.timeout);
     }
 
     public void stop() {
@@ -54,7 +55,7 @@ public class Timer implements Updatable {
     public boolean timeout() {
         if (this.timeout == -1) {
             // timeout has occurred and is not looped
-            return false;
+            return true;
         }
 
         if (this.timeout - 1 < 0) {
@@ -89,11 +90,14 @@ public class Timer implements Updatable {
 
     @Override
     public void update(double deltaTime) {
+        System.out.println("timeout: " + this.timeout);
         if (this.timeout != -1) {
             // Only update when timer is not aborted
             this.time += deltaTime;
+            System.out.println("time is " + this.time);
             if (this.time >= this.wait) {
                 // timeout occurred
+                System.out.println("timeout occurred, time is " + this.time);
                 this.time -= this.wait;
                 this.timeout++;
             }
diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java
index 83689b7..0eb629c 100644
--- a/core/src/netwerkprog/game/util/game/GameCharacter.java
+++ b/core/src/netwerkprog/game/util/game/GameCharacter.java
@@ -1,9 +1,11 @@
 package netwerkprog.game.util.game;
 
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import netwerkprog.game.client.game.map.GameTile;
+import netwerkprog.game.util.application.Timer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,6 +21,8 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
     protected TextureRegion textureRegion;
     protected int health;
     protected List<GameTile> allowedToMove;
+    protected boolean damageAnimation = false;
+    protected Timer hitAnimationTimer;
 
     public GameCharacter(String name, Faction faction, TextureRegion textureRegion, Ability... abilities) {
         super();
@@ -29,6 +33,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
         this.textureRegion = textureRegion;
         this.health = 100;
         this.allowedToMove = new ArrayList<>();
+        this.hitAnimationTimer = new Timer(5000);
     }
 
     public String getName() {
@@ -58,7 +63,9 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
 
     public void damage(int amount) {
         this.health -= amount;
-        if (this.health < 0) this. health = 0;
+        if (this.health < 0) this.health = 0;
+        this.damageAnimation = true;
+        this.hitAnimationTimer.start();
         System.out.println("OUCH character " + name + " was damaged for " + amount);
     }
 
@@ -90,6 +97,18 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
                 Objects.equals(abilities, character.abilities);
     }
 
+    public void update(double deltaTime) {
+        this.hitAnimationTimer.update(deltaTime);
+
+//        if (this.isShowingAnimation()) {
+//            System.out.println("showing");
+            if (this.hitAnimationTimer.timeout()) {
+                System.out.println("timout");
+                this.damageAnimation = false;
+                this.hitAnimationTimer.stop();
+            }
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(name, faction, abilities, override);
@@ -121,4 +140,12 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
     public Faction getFaction() {
         return faction;
     }
+
+    public boolean isShowingAnimation() {
+        return this.damageAnimation;
+    }
+
+    public void setShowingDamageAnimation(boolean damageAnimation) {
+        this.damageAnimation = damageAnimation;
+    }
 }