Commit Graph

194 Commits

Author SHA1 Message Date
ebaydayz
4d5dc060d2 Fix tame_dog errors
Tame_dog_old and player_tameDog are not used.
2016-04-18 21:49:27 -04:00
ebaydayz
464c26861c Add back Epoch animals in sched_animals
player_animalCheck is not used
2016-04-18 14:19:41 -04:00
ebaydayz
e13b5dbdff Fix RoadFlare RPT error
Fixes:

Error in expression <ehicles","WeaponHolder"], 50];
{ [_x,0] spawn
object_roadFlare } count (allMissi>
  Error position: <spawn
object_roadFlare } count (allMissi>
  Error Type Script, expected Bool
2016-04-17 20:10:54 -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
0b290d8fec Fix halo spawn 2016-04-14 14:55:46 -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
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
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
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
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
8f2ff5cb3e Update spawnCrashSite 2016-03-26 22:02:28 -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
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
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
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
icomrade
68da397c52 Finish Medical and Sleep to UiSleep 2016-03-05 22:34:25 -05:00
icomrade
61c64cb14a Fix Merge Conflict 1 2016-03-03 22:09:38 -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
ebaydayz
075336008e Add files for local trader cities
I've loaded and checked each of these on their respective map in the
editor. I've also tested both Chernarus ones on my test server.
2016-02-29 22:32:16 -05:00
icomrade
84eb6f815a Missing Files 2016-02-29 00:55:29 -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
icomrade
a83909b918 System is done (i think) 2016-02-28 15:28:59 -05:00
icomrade
c034f43d0b Additional Folders/Files in System 2016-02-27 22:34:50 -05:00
icomrade
6c1520b94a Fix #1440 2016-02-20 08:56:11 -05:00
icomrade
6db02d28bf Fix slow login timer and wrong login timeout message 2016-02-18 23:14:36 -05:00
ebaydayz
7a1058cb6d Block local script execution bug
See:
<pre>https://dev.arma3.com/post/spotrep-00045
Fixed: Exploit with inGameUISetEventHandler granted a menu hack
possibility</pre>
Still not fixed in A20A as of 1.63.131129
2016-02-18 14:16:47 -05:00
icomrade
277d87fa3b Some more position fixes 2016-02-18 09:16:20 -05:00
icomrade
c3ed4e49e1 Replace sleep with uiSleep
see the below links for more info. uiSleep is based off of a more
accurate method of tracking time, whereas sleep can fluctuate depending
on application performance since it is based on framerate.
https://community.bistudio.com/wiki/uiSleep
https://community.bistudio.com/wiki/sleep_vs_uiSleep
https://community.bistudio.com/wiki/sleep
2016-02-17 13:03:17 -05:00
ebaydayz
441e9fb231 Update keyboard eventhandler and add rules.sqf
See: https://github.com/EpochModTeam/DayZ-Epoch/pull/1673
2016-02-16 21:59:29 -05:00
ebaydayz
edf9b71e12 Update description.ext to 1861 format
Tested with current 106 files without issue.
2016-02-12 17:41:23 -05:00
icomrade
41ff819f13 Remove Fixed Files 2015-12-18 13:16:10 -05:00
Zupa
43cf40729d Merge pull request #1624 from Mikeeeyy/patch-10
Add Toggle Slow Zombies
2015-07-03 00:04:05 +02:00
Zupa
9396105d9a Merge pull request #1649 from Mikeeeyy/patch-18
[FIX] Inventory wiping on login.
2015-07-02 23:42:01 +02:00
ebaydayz
cfdab56f7e Update version number 2015-04-18 15:31:13 -04:00
Mikeeeyy
b6784a645d Update player_spawn_2.sqf 2015-04-07 19:30:57 +01:00
Mikeeeyy
6827f393db Fix undefined error
Sanitize the variable before using it.
2015-04-07 19:04:42 +01:00
Mikeeeyy
fb189ddca2 Update player_spawn_2.sqf 2015-04-06 00:47:33 +01:00