From 17ee715b563f91f66fe327a5269d287be535d66b Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Sun, 14 Oct 2018 19:28:29 +1100 Subject: [PATCH 1/3] bobby pin reduction --- gamemodes/irresistible/cnr/features/shop.pwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/shop.pwn b/gamemodes/irresistible/cnr/features/shop.pwn index ae0d1bf..a9496bd 100644 --- a/gamemodes/irresistible/cnr/features/shop.pwn +++ b/gamemodes/irresistible/cnr/features/shop.pwn @@ -41,9 +41,9 @@ new { SHOP_ITEM_CHASITY_BELT, false, "Chastity Belt", "Protection from aids", 1, 550 }, { SHOP_ITEM_SECURE_WALLET, false, "Secure Wallet", "Protection from robberies", 1, 660 }, { SHOP_ITEM_SCISSOR, true , "Scissors", "Automatically cut ties", 8, 1100 }, - { SHOP_ITEM_ROPES, true , "Rope", "/tie", 8, 2250 }, // [1500] + { SHOP_ITEM_ROPES, true , "Rope", "/tie", 8, 1500 }, + { SHOP_ITEM_BOBBY_PIN, true , "Bobby Pin", "Automatically break cuffs", 16, 1950 }, // [1000] -makecopgreatagain { SHOP_ITEM_FOIL, true , "Aluminium Foil", "Automatically deflect EMP", 8, 3400 }, - { SHOP_ITEM_BOBBY_PIN, true , "Bobby Pin", "Automatically break cuffs", 16, 3900 }, // [1000] -makecopgreatagain { SHOP_ITEM_MONEY_CASE, false, "Money Case", "Increases robbing amount", 1, 4500 }, // [1250] { SHOP_ITEM_DRILL, true , "Thermal Drill", "Halves safe cracking time", 1, 5000 }, { SHOP_ITEM_METAL_MELTER, true , "Metal Melter", "/breakout", 4, 7500 } From 7c325bb6eba56f3bc65a718a998b12ceafe8bf8b Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Sun, 14 Oct 2018 19:39:53 +1100 Subject: [PATCH 2/3] money dropped in pb --- gamemodes/irresistible/cnr/features/weapon_drop.pwn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/weapon_drop.pwn b/gamemodes/irresistible/cnr/features/weapon_drop.pwn index 0367ecb..fb90507 100644 --- a/gamemodes/irresistible/cnr/features/weapon_drop.pwn +++ b/gamemodes/irresistible/cnr/features/weapon_drop.pwn @@ -47,6 +47,9 @@ hook OnPlayerDeathEx( playerid, killerid, reason, Float: damage, bodypart ) hook OnPlayerDeath( playerid, killerid, reason ) #endif { + if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) ) + return 1; // do not break return + new Float: X, Float: Y, Float: Z; new expire_time = GetServerTime( ) + 180; @@ -54,8 +57,6 @@ hook OnPlayerDeath( playerid, killerid, reason ) if ( IsPlayerConnected( killerid ) && ! IsPlayerNPC( killerid ) ) { - if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) ) - return 1; for ( new slotid = 0; slotid < 13; slotid++ ) From 437c32ee84bb22750d7345340a0f97b32ac56a6b Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Sun, 14 Oct 2018 19:43:30 +1100 Subject: [PATCH 3/3] update updates.txt --- scriptfiles/updates.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scriptfiles/updates.txt b/scriptfiles/updates.txt index f6596fa..8737b96 100644 --- a/scriptfiles/updates.txt +++ b/scriptfiles/updates.txt @@ -1,12 +1,23 @@ +(+) Newly registered players will be asked if they prefer DM or RP - if they like RP, passive mode is on. (+) Added confirmation dialog before selling a home / business / vehicle components. (+) Pilot and train minijobs are now saved to the database (and in /highscores). (+) Adds some strippers in the LV brothel (for fun). (+) Adds Hide From Minimap perk (costs $25,000) ... hides you for 1 minute. -(/) You can now set spikes in non-air and non-sea vehicles using your AIM key. +(+) Fire tracker is now /fires ... and it shows the fires on the map as red blips. +(+) New hitmarker system ... activate using /cp - Now shows taken/given damage! +(+) Level 5 admins can now view the police chat. +(+) If you die, you will drop 25% of the money you are currently holding. +(/) Passive mode now completely disables deathmatch. +(/) You can now set spikes in non-air and non-sea vehicles using your CAPSLOCK key. (/) Car jackers now need to wait only 1 min before exporting another vehicle (before 2 min). (/) Players with level 100 in a specific level are able to accrue more XP in the level. +(/) Explosive rounds used on vehicles will have a more significant impact. +(/) Explosive rounds require the key N to activate. +(/) Rank is now XP based now (prior score based). (*) Should be faster to place multiple drills using left alt. (*) Fixes death bug with players suiciding in a vehicle. (*) Fixed Alcatraz map escaping issues. (*) Addressed issue with being unable to rob ChuffSec. +(*) Fixed issue with business exports being randomly canceled. +(*) ATMs in facilities are now operational. (-) Removed a counter in cluckin' bell for ease of access to the safe. \ No newline at end of file