Commit Graph

1747 Commits

Author SHA1 Message Date
ebaydayz
01529e51bc Update shotgun ammo names
See:
634214570c
2016-03-11 14:10:45 -05:00
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
02564a2d30 Move more stuff out of DZE\Misc.hpp
Better organization
2016-03-10 15:44:50 -05:00
ebaydayz
6ca57a099a Move tents to Tent.hpp
This is better organized than having everything in Misc.hpp
2016-03-10 15:02:53 -05:00
ebaydayz
2803847aa0 Remove more unused strings 2016-03-10 14:33:16 -05:00
ebaydayz
18c4c4a203 Misc.hpp formatting
No changes, just removed extra tab.
2016-03-10 13:54:07 -05:00
ebaydayz
b82e256766 CfgMagazines cleanup 2016-03-10 13:52:20 -05:00
ebaydayz
5d2c123b8b CfgAmmo formatting sync 2016-03-10 13:03:54 -05:00
ebaydayz
3d5a8c8b54 Use unmodified 1.8.7 dayz_code stringtable
The only difference between this and the previous version is:
1. Container tags removed
2. Comments added back in
3. str_usract_watch_toggle, str_usract_watch and str_itemwatch are not
commented out. These should not be duplicates if we are using the new
languagecore.xml (according to the comment). If it is a duplicate we
should fix it on 1.8.7 too (after confirming it there).

Using the unmodified file directly from 1.8.7 dayz_code makes it easier
to compare for future updates.
2016-03-09 16:02:10 -05:00
ebaydayz
c9ee0ea64d Fix tab in CfgWorlds.hpp 2016-03-08 19:36:58 -05:00
ebaydayz
a505cb5e54 Move females.hpp to DZE\Females.hpp 2016-03-08 16:51:18 -05:00
ebaydayz
e61eeaca09 Generator_DZ no longer in BuiltItems
Needed to add it to variables.sqf lists.

@icomrade - Any reason FireBarrel_DZ was removed? I think we still need
it, since it is an epoch buildable class, unless we merge it with
Land_Fire_barrel.
2016-03-08 14:26:33 -05:00
ebaydayz
040cce2a27 More cfgVehicles cleanup 2016-03-06 20:02:24 -05:00
icomrade
a551a45092 Duplicates 2016-03-05 22:34:25 -05:00
icomrade
68da397c52 Finish Medical and Sleep to UiSleep 2016-03-05 22:34:25 -05:00
ebaydayz
eadb3566c4 Split hatchback and sedan into separate files
Using 1.8.7 style now. If it was erroring out before it's because Skoda
needed to be defined before hatchback.
2016-03-05 21:04:06 -05:00
icomrade
9d52fb0595 Should be all scope entries 2016-03-05 20:36:07 -05:00
ebaydayz
5cfe47c718 dayz_anim requiredAddon in dayz_sfx
These changes are consistent with the 1.8.7 files.

@icomrade - Why did you change all of the scope = public; to scope = 2;
in dayz_code? They should be identical since that is included in the
basicDefines.hpp above all configs. We should stay consistent with 1.8.7
and use the human readable names if possible.

Also any reason you left out these extra CfgActions?
2016-03-05 18:16:17 -05:00
ebaydayz
155e5e5616 Remove more unused strings
Also add back call to fn_gearMenuChecks
2016-03-05 01:16:30 -05:00
ebaydayz
214a648bc1 Remove unused string and duplicate defines 2016-03-04 22:41:00 -05:00
ebaydayz
28c3f9a937 Remove duplicate and unused includes 2016-03-04 19:21:51 -05:00
icomrade
9863c0765a Pointless merge conflict 2016-03-04 15:23:22 -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
ebaydayz
959507bfc7 Add autorun hotkey
Tested while autorunning:
- getting knocked out
- breaking legs
- running into water
- getting into and out of vehicles
- climbing a ladder
- dying
- antiTP enabled
- running up steep hills
- as player zombie

Everything works as expected. This does allow you to run up and down
pretty steep hills, but if you try to scale something too steep you will
break your legs as expected.
2016-03-01 22:34:36 -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
ebaydayz
075336008e Add files for local trader cities
I've loaded and checked each of these on their respective map in the
editor. I've also tested both Chernarus ones on my test server.
2016-02-29 22:32:16 -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
a47c3dc137 Fixes 2016-02-29 01:20:37 -05:00
icomrade
84eb6f815a Missing Files 2016-02-29 00:55:29 -05:00
icomrade
b96cd2d971 Update compiles - 2 more files to do
fn_selfActions.sqf
player_updateGui.sqf
2016-02-29 00:26:12 -05:00
icomrade
a83909b918 System is done (i think) 2016-02-28 15:28:59 -05:00
icomrade
c034f43d0b Additional Folders/Files in System 2016-02-27 22:34:50 -05:00
icomrade
3ba3781432 Traps and Utill Folders/Files 2016-02-27 22:31:43 -05:00
icomrade
cfbebe7ffd Init more or less done 2016-02-27 22:30:15 -05:00
icomrade
e418e921c5 Compiles more or less done 2016-02-27 16:48:21 -05:00
icomrade
18c9e72e15 Some compiles, start separation of blood system 2016-02-27 09:56:53 -05:00
icomrade
61cbd16de1 Merge remote-tracking branch 'upstream/master' 2016-02-27 09:01:02 -05:00
icomrade
dde3215f9a CFGLoot should be done
Make sure there's no attachments or NEW _DZ weapons that support
attachments!!!!
2016-02-26 11:24:20 -05:00
icomrade
43b9da7c17 I hate loot tables 2016-02-25 13:23:15 -05:00
icomrade
0309e1de40 re-add mil-industrial 2016-02-25 13:08:45 -05:00
icomrade
6c550faf27 move includes to CfgBuildingPos
for consistency with old releases
2016-02-25 11:59:34 -05:00
icomrade
71d045875b BuildingPos Done and Separated/Sorted 2016-02-25 11:43:55 -05:00
icomrade
a118851ca8 Loot Defines done, need to do building loot now
Add legacy loot defines, needs new blood bags if server wants to use
bloodtype system.
2016-02-25 09:49: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