* Remove public variable event handler when using config traders.
This stops the public variable event handler from being loaded when
you're using config based traders, it's not needed in this situation
* Change nearestObjects to nearEntities in z_checkCloseVehicle.sqf
* Fixes vehicle selling not able to sell correctly
If more than 1 vehicle of the same classname was in a trader and the
local vehicle was further away it would not be able to be sold till
moved closer. We are using DZE_myVehicle for everything and we do
previous checks to make sure it's not null and local so we can assume it
is okay to use.
Fixes
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/#comment-290036
Fixes mistake from ffef031 @icomrade . _amount here is the quantity the
player enters in the quantity box when buying. The only time it is less
than or equal to zero is if the player enters zero or a negative number.
It has nothing to do with the buy or sell price.
Thanks Sercan for reporting.
Z_checkArrayInConfig is expecting weapons in position 0 for _this, all other stuff like get z_at_getGearItems.sqf and z_at_getVehicleItems.sqf passes the weapons array in position 0.
* server_updateObject force update for single currency
This modifies server_updateObject to force update/save to the hive if
the item being saved is in the DZE_MoneyStorageClasses array.
Previously if you force saved the object multiple times, the coins would
not get updated until the inventory changed, which if this was for a
bank object it would never update.
(This applies if you are using PVDZ_veh_Save to save the object)
* z_at_calcDefaultCurrencyNoImg prettyfication
This fixes a long standing issue in my brain about how this text was
always displayed, to me it seemed very untidy and just thrown together
(since I borrowed it from the IMG version)
Changes the output from this example: 7 Ruby 1 Amethyst 3 Gold 4 10oz
Silver 5 Silver
To this prettier and more logical example: 7 Ruby, 1 Amethyst, 3 Gold, 4
10oz Silver and 5 Silver
Make texts great again!
* z_at_logtrade fixes
Removes hard coded "Coins" text and replaces it with configVariables
version.
Also removes duplicate code and simplifies it.
* Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg
This merges these two files together since they are largely the same,
this also adds an optional argument to change the font size which is
useful for custom scripts that use this function.
Examples of use:
[_number,true] call z_calcCurrency; // Return a string of text with no
images
[_number,false] call z_calcCurrency; // Return a string of text with
images
[_number,false,0.7] call z_calcCurrency; // Return a string of text with
the currency in it and sets the font size to 0.7
* Localization changes/additions.
Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.
* Toolbox change
Update camonet removal to 10m instead of 5m
* Safe zone no building near/blacklisted buildings no building near
Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.
* typo
fix typo
* Safezone/blacklisted changes
As per requests.
* Rework
Rework
* Remove unused variables
as per subject
* Misc changes
Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces
* rework
rework
* Advanced trading modifications, maintain_area modifications
This lot of changes brings forth the following:
Sets up a "default" set of compiles that are the minimum needed for
maintain_area.sqf and custom scripts to utilize the gem based currency
that @icomrade added.
maintain_area.sqf: This will now utilize the gem based currency system.
Removed the redundant Z_Vehicle and replaced it with the Epoch built in
DZE_myVehicle
z_at_buyItems: Code tidying and optimization
z_at_checkCloseVehicle: Tidied up the code since removing Z_Vehicle
allowed us to remove some now useless code.
z_at_getVehicleItems: Removed the nearestObjects check for your vehicle
since we now do z_checkCloseVehicle on Advanced trading start up.
* Advanced trading missed redundant variables
As per description
* Advanced trading rework
We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.
* Revert "Advanced trading rework"
This reverts commit a589bd19b9.
* Advanced trading rework
We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.
* Advanced trading rework
More rework
* Remove single currency add/remove coins functions
at request of @ebaydayz.
* Update z_at_buyItems.sqf
* Update z_at_buyItems.sqf
* Update z_at_canAfford.sqf
* Update z_at_fillBuyableList.sqf
All of this is already checked in z_checkCloseVehicle at startup. If Z_VehicleChanges between the time the menu is started and the buyable list is filled it's not a big deal, since it only affects the highlighted color.
* Update server_handleSafeGear.sqf
* Update snappoints.hpp
* Update z_at_buyItems.sqf
* Advanced trading fixes
Fixes a few issues and a dupe with advanced trading as well as some
localization of where a vehicle key is going.
Z_at_buyItems: Now adds localization for the key getting added to your
toolbelt, backpack and vehicle, this stops players thinking they didn't
get a key when infact it was added to their backpack/vehicle.
Z_at_canAfford.sqf: This fixes a dupe from a bad copy paste for whomever
wrote this script, it was using _backpackMoney in the
z_allowTakingMoneyFromVehicle part, changed to the proper variable
_vehicleMoney.
z_at_fillBuyableList.sqf: this fixes a bug where a vehicle would show
green even when it isn't local, just basically added more checking to
make sure the vehicle it's making green in the list is a) local, b)
alive and that the typeOf == _name.
z_at_logTrade.sqf: fixes some tidyness.
advancedTrading/init.sqf: adds a z_checkCloseVehicle call otherwise even
with Z_AllowTakingMoneyFromVehicle = true it will not get currency from
your vehicle until you clicked on the "Vehicle" tab.
dayz_server/server_tradeObject.sqf: More tidying as per the
z_at_logTrade and removes the useless Player:, as it is obvious a player
has bought something not an AI.
dayz_server/server_handleSafeGear.sqf: Makes the diag_log at the end
more human readable with GPS coordinates as well as the lock code for
the safe or the lockbox.
* advanced trading fixes. I hate you github
WHY U GET MISSED?? STUPID GITHUB.
* snappoints changes
Fixes the issue @SmokeyBR reported
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-253864795
Adds all floor types to snap list for all barriers so you can snap a
sandbag etc to a floor instead of manually lining it up
I didn't catch this mistake before because _backpack was not in the private array, so it was still defined from the script that called this function. Thanks @oiad
See my comment on b806043
Veh_setFixServer only runs on the server, so the client does not need to
compile it.
The PVDZ_veh_Save PVEH is only added on the server, so it should never
be sent with regular publicVariable anymore.
* Advanced trading combine/return change
Fixes combining/returnChange to squash gems into usable currency so they
can properly be used in the economy
Stringtable fixes for duplicates
* Localization additions
More localizations
This fixes incorrect return of "not enough space to accept change" when
purchasing large quantities of magazines into a vehicle.
Thanks @oiad for noticing this.
If there was no helipad available findSafePos was called. If that failed
it spawned the vehicle in the debug zone.
Calling findSafePos is no longer necessary since we are now using
createVehicle "NONE".
* 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
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.
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.
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.
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.
- Added gear icons to vehicle cargo space display instead of
Weps/Mags/Bags text
- Decreased info text to 0.7 all around. Can be reverted to 0.8 if
preferred, but 0.7 or smaller is needed for vehicle info class, display
name and weapons list to avoid cutting off the dialog on normal and
larger interface sizes.
#1724
