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

remove train driver minijob

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-12-09 00:46:11 +11:00
parent 4fd6abb3e6
commit b1735de8b1
4 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamemodes/irresistible/cnr/features/minijobs/_minijobs.pwn
View File

@ -10,6 +10,6 @@
#include "irresistible\cnr\features\minijobs\meth.pwn" #include "irresistible\cnr\features\minijobs\meth.pwn"
#include "irresistible\cnr\features\minijobs\trucking.pwn" #include "irresistible\cnr\features\minijobs\trucking.pwn"
#include "irresistible\cnr\features\minijobs\pilot.pwn" #include "irresistible\cnr\features\minijobs\pilot.pwn"
#include "irresistible\cnr\features\minijobs\traindriver.pwn" //#include "irresistible\cnr\features\minijobs\traindriver.pwn"
#include "irresistible\cnr\features\minijobs\lumberjack.pwn" #include "irresistible\cnr\features\minijobs\lumberjack.pwn"
#include "irresistible\cnr\features\minijobs\paramedic.pwn" #include "irresistible\cnr\features\minijobs\paramedic.pwn"

1
gamemodes/irresistible/cnr/features/minijobs/traindriver.pwn
View File

@ -34,6 +34,7 @@ static stock
bool: p_hasTrainJob [ MAX_PLAYERS char ], bool: p_hasTrainJob [ MAX_PLAYERS char ],
p_TrainMissions [ MAX_PLAYERS ],
p_TrainMapIcon [ MAX_PLAYERS ] = { -1, ... }, p_TrainMapIcon [ MAX_PLAYERS ] = { -1, ... },
p_TrainCheckPoint [ MAX_PLAYERS ] = { -1, ... }, p_TrainCheckPoint [ MAX_PLAYERS ] = { -1, ... },
p_TrainPositionTimer [ MAX_PLAYERS ] = { -1, ... }, p_TrainPositionTimer [ MAX_PLAYERS ] = { -1, ... },

1
gamemodes/irresistible/cnr/player.pwn
View File

@ -194,7 +194,6 @@ new
p_AntiSpammyTS [ MAX_PLAYERS ], p_AntiSpammyTS [ MAX_PLAYERS ],
p_TruckedCargo [ MAX_PLAYERS ], p_TruckedCargo [ MAX_PLAYERS ],
p_PilotMissions [ MAX_PLAYERS ], p_PilotMissions [ MAX_PLAYERS ],
p_TrainMissions [ MAX_PLAYERS ],
p_KidnapImmunity [ MAX_PLAYERS ], p_KidnapImmunity [ MAX_PLAYERS ],
p_GangSplitProfits [ MAX_PLAYERS ], p_GangSplitProfits [ MAX_PLAYERS ],
p_SafeHelperTimer [ MAX_PLAYERS ] = { -1, ... }, p_SafeHelperTimer [ MAX_PLAYERS ] = { -1, ... },

42
gamemodes/sf-cnr.pwn
View File

