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/Business/cardealer.ts
View File

@@ -12,7 +12,7 @@ const ListItem = NativeUI.ListItem;
import moneyFormat from '../moneyformat';
export default function carDealer(globalData: GlobalData) {
export default function carDealer(globalData: IGlobalData) {
var shopMenu: NativeUI.Menu;

2
ReallifeGamemode.Client/Business/main.ts
View File

@@ -12,7 +12,7 @@ const ListItem = NativeUI.ListItem;
import InputHelper from '../inputhelper';
export default function business(globalData: GlobalData) {
export default function business(globalData: IGlobalData) {
var keyBound = false;

2
ReallifeGamemode.Client/CharCreator/main.ts
View File

@@ -24,7 +24,7 @@
const localPlayer = mp.players.local;
export default function charCreator(globalData: GlobalData) {
export default function charCreator(globalData: IGlobalData) {
var creatorHairMenu;

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) => {

2
ReallifeGamemode.Client/Interaction/ItemShop.ts
View File

@@ -9,7 +9,7 @@ const Point = NativeUI.Point;
const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
export default function itemShopList(globalData: GlobalData) {
export default function itemShopList(globalData: IGlobalData) {
const localPlayer = mp.players.local;

2
ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts
View File

@@ -23,7 +23,7 @@ const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
export default function clotheShopList(globalData: GlobalData) {
export default function clotheShopList(globalData: IGlobalData) {
const categoryTitles = {
clothes: {
1: "Masks",

2
ReallifeGamemode.Client/Interaction/drivingschool.ts
View File

@@ -18,7 +18,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function drivingSchoolList(globalData: GlobalData) {
export default function drivingSchoolList(globalData: IGlobalData) {
var drivingMenu: NativeUI.Menu;

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

@@ -18,7 +18,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function elevatorList(globalData: GlobalData) {
export default function elevatorList(globalData: IGlobalData) {
var elevatorMenu: NativeUI.Menu;

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

@@ -8,7 +8,7 @@ const Point = NativeUI.Point;
const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
export default function factionInteraction(globalData: GlobalData) {
export default function factionInteraction(globalData: IGlobalData) {
var screenRes = mp.game.graphics.getScreenResolution(0, 0);
var player = mp.players.local;
var tasks;

2
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -13,7 +13,7 @@ const Color = NativeUI.Color;
import { getStreetName, getZoneName } from '../streetnames';
export default function (globalData: GlobalData) {
export default function (globalData: IGlobalData) {
var menuClose = false;

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

@@ -19,7 +19,7 @@ let eY = sY - 0.1;
let sizeMul = 0.08;
let yMul = 1.8;
export default function playerInteraction(globalData: GlobalData) {
export default function playerInteraction(globalData: IGlobalData) {
var nearbyPlayers = [];
let screenRes = mp.game.graphics.getScreenResolution(0, 0);

2
ReallifeGamemode.Client/Jobs/BusRouteSelect.ts
View File

@@ -20,7 +20,7 @@ cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function busRouteList(globalData: GlobalData) {
export default function busRouteList(globalData: IGlobalData) {
var routeMenu: NativeUI.Menu;
var routeTexts;

2
ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts
View File

@@ -20,7 +20,7 @@ cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function PilotRouteList(globalData: GlobalData) {
export default function PilotRouteList(globalData: IGlobalData) {
var routeMenu: NativeUI.Menu;
var routeTexts;

2
ReallifeGamemode.Client/Jobs/main.ts
View File

@@ -1,6 +1,6 @@
import * as NativeUI from '../libs/NativeUI';
export default function (globalData: GlobalData) {
export default function (globalData: IGlobalData) {
mp.events.add("SERVER:Job_ShowJobMenu", (jobName: string, data: any) => {
if (globalData.InMenu) return;

2
ReallifeGamemode.Client/Login/main.ts
View File

@@ -4,7 +4,7 @@
* @copyright (c) 2008 - 2018 Life of German
*/
export default function(globalData: GlobalData): void {
export default function(globalData: IGlobalData): void {
var loginBrowser: BrowserMp;
var loginCam: CameraMp = mp.cameras.new('login', new mp.Vector3(-1883.736, -781.4911, 78.27616), new mp.Vector3(3.185999, 0, -79.59519), 40);

2
ReallifeGamemode.Client/Player/criminalrelease.ts
View File

@@ -18,7 +18,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function jailList(globalData: GlobalData) {
export default function jailList(globalData: IGlobalData) {
var jailMenu: NativeUI.Menu;

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

@@ -24,7 +24,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function dutyCloth(globalData: GlobalData) {
export default function dutyCloth(globalData: IGlobalData) {
var dutyMenu: NativeUI.Menu;

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

@@ -9,7 +9,7 @@
const player = mp.players.local;
export default function keys(globalData: GlobalData) {
export default function keys(globalData: IGlobalData) {
var showInventory = false;
var showGui = true;

2
ReallifeGamemode.Client/Player/reportmenu.ts
View File

@@ -27,7 +27,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function reportList(globalData: GlobalData) {
export default function reportList(globalData: IGlobalData) {
var reportMenu: NativeUI.Menu;

2
ReallifeGamemode.Client/Player/weaponlist.ts
View File

@@ -18,7 +18,7 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
export default function weaponList(globalData: GlobalData) {
export default function weaponList(globalData: IGlobalData) {
var weaponMenu: NativeUI.Menu;

2
ReallifeGamemode.Client/Speedometer/index.ts
View File

@@ -1,6 +1,6 @@
let player = mp.players.local;
export default function speedometer(globalData: GlobalData) {
export default function speedometer(globalData: IGlobalData) {
var dictLoaded = false;
var lockStatus = false;

2
ReallifeGamemode.Client/Tuning/main.ts
View File

@@ -10,7 +10,7 @@ const UIMenuItem = NativeUI.UIMenuItem;
const BadgeStyle = NativeUI.BadgeStyle;
const Point = NativeUI.Point;
export default function tuning(globalData: GlobalData) {
export default function tuning(globalData: IGlobalData) {
var keyBound = false;
const disableInput = [75, 278, 279, 280, 281, 23, 59, 60, 71, 72, 74];

2
ReallifeGamemode.Client/Voice/main.ts
View File

@@ -4,7 +4,7 @@
* @copyright (c) 2008 - 2019 Life of German
*/
export default function voice(globalData: GlobalData) {
export default function voice(globalData: IGlobalData) {
let dictLoaded = false;
const Use3d = true;

14
ReallifeGamemode.Client/core/rage-mp/ui.ts
View File

@@ -1,5 +1,6 @@
import { IUi, IBrowser } from "../../game";
import { Menu } from "../../libs/NativeUI/index";
import { GlobalData } from "../..";
export default class RageUi implements IUi {
setHelpText(text: string): void {
@@ -11,9 +12,17 @@ export default class RageUi implements IUi {
mp.game.ui.clearHelp(true);
}
private _inMenu: boolean = false;
private _inChat: boolean = false;
private _activeMenu: Menu = null;
inChat: boolean = false;
get inChat() {
return this._inChat || GlobalData.InChat;
}
set inChat(value: boolean) {
this._inChat = value;
GlobalData.InChat = value;
}
get activeMenu(): Menu {
return this._activeMenu;
@@ -34,11 +43,12 @@ export default class RageUi implements IUi {
}
get inMenu() {
return this._inMenu;
return this._inMenu || GlobalData.InMenu;
}
set inMenu(value: boolean) {
this._inMenu = value;
GlobalData.InMenu = value;
this.toggleChat(!value);
}

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

@@ -1,4 +1,4 @@
declare interface GlobalData {
declare interface IGlobalData {
InTuning: boolean,
HideGui: boolean,
InMenu: boolean,

8
ReallifeGamemode.Client/index.ts
View File

@@ -7,7 +7,7 @@
import { IGame } from './game';
import RageGame from './core/rage-mp/game';
let globalData: GlobalData = {
let globalData: IGlobalData = {
InTuning: false,
HideGui: false,
InChat: false,
@@ -26,6 +26,9 @@ let globalData: GlobalData = {
const game: IGame = new RageGame();
export default game;
export {
globalData as GlobalData
}
game.events.onPlayerCommand((cmd) => {
game.events.callServer("Command", cmd.split(' '));
@@ -35,8 +38,7 @@ var inMenu = false;
mp.game.vehicle.defaultEngineBehaviour = false;
import house from './Gui/house';
house(globalData);
require('./Gui/house');
import vehicleEntering from './vehiclesync/entering';
vehicleEntering(globalData);

10
ReallifeGamemode.Client/inputhelper/index.ts
View File

@@ -1,13 +1,15 @@
export default class InputHelper {
import { GlobalData } from "..";
export default class InputHelper {
private title: string;
private value: string;
private created: boolean;
private browser: BrowserMp;
private data: GlobalData;
private data: IGlobalData;
constructor(title: string, globalData: GlobalData) {
constructor(title: string, globalData?: IGlobalData) {
this.title = title;
this.data = globalData;
this.data = globalData || GlobalData;
this.cefTitleCall = this.cefTitleCall.bind(this);
mp.events.add('cef_request_title', this.cefTitleCall);

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

@@ -1,6 +1,6 @@

export default function inventory(globalData: GlobalData): void {
export default function inventory(globalData: IGlobalData): void {
var invBrowser: BrowserMp = null;
var itemIdArr;

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

@@ -1,4 +1,4 @@
export default function gangwarHandle(globalData: GlobalData) {
export default function gangwarHandle(globalData: IGlobalData) {
function inside(point, vs) {
let x = point[0],
@@ -65,12 +65,12 @@
}
_setup(name, id, x, y, range, color, rot, owner, edit, vector) {
var self = this;
self.name = name;
self.id = id;
self.range = range;
self.setColor(owner);
self.setColor(owner);
self.x = x;
self.y = y;
self.rotation = rot;
@@ -91,7 +91,7 @@
} else {
self.leaderBlipVector = null;
}
self.leaderColShape = null;
}
@@ -122,11 +122,11 @@
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);
mp.game.invoke(Natives.SET_BLIP_ALPHA, self.blip, 70);
mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color);
self.blip = mp.game.ui.addBlipForRadius(self.x, self.y, 1, self.range);
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.blip, 5);
mp.game.invoke(Natives.SET_BLIP_ALPHA, self.blip, 70);
mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color);
self._colshape = mp.colshapes.newCircle(self.x, self.y, self.range * 1.5);
}
render() {
@@ -139,9 +139,9 @@
mp.game.invoke(Natives.SET_BLIP_COORDS, self.blip, mp.players.local.position.x, mp.players.local.position.y, 1);
self.x = mp.players.local.position.x;
self.y = mp.players.local.position.y;
}
mp.game.invoke(Natives.SET_BLIP_ROTATION, self.blip, self.rotation);
}
mp.game.invoke(Natives.SET_BLIP_ROTATION, self.blip, self.rotation);
}
@@ -192,10 +192,10 @@
a += 0.001
}
*/
}
}
}
if (self.isInsideArea()) {
mp.game.graphics.drawText(self.name, [self.x, self.y, mp.players.local.position.z + 20], {
@@ -205,7 +205,7 @@
outline: true,
centre: true
});
}
}
}
@@ -223,11 +223,11 @@
}
}
}
}
startGangWar() {
startGangWar() {
var self = this;
if (self._status == "normal") {
let dist = mp.game.gameplay.getDistanceBetweenCoords(mp.players.local.position.x, mp.players.local.position.y, 0, self.leaderBlipVector.x, self.leaderBlipVector.y, self.leaderBlipVector.z, false);
@@ -251,7 +251,7 @@
}
if (status == "normal") {
self._status = "normal";
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false);
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false);
return;
}
if (status == "conquered") {
@@ -296,19 +296,19 @@
self.setLeaderColShape();
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.leaderBlip, 437);
mp.game.invoke(Natives.SET_BLIP_AS_SHORT_RANGE, self.leaderBlip, false);
}
}
}
setLeaderColShape() {
var self = this;
let newVector = new mp.Vector3(self.leaderBlipVector.x, self.leaderBlipVector.y, self.leaderBlipVector.z - 2)
self.leaderColShape = mp.markers.new(1, newVector, 2, {
color: [255, 255, 0, 150],
visible: true,
dimension: 0
});
let newVector = new mp.Vector3(self.leaderBlipVector.x, self.leaderBlipVector.y, self.leaderBlipVector.z - 2)
self.leaderColShape = mp.markers.new(1, newVector, 2, {
color: [255, 255, 0, 150],
visible: true,
dimension: 0
});
}
@@ -321,7 +321,7 @@
}
check() {
var self = this
var self = this
if (self._entered == true) {
if (!self.isInsideArea() || (self.isNearGround() == false)) {
self._entered = false;
@@ -329,7 +329,7 @@
}
}
}
enter() {
var self = this;
self._timerCheck = setInterval(function () {
@@ -340,8 +340,8 @@
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));
}
} else if (self._entered == true) {
@@ -350,7 +350,7 @@
if (self._status === "attack") {
mp.game.audio.playSoundFrontend(1, "Exit_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true);
mp.game.graphics.startScreenEffect("MinigameTransitionIn", 500, false);
}
}
mp.events.callRemote("Gangarea:Leave", JSON.stringify(self.id));
}
}
@@ -360,7 +360,7 @@
leave() {
var self = this;
clearInterval(self._timerCheck);
self.check();
}
isNearGround() {
@@ -469,7 +469,7 @@
last_leaderBlip = mp.game.invoke(Natives.GET_NEXT_BLIP_INFO_ID, 437);
}
}
mp.events.add('GangAreas:Create', (turfsJSON) => {
var turfs = JSON.parse(turfsJSON);
if (gangturfs.length > 0) {
@@ -485,7 +485,7 @@
}
clearBlips();
if (turfs.length > 0) {
gangturfs = [];
turfs.forEach(function (turf) {
if (turf.Id != undefined) {
@@ -505,7 +505,7 @@
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);
}
}
});
mp.events.add('ADMIN:DeleteTurf', () => {
@@ -541,13 +541,13 @@
mp.events.add('CLIENT:Turf_LoadLeaderBlip', () => {
gangturfs.forEach(function (turf) {
turf.setLeaderBlip(false);
turf.setLeaderBlip(false);
});
});
mp.events.add('ADMIN:Turf_CreateLeaderBlip', () => {
gangturfs.forEach(function (turf) {
if (turf._entered == true) {
if (turf._entered == true) {
turf.setLeaderBlip(true);
}
});
@@ -556,7 +556,7 @@
mp.events.add('CLIENT:StartGangwar', () => {
gangturfs.forEach(function (turf) {
if (turf._entered == true) {
turf.startGangWar();
turf.startGangWar();
}
});
});

2
ReallifeGamemode.Client/util/checkpoint.ts
View File

@@ -1,7 +1,7 @@
import * as NativeUI from '../libs/NativeUI';
import InputHelper from '../inputhelper';
export default function checkpointHandle(globalData: GlobalData) {
export default function checkpointHandle(globalData: IGlobalData) {
var count = 0;
var myVar;
var posCp;

2
ReallifeGamemode.Client/util/drivingschool.ts
View File

@@ -10,7 +10,7 @@ const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
const ListItem = NativeUI.ListItem;
export default function drivingSchoolHandle(globalData: GlobalData) {
export default function drivingSchoolHandle(globalData: IGlobalData) {
var keyBound = false;
var mainMenu: NativeUI.Menu;

2
ReallifeGamemode.Client/util/planeschool.ts
View File

@@ -10,7 +10,7 @@ const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
const ListItem = NativeUI.ListItem;
export default function planeSchoolHandle(globalData: GlobalData) {
export default function planeSchoolHandle(globalData: IGlobalData) {
var keyBound = false;
var mainMenu: NativeUI.Menu;

2
ReallifeGamemode.Client/vehiclesync/entering.ts
View File

@@ -1,4 +1,4 @@
export default function vehicleEntering(globalData: GlobalData) {
export default function vehicleEntering(globalData: IGlobalData) {
mp.events.add('render', () => {
const controls = mp.game.controls;
if(globalData.InChat) return;