[+] Add Duty Points and Weapon Points for various Factions
Fixed minor stuff
This commit is contained in:
@@ -62,7 +62,6 @@ export default function weaponList(globalData: GlobalData) {
|
|||||||
primary = "";
|
primary = "";
|
||||||
} else {
|
} else {
|
||||||
primary = String(item.SelectedItem.DisplayText);
|
primary = String(item.SelectedItem.DisplayText);
|
||||||
mp.events.callRemote("updateWeaponSelection", primary, 1);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "Sekundäre":
|
case "Sekundäre":
|
||||||
@@ -70,7 +69,6 @@ export default function weaponList(globalData: GlobalData) {
|
|||||||
secondary = "";
|
secondary = "";
|
||||||
} else {
|
} else {
|
||||||
secondary = String(item.SelectedItem.DisplayText);
|
secondary = String(item.SelectedItem.DisplayText);
|
||||||
mp.events.callRemote("updateWeaponSelection", secondary, 2);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "Nahkampf":
|
case "Nahkampf":
|
||||||
@@ -78,7 +76,6 @@ export default function weaponList(globalData: GlobalData) {
|
|||||||
melee = "";
|
melee = "";
|
||||||
} else {
|
} else {
|
||||||
melee = String(item.SelectedItem.DisplayText);
|
melee = String(item.SelectedItem.DisplayText);
|
||||||
mp.events.callRemote("updateWeaponSelection", melee, 3);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "Spezial":
|
case "Spezial":
|
||||||
@@ -86,7 +83,6 @@ export default function weaponList(globalData: GlobalData) {
|
|||||||
specialWep = "";
|
specialWep = "";
|
||||||
} else {
|
} else {
|
||||||
specialWep = String(item.SelectedItem.DisplayText);
|
specialWep = String(item.SelectedItem.DisplayText);
|
||||||
mp.events.callRemote("updateWeaponSelection", specialWep, 4);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ namespace ReallifeGamemode.Server.Events
|
|||||||
player.SendNotification("Du bist nun ~r~außer Dienst.");
|
player.SendNotification("Du bist nun ~r~außer Dienst.");
|
||||||
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
|
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
|
||||||
player.NametagColor = new Color(255, 255, 255);
|
player.NametagColor = new Color(255, 255, 255);
|
||||||
player.SetSharedData("blipColor", 4);
|
player.SetSharedData("blipColor", 0);
|
||||||
UpdateCharacterCloth.LoadCharacterDefaults(player);
|
UpdateCharacterCloth.LoadCharacterDefaults(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -259,7 +259,6 @@ namespace ReallifeGamemode.Server.Events
|
|||||||
foreach (Client target in NAPI.Pools.GetAllPlayers())
|
foreach (Client target in NAPI.Pools.GetAllPlayers())
|
||||||
{
|
{
|
||||||
User c = target.GetUser();
|
User c = target.GetUser();
|
||||||
|
|
||||||
if (c.JailTime > 0)
|
if (c.JailTime > 0)
|
||||||
{
|
{
|
||||||
criminals.Add(c.Name);
|
criminals.Add(c.Name);
|
||||||
@@ -324,7 +323,6 @@ namespace ReallifeGamemode.Server.Events
|
|||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (cloth.SlotId)
|
switch (cloth.SlotId)
|
||||||
{
|
{
|
||||||
case 11:
|
case 11:
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ namespace ReallifeGamemode.Server.Events
|
|||||||
{
|
{
|
||||||
client.RemoveAllWeapons();
|
client.RemoveAllWeapons();
|
||||||
client.GiveWeapon(weaponHash, 0);
|
client.GiveWeapon(weaponHash, 0);
|
||||||
|
|
||||||
}
|
}
|
||||||
if (slot == 2)
|
if (slot == 2)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -123,7 +123,6 @@ namespace ReallifeGamemode.Server.Extensions
|
|||||||
ChatService.SendMessage(copPlayer, "~r~HQ: Der Straftäter: " + user.Name + " wird nun mit Fahndungslevel " + newWanteds + " gesucht.");
|
ChatService.SendMessage(copPlayer, "~r~HQ: Der Straftäter: " + user.Name + " wird nun mit Fahndungslevel " + newWanteds + " gesucht.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
public static FactionRank GetFactionRank(this User user)
|
public static FactionRank GetFactionRank(this User user)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -27,8 +27,19 @@ namespace ReallifeGamemode.Server.Managers
|
|||||||
Position = new Vector3(458.24, -990.86, 30.68),
|
Position = new Vector3(458.24, -990.86, 30.68),
|
||||||
FactionId = 1
|
FactionId = 1
|
||||||
};
|
};
|
||||||
|
DutyPoint dutyPointFIB = new DutyPoint()
|
||||||
|
{
|
||||||
|
Position = new Vector3(109.5706, -745.2126, 242.1521),
|
||||||
|
FactionId = 1
|
||||||
|
};
|
||||||
|
DutyPoint dutyPointLSED = new DutyPoint()
|
||||||
|
{
|
||||||
|
Position = new Vector3(1152.181, -1527.95, 34.8434),
|
||||||
|
FactionId = 1
|
||||||
|
};
|
||||||
|
|
||||||
DutyPoints.Add(dutyPointLSPD);
|
DutyPoints.Add(dutyPointLSPD);
|
||||||
|
DutyPoints.Add(dutyPointFIB);
|
||||||
|
|
||||||
foreach (DutyPoint d in DutyPoints)
|
foreach (DutyPoint d in DutyPoints)
|
||||||
{
|
{
|
||||||
@@ -43,8 +54,26 @@ namespace ReallifeGamemode.Server.Managers
|
|||||||
Position = new Vector3(460.3162,-981.0168,30.68959),
|
Position = new Vector3(460.3162,-981.0168,30.68959),
|
||||||
FactionId = 1
|
FactionId = 1
|
||||||
};
|
};
|
||||||
|
WeaponPoint weaponPointFIB = new WeaponPoint()
|
||||||
|
{
|
||||||
|
Position = new Vector3(119.6835, -729.3273, 242.1519),
|
||||||
|
FactionId = 1
|
||||||
|
};
|
||||||
|
WeaponPoint weaponPointBallas = new WeaponPoint()
|
||||||
|
{
|
||||||
|
Position = new Vector3(1266.622, -1714.637, 54.65503),
|
||||||
|
FactionId = 8
|
||||||
|
};
|
||||||
|
WeaponPoint weaponPointGrove = new WeaponPoint()
|
||||||
|
{
|
||||||
|
Position = new Vector3(129.8998, -1938.709, 20.61865),
|
||||||
|
FactionId = 7
|
||||||
|
};
|
||||||
|
|
||||||
WeaponPoints.Add(weaponPointLSPD);
|
WeaponPoints.Add(weaponPointLSPD);
|
||||||
|
WeaponPoints.Add(weaponPointFIB);
|
||||||
|
WeaponPoints.Add(weaponPointBallas);
|
||||||
|
WeaponPoints.Add(weaponPointGrove);
|
||||||
|
|
||||||
foreach (WeaponPoint w in WeaponPoints)
|
foreach (WeaponPoint w in WeaponPoints)
|
||||||
{
|
{
|
||||||
@@ -68,7 +97,6 @@ namespace ReallifeGamemode.Server.Managers
|
|||||||
NAPI.TextLabel.CreateTextLabel("Gefängnis PC - Dr\u00fccke ~y~E", j.Position, 7, 1, 0, new Color(255, 255, 255), false, 0);
|
NAPI.TextLabel.CreateTextLabel("Gefängnis PC - Dr\u00fccke ~y~E", j.Position, 7, 1, 0, new Color(255, 255, 255), false, 0);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace ReallifeGamemode.Server.Wanted
|
|||||||
User user = client.GetUser();
|
User user = client.GetUser();
|
||||||
if (user.JailTime > 0)
|
if (user.JailTime > 0)
|
||||||
{
|
{
|
||||||
client.SetSharedData("blipColor", 4);
|
client.SetSharedData("blipColor", 0);
|
||||||
client.RemoveAllWeapons();
|
client.RemoveAllWeapons();
|
||||||
client.Health = 100;
|
client.Health = 100;
|
||||||
client.Armor = 0;
|
client.Armor = 0;
|
||||||
@@ -61,6 +61,7 @@ namespace ReallifeGamemode.Server.Wanted
|
|||||||
}
|
}
|
||||||
client.SetData("isDead", false);
|
client.SetData("isDead", false);
|
||||||
client.RemoveAllWeapons();
|
client.RemoveAllWeapons();
|
||||||
|
client.SetSharedData("blipColor", 0);
|
||||||
Random rnd = new Random();
|
Random rnd = new Random();
|
||||||
int rndInt = rnd.Next(1, 3);
|
int rndInt = rnd.Next(1, 3);
|
||||||
if (rndInt == 1)
|
if (rndInt == 1)
|
||||||
|
|||||||
Reference in New Issue
Block a user