W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 15:51:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,029 Commits 20 Branches 18 Tags
914162c69887f6b6eb2410e99212c9dd5195df47
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz 914162c698 Update messing variable in pz_feed.sqf 
Messing now has a third parameter for dayz_nutrition.
 2016-05-13 17:02:44 -04:00
ebaydayz 8b0e03545f Remove legacy config trader menu 
Advanced trading now does everything the legacy config menu did and
more.
 2016-05-12 16:41:40 -04:00
ebaydayz 3be1d4e6bf Update outhouse and plot pole descriptions 
Outhouse no longer includes toilet paper.

Plot pole may cover an arbitrary radius and ownership may not be lost
after death depending on server settings.
 2016-05-12 15:10:20 -04:00
ebaydayz bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
ebaydayz e60175b30c Fix wrong price when adding multiples of same item to buy list 
Modifying _temp was also modifying Z_BuyableArray. An independent copy
of the array was needed.
 2016-05-11 15:07:58 -04:00
ebaydayz 5ad1697308 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-11 12:42:51 -04:00
ebaydayz 6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -04:00
ebaydayz 5ca182dffe Fix can't sell satchels with Adv. Trade 
Some items (like PipeBomb) are a class in both CfgMagazines and
CfgWeapons. BIS_fnc_invRemove uses weapon first, so that is why the
magazine was not being removed. Using config instead of string avoids
this problem.
 2016-05-09 14:10:20 -04:00
ebaydayz c0cb702534 Add swap for classicBloodBagSystem in Adv. Trade 2016-05-08 17:31:23 -04:00
ebaydayz 5120d8a488 Fix incorrect backpack space calculation 
Fixes not being able to purchase into a half full backpack and free slot
counts text incorrect when buying into backpack.
 2016-05-08 16:21:24 -04:00
ebaydayz 84e64be47e Don't show debug message when paying with exact amount 2016-05-08 13:30:26 -04:00
ebaydayz c477304571 Forbid buying duplicate tools into gear 2016-05-08 11:59:25 -04:00
ebaydayz 41e653136f Add attachments compatibility list to trader 
Also reduced item info size a bit to better fit normal and large
interface sizes.
 2016-05-07 19:29:00 -04:00
ebaydayz 3d4d6f6544 Add SQL query for Precise Base Building 1.0.5 
You only need to run this if v1.0.4 was installed on your server
 2016-05-07 13:24:27 -04:00
ebaydayz 1fe8a7abf5 Fix typo from 26e6727 2016-05-07 13:14:22 -04:00
ebaydayz 26e67270cb Update Precise Base Building to v1.0.5 by @Mikeeeyy 
Note @icomrade : 1.0.6 test servers need to empty object_data or run the
SQL query linked below before applying this update.

http://epochmod.com/forum/topic/15813-release-v105-precise-base-building-persistent-bases-after-restart-updated-220915/#comment-118663
 2016-05-07 13:06:20 -04:00
ebaydayz 03e3293795 Add extra vehicle info in Adv. Trading 
Translations are from Arma2OA languagecore.pbo
 2016-05-06 18:57:53 -04:00
ebaydayz b0ffc1421e Prevent errors if zombie is deleted suddenly 2016-05-05 20:03:41 -04:00
ebaydayz 00cb76a496 Fix Adv. Trading pistol detection 
The secondaryWeapon command does not detect pistols. It returns the
unit's launcher.
https://community.bistudio.com/wiki/secondaryWeapon

This fixes the menu always showing your pistol slot as open, even when
you already have one.
 2016-05-05 17:25:47 -04:00
ebaydayz 7bc5d7f7f5 Fix full toolbelt showing -2 tool slots in Adv. Trade 
Correctly shows zero available tool slots when toolbelt, binocular and
NVG slots are full now.
 2016-05-05 16:50:09 -04:00
ebaydayz fe54b78bdb Add backpack selling to Advanced Trading 
It was not possible to sell a backpack from your gear or vehicle.

Added option to sell from gear. Sell backpack from vehicle is still not
possible currently due to Arma limitations.
 2016-05-05 14:55:50 -04:00
ebaydayz 2c6ef2ced3 Don't show selected vehicleX message on Adv Trade startup 
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
 2016-05-05 12:37:10 -04:00
