Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add /perks #53

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add /perks #53

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e67f30
Add /perks
fghouri Jan 6, 2021
d2abf22
Add TP option in /perks
fghouri Jan 25, 2021
894a008
Remove is not in vehicle restriction in the CMD
fghouri Jan 25, 2021
8e0f061
Changes using inlines perks cmd
CnRXoMoX Feb 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions gamemodes/core/cmds/cmds_perks.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,9 @@ CMD:perks(playerid, params[])
perksStr[256]
;

for(new i = 0; i < sizeof(gPerkData); i++)
format(perksStr, sizeof perksStr, "%s%s\t%s\t{FFDC2E}$%d\n", perksStr, gPerkData[i][E_NAME], gPerkData[i][E_PURPOSE], gPerkData[i][E_COST]);

format(perksStr, sizeof perksStr, "{FFFFFF}Perk\t{FFFFFF}Purpose\t{FFFFFF}Cost\n%s", perksStr);

ShowPlayerDialog(playerid, DIALOG_PERKS, DIALOG_STYLE_TABLIST_HEADERS, "Player Perks", perksStr, "Choose", "Close");
return 1;
}

public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
{
if(dialogid == DIALOG_PERKS)
{
inline perks(pid, dialogid, response, listitem, string:inputtext[]) {
Copy link
Owner

Choose a reason for hiding this comment

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

inline function name is CameCase.

#pragma unused pid, dialogid, inputtext
if(!response) return 1;
new
vehicleid = GetPlayerVehicleID(playerid)
;
Expand Down Expand Up @@ -78,30 +68,45 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
}
case 3: // Teleport
{
ShowPlayerDialog(playerid, DIALOG_PERKS_TP, DIALOG_STYLE_INPUT, "{FFFFFF}Teleport To A Player", "Input a valid player name/id", "Select", "Cancel");
inline teleportInline(pid2, did, resp, li, string:it[]) {
#pragma unused pid2, did, li
new
id
;

if(!resp) return Dialog_ShowCallback(playerid, using inline teleportInline, DIALOG_STYLE_INPUT, "{FFFFFF}Teleport To A Player", "Input a valid player name/id", "Select", "Cancel");
Copy link
Owner

Choose a reason for hiding this comment

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

consitency


if(sscanf(it, "u", id)) {
return Dialog_ShowCallback(playerid, using inline teleportInline, DIALOG_STYLE_INPUT, "{FFFFFF}Teleport To A Player", "Input a valid player name/id", "Select", "Cancel");
Copy link
Owner

Choose a reason for hiding this comment

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

consistency, which style do you want to use?

}

else if(!IsPlayerConnected(id)) {
return SendErrorMsg(playerid, "Invalid Player ID");
}

else if(GetPlayerWantedLevel(playerid) != 0) {
return SendErrorMsg(playerid, "You mustn't be a wanted player to use this perk.");
}

new Float:x, Float:y, Float:z;
new interior = GetPlayerInterior(playerid), vm = GetPlayerVirtualWorld(playerid);
GetPlayerPos(id, x, y, z);
SetPlayerPos(playerid, x, y, z);
SetPlayerInterior(playerid, interior);
SetPlayerVirtualWorld(playerid, vm);

SendMsgF(playerid, -1, "[PERK-TP] You have successfully teleported to %s", id);
}
Dialog_ShowCallback(playerid, using inline teleportInline, DIALOG_STYLE_INPUT, "{FFFFFF}Teleport To A Player", "Input a valid player name/id", "Select", "Cancel");
}
}
}
else if(dialogid == DIALOG_PERKS_TP)
{
new
id
;

if(sscanf(inputtext, "u", id))
return ShowPlayerDialog(playerid, DIALOG_PERKS_TP, DIALOG_STYLE_INPUT, "{FFFFFF}Teleport To A Player", "Input a valid player name/id", "Select", "Cancel");
for(new i = 0; i < sizeof(gPerkData); i++)
Copy link
Owner

Choose a reason for hiding this comment

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

can we wrap this in brackets please?

format(perksStr, sizeof perksStr, "%s%s\t%s\t{FFDC2E}$%d\n", perksStr, gPerkData[i][E_NAME], gPerkData[i][E_PURPOSE], gPerkData[i][E_COST]);

else if(!IsPlayerConected(id))
return SendErrorMsg(playerid, "Invalid Player ID");
format(perksStr, sizeof perksStr, "{FFFFFF}Perk\t{FFFFFF}Purpose\t{FFFFFF}Cost\n%s", perksStr);

else if(GetPlayerWantedLevel(playerid) != 0)
return SendErrorMsg(playerid, "You mustn't be a wanted player to use this perk.");

new Float:x, Float:y, Float:z;
GetPlayerPos(id, x, y, z);
SetPlayerPos(playerid, x, y, z);

SendMsgF(playerid -1, "[PERK-TP] You have successfully teleported to %s", id);
}
return 1;
}
Dialog_ShowCallback(playerid, using inline perks, DIALOG_STYLE_TABLIST_HEADERS, "Player Perks", perksStr, "Choose", "Close");
return 1;
}
4 changes: 2 additions & 2 deletions gamemodes/core/player/player_items.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ static void:_SaveItem(playerid, const itemName[], value) {
"UPDATE player_items SET ? = ? + ? WHERE u_id = ?"
);

MySQL_Bind(stmt_saveItem, 0, itemName, true);
MySQL_Bind(stmt_saveItem, 1, itemName, true);
MySQL_Bind(stmt_saveItem, 0, itemName);
MySQL_Bind(stmt_saveItem, 1, itemName);
Copy link
Owner

Choose a reason for hiding this comment

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

this is needed to allow raw string to be the input

Copy link
Collaborator

Choose a reason for hiding this comment

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

When i compiled it, gives me an error but gonna fix it

Copy link
Owner

Choose a reason for hiding this comment

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

need to update package sampctl p ensure because I've recently updated the prepared statement library.

MySQL_BindInt(stmt_saveItem, 2, value);
MySQL_BindInt(stmt_saveItem, 3, Player_GetAccountID(playerid));
MySQL_ExecuteThreaded(stmt_saveItem);
Expand Down