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

payday frakgeld geht brrrrr

Browse Source
This commit is contained in:
hydrant
2020-04-13 12:31:20 +02:00
parent eb25db30fd
commit b45d2ef728
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Import/Bootstrapper.dll
View File

Binary file not shown.

BIN
Import/rage-sharp.dll
View File

Binary file not shown.

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

@@ -26,7 +26,7 @@ export default function (globalData: IGlobalData) {
var groupItem = new UIMenuItem("Gruppe", "Verwalte deine Gruppe");
var paycheckItem = new UIMenuItem("Gehaltsscheck", "Schaue dir deinen Verdienst der letzten Stunde an");
var licenseItem = new UIMenuItem("Lizenzen", "Lizenzen Informationen");
var vehiclesItem = new UIMenuItem("Fahrzeuge", "Zeige deine Fahrzeuge an");
@@ -82,6 +82,12 @@ export default function (globalData: IGlobalData) {
item.SetRightLabel("~g~+ $" + moneyFormat(p.financialHelp));
paycheckMenu.AddItem(item);
if (p.factionMoney) {
item = new UIMenuItem("Fraktionsgeld");
item.SetRightLabel("~g~+ $" + moneyFormat(p.factionMoney));
paycheckMenu.AddItem(item);
}
item = new UIMenuItem("Fahrzeugsteuer");
item.SetRightLabel("~r~- $" + moneyFormat(p.vehicleTaxation));
paycheckMenu.AddItem(item);
@@ -106,8 +112,7 @@ export default function (globalData: IGlobalData) {
menu.BindMenuToItem(paycheckMenu, paycheckItem);
}
if (ticket_boolean == true)
{
if (ticket_boolean == true) {
menu.AddItem(ticketItem);
menu.BindMenuToItem(getTicketMenu(ticket_amount, menu), ticketItem);
}

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

@@ -35,6 +35,7 @@ declare type Paycheck = {
amount: number;
rentalFees: number;
healthInsurance: number;
factionMoney: number;
}
declare type Licenses = {

12
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -81,9 +81,17 @@ namespace ReallifeGamemode.Server.Finance
int healthInsurance = (int)(user.BankAccount.Balance * 0.001);
int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance;
Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance);
int? factionMoney = null;
if (user.Faction != null && user.FactionRank != null)
{
factionMoney = user.FactionRank.Order * 1000;
}
int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance + (factionMoney ?? 0);
Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance, factionMoney);
Paychecks[user.Id] = paycheck;
ReleasePayDay(client, paycheck);
}

6
ReallifeGamemode.Server/Finance/Paycheck.cs
View File

@@ -37,7 +37,10 @@ namespace ReallifeGamemode.Server.Finance
[JsonProperty("healthInsurance")]
public int HealthInsurance { get; set; } = 0;
public Paycheck(float FinancialHelp, float FinancialInterest, int VehicleTaxation, float PropertyTaxation, int Wage, int Amount, int RentalFees, int HealthInsurance)
[JsonProperty("factionMoney")]
public int? FactionMoney { get; set; } = 0;
public Paycheck(float FinancialHelp, float FinancialInterest, int VehicleTaxation, float PropertyTaxation, int Wage, int Amount, int RentalFees, int HealthInsurance, int? FactionMoney)
{
this.FinancialHelp = FinancialHelp;
this.FinancialInterest = FinancialInterest;
@@ -47,6 +50,7 @@ namespace ReallifeGamemode.Server.Finance
this.Amount = Amount;
this.RentalFees = RentalFees;
this.HealthInsurance = HealthInsurance;
this.FactionMoney = FactionMoney;
}
}
}