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

Miese Corona Zeiten push für Lenhardt

Browse Source
This commit is contained in:
Siga
2020-05-10 19:19:53 +02:00
parent 15e4cec8ee
commit efbff34c21
159 changed files with 8042 additions and 8695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Client/Interaction/elevator.ts
View File

@@ -19,19 +19,16 @@ cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function elevatorList(globalData: IGlobalData) {
var elevatorMenu: NativeUI.Menu;
var stages;
var stage = "";
//Weapon Menu
mp.events.add('showElevatorMenu', (stagesArr) => {
if (!globalData.InMenu) {
globalData.InMenu = true;
stages = JSON.parse(stagesArr);

48
ReallifeGamemode.Client/Jobs/RefuseCollector.ts
View File

@@ -1,9 +1,8 @@
export default function RefuseCollector() {
var State = false;
var Traegt = false;
var HintenVoll = false;
var MuellSack = null;
var BlipTonneHinten = null;
var CheckpointTonneHinten = null;
var ShapeTonneHinten = null;
@@ -17,8 +16,6 @@
var BlipTonne = [];
var ShapeTonne = [];
mp.events.add('SERVER:MuellmannStatusTrue', () => {
State = true;
});
@@ -28,13 +25,12 @@
});
mp.events.add('SERVER:MuellmannBCSErstellen', (jsonPosArr, veh) => {
let posArr = JSON.parse(jsonPosArr);
vehicle = veh;
for (var i = 0; i < posArr.length; i++) {
let pos = new mp.Vector3(posArr[i].x, posArr[i].y, posArr[i].z - 1)
BlipTonne.push(mp.blips.new(1, pos, { name: 'Müllmann', color: 45, shortRange: false }));
BlipTonne[i].setFlashes(true);
BlipTonne[i].setFlashTimer(2000);
ShapeTonne.push(mp.colshapes.newSphere(posArr[i].x, posArr[i].y, posArr[i].z + 0.5, 1.75));
}
@@ -43,7 +39,6 @@
ShapeTonneBase = mp.colshapes.newSphere(-535.1912, -1713.742, 19.23861 - 1, 10);
});
mp.events.add('SERVER:MuellmannBCSEntfernen', () => {
for (var i = 0; i < BlipTonne.length; i++) {
if (BlipTonne[i] == null) continue;
BlipTonne[i].destroy();
@@ -79,10 +74,8 @@
BlipTonne[i] = null;
ShapeTonne[i].destroy();
ShapeTonne[i] = null;
MuellSack = mp.objects.new(3619689535, mp.players.local.position, { rotation: new mp.Vector3(0.0, 0.0, 0.0), alpha: 255, dimension: 0 });
MuellSack.attachTo(mp.players.local.handle, mp.players.local.getBoneIndex(6286), 0.08, 0.0, -0.03, 270.0, 0.0, 25.0, true, true, false, false, 0, true);
interval = setInterval(function () { createMarker(); }, 250);
interval = setInterval(function () { createMarker(); }, 2);
}
else {
mp.gui.chat.push("Der Müllwagen ist bereits voll! Fahre zur Base und lade ab!");
@@ -96,7 +89,6 @@
}
if (Shape == ShapeTonneHinten) {
if (Traegt) {
Traegt = false;
mp.events.callRemote('CLIENT:MuellmannAddSack');
@@ -108,10 +100,7 @@
CheckpointTonneHinten = null;
if (ShapeTonneHinten) ShapeTonneHinten.destroy();
ShapeTonneHinten = null;
MuellSack.destroy();
}
}
else if (Shape == ShapeTonneBase) {
BlipTonneBase.setRoute(false);
@@ -134,11 +123,31 @@
HintenVoll = true;
});
function createMarker() {
if (vehicle != null) {
var boneIndex = vehicle.getBoneIndexByName("platelight");
let pos = vehicle.getWorldPositionOfBone(boneIndex);
var boneIndex2 = vehicle.getBoneIndexByName("platelight");
var boneIndex1 = vehicle.getBoneIndexByName("chassis_dummy");
let posPlate = vehicle.getWorldPositionOfBone(boneIndex2);
let posCentre = vehicle.getWorldPositionOfBone(boneIndex1);
let plateVec = new mp.Vector3(posPlate.x, posPlate.y, posPlate.z);
let lightVec = new mp.Vector3(posCentre.x, posCentre.y, posCentre.z);
let posPL = lightVec.subtract(plateVec);
let temp = new mp.Vector3(posPL.x * -1, posPL.y * -1, posPL.z * -1)
let length = Math.sqrt((temp.x * temp.x) + (temp.y * temp.y) + (temp.z * temp.z));
let x = temp.x / length;
let y = temp.y / length;
let z = temp.z / length;
temp = new mp.Vector3(x, y, z - 1);
let pos = plateVec.add(temp);
if (BlipTonneHinten) BlipTonneHinten.destroy();
BlipTonneHinten = null;
if (CheckpointTonneHinten) CheckpointTonneHinten.destroy();
@@ -147,10 +156,7 @@
ShapeTonneHinten = null;
BlipTonneHinten = mp.blips.new(318, pos, { name: 'Müllmann', color: 24, shortRange: false });
CheckpointTonneHinten = mp.markers.new(1, pos, 1, { direction: new mp.Vector3(-235.5747, -1685.475, 32.7207), color: [0, 255, 0, 255], visible: true, dimension: 0 });
ShapeTonneHinten = mp.colshapes.newSphere(pos.x, pos.y, pos.z - 1, 2);
ShapeTonneHinten = mp.colshapes.newSphere(pos.x, pos.y, pos.z, 2);
}
};
}

90
ReallifeGamemode.Client/assets/html/inventory/css/inventory.css
View File

@@ -22,8 +22,6 @@ body {
background-color: transparent;
}
.main2 {
z-index: 2;
background: #0c0c0cc4;
@@ -557,53 +555,48 @@ t#tf_nameorid {
}
#tf_zahl {
background-color: #313131; /* blau */
background-color: #313131;
border: none;
height: 30px;
width: 124px;
height: 1vw;
width: 4.3vw;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
font-size: 0.5vw;
position: relative;
left: 42%;
top: 40%;
left: 7.8vw;
top: 1.2vw;
color: #ffffff;
}
#tf_cancle {
background-color: #ff0000;
border: none;
height: 32px;
width: 124px;
height: 1vw;
width: 3vw;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
font-color: white;
font-size: 0.5vw;
position: relative;
left: 33.7%;
top: 44%;
left: 12.5vw;
top: -0.2vw;
color: #ffffff;
opacity: 0.5;
transition: 0.3s;
}
#tf_submitZahl {
background-color: #008CBA; /* blau */
background-color: #008CBA;
border: none;
height: 32px;
width: 124px;
height: 1.5vw;
width: 8vw;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
font-color: white;
font-size: 0.5vw;
position: relative;
left: 42%;
top: 40%;
left: -1.8vw;
top: 6vw;
color: #ffffff;
opacity: 0.5;
transition: 0.3s;
}
@@ -614,15 +607,15 @@ t#tf_nameorid {
#tf_zahl4 {
background-color: #313131;
border: none;
height: 1.5vw;
width: 5vw;
height: 1vw;
width: 4.3vw;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 0.6vw;
font-size: 0.5vw;
position: relative;
left: 19vw;
top: 13vw;
left: 7.7vw;
top: 1vw;
color: #ffffff;
}
@@ -635,12 +628,10 @@ t#tf_nameorid {
text-decoration: none;
display: inline-block;
font-size: 0.5vw;
font-color: white;
position: relative;
left: 17.8vw;
top: 9.4vw;
left: 12.5vw;
top: -0.3vw;
color: #ffffff;
opacity: 0.5;
transition: 0.3s;
}
@@ -657,12 +648,10 @@ t#tf_nameorid {
text-decoration: none;
display: inline-block;
font-size: 0.5vw;
font-color: white;
position: relative;
left: 21vw;
top: 13vw;
left: -5.4vw;
top: 6vw;
color: #ffffff;
opacity: 0.5;
transition: 0.3s;
}
@@ -692,7 +681,6 @@ t#tf_nameorid {
opacity: 1;
}
#tf_acceptTrade {
background-color: #009b03;
border: none;
@@ -731,7 +719,9 @@ t#tf_nameorid {
color: #ffffff;
opacity: 0.5;
transition: 0.3s;
}i
}
i
#tf_cancle3:hover {
opacity: 1
@@ -784,7 +774,7 @@ t#tf_nameorid {
.BoxBlue {
background-color: #1b1b1b;
height: 11.1vw;
height: 8.9vw;
width: 20.2vw;
position: relative;
margin-top: 11vw;
@@ -801,7 +791,7 @@ t#tf_nameorid {
display: inline-block;
font-size: 0.5vw;
position: relative;
left: 5.45vw;
left: 12.45vw;
top: 0vw;
color: #ffffff;
}
@@ -837,8 +827,8 @@ t#tf_nameorid {
display: inline-block;
font-size: 0.6vw;
position: relative;
left: 10.8vw;
top: 5.45vw;
left: -1.7vw;
top: 6.45vw;
color: #ffffff;
opacity: 0.5;
transition: 0.3s;
@@ -858,8 +848,8 @@ t#tf_nameorid {
display: inline-block;
font-size: 0.5vw;
position: relative;
left: 7.5vw;
top: 4.4vw;
left: 7.8vw;
top: 1.4vw;
color: #ffffff;
}
@@ -871,15 +861,15 @@ select.select_box2 {
.blueIcon1 {
position: relative;
height: 3vw;
margin-bottom: -3.1vw;
margin-left: 13.4vw;
margin-bottom: -3.6vw;
margin-left: 8.5vw;
}
.blueIcon2 {
position: relative;
height: 3vw;
margin-bottom: 0.9vw;
margin-left: 3.4vw;
margin-bottom: -4.6vw;
margin-left: 0.7vw;
}
.blue3 {
@@ -901,7 +891,6 @@ select.select_box2 {
opacity: 1
}
#tf_nameorid {
background-color: #313131;
border: none;
@@ -917,7 +906,6 @@ select.select_box2 {
color: #ffffff;
}
.alert_green {
z-index: 2;
background: rgba(85, 255, 0, 0.90);

490
ReallifeGamemode.Client/assets/html/inventory/inventory.html
View File

@@ -11,40 +11,48 @@
<body>
<div class="alerts" id='alertbox'>
</div>
<div class="sidebar">
<ul>
<li name="side1" class="sidebaritem1" onclick="switchSite('backpackClass')"><img class="sideicon1" src="img/backpack/backpack.svg"><p class="bartext">Rucksack</p></li>
<li name="side2" class="sidebaritem2" onclick="getVehicle()"><img class="sideicon2" src="img/backpack/car.svg"><p class="bartext">Fahrzeug</p></li>
<li name="side3" class="sidebaritem3" onclick="switchSite('tradeClass')"><img class="sideicon4" src="img/backpack/trading.svg"><p class="bartext">Handel</p></li>
<li name="side1" class="sidebaritem1" onclick="switchSite('backpackClass')">
<img class="sideicon1" src="img/backpack/backpack.svg"><p class="bartext">Rucksack</p>
</li>
<li name="side2" class="sidebaritem2" onclick="getVehicle()">
<img class="sideicon2" src="img/backpack/car.svg"><p class="bartext">Fahrzeug</p>
</li>
<!-- <li name="side3" class="sidebaritem3" onclick="switchSite('tradeClass')"><img class="sideicon4" src="img/backpack/trading.svg"><p class="bartext">Handel</p></li>
<li name="side4" class="sidebaritem4 hidden" onclick="switchSite('handelClass')"><img class="sideicon4" src="img/backpack/trading.svg"><p class="bartext">Handeln</p></li>
<li name="side5" class="sidebaritem5 hidden" onclick="getTrade()"><img class="sideicon4" src="img/backpack/save-money.svg"><p class="bartext">Anfrage</p></li>
<li name="side6" class="sidebaritem6 hidden" onclick="switchSite('backClass')"><img class="sideicon4" src="img/backpack/back.svg"><p class="bartext">Zurück</p></li>
<li name="side5" class="sidebaritem5 hidden" onclick="getTrade()"><img class="sideicon4" src="img/backpack/save-money.svg"><p class="bartext">Anfrage</p></li> -->
<li name="side6" class="sidebaritem6 hidden" onclick="switchSite('backClass')">
<img class="sideicon4" src="img/backpack/back.svg"><p class="bartext">Zurück</p>
</li>
</ul>
</div>
<div name="backpackClass" class="backpack">
<div class="main">
<div class="Betrag" style="display: none;">
<div class="BoxBlue">
<input type="text" id="tf_zahl" name="number" placeholder="Betrag eingeben" min="1" step="1" oninput="this.value=this.value.replace(/[^0-9]/g,'');">
<button id='tf_submitZahl' onclick="">Bestätigen</button>
<button id='tf_cancle' onclick="">Schließen</button>
<button id="tf_cancle" onclick="">Schließen</button>
<button id="tf_submitZahl" onclick="">Bestätigen</button>
<img class="blueIcon1" src="img/backpack/trash2.svg"></img>
</div>
</div>
<div class="Betrag2" style="display: none;">
<div class="BoxBlue">
<input type="text" id="tf_zahl2" name="number" placeholder="Betrag eingeben" min="1" step="1" oninput="this.value=this.value.replace(/[^0-9]/g,'');">
<button id="tf_submitZahlToHandel" onclick="">Zum handeln transferieren</button>
<button id="tf_cancle2" onclick="">Schließen</button>
<button id="tf_submitZahlToVehicle" onclick="">Zum Fahrzeug transferieren</button>
<img class="blueIcon1" src="img/backpack/car.svg">
<img class="blueIcon2" src="img/backpack/trading.svg">
<img class="blueIcon1" src="img/backpack/car.svg"></img>
</div>
</div>
<div class="title"><div class="titlecount"><span id="count1">0</span> / 40 Kilogramm</div><div class="titletext">Rucksack</div></div>
<div class="title">
<div class="titlecount"><span id="count1">0</span> / 40 Kilogramm</div>
<div class="titletext">Rucksack</div>
</div>
<div class="items">
<ul id="List0"></ul>
</div>
@@ -53,11 +61,17 @@
<div name="vehClass" class="veh hidden">
<div class="main">
<div class="title"><div class="titlecount"><span id="count2">0</span> / 250 Kilogramm</div><div class="titletext">Fahrzeug</div></div>
<div class="title">
<div class="titlecount"><span id="count2">0</span> / 250 Kilogramm</div>
<div class="titletext">Fahrzeug</div>
</div>
<div class="Betrag4" style="display: none;">
<input type="text" id="tf_zahl4" name="number" placeholder="Betrag eingeben" min="1" step="1" oninput="this.value=this.value.replace(/[^0-9]/g,'');">
<button id='tf_submitZahl4' onclick="">Zum Rucksack transferieren</button>
<button id='tf_cancle4' onclick="">Schließen</button>
<div class="BoxBlue">
<img class="blueIcon1" src="img/backpack/backpack.svg">
<button id="tf_cancle4" onclick="">Schließen</button><input type="text" id="tf_zahl4" name="number" placeholder="Betrag eingeben" min="1" step="1" oninput="this.value=this.value.replace(/[^0-9]/g,'');">
<button id="tf_submitZahl4" onclick="">Zum Rucksack transferieren</button>
</div>
</div>
<div class="items">
<ul id="List4"></ul>
@@ -65,7 +79,7 @@
</div>
</div>
<div name="handelClass" class="handel hidden">
<!-- <div name="handelClass" class="handel hidden">
<div class="main">
<div class="Betrag3" style="display:none;">
<input type="text" id="tf_zahl3" name="number" placeholder="Betrag eingeben" min="1" step="1" oninput="this.value=this.value.replace(/[^0-9]/g,'');">
@@ -91,53 +105,16 @@
<ul id="List3"></ul>
</div>
</div>
</div>
</div> -->
<div id="invisible" style="display: none"></div>
<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
<script src="../../js/jquery-3.3.1.min.js"></script>
<script>
var lastClass = "backpackClass";
var val = 0;
function changeTradeStatus(value) {
val = JSON.parse(value);
}
function getTrade() {
if (val == 1) {
switchSite('anfrageClass');
}
}
function getVehicle() {
if (vehInv.length > 0) {
switchSite('vehClass');
} else {
mp.trigger("Error", "Kofferraum leer oder kein Fahrzeug in der Nähe.")
}
}
$("#tf_acceptTrade").unbind('click').click(function () {
if (anfrageInv.length > 0) {
mp.trigger("CEF:acceptTrade");
}
});
$("#tf_submitTrade").unbind('click').click(function () {
if (handelInv.length > 0) {
var handelItemID = [];
var handelItemAmount = [];
for (i = 0; i < handelInv.length; i++) {
handelItemID.push(handelInv[i].ID);
handelItemAmount.push(handelInv[i].Amount);
}
mp.trigger("CEF:tradeItem", 0, JSON.stringify(String($('#tf_nameorid').val())), JSON.stringify(handelItemID), JSON.stringify(handelItemAmount))
}
});
$("#tf_cancle4").unbind('click').click(function () {
$(".Betrag4").hide();
});
@@ -151,20 +128,6 @@
$(".Betrag2").hide();
});
function setAnfrage(jsonIdArr, jsonAmountArr, jsonNameArr, jsonWeight) {
var parsedIdArr = JSON.parse(jsonIdArr);
var parsedAmountArr = JSON.parse(jsonAmountArr);
var parsedNameArr = JSON.parse(jsonNameArr);
var parsedWeight = JSON.parse(jsonWeight);
for (var i = 0; i < parsedNameArr.length; i++) {
var num = parsedAmountArr[i];
var newItem = { Name: parsedNameArr[i], ID: parsedIdArr[i], Amount: num, Category: 3 };
anfrageInv[i] = newItem;
}
$('#count4').html(parsedWeight / 1000);
drawAnfrage();
}
function switchSite(site) {
if (site != lastClass) {
if (site == "tradeClass") {
@@ -203,111 +166,8 @@
$(document).ready(function () {
mp.trigger('CEF:InventoryLoaded');
mp.trigger('CEF:getNearVehicles');
});
function setItems(jsonName, jsonID, jsonAmount, nearPlayers) {
var parsedName = JSON.parse(jsonName);
var parsedID = JSON.parse(jsonID);
var parsedAmount = JSON.parse(jsonAmount);
for (var i = 0; i < parsedName.length; i++) {
var num = parsedAmount[i];
var newItem = { Name: parsedName[i], ID: parsedID[i], Amount: num, Category: 0 };
rucksackInv[i] = newItem;
}
jsonInv = JSON.stringify(rucksackInv);
ReceiveClientInformation(jsonInv);
var parsedPlayers = JSON.parse(nearPlayers);
Players = parsedPlayers;
for (var x = 0; x < parsedPlayers.length; x++) {
$('.dropdown-content').append("<a value=" + x + ">" + parsedPlayers[x] + "</a>");
}
}
var Players = [];
function setWeight(jsonWeight) {
var parsedWeight = JSON.parse(jsonWeight);
$('#count1').html(parsedWeight / 1000);
}
function setVehiclesInv(jsonVehInv) {
var parsedVehInv = JSON.parse(jsonVehInv);
vehInvItem.push(parsedVehInv);
var vehicle = vehInvItem[0];
for (i = 0; i < vehicle.ivehName.length; i++) {
var newItem = { Name: vehicle.ivehName[i], ID: vehicle.ivehId[i], Amount: vehicle.ivehAmount[i], Category: 1 };
vehInv.push(newItem);
}
Origin.push(0);
Origin.push(vehicle.ID);
var jsonVehInv = JSON.stringify(vehInv);
$('#count2').html(vehInvItem[0].currentWeight / 1000);
RecieveVehicleInfo(jsonVehInv);
}
function RecieveVehicleInfo(json) {
var parsed = JSON.parse(json);
for (var i = 0; i < parsed.length; i++) {
var item = parsed[i];
console.log(item);
var quantity = parsed[i].Amount;
var list = document.getElementById("List4");
var pictureElement = document.createElement("img");
pictureElement.setAttribute("class", "sideicon15");
pictureElement.setAttribute("src", "img/inventory/" + item.ID + ".svg");
var redButton = document.createElement("div");
var redButtonImg = document.createElement("img");
redButton.setAttribute("class", "red");
redButton.setAttribute("onclick", "onAction(1," + item.ID + "," + item.Amount + ","+ i +");");
redButtonImg.setAttribute("src", "img/backpack/trash.svg");
redButtonImg.setAttribute("class", "redImg");
redButton.appendChild(redButtonImg);
var blueButton = document.createElement("div");
var blueButtonImg = document.createElement("img");
blueButton.setAttribute("class", "blue2");
blueButton.setAttribute("onclick", "onAction(4," + item.ID + "," + item.Amount + ","+ i +");");
blueButtonImg.setAttribute("src", "img/backpack/paper-plane.svg");
blueButtonImg.setAttribute("class", "blueImg");
blueButton.appendChild(blueButtonImg);
var listLength = list.length;
var row = 1;
if (listLength > 3) {
row = 2;
}
if (listLength > 7) {
row = 3;
}
if (listLength > 11) {
row = 4;
}
if (listLength > 15) {
row = 5;
}
if (listLength > 19) {
row = 6;
}
var Litem = document.createElement("li");
Litem.setAttribute("class", "item" + row);
Litem.appendChild(document.createTextNode(quantity + "x " + item.Name));
Litem.appendChild(pictureElement);
Litem.appendChild(redButton);
Litem.appendChild(blueButton);
list.appendChild(Litem);
}
}
var rucksackInv = [];
var handelInv = [];
var vehInv = [];
@@ -316,73 +176,35 @@
var vehInvItem = [];
function ReceiveClientInformation(json) {
var parsed = JSON.parse(json);
rucksackInv = parsed;
for (var i = 0; i < parsed.length; i++) {
var item = parsed[i];
item.Category = 0;
console.log(item);
var quantity = parsed[i].Amount;
var list = document.getElementById("List" + item.Category);
var pictureElement = document.createElement("img");
pictureElement.setAttribute("class", "sideicon15");
pictureElement.setAttribute("src", "img/inventory/" + item.ID + ".svg");
var redButton = document.createElement("div");
var redButtonImg = document.createElement("img");
redButton.setAttribute("class", "red");
redButton.setAttribute("onclick", "onAction(1," + item.ID + "," + item.Amount + "," + i + ");");
redButtonImg.setAttribute("src", "img/backpack/trash.svg");
redButtonImg.setAttribute("class", "redImg");
redButton.appendChild(redButtonImg);
var greenButton = document.createElement("div");
var greenButtonImg = document.createElement("img");
greenButton.setAttribute("class", "green");
greenButton.setAttribute("onclick", "onAction(0," + item.ID + "," + item.Amount + "," + i + ");");
greenButtonImg.setAttribute("src", "img/backpack/use.svg");
greenButtonImg.setAttribute("class", "greenImg");
greenButton.appendChild(greenButtonImg);
var blueButton = document.createElement("div");
var blueButtonImg = document.createElement("img");
blueButton.setAttribute("class", "blue");
blueButton.setAttribute("onclick", "onAction(2," + item.ID + "," + item.Amount + ", " + i + ");");
blueButtonImg.setAttribute("src", "img/backpack/paper-plane.svg");
blueButtonImg.setAttribute("class", "blueImg");
blueButton.appendChild(blueButtonImg);
var listLength = list.length;
var row = 1;
if (listLength > 3) {
row = 2;
function setBackpackItems(jsonItemArr) {
console.log(jsonItemArr);
var parsedItemArr = JSON.parse(jsonItemArr)
rucksackInv = [];
for (var i = 0; i < parsedItemArr.length; i++) {
var item = parsedItemArr[i];
var newItem = { Name: item.Name, ID: item.ItemId, Amount: item.Amount, Category: 0 };
rucksackInv.push(newItem);
$('#count1').html(item.Weight / 1000);
}
if (listLength > 7) {
row = 3;
}
if (listLength > 11) {
row = 4;
}
if (listLength > 15) {
row = 5;
}
if (listLength > 19) {
row = 6;
drawRucksack();
}
var Litem = document.createElement("li");
Litem.setAttribute("class", "item" + row);
Litem.appendChild(document.createTextNode(quantity + "x " + item.Name));
Litem.appendChild(pictureElement);
Litem.appendChild(redButton);
Litem.appendChild(greenButton);
Litem.appendChild(blueButton);
list.appendChild(Litem);
function getVehicle() {
mp.trigger("CEF:callVehicleInventory");
}
function setVehicleItems(jsonItemArr) {
var parsedItemArr = JSON.parse(jsonItemArr)
vehInv = [];
for (var i = 0; i < parsedItemArr.length; i++) {
var item = parsedItemArr[i];
var newItem = { Name: item.Name, ID: item.ItemId, Amount: item.Amount, Category: 0 };
vehInv.push(newItem);
$('#count2').html(item.Weight / 1000);
}
switchSite('vehClass');
drawVehicle();
}
var clnc = 1;
@@ -478,7 +300,6 @@
}
}
function onAction(action, id, ammount, i) {
$(".Betrag").hide();
@@ -497,8 +318,6 @@
mp.trigger("CEF:useItem", JSON.stringify("drop"), JSON.stringify(ammount), JSON.stringify(rucksackInv[i].ID))
}
$(".Betrag").hide();
drawRucksack();
drawVehicle();
event.preventDefault()
event.stopPropagation()
});
@@ -507,209 +326,33 @@
{
$(".Betrag2").show();
var Copy = Object.assign({}, rucksackInv[i]);
$("#tf_submitZahlToHandel").unbind('click').click(function () {
var y = parseInt($('#tf_zahl2').val(), 10);
if ($('#tf_zahl2').val() < ammount && ammount > 0) {
for (x = 0; x < handelInv.length; x++) {
if (handelInv[x].ID == Copy.ID) {
handelInv[x].Amount += y;
rucksackInv[i].Amount -= y;
$(".Betrag2").hide();
drawHandel();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
}
handelInv.push(Copy);
handelInv[handelInv.length - 1].Amount = y;
handelInv[handelInv.length - 1].Category = 2;
rucksackInv[i].Amount -= y;
} else if ($('#tf_zahl2').val() >= ammount) {
for (x = 0; x < handelInv.length; x++) {
if (handelInv[x].ID == Copy.ID) {
handelInv[x].Amount += y;
rucksackInv.splice(i, 1);
$(".Betrag2").hide();
drawHandel();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
}
handelInv.push(Copy);
handelInv[handelInv.length - 1].Category = 2;
rucksackInv.splice(i, 1);
}
$(".Betrag2").hide();
drawHandel();
drawRucksack();
event.preventDefault()
event.stopPropagation()
});
$("#tf_submitZahlToVehicle").unbind('click').click(function () {
if (Origin.length < 2) {
$(".Betrag2").hide();
drawVehicle();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
Origin[0] = 0;
var y = parseInt($('#tf_zahl2').val(), 10);
if ($('#tf_zahl2').val() < ammount && ammount > 0) {
for (x = 0; x < vehInv.length; x++) {
if (vehInv[x].ID == Copy.ID) {
vehInv[x].Amount += y;
rucksackInv[i].Amount -= y;
$(".Betrag2").hide();
mp.trigger("CEF:saveVehicleTransfer",0, JSON.stringify(Origin), JSON.stringify(rucksackInv[i].ID), JSON.stringify(rucksackInv[i].Amount), JSON.stringify(y));
drawVehicle();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
}
vehInv.push(Copy);
vehInv[vehInv.length - 1].Amount = y;
vehInv[vehInv.length - 1].Category = 2;
rucksackInv[i].Amount -= y;
mp.trigger("CEF:saveVehicleTransfer",0, JSON.stringify(Origin), JSON.stringify(rucksackInv[i].ID), JSON.stringify(rucksackInv[i].Amount), JSON.stringify(y));
mp.trigger("CEF:backpackToVehicle", JSON.stringify(rucksackInv[i].ID), JSON.stringify(y));
} else if ($('#tf_zahl2').val() >= ammount) {
for (x = 0; x < vehInv.length; x++) {
if (vehInv[x].ID == Copy.ID) {
vehInv[x].Amount += y;
rucksackInv.splice(i, 1);
$(".Betrag2").hide();
mp.trigger("CEF:saveVehicleTransfer",0, JSON.stringify(Origin), JSON.stringify(Copy.ID), JSON.stringify(0), JSON.stringify(ammount));
drawVehicle();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
}
vehInv.push(Copy);
vehInv[vehInv.length - 1].Category = 2;
rucksackInv.splice(i, 1);
mp.trigger("CEF:saveVehicleTransfer",0, JSON.stringify(Origin), JSON.stringify(Copy.ID), JSON.stringify(0), JSON.stringify(ammount));
mp.trigger("CEF:backpackToVehicle", JSON.stringify(rucksackInv[i].ID), JSON.stringify(ammount));
}
$(".Betrag2").hide();
drawVehicle();
drawRucksack();
event.preventDefault()
event.stopPropagation()
});
}
if (action == 3) {
$(".Betrag3").show();
var Copy = Object.assign({}, handelInv[i]);
$("#tf_submitZahl3").unbind('click').click(function () {
var y = parseInt($('#tf_zahl3').val(), 10);
if ($('#tf_zahl3').val() < ammount && ammount > 0) {
for (x = 0; x < rucksackInv.length; x++) {
if (rucksackInv[x].ID == Copy.ID) {
rucksackInv[x].Amount += y;
handelInv[i].Amount -= y;
$(".Betrag3").hide();
drawHandel();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
}
rucksackInv.push(Copy);
rucksackInv[rucksackInv.length - 1].Amount = y;
rucksackInv[rucksackInv.length - 1].Category = 0;
handelInv[i].Amount -= y;
} else if ($('#tf_zahl3').val() >= ammount) {
for (x = 0; x < rucksackInv.length; x++) {
if (rucksackInv[x].ID == Copy.ID) {
rucksackInv[x].Amount += ammount;
handelInv.splice(i, 1);
$(".Betrag3").hide();
drawHandel();
drawRucksack();
event.preventDefault()
event.stopPropagation()
return;
}
}
rucksackInv.push(Copy);
rucksackInv[rucksackInv.length - 1].Category = 0;
handelInv.splice(i, 1);
}
$(".Betrag3").hide();
drawHandel();
drawRucksack();
event.preventDefault()
event.stopPropagation()
});
}
if (action == 4) {
$(".Betrag4").show();
var Copy = Object.assign({}, vehInv[i]);
$("#tf_submitZahl4").unbind('click').click(function () {
Origin[0] = 1;
var y = parseInt($('#tf_zahl4').val(), 10);
if ($('#tf_zahl4').val() < ammount && ammount > 0) {
for (x = 0; x < rucksackInv.length; x++) {
if (rucksackInv[x].ID == Copy.ID) {
rucksackInv[x].Amount += y;
vehInv[i].Amount -= y;
$(".Betrag2").hide();
mp.trigger("CEF:saveVehicleTransfer",1, JSON.stringify(Origin), JSON.stringify(Copy.ID), JSON.stringify(vehInv[i].Amount), JSON.stringify(y));
drawRucksack();
drawVehicle();
event.preventDefault()
event.stopPropagation()
return;
}
}
console.log(rucksackInv);
rucksackInv.push(Copy);
rucksackInv[rucksackInv.length - 1].Amount = y;
rucksackInv[rucksackInv.length - 1].Category = 2;
vehInv[i].Amount -= y;
console.log(rucksackInv);
mp.trigger("CEF:saveVehicleTransfer",1, JSON.stringify(Origin), JSON.stringify(Copy.ID), JSON.stringify(vehInv[i].Amount), JSON.stringify(y));
mp.trigger("CEF:vehicleToBackpack", JSON.stringify(vehInv[i].ID), JSON.stringify(y));
} else if ($('#tf_zahl4').val() >= ammount) {
for (x = 0; x < rucksackInv.length; x++) {
if (rucksackInv[x].ID == Copy.ID) {
rucksackInv[x].Amount += ammount;
vehInv.splice(i, 1);
$(".Betrag2").hide();
mp.trigger("CEF:saveVehicleTransfer",1, JSON.stringify(Origin), JSON.stringify(Copy.ID), JSON.stringify(0), JSON.stringify(ammount));
drawRucksack();
drawVehicle();
event.preventDefault()
event.stopPropagation()
return;
}
mp.trigger("CEF:vehicleToBackpack", JSON.stringify(vehInv[i].ID), JSON.stringify(ammount));
}
rucksackInv.push(Copy);
rucksackInv[rucksackInv.length - 1].Amount = ammount;
rucksackInv[rucksackInv.length - 1].Category = 2;
vehInv.splice(i, 1);
mp.trigger("CEF:saveVehicleTransfer",1, JSON.stringify(Origin), JSON.stringify(Copy.ID), JSON.stringify(0), JSON.stringify(ammount));
}
$(".Betrag4").hide();
drawRucksack();
drawVehicle();
event.preventDefault()
event.stopPropagation()
});
@@ -736,7 +379,6 @@
pictureElement.setAttribute("class", "sideicon15");
pictureElement.setAttribute("src", "img/inventory/" + item.ID + ".svg");
var blueButton = document.createElement("div");
var blueButtonImg = document.createElement("img");
blueButton.setAttribute("class", "blue3");
@@ -883,7 +525,6 @@
redButtonImg.setAttribute("class", "redImg");
redButton.appendChild(redButtonImg);
var blueButton = document.createElement("div");
var blueButtonImg = document.createElement("img");
blueButton.setAttribute("class", "blue2");
@@ -943,7 +584,6 @@
pictureElement.setAttribute("class", "sideicon15");
pictureElement.setAttribute("src", "img/inventory/" + item.ID + ".svg");
var listLength = list.length;
var row = 1;
@@ -974,8 +614,6 @@
}
}
</script>
</body>
</html>

84
ReallifeGamemode.Client/core/rage-mp/entities.ts
View File

@@ -1,4 +1,4 @@
import { IEntity, IPlayer, IPlayerPool, IVehicle, IVehiclePool, VehicleSeat, EntityType } from "../../game";
import { IEntity, IPlayer, IEntityAttachments, IEntityAttachmentPool, IPlayerPool, IVehicle, IVehiclePool, VehicleSeat, EntityType } from "../../game";
import { parseJson } from "../../util";
class RageEntity implements IEntity {
@@ -8,6 +8,10 @@ class RageEntity implements IEntity {
return this.entity.id;
}
get remoteId(): any {
return this.entity.remoteId;
}
constructor(entity: EntityMp) {
this.entity = entity;
}
@@ -32,6 +36,8 @@ class RageEntity implements IEntity {
class RagePlayer extends RageEntity implements IPlayer {
private player: PlayerMp;
public __attachments: any[];
public __attachmentObjects: any[];
get name(): string {
return this.player.name;
@@ -52,6 +58,78 @@ class RagePlayer extends RageEntity implements IPlayer {
}
}
class RageAttachments implements IEntityAttachments {
remoteId: any;
public __attachments: any[];
public __attachmentObjects: any[];
constructor(entity: IEntity, attachments: any[], attachmentObjects: any[]) {
this.remoteId = entity.remoteId;
this.__attachments = attachments;
this.__attachmentObjects = attachmentObjects;
}
}
class RageEntityAttachmentPool implements IEntityAttachmentPool {
public attachmentPool: IEntityAttachments[];
remove(entity: IEntity) {
for (let obj of this.attachmentPool.keys()) {
if (entity.remoteId == this.attachmentPool[obj].remoteId) delete this.attachmentPool[obj];
}
}
find(entity: EntityMp): IEntityAttachments {
for (let i of this.attachmentPool.keys()) {
let pool = this.attachmentPool[i];
for (let obj of pool.__attachmentObjects) {
if (entity == obj) { return pool;}
}
}
return null;
}
set(entity: IEntity, attachments: any[], attachmentObjects: any[]): IEntityAttachments {
if (!this.attachmentPool) {
let e = new RageAttachments(entity, attachments, attachmentObjects);
this.attachmentPool = [];
this.attachmentPool.push(e);
return e;
}
for (let obj of this.attachmentPool.keys()) {
if (entity.remoteId == this.attachmentPool[obj].remoteId) { this.remove(entity); }
}
let e = new RageAttachments(entity, attachments, attachmentObjects);
this.attachmentPool.push(e);
return e;
}
at(remoteId: any): IEntityAttachments {
if (!this.attachmentPool) {
return null;
}
for (let obj of this.attachmentPool.keys()) {
if (remoteId == this.attachmentPool[obj].remoteId) { return this.attachmentPool[obj]; }
}
return null;
}
get(entity: IEntity): IEntityAttachments {
if (!this.attachmentPool) {
return null;
}
for (let obj of this.attachmentPool.keys()) {
if (entity.remoteId == this.attachmentPool[obj].remoteId) { return this.attachmentPool[obj]; }
}
return null;
}
}
class RagePlayerPool implements IPlayerPool {
get local(): IPlayer {
return new RagePlayer(mp.players.local);
@@ -103,14 +181,14 @@ class RageVehiclePool implements IVehiclePool {
fn(new RageVehicle(e));
})
}
}
export {
RageEntity,
RagePlayer,
RagePlayerPool,
RageAttachments,
RageEntityAttachmentPool,
RageVehicle,
RageVehiclePool,
}

6
ReallifeGamemode.Client/core/rage-mp/game.ts
View File

@@ -1,12 +1,12 @@
import { IGame, IUi, IEvents, IPlayerPool, IVehiclePool } from "../../game";
import { IGame, IUi, IEvents, IPlayerPool, IVehiclePool, IEntityAttachmentPool } from "../../game";
import RageEvents from "./events";
import RageUi from "./ui";
import { RagePlayerPool, RageVehiclePool } from "./entities";
import { RagePlayerPool, RageVehiclePool, RageEntityAttachmentPool } from "./entities";
export default class RageGame implements IGame {
players: IPlayerPool = new RagePlayerPool();
vehicles: IVehiclePool = new RageVehiclePool();
attachments: IEntityAttachmentPool = new RageEntityAttachmentPool();
events: IEvents = new RageEvents;
ui: IUi = new RageUi;

20
ReallifeGamemode.Client/game.ts
View File

@@ -5,6 +5,7 @@
players: IPlayerPool;
vehicles: IVehiclePool;
attachments: IEntityAttachmentPool;
disableDefaultEngineBehaviour(): void;
}
@@ -41,6 +42,7 @@ interface IBrowser {
interface IEntity {
id: number;
remoteId: any;
type: EntityType;
getSharedData<T>(key: string): T;
}
@@ -51,6 +53,12 @@ interface IPlayer extends IEntity {
vehicle: IVehicle;
}
interface IEntityAttachments {
remoteId: any;
__attachments: any[];
__attachmentObjects: any[];
}
interface IVehicle extends IEntity {
isSeatFree(seat: VehicleSeat): boolean;
setEngineStatus(status: boolean, instantly: boolean, otherwise: boolean);
@@ -67,8 +75,16 @@ interface IPlayerPool extends IEntityPool<IPlayer> {
local: IPlayer;
}
interface IVehiclePool extends IEntityPool<IVehicle> {
interface IEntityAttachmentPool {
attachmentPool: IEntityAttachments[];
find(entity: EntityMp): IEntityAttachments;
remove(entity: IEntity): void;
set(entity: IEntity, attachments: any[], attachmentObjects: any[]): IEntityAttachments;
at(handle: any): IEntityAttachments;
get(entity: IEntity): IEntityAttachments;
}
interface IVehiclePool extends IEntityPool<IVehicle> {
}
enum EntityType {
@@ -122,6 +138,8 @@ export {
IBrowser,
IPlayer,
IEntityAttachments,
IEntityAttachmentPool,
IVehicle,
IEntity,
IEntityPool,

11
ReallifeGamemode.Client/index.ts
View File

@@ -209,6 +209,15 @@ taximeterInput(globalData);
import refuseCollector from './Jobs/RefuseCollector';
refuseCollector();
import PedCreator from './Ped/PedCreator';
PedCreator();
import attachmentManager from './util/attachmentMngr';
attachmentManager(game);
import relativeVector from './util/relativevector';
relativeVector();
require('./Gui/policedepartment');
interface VehicleData {
@@ -219,3 +228,5 @@ interface VehicleData {
export {
VehicleData
}

94
ReallifeGamemode.Client/inventory/inventory.ts
View File

@@ -1,43 +1,31 @@

export default function inventory(globalData: IGlobalData): void {
export default function inventory(globalData: IGlobalData): void {
var invBrowser: BrowserMp = null;
var itemIdArr;
var itemAmountArr;
var invWeight;
var itemNameArr;
var itemArr;
var offerItemArr;
var tradeItemArr;
var vehItemArr;
var ivehArr;
var loaded = false;
var Players;
mp.events.add('setVehiclesInventory', (vehInvArr) => {
ivehArr = vehInvArr;
invBrowser.execute(`setVehiclesInv('${JSON.stringify(ivehArr)}');`);
});
mp.events.add('showVehInventory', () => {
invBrowser.execute(`execVehInv();`);
});
var open = false;
mp.events.add('inventoryShow', (iWeight, iNameArr, iAmountArr, iIdArr, playersArr) => {
mp.events.add('inventoryShow', () => {
if (invBrowser !== null) {
invBrowser.destroy()
invBrowser = null;
globalData.InInput = false;
loaded = false;
mp.gui.cursor.show(false, false);
return;
}
if (!globalData.InInput) {
globalData.InInput = true;
mp.gui.cursor.show(true, true);
itemArr = [];
vehItemArr = [];
invBrowser = mp.browsers.new('package://assets/html/inventory/inventory.html');
Players = playersArr;
itemIdArr = iIdArr;
itemAmountArr = iAmountArr;
itemNameArr = iNameArr;
invWeight = iWeight;
}
});
var offer = 0;
@@ -55,22 +43,42 @@ export default function inventory(globalData: IGlobalData): void {
}
});
mp.events.add("addTradeItems", (itemId, itemAmount, itemName, weight) => {
tradeItemID = JSON.stringify(itemId);
tradeItemAmount = JSON.stringify(itemAmount);
tradeItemName = JSON.stringify(itemName);
tradeItemWeight = JSON.stringify(weight);
if (invBrowser != null)
invBrowser.execute(`setAnfrage('${tradeItemID}','${tradeItemAmount}','${tradeItemName}','${tradeItemWeight}');`);
mp.events.addDataHandler("backpackItems", (entity: EntityMp, jsonItemArr) => {
if (entity.handle != mp.players.local.handle) return;
itemArr = JSON.parse(jsonItemArr);
if (loaded)
invBrowser.execute(`setBackpackItems('${JSON.stringify(itemArr)}',true)`);
});
mp.events.add("CEF:saveVehicleTransfer", (val, jsonOrigin, jsonInvID, jsonInvAmount, jsonVehAmount) => {
if (val == 0) {
mp.events.callRemote('saveInventory', jsonInvID, jsonInvAmount, jsonOrigin, jsonVehAmount);
} else if(val == 1){
mp.events.callRemote('saveVehicleInventory', jsonInvID, jsonInvAmount, jsonOrigin, jsonVehAmount);
mp.events.addDataHandler("vehicleItems", (entity: EntityMp, jsonItemArr) => {
if (entity != mp.players.local) return;
vehItemArr = JSON.parse(jsonItemArr);
if (loaded)
invBrowser.execute(`setVehicleItems('${JSON.stringify(vehItemArr)}')`);
});
mp.events.add("CEF:InventoryLoaded", () => {
invBrowser.execute(`setBackpackItems('${JSON.stringify(itemArr)}')`);
if (vehItemArr.length != 0) {
invBrowser.execute(`setVehicleItems('${JSON.stringify(vehItemArr)}')`);
}
//invBrowser.execute(`setTradeItems('${JSON.stringify(tradeItemArr)}')`);
//invBrowser.execute(`setOfferItems('${JSON.stringify(offerItemArr)}')`);
loaded = true;
});
mp.events.add("CEF:callVehicleInventory", () => {
mp.events.callRemote("CLIENT:getVehicleInventory")
});
mp.events.add("CEF:backpackToVehicle", (jsonItemId, jsonAmount) => {
mp.events.callRemote('transferToVehicle', jsonItemId, jsonAmount);
});
mp.events.add("CEF:vehicleToBackpack", (jsonItemId, jsonAmount) => {
mp.events.callRemote('transferToBackpack', jsonItemId, jsonAmount);
});
mp.events.add("CEF:useItem", (type, amount, id) => {
@@ -112,22 +120,6 @@ export default function inventory(globalData: IGlobalData): void {
});
mp.events.add("CEF:InventoryLoaded", () => {
if (offer == 1) {
invBrowser.execute(`changeTradeStatus('${JSON.stringify(offer)}')`);
invBrowser.execute(`setAnfrage('${tradeItemID}','${tradeItemAmount}','${tradeItemName}','${tradeItemWeight}');`);
}
invBrowser.execute(`setItems('${JSON.stringify(itemNameArr)}','${JSON.stringify(itemIdArr)}','${JSON.stringify(itemAmountArr)}','${JSON.stringify(Players)}');`);
invBrowser.execute(`setWeight('${JSON.stringify(invWeight)}');`);
});
mp.events.add("CEF:getNearVehicles", () => {
mp.events.callRemote('getNearVehicles');
});
mp.events.add("CEF:acceptTrade", () => {
if (invBrowser !== null) {
mp.events.callRemote('acceptTrade');
@@ -135,7 +127,6 @@ export default function inventory(globalData: IGlobalData): void {
invBrowser = null;
mp.gui.cursor.show(false, false);
}
});
mp.events.add("CEF:declineTrade", () => {
@@ -169,5 +160,4 @@ export default function inventory(globalData: IGlobalData): void {
}
}
});
}

24
ReallifeGamemode.Client/util/Gangwar.ts
View File

@@ -1,7 +1,4 @@

export default function gangwarHandle(globalData: IGlobalData) {
export default function gangwarHandle(globalData: IGlobalData) {
function inside(point, vs) {
let x = point[0],
y = point[1];
@@ -35,7 +32,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
};
var Gangturf = class {
name: string;
id: number;
range: number;
@@ -70,7 +66,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
}
_setup(name, id, x, y, range, color, rot, owner, edit, vector, value) {
var self = this;
self.name = name;
self.id = id;
@@ -127,7 +122,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
loadArea() {
var self = this;
self.blip = mp.game.ui.addBlipForRadius(self.x, self.y, 1, self.range);
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.blip, 5);
@@ -137,7 +131,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
self._colshape = mp.colshapes.newCircle(self.x, self.y, self.range * 1.5);
}
render() {
var self = this;
if (self._colshape) {
if (self.edit == true) {
@@ -151,11 +144,8 @@ export default function gangwarHandle(globalData: IGlobalData) {
}
//self.blip.setRotation(self.rotation);
mp.game.invoke(Natives.SET_BLIP_ROTATION, self.blip, self.rotation);
}
if (self._status == "attack" || self.edit == true) {
if (self._colshape) {
if (mp.game.gameplay.getDistanceBetweenCoords(mp.players.local.position.x, mp.players.local.position.y, 0, self.x, self.y, 0, true) < self.range * 1.5) {
@@ -191,7 +181,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
mp.game.graphics.drawLine(bottom_left.x, bottom_left.y, i, top_left.x, top_left.y, i, 255, 0, 0, 255);
}
} else {
/*
let a = 0;
for (var i = z; i < z + 1; i += 0.001) {
@@ -203,10 +192,8 @@ export default function gangwarHandle(globalData: IGlobalData) {
}
*/
}
}
if (self.isInsideArea()) {
mp.game.graphics.drawText(self.name, [self.x, self.y, mp.players.local.position.z + 20], {
font: 7,
@@ -215,7 +202,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
outline: true,
centre: true
});
}
}
}
@@ -233,10 +219,8 @@ export default function gangwarHandle(globalData: IGlobalData) {
}
}
}
}
startGangWar() {
var self = this;
if (self._status == "normal") {
@@ -287,7 +271,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
self.attackBlip = mp.game.ui.addBlipForCoord(self.x, self.y, 0);
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.attackBlip, 378);
mp.game.invoke(Natives.SET_BLIP_AS_SHORT_RANGE, self.attackBlip, false);
} else if (!bool) {
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.attackBlip, 5);
}
@@ -310,7 +293,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
self.setLeaderColShape();
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.leaderBlip, 437);
mp.game.invoke(Natives.SET_BLIP_AS_SHORT_RANGE, self.leaderBlip, false);
}
}
@@ -323,7 +305,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
visible: true,
dimension: 0
});
}
isTurfArea(shape) {
@@ -354,7 +335,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
mp.game.audio.playSoundFrontend(1, "Enter_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true);
mp.game.graphics.stopScreenEffect("MinigameTransitionIn");
mp.game.graphics.startScreenEffect("MinigameTransitionOut", 500, false);
}
mp.events.callRemote("Gangarea:Enter", JSON.stringify(self.id));
}
@@ -525,7 +505,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
}
clearBlips();
if (turfs.length > 0) {
gangturfs = [];
turfs.forEach(function (turf) {
if (turf.Id != undefined) {
@@ -543,7 +522,6 @@ export default function gangwarHandle(globalData: IGlobalData) {
mp.events.add('ADMIN:SetTurf', (name) => {
gangturfs[gangturfs.length - 1].edit = false;
if (gangturfs[gangturfs.length - 1].id == -1) {
mp.events.callRemote("SERVER:SetTurf", JSON.stringify(gangturfs[gangturfs.length - 1].x), JSON.stringify(gangturfs[gangturfs.length - 1].y), JSON.stringify(gangturfs[gangturfs.length - 1].rotation), JSON.stringify(gangturfs[gangturfs.length - 1].range), name);
}
});

1
ReallifeGamemode.Database/Entities/Saves/SavedPed.cs
View File

@@ -21,5 +21,6 @@ namespace ReallifeGamemode.Database.Entities.Saves
public float Heading { get; set; }
public byte Dimension { get; set; }
public bool Active { get; set; }
public int Type { get; set; }
}
}

2
ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -775,6 +775,8 @@ namespace ReallifeGamemode.Database.Migrations
b.Property<float>("PositionZ");
b.Property<int>("Type");
b.HasKey("Id");
b.ToTable("Peds");

9
ReallifeGamemode.Server/Business/AirplaneDealerBusiness.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
class AirplaneDealerBusiness : CarDealerBusinessBase
internal class AirplaneDealerBusiness : CarDealerBusinessBase
{
public override int Id => 7;
public override string Name => "Flugzeug Shop";
@@ -22,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
public override string BankAccountName => Name;

9
ReallifeGamemode.Server/Business/BeachDealerBusiness.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
class BeachDealerBusiness : CarDealerBusinessBase
internal class BeachDealerBusiness : CarDealerBusinessBase
{
public override int Id => 9;
public override string Name => "Beach Shop";
@@ -22,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Business/BikeDealerBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -21,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Business/BoatDealerBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -21,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

7
ReallifeGamemode.Server/Business/BusinessBase.cs
View File

@@ -1,11 +1,11 @@
using GTANetworkAPI;
using System;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using System;
using System.Linq;
namespace ReallifeGamemode.Server.Business
{
@@ -86,7 +86,6 @@ namespace ReallifeGamemode.Server.Business
NAPI.Util.ConsoleOutput("Creating Bank Account for Business: " + Name);
using (var dbContext = new DatabaseContext())
{
dbContext.BusinessBankAccounts.Add(new BusinessBankAccount()
{
BusinessId = Id,

3
ReallifeGamemode.Server/Business/CarDealerBusinessBase.cs
View File

@@ -1,7 +1,4 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Business
{

6
ReallifeGamemode.Server/Business/HelicopterDealerBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -21,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

9
ReallifeGamemode.Server/Business/LastTrainDealerBusiness.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
class LastTrainDealerBusiness : CarDealerBusinessBase
internal class LastTrainDealerBusiness : CarDealerBusinessBase
{
public override int Id => 10;
public override string Name => "Last Train Carshop";
@@ -22,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Business/PremiumDeluxeMotorsportCarDealerBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -19,7 +16,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

9
ReallifeGamemode.Server/Business/SUVDealerBusiness.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
class SUVDealerBusiness : CarDealerBusinessBase
internal class SUVDealerBusiness : CarDealerBusinessBase
{
public override int Id => 11;
public override string Name => "SUV Carshop";
@@ -22,7 +18,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Business/ShopBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -15,7 +12,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Business/TelefonBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -15,7 +12,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Business/VapidCarDealerBusiness.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Business
{
@@ -19,7 +16,6 @@ namespace ReallifeGamemode.Server.Business
public override void Load()
{
}
}
}

6
ReallifeGamemode.Server/Classes/TempBlip.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Classes
namespace ReallifeGamemode.Server.Classes
{
public class TempBlip
{

128
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1,26 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Business;
using System.Text.RegularExpressions;
using ReallifeGamemode.Server.Classes;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Finance;
using ReallifeGamemode.Server.Wanted;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Database;
using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Business;
using ReallifeGamemode.Server.Classes;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Finance;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
using ReallifeGamemode.Services;
/**
* @overview Life of German Reallife - Admin Commands (Admin.cs)
@@ -32,8 +31,8 @@ namespace ReallifeGamemode.Server.Commands
{
public class AdminCommands : Script
{
#region Todo
[Command("eat", "~m~Benutzung: ~s~/eat [Item]")]
public void CmdAdminEat(Player player, string item)
{
@@ -126,8 +125,10 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(player, msg);
}
#endregion
#endregion Todo
#region ahelp
[Command("ahelp", "~m~Benutzung: ~s~/ahelp")]
public void CmdAdminHelp(Player player)
{
@@ -143,35 +144,39 @@ namespace ReallifeGamemode.Server.Commands
case AdminLevel.MAPPING:
ChatService.SendMessage(player, "~b~ " + "/team, /tc, /position");
break;
case AdminLevel.ENTWICKLUNG:
ChatService.SendMessage(player, "~b~ " + "/team, /tc, /position");
break;
case AdminLevel.SUPPORTER:
ChatService.SendMessage(player, "~b~ " + "/tsupport, /showtickets, /rc, /rc quit, /o, /pm, /dimension, /to, /gh, /clearchat, /skick");
break;
case AdminLevel.ADMIN:
ChatService.SendMessage(player, "~b~ " + "/a, /countdown, /freeze, /unfreeze, /mark, /gotmark, /gotox, /up, /setdimension, /spec, /warn, /ip, /kick, /ban /unban, /slap, /takeweapon, /tov, /ghv, /factionlist, /businesslist, /joblist");
break;
case AdminLevel.ADMIN2:
ChatService.SendMessage(player, "~b~ " + "/sethp, /setarmor, /arevive, /aunjail, /aclear, /clothes, /props");
break;
case AdminLevel.ADMIN3:
ChatService.SendMessage(player, "~b~ " + "/adice, /settime, /setweather, /rsetarmor, /rgiveweapon, /giveweapon, /veh, /fv, /vfix, /vdestroy, /vlivery, /vcolor, /vehsmoke, /aneon, /mod, /showtuningmenu, /rvdestroy, /vsethp");
break;
case AdminLevel.HEADADMIN:
ChatService.SendMessage(player, "~b~ " + "/aspeed, /set, /setmoney, /givemoney, /sethandmoney, /givehandmoney, /paydaydrop, /setwage, /freekh, /ainvite, /makeleader, /managefactionranks, /setweaponrack, /rmweaponrack, /setweaponrank, /giveitem, /inventory, /save, /remove, /house, /setbusinessbankbalance, /reloaddors, /interior, /editmode, /setbliptemplate, /ipl, /load, /quicksavemode, /createturf, /setturf, /cancleturf, /reloadturfs, /deleteturfs, /setturfpoint");
break;
case AdminLevel.PROJEKTLEITUNG:
ChatService.SendMessage(player, "~b~ " + "/makeadmin, /whitelist, /blind");
break;
}
}
}
#endregion
#endregion ahelp
#region Mapping / Entwicklung
@@ -219,9 +224,10 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(player, "Position: X Y Z: " + player.Position + " Richtung: " + player.Heading);
}
#endregion Mapping / Entwicklung
#endregion
#region Support
[Command("tsupport", "~m~Benutzung: ~s~/tsupport", Alias = "ts")]
public void tsup(Player player)
{
@@ -242,8 +248,6 @@ namespace ReallifeGamemode.Server.Commands
GlobalHelper.tsupAdmins.Remove(player);
ChatService.SendMessage(player, "!{#ee4d2e}** " + "Du befindest dich nicht mehr im T-Support");
using (var dbContext = new DatabaseContext())
{
User targetUser = player.GetUser(dbContext);
@@ -252,12 +256,15 @@ namespace ReallifeGamemode.Server.Commands
case null:
player.SetSharedData("blipColor", 0);
break;
case 8:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;
@@ -281,8 +288,6 @@ namespace ReallifeGamemode.Server.Commands
ChatService.Broadcast("~g~[SUPPORT] " + player.Name + " hat sich zum Support angemeldet");
player.TriggerEvent("toggleADutyMode", true);
}
else
{
@@ -440,7 +445,7 @@ namespace ReallifeGamemode.Server.Commands
}
}
#endregion
#endregion Support
#region ALevel1
@@ -485,9 +490,6 @@ namespace ReallifeGamemode.Server.Commands
ChatService.BroadcastAdmin("!{#1db992}** AC " + player.Name + ":~w~ " + message, AdminLevel.ADMIN);
}
[Command("gotolist", "~m~Benutzung: ~s~/gotolist")] //TODO Als Browser anzeigeN??
public void CmdAdminGotoList(Player player)
{
@@ -815,7 +817,6 @@ namespace ReallifeGamemode.Server.Commands
NAPI.Entity.SetEntityVelocity(player.Vehicle, new Vector3());
}
else player.Position = new Vector3(p.X, p.Y, p.Z);
}
}
@@ -831,7 +832,6 @@ namespace ReallifeGamemode.Server.Commands
else player.Position = new Vector3(x, y, z);
}
[Command("slap", "~m~Benutzung: ~s~/slap [Spieler] (Höhe)")]
public void CmdAdminSlap(Player player, string name, int wert = 5)
{
@@ -963,8 +963,10 @@ namespace ReallifeGamemode.Server.Commands
}
}
#endregion
#endregion ALevel1
#region ALevel2
[Command("sethp", "~m~Benutzung: ~s~/sethp [Spieler] (Hp)")]
public void CmdAdminSetHp(Player player, string name, int hp = 100)
{
@@ -1130,7 +1132,6 @@ namespace ReallifeGamemode.Server.Commands
[Command("aclear", "~m~Benutzung: ~s~/aclear [Spieler] [Grund]", GreedyArg = true)]
public void CmdFactionClear(Player player, string nameOrId, string reason)
{
User user = player.GetUser();
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true)
{
@@ -1160,12 +1161,15 @@ namespace ReallifeGamemode.Server.Commands
case null:
target.SetSharedData("blipColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
break;
case 7:
target.SetSharedData("blipColor", 52);
break;
case 4:
target.SetSharedData("blipColor", 5);
break;
@@ -1176,7 +1180,9 @@ namespace ReallifeGamemode.Server.Commands
dbContext.SaveChanges();
}
}
#endregion
#endregion ALevel2
#region ALevel3
[Command("adice", "~m~Benutzung: ~s~/adice [Zahl]")]
@@ -1537,7 +1543,6 @@ namespace ReallifeGamemode.Server.Commands
TimeManager.PauseTimeManager();
NAPI.World.SetTime(hour, min, sec);
return;
}
[Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")]
@@ -1600,7 +1605,8 @@ namespace ReallifeGamemode.Server.Commands
}
}
#endregion
#endregion ALevel3
#region ALevel1337
[Command("wepmod", "~m~Benutzung: ~s~/wepmod [Variable]")]
public void CmdWeaponModifier(Player player, float modifier)
@@ -1618,7 +1624,6 @@ namespace ReallifeGamemode.Server.Commands
public void CmdAdminGotocp(Player admin)
{
admin.TriggerEvent("getCP");
}
[RemoteEvent("sendCP")]
@@ -1725,7 +1730,7 @@ namespace ReallifeGamemode.Server.Commands
else
{
UserItem item = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount };
InventoryManager.AddItemToInventory(target, item);
InventoryManager.AddItemToInventory(target, item.ItemId, item.Amount);
}
}
@@ -1771,7 +1776,6 @@ namespace ReallifeGamemode.Server.Commands
player.SendNotification("Edit-Mode ~r~deaktiviert");
player.TriggerEvent("toggleEditMode", false);
}
}
[Command("setbliptemplate", "~m~Benutzung: ~s~/setbliptemplate [byte COLOR] [byte ALPHA] [bool SHORTRANGE] [uint SPRITE] [float SCALE] [string NAME]", GreedyArg = true)]
@@ -1911,16 +1915,18 @@ namespace ReallifeGamemode.Server.Commands
case null:
target.SetSharedData("blipColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
break;
case 7:
target.SetSharedData("blipColor", 52);
break;
case 4:
target.SetSharedData("blipColor", 5);
break;
}
dbContext.SaveChanges();
}
@@ -1969,16 +1975,18 @@ namespace ReallifeGamemode.Server.Commands
case null:
target.SetSharedData("blipColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
break;
case 7:
target.SetSharedData("blipColor", 52);
break;
case 4:
target.SetSharedData("blipColor", 5);
break;
}
dbContext.SaveChanges();
@@ -1999,6 +2007,7 @@ namespace ReallifeGamemode.Server.Commands
case "blip":
player.TriggerEvent("saveBlip");
break;
case "goto":
if (option1 == null)
{
@@ -2020,10 +2029,10 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(player, "Einen Goto-Punkt mit dieser Bezeichnung gibt es schon!");
}
}
}
break;
case "vehicle":
if (player.IsInVehicle)
{
@@ -2036,6 +2045,7 @@ namespace ReallifeGamemode.Server.Commands
}
else ChatService.SendMessage(player, "~m~Du sitzt in keinem Fahrzeug!");
break;
case "fvehicle":
if (player.IsInVehicle)
{
@@ -2074,6 +2084,7 @@ namespace ReallifeGamemode.Server.Commands
}
else ChatService.SendMessage(player, "~m~Du sitzt in keinem Fahrzeug!");
break;
case "jvehicle":
if (player.IsInVehicle)
{
@@ -2262,6 +2273,7 @@ namespace ReallifeGamemode.Server.Commands
}
#region loadCommand
[Command("load", "~m~Benutzung: ~s~/load [Typ = OnlineBunkers, ArcadiusBusinessCentre, MazeBankBuilding, LomBank, MazeBankWest, ClubWareHouse, SpecialLocations, GRHYacht, DHYacht, PYacht, AircraftCarrier, BridgeTC, BridgeTN, NorthYankton, ONeilsFarmB, ONeilsFarm, Morgue")]
public void CmdAdminloadlocation(Player player, string typ)
{
@@ -2288,6 +2300,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("gr_case4_bunkerclosed");
ChatService.SendMessage(player, "~y~ Online Bunkers~s~ erfolgreich geladen!");
break;
case "ArcadiusBusinessCentre":
NAPI.World.RequestIpl("ex_dt1_02_office_02b");
NAPI.World.RequestIpl("ex_dt1_02_office_02c");
@@ -2304,6 +2317,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("imp_dt1_02_modgarage");
ChatService.SendMessage(player, "~y~ Arcadius Business Centre~s~ erfolgreich geladen!");
break;
case "MazeBankBuilding":
NAPI.World.RequestIpl("ex_dt1_11_office_02b");
NAPI.World.RequestIpl("ex_dt1_11_office_02c");
@@ -2320,6 +2334,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("imp_dt1_11_modgarage");
ChatService.SendMessage(player, "~y~ Maze Bank Building~s~ erfolgreich geladen!");
break;
case "LomBank":
NAPI.World.RequestIpl("ex_sm_13_office_02b");
NAPI.World.RequestIpl("ex_sm_13_office_02c");
@@ -2336,6 +2351,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("imp_sm_13_modgarage");
ChatService.SendMessage(player, "~y~Lom Bank~s~ erfolgreich geladen!");
break;
case "MazeBankWest":
NAPI.World.RequestIpl("ex_sm_15_office_02b");
NAPI.World.RequestIpl("ex_sm_15_office_02c");
@@ -2352,6 +2368,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("imp_sm_15_modgarage");
ChatService.SendMessage(player, "~y~Maze Bank West~s~ erfolgreich geladen!");
break;
case "ClubWareHouse":
NAPI.World.RequestIpl("bkr_biker_interior_placement_interior_0_biker_dlc_int_01_milo");
NAPI.World.RequestIpl("bkr_biker_interior_placement_interior_1_biker_dlc_int_02_milo");
@@ -2367,6 +2384,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("bkr_bi_hw1_13_int");
ChatService.SendMessage(player, "~y~Clubs & Warehouses~s~ erfolgreich geladen!");
break;
case "SpecialLocations":
NAPI.World.RequestIpl("cargoship");
NAPI.World.RequestIpl("sunkcargoship");
@@ -2383,6 +2401,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("FIBlobby");
ChatService.SendMessage(player, "~y~Special Locations~s~ erfolgreich geladen!");
break;
case "GRHYacht":
NAPI.World.RequestIpl("gr_heist_yacht2");
NAPI.World.RequestIpl("gr_heist_yacht2_bar");
@@ -2392,6 +2411,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("gr_heist_yacht2_lounge");
ChatService.SendMessage(player, "~y~Gunrunning heist Yacht~s~ erfolgreich geladen!");
break;
case "DHYacht":
NAPI.World.RequestIpl("hei_yacht_heist");
NAPI.World.RequestIpl("hei_yacht_heist_enginrm");
@@ -2403,11 +2423,13 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("hei_yacht_heist_LODLights");
ChatService.SendMessage(player, "~y~Dignity heist Yacht~s~ erfolgreich geladen!");
break;
case "PYacht":
NAPI.World.RequestIpl("smboat");
NAPI.World.RequestIpl("smboat_lod");
ChatService.SendMessage(player, "~y~Party Yacht~s~ erfolgreich geladen!");
break;
case "AircraftCarrier":
NAPI.World.RequestIpl("hei_carrier");
NAPI.World.RequestIpl("hei_carrier_DistantLights");
@@ -2420,16 +2442,19 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("hei_carrier_LODLights");
ChatService.SendMessage(player, "~y~Aircraft Carrier~s~ erfolgreich geladen!");
break;
case "BridgeTC":
NAPI.World.RequestIpl("canyonriver01_traincrash");
NAPI.World.RequestIpl("canyonriver01_traincrash");
ChatService.SendMessage(player, "~y~Bridge Train Crash~s~ erfolgreich geladen!");
break;
case "BridgeTN":
NAPI.World.RequestIpl("canyonriver01");
NAPI.World.RequestIpl("railing_start");
ChatService.SendMessage(player, "~y~Bridge Train Normal~s~ erfolgreich geladen!");
break;
case "NorthYankton":
NAPI.World.RequestIpl("prologue01");
NAPI.World.RequestIpl("prologue01c");
@@ -2464,6 +2489,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("prologuerdb");
ChatService.SendMessage(player, "~y~North Yankton~s~ erfolgreich geladen!");
break;
case "ONeilsFarmB":
NAPI.World.RequestIpl("farmint");
NAPI.World.RequestIpl("farm_burnt");
@@ -2472,21 +2498,23 @@ namespace ReallifeGamemode.Server.Commands
NAPI.World.RequestIpl("des_farmhs_end_occl");
ChatService.SendMessage(player, "~y~ONeils Farm Burnt~s~ erfolgreich geladen!");
break;
case "ONeilsFarm":
NAPI.World.RequestIpl("farm");
NAPI.World.RequestIpl("farm_props");
NAPI.World.RequestIpl("farm_int");
ChatService.SendMessage(player, "~y~ONeils Farm~s~ erfolgreich geladen!");
break;
case "Morgue":
NAPI.World.RequestIpl("coronertrash");
NAPI.World.RequestIpl("Coroner_Int_On");
ChatService.SendMessage(player, "~y~Morgue~s~ erfolgreich geladen!");
break;
}
}
#endregion
#endregion loadCommand
//
[Command("managefactionranks", "~m~Benutzung: ~s~/managefactionranks [Fraktions-ID]", Alias = "mfr")]
@@ -2713,7 +2741,6 @@ namespace ReallifeGamemode.Server.Commands
// return;
// }
//}
[Command("reloaddoors", "~m~Benutzung: ~s~/reloaddoors")]
@@ -2828,7 +2855,6 @@ namespace ReallifeGamemode.Server.Commands
dbContext.SaveChanges();
ChatService.SendMessage(player, "Waffeneintrag bearbeitet für die Fraktion " + f.Name + ": " + weaponModel + ", SlotId: " + slotId);
return;
}
FactionWeapon fw2 = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel);
@@ -2854,7 +2880,6 @@ namespace ReallifeGamemode.Server.Commands
}
}
[Command("rmweaponrack", "~m~Benutzung: ~s~/rmweaponrack [Fraktion ID] [Waffen Model]")]
public void CmdAdminRmWeaponrack(Player player, int factionID, string weaponModel)
{
@@ -3016,9 +3041,11 @@ namespace ReallifeGamemode.Server.Commands
}
player.TriggerEvent("ADMIN:Turf_CreateLeaderBlip");
}
#endregion
#endregion ALevel1337
#region ALevel1338
[Command("whitelist", "~m~Benutzung: ~s~/whitelist [Add / Remove] [Socialclub Name]")]
public void CmdAdminWhitelist(Player player, string option, string scName)
{
@@ -3123,6 +3150,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(target, "~b~[ADMIN]~s~ Du wurdest durch ~y~" + player.Name + " ~s~auf Adminlevel ~y~" + target.GetUser().AdminLevel.GetName() + " ~y~(" + rank + ") ~s~gesetzt.");
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast ~y~" + target.Name + " ~s~auf Adminlevel ~y~" + target.GetUser().AdminLevel.GetName() + " ~y~(" + rank + ") ~s~gesetzt.");
}
#endregion
#endregion ALevel1338
}
}

33
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -1,4 +1,7 @@
using GTANetworkAPI;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
@@ -6,11 +9,7 @@ using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Wanted;
using ReallifeGamemode.Services;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
/**
* @overview Life of German Reallife - Faction Commands (Faction.cs)
@@ -20,7 +19,7 @@ using System.Text.RegularExpressions;
namespace ReallifeGamemode.Server.Commands
{
class FactionCommands : Script
internal class FactionCommands : Script
{
#region Chat Commands
@@ -74,8 +73,11 @@ namespace ReallifeGamemode.Server.Commands
ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.StateOwned));
}
}
#endregion
#endregion Chat Commands
#region Leader Commands
[Command("giverank", "~m~Benutzung: ~s~/giverank [Name] [Rang]", GreedyArg = true)]
public void CmdFactionGiverank(Player player, string name, string rank)
{
@@ -173,8 +175,8 @@ namespace ReallifeGamemode.Server.Commands
}
}
#endregion Leader Commands
#endregion
#region Sanitäter Commands
[Command("revive", "~m~Benutzung: ~s~/revive")]
@@ -267,8 +269,11 @@ namespace ReallifeGamemode.Server.Commands
target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false);
player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false);
}
#endregion
#endregion Sanitäter Commands
#region Staatsfraktionen (LSPD / FBI) Commands
[Command("wanted", "~m~Benutzung: ~s~/wa(nted) [Spieler] [Anzahl] [Grund]", Alias = "wa", GreedyArg = true)]
public void CmdFactionWanted(Player player, string nameOrId, int amount, string reason)
{
@@ -311,7 +316,6 @@ namespace ReallifeGamemode.Server.Commands
[Command("clear", "~m~Benutzung: ~s~/clear [Spieler] [Grund]", GreedyArg = true)]
public void CmdFactionClear(Player player, string nameOrId, string reason)
{
User user = player.GetUser();
if (user == null || (user.FactionId != 1 && user.FactionId != 3))
{
@@ -348,9 +352,11 @@ namespace ReallifeGamemode.Server.Commands
case 8:
target.SetSharedData("blipColor", 83);
break;
case 7:
target.SetSharedData("blipColor", 52);
break;
case 4:
target.SetSharedData("blipColor", 5);
break;
@@ -362,11 +368,6 @@ namespace ReallifeGamemode.Server.Commands
}
}
#endregion
#region Global Fraktions Commands
#endregion
#endregion Staatsfraktionen (LSPD / FBI) Commands
}
}

13
ReallifeGamemode.Server/Commands/GroupCommands.cs
View File

@@ -1,16 +1,14 @@
using GTANetworkAPI;
using System.Text.RegularExpressions;
using GTANetworkAPI;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
namespace ReallifeGamemode.Server.Commands
{
class GroupCommands : Script
internal class GroupCommands : Script
{
#region Chat Commands
[Command("gc", "~m~Benutzung: ~s~/gc [Nachricht]", GreedyArg = true)]
public void CmdGroupG(Player player, string message)
{
@@ -26,6 +24,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.BroadcastGroup(message, group);
}
#endregion
#endregion Chat Commands
}
}

11
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -1,17 +1,14 @@
using GTANetworkAPI;
using ReallifeGamemode.Database;
using System;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Finance;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using System;
using System.Linq;
namespace ReallifeGamemode.Server.Commands
{
class UserCommands : Script
internal class UserCommands : Script
{
[Command("dice", "~m~Benutzung: ~s~/dice")]
public void CmdUserDice(Player player)
@@ -52,7 +49,6 @@ namespace ReallifeGamemode.Server.Commands
[Command("paycheck", "~m~Benutzung: ~s~/paycheck")]
public void CmdUserPaycheck(Player client)
{
User user = client.GetUser();
if (Economy.Paychecks.ContainsKey(user.Id))
{
@@ -68,6 +64,5 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(client, "~g~[PAYCHECK] -------------------------------------------------------");
}
}
}
}

22
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -1,18 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Services;
using System.Linq;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.DrivingSchool
{
class DrivingSchool : Script
internal class DrivingSchool : Script
{
private static TextLabel informationLabel;
private static Marker marker;
@@ -40,6 +36,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
new Vector3(-813.57, -1290.37, 4.59),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> DrivingRoute = new List<Vector3>
{
//BEGIN
@@ -80,12 +77,12 @@ namespace ReallifeGamemode.Server.DrivingSchool
new Vector3(-617.66, -1259.34, 9.82),
new Vector3(-758.35, -1285.03, 3.48),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> StopCar = new List<Vector3>
{
new Vector3(-788.66, -1278.75, 4),
}.AsReadOnly();
public static void Setup()
{
informationLabel = NAPI.TextLabel.CreateTextLabel("Fahrschule\n~y~Auto ~s~- $~g~2500\n~y~Motorrad ~s~- $~g~3500", new Vector3(-813.17, -1354.5, 5.14), 20.0f, 1.3f, 0, new Color(255, 255, 255));
@@ -181,7 +178,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
user.Position = new Vector3(-813.17, -1354.5, 4.14);
}
[RemoteEvent("drivingSchoolEvent")]
public void DrivingSchoolEvent(Player user, int checkpoint)
{
@@ -189,7 +185,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch.");
}
else if (checkpoint == 9)
{
user.TriggerEvent("renderTextOnScreen", "Fahre zwischen den Laternen Slalom.");
@@ -205,8 +200,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
}
}
[RemoteEvent("startBikeSchool")]
public void StartBikeSchool(Player client)
{
@@ -233,7 +226,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
client.TriggerEvent("waitPlayerEntersVehicle");
}
[RemoteEvent("bikeSchoolEventEnd")]
public void bikeSchoolEventEnd(Player user, int checkpoint)
{
@@ -258,7 +250,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
user.Position = new Vector3(-813.17, -1354.5, 4.14);
}
[RemoteEvent("bikeSchoolEvent")]
public void bikeSchoolEvent(Player user, int checkpoint)
{
@@ -272,6 +263,5 @@ namespace ReallifeGamemode.Server.DrivingSchool
CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, "bikeSchoolEventEnd");
}
}
}
}

5
ReallifeGamemode.Server/DrivingSchool/Licenses.cs
View File

@@ -1,7 +1,4 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.DrivingSchool
{
@@ -19,7 +16,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
[JsonProperty("weaponLicense")]
public bool WeaponLicense { get; set; }
public Licenses(bool CarLicense, bool BikeLicense, bool PlaneLicense, bool weaponLicense)
{
this.CarLicense = CarLicense;
@@ -27,6 +23,5 @@ namespace ReallifeGamemode.Server.DrivingSchool
this.PlaneLicense = PlaneLicense;
this.WeaponLicense = weaponLicense;
}
}
}

21
ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
View File

@@ -1,18 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Services;
using System.Linq;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.DrivingSchool
{
class PlaneSchool : Script
internal class PlaneSchool : Script
{
private static TextLabel informationLabel1;
private static Marker marker1;
@@ -38,16 +34,13 @@ namespace ReallifeGamemode.Server.DrivingSchool
new Vector3(-869.77, -1424.05, 133),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> planeRouteEnd = new List<Vector3>
{
new Vector3(-1164.29, -2351.52, 14.88),
}.AsReadOnly();
public static void Setup()
{
informationLabel1 = NAPI.TextLabel.CreateTextLabel("Flugschule\n~y~Flugschein ~s~- $~g~5000", new Vector3(-1083.96, -2476.96, 14.07), 20.0f, 1.3f, 0, new Color(255, 255, 255));
marker1 = NAPI.Marker.CreateMarker(MarkerType.VerticalCylinder, new Vector3(-1083.96, -2476.96, 13.07), new Vector3(), new Vector3(), 1f, new Color(255, 255, 255));
@@ -56,6 +49,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
_colShape1.OnEntityExitColShape += EntityExitBusinessColShape;
NAPI.Blip.CreateBlip(90, new Vector3(-1083.96, -2476.96, 14.07), 1.0f, 4, "Flugschule", shortRange: true);
}
private static void EntityEnterBusinessColShape(ColShape colShape, Player client)
{
if (client.IsInVehicle || !client.IsLoggedIn()) return;
@@ -132,6 +126,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
user.ResetData("ActiveSchool");
user.Position = new Vector3(-1083.96, -2476.96, 13.07);
}
[RemoteEvent("planeSchoolEvent")]
public void planeSchoolEvent(Player user, int checkpoint)
{
@@ -177,11 +172,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
user.TriggerEvent("renderTextOnScreen", "Setze zum landeflug an. Drücke 'G' um ihr Fahrwerk auszufahren.");
CheckPointHandle.StartCheckPointRoute(user, planeRouteEnd, 5000, 6, 12, "planeSchoolEventEnd");
break;
}
}
}
}

6
ReallifeGamemode.Server/Events/Chat.cs
View File

@@ -1,6 +1,6 @@
using GTANetworkAPI;
using System.Text.RegularExpressions;
using GTANetworkAPI;
using ReallifeGamemode.Server.Services;
using System.Text.RegularExpressions;
namespace ReallifeGamemode.Server.Events
{
@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Events
if (serverMsg.Trim().Length == 0) return;
NAPI.Player.GetPlayersInRadiusOfPlayer(10, player).ForEach(p =>
{
ChatService.SendMessage(p, $"{player.Name} sagt: {serverMsg}");//
ChatService.SendMessage(p, $"{player.Name} sagt: {serverMsg}");
});
}
}

10
ReallifeGamemode.Server/Events/Connect.cs
View File

@@ -1,12 +1,9 @@
using System;
using System;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
@@ -16,7 +13,7 @@ using ReallifeGamemode.Server.Wanted;
namespace ReallifeGamemode.Server.Events
{
class Connect : Script
internal class Connect : Script
{
[ServerEvent(Event.PlayerConnected)]
public void OnPlayerConnected(Player player)
@@ -24,7 +21,6 @@ namespace ReallifeGamemode.Server.Events
player.SetData("isLoggedIn", false);
player.Position = new Vector3(-1883.736, -781.4911, -10);
using (var dbContext = new DatabaseContext())
{
if (!dbContext.WhitelistEntries.Any(w => w.SocialClubName.ToLower() == player.SocialClubName.ToLower()))
@@ -41,12 +37,10 @@ namespace ReallifeGamemode.Server.Events
}
}
if (IsPlayerBanned(player)) return;
player.TriggerEvent("SERVER:Login_ShowBrowser");
string msg = "~m~*** " + player.Name + " [" + player.SocialClubName + "] [ID: " + player.Handle.Value + "] (" + player.Address + ")";
ChatService.BroadcastAdmin(msg, AdminLevel.ADMIN);
}
private bool IsPlayerBanned(Player player)

36
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -1,13 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Inventory;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
/**
@@ -66,7 +69,6 @@ namespace ReallifeGamemode.Server.Events
User user = player.GetUser();
if (user.JailTime <= 0)
{
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()
{
@@ -92,8 +94,35 @@ namespace ReallifeGamemode.Server.Events
//TODO PICTURE NOTIFICATION + SOUND für Medics
player.ClearAttachments();
using (var userDeath = new DatabaseContext())
{
List<UserItem> fItem = userDeath.UserItems.Where(u => u.UserId == user.Id).ToList();
foreach (var item in fItem)
{
IItem iItem = InventoryManager.GetItemById(item.ItemId);
if (iItem is IWeaponDealItem obj)
{
int amount = item.Amount;
Vector3 dropPosition = PlayerExtension.GetPositionFromPlayer(player, 0.6f, 0);
//new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f);
Random r = new Random();
GTANetworkAPI.Object grndObject;
Vector3 textPos = dropPosition;
dropPosition.Z -= 1.05f;
grndObject = NAPI.Object.CreateObject(3666746839, dropPosition, new Vector3(0, 0, r.Next(0, 360)), 255, 0);
GroundItem grndItem = new GroundItem { ItemId = iItem.Id, Amount = amount, Position = dropPosition };
TextLabel grndTxtLbl = NAPI.TextLabel.CreateTextLabel(iItem.Name + " ~s~(~y~" + amount + "~s~)", textPos, 5, 0.5f, 4, new Color(255, 255, 255), false, 0);
GroundItem.AddGroundItem(grndItem, grndObject, grndTxtLbl);
userDeath.Remove(item);
}
}
var dead = new Database.Entities.Logs.Death
{
VictimId = player.GetUser().Id,
@@ -117,7 +146,6 @@ namespace ReallifeGamemode.Server.Events
Jail.Check_PutBehindBars(player);
}
[RemoteEvent("RespawnPlayerAtHospital")]
public void RespawnPlayerAtHospital(Player player)
{

11
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -1,16 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Database;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
/**
* @overview Life of German Reallife - Event Login (Login.cs)

14
ReallifeGamemode.Server/Events/EnterVehicle.cs
View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
@@ -19,16 +17,16 @@ namespace ReallifeGamemode.Server.Events
return;
}
if (vehicle.HasMarkerBehind())
vehicle.RemoveMarkerBehind();
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
User u = client.GetUser();
if (u.FactionId != null && (!veh.GetOwners().Contains(u.FactionId.Value)) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
if (u.FactionId != null && (veh.GetOwners().Contains(u.FactionId.Value)) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
{
Vector3 vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
if (vector == new Vector3())
return;
List<Vector3> dealPoint = new List<Vector3>();
dealPoint.Add(vector);
dealPoint.Add(vehicle.GetData<Vector3>("weaponDealPoint"));
CheckPointHandle.StartCheckPointRoute(client, dealPoint, 5000, 1, 7, "loadWeaponTransport");
}
}

6
ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Types;
@@ -10,7 +7,6 @@ using ReallifeGamemode.Server.WeaponDeal;
namespace ReallifeGamemode.Server.Events
{
public class EnterVehicleAttempt : Script
{
[ServerEvent(Event.PlayerEnterVehicleAttempt)]

15
ReallifeGamemode.Server/Events/ExitVehicle.cs
View File

@@ -1,12 +1,8 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.WeaponDeal;
namespace ReallifeGamemode.Server.Events
{
@@ -15,8 +11,11 @@ namespace ReallifeGamemode.Server.Events
[ServerEvent(Event.PlayerExitVehicleAttempt)]
public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle)
{
if (client.VehicleSeat != -1)
if (client.VehicleSeat != 0)
return;
client.TriggerEvent("SERVER:setMarkerBehindVehicle", vehicle);
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
User u = client.GetUser();
@@ -25,6 +24,10 @@ namespace ReallifeGamemode.Server.Events
CheckPointHandle.RemovePlayerHandlerFromList(client);
client.TriggerEvent("destroyCP");
}
else if ((u.FactionId != null) && (veh.GetOwners().Contains(u.FactionId ?? 0)) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("WeaponDealLoad") && vehicle.GetData<bool>("WeaponDealLoad") == true)
{
client.TriggerEvent("SERVER:setMarkerBehindVehicle", vehicle);
}
}
if (vehicle.GetServerVehicle() is SchoolVehicle vehS)
{

8
ReallifeGamemode.Server/Events/Faction.cs
View File

@@ -1,15 +1,15 @@
using GTANetworkAPI;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util;
using System.Collections.Generic;
using System.Linq;
namespace ReallifeGamemode.Server.Events
{
class Faction : Script
internal class Faction : Script
{
[RemoteEvent("OnFactionRanksEdit")]
public void OnFactionRanksEdit(Player player, string jsonData)

7
ReallifeGamemode.Server/Events/Inventory.cs
View File

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
@@ -9,7 +7,6 @@ using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
using Newtonsoft.Json;
namespace ReallifeGamemode.Server.Events
{
@@ -60,7 +57,6 @@ namespace ReallifeGamemode.Server.Events
iName.Add(iItem.Name);
iAmount.Add(vehItem.Amount);
iId.Add(iItem.Id);
}
var vehInv = new VehicleInventory
{
@@ -75,6 +71,5 @@ namespace ReallifeGamemode.Server.Events
}
return vehicleInventory;
}
}
}

95
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -2,21 +2,21 @@
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Classes;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Classes;
using ReallifeGamemode.Server.DrivingSchool;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Finance;
using ReallifeGamemode.Server.Inventory;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.DrivingSchool;
using ReallifeGamemode.Server.Types;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.WeaponDeal;
/**
* @overview Life of German Reallife - Event Key (Key.cs)
* @author VegaZ
@@ -46,6 +46,7 @@ namespace ReallifeGamemode.Server.Events
tempBlip.Transparency.ToString(), 200.ToString(), tempBlip.ShortRange.ToString(), 0.ToString(), 0.ToString());
player.SendNotification("~y~Blip~s~ erstellt!", false);
break;
case "atm":
SaveManager.OnSaveBlipData(player, "500", "Geldautomat", 0.7.ToString(), "11",
"0", "200", true.ToString(), 0.ToString(), 0.ToString());
@@ -170,7 +171,6 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsLoggedIn()) return;
var user = player.GetUser();
if (user?.FactionId != null)
{
DutyPoint nearestDuty = PositionManager.DutyPoints.Find(d => d.Position.DistanceTo(player.Position) <= 1.5 && d.FactionId == user.FactionId);
@@ -179,7 +179,63 @@ namespace ReallifeGamemode.Server.Events
ElevatorPoint nearestElevatorPoint = PositionManager.ElevatorPoints.Find(e => e.Position.DistanceTo(player.Position) <= 1.5 && (user.FactionId == 1 || user.FactionId == 3));
ClotheshopPoint nearestClotheShopPoint = PositionManager.clotheshopPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5 && (!user.GetData<bool>("duty")));
ItemshopPoint nearestItemShopPoint = PositionManager.itemshopPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5);
BehindVehiclePoint nearestBehindVehiclePoint = MarkerBehinVehicle.behindVehiclePoints.Find(s => s.marker.Position.DistanceTo(player.Position) <= 3 && (user.FactionId == 8 || user.FactionId == 7 || user.FactionId == 1 || user.FactionId == 3));
if (nearestBehindVehiclePoint != null)
{
if (player.HasAttachment("ammobox")) return;
using (var dbContext = new DatabaseContext())
{
List<VehicleItem> vehicleItems = dbContext.VehicleItems.Where(f => f.GetVehicle().GetVehicle() == nearestBehindVehiclePoint.vehicle && InventoryManager.GetItemById(f.ItemId) is IWeaponDealItem).ToList();
if (vehicleItems.Count == 0)
{
GTANetworkAPI.Vehicle vehicle = nearestBehindVehiclePoint.vehicle;
if (WeaponDealManager.checkWeaponDbyVehicle(vehicle))
{
vehicle.ResetData("WeaponDealLoad");
}
nearestBehindVehiclePoint.vehicle.RemoveMarkerBehind();
return;
}
foreach (var v in vehicleItems)
{
int itemToAdd = 0;
for (int i = 1; i <= v.Amount; i++)
{
if (InventoryManager.GetUserInventoryWeight(player) + (i * InventoryManager.GetItemById(v.ItemId).Gewicht) > 40000)
{
break;
}
else
{
itemToAdd = i;
}
}
if (itemToAdd == 0)
break;
v.Amount -= itemToAdd;
if (v.Amount <= 0)
dbContext.VehicleItems.Remove(v);
var newItem = new UserItem()
{
ItemId = v.ItemId,
Slot = v.Slot,
Amount = itemToAdd,
UserId = user.Id,
};
InventoryManager.AddItemToInventory(player, newItem.Id, newItem.Amount);
nearestBehindVehiclePoint.usePoint(player);
dbContext.SaveChanges();
return;
}
}
}
if (nearestDuty != null)// Duty Point
{
var nameTagColor = new Color(0, 0, 0);
@@ -259,7 +315,6 @@ namespace ReallifeGamemode.Server.Events
}
if (nearestWeapon != null) // Weapon Point
{
List<string> primarys = new List<string>();
List<string> secondarys = new List<string>();
List<string> melees = new List<string>();
@@ -271,11 +326,13 @@ namespace ReallifeGamemode.Server.Events
melees.Add("Keine");
specials.Add("Keine");
using (var context = new DatabaseContext())
{
if (player.HasAttachment("ammobox"))
{
player.AddAttachment("ammobox", true);
player.StopAnimation();
}
List<UserItem> fItem = context.UserItems.Where(u => u.UserId == user.Id).ToList();
foreach (var item in fItem)
@@ -285,7 +342,11 @@ namespace ReallifeGamemode.Server.Events
{
FactionWeapon weapon = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == iItem.Name).FirstOrDefault();
if (weapon == null)
{
context.Remove(item);
continue;
}
weapon.Ammount += item.Amount;
ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefürgt.");
context.Remove(item);
@@ -311,14 +372,17 @@ namespace ReallifeGamemode.Server.Events
if (user.FactionRank.Order >= weapon.Rank)
primarys.Add(weapon.WeaponModel.ToString());
break;
case 2:
if (user.FactionRank.Order >= weapon.Rank)
secondarys.Add(weapon.WeaponModel.ToString());
break;
case 3:
if (user.FactionRank.Order >= weapon.Rank)
melees.Add(weapon.WeaponModel.ToString());
break;
case 4:
if (user.FactionRank.Order >= weapon.Rank)
specials.Add(weapon.WeaponModel.ToString());
@@ -374,7 +438,8 @@ namespace ReallifeGamemode.Server.Events
public void KeyPressI(Player player)
{
if (!player.IsLoggedIn()) return;
InventoryManager.GetUserItems(player);
player.TriggerEvent("inventoryShow");
InventoryManager.SetBackpackItems(player);
}
[RemoteEvent("keyPress:O")]
@@ -429,9 +494,11 @@ namespace ReallifeGamemode.Server.Events
case 11:
tops.Add(cloth.ClothId.ToString());
break;
case 4:
legs.Add(cloth.ClothId.ToString());
break;
case 6:
shoes.Add(cloth.ClothId.ToString());
break;
@@ -441,7 +508,6 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("showDutyClothMenu", hats.ToArray(), tops.ToArray(), legs.ToArray(), shoes.ToArray());
}
}
}
[RemoteEvent("keyPress:L")]
@@ -526,7 +592,6 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsInVehicle)
{
Vehicle.VehicleMenuLockCarEvent(player);
GroundItem.PickUpGroundItem(player);

11
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -1,16 +1,14 @@
using System.Linq;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
using ReallifeGamemode.Database;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Database.Entities;
using Newtonsoft.Json;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
@@ -96,12 +94,15 @@ namespace ReallifeGamemode.Server.Events
case null:
player.SetSharedData("blipColor", 0);
break;
case 8:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;

4
ReallifeGamemode.Server/Events/Register.cs
View File

@@ -1,7 +1,7 @@
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
/**
* @overview Life of German Reallife - Event Register (Register.cs)
@@ -11,7 +11,7 @@ using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Server.Events
{
class Register : Script
internal class Register : Script
{
[RemoteEvent("CLIENT:Login_RegisterRequest")]
public void OnPlayerRegister(Player player, string username, string password, string passwordRepeat)

4
ReallifeGamemode.Server/Events/ResourceStop.cs
View File

@@ -1,6 +1,6 @@
using GTANetworkAPI;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Models;
using System.Linq;
/**
* @overview Life of German Reallife - Event ResourceStop (ResourceStop.cs)

9
ReallifeGamemode.Server/Events/Siren.cs
View File

@@ -1,11 +1,9 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.Text;
using System.Collections.Generic;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Events
{
class Siren : Script
internal class Siren : Script
{
private readonly Dictionary<NetHandle, bool> _sirenStates = new Dictionary<NetHandle, bool>();
@@ -21,7 +19,6 @@ namespace ReallifeGamemode.Server.Events
pV.SetSharedData("sirenSound", newValue);
NAPI.ClientEvent.TriggerClientEventForAll("toggleVehicleSiren", pV, newValue);
}
}
}

2
ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs
View File

@@ -187,7 +187,6 @@ namespace ReallifeGamemode.Server.Events
}
using (var dbContext = new DatabaseContext())
{
var clothes = dbContext.CharacterClothes.FirstOrDefault(c => c.UserId == user.Id && c.SlotId == data[0] && c.Duty == false);
if (clothes == null)
@@ -254,7 +253,6 @@ namespace ReallifeGamemode.Server.Events
client.GetUser(dbContext).Handmoney -= data[6];
dbContext.SaveChanges();
client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
}
client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]);
}

6
ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs
View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Events
{
public class UpdateCharacterElevator : Script

5
ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
@@ -48,7 +47,6 @@ namespace ReallifeGamemode.Server.Events
client.RemoveAllWeapons();
}
[RemoteEvent("saveWeaponSelection")]
public void SaveWeaponSelection(Player client, string primaryModel, string secondaryModel, string meleeModel, string specialModel)
{
@@ -69,7 +67,6 @@ namespace ReallifeGamemode.Server.Events
melee = NAPI.Util.GetHashKey($"weapon_{meleeModel}");
}
client.GiveWeapon((WeaponHash)primary, 50);
client.GiveWeapon((WeaponHash)secondary, 150);
client.GiveWeapon((WeaponHash)melee, 1);

8
ReallifeGamemode.Server/Events/Vehicle.cs
View File

@@ -1,11 +1,10 @@
using GTANetworkAPI;
using ReallifeGamemode.Database;
using System;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using System;
namespace ReallifeGamemode.Server.Events
{
@@ -175,7 +174,6 @@ namespace ReallifeGamemode.Server.Events
msg += state ? "~g~abgeschlossen" : "~r~aufgeschlossen";
player.TriggerEvent("vehsync:OpenCar", state);
player.SendNotification(msg);
}
}
@@ -280,7 +278,5 @@ namespace ReallifeGamemode.Server.Events
VehicleStreaming.SetDoorState(veh, doorId, DoorState.DoorClosed);
}
}
}
}

2
ReallifeGamemode.Server/Events/Voice.cs
View File

@@ -8,7 +8,7 @@
namespace ReallifeGamemode.Server.Events
{
class Voice : Script
internal class Voice : Script
{
[RemoteEvent("CLIENT:AddVoiceListener")]
public void AddPlayerVoiceListenerEvent(Player player, Player target)

9
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -1,12 +1,12 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using System;
using System.Collections.Generic;
using System.Linq;
/**
* @overview Life of German Reallife - Player Extension (PlayerExtension.cs)
@@ -130,6 +130,7 @@ namespace ReallifeGamemode.Server.Extensions
}
}
}
public static FactionRank GetFactionRank(this User user)
{
using (var dbContext = new DatabaseContext())

16
ReallifeGamemode.Server/Extensions/EnumExtensions.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Util;
using System;
using System.Collections.Generic;
using System.Text;
using ReallifeGamemode.Database;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Types;
using static ReallifeGamemode.Server.Types.AdminLevel;
namespace ReallifeGamemode.Server.Extensions
@@ -21,18 +16,24 @@ namespace ReallifeGamemode.Server.Extensions
{
case MAPPING:
return "Mapper";
case ENTWICKLUNG:
return "Entwickler";
case SUPPORTER:
return "Supporter";
case ADMIN:
case ADMIN2:
case ADMIN3:
return "Admin";
case HEADADMIN:
return "Headadmin";
case PROJEKTLEITUNG:
return "Projektleiter";
default:
return "Spieler";
}
@@ -44,10 +45,13 @@ namespace ReallifeGamemode.Server.Extensions
{
case GroupRank.OWNER:
return "Besitzer";
case GroupRank.MANAGER:
return "Manager";
case GroupRank.MEMBER:
return "Mitglied";
default:
return "Keiner";
}

6
ReallifeGamemode.Server/Extensions/HouseExtensions.cs
View File

@@ -1,11 +1,11 @@
using Microsoft.EntityFrameworkCore;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System.Linq;
namespace ReallifeGamemode.Server.Extensions
{
static class HouseExtensions
internal static class HouseExtensions
{
public static House Refresh(this House house)
{

7
ReallifeGamemode.Server/Extensions/IntegerExtension.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Extensions
namespace ReallifeGamemode.Server.Extensions
{
public static class IntegerExtension
{
@@ -10,6 +6,7 @@ namespace ReallifeGamemode.Server.Extensions
{
return ToMoneyString(money ?? 0);
}
public static string ToMoneyString(this int money)
{
return "$" + string.Format(Main.SERVER_CULTURE, "{0:C0}", money).Replace("€", "").Trim();

8
ReallifeGamemode.Server/Extensions/ListExtensions.cs
View File

@@ -1,12 +1,10 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Extensions
{
static class ListExtensions
internal static class ListExtensions
{
public static bool Contains(this List<Player> list, Player client)
{

5
ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Managers;

4
ReallifeGamemode.Server/Extensions/VehicleExtension.cs
View File

@@ -1,8 +1,8 @@
using GTANetworkAPI;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Managers;
using System.Linq;
namespace ReallifeGamemode.Server.Extensions
{

16
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Collections.Generic;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Services;
/**
* @overview Life of German Reallife - Server Factions Medic Medic.cs
@@ -11,7 +8,6 @@ using ReallifeGamemode.Server.Services;
* @copyright (c) 2008 - 2018 Life of German
*/
namespace ReallifeGamemode.Server.Factions.Medic
{
public class Medic : Script
@@ -32,9 +28,11 @@ namespace ReallifeGamemode.Server.Factions.Medic
case MedicTaskType.REVIVE:
ReviveTasks.Add(task);
break;
case MedicTaskType.HEAL:
HealTasks.Add(task);
break;
case MedicTaskType.FIRE:
FireTasks.Add(task);
break;
@@ -53,14 +51,17 @@ namespace ReallifeGamemode.Server.Factions.Medic
case MedicTaskType.REVIVE:
ReviveTasks.Remove(task);
break;
case MedicTaskType.HEAL:
HealTasks.Remove(task);
break;
case MedicTaskType.FIRE:
FireTasks.Remove(task);
break;
}
}
[RemoteEvent("loadMedicTasks")]
public void LoadMedicTasks(Player player, int type)
{
@@ -69,14 +70,17 @@ namespace ReallifeGamemode.Server.Factions.Medic
case 0:
player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks));
break;
case 1:
player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks));
break;
case 2:
player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks));
break;
}
}
[RemoteEvent("updateMedicTask")]
public void UpdateMedicTasks(Player player, int type, int index, string medicName)
{
@@ -85,9 +89,11 @@ namespace ReallifeGamemode.Server.Factions.Medic
case 0:
ReviveTasks[index].MedicName = medicName;
break;
case 1:
HealTasks[index].MedicName = medicName;
break;
case 2:
FireTasks[index].MedicName = medicName;
break;

3
ReallifeGamemode.Server/Factions/Medic/MedicTask.cs
View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
/**
@@ -9,7 +7,6 @@ using GTANetworkAPI;
* @copyright (c) 2008 - 2018 Life of German
*/
namespace ReallifeGamemode.Server.Factions.Medic
{
public class MedicTask

16
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -4,18 +4,16 @@
@copyright (c) 2008 - 2019 Life of German
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
namespace ReallifeGamemode.Server.Finance
{
@@ -52,7 +50,6 @@ namespace ReallifeGamemode.Server.Finance
}
vehicleTaxation += (int)(uVeh.Price * 0.005f);
}
}
return vehicleTaxation;
}
@@ -69,7 +66,6 @@ namespace ReallifeGamemode.Server.Finance
return propertyTaxation;
}
public static void SetPaycheck(Player client)
{
User user = client.GetUser();
@@ -81,7 +77,6 @@ namespace ReallifeGamemode.Server.Finance
int healthInsurance = (int)(user.BankAccount.Balance * 0.001);
int? factionMoney = null;
if (user.Faction != null && user.FactionRank != null)
@@ -124,7 +119,6 @@ namespace ReallifeGamemode.Server.Finance
u.PaydayTimer = 60;
NAPI.Util.ConsoleOutput("set sachen");
var rentals = dbContext.HouseRentals
@@ -132,7 +126,6 @@ namespace ReallifeGamemode.Server.Finance
.ThenInclude(h => h.BankAccount)
.Where(hR => hR.UserId == u.Id);
NAPI.Util.ConsoleOutput("get rentals");
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += (int)(paycheck.HealthInsurance * 0.1);
@@ -155,7 +148,6 @@ namespace ReallifeGamemode.Server.Finance
ChatService.SendMessage(client, "~g~[PAYDAY]~s~ Dein Stundenumsatz beträgt + $~g~" + paycheck.Amount + "~s~.");
else
ChatService.SendMessage(client, "~g~[PAYDAY]~s~ Dein Stundenumsatz beträgt - $~r~" + paycheck.Amount + "~s~.");
}
public static void Timer_Elapsed()

11
ReallifeGamemode.Server/Finance/Paycheck.cs
View File

@@ -1,13 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using Newtonsoft.Json;
namespace ReallifeGamemode.Server.Finance
{

3
ReallifeGamemode.Server/Gangwar/Gangwar.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;

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

@@ -1,21 +1,19 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using System.Timers;
using System.Linq;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Services;
using Newtonsoft.Json;
using System.Timers;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
namespace ReallifeGamemode.Server.Gangwar
{
public class Turf
{
public int TurfID { get; set; }
public string TurfName { get; set; }
public int Color { get; set; }
@@ -32,7 +30,6 @@ namespace ReallifeGamemode.Server.Gangwar
public Player[] playerInGangwar { get; set; }
public int timerCount;
public Turf(int TurfID, string TurfName, int color, string Owner, int value, int maxValue, bool surplus)
{
this.TurfID = TurfID;
@@ -124,11 +121,10 @@ namespace ReallifeGamemode.Server.Gangwar
}
}
private void update()
{
#region Ticket system
/*
try
{
@@ -151,7 +147,9 @@ namespace ReallifeGamemode.Server.Gangwar
if(owners.Length < attackers.Length)
this.Def_Score -= attackers.Length - owners.Length;
*/
#endregion
#endregion Ticket system
foreach (Player gangwarPlayer in this.playerInGangwar)
{
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score);
@@ -276,7 +274,6 @@ namespace ReallifeGamemode.Server.Gangwar
turf.FactionId = dbContext.Factions.Where(f => f.Name == this.Owner).FirstOrDefault().Id;
dbContext.SaveChanges();
}
}
this.Attacker = null;
foreach (var c in playerInGangwar)
@@ -312,7 +309,6 @@ namespace ReallifeGamemode.Server.Gangwar
}
List<Player> inGangwar = new List<Player>(ownersInGangwar.Concat(attackersInGangwar));
usersInGangwar = inGangwar.ToArray();
}
if (this.status == "normal")

26
ReallifeGamemode.Server/Inventory/GroundItem.cs
View File

@@ -1,11 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using System.Linq;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Server.Inventory
{
@@ -34,10 +34,12 @@ namespace ReallifeGamemode.Server.Inventory
var invWeight = InventoryManager.GetUserInventoryWeight(player);
var itemsToAdd = 0;
GTANetworkAPI.Object nearestObject = GroundObjects.FirstOrDefault(d => d.Position == nearest.Position);
TextLabel nearestTextLabel = GroundTextLabels.FirstOrDefault(d => d.Position == nearest.Position);
TextLabel nearestTextLabel = GroundTextLabels.FirstOrDefault(d => d.Position == new Vector3(nearest.Position.X, nearest.Position.Y, nearest.Position.Z + 1.05) || d.Position == new Vector3(nearest.Position.X, nearest.Position.Y, nearest.Position.Z + 0.8));
IItem nearestItem = InventoryManager.GetItemById(nearest.ItemId);
UserItem existingItem = InventoryManager.UserHasThisItem(player, nearest.ItemId);
var user = player.GetUser();
if (player.HasAttachment("ammobox"))
{ player.SendNotification("~r~Du kannst momentan nichts tragen!", false); return; }
if (nearestItem.Gewicht * nearest.Amount + invWeight > 40000)
{
for (var i = 1; i <= nearest.Amount; i++)
@@ -69,7 +71,7 @@ namespace ReallifeGamemode.Server.Inventory
else
{
UserItem newItem = new UserItem { ItemId = nearest.ItemId, UserId = user.Id, Amount = nearest.Amount };
InventoryManager.AddItemToInventory(player, newItem);
InventoryManager.AddItemToInventory(player, newItem.ItemId, newItem.Amount);
}
nearest.Amount -= itemsToAdd;
nearestTextLabel.Text = nearestItem.Name + " ~s~(~y~" + nearest.Amount + "~s~)";
@@ -90,11 +92,20 @@ namespace ReallifeGamemode.Server.Inventory
else
{
UserItem item = new UserItem() { ItemId = nearest.ItemId, UserId = user.Id, Amount = nearest.Amount };
InventoryManager.AddItemToInventory(player, item);
InventoryManager.AddItemToInventory(player, item.ItemId, item.Amount);
}
RemoveGroundItem(nearest, nearestObject, nearestTextLabel);
player.SendNotification("Du hast ~g~" + nearest.Amount + " ~y~" + nearestItem.Name + " ~s~aufgehoben.");
}
if (nearestItem is IWeaponDealItem obj)
{
if (!player.HasAttachment("ammobox"))
{
player.PlayAnimation("anim@heists@box_carry@", "idle", 49);
player.AddAttachment("ammobox", false);
NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
}
}
}
}
@@ -108,4 +119,3 @@ namespace ReallifeGamemode.Server.Inventory
}
}
}

6
ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Interfaces Item (IItem.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

6
ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs
View File

@@ -1,8 +1,4 @@
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using System;
using System.Collections.Generic;
using System.Text;
using ReallifeGamemode.Database.Entities;
/**
* @overview Life of German Reallife - Inventory Interfaces UsableItem (IUsableItem.cs)

5
ReallifeGamemode.Server/Inventory/Interfaces/IWeaponDealItem.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Server.Inventory.Interfaces

7
ReallifeGamemode.Server/Inventory/Items/Aal.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/Barsch.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

3
ReallifeGamemode.Server/Inventory/Items/Cannabis.cs
View File

@@ -1,7 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)

7
ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

8
ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Cheeseburger (Cheeseburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
@@ -21,6 +16,5 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override int HpAmount => 20;
public override uint Object => 2240524752;
public override int Price => 150;
}
}

7
ReallifeGamemode.Server/Inventory/Items/Cocain.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Chickenburger (Chickenburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

3
ReallifeGamemode.Server/Inventory/Items/DropItem.cs
View File

@@ -3,9 +3,6 @@ using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{

7
ReallifeGamemode.Server/Inventory/Items/Flunder.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

3
ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
View File

@@ -3,9 +3,6 @@ using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{

7
ReallifeGamemode.Server/Inventory/Items/Lachs.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/Pistol50.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/PumpShotgun.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/SMG.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/Schutzweste.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/SniperRifle.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

7
ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

4
ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs
View File

@@ -2,10 +2,6 @@
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{

7
ReallifeGamemode.Server/Inventory/Items/Zander.cs
View File

@@ -1,9 +1,4 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
/**
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German

9
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Job
{
class BusDriverJob : JobBase
internal class BusDriverJob : JobBase
{
public override int Id => 4;
@@ -57,7 +57,6 @@ namespace ReallifeGamemode.Server.Job
private readonly IReadOnlyCollection<Vector3> RouteLong = new List<Vector3>
{
new Vector3(403.8605,-597.0284,27.1788),
new Vector3(953.7955,140.8976,79.34214),
new Vector3(1531.374,832.1884,75.94727),
@@ -67,12 +66,10 @@ namespace ReallifeGamemode.Server.Job
new Vector3(2599.954,4264.15,40.87192),
new Vector3(2705.722,3308.447,54.2841),
new Vector3(355.8403,-634.835,27.56906),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> RouteVeryLong = new List<Vector3>
{
new Vector3(-562.68, -2203.85, 6.72),
new Vector3(-889.0892, -2190.34, 8.100273),
new Vector3(-695.8978, -1197.1, 10.07723),
@@ -149,12 +146,10 @@ namespace ReallifeGamemode.Server.Job
{
CheckPointHandle.StartCheckPointRoute(player, RouteVeryLong, 3000, 1, 7, "busDriverJob");
}
}
public static void payWage(Player jobber, int wage)
{
}
}
}

10
ReallifeGamemode.Server/Job/JobBase.cs
View File

@@ -1,19 +1,20 @@
using GTANetworkAPI;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using System;
using System.Collections.Generic;
using System.Linq;
namespace ReallifeGamemode.Server.Job
{
public abstract class JobBase : Script
{
public delegate void JobStartHandler(Player player);
public delegate void JobStopHandler(Player player);
public event JobStartHandler JobStart;
public event JobStopHandler JobStop;
private readonly List<Player> _inJob = new List<Player>();
@@ -59,6 +60,7 @@ namespace ReallifeGamemode.Server.Job
}
public static List<Player> GetPlayerInJob() => jobPlayer;
public List<Player> GetUsersInJob() => _inJob;
}
}

10
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Job
{
class PilotJob : JobBase
internal class PilotJob : JobBase
{
public override int Id => 3;
@@ -101,8 +102,6 @@ namespace ReallifeGamemode.Server.Job
new Vector3(-591.96, -1943.26, 311.73),
}.AsReadOnly();
public PilotJob()
{
JobStart += PilotJob_JobStart;
@@ -117,7 +116,6 @@ namespace ReallifeGamemode.Server.Job
if (veh.DisplayName == "Velum")
{
listRouteTexts2.Add("Route 4");
listRouteTexts2.Add("Route 5");
listRouteTexts2.Add("Route 6");
@@ -132,8 +130,8 @@ namespace ReallifeGamemode.Server.Job
player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts));
}
}
[RemoteEvent("startPilotRoute")]
public void StartPilotRoute(Player player, string type)
{

17
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -202,6 +202,7 @@ namespace ReallifeGamemode.Server.Job
Player target = data.getPartnerClient(player);
if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex);
ChatService.SendMessage((Player)player, "Du hast den Müllsack in der Hand. Bringe ihm zum Müllwagen hinten.");
player.AddAttachment("binbag", false);
return;
}
}
@@ -213,14 +214,10 @@ namespace ReallifeGamemode.Server.Job
{
if (data.getDataFromClient(player) == null) continue;
int count = data.getTrashCount();
count++;
data.setTrashCount(count);
data.setTrashCount(data.getTrashCount() + 1);
Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Es sind jetzt {count} Säcke im Müllwagen.");
ChatService.SendMessage((Player)player, $"Es sind jetzt {count} Säcke im Müllwagen.");
player.AddAttachment("binbag", true);
if (data.getTrashCount() >= 20)
{
ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base.");
@@ -241,11 +238,9 @@ namespace ReallifeGamemode.Server.Job
{
if (data.getDataFromClient(player) == null) continue;
int count = data.getTrashCount();
Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {count}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {count}");
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}");
//bonus pro sack
data.setTrashCount(0);
@@ -330,7 +325,7 @@ namespace ReallifeGamemode.Server.Job
}
CheckDataForDuplicatePlayer(player, data);
data.setClientToData(player);
//destroy veh
MuellmannJobStarten(player, vehicle);
target = data.getPartnerClient(player);

22
ReallifeGamemode.Server/Job/TaxiDriverJob.cs
View File

@@ -1,21 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Extensions;
using System.Timers;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Database.Entities;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Job
{
class TaxiDriverJob : JobBase
internal class TaxiDriverJob : JobBase
{
public List<TaxiContract> TaxiContracts { get; set; } = new List<TaxiContract>();
@@ -27,7 +24,6 @@ namespace ReallifeGamemode.Server.Job
public override bool NeedVehicleToStart => true;
private static TaxiDriverJob _Instance;
public TaxiDriverJob()
@@ -42,6 +38,7 @@ namespace ReallifeGamemode.Server.Job
_Instance = new TaxiDriverJob();
return _Instance;
}
private void TaxiDriverJobJobStart(Player player)
{
player.Vehicle.SetSharedData("vehicleTaxiLight", true);
@@ -89,7 +86,6 @@ namespace ReallifeGamemode.Server.Job
dbContext.SaveChanges();
target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
}
}
/*
@@ -124,9 +120,7 @@ namespace ReallifeGamemode.Server.Job
{
occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance));
}
}
}
}
}

30
ReallifeGamemode.Server/Main.cs
View File

@@ -1,29 +1,21 @@
using System.Globalization;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Classes;
using ReallifeGamemode.Server.Finance;
using ReallifeGamemode.Server.Common;
using ReallifeGamemode.Server.Core.API;
using ReallifeGamemode.Server.Core.Events;
using ReallifeGamemode.Server.Core.RageMP;
using ReallifeGamemode.Server.DrivingSchool;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
using ReallifeGamemode.Server.DrivingSchool;
using ReallifeGamemode.Server.WeaponDeal;
using ReallifeGamemode.Server.Core.API;
using ReallifeGamemode.Server.Core.RageMP;
using ReallifeGamemode.Server.Core.Events;
using System.Collections.Generic;
using ReallifeGamemode.Server.Common;
using System.Reflection;
using System.Linq;
using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Database.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Infrastructure;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Services;
/**
* @overview Life of German Reallife - Main Class (Main.cs)
* @author VegaZ, hydrant

10
ReallifeGamemode.Server/Managers/ATMManager.cs
View File

@@ -1,11 +1,9 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
/**
* @overview Life of German Reallife - Managers ATMManager (ATMManager.cs)
@@ -59,6 +57,7 @@ namespace ReallifeGamemode.Server.Managers
LoadATMs();
}
}
public static void LoadATMs()
{
using (var dbContext = new DatabaseContext())
@@ -73,14 +72,17 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
public static void EnterATMRange(ColShape colShape, Player client)
{
client.SetData("nearATM", colShape.GetData<int>("id"));
}
public static void ExitATMRange(ColShape colShape, Player client)
{
client.ResetData("nearATM");
}
public static void ShowAtmUi(Player player, int atmId)
{
player.TriggerEvent("SERVER:ShowAtmUi", atmId);

13
ReallifeGamemode.Server/Managers/BankManager.cs
View File

@@ -1,15 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Server.Business;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Database.Entities.Logs;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Entities.Logs;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Util;
/**
* @overview Life of German Reallife - Managers BankManager (BankManager.cs)

23
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -1,22 +1,21 @@
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Business;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using ReallifeGamemode.Database;
using ReallifeGamemode.Server.Types;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Business;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Managers
{
class BusinessManager : Script
internal class BusinessManager : Script
{
public static List<BusinessBase> Businesses { get; private set; }

5
ReallifeGamemode.Server/Managers/CharacterCreator.cs
View File

@@ -1,8 +1,8 @@
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json.Linq;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
namespace ReallifeGamemode.Server.Managers
{
@@ -14,6 +14,7 @@ namespace ReallifeGamemode.Server.Managers
if (gender == 0) player.SetSkin(PedHash.FreemodeMale01);
else player.SetSkin(PedHash.FreemodeFemale01);
}
[RemoteEvent("creatorSave")]
public void CreatorSave(Player player, bool gender, string parentData, string featureData, string appearanceData, string hairAndColorData)
{
@@ -304,7 +305,6 @@ namespace ReallifeGamemode.Server.Managers
player.SetHeadOverlay(11, blemishes);
player.SetHeadOverlay(12, blemishes);
//Gesicht (Vererbung durch Mutter / Vater)
HeadBlend headBlend = new HeadBlend()
{
@@ -326,7 +326,6 @@ namespace ReallifeGamemode.Server.Managers
//Augenfarbe
NAPI.Player.SetPlayerEyeColor(player, character.EyeColor);
}
}
}

13
ReallifeGamemode.Server/Managers/CityHallManager.cs
View File

@@ -1,20 +1,15 @@
using GTANetworkAPI;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ReallifeGamemode.Database;
using ReallifeGamemode.Server.Types;
namespace ReallifeGamemode.Server.Managers
{
class CityHallManager : Script
internal class CityHallManager : Script
{
private static readonly Vector3 _cityHallPosition = new Vector3(273.22, -278.14, 53.9);

5
ReallifeGamemode.Server/Managers/DoorManager.cs
View File

@@ -2,11 +2,10 @@
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Database;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Types;
/**
* @overview Life of German Reallife - Managers BankManager (BankManager.cs)
* @author VegaZ

34
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -1,16 +1,14 @@
using GTANetworkAPI;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ReallifeGamemode.Database;
using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Types;
using System.Buffers;
@@ -27,9 +25,8 @@ namespace ReallifeGamemode.Server.Managers
{
public class InteractionManager : Script
{
#region Umgebungsinteraktionen PFEILTASTE-HOCH
#endregion
#region Eigeninteraktionen PFEILTASTE-RUNTER
[RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")]
public void InteractionMenuAcceptInvite(Player player, string type)
{
@@ -75,12 +72,15 @@ namespace ReallifeGamemode.Server.Managers
default:
player.SetSharedData("blipColor", 0);
break;
case 8:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;
@@ -121,6 +121,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
[RemoteEvent("CLIENT:InteractionMenu_EndShow")]
public void InteractionMenuEndShow(Player client)
{
@@ -165,7 +166,6 @@ namespace ReallifeGamemode.Server.Managers
licenses.Add(playerUser.FlyingLicensePlane);
licenses.Add(playerUser.WeaponLicense);
target.TriggerEvent("ShowLicenses", player.Name, licenses.ToArray());
}
}
@@ -310,7 +310,6 @@ namespace ReallifeGamemode.Server.Managers
using (var dbContext = new DatabaseContext())
{
target.GetUser(dbContext).Group = null;
target.GetUser(dbContext).GroupRank = GroupRank.NONE;
@@ -411,7 +410,6 @@ namespace ReallifeGamemode.Server.Managers
player.SendNotification("~r~Du kannst nur zwischen 1$ und 10000$ angeben!");
}
}
}
[RemoteEvent("CLIENT:InteractionMenu_LSPD_Points3")]
public void InteractionMenu_LSPD_Points3(Player player, string jsonNameOrId, string jsoAmount, string jsonReason)
@@ -484,7 +482,6 @@ namespace ReallifeGamemode.Server.Managers
{
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Du hast nun ~y~{target.GetUser().Points}/8 ~x~Strafpunkten.", true);
}
}
else
{
@@ -532,7 +529,6 @@ namespace ReallifeGamemode.Server.Managers
target.ResetData("ticket_boolean");
target.ResetData("ticket_amount");
target.ResetData("ticket_player");
}
else if (type == "Abgelehnt")
{
@@ -543,8 +539,11 @@ namespace ReallifeGamemode.Server.Managers
target.ResetData("ticket_player");
}
}
#endregion
#endregion Eigeninteraktionen PFEILTASTE-RUNTER
#region Spielerinteraktionen PFEILTASTE-LINKS
[RemoteEvent("openTradeInventory")]
public void OpenTradeInventory(Player player, string targetPlayer)
{
@@ -603,8 +602,7 @@ namespace ReallifeGamemode.Server.Managers
tradeRequester.TriggerEvent("unlockTradeItems");
}
}
#endregion
#region Fraktionsinteraktionen / Jobinteraktionen PFEILTASTE-RECHTS
#endregion
#endregion Spielerinteraktionen PFEILTASTE-LINKS
}
}

Some files were not shown because too many files have changed in this diff Show More