Commit Graph

4649 Commits

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

a57478fb1a
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:

fd8e1e2baa
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:

8027cf6917
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:

8be21c0322

256212388d

8d928c4c8f

b83d74e076
2016-10-03 12:53:15 -04:00
ebaydayz
da524041ee Update vanilla fences
Vanilla commits applied:

c5f2447f14

45e757ece2
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:

f4aac518c1
2016-10-01 20:06:59 -04:00
icomrade
02218b736c Update epoch.sql 2016-10-01 19:37:56 -04:00
ebaydayz
17b30a7a2e Fix AI damage scaling
Fixes shots from AI using default scaling. For example AK_74 was doing
200 blood per shot or 60 shots to kill.
2016-10-01 17:45:46 -04:00
ebaydayz
e630f428bc Enable self bloodbag by default
Most server will want this on, even vanilla has it enabled by default.
2016-10-01 16:00:46 -04:00
ebaydayz
d6e78b27f0 Add setVelocity in publishVehicle2
This prevents trader spawned vehicles from floating.
2016-10-01 15:56:52 -04:00
ebaydayz
8ea21a2c81 Fix humanity hit for units in vehicles
The only change is a removal of this check and the corresponding
tabs/spacing:

if (_object == player) then {

That returns false if the player is in a vehicle. It is not needed since
PVCDZ_plr_Humanity EH only fires on the intended player now (sent with
PVC instead of PV).
2016-10-01 13:43:30 -04:00
ebaydayz
0a17804e36 Change inCombat to bool instead of number
When a variable is only going to be 0 or 1 it makes more sense to use a
bool.

Also avoided unnecessary network broadcasts of inCombat from e446603
2016-10-01 13:07:59 -04:00
ebaydayz
76273d06cd Fix undefined error _hasBloodBag in fn_damageActions
When this function was passed an empty array (like a player with no
magazines) it returned undefined because the inside of the forEach loop
did not execute.
2016-10-01 11:31:24 -04:00
oiad
11fa6a631c Minor fixes (#1770)
* Minor fixes

Simplifies the serverside logging to be more human readable
Removes duplicate transfusion text

* Minor fix

Minor fix for syntax
2016-09-30 22:10:56 -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
ff8fb18cbf Correct stringtable explosion death grammar
Proper grammar when used in:
His name was %1, it appears he died from %2
and
%1 died from %2
2016-09-30 21:05:20 -04:00
ebaydayz
d9b785750d Fix death messages vehicle detection again 2016-09-30 20:51:34 -04:00
ebaydayz
88c1b83c31 Fix mine detection in death messages again 2016-09-30 20:06:18 -04:00
ebaydayz
1fb0b1004d Fix typo from d335ee2 2016-09-30 19:16:38 -04:00
ebaydayz
d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz
b45d6d9a24 Color new killfeed death messages
The player who died is colored red and the killer is colored green. The
weapon now points in the direction of the player who died.

Also reverted 66fd5be since it did not help. It is already done globally
in player_death.sqf anyway. I tested again and this actually fixes the
problem.
2016-09-29 20:26:26 -04:00
icomrade
1b91e808dd remove unused variable 2016-09-29 15:59:52 -04:00
icomrade
e49d786e2a Fix gear access on locked vehicles
This will be annoying in bases for sure, but cursorTarget just doesn't
work reliably.
2016-09-29 15:58:28 -04:00