Skip to content

Commit

Permalink
fixes & revamp
Browse files Browse the repository at this point in the history
- revamp bank system, also a better tax system in place.
- added legacy include for progress2 and EVF
- fix improper hooking of EVF.inc
  • Loading branch information
PatrickGTR committed Jan 19, 2021
1 parent 3adfd99 commit 6340082
Show file tree
Hide file tree
Showing 16 changed files with 300 additions and 408 deletions.
28 changes: 0 additions & 28 deletions gamemodes/core/admin/admin_cmd_lvl5.inc
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,6 @@ ACMD:[5]setadmin(playerid, params[])
return 1;
}

ACMD:[5]setplayerdept(playerid, params[])
{
new target, value;
if(sscanf(params, "ui", target)) return SendSyntaxMsg(playerid, "/setplayerdept (name/id) (bank dept.)");
if(!IsPlayerConnected(target)) {
return SendErrorMsg(playerid, "Player is not connected");
}
SendMsgAllF(COLOR_MODERATION, "[BANK DEPT.]: An Administrator sets %p (%d)'s bank dept. to %d", target, target, value);
Player_AddBankDept(target, value, true);
SendMsgAllF(COLOR_MODERATION, "[BANK]: %p (%d)'s Total Bank Dept. is %d", target, target, Player_GetBankDept(playerid));
return 1;
}

ACMD:[5]bankrupt(playerid, params[])
{
new target;
if(sscanf(params, "u", target)) return SendSyntaxMsg(playerid, "/bankrupt (name/id)");
if(!IsPlayerConnected(target)) {
return SendErrorMsg(playerid, "Player is not connected");
}
SendMsgAllF(COLOR_MODERATION, "[BANKRUPT]: An Administrator bankrupted %p (%d)", target, target);
SendMsgAllF(COLOR_MODERATION, "[BANK]: Removed %d from %p (%d)'s account", Player_GetBankMoney(playerid), target, target);
Player_RemoveBankMoney(target, Player_GetBankMoney(target));
SendMsgAllF(COLOR_MODERATION, "[BANK]: Removed %p (%d)'s Tax Balance.", target, target);
Player_RemoveBankTax(target, Player_GetBankTax(playerid));
return 1;
}

ACMD:[5]skick(playerid, params[])
{
new target;
Expand Down
193 changes: 0 additions & 193 deletions gamemodes/core/bank/bank.inc

This file was deleted.

19 changes: 0 additions & 19 deletions gamemodes/core/bank/bank_setup-bankacc-table.inc

This file was deleted.

49 changes: 0 additions & 49 deletions gamemodes/core/bank/bank_taxes.inc

This file was deleted.

1 change: 1 addition & 0 deletions gamemodes/core/player/player.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <player_crimes>
#include <player_shots>
#include <player_army>
#include <player_bank>

#include <player_hitpoint-save>
#include <player_weapon-save>
Expand Down
74 changes: 74 additions & 0 deletions gamemodes/core/player/player_bank.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
#include <YSI_Coding\y_hooks>

static
Statement:stmt_insertBank,
Statement:stmt_loadBank,
PlayerBankMoney[MAX_PLAYERS];

hook OnMySQLConnected() {
static const insertQuery[] = "\
INSERT INTO \
player_bank(u_id) \
VALUES \
(?) \
ON DUPLICATE KEY UPDATE \
money = ? \
";
stmt_insertBank = MySQL_PrepareStatement(MySQL_GetHandle(), insertQuery);

static const loadQuery[] = "\
SELECT \
money \
FROM \
player_bank \
WHERE \
u_id = ? \
";
stmt_loadBank = MySQL_PrepareStatement(MySQL_GetHandle(), loadQuery);
return 1;
}

hook OnPlayerLogin(playerid) {
Bank_Load(playerid);
return 1;
}

hook OnPlayerConnect(playerid) {
PlayerBankMoney[playerid] = 0;
return 1;
}

Bank_Load(playerid) {
inline OnBankLoad() {
new
bankBalance;
MySQL_BindResultInt(stmt_loadBank, 0, bankBalance);

if(MySQL_Statement_FetchRow(stmt_loadBank)) {
Player_GiveBankMoney(playerid, bankBalance);
}
}
MySQL_BindInt(stmt_loadBank, 0, Player_GetAccountID(playerid));
MySQL_ExecuteParallel_Inline(stmt_loadBank, using inline OnBankLoad);
}

stock Player_GetBankMoney(playerid)
return PlayerBankMoney[playerid];

stock Player_GiveBankMoney(playerid, amount, bool:save = false) {
PlayerBankMoney[playerid] = (Player_GetBankMoney(playerid) + amount);

if(save) {
MySQL_BindInt(stmt_insertBank, 0, Player_GetAccountID(playerid));
MySQL_BindInt(stmt_insertBank, 1, Player_GetBankMoney(playerid));
MySQL_ExecuteThreaded(stmt_insertBank);
}
}

stock Player_RemoveBankMoney(playerid, amount) {
PlayerBankMoney[playerid] = (Player_GetBankMoney(playerid) - amount);

MySQL_BindInt(stmt_insertBank, 0, Player_GetAccountID(playerid));
MySQL_BindInt(stmt_insertBank, 1, Player_GetBankMoney(playerid));
MySQL_ExecuteThreaded(stmt_insertBank);
}
1 change: 1 addition & 0 deletions gamemodes/core/server/server.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <server_shop-items>
#include <server_msgs>
#include <server_motd>
#include <server_tax>

#include <server_atm-impl>
#include <server_atm-menu>
Expand Down
Loading

2 comments on commit 6340082

@MatheusAgL
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Patrick!

Can you tell me how you use fate:

#include <player_crimes>
#include <player_shots>
#include <player_army>
#include <player_bank>

Rather than

#include "core/player/player_crimes.inc"
#include "core/player/player_shots.inc"
#include "core/player/player_army.inc"
#include "core/player/player_bank.inc"

@PatrickGTR
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Patrick!

Can you tell me how you use fate:

#include <player_crimes>
#include <player_shots>
#include <player_army>
#include <player_bank>

Rather than

#include "core/player/player_crimes.inc"
#include "core/player/player_shots.inc"
#include "core/player/player_army.inc"
#include "core/player/player_bank.inc"

refer to https://github.com/PatrickGTR/gta-open/blob/master/pawn.json and check builds section.

Please sign in to comment.