@ -16,7 +16,7 @@
//#pragma option -d3 //#pragma option -d3
#pragma dynamic 7200000 #pragma dynamic 7200000
#define DEBUG_MODE //#define DEBUG_MODE
#if defined DEBUG_MODE #if defined DEBUG_MODE
#pragma option -d3 #pragma option -d3
@ -1361,7 +1361,6 @@ public OnPlayerDisconnect( playerid, reason )
p_AntiExportCarSpam[ playerid ] = 0; p_AntiExportCarSpam[ playerid ] = 0;
p_TruckedCargo[ playerid ] = 0; p_TruckedCargo[ playerid ] = 0;
p_PilotMissions[ playerid ] = 0; p_PilotMissions[ playerid ] = 0;
p_TrainMissions[ playerid ] = 0;
p_HydrogenChloride{ playerid } = 0; p_HydrogenChloride{ playerid } = 0;
p_Methamphetamine{ playerid } = 0; p_Methamphetamine{ playerid } = 0;
p_LastEnteredEntrance[ playerid ] = -1; p_LastEnteredEntrance[ playerid ] = -1;
@ -2863,7 +2862,7 @@ CMD:irresistiblecoins( playerid, params[ ] )
CMD:top( playerid, params[ ] ) return cmd_highscores( playerid, params ); CMD:top( playerid, params[ ] ) return cmd_highscores( playerid, params );
CMD:highscores( playerid, params[ ] ) CMD:highscores( playerid, params[ ] )
{ {
ShowPlayerDialog( playerid, DIALOG_HIGHSCORES, DIALOG_STYLE_LIST, "{FFFFFF}Highscores", "Seasonal Rank\nTotal Score\nTotal Kills\nTotal Arrests\nTotal Robberies\nHits Completed\nFires Extinguished\nBurglaries\nBlown Jails\nBlown Vaults\nVehicles Jacked\nMeth Yielded\nTotal Trucked Cargo\nTotal Pilot Missions\nTotal Train Missions", "Select", "Close" ); ShowPlayerDialog( playerid, DIALOG_HIGHSCORES, DIALOG_STYLE_LIST, "{FFFFFF}Highscores", "Seasonal Rank\nTotal Score\nTotal Kills\nTotal Arrests\nTotal Robberies\nHits Completed\nFires Extinguished\nBurglaries\nBlown Jails\nBlown Vaults\nVehicles Jacked\nMeth Yielded\nTotal Trucked Cargo\nTotal Pilot Missions", "Select", "Close" );
return 1; return 1;
} }
@ -7299,7 +7298,7 @@ thread OnAttemptPlayerLogin( playerid, password[ ] )
p_HitsComplete[ playerid ] = cache_get_field_content_int( 0, "CONTRACTS", dbHandle ); p_HitsComplete[ playerid ] = cache_get_field_content_int( 0, "CONTRACTS", dbHandle );
p_TruckedCargo[ playerid ] = cache_get_field_content_int( 0, "TRUCKED", dbHandle ); p_TruckedCargo[ playerid ] = cache_get_field_content_int( 0, "TRUCKED", dbHandle );
p_PilotMissions[ playerid ] = cache_get_field_content_int( 0, "PILOT", dbHandle ); p_PilotMissions[ playerid ] = cache_get_field_content_int( 0, "PILOT", dbHandle );
p_TrainMissions[ playerid ] = cache_get_field_content_int( 0, "TRAIN", dbHandle ); //p_TrainMissions[ playerid ] = cache_get_field_content_int( 0, "TRAIN", dbHandle );
//p_CopTutorial{ playerid } = cache_get_field_content_int( 0, "COP_TUTORIAL", dbHandle ); //p_CopTutorial{ playerid } = cache_get_field_content_int( 0, "COP_TUTORIAL", dbHandle );
p_Job{ playerid } = cache_get_field_content_int( 0, "JOB", dbHandle ); p_Job{ playerid } = cache_get_field_content_int( 0, "JOB", dbHandle );
p_VIPJob{ playerid } = cache_get_field_content_int( 0, "VIP_JOB", dbHandle ); p_VIPJob{ playerid } = cache_get_field_content_int( 0, "VIP_JOB", dbHandle );
@ -8490,9 +8489,8 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
""COL_GREY"Total Cars Jacked:{FFFFFF} %d\n"\ ""COL_GREY"Total Cars Jacked:{FFFFFF} %d\n"\
""COL_GREY"Total Trucked Cargo:{FFFFFF} %d\n"\ ""COL_GREY"Total Trucked Cargo:{FFFFFF} %d\n"\
""COL_GREY"Total Meth Yielded:{FFFFFF} %d\n"\ ""COL_GREY"Total Meth Yielded:{FFFFFF} %d\n"\
""COL_GREY"Total Pilot Missions:{FFFFFF} %d\n"\ ""COL_GREY"Total Pilot Missions:{FFFFFF} %d",
""COL_GREY"Total Train Missions:{FFFFFF} %d", szLargeString, p_JailsBlown[ pID ], p_BankBlown[ pID ], p_CarsJacked[ pID ], p_TruckedCargo[ pID ], p_MethYielded[ pID ], p_PilotMissions[ pID ] );
szLargeString, p_JailsBlown[ pID ], p_BankBlown[ pID ], p_CarsJacked[ pID ], p_TruckedCargo[ pID ], p_MethYielded[ pID ], p_PilotMissions[ pID ], p_TrainMissions[ playerid ] );
ShowPlayerDialog( playerid, DIALOG_STATS_REDIRECT, DIALOG_STYLE_MSGBOX, "{FFFFFF}Main Statistics", szLargeString, "Okay", "Back" ); ShowPlayerDialog( playerid, DIALOG_STATS_REDIRECT, DIALOG_STYLE_MSGBOX, "{FFFFFF}Main Statistics", szLargeString, "Okay", "Back" );
} }
@ -9022,13 +9020,10 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
// pilot missons // pilot missons
case 13: mysql_function_query( dbHandle, "SELECT `NAME`, `PILOT` as `SCORE_VAL` FROM `USERS` ORDER BY `PILOT` DESC LIMIT 25", true, "OnHighScoreCheck", "ii", playerid, 13 ); case 13: mysql_function_query( dbHandle, "SELECT `NAME`, `PILOT` as `SCORE_VAL` FROM `USERS` ORDER BY `PILOT` DESC LIMIT 25", true, "OnHighScoreCheck", "ii", playerid, 13 );
// train missions
case 14: mysql_function_query( dbHandle, "SELECT `NAME`, `TRAIN` as `SCORE_VAL` FROM `USERS` ORDER BY `TRAIN` DESC LIMIT 25", true, "OnHighScoreCheck", "ii", playerid, 14 );
} }
} }
if ( dialogid == DIALOG_HIGHSCORES_BACK && ! response ) { if ( dialogid == DIALOG_HIGHSCORES_BACK && ! response ) {
return ShowPlayerDialog( playerid, DIALOG_HIGHSCORES, DIALOG_STYLE_LIST, "{FFFFFF}Highscores", "Seasonal Rank\nTotal Score\nTotal Kills\nTotal Arrests\nTotal Robberies\nHits Completed\nFires Extinguished\nBurglaries\nBlown Jails\nBlown Vaults\nVehicles Jacked\nMeth Yielded\nTotal Trucked Cargo\nTotal Pilot Missions\nTotal Train Missions", "Select", "Close" ); return ShowPlayerDialog( playerid, DIALOG_HIGHSCORES, DIALOG_STYLE_LIST, "{FFFFFF}Highscores", "Seasonal Rank\nTotal Score\nTotal Kills\nTotal Arrests\nTotal Robberies\nHits Completed\nFires Extinguished\nBurglaries\nBlown Jails\nBlown Vaults\nVehicles Jacked\nMeth Yielded\nTotal Trucked Cargo\nTotal Pilot Missions", "Select", "Close" );
} }
return 1; return 1;
} }
@ -9063,7 +9058,6 @@ thread OnHighScoreCheck( playerid, highscore_item )
case 11: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Meth\n", szSmallString = "Top 25 Meth Yielded"; case 11: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Meth\n", szSmallString = "Top 25 Meth Yielded";
case 12: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Trucked\n", szSmallString = "Top 25 Total Trucked Cargo"; case 12: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Trucked\n", szSmallString = "Top 25 Total Trucked Cargo";
case 13: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Missions\n", szSmallString = "Top 25 Total Pilot Missions"; case 13: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Missions\n", szSmallString = "Top 25 Total Pilot Missions";
case 14: szLargeString = ""COL_GOLD"Player\t"COL_GOLD"Missions\n", szSmallString = "Top 25 Total Train Missions";
} }
for ( new row = 0; row < rows; row ++ ) for ( new row = 0; row < rows; row ++ )
@ -9409,14 +9403,14 @@ stock SavePlayerData( playerid, bool: logout = false )
p_ContractedAmount[ playerid ], p_WeedGrams[ playerid ], logout ? ( bQuitToAvoid ? 1 : 0 ) : 0, p_ContractedAmount[ playerid ], p_WeedGrams[ playerid ], logout ? ( bQuitToAvoid ? 1 : 0 ) : 0,
p_drillStrength[ playerid ] ); p_drillStrength[ playerid ] );
format( Query, sizeof( Query ), "%s`BLEW_JAILS`=%d,`BLEW_VAULT`=%d,`VEHICLES_JACKED`=%d,`METH_YIELDED`=%d,`LAST_IP`='%s',`VIP_JOB`=%d,`TRUCKED`=%d,`COINS`=%f,`EXPLOSIVE_BULLETS`=%d,`ONLINE`=%d,`HIT_SOUND`=%d,`EXTRA_SLOTS`=%d,`PILOT`=%d,`TRAIN`=%d WHERE `ID`=%d", format( Query, sizeof( Query ), "%s`BLEW_JAILS`=%d,`BLEW_VAULT`=%d,`VEHICLES_JACKED`=%d,`METH_YIELDED`=%d,`LAST_IP`='%s',`VIP_JOB`=%d,`TRUCKED`=%d,`COINS`=%f,`EXPLOSIVE_BULLETS`=%d,`ONLINE`=%d,`HIT_SOUND`=%d,`EXTRA_SLOTS`=%d,`PILOT`=%d WHERE `ID`=%d",
Query, Query,
p_JailsBlown[ playerid ], p_BankBlown[ playerid ], p_CarsJacked[ playerid ], p_JailsBlown[ playerid ], p_BankBlown[ playerid ], p_CarsJacked[ playerid ],
p_MethYielded[ playerid ], mysql_escape( ReturnPlayerIP( playerid ) ), p_MethYielded[ playerid ], mysql_escape( ReturnPlayerIP( playerid ) ),
p_VIPJob{ playerid }, p_TruckedCargo[ playerid ], p_IrresistibleCoins[ playerid ], p_VIPJob{ playerid }, p_TruckedCargo[ playerid ], p_IrresistibleCoins[ playerid ],
p_ExplosiveBullets[ playerid ], p_ExplosiveBullets[ playerid ],
!logout, p_HitmarkerSound{ playerid }, p_ExtraAssetSlots{ playerid }, !logout, p_HitmarkerSound{ playerid }, p_ExtraAssetSlots{ playerid },
p_PilotMissions[ playerid ], p_TrainMissions[ playerid ], p_PilotMissions[ playerid ],
p_AccountID[ playerid ] ); p_AccountID[ playerid ] );
mysql_single_query( Query ); mysql_single_query( Query );
@ -11166,20 +11160,6 @@ stock Achievement::HandlePilotMissions( playerid )
} }
} }
stock Achievement::HandleTrainMissions( playerid )
{
switch( ++p_TrainMissions[ playerid ])
{
case 5: ShowAchievement( playerid, "Completed ~r~5~w~~h~~h~ train missions!", 3 );
case 20: ShowAchievement( playerid, "Completed ~r~20~w~~h~~h~ train missions!", 6 );
case 50: ShowAchievement( playerid, "Completed ~r~50~w~~h~~h~ train missions!", 9 );
case 100: ShowAchievement( playerid, "Completed ~r~100~w~~h~~h~ train missions!", 12 );
case 200: ShowAchievement( playerid, "Completed ~r~200~w~~h~~h~ train missions!", 15 );
case 500: ShowAchievement( playerid, "Completed ~r~500~w~~h~~h~ train missions!", 18 );
case 1000: ShowAchievement( playerid, "Completed ~r~1000~w~~h~~h~ train missions!", 25 );
}
}
thread readplayernotes( playerid ) thread readplayernotes( playerid )
{ {
new new
@ -11429,12 +11409,6 @@ stock displayAchievements( playerid, dialogid = DIALOG_NULL, szSecondButton[ ] =
Ach_Unlock( p_PilotMissions[ playerid ], 100 ), Ach_Unlock( p_PilotMissions[ playerid ], 200 ), Ach_Unlock( p_PilotMissions[ playerid ], 500 ), Ach_Unlock( p_PilotMissions[ playerid ], 100 ), Ach_Unlock( p_PilotMissions[ playerid ], 200 ), Ach_Unlock( p_PilotMissions[ playerid ], 500 ),
Ach_Unlock( p_PilotMissions[ playerid ], 1000 ) Ach_Unlock( p_PilotMissions[ playerid ], 1000 )
); );
format( szAchievements, sizeof( szAchievements ),
"%s"COL_GREY"Total Train Missions\t\t%s5\t%s20\t%s50\t%s100\t%s200\t%s500\t%s1000\n", szAchievements,
Ach_Unlock( p_TrainMissions[ playerid ], 5 ), Ach_Unlock( p_TrainMissions[ playerid ], 20 ), Ach_Unlock( p_TrainMissions[ playerid ], 50 ),
Ach_Unlock( p_TrainMissions[ playerid ], 100 ), Ach_Unlock( p_TrainMissions[ playerid ], 200 ), Ach_Unlock( p_TrainMissions[ playerid ], 500 ),
Ach_Unlock( p_TrainMissions[ playerid ], 1000 )
);
if ( !IsPlayerConnected( forid ) ) forid = playerid; if ( !IsPlayerConnected( forid ) ) forid = playerid;
ShowPlayerDialog( forid, dialogid, DIALOG_STYLE_MSGBOX, "{FFFFFF}Achievements", szAchievements, "Okay", szSecondButton ); ShowPlayerDialog( forid, dialogid, DIALOG_STYLE_MSGBOX, "{FFFFFF}Achievements", szAchievements, "Okay", szSecondButton );