Commit Graph

78 Commits

Author SHA1 Message Date
ebayShopper
4953f33fdb Add configurable loot refresh timer
Vanilla commits:

2eb963dc3f

657aaba83a
2017-11-17 17:47:28 -05:00
ebayShopper
231a9e5d92 Fix floating loot positions in hotel
These were slightly off https://imgur.com/a/CuSV9
2017-11-17 13:31:47 -05:00
ebayShopper
c1110fc61c Fix a rare error with keyboard_keys
Some combo binds will cause actionKeys to return a number greater than
six digits. See AgentRev's note:
https://community.bistudio.com/wiki/actionKeys

An example is NumLock + P [1.15763e+009]. Using a number this large as
an index errors out. Example:
test_array = [];
test_array set [9999991,true];

But six digits or less will not error:
test_array = [];
test_array set [999999,true];
2017-11-13 17:34:43 -05:00
ebayShopper
eefcdf2610 Add basic security checks to object_killed
PVDZ_veh_Save = [_obj,"killed"]; could be abused in the same way as
server_deleteObj (42e0047)
2017-11-13 16:14:22 -05:00
ebayShopper
9574aca91e Change publishVeh2 and 3 to call instead of spawn
Following 95b3174 it is now possible to use call to avoid suspension mid
execution as described in:

https://epochmod.com/forum/topic/43805-epoch-shed_safetyvehiclesqf-issue/?tab=comments#comment-292696
2017-11-11 15:59:23 -05:00
ebayShopper
67f89ceb53 Fix pricing mistake from #1982
Sell price of AKS74U_SD_DZ and AKS74U_Kobra_SD_DZ were wrong, since they
use 545 silencer (3 Goldbar). Sell price of Mosin PU variants was wrong
since it uses SCOPED not PSO attachment. @worldwidesorrow

Also corrected comment, extra Sa58 are camo variants while _DZ variants
are non-camo, so not entirely redundant

Lowered sell price of hemp, since these plants are pretty common. They
are guaranteed spawns In their spawn locations, and you can easily get 5
or more per server restart.
2017-11-10 15:38:31 -05:00
ebayShopper
ac32a8b2cd Configure DZE_SafeZonePosArray by default
Zeds and loot should not spawn in trader cities by default, regardless
of whether the server uses safe zones.

For servers that do not use safezones, the only other things affected
are salvage and instant kill for vehicle explosions in trader cities.
Neither is a significant issue. Most servers use safezones anyway.

Following d750f57, changed to exitWith so the check is only called once
instead of multiple times. Also no need to call again in
zombie_generate, since that function is only called by
building_spawnZombies which already checks it.
2017-11-09 13:52:32 -05:00
ebayShopper
441110d05b Fix wrong bleeding icon on Epoch legacy status UI
Thanks to Epoch forums user Angelone for reporting
2017-11-07 17:24:09 -05:00
ebayShopper
e1b6125761 Fix Javelin selling and _HasKey check again
@oiad Add the Javelin magazine as trade_items to a trader which only
sells magazines (like FriendlyAssaultRifleAmmo) and the Javelin weapon
as trade_weapons to a trader which only sells weapons (like
FriendlyAssaultRifle), then test your changes from f8a230e with both in
your gear. You will see it allows you to sell all the magazines and the
weapon at both traders. This is because the only condition to add the
item to the sellable array is that it exists as an entry in the
category. It never checks the entry type. This commit will check to make
sure the type matches in the config and the player's inventory.

I changed your static "trade_any_vehicle" to find the type in the
config, because it could also be "trade_any_boat/bicycle/vehicle_free".
Boats are handled differently for the hitpoints check in sellItems.sqf.

Also I noticed that both the _HasKey check and your new _y == _myVehType
check were not working for upgraded vehicles _DZE[1-4] because they had
been swapped out to  _baseVehicle. I forgot to account for that when I
added that feature.

