Commit Graph

571 Commits

Author SHA1 Message Date
Lorenc Pekaj
749f52ca73 /dropmoney, /dropweapon ... 1% chance drop of armour when you die if ur dm lvl over 50 2018-10-14 16:10:57 +11:00
Lorenc Pekaj
1cfe7cffe6 weed dealers, 10g limit ... dealers can use it 2018-10-14 16:10:06 +11:00
Lorenc Pekaj
31466a89d7 Merged master into moneygrub 2018-10-14 14:07:36 +11:00
Lorenc Pekaj
9ed5221550 destroy damage object if it exists 2018-10-14 13:38:34 +11:00
Steven Howard
18ff02951b hidden syncing for the time being 2018-10-13 17:06:06 +01:00
Steven Howard
7d0d72260b global object replacement 2018-10-13 17:04:32 +01:00
Steven Howard
3fe2638959 textdraw changes 2018-10-13 15:44:04 +01:00
Steven Howard
76d2629b0a starting sync player. 2018-10-13 15:38:02 +01:00
Steven Howard
aeabfdcdf5 removed unused function 2018-10-13 14:16:59 +01:00
Steven Howard
ad8a8b9385 removes invalid defines 2018-10-13 14:15:48 +01:00
Steven Howard
c15ea9ef49 adds /viewpolicechat for level 5 admins 2018-10-13 14:11:21 +01:00
Steven Howard
e46ece5ace removes invalid vehicles
http://forum.sfcnr.com/showthread.php?60671-Infernus-placements
2018-10-13 14:07:39 +01:00
Lorenc Pekaj
763689448f damage feed improvements 2018-10-13 23:21:05 +11:00
Steven Howard
0e080fcd7c 3d text is attached to damaged player
lifted the object above player name
2018-10-13 11:44:55 +01:00
Steven Howard
3c4bab5596 Merge branch 'damage_feed' of https://bitbucket.org/lorenc/cnr into damage_feed 2018-10-13 11:18:09 +01:00
Steven Howard
da428e56b6 cleaning up invalid prints and comments 2018-10-13 11:15:35 +01:00
Steven Howard
bcff7701ab Merged master into damage_feed 2018-10-13 11:13:23 +01:00
Steven Howard
3f96fe199b changed from object to a SetPlayerAttachedObject 2018-10-13 11:12:08 +01:00
Steven Howard
dd9a68eaa4 adds a object above the players head according to what damage has been given (armour and/or health)
Inspired by Shini
2018-10-12 23:04:18 +01:00
Steven Howard
52146a04d2 attachs a 3D text label where the player damaged a player (known from dming) 2018-10-12 22:13:07 +01:00
Steven Howard
b74ab57bdf removes vip requirement to change hitmarker sounds 2018-10-12 17:04:19 +01:00
Steven Howard
bdb45e28d8 moves hitmarkersound into damage_feed.pwn
cleanup
2018-10-12 17:00:44 +01:00
Steven Howard
0250296b2b changes textdraw colors 2018-10-12 15:59:20 +01:00
Lorenc Pekaj
c45e66e6bb fix admin spec issue 2018-10-13 01:12:47 +11:00
Lorenc Pekaj
b73f2bb9e4 replace hitmarker with damage feed 2018-10-13 01:12:27 +11:00
Steven Howard
7fde0d019e player change 2018-10-12 15:07:26 +01:00
Lorenc Pekaj
23fc8aa608 spectate check for player 2018-10-13 00:49:38 +11:00
Steven Howard
44f16fcc3d changing targetid 2018-10-12 11:56:56 +01:00
Lorenc Pekaj
b182e49b2b drop money on death 2018-10-12 21:39:20 +11:00
Lorenc Pekaj
f5e1a4565c moviemode xp tds moved to experience.pwn 2018-10-12 20:26:35 +11:00
Lorenc Pekaj
ecf10abe5c new rank system is largely based off the new xp system 2018-10-12 20:01:32 +11:00
Lorenc Pekaj
1838bf5b50 move rank to experience.pwn 2018-10-12 19:34:02 +11:00
Lorenc Pekaj
fa0e42c018 explode at vehicle centre 2018-10-12 16:43:16 +11:00
Steven Howard
f179841d38 changed timer durations based on ticks 2018-10-11 16:44:11 +01:00
Steven Howard
110458523d changing functions for given/taken feed 2018-10-11 16:36:56 +01:00
Steven Howard
45dcae630d puching all hitsound configuration into one 2018-10-11 14:35:21 +01:00
Steven Howard
598b0c6fda adding hitmarker textdraw into damage_feed file.
cleanup variables
2018-10-11 14:21:51 +01:00
Steven Howard
a57114f4c1 textdraw placements 2018-10-11 14:06:18 +01:00
Lorenc Pekaj
f4a6e08428 fix issue with players losing their biz checkpoints when someone quits 2018-10-12 00:03:57 +11:00
Lorenc Pekaj
97429cf955 explosive rounds n to activate 2018-10-11 23:22:55 +11:00
Steven Howard
5c635493e7 cleanup 2018-10-11 11:26:41 +01:00
Steven Howard
71dc423e88 added callback to return the damage given/taken 2018-10-11 11:26:08 +01:00
Steven Howard
0405aa45a4 remove invalid defines 2018-10-11 11:13:17 +01:00
Steven Howard
9d3fc9838e moved into features
changed the colors of textdraws
2018-10-11 11:10:16 +01:00
Steven Howard
9fd02514c4 fixing the wrong player index selected for damage. 2018-10-11 10:41:35 +01:00
Steven Howard
0d442f4e78 damage feed changes 2018-10-11 10:37:47 +01:00
Lorenc Pekaj
3ad50aec5e move spike strip in car key to H/CAPSLOCK 2018-10-11 20:24:21 +11:00
Lorenc Pekaj
05cd9b1722 fire system retouched - use /fires ... based off map icons ... no more textdraws 2018-10-11 20:19:30 +11:00
Steven Howard
8f6058b86a starting on damage feed, ideal for dmers 2018-10-11 00:40:49 +01:00
Lorenc Pekaj
8c9330aa6e remove random object 2018-10-10 20:20:18 +11:00
Lorenc Pekaj
25890745af alcatraz fixes 2018-10-10 20:17:42 +11:00
Lorenc Pekaj
d7b68afa01 allow players over level 100 to accrue more xp regardless 2018-10-10 20:15:21 +11:00
Lorenc Pekaj
3524501d76 address issue with player unable to rob chuff ... move progress bar data there 2018-10-10 20:05:55 +11:00
Lorenc Pekaj
cca1f347f1 modulize car jacker 2018-10-10 19:36:08 +11:00
Lorenc Pekaj
cc23d6ced4 modulize fire system 2018-10-10 19:20:25 +11:00
Lorenc Pekaj
ad02b2c08c remove a counter in cluckin bell for ease 2018-10-10 19:04:18 +11:00
Lorenc Pekaj
098d259a5a use aim key to set spike in car ... disabled for air/boat 2018-10-10 19:04:08 +11:00
Lorenc Pekaj
1252bb5d89 move vehicle functions to gta\vehicle_data.pwn 2018-10-10 19:03:48 +11:00
Lorenc Pekaj
17285c5251 potential issue fix with isnotnearplayer 2018-10-10 16:13:45 +11:00
Lorenc Pekaj
3dd5ec63c9 remove XP from registration query 2018-10-10 16:08:42 +11:00
Lorenc Pekaj
889f8bf946 modulize streaks and weapon statistics 2018-10-10 16:05:23 +11:00
Lorenc Pekaj
c652ac40e2 GetPlayerOutsidePos will give you the entrance/house/garage/pos the player is at 2018-10-10 16:05:14 +11:00
Lorenc Pekaj
c3ce372f9f modulize atm system and crime report system 2018-10-10 15:21:11 +11:00
Lorenc Pekaj
7f69b7427f move car mod checker as an anticheat module... move charging for vehicle components in the anticheat money module 2018-10-10 14:59:03 +11:00
Lorenc Pekaj
97d4c8a40a modulize information pickups 2018-10-10 14:50:16 +11:00
Lorenc Pekaj
233b913fe6 modulize bribes 2018-10-10 14:46:38 +11:00
Lorenc Pekaj
f392745ec6 modulize roadblock system 2018-10-10 14:35:08 +11:00
Lorenc Pekaj
2e0d92f2a7 mining minijob modulized 2018-10-10 14:30:35 +11:00
Lorenc Pekaj
4feea47631 remove useless modules ... modulize weapon lockers 2018-10-10 14:08:18 +11:00
Lorenc Pekaj
8afbdb8956 useless to have IsPlayerLorenc ... added a IsPlayerMaintainer function which can be edited in config/server.pwn 2018-10-10 13:51:56 +11:00
Lorenc Pekaj
1a7d8695d2 validate house id and biz id in confirmation dialogs ... update updates.txt 2018-10-10 12:19:18 +11:00
Lorenc Pekaj
3b28c1b30f little bit faster to place the drills now 2018-10-10 12:11:07 +11:00
Lorenc Pekaj
be16355bee make hide from radar last one minute 2018-10-10 12:00:29 +11:00
Lorenc Pekaj
278f3f7c6b add back check to see if player is in vehicle ... for death bug 2018-10-10 11:26:53 +11:00
Steven Howard
f4e603ec85 cleanup 2018-10-09 22:12:54 +01:00
Steven Howard
f0377f3d5c fixes the deadly death bug 2018-10-09 16:04:52 +01:00
Steven Howard
3483bc358b changed some level req values 2018-10-09 14:18:32 +01:00
Steven Howard
07b2d25182 adds stealth mode (hides player from radar)
once player is shot he shows for a short period (like CIA)
2018-10-09 14:15:35 +01:00
Steven Howard
133a5a6079 adds strippers in the LV brothel (for fun) 2018-10-09 13:25:39 +01:00
Steven Howard
a65c2cf9b5 added train missions to database
updated highscores to have train missions
added achievements for train driver aswell
2018-10-09 10:49:11 +01:00
Steven Howard
120c5b09c2 updated pilot sql schematic 2018-10-09 10:13:25 +01:00
Steven Howard
2d1094574c adds a confirmation dialog before selling a business 2018-10-09 10:09:15 +01:00
Steven Howard
9c48bbeebc adds more highscore options meth yielded, pilot missions, trucked cargo, vehicles jacked 2018-10-09 10:01:05 +01:00
Steven Howard
590da61131 addressed mmb for arresting issue
pilot missions are added into achievements and saves in sql
2018-10-09 09:53:55 +01:00
Steven Howard
7f4a463235 adds a confirmation dialog before selling a house 2018-10-09 09:32:26 +01:00
Steven Howard
91bf3157a0 adds a confirmation dialog before selling vehicle modifications 2018-10-09 08:49:53 +01:00
Steven Howard
02f105c5c4 reformatted all dialog id's and ordered them 2018-10-09 08:30:55 +01:00
Lorenc Pekaj
f93b76d4f9 change zero's skin 2018-10-09 11:02:44 +11:00
Lorenc Pekaj
917b687a87 cleanup 2018-10-09 10:41:02 +11:00
Lorenc Pekaj
8c2dd222d2 add toy model preview 2018-10-09 10:33:04 +11:00
Lorenc Pekaj
b755e6ffa1 add /smoke to animlist 2018-10-09 10:26:33 +11:00
Lorenc Pekaj
a4cf751cec add model preview functionality ... makes previewing models before buying seamless 2018-10-09 10:04:42 +11:00
Lorenc Pekaj
066915d7fe update updates.txt ... fix potential issues 2018-10-09 09:05:02 +11:00
Steven Howard
e33c2c3efb adds a option to preview a garage component before buying 2018-10-08 22:41:29 +01:00
Steven Howard
41b8c22061 adds burglary checkpoint and vehicles in other cities LS and LV 2018-10-08 21:47:10 +01:00
Steven Howard
09a8cfe1af change to firefighter into different homes
http://forum.sfcnr.com/showthread.php?48467-Fires-amp-Burglary-system-in-LS-amp-LV
2018-10-08 20:58:49 +01:00
Steven Howard
108fc055a6 adds /smoke into animations 2018-10-08 20:53:05 +01:00
Steven Howard
5f300a6cd2 LEO's can't MMB to taze/cuff/arrest whie they have spawn protection active 2018-10-08 20:26:33 +01:00
Steven Howard
67d59beab3 Merged master into changes 2018-10-08 14:00:14 +01:00
Steven Howard
d1f4ab1ecb reformatted paintball edit dialog
added a chat toggle option to enable/disable pb chat
2018-10-08 13:58:52 +01:00
Steven Howard
0f6e2a18a0 re-worded the attacking turf message 2018-10-08 13:43:40 +01:00
Steven Howard
9187922b28 adds blown jail, blown vaults, hit's completed and fires in /highscore 2018-10-08 13:37:20 +01:00
Steven Howard
4412650371 vehicle dealership spawn location fixes 2018-10-08 13:31:44 +01:00
Steven Howard
b567a476fe Merged master into bug-fixes 2018-10-08 13:20:41 +01:00
Steven Howard
0a236abad7 fixes spawn locations when buying a personal vehicle 2018-10-08 12:53:41 +01:00
Lorenc Pekaj
f0d793d4fc speed up robbery time with thermal drill 2018-10-08 21:36:19 +11:00
Lorenc Pekaj
53d7f274e8 increase payout for robberies 2018-10-08 21:34:45 +11:00
Lorenc Pekaj
b2f9b51388 increase safe picking speed with higher robbery level 2018-10-08 21:10:32 +11:00
Lorenc Pekaj
43525a52aa store progress bar in progress.pwn and use progressbarv2 2018-10-08 21:02:19 +11:00
Lorenc Pekaj
6b3cb411cf adjust clerk xp credit 2018-10-08 21:02:03 +11:00
Steven Howard
5771ed6461 fixed the wrongly formatted command for /getgang 2018-10-07 21:52:35 +01:00
Lorenc Pekaj
aa00cd6346 address issue with clerks giving too much xp 2018-10-06 12:54:20 +10:00
Lorenc Pekaj
1ea84952ae move toys into toys module cnr\features\toys.pwn 2018-10-06 12:11:26 +10:00
Lorenc Pekaj
19446fd230 move shop data to module shops.pwn (supasave) 2018-10-06 11:59:34 +10:00
Lorenc Pekaj
b4bd152bae add back all robbery npcs ... drop the pay of safes by a tiny bit 2018-10-06 11:14:18 +10:00
Lorenc Pekaj
41489478b7 modulize entrances, jobs, robbery npcs, robbery safes, vaults 2018-10-06 10:50:23 +10:00
Steven Howard
1daf8141dc Merge branch 'gang-changes' of https://bitbucket.org/lorenc/cnr into gang-changes 2018-10-05 19:42:40 +01:00
Steven Howard
b7cb7134bc adds turf location when another gang is turfing 2018-10-05 19:39:53 +01:00
Steven Howard
be5edf4ddd removed test function 2018-10-05 18:38:47 +00:00
Steven Howard
7e79d90dc0 adds /getgang [PLAYER_ID] - returns the gang that the player is in. 2018-10-05 19:23:27 +01:00
Steven Howard
2789c3f234 changed /turfs into /gang turfs 2018-10-05 19:14:57 +01:00
Steven Howard
4ebaf037a0 adds /turfs - showing all the current turfs and the gang who controls it 2018-10-05 15:48:24 +01:00
Lorenc Pekaj
cbc7e6a429 drop health according to dm level 2018-10-05 16:50:05 +10:00
Lorenc Pekaj
b245112594 reduce turf pay by 500, increase facility spawn fee by 250 (gangs) 2018-10-05 16:37:53 +10:00
Lorenc Pekaj
4ae2a86512 passive mode is now automatically enabled 2018-10-05 16:32:32 +10:00
Lorenc Pekaj
16fd59d78a improve business payouts ... significantly 2018-10-05 16:32:19 +10:00
Lorenc Pekaj
7d83b8bccb add chainsaw pickup ... remove dialog for lumberjack 2018-10-05 16:32:01 +10:00
Lorenc Pekaj
fd1d42d961 remove duplicate inc on pool ... updates.txt update 2018-10-05 03:58:08 +10:00
Lorenc Pekaj
60cf953710 fix xp credited on specific weapons 2018-10-04 06:29:48 +10:00
Lorenc Pekaj
acd524163d add facility objects 2018-10-04 06:16:22 +10:00
Lorenc Pekaj
a3d7673072 increase facility limit 2018-10-04 06:09:51 +10:00
Lorenc Pekaj
8f6a417b6b fix business bug with supplies 2018-10-04 06:02:52 +10:00
Lorenc Pekaj
c182ee10b2 add different colors to experience 2018-10-04 05:52:08 +10:00
Lorenc Pekaj
8a2f312bb5 perks cleanup 2018-10-04 05:47:29 +10:00
Lorenc Pekaj
233d83cf39 charge gangs $250 per spawn on their facility 2018-10-04 05:44:45 +10:00
Lorenc Pekaj
c4e50c8bfc add perks based off total level and make it expensive ...
dm experience now varies between the weapon
2018-10-04 05:35:04 +10:00
Lorenc Pekaj
e94b7d8772 require min 7 days before upgrading 2018-10-02 01:04:54 +10:00
Lorenc Pekaj
b461ee83e6 fix potential passive bug 2018-10-01 14:57:09 +10:00
Lorenc Pekaj
0f4aee7915 solve issue with saved biz vehicles showing unpurchased 2018-10-01 14:39:08 +10:00
Lorenc Pekaj
65cc786fa0 error fix and update changelog 2018-10-01 14:25:54 +10:00
Lorenc Pekaj
a8bba4c4e4 update description 2018-10-01 14:20:08 +10:00
Lorenc Pekaj
0ce410a1ba business production timer now relies on players online 2018-10-01 14:18:16 +10:00
Lorenc Pekaj
26a860dab3 modulize business system and disable business security 2018-10-01 13:30:25 +10:00
Lorenc Pekaj
487cecf314 modulize spike strips ... left alt to deploy spike strip 2018-09-30 03:37:42 +10:00
Lorenc Pekaj
a1960abe96 redundant variables removed 2018-09-30 03:37:26 +10:00
Lorenc Pekaj
ce3ddea6f1 add stev to rcon whitelist 2018-09-30 03:15:20 +10:00
Lorenc Pekaj
31b67c20e4 add pagination to realestate (/estate) ... can support hundreds of homes now 2018-09-30 03:14:56 +10:00
Lorenc Pekaj
d0b1061ad2 fix potential chuffsec issue 2018-09-30 02:37:13 +10:00
Lorenc Pekaj
c5c0213793 cleanup 2018-09-29 21:50:27 +10:00
Lorenc Pekaj
d3db7d1117 passive mode bugfix 2018-09-29 21:41:11 +10:00
Lorenc Pekaj
0dc80c7bc0 update vip description 2018-09-29 21:23:22 +10:00
Lorenc Pekaj
f6a21c8c66 fix total xp bug in stats 2018-09-29 20:00:51 +10:00
Lorenc Pekaj
6c0ae4134c add progress bar to experience 2018-09-29 19:25:39 +10:00
Lorenc Pekaj
88c8bd3582 remove xp market, completely deprecate prior xp system 2018-09-29 08:13:08 +10:00
Lorenc Pekaj
692a8fa8e0 Add refresh button to /level as well as a user parameter 2018-09-29 06:34:42 +10:00
Lorenc Pekaj
e9b76938bd reduce bc success by 5% ... reduce lvl 100 requirements 2018-09-29 06:13:29 +10:00
Lorenc Pekaj
2e56a7bb57 error fix with random msgs 2018-09-29 06:08:36 +10:00
Lorenc Pekaj
556a008573 move player market cmds to /ic 2018-09-29 06:05:39 +10:00
Lorenc Pekaj
f81d656161 start with just police, robbery, dm levels 2018-09-29 04:44:18 +10:00
Lorenc Pekaj
0c22793fb5 bug fix with integer 2018-09-28 10:44:06 +10:00
Lorenc Pekaj
14c73d01ae drastically dilute the xp 2018-09-28 10:35:13 +10:00
Lorenc Pekaj
1005a506b6 add more levels ... copy queries at the bottom to fully populate 2018-09-28 10:29:13 +10:00
Lorenc Pekaj
1e6b9d8116 - add xp dilation just so people do not get bored of "+1 xp" constantly
- double xp factored in
2018-09-28 09:49:06 +10:00
Lorenc Pekaj
2cb296835a remove redundant e_level from enumerator ... add /levels command for testing 2018-09-28 09:24:49 +10:00
Lorenc Pekaj
054f4e4363 add experience v2 base ... remove accountid parameter from onplayerlogin 2018-09-28 09:07:58 +10:00
Lorenc Pekaj
a9f6a09447 add player market description 2018-09-28 07:45:09 +10:00
Lorenc Pekaj
be74b5be2d min buy amount will be .5 ic 2018-09-28 05:39:15 +10:00
Lorenc Pekaj
0831864a2a add player coin market 2018-09-28 05:23:59 +10:00
Lorenc Pekaj
6dbfc1ecfe add system for buying coins and selling coins 2018-09-28 03:51:06 +10:00
Lorenc Pekaj
5be244ea27 begin work on player ic market 2018-09-28 02:52:38 +10:00
Lorenc Pekaj
6d1f4247ef tiny cleanup + update updates.txt 2018-09-26 17:01:34 +10:00
Lorenc Pekaj
2d46306b9a make houses, and shark cards 10% cheaper 2018-09-26 14:16:29 +10:00
Lorenc Pekaj
09d8e0a1c1 fix animation bug 2018-09-26 14:16:15 +10:00
Lorenc Pekaj
4bf6b8f33e introduce OnPlayerFirstSpawn( p ), OnPlayerMoveMode( p, t ) ... move animation to /features/animations.pwn 2018-09-26 14:04:39 +10:00
Steven Howard
b3102535bc Merged master into changes 2018-09-25 22:24:44 +01:00
Steven Howard
04cbc67c6a updating main script from animations changes 2018-09-25 22:24:04 +01:00
Steven Howard
65e0ac30c3 move animations code to module 2018-09-25 22:23:20 +01:00
Steven Howard
7850b215bc dialog based /acmds 2018-09-25 22:06:23 +01:00
Lorenc Pekaj
3bc77224c5 make gold vip 1.8k ic per month ... add custom estate to ic market 2018-09-26 04:09:20 +10:00
Lorenc Pekaj
d0aab3adb6 passive mode green textdraw 2018-09-26 01:52:53 +10:00
Steven Howard
b8df0fc32f Merge branch 'changes' of https://bitbucket.org/lorenc/cnr into changes 2018-09-25 16:30:09 +01:00
Steven Howard
c4a9400601 revet pm messang lengh changes 2018-09-25 16:18:52 +01:00
Steven Howard
aa22ea2c97 Merged master into changes 2018-09-25 16:18:17 +01:00
Steven Howard
1ebbadeeb8 adds /passivelist
adds a textdraw quite like "admon on duty" and it's "Passive Mode"
2018-09-25 16:17:34 +01:00
Lorenc Pekaj
cdfe84671d allow players over the vip limit to utilize their houses/vehicles 2018-09-26 00:23:25 +10:00
Steven Howard
05e994fe46 changed force command errors
changed dialog outputs for /reports and /questons
added /mutelist into a dialog base
2018-09-25 14:58:05 +01:00
Lorenc Pekaj
bd597eb945 remove pool function placeholder 2018-09-25 23:54:59 +10:00
Lorenc Pekaj
3d54f3f266 random msg for stephanie and estate 2018-09-25 23:50:01 +10:00
Lorenc Pekaj
c535ca1796 fix potential sql injection vulernability :O 2018-09-25 23:46:30 +10:00
Lorenc Pekaj
df5038457e fix crowdfund SQL error 2018-09-25 23:36:53 +10:00
Lorenc Pekaj
1c70a050e3 compile error and add back in pool 2018-09-25 23:28:31 +10:00
Lorenc Pekaj
4c93b2e888 include house name in realestate sale 2018-09-25 23:12:41 +10:00
Lorenc Pekaj
28050c0aa6 add /rpmode as /passive alternative 2018-09-25 14:00:37 +10:00
Lorenc Pekaj
039452310d move garage code to module 2018-09-25 13:58:21 +10:00
Lorenc Pekaj
a6a7f00c52 check if player is over slot limit before buying premium home 2018-09-25 13:32:52 +10:00
Lorenc Pekaj
06fd6b742b fix /reconnectchuff 2018-09-25 13:32:36 +10:00
Lorenc Pekaj
5231ca0ac0 update changelog 2018-09-25 12:49:00 +10:00
Steven Howard
f08fcea3d7 Merged in admin-hitmarker (pull request #20)
adds hitmarker while you are spectating a player
2018-09-25 02:44:06 +00:00
Lorenc Pekaj
27e8f154d6 Merged realestate_listings into master 2018-09-25 12:42:45 +10:00
Lorenc Pekaj
57a1db8cd8 move command to /estate for now 2018-09-25 12:42:20 +10:00