Commit Graph

389 Commits

Author SHA1 Message Date
ebaydayz
09b656abc3 Use 1.8.7 fishing
The fishing models, pictures, etc. in 1.8.7 are identical to the ones in
dayz_epoch, so we should use them instead of having duplicate classes.
2016-03-10 22:30:19 -05:00
ebaydayz
2803847aa0 Remove more unused strings 2016-03-10 14:33:16 -05:00
icomrade
68da397c52 Finish Medical and Sleep to UiSleep 2016-03-05 22:34:25 -05:00
ebaydayz
732c2fe5a0 Cleanup some merge conflicts 2016-03-04 14:29:49 -05:00
icomrade
61c64cb14a Fix Merge Conflict 1 2016-03-03 22:09:38 -05:00
ebaydayz
479097e7a8 1.8.7 player_switchWeapon updates 2016-03-03 21:31:32 -05:00
ebaydayz
e660704f97 Add journal and preliminary strings for crafting
The journal is now functional. Preliminary strings are added for the
1.8.7 crafting system, but it is disabled for now.

I've messaged @marceldev89 (ziellos2k) and @AlbyBDPK on the DayZ forums
to ask permission to use fn_updateCraftUI, player_checkRecipe and
player_craftItemGUI. Are you guys okay with us including these in DayZ
Epoch 1.0.6?
2016-03-03 20:11:11 -05:00
ebaydayz
585841a3ad Fix snap build errors
@raymix in most of your helper functions you are using exitWith {}; in
the same way the main player_build uses it. The problem is exitWith
inside of a called function only exits that function, not the parent
script it was called from.

When a helper function exits the main script continues on with undefined
variables and other problems. The easiest solution was to just remove
these helper functions for now. I just directly substituted their code
back into the main modular_build file and removed the passes to and from
them.

We should consolidate player_build and modular_build into one file first
since they are about 80% identical. After that we need to integrate
plot4life. Dividing player_build up into smaller sub functions like this
can be left for last.

I tested this thoroughly and can confirm the undefined errors are fixed
now.
2016-03-02 22:16:07 -05:00
ebaydayz
78e193d7c4 Fix DZE_BuildLimit check
NearObjects "All" counts things like local plot markers, weapon holders,
ambient life, etc. We only want to count buildables. The radius should
also start at the plot pole if available, not the player position.

Thanks to Epoch forums user jOoPs for pointing this out. I will fix this
in modular_build.sqf too.

Tested and confirmed working.
2016-03-02 17:03:47 -05:00
icomrade
bad0a2e461 add 2 new vars and fix up variable names
DZE_HeartBeat
DZE_UseBloodTypes
2016-03-01 00:23:14 -05:00
icomrade
a3dac45061 Some small changes 2016-02-29 11:53:49 -05:00
icomrade
b667d01c1c Actions Done 2016-02-29 10:45:53 -05:00
icomrade
84eb6f815a Missing Files 2016-02-29 00:55:29 -05:00
ebaydayz
03353b9483 Add lock and unlock vehicle from inside
See: #1103
Made vehicle gear always accessible from inside.

Also added optional variable to prevent stealing from backpacks by
non-friendlies at traders.  Thanks to @maca134 for the method.
2016-02-24 20:56:13 -05:00
ebaydayz
9bbeb1e43e Use nearEntities for empty drivable vehicles
NearEntities is faster and works fine for empty drivable vehicles that
are not destroyed.
2016-02-22 16:52:39 -05:00
ebaydayz
0075b44c0e Add option to restrict wearable clothes
See #1560

Note: Already wearing check is not needed in player_humanityMorph
because it is already done in player_wearClothes. See:

0726311df5
2016-02-20 22:08:20 -05:00
ebaydayz
174e11dfdb Remove unused string from #1313 2016-02-19 17:52:24 -05:00
ebaydayz
9d1185409c Fix combine mags not working for M1911 and Revolver
See #1313
2016-02-19 17:37:52 -05:00
ebaydayz
fd78f27250 Fix copy key failing when player has no backpack
Related to #1567, so I made this a function so it can be reused. People
should call this whenever they are adding a toolbelt item which the
player may already have. It has localized strings and handles spawning
the weapon holder on water, land and rooftop.

