Commit Graph

4765 Commits

Author SHA1 Message Date
ebaydayz 5fdbced171 Add more loot and zed positions for namalsk
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/57511ad463d828a6d53eefbaf309baaf09160ffe

https://github.com/DayZMod/DayZ/commit/7745633e8e1f1845a9ca80d490abb5201ab1095b

https://github.com/DayZMod/DayZ/commit/0e237c02740796b9be14fd44b8e53838c71beaf5

https://github.com/DayZMod/DayZ/commit/95d3f94f881de42509f40ef4603038454f2d9b66

https://github.com/DayZMod/DayZ/commit/6e4598a3e1ba2af72de45d8f5342f88186a9d396

https://github.com/DayZMod/DayZ/commit/081620cccb83e20ada20766271f1662847ed3516
2016-10-08 19:58:58 -04:00
ebaydayz 4670f16e89 Rename _isOwner variable to _hasAccess
This is a more logical name in these cases, since friendlies and admins
are not the owner.
2016-10-08 15:57:51 -04:00
ebaydayz e6d1e0050d Remove redundant _canDo and cursorTarget checks in selfActions
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/dfb199fbc3c87995739c187031161d7d67d6b9c3
2016-10-08 15:36:38 -04:00
ebaydayz 534abdbdf0 Remove excessive door management config variables
Too many config variables made this unnecessarily complicated. Most
servers will want the defaults. For those that want to customize further
they can easily overwrite these files.

These seem like the most logical defaults to me. Allow all of these
people to manage and unlock by default:
- door owner
- plot owner
- plot friend
- plot admin
- door friend
- door admin

Door friends should be able to manage by default so they don't have to
wait for the owner to come back online to add someone as a door friend.

Plot friends and plot admins can get around the door by removing it and
building another one anyway, so locking them out is pointless. It is
still useful to have these as separate variables for servers that do not
require plot poles though.

Regular friendlies should not be included by default, since we have the
more fine grained plot friends and door friends lists for that. Regular
friendlies will probably be replaced by groups in the near future
anyway.

Please post a comment if there are any issues with these defaults I'm
forgetting. Thanks.
2016-10-08 14:49:59 -04:00
ebaydayz f395f2303c Update 30m_plot_kit classname in epoch.sql #1775
@oiad #1775
2016-10-08 12:44:34 -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:

https://github.com/DayZMod/DayZ/commit/b8eed6fc70ea620675ed0b6d054b9471f5983e29
2016-10-08 12:07:07 -04:00
oiad 78fac87333 dze_BuildChecks changes
This changes the reasons to be more understandable about why you can't
build somewhere.
Some localization fixes to be more englishy.
2016-10-08 12:53:25 +13: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
ebaydayz 8a2d95295b Restrict access to show plot boundary action
Only the owner, plot owner, plot friends and plot admins should be able
to see the plot boundary. Randoms just use it for griefing.

Also renamed the targetX variables to the more appropriate doorX in
fn_check_access since they are only used if the target is a door.
2016-10-07 17:39:06 -04:00
ebaydayz c0d7917603 Add note about Linux server 2016-10-07 15:56:27 -04:00
ebaydayz a909d713c3 Fix death message handling of vehicle explosion 2016-10-07 15:08:00 -04:00
ebaydayz 79d2b268a8 Changed loot_spawn to use PositionAGL
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7e413848fb0953a81f1822b444e065cfc0675d21
2016-10-07 14:41:47 -04:00
ebaydayz 3604d77823 Fix reversed comments for RunOver/Dragged
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef3600bd32d239531ed6a791cf9f5d3a0336e199
2016-10-07 14:19:08 -04:00
icomrade b25b7636a7 Direct menu to cursortarget or player
Please test the living hell out of this.
2016-10-07 13:46:53 -04:00
ebaydayz 5b158b398a Fix damage handling of vehicle explosions
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/589791e9f9116e8b230e01d51fabde028298ea7a

This was being falsely triggered before because the distance (3m) was
far too small and it was only counting fast moving vehicles. The player
can be damaged up to 25m away from the vehicle explosion.

