Commit Graph

722 Commits

Author SHA1 Message Date
ebaydayz 4fa36dfd94 Fix selling of Javelin, Stinger and some other items
Fixes #1844
2016-12-31 17:14:16 -05:00
Kobayashi 79bbc2c5a4 Backwards array call to Z_checkArrayInConfig (#1845)
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.
2016-12-31 16:03:16 -05:00
ebaydayz d4b286660f Fix base objects duplicating when using plot take ownership #1811
Fixes #1811
2016-12-30 16:29:34 -05:00
icomrade 2d595118c3 Building upgrades from backpack 2016-12-30 16:16:51 -05:00
ebaydayz e33519ffd4 Readd changes from #1836
I accidentally removed these when resolving merge conflicts with 854c41c
.
2016-12-30 14:16:18 -05:00
icomrade c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -05:00
ebaydayz 0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
A Man 3151c0df84 Update player_craftItem.sqf (#1830)
Adding the ability to craft with all Dayz_Ignators when dayz_matchboxCount = true; For example crafting a Firebarrel
2016-12-26 14:11:22 -05:00
ebaydayz 64f6a9daa3 Exit vanilla craft item when action is in progress
Fixes #1826
2016-12-25 20:01:55 -05:00
ebaydayz b962bd50b9 Use faster switch in repair and salvage
https://github.com/EpochModTeam/DayZ-Epoch/commit/7496ef5d5cd01eea811261c110fb61120c300b96#commitcomment-20292237
2016-12-25 17:51:32 -05:00
oiad 75243933b4 Move more debug lines to #ifdef (#1829)
* Move more debug lines to #ifdef

Tidys up server RPT

Also make the combination rolling text overwrite the previous build
spam.

* Make additional changes
2016-12-25 17:20:30 -05:00
ebaydayz 7496ef5d5c Fix undefined color error in repair_vehicle.sqf
Same color error as f92b751 .

Also same issue in salvage_vehicle.sqf as described in #1828

Added setVariable exceptions for tank hit points.
2016-12-24 20:17:08 -05:00
Kobayashi 811e06ffe2 Detection of part doesn't work (#1828)
For tanks and other vehicles not explicitly defined in configs, _part will return with "" using gettext(), evaluating if it is nil doesn't do anything. With this change it will properly allow for repairing tracks on tanks with scrap metal.
2016-12-24 19:27:25 -05:00
ebaydayz 4d3f707417 Stop autoRun and remove drink from hands at ponds #1827
Fixes #1827
2016-12-22 21:52:22 -05:00
oiad 9889c8cd76 Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg (#1824)
* 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
2016-12-22 14:16:38 -05:00
ebaydayz b4c239729c Fix self actions duplicating when changing clothes and looking at a safe
This was also a bug in 1051. Thanks to Epoch forums user jOoPs for
reporting.
2016-12-12 15:23:31 -05:00
icomrade f34d1820bb Fix full cinder wall vector building #1813 2016-12-08 16:46:23 -05:00
ebaydayz f92b751ae3 Fix undefined color error in salvage_vehicle.sqf
Color was undefined if part damage was in any of these ranges:
0.2501 - 0.2599
0.5001 - 0.5999
0.7501 - 0.7599

Fixes related RPT errors:
Unknown attribute any>Remove
Unknown attribute -
Unknown attribute LFWheel
Unknown attribute (76%
Unknown attribute Damage)</t>
2016-12-07 18:50:01 -05:00
ebaydayz 5d1a6939e6 Fix refuel at gas station with generator #1806
Fixed mistake from: e398250

The refuel code was only running if a fuel truck was passed to the
script.

Also removed fuel truck classes that do not exist from the
dze_fueltruckarray.
2016-12-02 12:34:51 -05:00
ebaydayz baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
ebaydayz 40ea519fd3 Temp fix for vault_pitch.sqf error in 1.0.6 release 2016-12-01 15:31:09 -05:00
ebaydayz c0d5fcf17c Fix vault_pitch PVDZ_obj_Publish array
106 server_publishObject expects inventory as 4th element.
2016-12-01 15:15:04 -05:00
ebaydayz 185d84f14f Remove unneeded global var Z_AT_FolderLocation
This variable is not useful. If you change it you need to copy all the
AT files to your mission.

It is fewer files in the mission to just overwrite the path in compiles
and fn_selfActions.

Also fixed mistake with not replacing macros in scripts.txt with their
actual values.
2016-11-27 20:30:34 -05:00
oiad 0b10b85e3a player_upgrade combination fix (#1803)
Adds systemChat to receive the combination for whatever you upgrade as
well as dayz_rollingMessages.

The same as what modular_build does.
2016-11-27 11:36:47 -05:00
ebaydayz b6d88b1329 Update vanilla building
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/674624d1221e7f661189206631e066b48870e0c7
2016-11-25 16:25:26 -05:00
ebaydayz ec6b5eb679 Move Repair and Salvage back to fn_selfActions
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
2016-11-23 13:34:22 -05:00
ebaydayz 6aa0cb8215 Update vanilla building
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/dfc46eff7b3188dfe65ffa616f9b7cb2985bc654
2016-11-21 14:57:02 -05:00
ebaydayz 2d394c32da Move sharpen action to ItemKnifeBlunt
Avoids confusing message "Missing ItemKnifeBlunt to do this"
2016-11-21 13:55:09 -05:00
ebaydayz 0c9fbc40c8 Remove Salvage from Bicycle in configs 2016-11-21 13:43:11 -05:00
ebaydayz 5e97435d7b Fix can't sell classic bloodbag 2016-11-20 21:24:27 -05:00
ebaydayz 901329c9ec Fix vanilla crafting actionInProgress 2016-11-20 20:34:05 -05:00
ebaydayz 3aad4b61e9 Move some addActions to config UserActions
Should improve client FPS while still allowing conditions and scripts to
be customized.

Some special vehicles like MV22, UH1Y, etc. have UserActions overwritten
in their configs, so please let me know if you find any others that do
not get the option to repair or salvage because UserActions is
overwritten in their config. I think I got them all.

Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/350d73abe1e39f15b3b41d38400ce9ec2d0d74e8
2016-11-20 19:47:21 -05:00
ebaydayz b01a4165a8 Comment some unused achievement code
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/3ec1cc3c5db3cb9c8a0a974ef6d11248b761cea0

https://github.com/DayZMod/DayZ/commit/3171f68beee73430d3236cfd4e43e13535209174
2016-11-18 13:22:36 -05:00
icomrade e398250489 Fix refuel trucks, add upgraded trucks to array
Issue was:
A. with locality, we were checking the wrong vehicle in one instance and

B. with variable names, since we called local_setFuel and _vehicle was
private already from the calling script we ran into an issue with
duplicate variables causing the command to fail. local_setFuel doesnt
really need any local variable so I removed them and this fixed the
issue (script filters may need to be adjusted accordingly)
2016-11-16 14:53:17 -05:00
ebaydayz f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz 89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
oiad be1fb51fe8 player_onPause fixes (#1796)
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
2016-11-12 20:56:58 -05:00
ebaydayz db3d9bf474 Update vanilla object_maintenance.sqf
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/f6e98f3be092c26fdf3405cb054fc254adcca8c8
2016-11-12 15:19:42 -05:00
ebaydayz f87ac79acc Add missing private var in hotwire_veh.sqf 2016-11-12 14:54:29 -05:00
ebaydayz 88870a6b2a Sync closeDisplay exit codes for easier scripts.txt filtering 2016-11-11 14:48:41 -05:00
oiad d28ac4de22 Hotwire rework
Rework again! - Readd sleep
2016-11-11 15:49:08 +13:00
oiad b0926b2a82 Hotwire rework
Hotwire rework
2016-11-11 14:45:48 +13:00
oiad 310fef893d Hotwire vehicle changes
Adds a localization for hotwire kit working
Updates localization for hotwire kit failing
Adds medic animation/sound and zombie notify
2016-11-11 10:45:07 +13:00
ebaydayz eedf7dd12c Fix door and plot management display text for mustBeClose
Also removed unneeded uiNamespace vars.
2016-11-08 19:27:05 -05:00
ebaydayz 261dc4b373 Allow crafting with dull knife
Output is still reduced for dull knife when gutting animals.
2016-11-07 17:37:22 -05:00
ebaydayz 01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz e1bf11c4bb Remove empty folder 2016-11-06 13:15:18 -05:00
ebaydayz 88691fe9d1 Fix mistake in remove.sqf
DZE_DoorsLocked is a list of strings, not objects. I'm surprised no one
noticed this before.
2016-11-06 12:28:26 -05:00
oiad 0159b1418d Remove unreferrenced file (#1793)
This is an old file from A plot for life, we also use player_build for
tents now.
2016-11-05 20:40:35 -04:00
oiad 497b065663 Localization changes/additions. (#1787)
* 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
2016-11-04 12:08:47 -04:00