Commit Graph

967 Commits

Author SHA1 Message Date
ebaydayz ea389b59ea Remove unneeded isKindOf "Man" checks
"Man" includes animals and zombies:

https://community.bistudio.com/wiki/ArmA_2:_CfgVehicles#Man_Class_Vehicles
2016-11-23 14:43:59 -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 aea0bb1298 Update animal cleanup on log out
Partial revert of 0483fa6
2016-11-21 20:54:33 -05:00
ebaydayz 0483fa61f6 Fix live animals being deleted in front of players
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/9d6be1731eca33172c340bc584771032ede92a69
2016-11-21 18:49:03 -05:00
ebaydayz 6853263f3d Update zombie generate
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/09aa9f8879b40013e852e2c8333ab2a219cff25e

https://github.com/DayZMod/DayZ/commit/68be696c4d91b59bc144267b189d90280abbcb46
2016-11-21 18:33:41 -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 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 efeadcfa35 Rename selectPlayer and selectGroupMember functions
Fewer scripts.txt exceptions needed
2016-11-19 19:39:08 -05:00
ebaydayz ad9a287d00 Remove unused Lada base class
Also removed some values that are already inhertied from 8429ad1
2016-11-18 12:18:13 -05:00
ebaydayz 8429ad1fbc Clear typicalCargo for some vehicles missing it
Prevents preloading units, may help with load times a little.
2016-11-17 15:40:08 -05:00
ebaydayz e266fee651 Fix right click on radio generic error 2016-11-12 19:16:19 -05:00
ebaydayz e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz 88870a6b2a Sync closeDisplay exit codes for easier scripts.txt filtering 2016-11-11 14:48:41 -05: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 ba43900036 Revert "Allow blunt knife for item actions"
This reverts commit 59a0548f5d.
2016-11-07 17:37:46 -05:00
icomrade 59a0548f5d Allow blunt knife for item actions 2016-11-07 17:14:30 -05:00
ebaydayz 01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz e0c06692e2 Update scrollbar color in lobby and player list
To match 6732e5c
2016-11-07 15:21:56 -05:00
ebaydayz de46a173dc Fix errors when removing traps
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b558351a0696724da9e17c31bd4c73b85e525a43
2016-11-06 13:05:46 -05:00
ebaydayz 677abe62aa Remove vanilla camo net
Duplicate of Epoch one.

Also had sliding issues when building because it did not have the proper
Epoch offset.
2016-11-05 20:53:22 -04:00
ebaydayz 754fc3744e Add delay at group startup 2016-11-05 19:18:51 -04:00
ebaydayz eaebdb7d93 Revert "Disable RadioProtocol spam"
This reverts commit ac99e45854.
2016-11-05 18:47:54 -04:00
ebaydayz 564144ee41 Revert vanilla work bench to player_buildVanilla
Partial revert of:

https://github.com/EpochModTeam/DayZ-Epoch/commit/2d9097a6af14ff21d0cd362eccaf62678c86060e

This workbench is currently not obtainable either by crafting or the
loot tables, so it is not used anyway. But with Epoch player_build
attempting to build it sends the player flying / sliding backwards at
high speed. Using the vanilla player_build that does not happen.

