diff --git a/ReallifeGamemode.Client/Gui/deathscreen.ts b/ReallifeGamemode.Client/Gui/deathscreen.ts
index f5f4de52..375f989a 100644
--- a/ReallifeGamemode.Client/Gui/deathscreen.ts
+++ b/ReallifeGamemode.Client/Gui/deathscreen.ts
@@ -18,7 +18,7 @@ export default function deathScreen() {
var fade;
var deathDate: Date;
var taskTimeout = false;
- const maxDeathTime = 30;
+ const maxDeathTime = 120;
const medicJobTime = maxDeathTime * -1;
mp.game.gameplay.setFadeOutAfterDeath(false);
diff --git a/ReallifeGamemode.Client/assets/html/Introduction/Introduction.html b/ReallifeGamemode.Client/assets/html/Introduction/Introduction.html
index b0a76111..bff3aa9c 100644
--- a/ReallifeGamemode.Client/assets/html/Introduction/Introduction.html
+++ b/ReallifeGamemode.Client/assets/html/Introduction/Introduction.html
@@ -18,7 +18,11 @@
Willkommen auf Life of German
- In dieser Info findest du alles wichtige zum Thema Steuerung und Funktionen.
+ Was sind die ersten Schritte wirst du dich jetzt bestimmt fragen. Hier ein kleiner Guide.
+ 1. Mach deine Scheine (Führerschein, Flugschein, Waffenschein)
+ 2. Nimm einen Job in der Stadthalle an und verdien dir dein erstes Geld.
+ 3. Kauf dir ein eigenes Auto.
+ 4. Tritt einer Fraktion bei
Steuerung:
T - Chat öffnen
@@ -27,6 +31,8 @@
N - Fahrzeugmotor Starten
O - Onlineliste öffnen/schließen
I - Inventar öffnen/schließen
+ f4 - Mikrofon an und aus stellen
+ Mit /help kannst du dir jederzeit die Steuerung angucken. Und nun viel Spaß auf unseren Server.
diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts
index d0d49ff2..102908c0 100644
--- a/ReallifeGamemode.Client/util/Gangwar.ts
+++ b/ReallifeGamemode.Client/util/Gangwar.ts
@@ -499,9 +499,6 @@
z++
}
- mp.gui.chat.push("DEBUG: Turf blips not removed: " + x + " / " + n);
- mp.gui.chat.push("DEBUG: Attack blips not removed: " + y);
- mp.gui.chat.push("DEBUG: LeaderBlips blips not removed: " + z);
}
mp.events.add('GangAreas:Create', (turfsJSON) => {
diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts
index 32a0779d..1635c09b 100644
--- a/ReallifeGamemode.Client/util/weapondamage.ts
+++ b/ReallifeGamemode.Client/util/weapondamage.ts
@@ -91,7 +91,6 @@
mp.events.add("entityStreamIn", (entity) => {
if (entity.type === "player") {
- mp.gui.chat.push("headshot entity stream in" + entity.name);
entity.setSuffersCriticalHits(false);
}
});
diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index b081fd7f..1a99b053 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -144,7 +144,7 @@ namespace ReallifeGamemode.Server.Commands
#region ahelp
- [Command("ahelp", "~m~Benutzung: ~s~/ahelp")]
+ /* [Command("ahelp", "~m~Benutzung: ~s~/ahelp")]
public void CmdAdminHelp(Player player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? true)
@@ -170,7 +170,7 @@ namespace ReallifeGamemode.Server.Commands
}
}
}
-
+ */
#endregion ahelp
#region Mapping / Entwicklung
diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs
index e7fc06b7..3ed5bc5d 100644
--- a/ReallifeGamemode.Server/Commands/UserCommands.cs
+++ b/ReallifeGamemode.Server/Commands/UserCommands.cs
@@ -79,7 +79,12 @@ namespace ReallifeGamemode.Server.Commands
[Command("help", "~m~Benutzung: ~s~/help")]
public void CmdHelp(Player player)
{
- player.TriggerEvent("showUserhelp");
+ player.SendChatMessage("M - Interaktionsmenü öffnen und schließen");
+ player.SendChatMessage("X - Fahrzeug auf -/ abschließen sowie im Fahrzeuginteraktionsmenü öffnen");
+ player.SendChatMessage("N - Fahrzeugmotor Starten");
+ player.SendChatMessage("O - Onlineliste öffnen / schließen");
+ player.SendChatMessage("I - Inventar öffnen / schließen");
+ player.SendChatMessage("f4 - Mikrofon an/aus schalten");
}
[Command("hup")]
diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs
index 97850e87..3000d1ec 100644
--- a/ReallifeGamemode.Server/Gangwar/Turf.cs
+++ b/ReallifeGamemode.Server/Gangwar/Turf.cs
@@ -118,11 +118,9 @@ namespace ReallifeGamemode.Server.Gangwar
{
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();
@@ -167,7 +165,7 @@ namespace ReallifeGamemode.Server.Gangwar
foreach (Player gangwarPlayer in this.playerInGangwar)
{
- gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 40 - timerCount);
+ gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 900 - timerCount);
}
/*if (this.Att_Score >= 200)
{
@@ -178,7 +176,7 @@ namespace ReallifeGamemode.Server.Gangwar
this.takeOver(this.Owner);
}*/
timerCount += 1;
- if (timerCount >= 40) //change to 900 (seconds) before release for testing reasons change to whatever you like
+ if (timerCount >= 900) //change to 900 (seconds) before release for testing reasons change to whatever you like
{
if (this.Att_Score > this.Def_Score)
{
diff --git a/ReallifeGamemode.Server/Util/AttachmentSync.cs b/ReallifeGamemode.Server/Util/AttachmentSync.cs
index 40ae8e55..ef3fccf8 100644
--- a/ReallifeGamemode.Server/Util/AttachmentSync.cs
+++ b/ReallifeGamemode.Server/Util/AttachmentSync.cs
@@ -137,7 +137,7 @@ public class AttachmentSyncExample : Script
player.AddAttachment(Base36Extensions.FromBase36(hash), true);
}
- [Command("xdd")]
+ /* [Command("xdd")]
public void attachment(Player player)
{
Vehicle veh = player.Vehicle;
@@ -152,6 +152,7 @@ public class AttachmentSyncExample : Script
veh.ClearAttachments();
}
}
+ */
}