Commit Graph

3771 Commits

Author SHA1 Message Date
ebaydayz
207e515e53 Update READMEs 2016-03-14 12:57:19 -04:00
ebaydayz
17134170ea Remove empty optional parameters
AFAIK there is no benefit to including the optional shortcut and
condition parameters as empty strings:
https://community.bistudio.com/wiki/addAction

All the addActions in fn_damageActions do not include them either. I've
run these changes on a live server for a while and never saw a
difference.
2016-03-13 20:15:50 -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
87052a9bf2 Add DZE_MissionLootTable 2016-03-13 15:57:31 -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
0e4ed37218 Remove CfgLootLegacy for now
See discussion at:

8201643c00 (commitcomment-16665467)
2016-03-12 23:19:02 -05:00
ebaydayz
4c6b636bc0 More minor cleanup 2016-03-12 22:40:23 -05:00
ebaydayz
473e1eaedd Minor formatting cleanup 2016-03-12 20:05:36 -05: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
6a2b135ac9 Add 1.0.6 SQL updates 2016-03-10 16:44:28 -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
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
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
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
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
ebaydayz
ca44e9d8b1 Sensible combat log knockout timer
A five minute knockout timer for combat logging is far too long. Most
players will just leave the server and join another. Two and a half
minutes is more bearable.
2016-03-01 17:02:27 -05:00
ebaydayz
44b9b68fd7 Remove 6.Dingor mission
This is identical to the lingor mission. The only change is "ibr_dingor"
added in mission.sqm. Admins can use the lingor files for dingor. The
two maps are the same apart from the desert skin. There are currently no
servers running dingor at the time of writing this.
2016-03-01 16:45:06 -05:00
ebaydayz
e15a913809 Remove 18.Sara mission
This is an exact duplicate of the smd_sahrani_A2 mission. The only
difference is the "oac_core" addon in mission.sqm. That addon is no
longer used in any of the current versions of the map.
2016-03-01 16:19:15 -05:00
ebaydayz
813803cf4b Remove template mission
This is basically a duplicate of Chernarus11. People can use that as a
template.
2016-03-01 14:49:52 -05:00
ebaydayz
ca1a508417 Add old files to TraderCitySources for reference
I put all the old trader city mission.sqf files from
dayz_server\missions\ in the TraderCitySources folder for reference. I
renamed the folders to instanceNumber.mapName to be more organized.
2016-03-01 01:08:23 -05:00