Commit Graph

769 Commits

Author SHA1 Message Date
ebaydayz
5308445f4c Update vanilla player_mineStone 2016-04-19 17:01:07 -04:00
ebaydayz
f0c46a0764 Use Epoch player_harvest instead of player_chopWood 2016-04-19 16:51:20 -04:00
ebaydayz
4d5dc060d2 Fix tame_dog errors
Tame_dog_old and player_tameDog are not used.
2016-04-18 21:49:27 -04:00
ebaydayz
11741fa710 Update player_tameDog raw meat names 2016-04-18 13:36:09 -04:00
ebaydayz
d46eb13267 Fix redirect to vanilla player_craftItem 2016-04-17 22:51:10 -04:00
ebaydayz
59a4459809 Fix spawn marker count for non-cherno maps 2016-04-17 15:32:47 -04:00
ebaydayz
3c4e1fa5a2 Add handling of multiline messages for now
Eventually dayz_rollingMessages will be updated to use cutRsc instead of
titleText.
2016-04-16 19:33:29 -04:00
ebaydayz
5157228e67 Update all cutText to dayz_rollingMessages 2016-04-16 15:47:49 -04:00
ebaydayz
577892c40e Roll back to old dayz_objectUID2
1.8.7 dayz_objectUID2 seems to generate keys that are too long for the
Epoch hive. So, we will keep the old method for now.
2016-04-13 18:41:36 -04:00
ebaydayz
652ca51c2c Update combattimeout from time to diag_tickTime
Also organized change log
2016-04-12 21:04:17 -04:00
ebaydayz
27d57283a0 Fix server position sync after knockout
All DayZ Mod Development commits since 1.8.7 release (Jan. 24) have now
been applied.
2016-04-12 14:51:22 -04:00
ebaydayz
4a07b7cc7a Add extra Epoch trucks to salvage vehicle 2016-04-11 21:06:46 -04:00
ebaydayz
7732481a8d Add new items to R3F weight config
I split CfgWeight into separate files to make it more readable.
2016-04-07 18:42:44 -04:00
ebaydayz
666ace6d54 Cleanup duplicate and unused strings
Cargo count is shown at the top of the gear menu now
2016-04-04 16:58:59 -04:00
ebaydayz
e69364991c New config variable dayz_toolBreaking
Tool breaking is disabled by default.

Also made all scripts use Epoch sledge, which is a different model from
vanilla sledge.

PK_DZ was a duplicate of the new PKM_DZ.
2016-04-03 16:34:14 -04:00
ebaydayz
4ce54fbb62 Update server_publishObject
The hive call in server_publishObject is the same between vanilla and
Epoch. The only difference is vanilla uses the _inventory area for
owner, lock code, etc. variables where as modular Epoch items just store
an empty array there.

The object classname does not need to be sent in the PV because it can
be obtained on the server.

PVDZE_veh_Publish was not used.
2016-04-02 15:24:20 -04:00
ebaydayz
8de50c4619 New variable for match stick counting 2016-03-31 16:23:09 -04:00
ebaydayz
d926a81038 Remove Hatchet_DZE
The two items are 100% identical now. There is no need to have a
separate class for it anymore.
2016-03-31 15:44:23 -04:00
ebaydayz
3f6cd7de42 Fix some errors 2016-03-31 14:45:13 -04:00
ebaydayz
c54a52a103 Merge selfbloodbag and self_transfuse 2016-03-30 20:50:06 -04:00
ebaydayz
77e760fe73 Update private tags
From
e69f8d5306

Moved dog files to the \dog\ folder and pzombie files to the \pzombie\
folder. Also removed some legacy files that are no longer used.

The actions\ and compile\ folders are fully up to date now
2016-03-30 14:55:45 -04:00
ebaydayz
91f9b3e33b Make UI toggleable between three options
Admin can choose vanilla, classic epoch or classic epoch dark.

dayz_hungerThirst was replaced with dayz_NutritionSystem
2016-03-29 19:54:19 -04:00
ebaydayz
71b975b05e Actions cleanup 2016-03-29 14:47:28 -04:00
ebaydayz
e1a0bfebc1 Update inits 2016-03-27 23:47:30 -04:00
ebaydayz
8c7a7429af Remove unused PVEH
I'm guessing the 1 in place of I in the PV names was intentional to work
around some BE filter. If not, it should be changed in vanilla.
2016-03-24 19:56:17 -04:00
ebaydayz
ee13f4caf7 Remove friendlySaving for now
Achievements are saved in the state field, so we don't have room to save
friendlies there anymore. DZE_FriendlySaving is removed for now. I will
add it back later with a save to player profile instead.

The dayz_players variable is not used for anything. There were several
other unused variables in server_playerLogin.sqf.
2016-03-24 17:04:17 -04:00
ebaydayz
e2e6e79394 Minor formatting cleanup 2016-03-21 17:58:23 -04:00
ebaydayz
f0757b1544 Send dayz_playerName as array
This avoids triggering PV value restrictions when the player has
keywords or special characters in their name.
2016-03-20 22:12:11 -04:00
ebaydayz
4bd9a9aa0b Update public variables
It makes no sense to rename the identical DayZ PVs to have an E in their
name. I don't see any good reason it was done in the first place. All it
accomplishes is breaking script compatibility between the two mods and
requiring different publicvariable.txt filters. The only time it makes
sense is for custom Epoch variables that aren't used in vanilla.

All admins have to do to update custom scripts is swap the names
according to the change log.

Note I've submitted a pull request to replace PVDZ_veh_Save with
PVDZ_obj_Save in official too because they are duplicates.
2016-03-18 21:39:22 -04:00
ebaydayz
6a6db58291 Compiles.sqf cleanup
- Moved player_countMagazines to \compile\ folder
- Removed several unused and obsolete files
- Moved some epoch functions out of compiles.sqf into individual files
- Synced order and formatting with 1.8.7. Much easier to compare now.

Any changes I make to official DayZ Mod code and files I also submit as
a pull request to them.
2016-03-17 16:34:15 -04: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
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