Commit Graph
100 Commits
Author SHA1 Message Date
ebaydayz adff6440ed Fix errors from #1689 localization
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
2016-05-02 14:03:41 -04:00
ebaydayz 765b035764 Add note about PVDZ_plr_Save 2016-05-02 11:23:50 -04:00
ebaydayz 51308c5b32 Fix typo from #1688
Also remove a duplicate string
2016-05-01 21:14:38 -04:00
ebaydayz f848305b50 Update Advanced Trading with category reuse support
Tested and working ok.
Updating with change from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/03b8c38c6a9a8473d75addcfec113193f7b2ec6c
2016-05-01 19:02:29 -04:00
ebaydayz db62ed2019 Only check isPlayer if isMan in fn_selfActions
Better method than:

https://github.com/EpochModTeam/DayZ-Epoch/commit/66408ded24c81df771d9f3eb55bb7dda4294dbc5
2016-05-01 17:24:21 -04:00
ebaydayz 66408ded24 Prevent trader menu action showing on players
Fixes bug where player wearing a skin in serverTraders would show trader
menu action on him.
2016-05-01 17:08:55 -04:00
ebaydayz 2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
ebaydayz b4cd47f5b5 Update PVDZ_plr_save in advanced trading 2016-05-01 13:21:17 -04:00
ebaydayz 6187006ece Remove duplicate fnc_inString 2016-05-01 11:01:26 -04:00
ebaydayz ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
ebaydayz f44901db1b Prevent spamming change clothes
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/98733d37abf14e3dca92fe62846761b662fabf18
2016-04-30 16:48:05 -04:00
ebaydayz 4b9d6df0bb Finish localization support
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/33c6cafbcbffca2624ed5753d9b4882419626c70
2016-04-28 22:13:48 -04:00
ebaydayz 7f1b8db85a Fix MeleeMagazines showing in crafting UI
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/f2e1623ba1430d79b65b241023caffbefe4df4e1
2016-04-28 21:34:00 -04:00
ebaydayz 2b61ce850a Allow sleeping at all tents
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/e647be13c1b5990ad96715c403e1f5a16f042f23
2016-04-28 20:30:18 -04:00
ebaydayz d2ba027863 Perform build checks before removing magazines
Also allow tents and stashes to be built without a plot pole (same as
1051).
2016-04-28 15:32:32 -04:00
ebaydayz 034d898880 Update tent base class name
DZ_storage_base is now the base class for all tent and stash types.
2016-04-28 13:53:21 -04:00
ebaydayz f42496bb03 Move build checks to separate files
For better organization
2016-04-28 11:52:23 -04:00
ebaydayz 244b84e74b Update weapon switch hotkey for DZE_TwoPrimaries=2
Also forgot new dropped class for SledgeHammer
2016-04-27 16:11:40 -04:00
ebaydayz 7753ae2859 Add drop weapon action to MeleeSledge 2016-04-27 15:01:34 -04:00
ebaydayz bb66b4446c Add Anzio 20mm sniper by @arma2WillRobinson to addons list 2016-04-27 12:30:57 -04:00
ebaydayz 2696869dc2 Fix wrong dayz_minpos and maxpos for Chernarus
Fixes radiation effect when out of map
2016-04-26 21:02:59 -04:00
ebaydayz bf9140f1b5 Fix dayz_nutrition RPT error on login
Looks like the error was:
r_player_Nutrition = [_NutritionLoss];
It should have used the set command, since the array was already defined
in variables.sqf. But there is no need to use an array for a single
value anyway.

Fixes RPT error on login:
Error in expression <hyd"] spawn player_death;
};
};