I tested building all the other items changed in the above commit and
none of them have this problem.
2016-11-05 16:34:00 -04:00
ebaydayz 13a3083bae Remove right click build sandbag action on shovel
Right click action on sandbag is more up to date
2016-11-05 15:32:49 -04:00
oiad d7f35c0cf3 Fix spelling mistake of classname DZ_Czech_Vest_Pouch (#1792)
* Fix spelling mistake of classname DZ_Czech_Vest_Pouch

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per

* More typo SQL goodness

As per subject
2016-11-04 21:40:27 -04:00
ebaydayz 12032477d4 Remove vanilla dismantle on sandbag and hedgehog
Epoch handles this in fn_selfActions
2016-11-04 20:46:53 -04:00
A Man 1223e08d79 Fixing string is not displayed correctly (#1791)
* Fixing not shown string

* Fixing not shown string
2016-11-04 20:42:24 -04:00
ebaydayz c314febe45 Remove unneeded controls from game options 2016-11-04 19:17:43 -04:00
ebaydayz 6732e5cb67 Recolor lobby and player list to dark grey 2016-11-04 18:56:33 -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
ebaydayz ac99e45854 Disable RadioProtocol spam
Seems to stop most groupChat spam and doesn't appear to cause any
issues.

If you still see group chat spam after this commit or notice any issues
with it please post a comment.
2016-11-02 16:58:25 -04:00
A Man 560580b0a2 Removing 2 old rightclick actions, shorter german text (#1786)
* Removing old code

Build Sandbag Fence is not longer used since the rightclick action to build a sandbag.

* Removing old code

Old code "remove tank trap" is not longer used since we have the scroll action for that.

* Update Prop_Defs.hpp

* Cutting some strings, removing old strings

* Update stringtable.xml
2016-11-01 15:10:59 -04:00
A Man 41324139eb Adding CanvasHut_DZ to DZE_isRemovable (#1785)
* Adding CanvasHut_DZ to DZE_isRemovable

CanvasHut_DZ had no remove option.

* Update Prop_Defs.hpp
2016-10-31 19:26:40 -04:00
ebaydayz 866358e4d0 Add launcher handling to advanced trading 2016-10-31 13:07:07 -04:00
oiad b1171c5f9b player_wearclothes changes, string changes and maintain area moving (#1783)
* player_wearclothes changes, string changes and maintain area moving

Adds 2 toggles for admins to modify:

DZE_backpackRemove forces the player to drop his/her backpack when they
change gear.
DZE_maintainCurrencyRate modifies the amount of worth each item is worth
to maintain.

Changes the error message in player_wearClothes to tell the player why
they can't change gear yet
Remove some debug lines that spam RPT

* Rework

Rework as per @ebaydayz

* Rework

Rework
2016-10-30 14:11:54 -04:00
ebaydayz 0be3a8522e Add sleep before refreshing controls
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/e6e0d057dd9977b0b46a1c096e25d784b3969669
2016-10-29 15:52:55 -04:00
ebaydayz 07525388a6 Hide group buttons on use 2016-10-29 15:08:46 -04:00
A Man aa267bda2c Adding many new strings (#1781)
* More Stringtable updates

Ive added and corrected more german strings. Some german strings were too long. Lots of building items needed a localization. Adding after request the Winter Ghillie Suit localization for Namalsk compatibility.

* Update for new localization

* Update for localization

* Update for new localization

* Update again

* localization update

* Update stringtable.xml

* Update Doors.hpp

* Update ModularBuilding.hpp

* Update stringtable.xml

* Update stringtable.xml

* Update Doors.hpp

* Update Prop_Defs.hpp
2016-10-28 15:05:35 -04:00
ebaydayz 98be67b59c Add safezone scaling to group dialog buttons 2016-10-27 20:16:35 -04:00
ebaydayz f770b0a85d Add group system
Initial commit, not tested in multiplayer yet. Some revisions still left
to do.
2016-10-27 16:06:49 -04:00
ebaydayz 84d549d0a1 Revisions for #1777 (#1778)
* 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
2016-10-25 13:59:56 -04:00
oiad bef2506653 Advanced trading fixes, server_handleSafeGear human readibility (#1777)
* 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
2016-10-25 13:10:48 -04:00
icomrade 56abe26b92 Fix combat in AH6 2016-10-21 12:09:51 -04:00
ebaydayz d13aafcd0c Add streamer mode game options setting
The chat list does not appear to be toggleable on the fly because it is
a display with no accessible controls. Giving it an idd and using
closeDisplay did not work. So it needs to be manually set off screen in
its config or covered up.
2016-10-19 15:49:30 -04:00
icomrade 606098a1e3 Fixes SetFace error 2016-10-19 12:45:35 -04:00
A Man 5ec92bcd65 Updating german stringtable, tent fix, loot table changes (#1776)
* Updating german stringtable

The update for STR_ACTIONS_2TB and STR_ACTIONS_RFROMTB are important. That fixes a very old bug. It was no really readable in german because the words were a way to long.

* Add files via upload

* Fixing Desert Tent pack output

When packing a DesertTent the output was ItemDomeTent not ItemDesertTent

* Decreasing hotwire kit chance

* Decreasing hotwire kit chance

* Decreasing hotwire kit and combo lock chance

* Decreasing combo lock chance, fixing loot group

* Fixing loot group

* Lowering ammo box spawn chances again.

* Fixing Desert Tent pack output all versions
2016-10-15 13:47:13 -04:00
ebaydayz 01a5bbe687 Update Melee bat damage
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b3781670b48ae19fe0612a07e12b2861b42a0eff
2016-10-14 16:18:52 -04:00
ebaydayz 916f1733eb Add back melee ammo after removal for BIS_fnc_inv
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/516d1d538c99becacda91c16e617d3df0a8ffc71
2016-10-13 20:26:07 -04:00