Commit Graph

927 Commits

Author SHA1 Message Date
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:

b3781670b4
2016-10-14 16:18:52 -04:00
ebaydayz
916f1733eb Add back melee ammo after removal for BIS_fnc_inv
Vanilla commit:

516d1d538c
2016-10-13 20:26:07 -04:00
icomrade
edfba1516b Fice setFace error, use player's face for SP skins 2016-10-13 11:37:50 -04:00
icomrade
32131f866c Use OA config values for _DZ weapons 2016-10-12 15:01:56 -04:00
ebaydayz
854cbefdb2 Make all player names the same color in the lobby
Vanilla commit:

8614f37ccf
2016-10-12 12:21:42 -04:00
ebaydayz
05fa3e6a9a Update keyboard_keys after changing controls in-game
Vanilla commit:

e9b21a7e79

@icomrade we forgot to refresh keyboard_keys after the player changes
their controls in-game. The keyhandler was still using the old
keyboard_keys array since it is only set once at login time. The new
keys they set in-game wouldn't work until they relogged.
2016-10-11 15:34:10 -04:00
icomrade
f663cdcb39 Use OA config definitions for DMR
fixes NVGs
2016-10-10 16:12:49 -04:00
ebaydayz
5fdbced171 Add more loot and zed positions for namalsk
Vanilla commits applied:

57511ad463

7745633e8e

0e237c0274

95d3f94f88

6e4598a3e1

081620cccb
2016-10-08 19:58:58 -04:00
ebaydayz
0f0dcfd522 Merge pull request #1775 from oiad/master
Rename plot pole and dze_BuildChecks changes.
2016-10-08 12:36:36 -04:00
ebaydayz
d3bd2ba4a1 Update vanilla barn loot pos
Vanilla commit:

b8eed6fc70
2016-10-08 12:07:07 -04:00
oiad
5bc36166a7 Rename plot pole from "30m_plot_kit" to "plot_pole_kit"
Sanity change since the plot pole is not fixed at 30 meters and is
configurable.
2016-10-08 12:51:21 +13:00
A Man
e55b0b1ce5 GP25 wrong text
GP25 had the wrong description text.
2016-10-06 20:07:54 +02:00
ebaydayz
f41dbf377c Remove duplicate UH1H_DZ2 class
Duplicate of UH1H_2_DZ

This was not in 1051, so no need to swap in SQL updates.
2016-10-05 13:31:39 -04:00
A Man
2519d7e52e Addong german strings, updating heli displaynames, new UH-1H DZE (#1772)
* Updating displaynames 

Unfortunately I gave a few choppers their class names as displaynames. That should be better now.

* Adding DZE for UH1H_2 variant, displayname update

Adding the UH1H_DZE with no ammo. Adding better displaynames for the UH1H

* Updating german strings

Adding a lot german strings and correcting a few.

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml
2016-10-05 12:51:50 -04:00
ebaydayz
d109d9fb01 Fix SVD_DZ alternative iron sight
Vanilla commit:

8027cf6917
2016-10-03 16:49:26 -04:00
ebaydayz
a8e9c71ed1 Update some loot spawn rates
Vanilla commits applied:

8be21c0322

256212388d

8d928c4c8f

b83d74e076
2016-10-03 12:53:15 -04:00
ebaydayz
004a3bcde4 Fix wrong string used for Mountain Green soda
Mountain green was using the mountain dew strings too. These strings
were unused.
2016-10-02 20:31:52 -04:00
ebaydayz
de219116a8 Optimize save after trade
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.
2016-10-02 15:44:51 -04:00
oiad
9fd2f2270b Advance trading gem fixes/localizations (#1771)
* 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
2016-10-02 13:06:31 -04:00
ebaydayz
341e734373 Change satchel and mines to single gear slot
For consistency with all other items in Epoch.
2016-09-30 21:47:48 -04:00
ebaydayz
cc28d43d25 Remove unit's local event handler anticheat check
The createUnit remote execution locality exploit was fixed in current
A2OA stable patch 131129:
https://forums.bistudio.com/topic/186695-a2a2oa-patch-18122015/

This is now unnecessary and would needlessly restrict modders.
2016-09-27 16:04:14 -04:00
icomrade
514ac67650 Better OnPause 2016-09-25 20:31:38 -04:00
oiad
c02053176d Advanced trading bugfix, Snap building typo and snap point fixes
Fixes a bug with advanced trading green "you have this item" text in
buyables list, this was showing you had the item when you didn't.
Snap building typo
Snap building snap points for large cinder walls as reported by
@SmokeyBR
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-248021073
2016-09-24 18:53:02 +12:00
icomrade
e8006a40af Non-blocked messages
Displays at the bottom center of the screen. This now accepts formated
(structured) text, see https://community.bistudio.com/wiki/parseText for
more info
2016-09-23 14:02:31 -04:00
A Man
7b22d9dd14 New loot tables for zombies
Adding 3 new  loot tables
2016-09-20 01:28:42 +02:00
A Man
7ea6e9c7a4 Zombie loot update
Adding 3 more options for zombie loot to give admins better possibilities to customize the zombie loot.
2016-09-20 01:27:31 +02:00
A Man
5e3d4c7890 Zombie loot update 2016-09-20 01:25:20 +02:00
A Man
b751ffb278 Small loot position update
Adding Land_stan to loot positions. It is the same like the Camp. Increasing the high of loot positions to prevent loot from spawning in the ground.
2016-09-19 21:45:19 +02:00
icomrade
37a717fe3f Fix generator gear display and Offroad hud
using generator as a tent should have no adverse effects.

Thanks @SmokeyBR
2016-09-19 12:08:25 -04:00
ebaydayz
61f38fc259 Use number instead of string for weapon slot type in configs
This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
2016-09-18 14:58:35 -04:00
icomrade
0802ecc0ed Do not require plot to build traps 2016-09-14 17:48:23 -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
icomrade
26f9102a00 These are used
I didn't save all before commiting :(
2016-09-12 12:57:08 -04:00
icomrade
06202e753f Minor loot/crafting cleanup
removed DayZ fences and unused item, added some crafting supplies to
trader (marginal savings if you craft bandages as opposed to buying
them)
2016-09-12 12:55:47 -04:00
icomrade
caddfafc78 oops 2016-09-11 14:24:20 -04:00
icomrade
b806043a4a Save player and vehicle after trade
Also forgot to commit a change yesterday
2016-09-11 12:52:38 -04:00
oiad
64348b1f84 Localization additions
Adds some more text to localization, Moves sandbags around so they are
all next to each other.
2016-09-11 15:21:43 +12:00
ebaydayz
bbe6be6c31 Rename Multiplayer Setup to Lobby
Vanilla commit:

fd90a380a7
2016-09-10 13:19:31 -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
cb09377d26 Add GPS, Rangefinder and NVG back as sell only
Partially reverts
7435548582
@AirwavesMan now that buy or sell only is available via:

ffef031863
2016-09-09 14:05:06 -04:00
ebaydayz
771284a297 Auto select main weapon after throwing
Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

08449fdfda
2016-09-06 16:36:45 -04:00
ebaydayz
c8b3053496 Remove unused keyboard_keys function
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

f5780256ee
2016-09-05 14:16:38 -04:00