diff --git a/ReallifeGamemode.Client/Player/weaponlist.ts b/ReallifeGamemode.Client/Player/weaponlist.ts
index 3e31319d..cea64a5c 100644
--- a/ReallifeGamemode.Client/Player/weaponlist.ts
+++ b/ReallifeGamemode.Client/Player/weaponlist.ts
@@ -26,16 +26,17 @@ export default function weaponList(globalData: GlobalData) {
var secondaries;
var melees;
var specialsWep;
-
+ var time;
var primary = "";
var secondary = "";
var melee = "";
var specialWep = "";
+ var timer = "";
//Weapon Menu
- mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr) => {
+ mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr, jsonTime) => {
if (!globalData.InMenu) {
globalData.InMenu = true;
@@ -44,13 +45,19 @@ export default function weaponList(globalData: GlobalData) {
secondaries = secondariesArr;
melees = meleesArr;
specialsWep = specialsArr;
+ time = JSON.parse(jsonTime);
- weaponMenu = new Menu("Waffenschrank", "Stelle deine Waffen Ausrüstung zusammen", new Point(50, 50), null, null);
+ let dealItem = new UIMenuListItem("Waffentransport", "", new ItemsCollection(time));
+ dealItem.BackColor = new Color(204, 170, 0);
+ dealItem.HighlightedBackColor = new Color(255, 213, 0);
- weaponMenu.AddItem(new UIMenuListItem("Primäre", "", new ItemsCollection(primaries)));
- weaponMenu.AddItem(new UIMenuListItem("Sekundäre", "", new ItemsCollection(secondaries)));
+ weaponMenu = new Menu("Waffenschrank", "Stelle deine Waffenausrüstung zusammen", new Point(50, 50), null, null);
+
+ weaponMenu.AddItem(new UIMenuListItem("Primäre", "", new ItemsCollection(secondaries)));
+ weaponMenu.AddItem(new UIMenuListItem("Sekundäre", "", new ItemsCollection(primaries)));
weaponMenu.AddItem(new UIMenuListItem("Nahkampf", "", new ItemsCollection(melees)));
weaponMenu.AddItem(new UIMenuListItem("Spezial", "", new ItemsCollection(specialsWep)));
+ weaponMenu.AddItem(dealItem);
weaponMenu.AddItem(saveItem);
weaponMenu.AddItem(cancelItem);
weaponMenu.Visible = true;
@@ -96,6 +103,10 @@ export default function weaponList(globalData: GlobalData) {
} else if (item.Text === "Abbrechen") {
weaponMenu.Close();
globalData.InMenu = false;
+ } else if (item.Text === "Waffentransport") {
+ mp.events.callRemote("startWeaponDeal");
+ weaponMenu.Close();
+ globalData.InMenu = false;
}
});
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/11.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/11.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/11.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/15.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/15.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/15.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/16.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/16.svg
new file mode 100644
index 00000000..05c8e207
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/16.svg
@@ -0,0 +1,36 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/inventory.html b/ReallifeGamemode.Client/assets/html/inventory/inventory.html
index 5243a9ff..d60564c4 100644
--- a/ReallifeGamemode.Client/assets/html/inventory/inventory.html
+++ b/ReallifeGamemode.Client/assets/html/inventory/inventory.html
@@ -14,7 +14,7 @@
- 
+ 
@@ -109,6 +109,12 @@
}
}
+ function getVehicle() {
+ if (vehInv.length > 0) {
+ switchSite('vehClass');
+ }
+ }
+
$("#tf_acceptTrade").unbind('click').click(function () {
if (anfrageInv.length > 0) {
mp.trigger("CEF:acceptTrade");
diff --git a/ReallifeGamemode.Client/assets/js/login/script.js b/ReallifeGamemode.Client/assets/js/login/script.js
index d404c304..4cd8a82a 100644
--- a/ReallifeGamemode.Client/assets/js/login/script.js
+++ b/ReallifeGamemode.Client/assets/js/login/script.js
@@ -2,6 +2,7 @@
var errorShown = false;
+
$(document).ready(_ => {
mp.trigger("CEF:Login_RequestPlayerName");
diff --git a/ReallifeGamemode.Client/util/checkpoint.ts b/ReallifeGamemode.Client/util/checkpoint.ts
index 3f53208a..7990ed54 100644
--- a/ReallifeGamemode.Client/util/checkpoint.ts
+++ b/ReallifeGamemode.Client/util/checkpoint.ts
@@ -23,7 +23,8 @@ export default function checkpointHandle(globalData: GlobalData) {
delayCounter = 0;
checkPointsDone = checkPointID;
event = nEvent;
- activeCheckpoint = mp.markers.new(markerID, posCp, 3.0, {
+ let vectorCP = new mp.Vector3(posCp.x, posCp.y, posCp.z - 2)
+ activeCheckpoint = mp.markers.new(markerID, vectorCP, 4.0, {
color: [255, 0, 0, 150],
visible: true,
dimension: 0
@@ -42,14 +43,14 @@ export default function checkpointHandle(globalData: GlobalData) {
if (!inCheckpoint) {
if (delay != 0) {
- mp.gui.chat.push("Warte nun " + delay / 1000 + " Sekunden");
+ mp.gui.chat.push("Warte nun " + delay / 1000 + " Sekunden.");
}
mp.game.audio.playSoundFrontend(1, "Beep_Red", "DLC_HEIST_HACKING_SNAKE_SOUNDS", true);
}
inCheckpoint = true;
if (delayCounter >= delay) {
- activeCheckpoint.visible = false;
+ activeCheckpoint.destroy();
clearInterval(myVar);
mp.events.callRemote("playerInCheckpoint");
if (event != "") {
@@ -66,4 +67,9 @@ export default function checkpointHandle(globalData: GlobalData) {
delayCounter = 0;
}
}
+
+ mp.events.add('destroyCP', () => {
+ activeCheckpoint.destroy();
+ clearInterval(myVar);
+ });
}
\ No newline at end of file
diff --git a/ReallifeGamemode.Database/Entities/Faction.cs b/ReallifeGamemode.Database/Entities/Faction.cs
index 2c5ec266..feefe621 100644
--- a/ReallifeGamemode.Database/Entities/Faction.cs
+++ b/ReallifeGamemode.Database/Entities/Faction.cs
@@ -20,6 +20,7 @@ namespace ReallifeGamemode.Database.Entities
[StringLength(32)]
public string Name { get; set; }
public bool StateOwned { get; set; }
+ public int WeaponDealTime { get; set; } = 60;
public IBankAccount GetBankAccount(DatabaseContext databaseContext = null)
{
diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs
index f240ef4d..2829f54e 100644
--- a/ReallifeGamemode.Database/Entities/User.cs
+++ b/ReallifeGamemode.Database/Entities/User.cs
@@ -88,7 +88,7 @@ namespace ReallifeGamemode.Database.Entities
public int JailTime { get; set; }
- public int PaydayTimer { get; set; }
+ public int PaydayTimer { get; set; } = 60;
public bool IsAdmin(AdminLevel level) => AdminLevel >= level;
diff --git a/ReallifeGamemode.Database/Migrations/20190922163450_WeaponDealTimer.Designer.cs b/ReallifeGamemode.Database/Migrations/20190922163450_WeaponDealTimer.Designer.cs
new file mode 100644
index 00000000..1658ef6c
--- /dev/null
+++ b/ReallifeGamemode.Database/Migrations/20190922163450_WeaponDealTimer.Designer.cs
@@ -0,0 +1,1312 @@
+// 