Commit Graph
100 Commits
Author SHA1 Message Date
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 3d4b15517c Fix combat mode display on classic UI 2016-04-13 14:42:10 -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 a8b9114dd8 Add default loadout variables comment in init.sqf 2016-04-10 10:15:03 -04:00
ebaydayz 6d3bf3b855 Fix object_monitorGear with R3F disabled 2016-04-09 20:36:36 -04:00
ebaydayz 268d2fe018 Make default BuildingLimit 150 again 2016-04-09 18:40:52 -04:00
ebaydayz 09f01083fc Formatting cleanup 2016-04-09 16:52:00 -04:00
ebaydayz d229d10b6a Cleanup config variables 2016-04-09 16:47:51 -04:00
ebaydayz 1ba8f46543 Update CfgArma AI Skill
The old values were from 1.8
2016-04-09 13:49:36 -04:00
ebaydayz 99d9f12add Add back R3F weight text in object_monitorGear
The size of control 1001 was shortened in 1.8.7, so it is better to set
it on control 156. The initial text is always blank for that control
when cursorTarget isNull. Showing the weight carried when looking at an
object or vehicle is not necessary. It cuts off with long vehicle names
anyway.
2016-04-07 20:32:34 -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 a16abf0ca2 Add Chainsaws loot group for colors 2016-04-07 10:34:20 -04:00
ebaydayz 0f4aa05753 Disable lit fires when townGenerator is off
If townGenerator is enabled lit fires will be created everywhere except
blacklisted areas.
2016-04-06 20:08:28 -04:00
ebaydayz 6a42ef40d3 Disable TownGenerator and plant spawner by default
Junk and plant spawning is disabled by default. It can be enabled via
dayz_townGenerator config variable and positions blacklist (for trader
cities, etc.).

The trader objects spawn code was consolidated to functions.
2016-04-06 19:44:00 -04:00
ebaydayz 181c47d2a4 Use config traders by default
Config traders load faster and use less network traffic. Should help
with server lag. Admins can still switch back to DB traders if they
wish.
2016-04-06 13:22:07 -04:00
ebaydayz 03b8c38c6a Add new items to config traders
Duplicate categories are now marked instead of being listed multiple
times. This makes the configs far easier to maintain. Admins can still
expand each individual category for further customization.
2016-04-06 13:05:35 -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 6b25d3594e Add strings for desert dome tent 2016-04-04 14:04:21 -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 d07d31983b Remove legacy ammo boxes
AmmoBoxSmall_556 and AmmoBoxSmall_762 no longer exist and were causing
loot spawning errors.
2016-04-02 19:15:29 -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 22d7e23d3f Fix str_itemwatch listed twice
Fixes the RPT errors:
Item str_usract_watch_toggle listed twice
Item str_usract_watch listed twice
Item str_itemwatch listed twice

str_itemwatch is in Arma 2\AddOns\language.pbo and the other two are in
Arma 2 Operation Arrowhead\Expansion\dta\languagecore.pbo
2016-04-02 12:24:09 -04:00
ebaydayz ec4eb5418d Update server spawn_vehicles
Updated loot spawning code for vehicle cargo.

Also it is faster and more efficient to call spawn_vehicles repeatedly
in one thread rather than spawn it hundreds of times (opening hundreds
of simultaneous script threads).
2016-04-01 16:45:08 -04:00
ebaydayz 426e97dda7 Remove dayz pbo
The only difference from the vanilla dayz pbo is the DeathScreen change.
It is better to do that in dayz_code RscTitles. Then the dayz pbo does
not need to be maintained in this repo.
2016-04-01 12:06:56 -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 3f6cd7de42 Fix some errors 2016-03-31 14:45:13 -04:00
ebaydayz 6de88c7b07 Update some WeaponHolder to WeaponHolderBase 2016-03-31 11:35:33 -04:00
ebaydayz c54a52a103 Merge selfbloodbag and self_transfuse 2016-03-30 20:50:06 -04:00
ebaydayz 69091965a1 Merge new MultiPlayerSetup and autojoin 2016-03-30 17:01:28 -04:00
ebaydayz 77e760fe73 Update private tags
From
https://github.com/DayZMod/DayZ/commit/e69f8d530620e76f0ba7a4c7f3fcb1fa914c8e07

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 30b29c541e Update intro heli crash name 2016-03-29 20:53:57 -04:00
ebaydayz c3360efc1d Remove duplicate logo file
dayz_logo_ca.paa was the same exact file as loadingscreen.paa
2016-03-29 20:20:04 -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 23caf14dc9 Update mission
It should no longer be necessary to load dayz_vehicles in the
mission.sqm addons. It was taken out of mission.sqm in vanilla around
1.8.

The dayz_logo_ca.paa file was identical to loadingscreen.paa
2016-03-27 15:18:28 -04:00
ebaydayz 8f2ff5cb3e Update spawnCrashSite 2016-03-26 22:02:28 -04:00
ebaydayz cfff2454aa Update server_monitor 2016-03-26 20:46:42 -04:00
ebaydayz e435d41f6c Update server_functions
The protective box is not needed on Chernarus.

If other maps need it we are better off spawning a permanent box around
the debug area once, instead of constantly creating new boxes every time
a player logs in.
2016-03-25 21:24:43 -04:00
ebaydayz 145fbf093f Use str for very long strings
Format has a 2048 character limit:
https://community.bistudio.com/wiki/format

Str() should be used for strings that may exceed that, like object
inventories and vehicle hit point arrays.
2016-03-25 13:54:23 -04:00
ebaydayz c637c210b1 Cleanup server_updateObject 2016-03-25 13:17:04 -04:00
ebaydayz dd8283951d Remove unused function 2016-03-25 11:54:12 -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 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 debb714277 object_setFixServer -> fnc_veh_setFixServer
Fnc_veh_handleRepair is a new version of fnc_veh_setFixServer with extra
handling. It is used in salvage and some other scripts, but not
server_monitor.
2016-03-22 16:34:08 -04:00
ebaydayz cc64d2e7fb Cleanup player_switchModel 2016-03-21 20:25:01 -04:00
ebaydayz e2e6e79394 Minor formatting cleanup 2016-03-21 17:58:23 -04:00
ebaydayz 286f405e67 No achievements in player_death
Recent 1.8.7 commit:

https://github.com/DayZMod/DayZ/commit/651510eed7428e4cde854d08b6aecc6eb3823fdf
2016-03-20 23:24:20 -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 92c09e5c7b Cleanup zombie_agent formatting
It is much easier to compare with the 1.8.7 file now.
2016-03-20 16:37:14 -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 15a38afd82 Remove some unused files 2016-03-20 13:28:49 -04:00
ebaydayz 9ce5a20417 Cleanup variables.sqf
Epoch variables are grouped together now for easy comparison with
vanilla.
2016-03-19 19:58:37 -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 3113889a98 Update fn_selfActions
See also:
https://github.com/DayZMod/DayZ/pull/645
2016-03-15 22:15:38 -04:00
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:

https://github.com/EpochModTeam/DayZ-Epoch/commit/8201643c00fefb3f8956a7a23e02e69a8125b1a2#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:
https://github.com/DayZMod/DayZ/commit/634214570c2a6c3efe53e2b09bf01250fcc3d2e2

@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:
https://github.com/DayZMod/DayZ/commit/634214570c2a6c3efe53e2b09bf01250fcc3d2e2
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
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
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
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
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