Commit Graph

632 Commits

Author SHA1 Message Date
ebaydayz 7415c21c2b Small update to object_build
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a10173443b4d47d4f9739a50759d68c27b6340df
2016-09-15 12:48:31 -04:00
ebaydayz 815b54ec44 Fix gut dog
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
2016-09-14 16:42:25 -04:00
ebaydayz 29c16dc59f Consolidate duplicate sell distance variables 2016-09-12 14:14:38 -04:00
ebaydayz 2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
oiad fed89a0ed2 Advanced trading and safe GUI changes (#1762)
* Advanced trading and safe GUI changes

This adds displaying of item/backpack/weapon/vehicle descriptions
Moves Weapons display on vehicles to a modular type, so if the vehicle
has no weapons it wont display, same with Description

Fixes an issue with safes not sounding keyclicks, at present they are
only active if you have music turned on, since I don't play with music
on (and many others) you will never hear them and when you do, the DTMF
signals they use are really obnoxious.

Replaced the sound with the one from the lockboxes, it's still audible
but very reasonable.

* Advanced trading fixes

Rework for my previous commit @ebaydayz

* Localization additions

Missing from previous commit
2016-09-10 12:09:27 -04:00
ebaydayz f57e303355 Update vanilla fence building
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/e88a5c42bc86f91d254104b13064f83a2dd23a76

https://github.com/DayZMod/DayZ/commit/fe9564351108ae72496592b3bd741a5064b84ccd

https://github.com/DayZMod/DayZ/commit/9a82b8307c523046773b9cd3440c387c7155d70e

https://github.com/DayZMod/DayZ/commit/5a305198c70b1c3bdf7fbf055f550cf3a2d14001

https://github.com/DayZMod/DayZ/commit/be872601c96e526cb443b6ad47eb71fdf6618775

https://github.com/DayZMod/DayZ/commit/44a25b1b4a86d17ecf0780ba322513d756d1cbb1

https://github.com/DayZMod/DayZ/commit/7bfeab3c13b3835c5f134b39a15c8eae948a21b7

https://github.com/DayZMod/DayZ/commit/cc5f02a41ae7cba9d0312463caf48f46eed9cdad
2016-09-10 11:25:10 -04:00
ebaydayz 8f25cc70db Localize sell and buy only messages
PrimaryWeapon always returns "", never nil unless the player object
isNull (in which case this script would not be running).

Fixed cases where a nil variable would throw an error when checking the
next condition.
2016-09-09 13:53:20 -04:00
ebaydayz e5e212bbc2 Add comment about salvage vehicle work around 2016-09-09 12:58:41 -04:00
oiad 51f85acb9e Toggle for salvaging from locked vehicles (#1757)
* Toggle for salvaging from locked vehicles

This adds the ability to remove salvaging from locked vehicles which
helps avoid griefing
Fixes a spelling mistake for a localization string
Makes it possible to salvage 0% damaged items again, this was disabled
as per
https://github.com/EpochModTeam/DayZ-Epoch/commit/3292d84b857f307571af9233dcfffe9d59a0b5e9
I've had this running on my server for a year or so with no issues (not
that it doesn't affect it, i've just never seen it)

* Toggle salvagable locked vehicles changers

@ebaydayz fixed
2016-09-08 17:32:27 -04:00
ebaydayz 530ed4b3b4 Only exit for playerNear if supply crate wreck or mine wreck 2016-09-03 20:16:21 -04:00
icomrade ffef031863 Allow disabling of buying or selling
Set price of the item to -1 in the Cfg traders files to disallow buying
or selling
2016-09-03 14:26:43 -04:00
ebaydayz 7be75c4674 Remove random unused faco code 2016-09-02 13:25:51 -04:00
oiad d6324723e9 Plot management force maintain option
This replaces the "refresh" menu option with a "force maintain" option.
Allows you to maintain the base even if it doesn't need it to either get
all your items in sync or if you are going away or similar.

Tested with:
dze_permanent plot true/false
z_singlecurrency true/false

Also fixes an undefined variable error in system_monitor that was
introduced
https://github.com/EpochModTeam/DayZ-Epoch/commit/8f58baf3f286454a9f398517dc4f1980bd4d5c8e
2016-08-28 20:13:25 +12:00
ebaydayz 755adc7798 Initialize CurrencyName in configVariables.sqf
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242927452
2016-08-27 15:09:49 -04:00
ebaydayz 04b6711822 Round humanity in journal
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/145ec00b76914597f4d7454ba09de83f44887ec9
2016-08-27 10:11:49 -04:00
ebaydayz c2b16f0828 Consolidate DZE_ActionInProgress and r_action_count to one variable
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
2016-08-25 15:38:27 -04:00
ebaydayz a8e2ce07b5 Optimize some createVehicleLocal
https://community.bistudio.com/wiki/Code_Optimisation#createVehicle.28Local.29
2016-08-24 13:34:11 -04:00
ebaydayz 8af3d001ba Revert "Add faster array compare function"
This reverts commit d7cc4be585.
2016-08-23 18:22:06 -04:00
ebaydayz a323f453d2 Make minor change to fn_waitForObject.sqf 2016-08-23 17:49:53 -04:00
ebaydayz 134a614255 Remove FNC_getPlayerUID
It's been over two years since it was added. All servers should be
updated to steam ID by now.
2016-08-23 15:40:26 -04:00
ebaydayz 81473754f9 Revert unnecessary change from #1747
https://github.com/EpochModTeam/DayZ-Epoch/pull/1747#issuecomment-241802114
2016-08-23 13:12:01 -04:00
ebaydayz 10b006d4eb Improve readability of trade_any type lists 2016-08-23 11:57:09 -04:00
ebaydayz d7cc4be585 Add faster array compare function
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7bbeab4e7db4d340cdd34b6c288bafc0833b1a8e
2016-08-23 11:17:07 -04:00
ebaydayz 38b2a551bd Fix fn_waitForObject handling multiple of same object type
Forgot to handle case where there is already one or more of that object
type in the area (safes, cars, etc.).
2016-08-22 20:14:11 -04:00
ebaydayz bc7bef857f Fix r_action_count not reset in player_buildVanilla exit 2016-08-22 16:54:14 -04:00
oiad 89a43cb2d8 Advanced trading fix
This fixes the issue that @ndavalos found:
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-241289082
2016-08-22 21:10:46 +12:00
oiad 6bdc3956fb Plot / door management userlist sorting (#1747)
* Plot / door management userlist sorting

This correctly sorts the nearby humans list in both mods, I have this
running on my 1051 server with no issues, @ebaydayz please advise if
this is not right, I've tested it pretty well and it is indeed selecting
the right person/UID

* Door/plot management fixes

As per @ebaydayz
2016-08-21 17:19:52 -04:00
ebaydayz 745e287202 Add option to push stuck planes
Also changed flip vehicle back to 1051 default which allowed players to
flip non-ATVs with help.
2016-08-21 16:45:32 -04:00
icomrade 9aa1784f23 Globally remove wrecked objects
using PVEH PVDZE_obj_Remove. Wrecks only exist for the players currently
in the server when the parent object is destroyed. Passing the object
through the PVEH does not work.
2016-08-21 15:46:33 -04:00
ebaydayz fd90eda8ae Update vanilla player build
Vanilla development commits applied:

https://github.com/DayZMod/DayZ/commit/a2193626a0a16959c06b8a3d4986085b2e8ad232

https://github.com/DayZMod/DayZ/commit/deb7207672f33c45bfe15346ce22b52b00fe3672

https://github.com/DayZMod/DayZ/commit/2de1d90edd773883c17db80c5905e0b44a2b4ef6

https://github.com/DayZMod/DayZ/commit/8a914606cff65bb50c1b8c48178d7eab67d0285f
2016-08-21 11:58:32 -04:00
ebaydayz f0e0f6d6e4 Temp Bypass for tents and stashes for collision checks.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/143f8e4dcb824cc0c8d1f21f8e7fbf40dbb9b9cd
2016-08-21 11:39:19 -04:00
ebaydayz f3370cbc4b Give vehUpgraded a default value #1745
@oiad No need to check _vehtrade in this case it will always be true if
_vehUpgraded != ""
2016-08-19 14:17:13 -04:00
oiad d987fb290c Advanced trading selling upgraded vehicles.
These changes allow the player to sell upgraded vehicles with them not
being added to the trader (as to not polute the lists). This basically
refers to an upgraded vehicle as a child of the base vehicle so it will
get the same sell price as the base vehicle.

This still follows the original trading convention, the vehicle base
needs to be in the trader category, i.e you cant sell an armored SUV at
stary vehicle trader.
2016-08-19 22:15:47 +12:00
ebaydayz 509c2b17d6 Fix typo from 5d372d3
5d372d3
2016-08-18 13:30:19 -04:00
ebaydayz 0394c61183 Match Adv Trade blue color for compatible highlight
Matches blue used in advancedTrading.hpp, slightly lighter and easier to
see on dark grey background. @oiad 42ebfb5
2016-08-18 13:27:00 -04:00
oiad 42ebfb54d7 Advanced trading buyable list changes
Further changes Advanced trading buyable list to show the item as blue
if it's compatible attachment wise and ammo wise.

This will get overwritten if the player has the item in their inventory
by staying green.

Also fixes a small bug I put into my last commit by not showing up for
boats/bikes etc.
2016-08-18 22:02:51 +12:00
ebaydayz 3103195017 Fix switch weapon addAction with nothing in hands
The addAction click was doing an animation without switching when the
player had a primary or melee on back but nothing in hands.

Probably present in vanilla too, will check later.
2016-08-17 15:26:24 -04:00
oiad fc2c03d0d3 Advanced trading change to buyables list
This changes Advanced trading to change the item color to green if it
matches with an item is in your inventory, in your weapon slots (main
slot and dayz_onBack) is the same backpack and is a vehicle you are
local to.

This brings it in line with default trader, except we're using local
here since that's all that matters.

Thanks to @ebaydayz for the suggestion.
2016-08-17 22:52:05 +12:00
ebaydayz f04d581b4d Cleanup Adv Trade parseText formatting
Just added line breaks so it is easier to count the format order.
2016-08-16 17:07:33 -04:00
ebaydayz e02f8ba8ff Use BIS_fnc_numberText for SC number displays again
Missed some @ndavalos
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854
2016-08-16 16:44:56 -04:00
ebaydayz 3f3f1a32ed Use BIS_fnc_numberText for SC number displays
See:

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854

That should be all of them @ndavalos let me know if I missed any.
2016-08-16 16:28:06 -04:00
ebaydayz ae8329e55b Further simplify maintain_area.sqf again 2016-08-15 18:05:42 -04:00
ebaydayz 72c9c9eb38 Further simplify maintain_area.sqf 2016-08-15 17:54:16 -04:00
ebaydayz b37445a4d5 Fix mistake from 15763f4
#1735

https://github.com/EpochModTeam/DayZ-Epoch/commit/15763f4f2a5bbadc22fc137deae5fcff5844bc60
2016-08-15 17:21:13 -04:00
ebaydayz 15763f4f2a Consolidate maintain scripts
Thanks to @oiad for making this easy #1735
2016-08-15 16:33:00 -04:00
oiad c738710b77 Plot management fixes (#1735)
* Plot management fixes

This hopefully adds a few more items to the maintain list (@icomrade)
Uses epoch_returnChange to accurately and tidily return change and
handle money.
Localize maintain_area.sqf for single currency servers

* Plot Management tidyness

Fixing tidy issues

* Plot management changes

Fix maintenance variables as per @ebaydayz

* Plot management

Missed one

* Plot management fixes and default maintain_area fixes.

Convert original maintain_area.sqf to epoch_returnChange, I used the
plot management localization strings since I liked them better, the
epoch ones don't make a lot of sense really. Makes no difference if plot
management is turned off anyway.
Change the single currency version to work a lot better than it did, I
put the cost per item to 100 to be more in line with what I would expect
on a server

Changed _range to use DZE_maintainRange (DZE_plotPole select 0 + 20)
2016-08-15 14:49:56 -04:00
ebaydayz 74579bcf2f Allow remove with Crowbar in hands or onBack
Now crowbar can be in your toolbelt, hands or onBack when removing
modular items, mining ore, opening supply crates, etc.
2016-08-12 19:38:23 -04:00
ebaydayz 36196661ea Update arrow and quiver classnames
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/1561c3cfd85db4eee2688d76a6e5a6fdb8faddda
2016-08-12 14:00:32 -04:00
ebaydayz b2394703f3 Update vanilla player build
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/20f992fcb74f9a8b6823ea466ea3aadb5eafd1b0
2016-08-11 20:01:53 -04:00
ebaydayz 9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/707a591765c8a568429fd243a0f3d6f38793d8dc

https://github.com/DayZMod/DayZ/commit/c453cdedd2568ab365788415e6dcfbecc5c6cfd4

Set to double vanilla default value since Epoch has a lot more large
vehicles with 1000+ fuel capacity.
2016-08-11 18:08:21 -04:00