Tested both the sledgehammer and key copying. Confirmed all three
conditions are working.
2016-02-18 22:12:13 -05:00
ebaydayz
65c2a7e6b4 Fix opening supply crate over water
See #1558
2016-02-18 19:38:23 -05:00
icomrade
277d87fa3b Some more position fixes 2016-02-18 09:16:20 -05:00
icomrade
ecea4662fb Math is hard 2016-02-18 00:45:15 -05:00
icomrade
254fbff602 Fix #1274 2016-02-18 00:24:50 -05:00
icomrade
e2b47f2459 Fix #1313 2016-02-18 00:14:10 -05:00
icomrade
e423c81483 needs testing, but should fix #1558 2016-02-17 22:58:08 -05:00
icomrade
7151e455c9 Should Fix #1559 2016-02-17 22:48:31 -05:00
icomrade
c039644745 Undefined Var 2016-02-17 15:14:41 -05:00
icomrade
c3ed4e49e1 Replace sleep with uiSleep
see the below links for more info. uiSleep is based off of a more
accurate method of tracking time, whereas sleep can fluctuate depending
on application performance since it is based on framerate.
https://community.bistudio.com/wiki/uiSleep
https://community.bistudio.com/wiki/sleep_vs_uiSleep
https://community.bistudio.com/wiki/sleep
2016-02-17 13:03:17 -05:00
ebaydayz
441e9fb231 Update keyboard eventhandler and add rules.sqf
See: https://github.com/EpochModTeam/DayZ-Epoch/pull/1673
2016-02-16 21:59:29 -05:00
ebaydayz
1ade44eb35 Fix for crafting multiple SledgeHammers
Revision of https://github.com/EpochModTeam/DayZ-Epoch/pull/1567

Thanks @Namindu
2016-02-16 17:23:57 -05:00
ebaydayz
7151f6859f Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all the stary and base traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:13:08 -05:00
vbawol
211a74a645 Merge pull request #1540 from deadeye2/patch-2
Update player_drink.sqf
2015-01-18 00:32:38 -06:00
vbawol
a5e8aae13b Merge pull request #1539 from deadeye2/patch-1
undefined variable _itemtodrop     fixes #1535
2015-01-18 00:31:54 -06:00
raymix
d59c5b8278 rare bug 2014-08-30 12:55:58 +01:00
raymix
efca644b46 fix for db ATL limitation 2014-08-23 19:02:49 +01:00
raymix
903f5d8572 code optimization, bugs, improvements 2014-08-21 06:23:42 +01:00
deadeye2
5b4d53d3b9 Update player_drink.sqf
eliminate redundant declaring of _itemtodrop and change to match player_eat.sqf
2014-08-20 19:58:43 -04:00
deadeye2
e4982dc313 fixes #1535
After eating in a vehicle that should drop an empty can, client RPT would show:

Error Undefined variable in expression: _itemtodrop
2014-08-20 19:41:06 -04:00
raymix
1c4be9a043 Merge remote-tracking branch 'upstream/master' 2014-08-18 04:08:14 +01:00
raymix
34a2d03163 compatibility for issue 1526 45m plotpole 2014-08-18 04:03:11 +01:00
vbawol
fe5af9425a Merge pull request #1526 from Mikeeeyy/patch-4
Update cannot build plot pole within 45m.
2014-08-17 14:02:09 -05:00
raymix
c66b229a96 modular build code optimization + some extras 2014-08-15 05:40:26 +01:00
Mikeeeyy
49fe5f4846 Update cannot build plot pole within 45m.
Updates the cannot build plot pole within 45m message to use the DZE_PlotPole variable.
2014-08-15 00:10:24 +01:00
Marko
64d9be9169 Update player_goFishing.sqf
Added better message when trying to fish while in combat, to avoid confusion.
2014-08-09 11:41:43 +02:00
raymix
176c0372b4 bug fix & adjustable snap range 2014-08-08 13:30:25 +01:00
raymix
361ab3a3e5 function based player_build 2014-08-07 13:03:14 +01:00
ebaydayz
0111a8f580 Change count back to forEach
You can not nest count loops inside other count loops:
https://community.bistudio.com/wiki/Code_Optimisation#forEach_vs_count
2014-07-31 13:14:10 -04:00
Mikeeeyy
a4ade23086 Update dayz_spaceInterrupt.sqf
Changed starts at line 87 and end at line 93.
Fix for glitching through doors.
2014-07-29 17:47:29 +01:00
vbawol
c479fe45f3 Merge pull request #1452 from Markokil321/patch-2
Update player_build.sqf
2014-07-25 16:02:32 -05:00
Marko
f1b3104e1e Update player_build2.sqf
Would this work for adding built item code into systemchat? This way people can PageUp to view it, even after its gone from the screen.
2014-07-25 00:37:12 +02:00