Commit Graph

546 Commits

Author SHA1 Message Date
ebaydayz
a3cfdd4058 Small changes to temperatur for QF11 (Testing)
df0164b53c

1cd6f5f06a
2016-04-17 11:24:39 -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
993ce14da6 Remove unnecessary key event handler reset
No need to reset the key event handler again in player_monitor.fsm, it
is already done onPreloadFinished.
2016-04-15 20:16:13 -04:00
ebaydayz
110befba7f Swap bloodbags in traders and loot for classic system 2016-04-15 16:11:17 -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
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
6d3bf3b855 Fix object_monitorGear with R3F disabled 2016-04-09 20:36: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
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
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
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
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
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
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
e1a0bfebc1 Update inits 2016-03-27 23:47:30 -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
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
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
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
icomrade
68da397c52 Finish Medical and Sleep to UiSleep 2016-03-05 22:34:25 -05:00
icomrade
9863c0765a Pointless merge conflict 2016-03-04 15:23:22 -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
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
icomrade
bad0a2e461 add 2 new vars and fix up variable names
DZE_HeartBeat
DZE_UseBloodTypes
2016-03-01 00:23:14 -05:00
icomrade
b96cd2d971 Update compiles - 2 more files to do
fn_selfActions.sqf
player_updateGui.sqf
2016-02-29 00:26:12 -05:00