aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
michael.reiswich
2021-03-30 22:43:03 +02:00
parent b267c820ea a6be7e8365
commit 522ae784cd
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Timers;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
@@ -113,6 +114,20 @@ namespace ReallifeGamemode.Server.Gangwar
this.timerCount = 0;
}
private void reloadGangTurfs()
{
var t = Task.Factory.StartNew(() =>
{
ChatService.Broadcast("DEBUG: reloadGangTurfs(...)");
Task.Delay(10000).Wait();
Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllPlayers();
ChatService.Broadcast("DEBUG: reloadGangTurfs()...10 Sekunden um");
});
t.Wait();
}
private void Tick(object sender, System.Timers.ElapsedEventArgs e)
{
if (this.status == "attack")
@@ -152,18 +167,18 @@ namespace ReallifeGamemode.Server.Gangwar
foreach (Player gangwarPlayer in this.playerInGangwar)
{
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 100 - timerCount);
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 40 - timerCount);
}
if (this.Att_Score >= 200)
/*if (this.Att_Score >= 200)
{
this.takeOver(this.Attacker);
}
else if (this.Def_Score >= 200)
{
this.takeOver(this.Owner);
}
}*/
timerCount += 1;
if (timerCount >= 100) //change to 900 (seconds) before release for testing reasons change to whatever you like
if (timerCount >= 40) //change to 900 (seconds) before release for testing reasons change to whatever you like
{
if (this.Att_Score > this.Def_Score)
{
@@ -288,6 +303,7 @@ namespace ReallifeGamemode.Server.Gangwar
NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:Turf_Conquered", JsonConvert.SerializeObject(this.TurfID), JsonConvert.SerializeObject(this.status), JsonConvert.SerializeObject(this.Owner));
Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllPlayers();
reloadGangTurfs();
}
public void attack(string attacker)