Commit Graph

4081 Commits

Author SHA1 Message Date
icomrade c118ecbb15 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-13 17:06:46 -04:00
icomrade 6d69ca92e3 Fix undefined player uid in modular build 2016-05-13 17:06:43 -04:00
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
icomrade 33c3c7601f Fix Private Arrays 2016-05-13 16:57:50 -04:00
icomrade 00e2f34734 Forgot variables 2016-05-12 23:47:53 -04:00
icomrade 6c24aaeb3b Add Vector Building 2016-05-12 22:52:04 -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
icomrade 2d9097a6af Switch all buildables to Epoch building system
Didn't bother switching the stash over since it doesn't appear to be
implemented yet
2016-05-10 11:21:04 -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
icomrade 72f3779edb Fix death when changing clothes + minor changes
removing the Respawn EH fixes this, I haven't noticed any adverse
effects from removing it yet.

Also changing groups now deletes the old group. The machine which the
group is local to must execute the deleteGroup command, the server
previously had to wait until the player disconnects to delete their
empty groups.
2016-05-09 00:27:34 -04:00
icomrade 875b63027a Fix plot friends return 2016-05-08 19:13:18 -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
icomrade 6e430bdb84 Change self transfuse timeout to 2 min default
Also properly handle the infection chance
2016-05-06 11:52:36 -04:00
icomrade 6ab855fd9d Forgot to set this variable in selfbloodbag.sqf 2016-05-06 11:45:34 -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
icomrade 8a361a1b44 Wrong order 2016-05-03 23:28:32 -04:00
icomrade e8abd8f403 Add percent damaged display for maintenance #1583 2016-05-03 23:25:25 -04:00
icomrade 51be8aa8a5 Fix reloading 2016-05-03 20:19:01 -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
icomrade 3f10228b95 should fix knockout issue with self bloodbag
issue most likely happened if you used a typed bag not matching your
blood type when the classic system is enabled.
2016-05-03 16:34:28 -04:00