Commit Graph

526 Commits

Author SHA1 Message Date
Lorenc Pekaj
e97bcd2c76 Merged master into stockmarket 2018-11-01 17:50:07 +11:00
Lorenc Pekaj
f3afaa9af4 remove some useless hq 2018-11-01 17:49:29 +11:00
Lorenc Pekaj
469e8ac865 stock market edits 2018-11-01 17:48:25 +11:00
Lorenc Pekaj
90cdbd9816 add trade log 2018-10-31 20:05:47 +11:00
Lorenc Pekaj
7645f3f8e8 create two reports by default when a new company is made 2018-10-31 19:04:59 +11:00
Lorenc Pekaj
8ad01c0b0f crushing ores at alca contributes to mining company 2018-10-31 19:03:24 +11:00
Lorenc Pekaj
2ad6e41dd8 add trading fee 2018-10-31 19:01:35 +11:00
Lorenc Pekaj
4cb9be95fb fix some dividend pool issue 2018-10-31 18:34:50 +11:00
Lorenc Pekaj
ae01993db4 - add sell feature
- add basic pricing mechanism
2018-10-31 18:19:18 +11:00
Lorenc Pekaj
c616c94359 dividend payout implementation 2018-10-31 09:42:10 +11:00
Lorenc Pekaj
d03591a9a2 move bot attack code into its own module 2018-10-29 02:12:09 +11:00
Lorenc Pekaj
e74c80e5c5 bot-attack-module 2018-10-29 01:43:35 +11:00
Lorenc Pekaj
68fc7ad263 add mining stock 2018-10-28 22:34:48 +11:00
Lorenc Pekaj
1d99d05bcb add buy slip functionality with initial market maker ... work on /shares 2018-10-26 11:44:45 +11:00
Lorenc Pekaj
8d8fdc1392 use float for prices, reduce data redundancy 2018-10-26 04:58:12 +11:00
Lorenc Pekaj
b1847fffdf begin base for price of stocks 2018-10-25 08:32:18 +11:00
Lorenc Pekaj
8777a286a0 begin stock market 2018-10-25 01:19:48 +11:00
Lorenc Pekaj
de6b8849f0 vip note user id fix 2018-10-24 22:07:28 +11:00
Lorenc Pekaj
5fd32db86e fix color issue w vip 2018-10-23 00:44:57 +11:00
Lorenc Pekaj
ce81b6917c edit vip description 2018-10-22 23:44:59 +11:00
Lorenc Pekaj
e3a0f389fd adjust /vip 2018-10-22 22:35:55 +11:00
Lorenc Pekaj
050ba05cf2 legacy VIP system implement 2018-10-22 21:50:11 +11:00
Lorenc Pekaj
b80202334f cannot use bank terminal if bank has been robbed 2018-10-22 19:06:18 +11:00
Lorenc Pekaj
9800b8f007 remove help dialog when a player spawns ... fix issue with supa not hiding help dialog 2018-10-22 18:33:10 +11:00
Lorenc Pekaj
a0016cd039 fix biz prod bug... http://forum.sfcnr.com/showthread.php?60820-b-production 2018-10-22 17:29:38 +11:00
Lorenc Pekaj
9626ab84dd fix class selection textdraw issue 2018-10-22 17:11:12 +11:00
Lorenc Pekaj
45b73b7311 index out of bounds fix for npcs 2018-10-22 00:35:40 +11:00
Lorenc Pekaj
a64c916637 prevent NPCs from continuing with OnPlayerSpawn 2018-10-22 00:32:10 +11:00
Lorenc Pekaj
98941bbc7f move furniture code to furniture module 2018-10-17 04:34:29 +11:00
Lorenc Pekaj
13ddbb675c move load apt code to apartment module 2018-10-17 04:31:18 +11:00
Lorenc Pekaj
2a90d06d90 move some weapon drop modules 2018-10-17 04:28:47 +11:00
Lorenc Pekaj
0836381de9 update wanted level module description 2018-10-17 04:24:32 +11:00
Lorenc Pekaj
23e21bc109 add car particle spam and player pickup spam into anticheat modules 2018-10-17 04:20:16 +11:00
Lorenc Pekaj
857cff5e7e move hotel da novic into its own module 2018-10-17 03:58:05 +11:00
Lorenc Pekaj
f6d9d7c683 fix static includes 2018-10-17 03:34:59 +11:00
Lorenc Pekaj
32746cdd20 module for static map icons 2018-10-17 03:33:27 +11:00
Lorenc Pekaj
eda738d00e move more server settings to config/server.pwn 2018-10-17 03:28:19 +11:00
Lorenc Pekaj
3955ed0982 move gate code to gate module 2018-10-17 03:22:15 +11:00
Lorenc Pekaj
84c6e464f5 move class information into classes.pwn 2018-10-17 03:20:47 +11:00
Lorenc Pekaj
e6b7d0ec23 moved more irresisitble guard code and gang code to modules 2018-10-17 02:59:36 +11:00
Lorenc Pekaj
df49d0abf7 move gate system into module 2018-10-17 02:43:33 +11:00
Lorenc Pekaj
a9e9ac28b2 move race into its own module 2018-10-17 02:29:16 +11:00
Lorenc Pekaj
86a501d4fb move more gang code into their modules 2018-10-17 02:20:20 +11:00
Lorenc Pekaj
c7a50b8ae7 move progress bars into appropriate modules 2018-10-17 01:52:12 +11:00
Lorenc Pekaj
4eb8095f34 notify player if his weed gets stolen 2018-10-17 00:57:16 +11:00
Lorenc Pekaj
13e687fdef improve raising of weed ... no more creating near other weed ... add vip increased planting limits 2018-10-17 00:53:46 +11:00
Lorenc Pekaj
d474159c05 give wanted when they plant 2018-10-16 21:38:26 +11:00
Lorenc Pekaj
62fbc7f1c2 increase drug house and militia pay 2018-10-16 21:26:19 +11:00
Lorenc Pekaj
b49b074eb4 adjust offset for weed plant 2018-10-16 21:25:21 +11:00
Lorenc Pekaj
4ec8229157 adds a new weed system, where you buy seeds from supa ... then /weed plant. LALT to collect the plant 2018-10-16 21:02:36 +11:00
Lorenc Pekaj
cc05a872a8 add roadblocks module 2018-10-16 01:54:39 +11:00
Lorenc Pekaj
1a24034b05 damage feed object only shown if player is not in a vehicle 2018-10-16 01:39:08 +11:00
Lorenc Pekaj
139b335ba3 world/int check ... remove vip for /dm 2018-10-15 21:31:45 +11:00
Lorenc Pekaj
9fd63b70c1 2000 per facility spawn 2018-10-15 21:28:26 +11:00
Lorenc Pekaj
60df8738df sync refilled health bugfix 2018-10-15 21:28:05 +11:00
Lorenc Pekaj
e054a62b22 show player money bags that are intentionally dropped 2018-10-15 19:50:58 +11:00
Lorenc Pekaj
c41eb323cd fix bug with kicked paintball players droppin money 2018-10-15 19:49:48 +11:00
Lorenc Pekaj
b2c10884e8 bug fixes with sync 2018-10-15 18:11:20 +11:00
Lorenc Pekaj
9c743d49fb fix critical issue with ic buy 2018-10-15 17:08:52 +11:00
Lorenc Pekaj
b11ea31fb5 type ALL/MAX in bank depo/withdraw/ic buy and it will do the maximum amount possible. IC sold goes straight to your bank account. 2018-10-15 16:46:26 +11:00
Lorenc Pekaj
0d12721a24 3 minute passive mode 2018-10-15 16:15:33 +11:00
Lorenc Pekaj
c5a62d5eaa add /moneybags ... player can create >25k announced money bags around the map. passive players cannot see pickups ... only their own money drops 2018-10-15 16:15:18 +11:00
Lorenc Pekaj
08474974bf wanted level in module and hooked functions (completely server sided). You can use GetPlayerWantedLevel, SetPlayerWantedLevel or GivePlayerWantedLevel 2018-10-15 15:19:36 +11:00
Lorenc Pekaj
68a890d747 no keystate for /s ... fixed so previous weapons are given back ... added cooldown as well 2018-10-15 15:18:42 +11:00
Steven Howard
b9edc6add6 Merged in sync (pull request #32)
Sync
2018-10-15 03:28:33 +00:00
Lorenc Pekaj
5fe4f61740 fix random armour drop 2018-10-14 23:43:58 +11:00
Steven Howard
f1ee0e9968 adds wanted levels to sync 2018-10-14 13:02:49 +01:00
Steven Howard
ddbab0f803 Merged master into sync 2018-10-14 09:56:22 +01:00
Steven Howard
2dc9ea5335 vehicle jacking your own vehicle fix 2018-10-14 09:53:49 +01:00
Steven Howard
6dc23cb749 sync system
/s - /sync or ( SPACE & RIGHT CLICK )
2018-10-14 09:51:07 +01:00
Lorenc Pekaj
7c325bb6eb money dropped in pb 2018-10-14 19:39:53 +11:00
Lorenc Pekaj
17ee715b56 bobby pin reduction 2018-10-14 19:28:29 +11:00
Lorenc Pekaj
f0b62b37ab returning all of the changes i accidentally removed :( 2018-10-14 17:28:52 +11:00
Lorenc Pekaj
75fb809124 fix atm in facility issue 2018-10-14 16:24:58 +11:00
Lorenc Pekaj
02974924f4 Merge branch 'moneygrub' of ssh://bitbucket.org/lorenc/cnr into moneygrub 2018-10-14 16:12:24 +11:00
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
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
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
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
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
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
Steven Howard
e33c2c3efb adds a option to preview a garage component before buying 2018-10-08 22:41:29 +01:00
Steven Howard
108fc055a6 adds /smoke into animations 2018-10-08 20:53:05 +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
4412650371 vehicle dealership spawn location fixes 2018-10-08 13:31:44 +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
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
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
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
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
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
0dc80c7bc0 update vip description 2018-09-29 21:23:22 +10:00
Lorenc Pekaj
6c0ae4134c add progress bar to experience 2018-09-29 19:25:39 +10:00