Commit Graph

2692 Commits

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

https://github.com/DayZMod/DayZ/commit/81297c8e26ff24bd7094d722a4edfdbf0efaceec

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 cf0ef07ade Fix process hit running twice
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/604c1f05777a44f47dcae324473df129cf44c902
2016-10-20 13:00:58 -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:

https://github.com/DayZMod/DayZ/commit/2d47c7250c3eb6b4e746be9b130a11d4848779f3

https://github.com/DayZMod/DayZ/commit/94a0bac524b76eb630e9902318a807d5d0264619

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

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a8c9eaebe0fed9d88c30d9e8a16bce8272df1624
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:

https://github.com/DayZMod/DayZ/commit/7402b240df8dadd0e11f95885721cd0e7de87599
2016-10-17 14:52:34 -04:00
ebaydayz 84d58a5932 Update vanilla chop wood and mine stone tool break chance
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/50107678494d481d1944a465faa0eeb9f7325936

https://github.com/DayZMod/DayZ/commit/ac39f46a8c5bd0c3eeb908e4ac147f7762027a47
2016-10-15 17:15:31 -04:00
ebaydayz f21b4f0f41 Remove t_stub_picea.p3d from dayz_trees
See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/bf31d8f6e7c68b820f57709fdcba468ae4684ec0#commitcomment-19441154
2016-10-15 16:48:29 -04:00
ebaydayz 7ddee142b0 Update confirmed kills system
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/347105c036c56a8cac9bb2382aa11b4999b39063

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

https://github.com/DayZMod/DayZ/commit/1009828d8e9998ab06c2da5c3fe3a0c917abde66
2016-10-15 15:08:48 -04:00
ebaydayz 81aed28f87 Update vanilla break in chance for tool damage
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/9de0fbd15f0cd16cc2fa831acfa8361ff1d7dfe7
2016-10-15 14:29:30 -04:00
ebaydayz 2ee3d44b87 Fix blood regen with classic nutrition system
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/d1542874b130398995dc21f47a540ff94873349f
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:

https://github.com/DayZMod/DayZ/commit/e9df65bc56eff371a2f40209ee7b5c339a6c05f3
2016-10-15 12:04:44 -04:00
ebaydayz 05fda7b229 Block binding multiple controls to hold breath
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/2ffe5b43378f98235fa886ad3ee00549bd929940
2016-10-14 20:14:34 -04:00
ebaydayz 9f608fdf44 Add humanity gain for giving splint to other players
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/879d6ee4bf637687db8e755ac7ab6d6eb0f44920
2016-10-14 16:26:57 -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 0da569acad Update zombie_agent.fsm
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/402bb4e109abe7fb52b70edc2752b10c1ead19ee
2016-10-14 16:14:43 -04:00
ebaydayz 6cf740e7d4 Update _object_damage private array
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/21ea5984c94f83d940ebb23c985202ca40cd3929

https://github.com/DayZMod/DayZ/commit/a13e7240dcc6c3b9b736d3649f68eaf611459f03
2016-10-14 16:07:03 -04:00
ebaydayz 5e51787e59 Remove rSwitchMove in Turbo key block
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/8b551681d9fabf25a992b27187e182337e44b525
2016-10-14 15:03:53 -04:00
ebaydayz d44696be3a Delay player_death 1s if spawned from Killed EH
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/96c9be3ecf37e04c8048f70b559f88c71201d668
2016-10-14 12:40:19 -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
ebaydayz 7044b0095d Get player name before death
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/3e8c9410c5419f76b545d57fe42a51ce2883b326
2016-10-13 16:01:55 -04:00
ebaydayz 0b9c4a7ade Allow physics damage from vehicle crash
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/804445830ffa38bba742cc20c6645b75333725f5

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
icomrade bf31d8f6e7 Update tree array for NAPF
thanks @ndavalos
2016-10-12 14:55:24 -04:00
ebaydayz 854cbefdb2 Make all player names the same color in the lobby
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/8614f37ccf3e2f271b65ba70b15422fe8f10de21
2016-10-12 12:21:42 -04:00
ebaydayz 22b2a3a79f Prevent humanity hit to driver when crash damages passengers
I forgot to account for this when allowing humanity hit to players in a
vehicle:

https://github.com/DayZMod/DayZ/commit/15e923fb19ce0f52ae0c994269b56eb3aab6249b
2016-10-11 19:57:14 -04:00
ebaydayz 05fa3e6a9a Update keyboard_keys after changing controls in-game
Vanilla commit:

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

@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
ebaydayz fbb8cc645c Prevent automatic humanity morph when in vehicles
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/6326f1186d5fdd2ce8d39116cc30fe726126b70b
2016-10-11 13:06:57 -04:00
ebaydayz f8f9fbc57a Play medic animation when changing clothes
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b91c850f5f8d54135d66d767d52f95f0759f0635
2016-10-10 16:45:57 -04:00
icomrade 6f9316e496 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-10-10 16:40:05 -04:00
icomrade 920c359e46 Adjust nutrition values and exclude chainsaw
Everytime a piece of wood was spawned resulting from a chainsaw the
player would become more hungry and thirsty. Obviously in less than 10
seconds this would kill the player if they chopped multiple trees down.
2016-10-10 16:40:01 -04:00