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

eastereggs, detain/bc bug fixes, changelog addition

Browse Source
This commit is contained in:
Damen 2019-04-20 11:55:44 -04:00
parent 635e77c341
commit 2ceacd18bc
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamemodes/irresistible/cnr/features/_features.pwn
View File

@ -24,7 +24,7 @@
// special (xmas/easter/nye) // special (xmas/easter/nye)
// #include "irresistible\cnr\features\christmas.pwn" // #include "irresistible\cnr\features\christmas.pwn"
// #include "irresistible\cnr\features\eastereggs.pwn" #include "irresistible\cnr\features\eastereggs.pwn"
// #include "irresistible\cnr\features\new_years_eve.pwn" // #include "irresistible\cnr\features\new_years_eve.pwn"
// other // other

6
gamemodes/irresistible/cnr/features/cop/arrest.pwn
View File

@ -309,7 +309,7 @@ CMD:detain( playerid, params[ ] )
CMD:bc( playerid, params[ ] ) return cmd_breakcuffs(playerid, params); CMD:bc( playerid, params[ ] ) return cmd_breakcuffs(playerid, params);
CMD:breakcuffs( playerid, params[ ] ) CMD:breakcuffs( playerid, params[ ] )
{ {
return BreakPlayerCuffs( playerid ); return BreakPlayerCuffs( playerid ), 1;
} }
/* ** Functions ** */ /* ** Functions ** */
@ -408,6 +408,10 @@ stock BreakPlayerCuffs( playerid )
p_Cuffed{ playerid } = false; p_Cuffed{ playerid } = false;
p_BulletInvulnerbility[ playerid ] = g_iTime + 5; p_BulletInvulnerbility[ playerid ] = g_iTime + 5;
p_Detained{ playerid } = false;
Delete3DTextLabel( p_DetainedLabel[ playerid ] );
p_DetainedLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID;
p_DetainedBy[ playerid ] = INVALID_PLAYER_ID;
} }
SendServerMessage( playerid, "You have successfully broken out of your cuffs!" ); SendServerMessage( playerid, "You have successfully broken out of your cuffs!" );
return true; return true;

5
gamemodes/irresistible/cnr/features/eastereggs.pwn
View File

@ -19,7 +19,7 @@
#define EASTEREGG_LABEL "[EASTER EGG]" #define EASTEREGG_LABEL "[EASTER EGG]"
#define EASTEREGG_NAME "Easter Egg" #define EASTEREGG_NAME "Easter Egg"
#define EASTEREGG_MODEL randarg( 19341, 19342, 19343, 19344, 19345 ) #define EASTEREGG_MODEL randarg( 19341, 19342, 19343, 19344, 19345 )
#define MAX_EGGS ( 4 ) #define MAX_EGGS ( 6 )
/* ** Variables ** */ /* ** Variables ** */
enum E_EASTEREGG_DATA enum E_EASTEREGG_DATA
@ -70,7 +70,8 @@ hook OnPlayerUpdateEx( playerid )
} }
case 3: case 3:
{ {
p_IrresistibleCoins[ playerid ] += ( iCoins = fRandomEx( 75.0, 250.0 ) ); ( iCoins = fRandomEx( 75.0, 250.0 ) );
GivePlayerIrresistibleCoins( playerid, iCoins );
format( szPrize, sizeof( szPrize ), "%0.2f coins", iCoins ); format( szPrize, sizeof( szPrize ), "%0.2f coins", iCoins );
} }
} }

1
scriptfiles/changelogs/cnr/_changelogs.cfg
View File

@ -1,3 +1,4 @@
v11.55.182
v11.55.180 v11.55.180
v11.55.174 v11.55.174
v11.55.168 v11.55.168

3
scriptfiles/changelogs/cnr/v11.55.182.txt Normal file
View File

@ -0,0 +1,3 @@
(+) Easter Egg treasure hunts are not happening for Easter! /treasures
(*) Fixed an issue with being detained and then /bc'ing out of it.
(*) Fixed an issue with /bc throwing an "Invalid Command" message when failing.