Fix dutycloth

This commit is contained in:
hydrant
2019-07-20 13:54:29 +02:00
parent 5b252fe615
commit d817486602

View File

@@ -26,7 +26,7 @@ cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function dutyCloth(globalData: GlobalData) { export default function dutyCloth(globalData: GlobalData) {
var dutyMenu; var dutyMenu: NativeUI.Menu;
var hats; var hats;
var tops; var tops;
@@ -34,9 +34,9 @@ export default function dutyCloth(globalData: GlobalData) {
var shoes; var shoes;
var hat = -1; var hat = -1;
var top; var top = 0;
var leg; var leg = 0;
var shoe; var shoe = 0;
//Cloth Menu //Cloth Menu
@@ -45,13 +45,12 @@ export default function dutyCloth(globalData: GlobalData) {
globalData.InMenu = true; globalData.InMenu = true;
mp.gui.chat.activate(false);
hats = hatsArr; hats = hatsArr;
tops = topsArr; tops = topsArr;
legs = legsArr; legs = legsArr;
shoes = shoesArr; shoes = shoesArr;
dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(0, screenRes.y / 2), null, null); dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(50, 50), null, null);
dutyMenu.AddItem(new UIMenuListItem("Hut", "", new ItemsCollection(hats))); dutyMenu.AddItem(new UIMenuListItem("Hut", "", new ItemsCollection(hats)));
dutyMenu.AddItem(new UIMenuListItem("Top", "", new ItemsCollection(tops))); dutyMenu.AddItem(new UIMenuListItem("Top", "", new ItemsCollection(tops)));
@@ -66,11 +65,10 @@ export default function dutyCloth(globalData: GlobalData) {
case "Hut": case "Hut":
if (item.SelectedItem.DisplayText === "Keinen") { if (item.SelectedItem.DisplayText === "Keinen") {
hat = -1; hat = -1;
mp.events.callRemote("updateDutyProp", 0, -1);
} else { } else {
hat = parseInt(item.SelectedItem.DisplayText); hat = parseInt(item.SelectedItem.DisplayText);
mp.events.callRemote("updateDutyProp", 0, hat);
} }
mp.events.callRemote("updateDutyProp", 0, hat);
break; break;
case "Top": case "Top":
top = parseInt(item.SelectedItem.DisplayText); top = parseInt(item.SelectedItem.DisplayText);
@@ -93,11 +91,10 @@ export default function dutyCloth(globalData: GlobalData) {
var slotId = [0, 11, 4, 6]; var slotId = [0, 11, 4, 6];
var clothId = [hat, top, leg, shoe]; var clothId = [hat, top, leg, shoe];
mp.events.callRemote("saveCharacterCloth", JSON.stringify(slotType), JSON.stringify(slotId), JSON.stringify(clothId)); mp.events.callRemote("saveCharacterCloth", JSON.stringify(slotType), JSON.stringify(slotId), JSON.stringify(clothId));
dutyMenu.Visible = false; dutyMenu.Close();
mp.gui.chat.activate(true); globalData.InMenu = false;
} else if (item.Text === "Abbrechen") { } else if (item.Text === "Abbrechen") {
dutyMenu.Visible = false; dutyMenu.Close();
mp.gui.chat.activate(true);
mp.events.callRemote("defaultCharacterCloth"); mp.events.callRemote("defaultCharacterCloth");
globalData.InMenu = false; globalData.InMenu = false;
} }
@@ -105,8 +102,6 @@ export default function dutyCloth(globalData: GlobalData) {
dutyMenu.MenuClose.on(() => { dutyMenu.MenuClose.on(() => {
dutyMenu.Visible = false;
mp.gui.chat.activate(true);
mp.events.callRemote("defaultCharacterCloth"); mp.events.callRemote("defaultCharacterCloth");
globalData.InMenu = false; globalData.InMenu = false;
}); });