Commit Graph

223 Commits

Author SHA1 Message Date
ebayShopper
21412b74d2 Move ItemKeys back to dayz_code
This reverts commit c4682e5

Fixes #2010
2018-02-06 18:55:35 -05:00
icomrade
c4682e5346 Mitigate PboDLL limitation
this mitigates a newly introduced/reduced limitation on config size/entries when rapying content with Mikero's PBO tools. This issue will unfortunately not be fixed, hence moving keys to Epoch_B
2017-06-18 21:39:22 -04:00
ebaydayz
eda82156be Move CfgServerTrader to dayz_code\configs folder
Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.
2016-04-04 13:10:01 -04:00
ebaydayz
37277613c1 Fix blank remove attachment text M4, M240, L110
Some attachments were using incorrect string names.
2016-04-03 20:16:34 -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
0088b27708 Update weapon classnames 2016-03-31 22:45:59 -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
6de88c7b07 Update some WeaponHolder to WeaponHolderBase 2016-03-31 11:35:33 -04:00
ebaydayz
69091965a1 Merge new MultiPlayerSetup and autojoin 2016-03-30 17:01:28 -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
71b975b05e Actions cleanup 2016-03-29 14:47:28 -04:00
ebaydayz
3ed4a95c14 Rework death messages
MPHit does not always fire when a player is killed:
https://community.bistudio.com/wiki/ArmA_2:_Event_Handlers#MPHit

Using either MPHit or MPKilled is not a good idea here. There is already
a local 'killed' event handler which fires on player death
(player_death.sqf). That script sends a PV (priority message) to the
server which triggers server_playerDied. That means fnc_plyrHit needed
to finish sending its data to the server via public setVariables
(non-priority messages) before server_playerDied executed. Triggering
both these scripts at the same time was a bad idea.

Instead of sending the data to the server via setVariable I just
included it in PVDZ_plr_Death. This also lets us pass extra information
from the damage handler like ammo type, cause of death, etc. Still need
to test, but it should be more reliable and performant than
fnc_playerHit called from MPHit or MPKilled.
2016-03-23 19:52:04 -04:00
ebaydayz
cc64d2e7fb Cleanup player_switchModel 2016-03-21 20:25:01 -04:00
ebaydayz
ef873c2340 Fix player_monitor errors
DayzGearSave is no longer used. I will submit a pull to remove it from
vanilla too.

Player_dumpBackpack is not a good solution to stifle duping. Players can
not see friends backpacks dropped on the ground. That is a problem when
they want to trade backpacks. They don't understand why their friend
can't see it. Also players can still get the "gear" scroll action if
they look where the hidden backpack is.

If it is still a problem after all the updates to current dayz code then
we should submit a pull request with a better solution to vanilla.
2016-03-20 16:09:57 -04:00
ebaydayz
3113889a98 Update fn_selfActions
See also:
https://github.com/DayZMod/DayZ/pull/645
2016-03-15 22:15:38 -04:00
ebaydayz
3cc61bd90a fn_damageActions cleanup
I will merge the refueling into fn_selfActions where it is in 1.8.7.

The_inVehicle block was moved up.
2016-03-13 18:00:53 -04:00
ebaydayz
d9a0c3dd9b Remove <Original> tags
They are not needed. 1.8.7 removed them from their stringtable too.
2016-03-13 15:08:45 -04:00
ebaydayz
8201643c00 Cleanup CfgLoot
There is no point in having CfgBuildingPos.hpp in dayz_epoch_b too. It
was identical to the one in dayz_code and can be included in the mission
from there.

@icomrade couple questions:

1. Why keep a CfgLootLegacy? I know they are very different formats, but
it will just make things messier and more confusing. Also it will be a
PITA to maintain and update two different sets of loot tables in the
long run. I don't think catering to lazy admins is a good enough reason.
It's not that hard to convert to the new format.

2. Why not use the new _DZ weapon classes in the loot tables like
PDW_DZ, AKM_DZ, etc.?

