From a304a00ede771c8cf845f2583629e50ce1bf4fb0 Mon Sep 17 00:00:00 2001 From: Stev Date: Fri, 1 Mar 2019 22:12:42 +0000 Subject: [PATCH 1/4] attempts to fix pool issue - Damen --- gamemodes/irresistible/cnr/features/pool.pwn | 2 +- gamemodes/irresistible/physics_dynamic.pwn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/pool.pwn b/gamemodes/irresistible/cnr/features/pool.pwn index 91a3a31..74ae2d0 100644 --- a/gamemodes/irresistible/cnr/features/pool.pwn +++ b/gamemodes/irresistible/cnr/features/pool.pwn @@ -11,7 +11,7 @@ /* ** Definitions ** */ #define POCKET_RADIUS ( 0.09 ) -#define POOL_TIMER_SPEED ( 500 ) +#define POOL_TIMER_SPEED ( 25 ) #define DEFAULT_AIM ( 0.38 ) #define DEFAULT_POOL_STRING "Pool Table\n{FFFFFF}Press ENTER To Play" #define POOL_FEE_RATE ( 0.02 ) diff --git a/gamemodes/irresistible/physics_dynamic.pwn b/gamemodes/irresistible/physics_dynamic.pwn index 787bc77..35705f3 100644 --- a/gamemodes/irresistible/physics_dynamic.pwn +++ b/gamemodes/irresistible/physics_dynamic.pwn @@ -19,7 +19,7 @@ #include #if !defined PHY_TIMER_INTERVAL - #define PHY_TIMER_INTERVAL (20.0) + #define PHY_TIMER_INTERVAL (50.0) #endif #if !defined PHY_MAX_OBJECTS #define PHY_MAX_OBJECTS (1024) From 81c52f3b3f60013483ea84cd355a39dce70d3085 Mon Sep 17 00:00:00 2001 From: Stev Date: Fri, 1 Mar 2019 22:15:14 +0000 Subject: [PATCH 2/4] fixes q to avoid arrest for admins spectating - Damen --- gamemodes/irresistible/cnr/features/cop/arrest.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/irresistible/cnr/features/cop/arrest.pwn b/gamemodes/irresistible/cnr/features/cop/arrest.pwn index 55668e7..4f40050 100644 --- a/gamemodes/irresistible/cnr/features/cop/arrest.pwn +++ b/gamemodes/irresistible/cnr/features/cop/arrest.pwn @@ -503,7 +503,7 @@ stock AwardNearestLEO( playerid, reason ) new closestLEO = GetClosestPlayerEx( playerid, CLASS_POLICE, radius ); - if ( IsPlayerConnected( closestLEO ) ) + if ( IsPlayerConnected( closestLEO ) && !p_Spectating{ closestLEO } ) { new reasonText[ 24 ]; From 3e410a67c4ebaa21764db08783425bf78871b71a Mon Sep 17 00:00:00 2001 From: Stev Date: Fri, 1 Mar 2019 22:18:51 +0000 Subject: [PATCH 3/4] fixes the gps server msg's color formatting if house title has hex in it - Damen --- gamemodes/irresistible/cnr/features/houses/realestate.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/irresistible/cnr/features/houses/realestate.pwn b/gamemodes/irresistible/cnr/features/houses/realestate.pwn index cf083f4..fe16431 100644 --- a/gamemodes/irresistible/cnr/features/houses/realestate.pwn +++ b/gamemodes/irresistible/cnr/features/houses/realestate.pwn @@ -79,7 +79,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] ) if ( IsPlayerInAnyVehicle( playerid ) ) { GPS_SetPlayerWaypoint( playerid, g_houseData[ houseid ] [ E_HOUSE_NAME ], g_houseData[ houseid ] [ E_EX ], g_houseData[ houseid ] [ E_EY ], g_houseData[ houseid ] [ E_EZ ] ); - SendClientMessageFormatted( playerid, -1, ""COL_GREY"[GPS]"COL_WHITE" You have set your destination to %s. Follow the arrow to reach your destination.", g_houseData[ houseid ] [ E_HOUSE_NAME ] ); + SendClientMessageFormatted( playerid, -1, ""COL_GREY"[GPS]"COL_WHITE" You have set your destination to %s"COL_WHITE". Follow the arrow to reach your destination.", g_houseData[ houseid ] [ E_HOUSE_NAME ] ); } else { From 41055198ad1f8be342c5ccf287ae2fb8bfc11397 Mon Sep 17 00:00:00 2001 From: Stev Date: Fri, 1 Mar 2019 22:21:06 +0000 Subject: [PATCH 4/4] removes the ability to consume a health pickup if over 100 health - Damen --- gamemodes/irresistible/cnr/features/weapon_drop.pwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/weapon_drop.pwn b/gamemodes/irresistible/cnr/features/weapon_drop.pwn index c0b8acd..ffb0440 100644 --- a/gamemodes/irresistible/cnr/features/weapon_drop.pwn +++ b/gamemodes/irresistible/cnr/features/weapon_drop.pwn @@ -133,8 +133,8 @@ hook OnPlayerPickUpDynPickup( playerid, pickupid ) // Health Pickups if ( pickupid == g_HealthPickup ) { - SetPlayerHealth( playerid, 100.0 ); - return 1; + new Float: health; + if ( GetPlayerHealth( playerid, health ) <= 100 ) return SetPlayerHealth( playerid, 100.0 ); } // ignore if theres a delay