ebaydayz f900ee4520 Add isInTraderCity to BackpackAntiTheft check 2016-05-05 11:39:18 -04:00
ebaydayz af14d673f5 Make LMG magazines only take up one slot 
All ammo in Configs\CfgMagazines\Magazines\ is back to taking one gear
slot now, same as 1.0.5.1.
 2016-05-05 11:14:08 -04:00
ebaydayz ef2c910bfc Fix open gear backpack slots always showing zero 
IsNil returns true as long as the variable is defined. In this case it
is defined as objNull when you have no backpack.
 2016-05-04 19:09:10 -04:00
ebaydayz cb381c5ce3 Fix another transportMaxBackpacks typo 
This was responsible for vehicles showing zero and negative numbers of
available backpack slots.
 2016-05-04 18:42:20 -04:00
ebaydayz ed9253671e Always open Advanced Trading in buy mode 
Fixes the unintended behavior of swapping between buy and sell each time
the menu is opened.
 2016-05-04 16:50:46 -04:00
ebaydayz 349e0a103d Fix trade title showing "Buying in vehicleX" when in sell mode 
Tested and confirmed working as intended now.
 2016-05-04 16:46:35 -04:00
ebaydayz 85869b32f1 Fix Adv. Trade secondary vehicle check 
Forgot this one. See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/f503e530976a34c4ffb3ff136881423feb0c5cdb
 2016-05-04 15:53:25 -04:00
ebaydayz f503e53097 Fix Adv. Trade nearby vehicle check detecting animals 
Was getting "Buying in Rabbit" when one was nearby.

No need to check "AllVehicles", this is faster and will get all drivable
vehicle types.
 2016-05-04 15:47:47 -04:00
ebaydayz c4d3f01f38 Don't show enter/leave text when changing clothes in trader 2016-05-04 15:08:19 -04:00
ebaydayz e6c5930415 Fix unit icon in Advanced Trading selling from gear box 
Adds a nice icon of the unit in the top right below "Gear" text.
 2016-05-04 14:39:40 -04:00
ebaydayz 800182f7e2 Fix can't buy backpack into vehicle with Advanced Trading 
The typo here was causing all vehicles to return 0 for
transportMaxBackpacks.
 2016-05-04 14:20:23 -04:00
ebaydayz 5043fafae4 Fix default currency display in Adv. Trading bag item info 
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
 2016-05-04 12:54:36 -04:00
ebaydayz 085b6d32f9 Enable R3F weight by default 
Since we are keeping "everything takes up one gear slot" weight should
be enabled by default. Moved to init.sqf so admins can easily change it.

Also added RedRyder and Anzio_20 weight.
 2016-05-04 11:23:50 -04:00
ebaydayz ee70dd49d3 Prevent rags duping 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/31167114e79b7fbde063d543e3f225dc493261f7
 2016-05-03 17:28:33 -04:00
ebaydayz 1eeaa3e792 Add epoch_generateKey function 2016-05-03 13:35:50 -04:00
ebaydayz 2f98fc0451 Prevent MeleeMagazines being counted by BIS_fnc_inv 2016-05-03 13:35:50 -04:00
ebaydayz d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz 8d82693c1b More Advanced Trading localization 
Russian translations provided by Epoch forums user koms:
http://epochmod.com/forum/profile/33066-koms/
 2016-05-02 17:32:27 -04:00
ebaydayz c4ed93959e Better combat log detection method on server 
"noatlf4" variable is set on server through PV from damage handler. No
need to worry about diag_tickTime difference between clients and server.
 2016-05-02 15:12:43 -04:00
ebaydayz c951680ffd Added new Login Processing check for Ghost mode. 
Players who alt f4 while in ghost mode should no longer lose position
updates.

Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/24194861aa34e57a4ae6096c85db8aae02587314
 2016-05-02 14:48:15 -04:00
ebaydayz 99cd64c73b Removed Logging from Temperature system. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/166ae0219cc415be56ee145020468cd047d40fe2
 2016-05-02 14:28:58 -04:00
ebaydayz dfe68c7824 Removed Achievements from sync. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/09313b23769b056c5a7f3d34f37583b2e2c599b5
 2016-05-02 14:26:35 -04:00
ebaydayz 4df9a1e00b Fix wrong translations from #1689 @Adaptivity 
@Adaptivity
 2016-05-02 14:15:06 -04:00
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