diff --git a/ReallifeGamemode.Client/Gui/handmoney.ts b/ReallifeGamemode.Client/Gui/handmoney.ts index 19aad47e..27cc1df5 100644 --- a/ReallifeGamemode.Client/Gui/handmoney.ts +++ b/ReallifeGamemode.Client/Gui/handmoney.ts @@ -45,7 +45,8 @@ export default function handMoney(globalData: IGlobalData) { if (showMoneyChange <= 70) { alpha = (showMoneyChange * (255 / 70)) | 0; } - mp.game.graphics.drawText("-$" + moneyFormat(Math.abs(difference)), [0.95, 0.145], { + var differenceText = moneyFormat(Math.abs(difference)); + mp.game.graphics.drawText("-$" + differenceText, [0.95, 0.145], { font: 7, color: [255, 0, 45, alpha], scale: [0.65, 0.65], @@ -58,7 +59,8 @@ export default function handMoney(globalData: IGlobalData) { if (showMoneyChange <= 70) { alpha = (showMoneyChange * (255 / 70)) | 0; } - mp.game.graphics.drawText("+$" + moneyFormat(Math.abs(difference)), [0.95, 0.145], { + var differenceText = moneyFormat(Math.abs(difference)); + mp.game.graphics.drawText("+$" + differenceText, [0.95, 0.145], { font: 7, color: [115, 186, 131, alpha], scale: [0.65, 0.65], diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/1.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/1.svg index 87b7a0fe..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/1.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/1.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/10.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/10.svg index 31a49d7f..05c8e207 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/10.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/10.svg @@ -1,91 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg deleted file mode 100644 index 9a66c011..00000000 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 deleted file mode 100644 index 9a66c011..00000000 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 deleted file mode 100644 index 9a66c011..00000000 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 deleted file mode 100644 index 9a66c011..00000000 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/15.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 deleted file mode 100644 index 05c8e207..00000000 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/16.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/2.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/2.svg index f890542f..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/2.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/2.svg @@ -1,101 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/21.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/21.svg new file mode 100644 index 00000000..ca82ce1c --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/21.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/22.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/22.svg new file mode 100644 index 00000000..49bc5b0b --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/22.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/23.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/23.svg new file mode 100644 index 00000000..96c1111f --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/23.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/24.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/24.svg new file mode 100644 index 00000000..1682255c --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/24.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/25.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/25.svg new file mode 100644 index 00000000..31a49d7f --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/25.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/26.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/26.svg new file mode 100644 index 00000000..596bb760 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/26.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/27.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/27.svg new file mode 100644 index 00000000..f890542f --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/27.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/3.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/3.svg index b8e9aea0..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/3.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/3.svg @@ -1,56 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/30.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/30.svg new file mode 100644 index 00000000..92a41b9c --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/30.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/31.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/31.svg new file mode 100644 index 00000000..b8e9aea0 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/31.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/32.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/32.svg new file mode 100644 index 00000000..87b7a0fe --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/32.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/4.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/4.svg index 92a41b9c..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/4.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/4.svg @@ -1,36 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/5.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/5.svg index 96c1111f..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/5.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/5.svg @@ -1,88 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/6.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/6.svg index ca82ce1c..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/6.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/6.svg @@ -1,52 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/7.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/7.svg index 49bc5b0b..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/7.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/7.svg @@ -1,82 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/8.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/8.svg index 1682255c..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/8.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/8.svg @@ -1,70 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/9.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/9.svg index 596bb760..9a66c011 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/9.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/9.svg @@ -1,60 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 0cbc96db..0c25dbf4 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -385,7 +385,7 @@ namespace ReallifeGamemode.Server.Events } weapon.Ammount += item.Amount; - ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefürgt."); + ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt."); unloadedWeaponPackage = true; context.Remove(item); } diff --git a/ReallifeGamemode.Server/Inventory/Items/Aal.cs b/ReallifeGamemode.Server/Inventory/Items/Aal.cs index ac1ec0e3..40855cb9 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Aal.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Aal.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Aal : DropItem { - public override int Id => 6; + public override int Id => 21; public override string Name => "Aal"; public override string Description => "Ein Fisch"; public override int Gewicht => 3600; diff --git a/ReallifeGamemode.Server/Inventory/Items/Barsch.cs b/ReallifeGamemode.Server/Inventory/Items/Barsch.cs index 4dbfef66..2ba5ffc5 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Barsch.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Barsch.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Barsch : DropItem { - public override int Id => 7; + public override int Id => 22; public override string Name => "Barsch"; public override string Description => "Ein Fisch"; public override int Gewicht => 2600; diff --git a/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs b/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs index 60f7c53b..4ff04a7c 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs @@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Cannabis : IDroppableItem { - public int Id => 4; + public int Id => 30; public string Name => "Grünes Gift"; public string Description => "puff puff and pass"; public int Gewicht => 50; diff --git a/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs b/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs index c3ddff6d..dbe3503f 100644 --- a/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs +++ b/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class CarbineRifle : WeaponDealItem { - public override int Id => 13; + public override int Id => 6; public override string Name => "CarbineRifle"; public override string Description => "Waffe"; public override int Gewicht => 4000; diff --git a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs index 75e83ab7..c4860730 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs @@ -8,8 +8,8 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Cheeseburger : FoodItem { - public override int Id => 2; - public override string Name => "Hamburger"; + public override int Id => 27; + public override string Name => "Cheeseburger"; public override string Description => "Ein Burger"; public override int Gewicht => 300; public override string Einheit => "g"; diff --git a/ReallifeGamemode.Server/Inventory/Items/Cocain.cs b/ReallifeGamemode.Server/Inventory/Items/Cocain.cs index 4bb35ab0..e5820c37 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cocain.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cocain.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Cocain : FoodItem { - public override int Id => 3; + public override int Id => 31; public override string Name => "Kosks"; public override string Description => "Rave"; public override int Gewicht => 50; diff --git a/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs b/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs new file mode 100644 index 00000000..3d04cdc5 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Combatpstiol : WeaponDealItem + { + public override int Id => 4; + public override string Name => "Combatpistol"; + public override string Description => "Waffe"; + public override int Gewicht => 1180; + public override string Einheit => "g"; + public override uint Object => 3666746839; //3061944032 + public override int Price => 0; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs b/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs new file mode 100644 index 00000000..43faf49f --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Compactrifle : WeaponDealItem + { + public override int Id => 7; + public override string Name => "CompactRifle"; + public override string Description => "Waffe"; + public override int Gewicht => 3080; + public override string Einheit => "g"; + public override uint Object => 3666746839; //3061944032 + public override int Price => 0; + } +} + diff --git a/ReallifeGamemode.Server/Inventory/Items/Flunder.cs b/ReallifeGamemode.Server/Inventory/Items/Flunder.cs index caea9851..b708bef6 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Flunder.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Flunder.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Flunder : DropItem { - public override int Id => 5; + public override int Id => 23; public override string Name => "Flunder"; public override string Description => "Ein Fisch"; public override int Gewicht => 7700; diff --git a/ReallifeGamemode.Server/Inventory/Items/Holz.cs b/ReallifeGamemode.Server/Inventory/Items/Holz.cs index 0336e6db..a3fd3361 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Holz.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Holz.cs @@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Holz : IDroppableItem { - public int Id => 1; + public int Id => 32; public string Name => "Holz"; public string Description => "Ich und mein Holz."; public int Gewicht => 650; diff --git a/ReallifeGamemode.Server/Inventory/Items/Lachs.cs b/ReallifeGamemode.Server/Inventory/Items/Lachs.cs index c2e7daa9..bb808651 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Lachs.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Lachs.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Lachs : DropItem { - public override int Id => 8; + public override int Id => 24; public override string Name => "Lachs"; public override string Description => "Du Lachs"; public override int Gewicht => 4200; diff --git a/ReallifeGamemode.Server/Inventory/Items/Pistol.cs b/ReallifeGamemode.Server/Inventory/Items/Pistol.cs new file mode 100644 index 00000000..03072cdf --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Pistol.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Pistol : WeaponDealItem + { + public override int Id => 1; + public override string Name => "Pistol"; + public override string Description => "Waffe"; + public override int Gewicht => 1180; + public override string Einheit => "g"; + public override uint Object => 3666746839; //3061944032 + public override int Price => 0; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Pistol50.cs b/ReallifeGamemode.Server/Inventory/Items/Pistol50.cs index 6369cdf6..cfe9a85c 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Pistol50.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Pistol50.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Pistol50 : WeaponDealItem { - public override int Id => 11; + public override int Id => 2; public override string Name => "Pistol50"; public override string Description => "Waffe"; public override int Gewicht => 1180; diff --git a/ReallifeGamemode.Server/Inventory/Items/Pistolmk2.cs b/ReallifeGamemode.Server/Inventory/Items/Pistolmk2.cs new file mode 100644 index 00000000..078a8527 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Pistolmk2.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Pistolmk2 : WeaponDealItem + { + public override int Id => 3; + public override string Name => "Pistol_MK2"; + public override string Description => "Waffe"; + public override int Gewicht => 1180; + public override string Einheit => "g"; + public override uint Object => 3666746839; //3061944032 + public override int Price => 0; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/PumpShotgun.cs b/ReallifeGamemode.Server/Inventory/Items/PumpShotgun.cs index c873c0e5..9e241c4d 100644 --- a/ReallifeGamemode.Server/Inventory/Items/PumpShotgun.cs +++ b/ReallifeGamemode.Server/Inventory/Items/PumpShotgun.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class PumpShotgun : WeaponDealItem { - public override int Id => 14; + public override int Id => 9; public override string Name => "PumpShotgun"; public override string Description => "Waffe"; public override int Gewicht => 3600; diff --git a/ReallifeGamemode.Server/Inventory/Items/SMG.cs b/ReallifeGamemode.Server/Inventory/Items/SMG.cs index 4f2d965b..f2efad29 100644 --- a/ReallifeGamemode.Server/Inventory/Items/SMG.cs +++ b/ReallifeGamemode.Server/Inventory/Items/SMG.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class SMG : WeaponDealItem { - public override int Id => 12; + public override int Id => 5; public override string Name => "SMG"; public override string Description => "Waffe"; public override int Gewicht => 3080; diff --git a/ReallifeGamemode.Server/Inventory/Items/Schutzweste.cs b/ReallifeGamemode.Server/Inventory/Items/Schutzweste.cs index d15ea31a..d51c8d2b 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Schutzweste.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Schutzweste.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Schutzweste : WeaponDealItem { - public override int Id => 16; + public override int Id => 10; public override string Name => "Schutzweste"; public override string Description => "Waffe"; public override int Gewicht => 3000; diff --git a/ReallifeGamemode.Server/Inventory/Items/SniperRifle.cs b/ReallifeGamemode.Server/Inventory/Items/SniperRifle.cs index 050865ae..f9c3739d 100644 --- a/ReallifeGamemode.Server/Inventory/Items/SniperRifle.cs +++ b/ReallifeGamemode.Server/Inventory/Items/SniperRifle.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class SniperRifle : WeaponDealItem { - public override int Id => 15; + public override int Id => 8; public override string Name => "SniperRifle"; public override string Description => "Waffe"; public override int Gewicht => 12900; diff --git a/ReallifeGamemode.Server/Inventory/Items/Stungun.cs b/ReallifeGamemode.Server/Inventory/Items/Stungun.cs new file mode 100644 index 00000000..ed199a66 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Stungun.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Stungun : WeaponDealItem + { + public override int Id => 11; + public override string Name => "Stungun"; + public override string Description => "Waffe"; + public override int Gewicht => 1180; + public override string Einheit => "g"; + public override uint Object => 3666746839; //3061944032 + public override int Price => 0; + + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs b/ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs index fd2c4e2f..229a46f1 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Thunfisch : DropItem { - public override int Id => 9; + public override int Id => 25; public override string Name => "Thunfisch"; public override string Description => "Ein Fisch"; public override int Gewicht => 11000; diff --git a/ReallifeGamemode.Server/Inventory/Items/Zander.cs b/ReallifeGamemode.Server/Inventory/Items/Zander.cs index 2e24b879..2ed0ad82 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Zander.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Zander.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Zander : DropItem { - public override int Id => 10; + public override int Id => 26; public override string Name => "Zander"; public override string Description => "Ein Fisch"; public override int Gewicht => 5000; diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index 282a464d..5ea63e0e 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -49,9 +49,10 @@ namespace ReallifeGamemode.Server.WeaponDeal ChatService.ErrorMessage(client, "Der Transporter ist zu weit entfernt"); return; } + WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1; Vector3 vector; - vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value); + vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value); if (vector == new Vector3()) return; fVeh.SetData("weaponDealPoint", vector); @@ -101,8 +102,15 @@ namespace ReallifeGamemode.Server.WeaponDeal fVeh.SetData("weaponDeal", true); InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault(); + + if (fac.Id == 1 | fac.Id == 3) + { + fac.WeaponDealTime = 180; + context.SaveChanges(); + }else { fac.WeaponDealTime = 60; context.SaveChanges(); + } } else { @@ -170,14 +178,39 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); int oMembers = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count(); - if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7)) - { - VehicleItem item = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //pistole + if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7)){ + VehicleItem item = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //pistol50 InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); - VehicleItem item3 = new VehicleItem() { ItemId = 14, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Pumpe + VehicleItem item3 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //PumpShotgun InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount); - VehicleItem item2 = new VehicleItem() { ItemId = 16, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Schutzweste + VehicleItem item2 = new VehicleItem() { ItemId = 10, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Schutzweste InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount); + }else if(factionVehicle.GetOwners().Contains(1)) { + VehicleItem item = new VehicleItem() { ItemId = 1, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //pistol + InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); + VehicleItem item2 = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Pistol50 + InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount); + VehicleItem item3 = new VehicleItem() { ItemId = 5, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //SMG + InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount); + VehicleItem item4 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //PumpShotgun + InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount); + VehicleItem item5 = new VehicleItem() { ItemId = 10, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Schutzweste + InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount); + VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Stungun + InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount); + }else if (factionVehicle.GetOwners().Contains(3)) { + VehicleItem item = new VehicleItem() { ItemId = 3, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //pistol_mk2 + InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); + VehicleItem item2 = new VehicleItem() { ItemId = 4, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Combatpistol + InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount); + VehicleItem item3 = new VehicleItem() { ItemId = 6, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Carbinrifle + InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount); + VehicleItem item4 = new VehicleItem() { ItemId = 8, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Sniperrifle + InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount); + VehicleItem item5 = new VehicleItem() { ItemId = 10, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Schutzweste + InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount); + VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Stungun + InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount); } } } diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs index 19e4bcea..013aa8bc 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs @@ -20,17 +20,39 @@ namespace ReallifeGamemode.Server.WeaponDeal new Vector3(-1889.91, 2045.6, 138.68) }.AsReadOnly(); + public static readonly IReadOnlyCollection StaatsFrakWT_Route = new List + { + + new Vector3(3627.138, 3759.711, 28.515) + + }.AsReadOnly(); + public static Vector3 getRndWD_Route(int factionID) { if (!factionWeaponDeal.ContainsKey(factionID)) return new Vector3(); - if (factionWeaponDeal[factionID] == -1) + if(factionID == 1 | factionID == 3) + { + Random rnd = new Random(); + factionWeaponDeal[factionID] = rnd.Next(0, StaatsFrakWT_Route.Count - 1); + return StaatsFrakWT_Route.ElementAt(factionWeaponDeal[factionID]); + } + else + { + Random rnd = new Random(); + factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1); + return WT_Route.ElementAt(factionWeaponDeal[factionID]); + } + + /* if (factionWeaponDeal[factionID] == -1) { Random rnd = new Random(); factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1); } return WT_Route.ElementAt(factionWeaponDeal[factionID]); + + */ } } }