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

Change Globaldata Interaction -> InMenu, Fix DutyCloth Menu State

Browse Source
This commit is contained in:
VegaZ
2019-05-07 19:19:41 +02:00
parent ae7371efb9
commit 2289a29f10
6 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -34,7 +34,7 @@ export default function factionInteraction(globalData: GlobalData) {
mp.events.add("showFactionInteraction", (userFactionId, isDuty, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => { mp.events.add("showFactionInteraction", (userFactionId, isDuty, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => {
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
globalData.Interaction = true; globalData.InMenu = true;
var rP = ((reviveTaskCount === "0") ? "~r~" : "~g~"); var rP = ((reviveTaskCount === "0") ? "~r~" : "~g~");
var hP = ((healTaskCount === "0") ? "~r~" : "~g~"); var hP = ((healTaskCount === "0") ? "~r~" : "~g~");
@@ -80,20 +80,20 @@ export default function factionInteraction(globalData: GlobalData) {
case cancelItem: case cancelItem:
factionInteractionMenu.Visible = false; factionInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
break; break;
case reviveTaskMenu: case reviveTaskMenu:
mp.events.callRemote("loadMedicTasks", 0) mp.events.callRemote("loadMedicTasks", 0)
factionInteractionMenu.Visible = false; factionInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
break; break;
} }
}); });
factionInteractionMenu.MenuClose.on(() => { factionInteractionMenu.MenuClose.on(() => {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
}); });
}); });
@@ -107,7 +107,7 @@ export default function factionInteraction(globalData: GlobalData) {
mp.events.call("sortFactionTasks", false); mp.events.call("sortFactionTasks", false);
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
globalData.Interaction = true; globalData.InMenu = true;
switch (type) { switch (type) {
case 0: case 0:
reviveTaskMenu = new Menu("Revives", "\u00c4lteste zu erst", new Point(0, screenRes.y / 2), null, null); reviveTaskMenu = new Menu("Revives", "\u00c4lteste zu erst", new Point(0, screenRes.y / 2), null, null);
@@ -144,7 +144,7 @@ export default function factionInteraction(globalData: GlobalData) {
}); });
reviveTaskMenu.Visible = false; reviveTaskMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
ambulanceImagePos = 0.325 ambulanceImagePos = 0.325
taskStart = player.position; taskStart = player.position;
taskFinish = tasks[index].Position; taskFinish = tasks[index].Position;

8
ReallifeGamemode.Client/Interaction/playerinteraction.ts
View File

@@ -50,7 +50,7 @@ export default function playerInteraction(globalData: GlobalData) {
mp.events.add("showPlayerInteraction", (nearPlayerArr) => { mp.events.add("showPlayerInteraction", (nearPlayerArr) => {
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
nearbyPlayers = JSON.parse(nearPlayerArr); nearbyPlayers = JSON.parse(nearPlayerArr);
globalData.Interaction = true; globalData.InMenu = true;
let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2), null, null); let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2), null, null);
let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers)); let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers));
playerInteractionMenu.AddItem(playerSelect); playerInteractionMenu.AddItem(playerSelect);
@@ -68,17 +68,17 @@ export default function playerInteraction(globalData: GlobalData) {
mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue); mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue);
playerInteractionMenu.Visible = false; playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
} else if (item.Text === "Schlie\u00dfen") { } else if (item.Text === "Schlie\u00dfen") {
playerInteractionMenu.Visible = false; playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
} }
}); });
playerInteractionMenu.MenuClose.on(() => { playerInteractionMenu.MenuClose.on(() => {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.Interaction = false; globalData.InMenu = false;
}); });
}); });

10
ReallifeGamemode.Client/Player/dutycloth.ts
View File

@@ -24,7 +24,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0); cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53); cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function dutyCloth() { export default function dutyCloth(globalData: GlobalData) {
var dutyMenu; var dutyMenu;
@@ -41,6 +41,9 @@ export default function dutyCloth() {
//Cloth Menu //Cloth Menu
mp.events.add('showDutyClothMenu', (hatsArr, topsArr, legsArr, shoesArr) => { mp.events.add('showDutyClothMenu', (hatsArr, topsArr, legsArr, shoesArr) => {
if (!globalData.InMenu) {
globalData.InMenu = true;
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
hats = hatsArr; hats = hatsArr;
@@ -96,6 +99,7 @@ export default function dutyCloth() {
dutyMenu.Visible = false; dutyMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.events.callRemote("defaultCharacterCloth"); mp.events.callRemote("defaultCharacterCloth");
globalData.InMenu = false;
} }
}); });
@@ -104,6 +108,8 @@ export default function dutyCloth() {
dutyMenu.Visible = false; dutyMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.events.callRemote("defaultCharacterCloth"); mp.events.callRemote("defaultCharacterCloth");
}); globalData.InMenu = false;
});
}
}); });
} }

8
ReallifeGamemode.Client/Player/keys.ts
View File

@@ -24,28 +24,28 @@ export default function keys(globalData: GlobalData) {
//LEFT ARROW (Interaktion mit anderen Spielern) //LEFT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x25, false, function () { mp.keys.bind(0x25, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) { if (!globalData.InChat && !showInv && !globalData.InMenu) {
mp.events.callRemote("keyPress:LEFT_ARROW"); mp.events.callRemote("keyPress:LEFT_ARROW");
} }
}); });
//UP ARROW (Interaktion mit Spielwelt) //UP ARROW (Interaktion mit Spielwelt)
mp.keys.bind(0x26, false, function () { mp.keys.bind(0x26, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) { if (!globalData.InChat && !showInv && !globalData.InMenu) {
mp.events.callRemote("keyPress:UP_ARROW"); mp.events.callRemote("keyPress:UP_ARROW");
} }
}); });
//RIGHT ARROW (Fraktionsinteraktion) //RIGHT ARROW (Fraktionsinteraktion)
mp.keys.bind(0x27, false, function () { mp.keys.bind(0x27, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) { if (!globalData.InChat && !showInv && !globalData.InMenu) {
mp.events.callRemote("keyPress:RIGHT_ARROW"); mp.events.callRemote("keyPress:RIGHT_ARROW");
} }
}); });
//DOWN ARROW (Eigeninteraktion) //DOWN ARROW (Eigeninteraktion)
mp.keys.bind(0x28, false, function () { mp.keys.bind(0x28, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) { if (!globalData.InChat && !showInv && !globalData.InMenu) {
mp.events.callRemote("keyPress:DOWN_ARROW"); mp.events.callRemote("keyPress:DOWN_ARROW");
} }
}); });

2
ReallifeGamemode.Client/global.d.ts vendored
View File

@@ -1,7 +1,7 @@
declare interface GlobalData { declare interface GlobalData {
InTuning: boolean, InTuning: boolean,
HideGui: boolean, HideGui: boolean,
Interaction: boolean, InMenu: boolean,
InChat: boolean, InChat: boolean,
LoggedIn: boolean LoggedIn: boolean
} }

2
ReallifeGamemode.Client/index.ts
View File

@@ -7,7 +7,7 @@
let globalData: GlobalData = { let globalData: GlobalData = {
InTuning: false, InTuning: false,
HideGui: false, HideGui: false,
Interaction: false, InMenu: false,
InChat: false, InChat: false,
LoggedIn: false LoggedIn: false
}; };