change duel system styling for ease of use
This commit is contained in:
parent
95f4957f9a
commit
271ecbe713
@ -1,14 +1,16 @@
|
|||||||
/*
|
/*
|
||||||
* Irresistible Gaming (c) 2018
|
* Irresistible Gaming (c) 2018
|
||||||
* Developed by Stev
|
* Developed by Steven Howard
|
||||||
* Module: duel.pwn
|
* Module: cnr/features/duel.pwn
|
||||||
* Purpose: player dueling system
|
* Purpose: player duling system
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* ** Debug ** */
|
/* ** Includes ** */
|
||||||
|
#include < YSI\y_hooks >
|
||||||
|
|
||||||
/* ** Definitions ** */
|
/* ** Definitions ** */
|
||||||
#define COL_DUEL "{B74AFF}"
|
#define COL_DUEL "{B74AFF}"
|
||||||
|
|
||||||
#define DIALOG_DUEL 7360
|
#define DIALOG_DUEL 7360
|
||||||
#define DIALOG_DUEL_PLAYER 7361
|
#define DIALOG_DUEL_PLAYER 7361
|
||||||
#define DIALOG_DUEL_LOCATION 7362
|
#define DIALOG_DUEL_LOCATION 7362
|
||||||
@ -19,47 +21,38 @@
|
|||||||
#define DIALOG_DUEL_ARMOUR 7367
|
#define DIALOG_DUEL_ARMOUR 7367
|
||||||
|
|
||||||
/* ** Variables ** */
|
/* ** Variables ** */
|
||||||
enum duelData
|
|
||||||
|
enum E_DUEL_DATA
|
||||||
{
|
{
|
||||||
duelPlayer,
|
E_PLAYER, E_WEAPON[ 2 ], E_BET,
|
||||||
duelWeapon[2],
|
Float: E_ARMOUR, Float: E_HEALTH, E_COUNTDOWN,
|
||||||
duelBet,
|
E_TIMER, E_LOCATION_ID, E_ROUNDS,
|
||||||
Float: duelArmour,
|
|
||||||
Float: duelHealth,
|
|
||||||
duelCountdown,
|
|
||||||
duelTimer,
|
|
||||||
duelLocation,
|
|
||||||
duelRemainingRounds
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum locationData
|
enum E_DUEL_LOCATION_DATA
|
||||||
{
|
{
|
||||||
locationName[19],
|
E_NAME [ 19 ], Float: E_POS_ONE[ 3 ], Float: E_POS_TWO[ 3 ]
|
||||||
Float:locationPosOne[3],
|
|
||||||
Float:locationPosTwo[3],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const Float: duel_coordinates[3] = {-2226.1938, 251.9206, 35.3203};
|
|
||||||
|
|
||||||
new
|
new
|
||||||
weaponList [] = {0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34},
|
Float: g_DuelCoordinates [ 3 ] = { -2226.1938, 251.9206, 35.3203 },
|
||||||
LocationInfo [][locationData] =
|
g_WeaponList [ ] = { 0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34 },
|
||||||
|
g_duelData [ MAX_PLAYERS ][ E_DUEL_DATA ],
|
||||||
|
g_duelLocationData [ ][ E_DUEL_LOCATION_DATA ] =
|
||||||
{
|
{
|
||||||
{"Santa Maria Beach", {369.75770, -1831.576, 7.67190}, {369.65890, -1871.215, 7.67190}},
|
{ "Santa Maria Beach", { 369.75770, -1831.576, 7.67190 }, { 369.65890, -1871.215, 7.67190 }},
|
||||||
{"Greenglass College", {1078.0353, 1084.4989, 10.8359}, {1095.4019, 1064.7239, 10.8359}},
|
{ "Greenglass College", { 1078.0353, 1084.4989, 10.8359 }, { 1095.4019, 1064.7239, 10.8359 }},
|
||||||
{"Baseball Arena", {1393.0995, 2177.4585, 9.75780}, {1377.7881, 2195.4214, 9.75780}},
|
{ "Baseball Arena", { 1393.0995, 2177.4585, 9.75780 }, { 1377.7881, 2195.4214, 9.75780 }},
|
||||||
//{"The Visage", {1960.4512, 1907.6881, 130.937}, {1969.4047, 1923.2622, 130.937}},
|
//{"The Visage", { 1960.4512, 1907.6881, 130.937 }, { 1969.4047, 1923.2622, 130.937 }},
|
||||||
{"Mount Chilliad", {-2318.471, -1632.880, 483.703}, {-2329.174, -1604.657, 483.760}},
|
{ "Mount Chilliad", { -2318.471, -1632.880, 483.703 }, { -2329.174, -1604.657, 483.760 }},
|
||||||
{"The Farm", {-1044.856, -996.8120, 129.218}, {-1125.599, -996.7523, 129.218}},
|
{ "The Farm", { -1044.856, -996.8120, 129.218 }, { -1125.599, -996.7523, 129.218 }},
|
||||||
{"Tennis Courts", {755.93790, -1280.710, 13.5565}, {755.93960, -1238.688, 13.5516}},
|
{ "Tennis Courts", { 755.93790, -1280.710, 13.5565 }, { 755.93960, -1238.688, 13.5516 }},
|
||||||
{"Underwater World", {520.59600, -2125.663, -28.257}, {517.96600, -2093.610, -28.257}},
|
{ "Underwater World", { 520.59600, -2125.663, -28.257 }, { 517.96600, -2093.610, -28.257 }},
|
||||||
{"Grove Street", {2476.4580, -1668.631, 13.3249}, {2501.1560, -1667.655, 13.3559}},
|
{ "Grove Street", { 2476.4580, -1668.631, 13.3249 }, { 2501.1560, -1667.655, 13.3559 }},
|
||||||
{"Ocean Docks", {2683.5440, -2485.137, 13.5425}, {2683.8470, -2433.726, 13.5553}}
|
{ "Ocean Docks", { 2683.5440, -2485.137, 13.5425 }, { 2683.8470, -2433.726, 13.5553 }}
|
||||||
},
|
},
|
||||||
duelInfo [MAX_PLAYERS][duelData],
|
bool: p_playerDueling [ MAX_PLAYERS char ],
|
||||||
|
p_duelInvitation [ MAX_PLAYERS ][ MAX_PLAYERS ],
|
||||||
bool: p_playerDueling [MAX_PLAYERS char],
|
|
||||||
p_duelInvitation [MAX_PLAYERS][MAX_PLAYERS],
|
|
||||||
|
|
||||||
g_DuelCheckpoint = -1
|
g_DuelCheckpoint = -1
|
||||||
;
|
;
|
||||||
@ -67,27 +60,27 @@ new
|
|||||||
/* ** Hooks ** */
|
/* ** Hooks ** */
|
||||||
hook OnGameModeInit()
|
hook OnGameModeInit()
|
||||||
{
|
{
|
||||||
CreateDynamicMapIcon(duel_coordinates[0], duel_coordinates[1], duel_coordinates[2], 23, 0, -1, -1, -1, 750.0);
|
CreateDynamicMapIcon(g_DuelCoordinates[0], g_DuelCoordinates[1], g_DuelCoordinates[2], 23, 0, -1, -1, -1, 750.0);
|
||||||
g_DuelCheckpoint = CreateDynamicCP(duel_coordinates[0], duel_coordinates[1], duel_coordinates[2], 1.5, 0, 0, -1);
|
g_DuelCheckpoint = CreateDynamicCP(g_DuelCoordinates[0], g_DuelCoordinates[1], g_DuelCoordinates[2], 1.5, 0, 0, -1);
|
||||||
CreateDynamic3DTextLabel(""COL_GOLD"[DUEL PLAYER]", -1, duel_coordinates[0], duel_coordinates[1], duel_coordinates[2], 25.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, 0, 0, -1);
|
CreateDynamic3DTextLabel(""COL_GOLD"[DUEL PLAYER]", -1, g_DuelCoordinates[0], g_DuelCoordinates[1], g_DuelCoordinates[2], 25.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, 0, 0, -1);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hook OnPlayerConnect(playerid)
|
hook OnPlayerConnect( playerid )
|
||||||
{
|
{
|
||||||
p_playerDueling{playerid} = false;
|
p_playerDueling{ playerid } = false;
|
||||||
duelInfo[playerid][duelPlayer] = INVALID_PLAYER_ID;
|
g_duelData[ playerid ][ E_PLAYER ] = INVALID_PLAYER_ID;
|
||||||
duelInfo[playerid][duelWeapon][0] = 0;
|
g_duelData[ playerid ][ E_WEAPON ][ 0 ] = 0;
|
||||||
duelInfo[playerid][duelWeapon][1] = 0;
|
g_duelData[ playerid ][ E_WEAPON ][ 1 ] = 0;
|
||||||
duelInfo[playerid][duelHealth] = 100.0;
|
g_duelData[ playerid ][ E_HEALTH ] = 100.0;
|
||||||
duelInfo[playerid][duelArmour] = 100.0;
|
g_duelData[ playerid ][ E_ARMOUR ] = 100.0;
|
||||||
duelInfo[playerid][duelBet] = 0;
|
g_duelData[ playerid ][ E_BET ] = 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hook OnPlayerDisconnect(playerid, reason)
|
hook OnPlayerDisconnect( playerid, reason )
|
||||||
{
|
{
|
||||||
forfeitPlayerDuel(playerid);
|
forfeitPlayerDuel( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -97,237 +90,243 @@ hook OnPlayerDeathEx(playerid, killerid, reason, Float: damage, bodypart)
|
|||||||
hook OnPlayerDeath(playerid, killerid, reason)
|
hook OnPlayerDeath(playerid, killerid, reason)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
forfeitPlayerDuel(playerid);
|
forfeitPlayerDuel( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hook SetPlayerRandomSpawn(playerid)
|
hook SetPlayerRandomSpawn( playerid )
|
||||||
{
|
{
|
||||||
if (IsPlayerDueling(playerid))
|
if ( IsPlayerDueling( playerid ))
|
||||||
{
|
{
|
||||||
// teleport back to pb
|
// teleport back to pb
|
||||||
SetPlayerPos(playerid, duel_coordinates[0], duel_coordinates[1], duel_coordinates[2]);
|
SetPlayerPos( playerid, g_DuelCoordinates[0], g_DuelCoordinates[1], g_DuelCoordinates[2] );
|
||||||
SetPlayerInterior(playerid, 0);
|
SetPlayerInterior( playerid, 0 );
|
||||||
SetPlayerVirtualWorld(playerid, 0);
|
SetPlayerVirtualWorld( playerid, 0 );
|
||||||
|
|
||||||
// reset duel variables
|
// reset duel variables
|
||||||
p_playerDueling{playerid} = false;
|
p_playerDueling{ playerid } = false;
|
||||||
duelInfo[playerid][duelPlayer] = INVALID_PLAYER_ID;
|
g_duelData[ playerid ][ E_PLAYER ] = INVALID_PLAYER_ID;
|
||||||
return Y_HOOKS_BREAK_RETURN_1;
|
return Y_HOOKS_BREAK_RETURN_1;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hook OnPlayerEnterDynamicCP(playerid, checkpointid)
|
hook OnPlayerEnterDynamicCP( playerid, checkpointid )
|
||||||
{
|
{
|
||||||
if (GetPlayerState(playerid) == PLAYER_STATE_SPECTATING) {
|
if ( GetPlayerState( playerid ) == PLAYER_STATE_SPECTATING ) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (checkpointid == g_DuelCheckpoint)
|
if ( checkpointid == g_DuelCheckpoint )
|
||||||
{
|
{
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hook OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
|
hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[] )
|
||||||
{
|
{
|
||||||
if (dialogid == DIALOG_DUEL && response)
|
if ( ( dialogid == DIALOG_DUEL ) && response )
|
||||||
{
|
{
|
||||||
switch (listitem)
|
erase ( szBigString );
|
||||||
|
|
||||||
|
switch ( listitem )
|
||||||
{
|
{
|
||||||
case 0: ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{C0C0C0}Note: You can enter partially their names.", "Select", "Back");
|
case 0: ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_GREY"Note: You can enter partially their names.", "Select", "Back");
|
||||||
|
case 1: ShowPlayerDialog( playerid, DIALOG_DUEL_HEALTH, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Health", ""COL_WHITE"Enter the amount of health you will begin with:\n\n"COL_GREY"Note: The default health is 100.0.", "Select", "Back");
|
||||||
case 1: ShowPlayerDialog(playerid, DIALOG_DUEL_HEALTH, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Health", "{FFFFFF}Enter the amount of health you will begin with:\n\n{C0C0C0}Note: The default health is 100.0.", "Select", "Back");
|
case 2: ShowPlayerDialog( playerid, DIALOG_DUEL_ARMOUR, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Armour", ""COL_WHITE"Enter the amount of armour you will begin with:\n\n"COL_GREY"Note: The default armour is 100.0.", "Select", "Back");
|
||||||
|
|
||||||
case 2: ShowPlayerDialog(playerid, DIALOG_DUEL_ARMOUR, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Armour", "{FFFFFF}Enter the amount of armour you will begin with:\n\n{C0C0C0}Note: The default armour is 100.0.", "Select", "Back");
|
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
{
|
{
|
||||||
new weaponid = duelInfo[playerid][duelWeapon][0];
|
erase ( szBigString );
|
||||||
|
|
||||||
erase(szBigString);
|
new
|
||||||
|
iWeapon = g_duelData [ playerid ] [ E_WEAPON ] [ 0 ];
|
||||||
|
|
||||||
for (new i = 0; i < sizeof(weaponList); i ++) {
|
for ( new i = 0; i < sizeof( g_WeaponList ); i ++) {
|
||||||
format(szBigString, sizeof(szBigString), "%s%s%s\n", szBigString, (weaponid == weaponList[i] ? (COL_GREY) : (COL_WHITE)), ReturnWeaponName(weaponList[i]));
|
format( szBigString, sizeof(szBigString), "%s%s%s\n", szBigString, iWeapon == g_WeaponList [ i ] ? ( COL_GREY ) : ( COL_WHITE ), ReturnWeaponName( g_WeaponList[ i ] ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowPlayerDialog(playerid, DIALOG_DUEL_WEAPON, DIALOG_STYLE_LIST, "{FFFFFF}Duel Settings - Change Primary Weapon", szBigString, "Select", "Back");
|
ShowPlayerDialog( playerid, DIALOG_DUEL_WEAPON, DIALOG_STYLE_LIST, ""COL_WHITE"Duel Settings - Change Primary Weapon", szBigString, "Select", "Back");
|
||||||
}
|
}
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
{
|
{
|
||||||
new weaponid = duelInfo[playerid][duelWeapon][1];
|
erase ( szBigString );
|
||||||
|
|
||||||
erase(szBigString);
|
new
|
||||||
|
iWeapon = g_duelData [ playerid ] [ E_WEAPON ] [ 1 ];
|
||||||
|
|
||||||
for (new i = 0; i < sizeof(weaponList); i ++) {
|
for ( new i = 0; i < sizeof( g_WeaponList ); i ++ ) {
|
||||||
format(szBigString, sizeof(szBigString), "%s%s%s\n", szBigString, (weaponid == weaponList[i] ? (COL_GREY) : (COL_WHITE)), ReturnWeaponName(weaponList[i]));
|
format( szBigString, sizeof(szBigString), "%s%s%s\n", szBigString, iWeapon == g_WeaponList [ i ] ? ( COL_GREY ) : ( COL_WHITE ), ReturnWeaponName( g_WeaponList [ i ]) );
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowPlayerDialog(playerid, DIALOG_DUEL_WEAPON_TWO, DIALOG_STYLE_LIST, "{FFFFFF}Duel Settings - Change Secondary Weapon", szBigString, "Select", "Back");
|
ShowPlayerDialog( playerid, DIALOG_DUEL_WEAPON_TWO, DIALOG_STYLE_LIST, ""COL_WHITE"Duel Settings - Change Secondary Weapon", szBigString, "Select", "Back");
|
||||||
}
|
}
|
||||||
|
|
||||||
case 5:
|
case 5:
|
||||||
{
|
{
|
||||||
new index = duelInfo[playerid][duelLocation];
|
new
|
||||||
|
iLocationID = g_duelData [ playerid ][ E_LOCATION_ID ];
|
||||||
|
|
||||||
erase(szBigString);
|
for ( new i = 0; i < sizeof( g_duelLocationData ); i ++ ) {
|
||||||
|
format( szBigString, sizeof(szBigString), "%s%s%s\n", szBigString, iLocationID == i ? ( COL_GREY ) : ( COL_WHITE ), g_duelLocationData[ i ][ E_NAME ]);
|
||||||
for (new i = 0; i < sizeof(LocationInfo); i ++) {
|
|
||||||
format(szBigString, sizeof(szBigString), "%s%s%s\n", szBigString, (index == i ? (COL_GREY) : (COL_WHITE)), LocationInfo[i][locationName]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowPlayerDialog(playerid, DIALOG_DUEL_LOCATION, DIALOG_STYLE_LIST, "{FFFFFF}Duel Settings - Change Location", szBigString, "Select", "Back");
|
ShowPlayerDialog(playerid, DIALOG_DUEL_LOCATION, DIALOG_STYLE_LIST, ""COL_WHITE"Duel Settings - Change Location", szBigString, "Select", "Back");
|
||||||
}
|
}
|
||||||
|
|
||||||
case 6: ShowPlayerDialog(playerid, DIALOG_DUEL_WAGER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Set A Wager", "{FFFFFF}Please enter the wager for this duel:", "Select", "Back");
|
case 6: ShowPlayerDialog(playerid, DIALOG_DUEL_WAGER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Set A Wager", ""COL_WHITE"Please enter the wager for this duel:", "Select", "Back");
|
||||||
|
|
||||||
case 7:
|
case 7:
|
||||||
{
|
{
|
||||||
new targetid = duelInfo[playerid][duelPlayer];
|
new
|
||||||
|
pID = g_duelData [ playerid ][ E_PLAYER ];
|
||||||
|
|
||||||
if (!IsPlayerConnected(targetid)) {
|
if ( !IsPlayerConnected( pID ) ) {
|
||||||
SendError(playerid, "You haven't selected anyone to duel!");
|
SendError( playerid, "You haven't selected anyone to duel!" );
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
}
|
}
|
||||||
|
|
||||||
p_duelInvitation[playerid][targetid] = gettime() + 60;
|
p_duelInvitation[ playerid ][ pID ] = gettime( ) + 60;
|
||||||
ShowPlayerHelpDialog(targetid, 10000, "%s wants to duel!~n~~n~~y~Location: ~w~%s~n~~y~Weapon: ~w~%s and %s~n~~y~Wager: ~w~%s", ReturnPlayerName(playerid), LocationInfo[duelInfo[playerid][duelLocation]][locationName], ReturnWeaponName(duelInfo[playerid][duelWeapon][0]), ReturnWeaponName(duelInfo[playerid][duelWeapon][1]), number_format(duelInfo[playerid][duelBet]));
|
ShowPlayerHelpDialog( pID, 10000, "%s wants to duel!~n~~n~~y~Location: ~w~%s~n~~y~Weapon: ~w~%s and %s~n~~y~Wager: ~w~%s", ReturnPlayerName( playerid ), g_duelLocationData [ g_duelData[ playerid ][ E_LOCATION_ID ] ][ E_NAME ], ReturnWeaponName( g_duelData[ playerid ][ E_WEAPON ][ 0 ] ), ReturnWeaponName( g_duelData[ playerid ][ E_WEAPON ][ 1 ] ), number_format(g_duelData[ playerid ][ E_BET ]));
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have sent a duel invitation to %s for "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName(targetid), number_format(duelInfo[playerid][duelBet]));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have sent a duel invitation to %s for "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( pID ), number_format( g_duelData[ playerid ][ E_BET ] ) );
|
||||||
SendClientMessageFormatted(targetid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You are invited to duel %s for "COL_GOLD"%s"COL_WHITE", use \"/duel accept %d\".", ReturnPlayerName(playerid), number_format(duelInfo[playerid][duelBet]), playerid);
|
SendClientMessageFormatted( pID, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You are invited to duel %s for "COL_GOLD"%s"COL_WHITE", use \"/duel accept %d\".", ReturnPlayerName( playerid ), number_format( g_duelData[ playerid ][ E_BET ] ), playerid );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (dialogid == DIALOG_DUEL_PLAYER)
|
else if ( dialogid == DIALOG_DUEL_PLAYER )
|
||||||
{
|
{
|
||||||
if (!response)
|
if ( !response )
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
new targetid;
|
new
|
||||||
|
pID
|
||||||
|
;
|
||||||
|
|
||||||
if (sscanf(inputtext, "u", targetid))
|
if ( sscanf( inputtext, "u", pID) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{C0C0C0}Note: You can enter partially their names.", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_GREY"Note: You can enter partially their names.", "Select", "Back" );
|
||||||
|
|
||||||
if (targetid == playerid)
|
if ( pID == playerid )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}You can't invite yourself to duel!", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"You can't invite yourself to duel!", "Select", "Back" );
|
||||||
|
|
||||||
if (targetid == INVALID_PLAYER_ID || !IsPlayerConnected(targetid))
|
if ( pID == INVALID_PLAYER_ID || !IsPlayerConnected( pID ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}Player is not connected!", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"Player is not connected!", "Select", "Back" );
|
||||||
|
|
||||||
if (IsPlayerDueling(playerid))
|
if ( IsPlayerDueling( playerid ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}You are already in a duel!", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"You are already in a duel!", "Select", "Back" );
|
||||||
|
|
||||||
if (IsPlayerDueling(targetid))
|
if ( IsPlayerDueling( pID ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}This player is already in a duel!", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"This player is already in a duel!", "Select", "Back" );
|
||||||
|
|
||||||
if (GetPlayerWantedLevel(targetid))
|
if ( GetPlayerWantedLevel( pID ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}You can't duel this person right now, they are wanted", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"You can't duel this person right now, they are wanted", "Select", "Back" );
|
||||||
|
|
||||||
if (GetDistanceBetweenPlayers(playerid, targetid) > 25.0)
|
if ( GetDistanceBetweenPlayers( playerid, pID ) > 25.0 )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}The player you wish to duel is not near you.", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"The player you wish to duel is not near you.", "Select", "Back" );
|
||||||
|
|
||||||
if (IsPlayerJailed(targetid))
|
if ( IsPlayerJailed( pID ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Select a player", "{FFFFFF}Please type the name of the player you wish to duel:\n\n{FF0000}You can't duel this person right now, they are currently in jail.", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_PLAYER, DIALOG_STYLE_INPUT, ""COL_WHITE"Duel Settings - Select a player", ""COL_WHITE"Please type the name of the player you wish to duel:\n\n"COL_RED"You can't duel this person right now, they are currently in jail.", "Select", "Back" );
|
||||||
|
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have selected {C0C0C0}%s {FFFFFF}as your opponent.", ReturnPlayerName(targetid));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have selected {C0C0C0}%s {FFFFFF}as your opponent.", ReturnPlayerName( pID ) );
|
||||||
|
|
||||||
duelInfo[playerid][duelPlayer] = targetid;
|
g_duelData[ playerid ][ E_PLAYER ] = pID;
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (dialogid == DIALOG_DUEL_LOCATION)
|
else if ( dialogid == DIALOG_DUEL_LOCATION )
|
||||||
{
|
{
|
||||||
if (!response)
|
if ( !response )
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
if (duelInfo[playerid][duelLocation] == listitem)
|
if ( g_duelData[ playerid ][ E_LOCATION_ID ] == listitem )
|
||||||
{
|
{
|
||||||
SendError(playerid, "You have already selected this location!");
|
SendError( playerid, "You have already selected this location!" );
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
}
|
}
|
||||||
|
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed the duel location to {C0C0C0}%s{FFFFFF}.", LocationInfo[listitem][locationName]);
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have changed the duel location to {C0C0C0}%s{FFFFFF}.", g_duelLocationData [ listitem ][ E_NAME ]);
|
||||||
|
|
||||||
duelInfo[playerid][duelLocation] = listitem;
|
g_duelData[ playerid ][ E_LOCATION_ID ] = listitem;
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (dialogid == DIALOG_DUEL_WEAPON)
|
else if ( dialogid == DIALOG_DUEL_WEAPON )
|
||||||
{
|
{
|
||||||
if (!response)
|
if ( !response )
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
if (duelInfo[playerid][duelWeapon][0] == weaponList[listitem])
|
if ( g_duelData[ playerid ][ E_WEAPON ][ 0 ] == g_WeaponList[ listitem ] )
|
||||||
{
|
{
|
||||||
SendError(playerid, "You have already selected this weapon!");
|
SendError( playerid, "You have already selected this weapon!");
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
}
|
}
|
||||||
|
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed Primary Weapon to {C0C0C0}%s{FFFFFF}.", ReturnWeaponName(weaponList[listitem]));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have changed Primary Weapon to {C0C0C0}%s{FFFFFF}.", ReturnWeaponName( g_WeaponList[ listitem ]) );
|
||||||
duelInfo[playerid][duelWeapon][0] = weaponList[listitem];
|
g_duelData[ playerid ][ E_WEAPON ][ 0 ] = g_WeaponList[ listitem ];
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (dialogid == DIALOG_DUEL_WEAPON_TWO)
|
else if ( dialogid == DIALOG_DUEL_WEAPON_TWO )
|
||||||
{
|
{
|
||||||
if (!response)
|
if ( !response )
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
if (duelInfo[playerid][duelWeapon][1] == weaponList[listitem])
|
if ( g_duelData[ playerid ][ E_WEAPON ][ 1 ] == g_WeaponList[ listitem ] )
|
||||||
{
|
{
|
||||||
SendError(playerid, "You have already selected this weapon!");
|
SendError( playerid, "You have already selected this weapon!");
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
}
|
}
|
||||||
|
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed Secondary Weapon to {C0C0C0}%s{FFFFFF}.", ReturnWeaponName(weaponList[listitem]));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have changed Secondary Weapon to {C0C0C0}%s{FFFFFF}.", ReturnWeaponName( g_WeaponList[ listitem ]) );
|
||||||
duelInfo[playerid][duelWeapon][1] = weaponList[listitem];
|
g_duelData[ playerid ][ E_WEAPON ][ 1 ] = g_WeaponList[ listitem ];
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (dialogid == DIALOG_DUEL_HEALTH)
|
else if ( dialogid == DIALOG_DUEL_HEALTH )
|
||||||
{
|
{
|
||||||
if (!response)
|
if ( !response )
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
new Float:health;
|
new
|
||||||
|
Float:fHealth;
|
||||||
|
|
||||||
if (sscanf(inputtext, "f", health))
|
if (sscanf(inputtext, "f", fHealth))
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_HEALTH, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Health", "{FFFFFF}Enter the amount of health you will begin with:\n\n{C0C0C0}Note: The default health is 100.0.", "Select", "Back");
|
return ShowPlayerDialog(playerid, DIALOG_DUEL_HEALTH, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Health", "{FFFFFF}Enter the amount of health you will begin with:\n\n{C0C0C0}Note: The default health is 100.0.", "Select", "Back");
|
||||||
|
|
||||||
if (!(1.0 <= health <= 100.0))
|
if (!(1.0 <= fHealth <= 100.0))
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_HEALTH, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Health", "{FFFFFF}Enter the amount of health you will begin with:\n\n{FF0000}The amount you have entered is a invalid amount, 1 to 100 only!", "Select", "Back");
|
return ShowPlayerDialog(playerid, DIALOG_DUEL_HEALTH, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Health", "{FFFFFF}Enter the amount of health you will begin with:\n\n{FF0000}The amount you have entered is a invalid amount, 1 to 100 only!", "Select", "Back");
|
||||||
|
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed Health to {C0C0C0}%0.2f%%{FFFFFF}.", health);
|
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed Health to {C0C0C0}%0.2f%%{FFFFFF}.", fHealth);
|
||||||
duelInfo[playerid][duelHealth] = health;
|
g_duelData[ playerid ][ E_HEALTH ] = fHealth;
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (dialogid == DIALOG_DUEL_ARMOUR)
|
else if (dialogid == DIALOG_DUEL_ARMOUR)
|
||||||
{
|
{
|
||||||
if (!response)
|
if (!response)
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
new Float:armour;
|
new
|
||||||
|
Float:fArmour;
|
||||||
|
|
||||||
if (sscanf(inputtext, "f", armour))
|
if (sscanf(inputtext, "f", fArmour))
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_ARMOUR, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Armour", "{FFFFFF}Enter the amount of armour you will begin with:\n\n{C0C0C0}Note: The default armour is 100.0.", "Select", "Back");
|
return ShowPlayerDialog(playerid, DIALOG_DUEL_ARMOUR, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Armour", "{FFFFFF}Enter the amount of armour you will begin with:\n\n{C0C0C0}Note: The default armour is 100.0.", "Select", "Back");
|
||||||
|
|
||||||
if (!(0.0 <= armour <= 100.0))
|
if (!(0.0 <= fArmour <= 100.0))
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_ARMOUR, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Armour", "{FFFFFF}Enter the amount of armour you will begin with:\n\n{FF0000}The amount you have entered is a invalid amount, 0 to 100 only!", "Select", "Back");
|
return ShowPlayerDialog(playerid, DIALOG_DUEL_ARMOUR, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Armour", "{FFFFFF}Enter the amount of armour you will begin with:\n\n{FF0000}The amount you have entered is a invalid amount, 0 to 100 only!", "Select", "Back");
|
||||||
|
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed Armour to {C0C0C0}%0.2f%%{FFFFFF}.", armour);
|
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed Armour to {C0C0C0}%0.2f%%{FFFFFF}.", fArmour);
|
||||||
duelInfo[playerid][duelArmour] = armour;
|
g_duelData[ playerid ][ E_ARMOUR ] = fArmour;
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -337,144 +336,148 @@ hook OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
|
|||||||
return SendError(playerid, "You cannot use this at the moment.");
|
return SendError(playerid, "You cannot use this at the moment.");
|
||||||
|
|
||||||
if (!response)
|
if (!response)
|
||||||
return ShowPlayerDuelMenu(playerid);
|
return ShowPlayerDuelMenu( playerid );
|
||||||
|
|
||||||
new amount;
|
new
|
||||||
|
iBet
|
||||||
|
;
|
||||||
|
|
||||||
if (sscanf(inputtext, "d", amount))
|
if ( sscanf( inputtext, "d", iBet ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_WAGER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Set A Wager", "{FFFFFF}Please enter the wager for this duel:", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_WAGER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Set A Wager", "{FFFFFF}Please enter the wager for this duel:", "Select", "Back");
|
||||||
|
|
||||||
if (!(0 <= amount < 10000000))
|
if ( ! ( 0 <= iBet < 10000000 ) )
|
||||||
return ShowPlayerDialog(playerid, DIALOG_DUEL_WAGER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Set A Wager", "{FFFFFF}Please enter the wager for this duel:\n\n{FF0000}Wagers must be between $0 and $10,000,000.", "Select", "Back");
|
return ShowPlayerDialog( playerid, DIALOG_DUEL_WAGER, DIALOG_STYLE_INPUT, "{FFFFFF}Duel Settings - Set A Wager", "{FFFFFF}Please enter the wager for this duel:\n\n{FF0000}Wagers must be between $0 and $10,000,000.", "Select", "Back");
|
||||||
|
|
||||||
duelInfo[playerid][duelBet] = amount;
|
g_duelData[playerid][ E_BET ] = iBet;
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed the wager to %s.", number_format(duelInfo[playerid][duelBet]));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have changed the wager to %s.", number_format(g_duelData[playerid][ E_BET ]));
|
||||||
ShowPlayerDuelMenu(playerid);
|
ShowPlayerDuelMenu( playerid );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ** Commands ** */
|
/* ** Commands ** */
|
||||||
CMD:duel(playerid, params[])
|
CMD:duel( playerid, params[ ] )
|
||||||
{
|
{
|
||||||
if (!strcmp(params, "accept", false, 6))
|
if ( !strcmp(params, "accept", false, 6))
|
||||||
{
|
{
|
||||||
new
|
new
|
||||||
targetid;
|
targetid;
|
||||||
|
|
||||||
if (sscanf(params[7], "u", targetid))
|
if ( sscanf( params[7], "u", targetid) )
|
||||||
return SendUsage(playerid, "/duel accept [PLAYER_ID]");
|
return SendUsage( playerid, "/duel accept [PLAYER_ID]");
|
||||||
|
|
||||||
if (!IsPlayerConnected(targetid))
|
if ( !IsPlayerConnected( targetid ))
|
||||||
return SendError(playerid, "You do not have any duel invitations to accept.");
|
return SendError( playerid, "You do not have any duel invitations to accept.");
|
||||||
|
|
||||||
if (gettime() > p_duelInvitation[targetid][playerid])
|
if ( gettime() > p_duelInvitation[ targetid ][ playerid ] )
|
||||||
return SendError(playerid, "You have not been invited by %s to duel or it has expired.");
|
return SendError( playerid, "You have not been invited by %s to duel or it has expired.");
|
||||||
|
|
||||||
if (IsPlayerDueling(playerid))
|
if ( IsPlayerDueling( playerid ))
|
||||||
return SendError(playerid, "You cannot accept this invite as you are currently dueling.");
|
return SendError( playerid, "You cannot accept this invite as you are currently dueling.");
|
||||||
|
|
||||||
if (GetDistanceBetweenPlayers(playerid, targetid) > 25.0)
|
if ( GetDistanceBetweenPlayers( playerid, targetid ) > 25.0)
|
||||||
return SendError(playerid, "You must be within 25.0 meters of your opponent!");
|
return SendError( playerid, "You must be within 25.0 meters of your opponent!");
|
||||||
|
|
||||||
new waged_amount = duelInfo[targetid][duelBet];
|
new
|
||||||
|
waged_amount = g_duelData[ targetid ][ E_BET ];
|
||||||
|
|
||||||
if (duelInfo[targetid][duelBet] != 0)
|
if (g_duelData[ targetid ][ E_BET ] != 0)
|
||||||
{
|
{
|
||||||
if (GetPlayerCash(targetid) < waged_amount)
|
if ( GetPlayerCash( targetid ) < waged_amount)
|
||||||
{
|
{
|
||||||
SendClientMessageFormatted(targetid, -1, ""COL_DUEL"[DUEL]{FFFFFF} %s has accepted but you don't have money to wage (%s).", ReturnPlayerName(playerid), number_format(waged_amount));
|
SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted but you don't have money to wage (%s).", ReturnPlayerName( playerid ), number_format( waged_amount ) );
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have accepted %s's duel invitation but they don't have money.", ReturnPlayerName(targetid));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have accepted %s's duel invitation but they don't have money.", ReturnPlayerName( targetid ) );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else if (GetPlayerCash(playerid) < waged_amount)
|
else if ( GetPlayerCash( playerid ) < waged_amount)
|
||||||
{
|
{
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} %s requires you to wage %s.", ReturnPlayerName(targetid), number_format(waged_amount));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s requires you to wage %s.", ReturnPlayerName( targetid ), number_format( waged_amount ) );
|
||||||
SendClientMessageFormatted(targetid, -1, ""COL_DUEL"[DUEL]{FFFFFF} %s has accepted the duel invitation but they don't have money to wage.", ReturnPlayerName(playerid));
|
SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted the duel invitation but they don't have money to wage.", ReturnPlayerName( playerid ) );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GivePlayerCash(playerid, -waged_amount);
|
GivePlayerCash( playerid, -waged_amount );
|
||||||
GivePlayerCash(targetid, -waged_amount);
|
GivePlayerCash( targetid, -waged_amount );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SendClientMessageFormatted(targetid, -1, ""COL_DUEL"[DUEL]{FFFFFF} %s has accepted your duel invitation.", ReturnPlayerName(playerid));
|
SendClientMessageFormatted( targetid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s has accepted your duel invitation.", ReturnPlayerName( playerid ) );
|
||||||
SendClientMessageFormatted(playerid, -1, ""COL_DUEL"[DUEL]{FFFFFF} You have accepted %s's duel invitation.", ReturnPlayerName(targetid));
|
SendClientMessageFormatted( playerid, -1, ""COL_DUEL"[DUEL]"COL_WHITE" You have accepted %s's duel invitation.", ReturnPlayerName( targetid ) );
|
||||||
|
|
||||||
p_playerDueling{targetid} = true;
|
p_playerDueling{ targetid } = true;
|
||||||
p_playerDueling{playerid} = true;
|
p_playerDueling{ playerid } = true;
|
||||||
|
|
||||||
duelInfo[targetid][duelPlayer] = playerid;
|
g_duelData[ targetid ][ E_PLAYER ] = playerid;
|
||||||
duelInfo[playerid][duelPlayer] = targetid;
|
g_duelData[ playerid ][ E_PLAYER ] = targetid;
|
||||||
duelInfo[playerid][duelBet] = duelInfo[targetid][duelBet];
|
g_duelData[ playerid ][ E_BET ] = g_duelData[targetid][ E_BET ];
|
||||||
duelInfo[playerid][duelRemainingRounds] = 1;
|
g_duelData[ playerid ][ E_ROUNDS ] = 1;
|
||||||
duelInfo[targetid][duelRemainingRounds] = 1;
|
g_duelData[ targetid ][ E_ROUNDS ] = 1;
|
||||||
|
|
||||||
new id = duelInfo[targetid][duelLocation];
|
new
|
||||||
|
iLocation = g_duelData[ targetid ][ E_LOCATION_ID ];
|
||||||
|
|
||||||
ResetPlayerWeapons(targetid);
|
ResetPlayerWeapons( targetid );
|
||||||
RemovePlayerFromVehicle(targetid);
|
RemovePlayerFromVehicle( targetid );
|
||||||
SetPlayerArmour(targetid, duelInfo[targetid][duelArmour]);
|
SetPlayerArmour( targetid, g_duelData[ targetid ][ E_ARMOUR ]);
|
||||||
SetPlayerHealth(targetid, duelInfo[targetid][duelHealth]);
|
SetPlayerHealth( targetid, g_duelData[ targetid ][ E_HEALTH ]);
|
||||||
SetPlayerVirtualWorld(targetid, targetid + 1);
|
SetPlayerVirtualWorld( targetid, targetid + 1 );
|
||||||
SetPlayerPos(targetid, LocationInfo[id][locationPosTwo][0], LocationInfo[id][locationPosTwo][1], LocationInfo[id][locationPosTwo][2]);
|
SetPlayerPos( targetid, g_duelLocationData[ iLocation ][ E_POS_TWO ][0], g_duelLocationData[ iLocation ][ E_POS_TWO ][1], g_duelLocationData[ iLocation ][ E_POS_TWO ][2] );
|
||||||
|
|
||||||
ResetPlayerWeapons(playerid);
|
ResetPlayerWeapons( playerid );
|
||||||
RemovePlayerFromVehicle(playerid);
|
RemovePlayerFromVehicle( playerid );
|
||||||
SetPlayerArmour(playerid, duelInfo[targetid][duelArmour]);
|
SetPlayerArmour( playerid, g_duelData[ targetid ][ E_ARMOUR ]);
|
||||||
SetPlayerHealth(playerid, duelInfo[targetid][duelHealth]);
|
SetPlayerHealth( playerid, g_duelData[ targetid ][ E_HEALTH ]);
|
||||||
SetPlayerVirtualWorld(playerid, targetid + 1);
|
SetPlayerVirtualWorld( playerid, targetid + 1 );
|
||||||
SetPlayerPos(playerid, LocationInfo[id][locationPosOne][0], LocationInfo[id][locationPosOne][1], LocationInfo[id][locationPosOne][2]);
|
SetPlayerPos( playerid, g_duelLocationData[ iLocation ][ E_POS_ONE ][0], g_duelLocationData[ iLocation ][ E_POS_ONE ][1], g_duelLocationData[ iLocation ][ E_POS_ONE ][2] );
|
||||||
|
|
||||||
// freeze
|
// freeze
|
||||||
TogglePlayerControllable(playerid, 0);
|
TogglePlayerControllable( playerid, 0 );
|
||||||
TogglePlayerControllable(targetid, 0);
|
TogglePlayerControllable( targetid, 0 );
|
||||||
|
|
||||||
// start countdown
|
// start countdown
|
||||||
duelInfo[targetid][duelCountdown] = 10;
|
g_duelData[ targetid ][ E_COUNTDOWN ] = 10;
|
||||||
duelInfo[targetid][duelTimer] = SetTimerEx("DuelTimer", 960, true, "d", targetid);
|
g_duelData[ targetid ][ E_TIMER ] = SetTimerEx( "OnDuelTimer", 960, true, "d", targetid );
|
||||||
|
|
||||||
// give weapon
|
// give weapon
|
||||||
GivePlayerWeapon(playerid, duelInfo[targetid][duelWeapon][0], 5000);
|
GivePlayerWeapon( playerid, g_duelData[ targetid ][ E_WEAPON ][0], 5000);
|
||||||
GivePlayerWeapon(targetid, duelInfo[targetid][duelWeapon][0], 5000);
|
GivePlayerWeapon( targetid, g_duelData[ targetid ][ E_WEAPON ][0], 5000);
|
||||||
GivePlayerWeapon(playerid, duelInfo[targetid][duelWeapon][1], 5000);
|
GivePlayerWeapon( playerid, g_duelData[ targetid ][ E_WEAPON ][1], 5000);
|
||||||
GivePlayerWeapon(targetid, duelInfo[targetid][duelWeapon][1], 5000);
|
GivePlayerWeapon( targetid, g_duelData[ targetid ][ E_WEAPON ][1], 5000);
|
||||||
|
|
||||||
// clear invites for safety
|
// clear invites for safety
|
||||||
for (new i = 0; i < MAX_PLAYERS; i ++) {
|
for (new i = 0; i < MAX_PLAYERS; i ++) {
|
||||||
p_duelInvitation[playerid][i] = 0;
|
p_duelInvitation[ playerid ][ i ] = 0;
|
||||||
p_duelInvitation[targetid][i] = 0;
|
p_duelInvitation[ targetid ][ i ] = 0;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else if (strmatch(params, "cancel"))
|
else if (strmatch(params, "cancel"))
|
||||||
{
|
{
|
||||||
if (ClearDuelInvites(playerid))
|
if ( ClearDuelInvites( playerid ))
|
||||||
{
|
{
|
||||||
return SendServerMessage(playerid, "You have cancelled every duel offer that you have made.");
|
return SendServerMessage( playerid, "You have cancelled every duel offer that you have made." );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return SendError(playerid, "You have not made any duel offers recently.");
|
return SendError( playerid, "You have not made any duel offers recently." );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return SendUsage(playerid, "/duel [ACCEPT/CANCEL]");
|
return SendUsage( playerid, "/duel [ACCEPT/CANCEL]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ** Functions ** */
|
/* ** Functions ** */
|
||||||
static stock ClearDuelInvites(playerid)
|
static stock ClearDuelInvites( playerid )
|
||||||
{
|
{
|
||||||
new current_time = gettime();
|
new current_time = gettime( );
|
||||||
new count = 0;
|
new count = 0;
|
||||||
|
|
||||||
for (new i = 0; i < MAX_PLAYERS; i ++)
|
for ( new i = 0; i < MAX_PLAYERS; i ++ )
|
||||||
{
|
{
|
||||||
if (p_duelInvitation[playerid][i] != 0 && current_time > p_duelInvitation[playerid][i])
|
if ( p_duelInvitation[ playerid ][ i ] != 0 && current_time > p_duelInvitation[ playerid ][ i ])
|
||||||
{
|
{
|
||||||
p_duelInvitation[playerid][i] = 0;
|
p_duelInvitation[ playerid ][ i ] = 0;
|
||||||
count ++;
|
count ++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -487,91 +490,92 @@ stock IsPlayerDueling(playerid) {
|
|||||||
|
|
||||||
stock ShowPlayerDuelMenu(playerid)
|
stock ShowPlayerDuelMenu(playerid)
|
||||||
{
|
{
|
||||||
if (GetPlayerClass(playerid) != CLASS_CIVILIAN)
|
if ( GetPlayerClass( playerid ) != CLASS_CIVILIAN )
|
||||||
return SendError(playerid, "You can only use this feature whist being a civilian.");
|
return SendError( playerid, "You can only use this feature whist being a civilian.");
|
||||||
|
|
||||||
if (GetPlayerWantedLevel(playerid))
|
if ( GetPlayerWantedLevel( playerid ))
|
||||||
return SendError(playerid, "You cannot duel whilst having a wanted level.");
|
return SendError( playerid, "You cannot duel whilst having a wanted level.");
|
||||||
|
|
||||||
format(szBigString, sizeof(szBigString),
|
format( szBigString, sizeof(szBigString),
|
||||||
"Player\t{C0C0C0}%s\nHealth\t{C0C0C0}%.2f%%\nArmour\t{C0C0C0}%.2f%%\nPrimary Weapon\t{C0C0C0}%s\nSecondary Weapon\t{C0C0C0}%s\nLocation\t{C0C0C0}%s\nWager\t{C0C0C0}%s\n"COL_GOLD"Send Invite\t"COL_GOLD">>>",
|
"Player\t{C0C0C0}%s\nHealth\t{C0C0C0}%.2f%%\nArmour\t{C0C0C0}%.2f%%\nPrimary Weapon\t{C0C0C0}%s\nSecondary Weapon\t{C0C0C0}%s\nLocation\t{C0C0C0}%s\nWager\t{C0C0C0}%s\n"COL_GOLD"Send Invite\t"COL_GOLD">>>",
|
||||||
(!IsPlayerConnected(duelInfo[playerid][duelPlayer]) ? (""COL_RED"N/A") : (ReturnPlayerName(duelInfo[playerid][duelPlayer]))),
|
(!IsPlayerConnected(g_duelData[ playerid ][ E_PLAYER ]) ? (""COL_RED"N/A") : (ReturnPlayerName(g_duelData[ playerid ][ E_PLAYER ]))),
|
||||||
duelInfo[playerid][duelHealth],
|
g_duelData[ playerid ][ E_HEALTH ],
|
||||||
duelInfo[playerid][duelArmour],
|
g_duelData[ playerid ][ E_ARMOUR ],
|
||||||
ReturnWeaponName(duelInfo[playerid][duelWeapon][0]),
|
ReturnWeaponName(g_duelData[ playerid ][ E_WEAPON ][0]),
|
||||||
ReturnWeaponName(duelInfo[playerid][duelWeapon][1]),
|
ReturnWeaponName(g_duelData[ playerid ][ E_WEAPON ][1]),
|
||||||
LocationInfo[duelInfo[playerid][duelLocation]][locationName],
|
g_duelLocationData[ g_duelData[ playerid ][ E_LOCATION_ID ] ][ E_NAME ],
|
||||||
number_format(duelInfo[playerid][duelBet])
|
number_format(g_duelData[playerid][ E_BET ])
|
||||||
);
|
);
|
||||||
ShowPlayerDialog(playerid, DIALOG_DUEL, DIALOG_STYLE_TABLIST, "{FFFFFF}Duel Settings", szBigString, "Select", "Cancel");
|
ShowPlayerDialog(playerid, DIALOG_DUEL, DIALOG_STYLE_TABLIST, ""COL_WHITE"{FFFFFF}Duel Settings", szBigString, "Select", "Cancel");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static stock forfeitPlayerDuel(playerid)
|
static stock forfeitPlayerDuel(playerid)
|
||||||
{
|
{
|
||||||
if (!IsPlayerDueling(playerid))
|
if ( !IsPlayerDueling( playerid ))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ClearDuelInvites(playerid);
|
ClearDuelInvites( playerid );
|
||||||
|
|
||||||
new
|
new
|
||||||
winnerid = duelInfo[playerid][duelPlayer];
|
winnerid = g_duelData[ playerid ][ E_PLAYER ];
|
||||||
|
|
||||||
if (!IsPlayerConnected(winnerid) || !IsPlayerDueling(winnerid))
|
if (!IsPlayerConnected(winnerid) || !IsPlayerDueling(winnerid))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
// begin wager info
|
// begin wager info
|
||||||
new
|
new
|
||||||
amount_waged = duelInfo[playerid][duelBet];
|
amount_waged = g_duelData[ playerid ][ E_BET ];
|
||||||
|
|
||||||
SpawnPlayer(winnerid);
|
SpawnPlayer(winnerid);
|
||||||
ClearDuelInvites(winnerid);
|
ClearDuelInvites(winnerid);
|
||||||
|
|
||||||
// decrement rounds
|
// decrement rounds
|
||||||
duelInfo[playerid][duelRemainingRounds] --;
|
g_duelData[ playerid ][ E_ROUNDS ] --;
|
||||||
duelInfo[winnerid][duelRemainingRounds] = duelInfo[playerid][duelRemainingRounds];
|
g_duelData[ winnerid ][ E_ROUNDS ] = g_duelData[ playerid ][ E_ROUNDS ];
|
||||||
|
|
||||||
// check if theres a remaining round
|
// check if theres a remaining round
|
||||||
if (duelInfo[playerid][duelRemainingRounds] == 0) {
|
if (g_duelData[ playerid ][ E_ROUNDS ] == 0) {
|
||||||
if (0 < amount_waged < 10000000) {
|
if (0 < amount_waged < 10000000) {
|
||||||
new winning_prize = floatround(float(amount_waged) * 1.95); // We take 2.5% of the total pot
|
new
|
||||||
|
winning_prize = floatround(float(amount_waged) * 1.95); // We take 2.5% of the total pot
|
||||||
GivePlayerCash(winnerid, winning_prize);
|
GivePlayerCash(winnerid, winning_prize);
|
||||||
SendClientMessageToAllFormatted( -1, ""COL_DUEL"[DUEL]{FFFFFF} %s(%d) has won the duel against %s(%d) for %s!", ReturnPlayerName(winnerid), winnerid, ReturnPlayerName(playerid), playerid, number_format(winning_prize));
|
SendClientMessageToAllFormatted( -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s(%d) has won the duel against %s(%d) for %s!", ReturnPlayerName(winnerid), winnerid, ReturnPlayerName(playerid), playerid, number_format(winning_prize));
|
||||||
} else {
|
} else {
|
||||||
SendClientMessageToAllFormatted( -1, ""COL_DUEL"[DUEL]{FFFFFF} %s(%d) has won the duel against %s(%d)!", ReturnPlayerName(winnerid), winnerid, ReturnPlayerName(playerid), playerid);
|
SendClientMessageToAllFormatted( -1, ""COL_DUEL"[DUEL]"COL_WHITE" %s(%d) has won the duel against %s(%d)!", ReturnPlayerName(winnerid), winnerid, ReturnPlayerName(playerid), playerid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
function DuelTimer(targetid)
|
function OnDuelTimer(targetid)
|
||||||
{
|
{
|
||||||
new
|
new
|
||||||
playerid = duelInfo[targetid][duelPlayer];
|
playerid = g_duelData[targetid][ E_PLAYER ];
|
||||||
|
|
||||||
duelInfo[targetid][duelCountdown] --;
|
g_duelData[ targetid ][ E_COUNTDOWN ] --;
|
||||||
|
|
||||||
if (duelInfo[targetid][duelCountdown] <= 0)
|
if ( g_duelData[ targetid ][ E_COUNTDOWN ] <= 0)
|
||||||
{
|
{
|
||||||
GameTextForPlayer(targetid, "~g~~h~FIGHT!", 1500, 4);
|
GameTextForPlayer( targetid, "~g~~h~FIGHT!", 1500, 4 );
|
||||||
GameTextForPlayer(playerid, "~g~~h~FIGHT!", 1500, 4);
|
GameTextForPlayer( playerid, "~g~~h~FIGHT!", 1500, 4 );
|
||||||
|
|
||||||
PlayerPlaySound(targetid, 1057, 0.0, 0.0, 0.0);
|
PlayerPlaySound( targetid, 1057, 0.0, 0.0, 0.0 );
|
||||||
PlayerPlaySound(playerid, 1057, 0.0, 0.0, 0.0);
|
PlayerPlaySound( playerid, 1057, 0.0, 0.0, 0.0 );
|
||||||
|
|
||||||
TogglePlayerControllable(playerid, 1);
|
TogglePlayerControllable( playerid, 1 );
|
||||||
TogglePlayerControllable(targetid, 1);
|
TogglePlayerControllable( targetid, 1 );
|
||||||
|
|
||||||
KillTimer(duelInfo[targetid][duelTimer]);
|
KillTimer( g_duelData[ targetid ][ E_TIMER ] );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
format(szSmallString, sizeof(szSmallString), "~w~%d", duelInfo[targetid][duelCountdown]);
|
format(szSmallString, sizeof(szSmallString), "~w~%d", g_duelData[ targetid ][ E_COUNTDOWN ]);
|
||||||
GameTextForPlayer(targetid, szSmallString, 1500, 4);
|
GameTextForPlayer( targetid, szSmallString, 1500, 4 );
|
||||||
GameTextForPlayer(playerid, szSmallString, 1500, 4);
|
GameTextForPlayer( playerid, szSmallString, 1500, 4 );
|
||||||
|
|
||||||
PlayerPlaySound(targetid, 1056, 0.0, 0.0, 0.0);
|
PlayerPlaySound( targetid, 1056, 0.0, 0.0, 0.0 );
|
||||||
PlayerPlaySound(playerid, 1056, 0.0, 0.0, 0.0);
|
PlayerPlaySound( playerid, 1056, 0.0, 0.0, 0.0 );
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user