This should resolve both problems. I tested both and everything looks
good. It can do with some more thorough testing though. Note
DZE_SaleRequiresKey is false by default.
2017-11-07 16:53:33 -05:00
ebayShopper
f2360a9cd8 Do not use localize on server machine
These were resulting in sloppy mixed language sentences.

The server language never changes, so localize should not be used server
side, unless complete translations are added for all logs, which is not
worth the effort. Only admins see them, unlike client side strings which
are seen by everyone.
2017-11-05 15:05:59 -05:00
ebayShopper
ff397773b1 Update version numbers 2017-11-04 16:14:16 -04:00
ebayShopper
4570c96f7f Update change log 2017-11-03 18:34:14 -04:00
ebayShopper
42e00475d6 Add sender verification to publish and swap object
Continuation of 8035df0

This is important to have on publish to identify cheaters who spam
create objects in the database or create objects with bad inventory.

- Renamed variables to backport to vanilla
- Removed % and & due to code filtering in publicvariableval.txt

Changes in modular_build.sqf were the same as player_build.sqf.

Tested with building, upgrading buildable/vehicle/tent, downgrading,
buying a vehicle, destroying tent and removing an object.
2017-11-03 16:09:14 -04:00
ebayShopper
6e48434001 Lower destroyed vehicle cleanup time to 5 minutes
Update to 78460ce
2017-10-31 14:06:43 -04:00
BigEgg
dc3939fce5 Update Change Log 2017-10-08 00:06:18 -05:00
BigEgg
3521447972 Update Change Log 2017-10-08 00:02:49 -05:00
icomrade
95b3174e04 move SQF wait/loop to get OID to SQL Procedure
for some reason you cannot directly get the OID using SELECT LAST_INSERT_ID(); and you cannot return it within the same hive call as the insert call (????).

