haus-konto geld abheben (30% steuern)
alten hausmanager entfernt
interiormanager in core verschoben
This commit is contained in:
hydrant
2020-03-30 22:25:09 +02:00
parent 4159043348
commit 73bd04b84f
21 changed files with 1930 additions and 753 deletions

View File

@@ -41,6 +41,7 @@ function keyPressHandler() {
var setRentalFeeItem: UIMenuItem;
var cancelRentalsItem: UIMenuItem;
var sellHouseItem: UIMenuItem;
var withdrawBankItem: UIMenuItem;
var houseRentals = houseData.Rentals.length;
@@ -87,8 +88,14 @@ function keyPressHandler() {
houseMenu.BindMenuToItem(cancelRentalsMenu, cancelRentalsItem);
}
withdrawBankItem = new UIMenuItem("Konto", "Hebe Geld vom Konto ab");
withdrawBankItem.SetRightLabel(moneyFormat(houseData.Balance) + "$");
houseMenu.AddItem(withdrawBankItem);
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);
@@ -129,6 +136,19 @@ function keyPressHandler() {
} else if (item === sellHouseItem) {
game.events.callServer("House_SellHouse");
houseMenu.Close();
} else if (item == withdrawBankItem) {
var input = new InputHelper("Wie viel willst du abheben");
input.show();
input.getValue(data => {
if (isNaN(data)) {
return;
}
var withdrawAmount = parseInt(data);
game.events.callServer("House_WithdrawMoney", withdrawAmount);
houseMenu.Close();
});
}
});

View File

@@ -1,34 +1,26 @@
export default function interiors(globalData: IGlobalData) {
import game from "..";
import { Key } from "../game";
var keyBound = false;
var interiorId = -1;
var enterExit = undefined;
var interiorId = -1;
var enterExit = undefined;
mp.events.add('InteriorManager_ClearHelpText', () => {
mp.game.ui.clearHelp(true);
game.events.add('SERVER:InteriorManager_ClearHelpText', () => {
game.ui.clearHelpText();
enterExit = undefined;
enterExit = undefined;
game.events.unbindKey(Key.E, false, keyPressHandler);
});
if (keyBound) {
mp.keys.unbind(0x45, false, keyPressHandler);
keyBound = false;
}
});
game.events.add('SERVER:InteriorManager_ShowHelpText', (interior, intId, entEx) => {
game.ui.setHelpText('Drücke ~INPUT_CONTEXT~, um ~b~' + interior + ' ~s~zu ' + (entEx === 0 ? 'betreten' : 'verlassen'));
mp.events.add('InteriorManager_ShowHelpText', (interior, intId, entEx) => {
mp.game.ui.setTextComponentFormat('STRING');
mp.game.ui.addTextComponentSubstringPlayerName('Drücke ~INPUT_CONTEXT~, um ~b~' + interior + ' ~s~zu ' + (entEx === 0 ? 'betreten' : 'verlassen'));
mp.game.ui.displayHelpTextFromStringLabel(0, true, true, -1);
interiorId = intId;
enterExit = entEx;
interiorId = intId;
enterExit = entEx;
game.events.bindKey(Key.E, false, keyPressHandler);
});
mp.keys.bind(0x45, false, keyPressHandler);
keyBound = true;
});
function keyPressHandler() {
if (globalData.InChat) return;
mp.events.callRemote('InteriorManager_UseTeleport', interiorId, enterExit);
}
function keyPressHandler() {
if (game.ui.inChat) return;
game.events.callServer('InteriorManager_UseTeleport', [interiorId, enterExit]);
}

View File

@@ -100,8 +100,7 @@ license(globalData);
import vehicleMenu from './Gui/vehiclemenu/main';
vehicleMenu(globalData);
import interiors from './Gui/interiors';
interiors(globalData);
require('./Gui/interiors');
import factionInteraction from './Interaction/factioninteraction';
factionInteraction(globalData);