ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add atms into visage

Browse Source 
fix new bunker
This commit is contained in:
Lorenc 2018-03-28 10:44:34 +11:00
parent 29b7072f76
commit f7c6463fca
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gamemodes/sf-cnr.pwn
View File

@ -13,7 +13,7 @@
*/ */
#pragma compat 1 #pragma compat 1
#pragma option -d3 // #pragma option -d3
#pragma dynamic 7200000 #pragma dynamic 7200000
// #define DEBUG_MODE // #define DEBUG_MODE
@ -1275,7 +1275,7 @@ new
; ;
/* ** ATM System ** */ /* ** ATM System ** */
#define MAX_ATMS 46 #define MAX_ATMS 48
enum E_ATM_DATA enum E_ATM_DATA
{ {
@ -2934,7 +2934,7 @@ new
{ "Weed", -1719.1877, -1377.3049, 5874.8721, -1734.094, -1374.4567, 5874.1475, 10000, 12, MAX_WEED_AMOUNT, 2500000 }, { "Weed", -1719.1877, -1377.3049, 5874.8721, -1734.094, -1374.4567, 5874.1475, 10000, 12, MAX_WEED_AMOUNT, 2500000 },
{ "Meth", 2040.54810, 1011.41470, 1513.2777, 2029.2456, 1003.55200, 1510.2416, 18000, 16, MAX_METH_AMOUNT, 4000000 }, { "Meth", 2040.54810, 1011.41470, 1513.2777, 2029.2456, 1003.55200, 1510.2416, 18000, 16, MAX_METH_AMOUNT, 4000000 },
{ "Coke", 2566.50070, -1273.2887, 1143.7203, 2558.5261, -1290.6298, 1143.7242, 50000, 20, MAX_COKE_AMOUNT, 7500000 }, { "Coke", 2566.50070, -1273.2887, 1143.7203, 2558.5261, -1290.6298, 1143.7242, 50000, 20, MAX_COKE_AMOUNT, 7500000 },
{ "Weapons", -5362.4058, -269.47140, 836.5154, -5369.4609, -247.57190, 836.5154, 125000, 48, MAX_WEAPON_AMOUNT, 16000000 } { "Weapons", -6962.5542, -269.4713, 836.5154, -6969.2417, -248.1167, 836.5154, 125000, 48, MAX_WEAPON_AMOUNT, 16000000 }
}, },
g_businessCarModelData[ ] [ E_BUSINESS_VEHICLE_DATA ] = g_businessCarModelData[ ] [ E_BUSINESS_VEHICLE_DATA ] =
{ {
@ -9903,7 +9903,7 @@ CMD:meth( playerid, params[ ] )
return SendError( playerid, "This is restricted to civilians only." ); return SendError( playerid, "This is restricted to civilians only." );
new new
cashEarned = p_Methamphetamine{ playerid } * ( 3500 + random( 1000 ) ); cashEarned = p_Methamphetamine{ playerid } * ( 5000 + random( 1000 ) );
GivePlayerCash( playerid, cashEarned ); GivePlayerCash( playerid, cashEarned );
SendServerMessage( playerid, "You have exported %d bags of meth, earning you "COL_GOLD"%s"COL_WHITE".", p_Methamphetamine{ playerid }, number_format( cashEarned ) ); SendServerMessage( playerid, "You have exported %d bags of meth, earning you "COL_GOLD"%s"COL_WHITE".", p_Methamphetamine{ playerid }, number_format( cashEarned ) );
@ -10250,20 +10250,30 @@ CMD:getmytax( playerid, params[ ] )
CMD:gettotalcash( playerid, params[ ] ) CMD:gettotalcash( playerid, params[ ] )
{ {
mysql_function_query( dbHandle, "SELECT SUM(`BANKMONEY`) + SUM(`CASH`) AS `total_cash` FROM `USERS`", true, "gettotalcash", "i", playerid ); mysql_function_query( dbHandle, "SELECT USER_CASH, BIZ_CASH, GANG_CASH FROM (SELECT (SUM(BANKMONEY)+SUM(CASH)) USER_CASH FROM USERS) A CROSS JOIN (SELECT SUM(BANK) BIZ_CASH FROM BUSINESSES) B CROSS JOIN (SELECT SUM(BANK) GANG_CASH FROM GANGS) C", true, "gettotalcash", "i", playerid );
return 1; return 1;
} }
thread gettotalcash( playerid ) thread gettotalcash( playerid )
{ {
new new
rows, fields, Field[ 12 ]; rows;
cache_get_data( rows, fields ); cache_get_data( rows, tmpVariable );
if ( rows ) if ( rows )
{ {
cache_get_field_content( 0, "total_cash", Field ); new user_cash = cache_get_field_content_int( 0, "USER_CASH", dbHandle );
SendServerMessage( playerid, "Total: "COL_GOLD"%s"COL_WHITE", Tax Rate: "COL_GOLD"%s"COL_WHITE" per 24 mins.", number_format( strval( Field ) ), number_format( floatround( strval( Field ) / 1000 * GetTaxRate( ) ) ) ); new biz_cash = cache_get_field_content_int( 0, "BIZ_CASH", dbHandle );
new gang_cash = cache_get_field_content_int( 0, "GANG_CASH", dbHandle );
new total_cash = user_cash + biz_cash + gang_cash;
new tax_rate = floatround( float( total_cash ) / 1000.0 * GetTaxRate( ) );
format( szLargeString, 512, "Total User Cash\t"COL_GREY"%s\nTotal Gang Cash\t"COL_GREY"%s\nTotal Business Cash\t"COL_GREY"%s\nTotal Server Cash\t"COL_GOLD"%s\nTax Rate (24 min)\t"COL_GOLD"%s",
number_format( user_cash ), number_format( gang_cash ), number_format( biz_cash ), number_format( total_cash ), number_format( tax_rate ) );
SendServerMessage( playerid, "Total: "COL_GOLD"%s"COL_WHITE", Tax Rate: "COL_GOLD"%s"COL_WHITE" per 24 mins.", number_format( total_cash ), number_format( tax_rate ) );
ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_TABLIST, "{FFFFFF}SF-CNR Economy", szLargeString, "Close", "" );
} }
else SendError( playerid, "An error has occurred, try again later." ); else SendError( playerid, "An error has occurred, try again later." );
return 1; return 1;
@ -15094,7 +15104,7 @@ CMD:getstats( playerid, params[ ] )
else else
{ {
p_ViewingStats[ playerid ] = pID; p_ViewingStats[ playerid ] = pID;
ShowPlayerDialog( playerid, DIALOG_STATS, DIALOG_STYLE_LIST, "{FFFFFF}Statistics", "General Statistics\nGame Statistics\nItem Statistics\nStreak Statistics\nAchievements", "Okay", "Cancel" ); ShowPlayerDialog( playerid, DIALOG_STATS, DIALOG_STYLE_LIST, "{FFFFFF}Statistics", "General Statistics\nGame Statistics\nItem Statistics\nStreak Statistics\nWeapon Statistics\nAchievements", "Okay", "Cancel" );
} }
return 1; return 1;
} }
@ -23615,7 +23625,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
} }
} }
if ( ( dialogid == DIALOG_STATS_REDIRECT ) && !response ) { if ( ( dialogid == DIALOG_STATS_REDIRECT ) && !response ) {
ShowPlayerDialog( playerid, DIALOG_STATS, DIALOG_STYLE_LIST, "{FFFFFF}Statistics", "General Statistics\nGame Statistics\nItem Statistics\nStreak Statistics\nAchievements", "Okay", "Cancel" ); ShowPlayerDialog( playerid, DIALOG_STATS, DIALOG_STYLE_LIST, "{FFFFFF}Statistics", "General Statistics\nGame Statistics\nItem Statistics\nStreak Statistics\nWeapon Statistics\nAchievements", "Okay", "Cancel" );
} }
if ( ( dialogid == DIALOG_VEHDEALER ) && response ) { if ( ( dialogid == DIALOG_VEHDEALER ) && response ) {
ShowBuyableVehiclesTypeDialog( playerid, listitem + 1 ); ShowBuyableVehiclesTypeDialog( playerid, listitem + 1 );
@ -27572,7 +27582,7 @@ stock initializeCheckpoints( )
g_Checkpoints[ CP_BIZ_TERMINAL_COKE ] = CreateDynamicCP( 2563.5728, -1310.5925, 1143.7242, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_BIZ_TERMINAL_COKE ] = CreateDynamicCP( 2563.5728, -1310.5925, 1143.7242, 1.0, -1, -1, -1, 30.0 );
g_Checkpoints[ CP_BIZ_TERMINAL_METH ] = CreateDynamicCP( 2034.0669, 1001.6073, 1510.2416, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_BIZ_TERMINAL_METH ] = CreateDynamicCP( 2034.0669, 1001.6073, 1510.2416, 1.0, -1, -1, -1, 30.0 );
g_Checkpoints[ CP_BIZ_TERMINAL_WEED ] = CreateDynamicCP( -1742.9982, -1377.3049, 5874.1333, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_BIZ_TERMINAL_WEED ] = CreateDynamicCP( -1742.9982, -1377.3049, 5874.1333, 1.0, -1, -1, -1, 30.0 );
g_Checkpoints[ CP_BIZ_TERMINAL_WEAP ] = CreateDynamicCP( -5342.8770, -247.8264, 837.5850, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_BIZ_TERMINAL_WEAP ] = CreateDynamicCP( -6942.8770, -247.7294, 837.5850, 1.0, -1, -1, -1, 30.0 );
g_Checkpoints[ CP_REWARDS_CALIG ] = CreateDynamicCP( 2157.6294, 1599.4355, 1006.1797, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_REWARDS_CALIG ] = CreateDynamicCP( 2157.6294, 1599.4355, 1006.1797, 1.0, -1, -1, -1, 30.0 );
g_Checkpoints[ CP_REWARDS_4DRAG ] = CreateDynamicCP( 1951.7191, 997.5555, 992.8594, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_REWARDS_4DRAG ] = CreateDynamicCP( 1951.7191, 997.5555, 992.8594, 1.0, -1, -1, -1, 30.0 );
g_Checkpoints[ CP_REWARDS_VISAGE ] = CreateDynamicCP( 2604.1323, 1570.1182, 1508.3530, 1.0, -1, -1, -1, 30.0 ); g_Checkpoints[ CP_REWARDS_VISAGE ] = CreateDynamicCP( 2604.1323, 1570.1182, 1508.3530, 1.0, -1, -1, -1, 30.0 );
@ -27652,7 +27662,7 @@ stock initializeCheckpoints( )
CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, 2563.5728, -1310.5925, 1143.7242, 20.0); CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, 2563.5728, -1310.5925, 1143.7242, 20.0);
CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, 2034.0669, 1001.6073, 1510.2416, 20.0); CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, 2034.0669, 1001.6073, 1510.2416, 20.0);
CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, -1742.9982, -1377.3049, 5874.1333, 20.0); CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, -1742.9982, -1377.3049, 5874.1333, 20.0);
CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, -5342.8770, -247.8264, 837.5850, 20.0); CreateDynamic3DTextLabel("[BUSINESS TERMINAL]", COLOR_GOLD, -6942.8770, -247.7294, 837.5850, 20.0);
} }
stock DestroyAllPlayerC4s( playerid, bool: resetc4 = false ) stock DestroyAllPlayerC4s( playerid, bool: resetc4 = false )
@ -28734,7 +28744,7 @@ stock createRobberyLootInstance( playerid, robberyid, type )
GetDynamicObjectPos( g_robberyData[ robberyid ] [ E_SAFE ], fX, fY, fZ ); GetDynamicObjectPos( g_robberyData[ robberyid ] [ E_SAFE ], fX, fY, fZ );
if ( ( p_Robberies[ playerid ] <= 10 ? 0 : random( 101 ) ) < 80 ) if ( ( p_Robberies[ playerid ] <= 20 ? 0 : random( 101 ) ) < 90 )
{ {
new new
Float: iLoot = float( RandomEx( 1000, g_robberyData[ robberyid ] [ E_ROB_VALUE ] ) ); Float: iLoot = float( RandomEx( 1000, g_robberyData[ robberyid ] [ E_ROB_VALUE ] ) );
@ -33760,6 +33770,7 @@ stock IsRandomDeathmatch( issuerid, damagedid )
} }
stock IsPlayerInCasino( playerid ) { stock IsPlayerInCasino( playerid ) {
if ( GetPlayerState( playerid ) != PLAYER_STATE_ONFOOT ) return 0;
if ( GetPlayerInterior( playerid ) == VISAGE_INTERIOR && GetPlayerVirtualWorld( playerid ) == VISAGE_WORLD ) return 1; // visage itself if ( GetPlayerInterior( playerid ) == VISAGE_INTERIOR && GetPlayerVirtualWorld( playerid ) == VISAGE_WORLD ) return 1; // visage itself
if ( IsPlayerInRangeOfPoint( playerid, 100.0, 1993.0846, 1904.5693, 84.2848 ) && GetPlayerVirtualWorld( playerid ) != 0 ) return 1; // visage apartments if ( IsPlayerInRangeOfPoint( playerid, 100.0, 1993.0846, 1904.5693, 84.2848 ) && GetPlayerVirtualWorld( playerid ) != 0 ) return 1; // visage apartments
return ( GetPlayerInterior( playerid ) == 10 && GetPlayerVirtualWorld( playerid ) == 23 ) || ( GetPlayerInterior( playerid ) == 1 && GetPlayerVirtualWorld( playerid ) == 82 ); return ( GetPlayerInterior( playerid ) == 10 && GetPlayerVirtualWorld( playerid ) == 23 ) || ( GetPlayerInterior( playerid ) == 1 && GetPlayerVirtualWorld( playerid ) == 82 );

4
pawno/include/irresistible/features/visage/casino.inc
View File

@ -42,6 +42,8 @@ hook OnGameModeInit( )
// Create ATM // Create ATM
CreateATM( 2557.137939, 1576.037963, 1508.003051, -90.000000 ); CreateATM( 2557.137939, 1576.037963, 1508.003051, -90.000000 );
CreateATM( 2630.107177, 1647.757324, 1507.968750, -90.000000 );
CreateATM( 2641.666992, 1649.718994, 1507.968750, 90.0000000 );
// Create Roulette Tables // Create Roulette Tables
CreateRouletteTable( 2641.445068, 1619.609008, 1506.227050, 90.000000, VISAGE_WORLD, .maxbet = 250000 ); CreateRouletteTable( 2641.445068, 1619.609008, 1506.227050, 90.000000, VISAGE_WORLD, .maxbet = 250000 );
@ -321,6 +323,8 @@ static stock InitializeCasinoInterior( )
SetDynamicObjectMaterial( CreateDynamicObject( 18762, 2609.367919, 1564.864990, 1505.781982, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 8396, "sphinx01", "luxorwall02_128", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 18762, 2609.367919, 1564.864990, 1505.781982, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 8396, "sphinx01", "luxorwall02_128", -16 );
SetDynamicObjectMaterial( CreateDynamicObject( 19940, 2609.099121, 1566.212036, 1508.271972, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 8396, "sphinx01", "luxorwall02_128", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 19940, 2609.099121, 1566.212036, 1508.271972, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 8396, "sphinx01", "luxorwall02_128", -16 );
SetDynamicObjectMaterial( CreateDynamicObject( 19940, 2609.529052, 1566.202026, 1508.271972, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 8396, "sphinx01", "luxorwall02_128", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 19940, 2609.529052, 1566.202026, 1508.271972, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 8396, "sphinx01", "luxorwall02_128", -16 );
CreateDynamicObject( 19324, 2630.107177, 1649.759155, 1507.968750, 0.000000, 0.000000, 90.000000, -1, -1, -1 );
CreateDynamicObject( 19324, 2641.666992, 1647.757324, 1507.968750, 0.000000, 0.000000, -90.000000, -1, -1, -1 );
} }
stock IsPlayerInHighRoller( playerid ) stock IsPlayerInHighRoller( playerid )

1
pawno/include/irresistible/features/visage/roulette.inc
View File

@ -240,6 +240,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
g_rouletteTableData[ rouletteid ] [ E_NO_MORE_BETS ] = false; g_rouletteTableData[ rouletteid ] [ E_NO_MORE_BETS ] = false;
// fire the spin table // fire the spin table
KillTimer( g_rouletteTableData[ rouletteid ] [ E_SPINNING_TIMER ] );
g_rouletteTableData[ rouletteid ] [ E_SPINNING_TIMER ] = SetTimerEx( "OnSpinRouletteTable", 25, false, "ddd", rouletteid, 0, 1 ); g_rouletteTableData[ rouletteid ] [ E_SPINNING_TIMER ] = SetTimerEx( "OnSpinRouletteTable", 25, false, "ddd", rouletteid, 0, 1 );
// inform other players // inform other players

3
scriptfiles/updates.txt
View File

@ -1,5 +1,6 @@
(+) Adds some helpful text within the meth RV vans. (+) Adds some helpful text within the meth RV vans.
(+) "/gettotalcash" is now more accurate, taking into account gang and business accounts. (+) "/gettotalcash" is now more accurate, taking into account gang and business accounts.
(+) Adds two atms near the entrance of the Visage casino.
(*) Robbery loot should instantly appear when you successfully open it. (*) Robbery loot should instantly appear when you successfully open it.
(/) New bunker interior for businesses. (/) New bunker interior for businesses.
(/) Highroller slot machines are double the price, but have double the chance of winning. (/) Highroller slot machines are double the price, but have double the chance of winning.
@ -7,3 +8,5 @@
(/) Safe robbery has been DOUBLED and a bit faster to pick. (/) Safe robbery has been DOUBLED and a bit faster to pick.
(/) Highroller and firework cost have been changed. (/) Highroller and firework cost have been changed.
(/) Thermal drill now lasts an additional 5 safes. (/) Thermal drill now lasts an additional 5 safes.
(/) 10% more luck when opening a safe for loot.
(/) Meth payout increased by 30%.