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

haus system auf core geändert

Browse Source
This commit is contained in:
hydrant
2020-03-29 12:18:17 +02:00
parent 6bd3d4a3d0
commit bcfc2105ea
68 changed files with 1366 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Gui/Inventory/inventory.ts
View File

@@ -1,6 +1,6 @@
import InputHelper from '../../inputhelper';
export default function inventory(globalData: GlobalData) {
export default function inventory(globalData: IGlobalData) {
var q;
var qw = 0;

2
ReallifeGamemode.Client/Gui/cityhall.ts
View File

@@ -11,7 +11,7 @@ const Color = NativeUI.Color;
import InputHelper from '../inputhelper';
export default function (globalData: GlobalData) {
export default function (globalData: IGlobalData) {
var keyBound = false;
var menu: NativeUI.Menu = null;

2
ReallifeGamemode.Client/Gui/handmoney.ts
View File

@@ -1,6 +1,6 @@
import moneyFormat from '../moneyformat';
export default function handMoney(globalData: GlobalData) {
export default function handMoney(globalData: IGlobalData) {
var currentMoney = null;
var showMoneyChange = null;
var difference;

272
ReallifeGamemode.Client/Gui/house.ts
View File

@@ -1,158 +1,146 @@
import { Menu, Point, UIMenuItem, Color } from '../libs/NativeUI';
import moneyFormat from '../moneyformat';
import InputHelper from '../inputhelper';
import game from '..';
import { Key } from '../game';
export default function house(globalData: GlobalData) {
var houseMenu: Menu;
var houseData: any;
var houseState: number;
var houseMenu: Menu;
var houseData: any;
var houseState: number;
game.events.add("SERVER:ShowHouseMenu", () => {
var keyBound = false;
game.ui.setHelpText('Drücke ~INPUT_CONTEXT~, um das Hausmenü öffnen');
mp.events.add("SERVER:ShowHouseMenu", () => {
mp.game.ui.setTextComponentFormat('STRING');
mp.game.ui.addTextComponentSubstringPlayerName('Drücke ~INPUT_CONTEXT~, um das Hausmenü öffnen');
mp.game.ui.displayHelpTextFromStringLabel(0, true, true, -1);
game.events.bindKey(Key.E, false, keyPressHandler);
});
mp.keys.bind(0x45, false, keyPressHandler);
keyBound = true;
});
game.events.add("SERVER:SetHouseData", (dataStr, state) => {
houseData = JSON.parse(dataStr);
houseState = state;
});
mp.events.add("SERVER:SetHouseData", (dataStr, state) => {
houseData = JSON.parse(dataStr);
houseState = state;
});
function keyPressHandler() {
if (game.ui.inMenu || game.ui.inChat) return;
game.ui.clearHelpText();
function keyPressHandler() {
if (globalData.InMenu || globalData.InChat || globalData.InInput || !globalData.LoggedIn) return;
mp.game.ui.clearHelp(true);
var subTitle = houseData.Type;
if (houseData.OwnerName) {
subTitle += " von " + houseData.OwnerName;
}
houseMenu = new Menu("Hausverwaltung", subTitle, new Point(50, 50), null, null);
globalData.InMenu = true;
var rentInItem: UIMenuItem;
var cancelOwnRentalItem: UIMenuItem;
var buyHouseItem: UIMenuItem;
var setRentalFeeItem: UIMenuItem;
var cancelRentalsItem: UIMenuItem;
var sellHouseItem: UIMenuItem;
var houseRentals = houseData.Rentals.length;
if (houseState === -1) { // Keine Beziehung zum Haus
rentInItem = new UIMenuItem("Einmieten", "Miete dich in das Haus ein");
rentInItem.SetRightLabel(moneyFormat(houseData.RentalFee.toString(), 0) + "$");
houseMenu.AddItem(rentInItem);
} else if (houseState === 0) { // Haus hat keinen Eigentümer
buyHouseItem = new UIMenuItem("Haus kaufen", "Kaufe das Haus");
buyHouseItem.SetRightLabel(moneyFormat(houseData.Price, 0) + "$");
houseMenu.AddItem(buyHouseItem);
} else if (houseState === 1) { // Hausbesitzer
setRentalFeeItem = new UIMenuItem("Miete setzen", "Setze den Mietpreis");
setRentalFeeItem.SetRightLabel(moneyFormat(houseData.RentalFee, 0) + "$");
houseMenu.AddItem(setRentalFeeItem);
if (houseRentals > 0) {
cancelRentalsItem = new UIMenuItem("Mieter", "Liste deine Mieter auf");
cancelRentalsItem.SetRightLabel(houseRentals.toString());
houseMenu.AddItem(cancelRentalsItem);
var cancelRentalsMenu = new Menu("Mieter", "Kündige einen Mieter", new Point(50, 50), null, null);
cancelRentalsMenu.Visible = false;
houseData.Rentals.forEach(rental => {
var item = new UIMenuItem(rental, "");
item.SetRightLabel("Kündigen");
cancelRentalsMenu.AddItem(item);
});
cancelRentalsMenu.ItemSelect.on((item: UIMenuItem, index: number) => {
mp.events.callRemote("CLIENT:House_CancelUserRental", item.Text);
houseRentals--;
cancelRentalsItem.SetRightLabel(houseRentals.toString());
if (houseRentals === 0) {
cancelRentalsMenu.Visible = false;
houseMenu.Visible = true;
houseMenu.RemoveItem(cancelRentalsItem);
}
cancelRentalsMenu.RemoveItem(item);
});
houseMenu.BindMenuToItem(cancelRentalsMenu, cancelRentalsItem);
}
sellHouseItem = new UIMenuItem("Haus verkaufen");
houseMenu.AddItem(sellHouseItem);
} else if (houseState === 2) {
cancelOwnRentalItem = new UIMenuItem("Mietvertrag kündigen", "Ziehe aus der Wohnung aus");
houseMenu.AddItem(cancelOwnRentalItem);
}
var cancelItem = new UIMenuItem("Abbrechen");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
houseMenu.AddItem(cancelItem);
houseMenu.Open();
houseMenu.ItemSelect.on((item, index) => {
if (item === cancelItem) {
mp.events.call("SERVER:CloseHouseMenu");
houseMenu.Close();
} else if (item === buyHouseItem) {
mp.events.callRemote("CLIENT:House_BuyHouse");
mp.events.call("SERVER:CloseHouseMenu");
houseMenu.Close();
} else if (item === setRentalFeeItem) {
var rentalFeeInput = new InputHelper("Wie viel soll die Miete betragen?", globalData);
rentalFeeInput.show();
rentalFeeInput.getValue(data => {
if (isNaN(data)) {
return;
}
var rentalFee = parseInt(data);
mp.events.callRemote("CLIENT:House_SetRentalFee", rentalFee);
mp.events.call("SERVER:CloseHouseMenu");
houseMenu.Close();
});
} else if (item === rentInItem) {
mp.events.callRemote("CLIENT:House_RentInHouse");
houseMenu.Close();
} else if (item === cancelOwnRentalItem) {
mp.events.callRemote("CLIENT:House_CancelOwnRental");
houseMenu.Close();
} else if (item === sellHouseItem) {
mp.events.callRemote("CLIENT:House_SellHouse");
houseMenu.Close();
}
});
houseMenu.MenuClose.on(() => {
globalData.InMenu = false;
});
var subTitle = houseData.Type;
if (houseData.OwnerName) {
subTitle += " von " + houseData.OwnerName;
}
mp.events.add("SERVER:CloseHouseMenu", () => {
mp.game.ui.clearHelp(true);
if (houseMenu != null) {
houseMenu.Close();
houseMenu = new Menu("Hausverwaltung", subTitle, new Point(50, 50), null, null);
game.ui.inMenu = true;
var rentInItem: UIMenuItem;
var cancelOwnRentalItem: UIMenuItem;
var buyHouseItem: UIMenuItem;
var setRentalFeeItem: UIMenuItem;
var cancelRentalsItem: UIMenuItem;
var sellHouseItem: UIMenuItem;
var houseRentals = houseData.Rentals.length;
if (houseState === -1) { // Keine Beziehung zum Haus
rentInItem = new UIMenuItem("Einmieten", "Miete dich in das Haus ein");
rentInItem.SetRightLabel(moneyFormat(houseData.RentalFee.toString(), 0) + "$");
houseMenu.AddItem(rentInItem);
} else if (houseState === 0) { // Haus hat keinen Eigentümer
buyHouseItem = new UIMenuItem("Haus kaufen", "Kaufe das Haus");
buyHouseItem.SetRightLabel(moneyFormat(houseData.Price, 0) + "$");
houseMenu.AddItem(buyHouseItem);
} else if (houseState === 1) { // Hausbesitzer
setRentalFeeItem = new UIMenuItem("Miete setzen", "Setze den Mietpreis");
setRentalFeeItem.SetRightLabel(moneyFormat(houseData.RentalFee, 0) + "$");
houseMenu.AddItem(setRentalFeeItem);
if (houseRentals > 0) {
cancelRentalsItem = new UIMenuItem("Mieter", "Liste deine Mieter auf");
cancelRentalsItem.SetRightLabel(houseRentals.toString());
houseMenu.AddItem(cancelRentalsItem);
var cancelRentalsMenu = new Menu("Mieter", "Kündige einen Mieter", new Point(50, 50), null, null);
cancelRentalsMenu.Visible = false;
houseData.Rentals.forEach(rental => {
var item = new UIMenuItem(rental, "");
item.SetRightLabel("Kündigen");
cancelRentalsMenu.AddItem(item);
});
cancelRentalsMenu.ItemSelect.on((item: UIMenuItem, index: number) => {
game.events.callServer("House_CancelUserRental", item.Text);
houseRentals--;
cancelRentalsItem.SetRightLabel(houseRentals.toString());
if (houseRentals === 0) {
cancelRentalsMenu.Visible = false;
houseMenu.Visible = true;
houseMenu.RemoveItem(cancelRentalsItem);
}
cancelRentalsMenu.RemoveItem(item);
});
houseMenu.BindMenuToItem(cancelRentalsMenu, cancelRentalsItem);
}
if (keyBound) {
keyBound = false;
mp.keys.unbind(0x45, false, keyPressHandler);
sellHouseItem = new UIMenuItem("Haus verkaufen");
houseMenu.AddItem(sellHouseItem);
} else if (houseState === 2) {
cancelOwnRentalItem = new UIMenuItem("Mietvertrag kündigen", "Ziehe aus der Wohnung aus");
houseMenu.AddItem(cancelOwnRentalItem);
}
var cancelItem = new UIMenuItem("Abbrechen");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
houseMenu.AddItem(cancelItem);
houseMenu.Open();
houseMenu.ItemSelect.on((item, index) => {
if (item === cancelItem) {
houseMenu.Close();
} else if (item === buyHouseItem) {
game.events.callServer("House_BuyHouse");
houseMenu.Close();
} else if (item === setRentalFeeItem) {
var rentalFeeInput = new InputHelper("Wie viel soll die Miete betragen?");
rentalFeeInput.show();
rentalFeeInput.getValue(data => {
if (isNaN(data)) {
return;
}
var rentalFee = parseInt(data);
game.events.callServer("House_SetRentalFee", rentalFee);
houseMenu.Close();
});
} else if (item === rentInItem) {
game.events.callServer("House_RentInHouse");
houseMenu.Close();
} else if (item === cancelOwnRentalItem) {
game.events.callServer("House_CancelOwnRental");
houseMenu.Close();
} else if (item === sellHouseItem) {
game.events.callServer("House_SellHouse");
houseMenu.Close();
}
});
}
houseMenu.MenuClose.on(() => {
game.ui.inMenu = false;
});
}
game.events.add("SERVER:CloseHouseMenu", () => {
game.ui.clearHelpText();
if (houseMenu != null) {
houseMenu.Close();
}
game.events.unbindKey(Key.E, false, keyPressHandler);
});

2
ReallifeGamemode.Client/Gui/infobox.ts
View File

@@ -6,7 +6,7 @@
import moneyFormat from "../moneyformat";
export default function (globalData: GlobalData): void {
export default function (globalData: IGlobalData): void {
var currentdate;
var dateString;
var timeString;

2
ReallifeGamemode.Client/Gui/interiors.ts
View File

@@ -1,4 +1,4 @@
export default function interiors(globalData: GlobalData) {
export default function interiors(globalData: IGlobalData) {
var keyBound = false;
var interiorId = -1;

2
ReallifeGamemode.Client/Gui/licenses.ts
View File

@@ -1,7 +1,7 @@
import { isNull } from "util";
export default function licenses(globalData: GlobalData): void {
export default function licenses(globalData: IGlobalData): void {
var licenseBrowser: BrowserMp = null;
var licenseTimer;

2
ReallifeGamemode.Client/Gui/playerlist.ts
View File

@@ -4,7 +4,7 @@
* @copyright (c) 2008 - 2018 Life of German
*/
export default function playerList(globalData: GlobalData): void {
export default function playerList(globalData: IGlobalData): void {
var playerlistBrowser: BrowserMp = null;
var pList;

2
ReallifeGamemode.Client/Gui/taximeter.ts
View File

@@ -7,7 +7,7 @@ let lastkilometer: Number = 0;
let lastPrice: Number = 0;
let totalPrice: Number = 0;
var myVar;
export default function taximeterInput(globalData: GlobalData) {
export default function taximeterInput(globalData: IGlobalData) {
mp.events.add("CLIENT:setFarePrice", () => {
/*
var textBox = new InputHelper("Setzen Sie ihre Fahrtkosten [2 - 50 $/km]", globalData);

2
ReallifeGamemode.Client/Gui/vehiclemenu/main.ts
View File

@@ -6,7 +6,7 @@ const UIMenuListItem = NativeUI.UIMenuListItem;
const Point = NativeUI.Point;
const ItemsCollection = NativeUI.ItemsCollection;
export default function vehicleMenu(globalData: GlobalData) {
export default function vehicleMenu(globalData: IGlobalData) {
let menuBrowser: BrowserMp = null;
mp.events.add('ToggleVehicleMenu', () => {

2
ReallifeGamemode.Client/Gui/wanteds.ts
View File

@@ -1,4 +1,4 @@
export default function wanteds(globalData: GlobalData) {
export default function wanteds(globalData: IGlobalData) {
var browser = mp.browsers.new("package://assets/html/wanteds/index.html");
mp.events.add("SERVER:SetWanteds", (count: number) => {