Commit Graph

3811 Commits

Author SHA1 Message Date
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
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
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:

651510eed7
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:

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