Commit Graph

4729 Commits

Author SHA1 Message Date
ebaydayz
c2e63f63ae Merge pull request #1782 from oiad/master
Reduce client RPT spam
2016-10-28 20:01:07 -04:00
oiad
cf8e06bc8b Reduce client RPT spam
As per subject
2016-10-29 12:59:21 +13:00
oiad
1c7e96a0ff Advanced trading modifications, maintain_area modifications (#1780)
* 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.
2016-10-28 19:29:04 -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
icomrade
f92d84f720 Fix issue laying down near buildables 2016-10-26 16:58:06 -04:00
ebaydayz
c7d9741be4 Add height check for logout in air vehicle exploit
This prevents players who logout in grounded air vehicles from being relocated.
2016-10-25 18:48:54 -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
6713c1cf70 Lower nutrition values for push plane
Vanilla commit:

81297c8e26

Now using the same as refuel.

It takes a lot of pushes to move the plane any significant distance
(usually 10-20).
2016-10-20 15:28:23 -04:00
ebaydayz
9689301b07 Hide show on screen text for Vehicle Locked and Destroy %1 2016-10-20 14:46:08 -04:00
ebaydayz
5e170029d0 Fix dayz_playerUID undefined in selfActions when target is not null at login
Selfactions can run before dayz_playerUID is defined in
player_monitor.fsm.
2016-10-20 14:34:48 -04:00
ebaydayz
74879c85a4 Update onPlayerDisconnect.sqf
Vanilla commit:

b103437918
2016-10-20 14:03:44 -04:00
ebaydayz
00bc2170ec Update test build 2016-10-20 13:18:57 -04:00
ebaydayz
cf0ef07ade Fix process hit running twice
Vanilla commit:

604c1f0577
2016-10-20 13:00:58 -04:00
ebaydayz
e50ce31d08 Update changelog
Not currently functional
2016-10-19 21:00:27 -04:00
ebaydayz
b8aba38dca Fix humanity hit when crashing vehicle 2016-10-19 19:53:52 -04:00
ebaydayz
17c0661094 Increase crash damage scale 2016-10-19 18:29:25 -04:00
ebaydayz
8beba72cbb Remove unneeded check in toggle streamer mode 2016-10-19 16:02:43 -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
d116bfecb4 Should fix BIS_Effect eject/kill
excludes cars now
2016-10-19 13:23:44 -04:00
icomrade
606098a1e3 Fixes SetFace error 2016-10-19 12:45:35 -04:00
ebaydayz
869e95eb2c Fix wrong variable name in z_at_calcFreeSpace
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
2016-10-18 15:56:45 -04:00
ebaydayz
fffcf43bbb Spawn infectious waterholes locally on each machine
Vanilla commits:

2d47c7250c

94a0bac524

44b7114129
2016-10-17 16:49:24 -04:00
ebaydayz
228ac99eb1 Set body studied status globally so confirmed kill is only added once
7402b240df
ensures _source will always be a player, so it's no longer necessary to
check that.

Vanilla commit:

a8c9eaebe0
2016-10-17 16:11:54 -04:00
ebaydayz
1964a084ff Avoid sending humanity hit if source is local
We only want to send a humanity hit if the source is a remote player.
Note it's not necessary to check isNull since (isPlayer objNull) returns
false.

Vanilla commit:

7402b240df
2016-10-17 14:52:34 -04:00
icomrade
fd0a4685fe Update private array
6cf740e7d4 caused undefined variable
errors since the variables were private in 2 places. _forced and
_recorddmg should be declared private in the top of the script where
they are defined, not in the compile.
2016-10-16 12:53:20 -04:00
ebaydayz
84d58a5932 Update vanilla chop wood and mine stone tool break chance
Vanilla commits applied:

5010767849

ac39f46a8c
2016-10-15 17:15:31 -04:00
ebaydayz
f21b4f0f41 Remove t_stub_picea.p3d from dayz_trees
See:

bf31d8f6e7 (commitcomment-19441154)
2016-10-15 16:48:29 -04:00
ebaydayz
7ddee142b0 Update confirmed kills system
Vanilla commits applied:

347105c036

e6b6814f51

1009828d8e
2016-10-15 15:08:48 -04:00
ebaydayz
81aed28f87 Update vanilla break in chance for tool damage
Vanilla commit:

9de0fbd15f
2016-10-15 14:29:30 -04:00
ebaydayz
2ee3d44b87 Fix blood regen with classic nutrition system
Vanilla commit:

d1542874b1
2016-10-15 14:05:15 -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
a6cb29aa7e Prevent spamming sleep on tent
Vanilla commit:

e9df65bc56
2016-10-15 12:04:44 -04:00
ebaydayz
05fda7b229 Block binding multiple controls to hold breath
Vanilla commits:

d77c47fdc1

2ffe5b4337
2016-10-14 20:14:34 -04:00
ebaydayz
9f608fdf44 Add humanity gain for giving splint to other players
Vanilla commit:

879d6ee4bf
2016-10-14 16:26:57 -04:00
ebaydayz
01a5bbe687 Update Melee bat damage
Vanilla commit:

b3781670b4
2016-10-14 16:18:52 -04:00
ebaydayz
0da569acad Update zombie_agent.fsm
Vanilla commit:

402bb4e109
2016-10-14 16:14:43 -04:00
ebaydayz
6cf740e7d4 Update _object_damage private array
Vanilla commits:

21ea5984c9

a13e7240dc
2016-10-14 16:07:03 -04:00
ebaydayz
5e51787e59 Remove rSwitchMove in Turbo key block
Vanilla commit:

8b551681d9
2016-10-14 15:03:53 -04:00
ebaydayz
d44696be3a Delay player_death 1s if spawned from Killed EH
Vanilla commit:

96c9be3ecf
2016-10-14 12:40:19 -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
ebaydayz
7044b0095d Get player name before death
Vanilla commit:

3e8c9410c5
2016-10-13 16:01:55 -04:00
ebaydayz
0b9c4a7ade Allow physics damage from vehicle crash
Vanilla commit:

804445830f

This was exiting with 0 damage if _hit=="". It accounts for vehicles not
being damaged at all when crashing full speed into walls. It was also
causing the player to sometimes glitch out of the vehicle or into the
ground when crashing as you noticed before @icomrade.

Also fixed driver getting a humanity hit for damaging passengers in
crash. Reverting 22b2a3a since this is more reliable.
2016-10-13 13:45:01 -04:00
icomrade
c89031e089 Fix clothes change exit on gear count fail 2016-10-13 11:42:01 -04:00
icomrade
aac372d320 Remove animation for switching clothes
If the gear sync script is called during the animation, the player will
fail the gear sync and not change clothes. After removing the anim this
no longer happens. Also I think this is a BS change that only
inconveniences the player and makes something that is already cumbersome
even more so
2016-10-13 11:40:54 -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