if (dayz_nutrition > 0) then {
_Nutrition = >
Error position: <dayz_nutrition > 0) then {
_Nutrition = >
Error Undefined variable in expression: dayz_nutrition
File z\addons\dayz_code\system\player_spawn_2.sqf, line 182
2016-04-26 18:46:36 -04:00
ebaydayz d63f48af85 Fix pond detection in player_goFishing
Fixes #1678
Fixed for vanilla too:

https://github.com/DayZMod/DayZ/commit/8a18fe957c1de25c39628bfb4589e0d41e39fd34

Ponds and lakes were not being detected at all, neither on foot nor in a
boat.

Tested land (failure), pond, lake and shore both on foot and in a boat.
Working as intended now.
2016-04-25 21:53:31 -04:00
ebaydayz 97ad2688bc Enable RedRyder in loot tables again
Config errors are fixed for the next test build.
2016-04-25 19:57:23 -04:00
ebaydayz 69b940704e Removed powerlines from loot tables,
Vanilla development commit, see:

Removed Zeds spawning at powerLines.

https://github.com/DayZMod/DayZ/commit/b577424e50f1d7916f29e2250b362af42ceaf98f
2016-04-25 18:02:55 -04:00
ebaydayz a353f8e0e5 Fix hatchet remove from toolbelt text 2016-04-25 16:36:50 -04:00
ebaydayz 56ea7d1382 Use PVEH instead of MPF for death messages
This way no exception needs to be added in REsec for rSpawn and
dayz_rollingMessages can be used instead of rTitleText.
2016-04-25 16:10:52 -04:00
ebaydayz 6522cca7ce Fix typo from pull #1679
See #1679
2016-04-24 18:58:22 -04:00
ebaydayz 0511dcdb42 Change R3F overburden to force slow move
Better solution than knock out or break legs. See issue #1145
2016-04-24 18:19:01 -04:00
ebaydayz 6bee7a17f0 Change R3F weight overburden to break legs
Also BAF_L110A1_Aim_DZE wasn't in 1051, so no need to swap it in DB.
2016-04-23 19:51:56 -04:00
ebaydayz 1859216a94 Update test build and instructions 2016-04-23 14:24:52 -04:00
ebaydayz 619f65eef0 Remove canteen for now
Canteens were removed from cfgMagazines temporarily
2016-04-22 18:59:01 -04:00
ebaydayz 1879fb8707 Fix siphon fuel
ItemJerrycanEmpty no longer inherits from ItemJerrycan
2016-04-22 17:39:52 -04:00
ebaydayz 3c52278e4d Fix sedan and skoda getOut sound
Fixes RPT error when exiting skoda and sedan:
Cannot load sound
'ca\sounds\vehicles\wheeled\sedan\ext\ext-sedan-getout-1.wss'
Cannot load sound 'ca\sounds\vehicles\wheeled\bus\int\noise3.wss'
2016-04-22 14:29:17 -04:00
ebaydayz 6ea1df14cf Add missing string for infection death 2016-04-21 19:23:49 -04:00
ebaydayz 23b6ad2455 Add systemChat death message option 2016-04-21 13:27:05 -04:00
ebaydayz 81262fbe19 Fix change clothes triggering radiation 2016-04-21 13:07:36 -04:00
ebaydayz 796c607173 Fix vanilla chop wood error
Players can now chop wood either with hatchet in their hands (faster) or
via right click on toolbelt (slower).
2016-04-21 12:28:00 -04:00
ebaydayz 7da7b9e5dd Correct PVDZ_plr_Save for player zombies 2016-04-20 17:00:38 -04:00
ebaydayz 14dacf269c Add back player zombie faces
Also moved player zombie attack from 'v' key to an addaction with
localized string.
2016-04-20 14:50:12 -04:00
ebaydayz 9d4bd9221a Add exception in REsec for death messages 2016-04-20 11:53:30 -04:00
ebaydayz 5308445f4c Update vanilla player_mineStone 2016-04-19 17:01:07 -04:00
ebaydayz f0c46a0764 Use Epoch player_harvest instead of player_chopWood 2016-04-19 16:51:20 -04:00
ebaydayz ba480fb218 Improve some RPT logging 2016-04-19 14:01:38 -04:00
ebaydayz 58d54a8ce0 Add A and D keys to interrupt 2016-04-19 13:05:59 -04:00
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 11741fa710 Update player_tameDog raw meat names 2016-04-18 13:36:09 -04:00
ebaydayz d46eb13267 Fix redirect to vanilla player_craftItem 2016-04-17 22:51:10 -04:00
ebaydayz 2f45d46d05 Remove legacy stream_location functions
These are no longer used for anything.
2016-04-17 21:23:25 -04:00
ebaydayz 4a32f34268 Fix mission briefing descriptions
There is no central hive, so every server is private. It's silly to have
that in the description.
2016-04-17 20:34:30 -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 a994e7107c Fix readd of halo keydown eventhandler 2016-04-17 18:44:58 -04:00
ebaydayz f38c6ff72e Fix server FPS logging
No need to have a config variable for this, admin can easily change it
in server pbo.
2016-04-17 17:11:49 -04:00
ebaydayz ee58868d6f Fix wrong trader name on Sauerland 2016-04-17 16:18:19 -04:00
ebaydayz 59a4459809 Fix spawn marker count for non-cherno maps 2016-04-17 15:32:47 -04:00
ebaydayz a3cfdd4058 Small changes to temperatur for QF11 (Testing)
https://github.com/DayZMod/DayZ/commit/df0164b53c3e8f3859fa2e9a25d979645f0fb3cc

https://github.com/DayZMod/DayZ/commit/1cd6f5f06a995b3b9a344efddac29a22dbaa1487
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 0b290d8fec Fix halo spawn 2016-04-14 14:55:46 -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 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