3. Why not use the new box names like DZ_AmmoBoxRU, DZ_AmmoBoxUS,
DZ_MedBox,  etc. in the loot tables?

4. Why remove the attachments from the loot tables?
2016-03-12 17:17:38 -05:00
ebaydayz
6f5591c6f8 Update more ammo names
See:
634214570c

@icomrade - IMO we should use the new blood type system and take out the
config variable. It is not something that can be easily switched between
because it requires manually changing the loot tables and traders which
adds some big files to the mission. Some admins will get confused when
they change the config variable and it doesn't change the loot spawns or
traders.

Admins can make bloodBagONEG abundant on their server if they
don't like it. I think most people will want to use it since it is a
nice extra realism feature and consistent with 1.8.7. We can still leave
the ItemBloodbag class defined in cfgMagazines so admins can go back to
using it if they wish. 1.8.7 even took out the class completely.
2016-03-11 15:15:04 -05:00
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
2803847aa0 Remove more unused strings 2016-03-10 14:33:16 -05:00
ebaydayz
b82e256766 CfgMagazines cleanup 2016-03-10 13:52:20 -05:00
ebaydayz
7a084043c9 Remove duplicate strings
These are in dayz_code now
2016-03-09 20:42:00 -05:00
ebaydayz
8014866119 Remove playerstats package from epoch_b stringtable
This is in the dayz_code stringtable now.
2016-03-09 20:15:21 -05:00
ebaydayz
18606a3721 Remove more unused strings 2016-03-09 19:35:08 -05:00
ebaydayz
c7d263a916 Remove duplicate strings again
These are all duplicates from the dayz_code stringtable.xml. They
accidentally got added back in during the merge conflict resolution.
2016-03-09 17:00:52 -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
fbedaf9b8d Remove merge conflict markers
@icomrade - I'm going to start reviewing and testing the commits you've
done here. I'll commit any fixes and additional 1.8.7 stuff that is
needed to this 1.8.7-Rebase branch. Once we have it in a functional
state we can merge it into master if that's good with you.

Let me know if you are working on any files in particular so we don't
duplicate efforts. I'll be in discord while I'm working here too.
2016-03-04 14:59:12 -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
icomrade
61cbd16de1 Merge remote-tracking branch 'upstream/master' 2016-02-27 09:01:02 -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
Adaptivity
dd40bae42f Russian localization update, safe localization
Fix quotes
2016-02-22 23:50:09 +03:00
icomrade
7f4f17421c one more duplicate string
ArmA 2 OA has some duplicate strings itself
2016-02-22 10:51:03 -05:00
icomrade
1710a87297 Update Stringtable to 1.8.7
stringtable is in DayZ_Code now, Epoch and legacy strings remain in
DayZ_Epoch_b
2016-02-22 10:41:09 -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
icomrade
254fbff602 Fix #1274 2016-02-18 00:24:50 -05:00
ebaydayz
698a50a3ef Merge pull request #1667 from ebaydayz/patch-2
Add strings for sledgehammer crafting fix
2016-02-16 17:36:54 -05:00
ebaydayz
74f06a2562 Fix Russian translation 2016-02-16 15:42:23 -05:00
icomrade
546e59e959 auto login
I hate sitting in the lobby for the full 90 seconds before loading.
- Default login delay is 10 seconds, can be set in the mission
- Players cannot deselect or change character slots
- Players can click OK or disconnect before timeout
2015-12-29 17:59:40 -05:00
ebaydayz
62bf26ace3 Add strings for sledgehammer crafting fix
See https://github.com/vbawol/DayZ-Epoch/pull/1567
2015-07-22 17:00:40 -04:00
Zupa
f701affda8 Merge pull request #1548 from githubmil/master
Fix UAZ Cargo Upgrade & Balance Armor Upgrades & Fix L85A2 Price in config traders.
2015-07-01 23:49:54 +02:00
ebaydayz
0aa91b082f Update version number 2015-04-18 15:32:01 -04:00