From 9afb37f20075d2284b64e5ca9a6f2d10928880d3 Mon Sep 17 00:00:00 2001
From: Fabian <balbo@life-of-german.org>
Date: Thu, 29 Apr 2021 19:37:13 +0200
Subject: [PATCH] zum testen: gangwar

---
 ReallifeGamemode.Client/util/Gangwar.ts    | 2 +-
 ReallifeGamemode.Server/Gangwar/Gangwar.cs | 1 +
 ReallifeGamemode.Server/Gangwar/Turf.cs    | 6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts
index 3fdc949c..a7b94ac8 100644
--- a/ReallifeGamemode.Client/util/Gangwar.ts
+++ b/ReallifeGamemode.Client/util/Gangwar.ts
@@ -629,7 +629,7 @@
     });
 
     mp.events.add("gangWarKillNotification", (deathPlayername) => {
-        mp.events.call("BN_Show", "GANGWAR: Du hast ~r~" + deathPlayername + " ~w~getötet. Kills: " + ++gangwarKillCounter);
+        mp.events.call("BN_Show", "~y~GANGWAR~w~: Du hast ~r~" + deathPlayername + " ~w~getötet. Kills: " + ++gangwarKillCounter);
     });
     
     mp.events.add("resetKillcounter", () => {
diff --git a/ReallifeGamemode.Server/Gangwar/Gangwar.cs b/ReallifeGamemode.Server/Gangwar/Gangwar.cs
index c2252bef..326a4919 100644
--- a/ReallifeGamemode.Server/Gangwar/Gangwar.cs
+++ b/ReallifeGamemode.Server/Gangwar/Gangwar.cs
@@ -13,6 +13,7 @@ namespace ReallifeGamemode.Server.Gangwar
   {
     public static Turf[] _loadedTurfs;
     private static List<Turfs> turfs;
+    public const int GANGWAR_TOTAL_TIME = 90;
 
     public static void loadTurfs()
     {
diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs
index d7406dcf..3cd1d52b 100644
--- a/ReallifeGamemode.Server/Gangwar/Turf.cs
+++ b/ReallifeGamemode.Server/Gangwar/Turf.cs
@@ -31,8 +31,6 @@ namespace ReallifeGamemode.Server.Gangwar
     public Player[] playerInGangwar { get; set; }
     public int timerCount;
 
-    private const int GANGWAR_TOTAL_TIME = 30;
-
     public Turf(int TurfID, string TurfName, int color, string Owner, int value, int maxValue, bool surplus)
     {
       this.TurfID = TurfID;
@@ -144,7 +142,7 @@ namespace ReallifeGamemode.Server.Gangwar
             continue;
           }
 
-          gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, GANGWAR_TOTAL_TIME - timerCount);
+          gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, Gangwar.GANGWAR_TOTAL_TIME - timerCount);
         }
         /*if (this.Att_Score >= 200)
         {
@@ -155,7 +153,7 @@ namespace ReallifeGamemode.Server.Gangwar
           this.takeOver(this.Owner);
         }*/
         timerCount += 1;
-        if (timerCount >= GANGWAR_TOTAL_TIME)
+        if (timerCount >= Gangwar.GANGWAR_TOTAL_TIME)
         {
           if (this.Att_Score > this.Def_Score)
           {