Merge pull request #26 from dusan01/bugfixes/fireman-experience

Fireman and Lumberjack XP and Payout
This commit is contained in:
Lorenc Pekaj 2019-06-03 21:59:32 +10:00 committed by GitHub
commit 3365c06eee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -11,7 +11,7 @@
/* ** Definitions ** */ /* ** Definitions ** */
#define MAX_FIRES ( 10 ) #define MAX_FIRES ( 10 )
#define FIRE_EXTINGUISH_PAYOUT ( 4000 ) #define FIRE_EXTINGUISH_PAYOUT ( 6000 )
/* ** Variables ** */ /* ** Variables ** */
enum E_FIRE_DATA enum E_FIRE_DATA
@ -91,7 +91,7 @@ hook OnPlayerUpdateEx( playerid )
ach_HandleExtinguishedFires( playerid ); ach_HandleExtinguishedFires( playerid );
SendClientMessageToAllFormatted( -1, "{A83434}[FIREMAN]"COL_WHITE" %s(%d) has earned "COL_GOLD"%s"COL_WHITE" for extinguishing a house fire.", ReturnPlayerName( playerid ), playerid, cash_format( money_earned ) ); SendClientMessageToAllFormatted( -1, "{A83434}[FIREMAN]"COL_WHITE" %s(%d) has earned "COL_GOLD"%s"COL_WHITE" for extinguishing a house fire.", ReturnPlayerName( playerid ), playerid, cash_format( money_earned ) );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
//GivePlayerExperience( playerid, E_FIREMAN ); GivePlayerExperience( playerid, E_ROLEPLAY, 0.5 );
GivePlayerCash( playerid, money_earned ); GivePlayerCash( playerid, money_earned );
StockMarket_UpdateEarnings( E_STOCK_GOVERNMENT, money_earned, 0.15 ); StockMarket_UpdateEarnings( E_STOCK_GOVERNMENT, money_earned, 0.15 );
HouseFire_Remove( i ); HouseFire_Remove( i );

View File

@ -243,6 +243,7 @@ CMD:wood( playerid, params[ ] )
g_treeData[ i ] [ E_CHOPPED ] = true; g_treeData[ i ] [ E_CHOPPED ] = true;
count++; count++;
GivePlayerCash( playerid, 250 ); GivePlayerCash( playerid, 250 );
GivePlayerExperience( playerid, E_ROLEPLAY, 0.2 );
SendServerMessage( playerid, "Tree successfully chopped into smaller pieces. Go to the wood chipper and type "COL_ORANGE"/wood chip{FFFFFF}!" ); SendServerMessage( playerid, "Tree successfully chopped into smaller pieces. Go to the wood chipper and type "COL_ORANGE"/wood chip{FFFFFF}!" );
break; break;
} }