Commit Graph

731 Commits

Author SHA1 Message Date
Lorenc Pekaj
cc621872c4 remove paramedic and make specific items a minijob (e.g healing in truck/spraycan) 2018-11-24 03:03:45 +11:00
Lorenc Pekaj
27cfffbd77 replace a few criminal jobs with mugger 2018-11-24 02:41:15 +11:00
Steven Howard
5b3b3e4af3 Merged in bugs (pull request #34)
fixes a critical bug with hardpoints, it would restore players health everytime they enter zone
2018-11-22 15:32:36 +00:00
Lorenc Pekaj
fc5d8d086e undercover acc and object update 2018-11-23 01:57:25 +11:00
Steven Howard
633eaa19c8 fixes a critical bug with hardpoints, it would restore players health everytime they enter zone 2018-11-21 21:07:26 +00:00
Lorenc Pekaj
158890715f turf location relocations 2018-11-18 22:41:56 +11:00
Lorenc Pekaj
951a348c44 do not credit free vips assets 2018-11-18 22:41:41 +11:00
Lorenc Pekaj
1f3c3f4f8c add more turfs, number on turfs too (https://forum.sa-mp.com/showthread.php?t=649230), auto disable spawn protection on enter hardpoint 2018-11-18 20:57:12 +11:00
Lorenc Pekaj
42b7c5e87c increase gang vehicle limit, decrease gang vehicle spawn time to 3 min 2018-11-18 20:56:28 +11:00
Lorenc Pekaj
36fa43ff1e aod not counted as a person that can takeover 2018-11-15 01:11:44 +11:00
Lorenc Pekaj
fd8d9655db fix race issue with selecting new leader 2018-11-13 16:06:14 +11:00
Lorenc Pekaj
81f3e5a768 alert passive player he cannot pick up dropped weapons 2018-11-13 16:05:58 +11:00
Lorenc Pekaj
5f12c4a15e force sale the inactive player's stocks 2018-11-11 12:58:57 +11:00
Lorenc Pekaj
8a94df6036 alcatraz fix 2018-11-11 12:42:42 +11:00
Lorenc Pekaj
6db949a51f reduce hardpoint pay 25% 2018-11-11 12:38:26 +11:00
Lorenc Pekaj
99f98a2101 raise max market cap on stocks 2018-11-11 12:29:41 +11:00
Steven Howard
50567719f1 Merged in bugs (pull request #33)
Bugs
2018-11-10 16:21:40 +00:00
Steven Howard
d5236f4bb8 pilot difficulty "hard" should only give wanted level. 2018-11-10 11:32:01 +00:00
Steven Howard
1694d90a14 business production dialogue addiction of bank balance 2018-11-10 11:30:22 +00:00
Steven Howard
1815e6323b fireman cannot use /loc anymore 2018-11-10 11:24:44 +00:00
Steven Howard
8f6621524b playing hitmarker sound when player is spectating 2018-11-10 10:17:08 +00:00
Steven Howard
7197c3289b passive players will not be able to pick up weapon, ammo and money drops. 2018-11-10 09:56:47 +00:00
Lorenc Pekaj
43974bf30c cannon will kill people on a hill too (up to 20 m below target area) 2018-11-10 19:39:22 +11:00
Lorenc Pekaj
2f6202a4a0 maximum player can drop is $25K 2018-11-10 18:02:57 +11:00
Lorenc Pekaj
821c034e7d fix race outrun sync 2018-11-10 18:00:10 +11:00
Lorenc Pekaj
810af12771 use average player count for potential winnings and show map icon 2018-11-10 17:57:54 +11:00
Lorenc Pekaj
f406fb5139 veh dealership mcap increase 2018-11-10 14:46:05 +11:00
Lorenc Pekaj
dfbd7eb780 fix gang vehicles 2018-11-10 14:44:23 +11:00
Lorenc Pekaj
67e0d99db7 hardpoint 2018-11-10 14:44:16 +11:00
Steven Howard
ddd1cf38e8 jaillist fix 2018-11-09 19:37:08 +00:00
Steven Howard
f3544de066 cutting spectation when player dies has been removed. 2018-11-09 19:36:52 +00:00
Steven Howard
632ddd1e2c wanted level when killing in duel change 2018-11-09 19:18:14 +00:00
Lorenc Pekaj
8f8c7bfe0f initial hardpoint beta 2018-11-10 03:02:14 +11:00
Lorenc Pekaj
32e8e45d4b fix possible shares issue 2018-11-09 18:52:48 +11:00
Lorenc Pekaj
7dc93e5023 fix reward point issue 2018-11-09 18:50:58 +11:00
Lorenc Pekaj
d83e0c3120 modulize the rewards point system 2018-11-09 18:33:38 +11:00
Lorenc Pekaj
da98f1c20a address issue with bank hiest available in random shops 2018-11-09 17:49:38 +11:00
Lorenc Pekaj
9e70458953 allow only gang leaders to mod gang vehicles 2018-11-09 15:46:03 +11:00
Lorenc Pekaj
6a0ab57505 prevent occupied gang vehicle from being spawned 2018-11-09 15:45:07 +11:00
Lorenc Pekaj
65dd9d68d0 remove debug statement 2018-11-09 15:32:29 +11:00
Lorenc Pekaj
286d6b6332 remove pool debug msg 2018-11-09 15:31:29 +11:00
Lorenc Pekaj
d269546bbf fix visage apartment ownership transfer 2018-11-09 15:31:02 +11:00
Lorenc Pekaj
13331cc67d fix styling with vd dialog 2018-11-09 15:28:35 +11:00
Lorenc Pekaj
78addfe4e2 increase vehicle dealership price 2018-11-09 15:16:50 +11:00
Lorenc Pekaj
61519f8370 little cleanup 2018-11-09 15:16:41 +11:00
Lorenc Pekaj
732d7a7e92 add buying/selling/mod updating/spawning vehicle in facility 2018-11-09 15:04:38 +11:00
Lorenc Pekaj
8156e1749e add mechanic into the facilities with a checkpoint 2018-11-08 22:57:02 +11:00
Lorenc Pekaj
3947176508 init 2018-11-08 21:34:54 +11:00
Lorenc Pekaj
2edbc681b6 delete useless stock module 2018-11-08 21:09:31 +11:00
Lorenc Pekaj
5987d60fff use physics_dynamic.inc for pool (https://github.com/zeelorenc/Object-Physics) - support multiple interiors 2018-11-08 18:20:40 +11:00
Lorenc Pekaj
7b4cd776de update $ET description 2018-11-08 12:11:50 +11:00
Lorenc Pekaj
ec431ad43a add pilot stock 2018-11-07 19:51:46 +11:00
Lorenc Pekaj
5ed2066e42 fix season rank in stats 2018-11-07 19:24:24 +11:00
Lorenc Pekaj
aafb6f4e33 undercover account ids updated 2018-11-07 19:24:14 +11:00
Lorenc Pekaj
43e5b8bd7e users can now donate to stocks to prop them out (25% taxed) 2018-11-07 19:24:00 +11:00
Lorenc Pekaj
d9ce70f323 if max shares are increased from the IPO, it will be factored into the price 2018-11-07 18:10:36 +11:00
Lorenc Pekaj
78a597d606 fix market cap issue 2018-11-07 12:21:47 +11:00
Lorenc Pekaj
c4542f41aa Increase dividends for casino and government by a bit 2018-11-07 12:15:30 +11:00
Lorenc Pekaj
ea6dce5a41 show shares in sell orders (/shares) and cancel thru that command 2018-11-07 12:07:12 +11:00
Lorenc Pekaj
d4c03f4119 use huge string for shareholders 2018-11-06 15:40:20 +11:00
Lorenc Pekaj
349a8e4a27 show shareholders of stock 2018-11-06 15:24:24 +11:00
Lorenc Pekaj
caeae457ac reduce the floor of stock prices significantly 2018-11-06 14:02:11 +11:00
Lorenc Pekaj
6a297cd163 increase casino shareholding earnings by a bit ... and exaggerate their price factor for every 100k earnings 2018-11-06 13:52:23 +11:00
Lorenc Pekaj
54b05cf011 do not place random hits on passive players 2018-11-06 13:40:00 +11:00
Lorenc Pekaj
1139f4e92e disable /sync in passive mode 2018-11-05 10:49:23 +11:00
Lorenc Pekaj
b09f52b4fb fix potential market issues with selling while not logged in 2018-11-05 10:33:37 +11:00
Lorenc Pekaj
baed9eb28c Add government and casino stocks. 2018-11-05 10:23:38 +11:00
Lorenc Pekaj
f503224775 fireworks and explosive rounds available at supa/ammunation 2018-11-04 19:24:55 +11:00
Lorenc Pekaj
c836d256b1 server maintainers ignored in kickall 2018-11-03 16:26:40 +11:00
Lorenc Pekaj
e2837265a9 Pawn store stock for burglars 2018-11-03 16:21:56 +11:00
Lorenc Pekaj
6e54f16ed6 add veh dealership, trucking company, cluckin bell stocks 2018-11-03 16:06:58 +11:00
Lorenc Pekaj
89bc99d7d5 remove ploughs 2018-11-03 16:04:28 +11:00
Lorenc Pekaj
75e4ead544 add ammunation company and fix a lot of stock market related bugs 2018-11-02 09:57:08 +11:00
Lorenc Pekaj
b1da73f99f prefix fix for number_format 2018-11-02 09:52:23 +11:00
Lorenc Pekaj
3fcf35fc9a fix potential mining bug that allowed mining two rocks at a time? 2018-11-02 09:52:13 +11:00
Lorenc Pekaj
cb6c7475a5 drop only 10% of players wealth 2018-11-01 21:58:24 +11:00
Lorenc Pekaj
c964914a97 Add ammu-nation stock (reliant on ammu sales) 2018-11-01 21:55:21 +11:00
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
ee1e436258 remove debug 2018-10-29 02:13:47 +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
2901c315c5 move some vipgun checks so that armour has them 2018-10-22 21:51:32 +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
3c477431dc explosive round key modified 2018-10-16 01:38:02 +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
b43c12fa3b string overflow on stats dialog fixed 2018-10-15 16:52:21 +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
ee20816ebf lil cleanup 2018-10-15 16:15:40 +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
a1ed07c8e3 max 10 users per ip 2018-10-15 14:27:59 +11: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
Lorenc Pekaj
0009c38ffc Type MAX/ALL in the deposit/withdraw to all 2018-10-14 20:15:28 +11: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
0c467299d4 move dispose weapon to weapon_drop 2018-10-14 16:12:00 +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
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