Requires new procedure for 1.0.6.2
2017-09-25 12:14:41 -04:00
icomrade
83eb130fd2 add BAF_L85A2_RIS_TWS_DZ #1983 2017-09-19 12:27:33 -04:00
icomrade
b24129afd9 update changelog 2017-09-14 18:24:16 -04:00
icomrade
b8d5c7cda7 Change slow zombie behavior and variable
thanks for the idea DieTanx. note: The only changes to the FSM were in the action field of the UnitReady condition
2017-09-14 12:44:44 -04:00
icomrade
7ae6aa56dd Fix #1981 and Incidental dupe
thanks @AirwavesMan
2017-09-13 14:51:34 -04:00
icomrade
d750f576ed Prevent Zed + loot spawn in safezones
thanks BaroN for the idea
2017-09-13 12:45:00 -04:00
icomrade
e9abd7b161 revise changelog note 2017-09-08 11:29:20 -04:00
oiad
ce756a0622 Allow modular buildables to refund defined parts 2017-09-03 19:13:56 +12:00
ebayShopper
7a68f9f70b Add some basic compatibility for Ruegen map 2017-07-30 16:28:37 -04:00
ebayShopper
84556c9d03 Revert group menu color scheme to A2OA default 2017-07-30 12:44:58 -04:00
icomrade
ff7ec49ac5 make important point 2017-07-26 17:58:02 -04:00
icomrade
73926b8785 prevent logout with d/c #1938
Should work to prevent the issue described in #1938 by disabling the abort option, causing the player to alt + F4 if they want to log out without reconnecting. which results in the gear pile/weaponholder from not being created.
2017-07-26 12:39:37 -04:00
ebayShopper
aab4262ebb Add cleanup of destroyed vehicles and CraterLong 2017-06-24 11:14:39 -04:00
A Man
a7f2c88c32 Fix Corepatch AS50 magazine spawn (#1955)
* Fix Corepatch AS50 magazine spawn

The Corepatch broke some of the AS50 magazine spawns. Im not sure why it happend sometimes and sometimes not.

This message showed up sometimes: No entry 'bin\config.bin/CfgMagazines-5Rnd_127x99_as50_CP'.

The CorePatch use that: 

e0d06f7086/CorePatch_CIT_14888/config.cpp

This commit should fix that error message and the AS50 name as well.

* Define 5Rnd_127x99_as50_CP class

* Update AS50 fix

* Revert AS50 ammo fix
2017-06-24 09:34:53 -04:00
ebayShopper
6fec7bc4a2 Fix short knockouts for tranquilizer bolt
Vanilla commit:

9b5d1409bd
2017-06-23 18:16:57 -04:00
ebayShopper
09b376c584 Fix dramatic recoil camera shake bug
As reported in:

https://epochmod.com/forum/topic/43817-horrible-visual-recoil-bug-since-1061/

Vanilla commit:

1d80da5813
2017-06-11 18:33:25 -04:00
ebayShopper
5864bbcbf8 Readd crossbow reload sound
Vanilla commit:

c4e9b85e7d
2017-06-10 12:09:22 -04:00
ebayShopper
90d84648cd Add CZ550 and Enfield bolt animations by @Streatman
Vanilla commits:

a9dfb45bec

4d4373ba80

8dc4f22346

7fa4ba43fe

d8fd0dd0dc
2017-06-10 09:13:06 -04:00
ebayShopper
72df07bdf2 Remove medic animation from lock and unlock safe
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
2017-06-06 18:53:44 -04:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
icomrade
0b76e73592 update changelog and credits 2017-04-21 13:04:36 -04:00
ebayShopper
3560ac65b7 Allow anyone to lock a door #1944 2017-04-20 14:50:10 -04:00
ebayShopper
78c4ebd597 Add hidden gear display for force saves
Vanilla commits:

a4f8690404

9170e0f8a0
2017-04-17 17:04:17 -04:00
ebayShopper
75a12ad953 Rejoin group after dropping and picking back up radio 2017-04-17 11:49:54 -04:00
ebayShopper
9fc72a8b87 Change dayz_survived to actual play time
Vanilla commits:

18eaecb19f

b76b1200ca

78ea61e334

8309427f0d

Should be ready for Hive update @icomrade . If you upload it to a test
folder I'll test it.
2017-04-13 18:35:28 -04:00
ebayShopper
1065e722a6 Allow removal of RIS from SA58_RIS_DZ
Note RIS can not be removed from higher variants due to other
attachments depending on the RIS being attached first.

Closes #1940
2017-04-12 13:42:39 -04:00
ebayShopper
df526285cd Fix potential undefined dayz_characterID variable on login
The scheduler can start running fn_selfActions before player_monitor.fsm
defines dayz_characterID when login or network return is slow.
2017-04-08 19:19:47 -04:00
ebayShopper
89292b3f37 Correct some waterHole positions for Napf and Namalsk
https://epochmod.com/forum/topic/43623-cant-fill-water-bottles-on-napf/
2017-04-08 16:05:59 -04:00
ebayShopper
4b14397c7b Fix purchased boat not spawning on helipad
https://epochmod.com/forum/topic/43644-problem-with-napf-boat-spawn-in-1061/
2017-04-05 15:49:16 -04:00
ebayShopper
95ab6a28ab Fix unable to sell _DZE1-4 cars when base is removed from trader
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/
2017-04-05 12:04:00 -04:00
ebayShopper
496681cd9b Add support for harvesting added plants
Closes #1928
2017-04-04 13:32:06 -04:00
ebayShopper
107bb6d227 Fix group saving issue 2017-04-01 15:29:12 -04:00
ebayShopper
663170ae32 Remove upgrade option from dayz police car
Also added setvariable.txt exceptions for missing police car hitpoints

Fixes #1929
2017-04-01 13:48:02 -04:00
ebayShopper
3dc71602c0 Fix death message killer inaccurate in some cases 2017-03-31 18:30:39 -04:00