The comment was incorrect. It can be easily checked by using the
included diag_log at the top of this file.
2016-10-07 13:42:05 -04:00
ebaydayz b193ad925a Use more efficient check for "shot" death message
Most of the time the source will be local (zombie) or player (physics).
The next most common will be getting shot by a remote player, the least
common will be getting shot by a remote vehicle.
2016-10-06 19:13:46 -04:00
ebaydayz 7909f0089f Make minor adjustments to damage handler
These variables were moved down so they aren't checked unnecessarily
when the script exits.
2016-10-06 16:25:39 -04:00
oiad 5472eda2a8 Add M240Nest_DZ to maintain classes variable. (#1773)
* Add M240Nest_DZ to maintain classes variable.

This makes it so M240Nest can be maintained. (Which it should be)
2016-10-06 14:46:35 -04:00
ebaydayz 976314df24 Merge pull request #1774 from AirwavesMan/master
Fixed GP25 wrong text
2016-10-06 14:26:37 -04:00
A Man e55b0b1ce5 GP25 wrong text
GP25 had the wrong description text.
2016-10-06 20:07:54 +02:00
icomrade 5381748c63 better gear menu check
should be less annoying
2016-10-05 20:13:26 -04:00
ebaydayz 50584d3ff4 Update test build 2016-10-05 17:41:40 -04:00
ebaydayz 2ee06afea7 Sync chopped down trees for JIP players
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a57478fb1aac015926b25a6b108fabe5935efce9
2016-10-05 17:24:10 -04:00
ebaydayz 6e544e447e Fix some missing spaces in stringtable from #1772 2016-10-05 15:27:26 -04: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
ebaydayz 8c237492b9 Update vanilla player_build
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/fd8e1e2baaf2dc99d8a1ee4e550d7fade22e1ed9
2016-10-05 13:01:40 -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 2109fdba03 Prevent sell from vehicle dupe
Prevents dupe described here:

https://epochmod.com/forum/topic/41891-resource-a-collection-of-anti-dupes/#comment-281324
2016-10-05 12:17:17 -04:00
ebaydayz d109d9fb01 Fix SVD_DZ alternative iron sight
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/8027cf6917a29f84627eca3118c2b92352693f5b
2016-10-03 16:49:26 -04:00
ebaydayz 97796bf524 Update change log 2016-10-03 15:45:13 -04:00
ebaydayz df39ea0f30 Fix DomeTentStorage SQL Update
The Epoch dome tents had more cargo space than the default vanilla ones,
so we have to use the level 1 upgraded version to prevent gear falling
out.

Also corrected swap for DesertTent.
2016-10-03 13:17:10 -04:00
ebaydayz a8e9c71ed1 Update some loot spawn rates
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/8be21c0322ec1aeff4ad9c5e4929702c316ac1a2

https://github.com/DayZMod/DayZ/commit/256212388d8a3966178c80dea35021bb573256fa

https://github.com/DayZMod/DayZ/commit/8d928c4c8f43c25636243f46b735b5b209e650a6

https://github.com/DayZMod/DayZ/commit/b83d74e0765b47c8141492a2c75fabbfa473cea5
2016-10-03 12:53:15 -04:00
ebaydayz da524041ee Update vanilla fences
Vanilla commits applied:

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

https://github.com/DayZMod/DayZ/commit/45e757ece2fdb099dade57350eb62eaf7986375d
2016-10-03 12:27:43 -04:00
ebaydayz 591af81575 Add exit in fn_waitForObject.sqf
This is just in case something goes very wrong (like bad server lag) and
the object doesn't spawn.
2016-10-02 22:30:38 -04:00
ebaydayz 8196c2343a Fix inCombat checks from 0a17804
My mistake from 0a17804
2016-10-02 21:13:17 -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 87bebfad1f Improve publishVeh2 diag_log 2016-10-02 20:07:03 -04:00
ebaydayz 4faa1cbaab Set third parameter after findSafePos
All other scripts using findSafePos either set the third parameter or
use a getPosATL/etc. instead before the position is saved to database.

Also partially reverted d6e78b2 since it is not needed.
2016-10-02 18:51:46 -04:00
icomrade 1af4cc070f Fix issue with objects spawning in debug
better logging as well.

I haven't had objects purchased spawn in the debug, only those spawned
in with the admin tools since the position doesn't always have a third
element.
2016-10-02 16:20:35 -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
icomrade 353d3732d1 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-10-02 15:00:49 -04:00
icomrade f66c512485 Revert SQL changes, update key gen
slightly different generation scheme
2016-10-02 15:00:35 -04:00
ebaydayz 91f168011c Remove unused variable from #1770
_inventoryMoney was unused @oiad
2016-10-02 14:11:20 -04:00
ebaydayz c4f861630d Fix typo from 55910cc
Variable is not defined in this script.
2016-10-02 13:57:33 -04:00
ebaydayz 55910cc3d2 Remove humanity hit for killing player zombies
If you kill a player zombie you should not lose humanity. Player_death
is now synced with the humanity hit code in the damage handler.

Also the killing blow set variable was moved up because the same
conditions were already checked above.
2016-10-02 13:50:30 -04:00
ebaydayz 4509902822 Remove source object from Humanity hit network send
Source object is always player and not needed anymore after 8ea21a2
2016-10-02 13:26:11 -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 f353967abb Remove duplicate transfusion in progress messages
In addition to 11fa6a6

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/f4aac518c1017b689dad36c1d15b32fd94315a2e
2016-10-01 20:06:59 -04:00
icomrade 02218b736c Update epoch.sql 2016-10-01 19:37:56 -04:00