Commit Graph

58 Commits

Author SHA1 Message Date
ebaydayz
e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz
4263b0732f Allow damage from tripwire grenade
Vanilla commit:

30c746892f
2016-11-06 13:39:30 -05:00
ebaydayz
1b3ed13a47 Remove unnecessary check in damage diag_log
Vanilla commit:

e826a8bda9
2016-10-31 16:04:27 -04:00
ebaydayz
cf0ef07ade Fix process hit running twice
Vanilla commit:

604c1f0577
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
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
ebaydayz
7ddee142b0 Update confirmed kills system
Vanilla commits applied:

347105c036

e6b6814f51

1009828d8e
2016-10-15 15:08:48 -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
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:

15e923fb19
2016-10-11 19:57:14 -04:00
ebaydayz
3604d77823 Fix reversed comments for RunOver/Dragged
Vanilla commit:

ef3600bd32
2016-10-07 14:19:08 -04:00
ebaydayz
5b158b398a Fix damage handling of vehicle explosions
Vanilla commit:

589791e9f9

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
ebaydayz
97796bf524 Update change log 2016-10-03 15:45:13 -04:00
ebaydayz
8196c2343a Fix inCombat checks from 0a17804
My mistake from 0a17804
2016-10-02 21:13:17 -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
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
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
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
d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz
b4be955a0d Update new runover death message 2016-09-28 18:57:09 -04:00
icomrade
a09e364ec1 Don't block damage from explosives 2016-09-12 14:42:18 -04:00
ebaydayz
da2faeb6d0 Add back fall damage block for local explosion cheats
Vanilla commit:

a02294421c
2016-08-21 13:06:02 -04:00
ebaydayz
289b1307ff Fix speed typo in damage handler and vehicle getOut
Vanilla commit:

1f6dd9f787
2016-08-21 12:06:12 -04:00
ebaydayz
92fbfdfdae Fix gunshot study body death message
Vanilla commit:

9993400f97
2016-08-21 12:02:10 -04:00
ebaydayz
c75ccbb8b3 Move _hit == "" exitWith further down in damage handler
Vanilla development commit:

837a2623b0
2016-08-13 20:22:57 -04:00
ebaydayz
7b287a2a23 Send PVDZ_sec_atp messages as array
Vanilla development commits:

6e0fd6203b

78ed0665fa
2016-08-12 17:23:49 -04:00
ebaydayz
7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

3db0fe8e7a

73a63898f1

08e18d5b52

126da2dcd3

d5fa323865

d37526fcc6

5fcca134f0

c9c1fc934d
2016-08-11 15:16:53 -04:00
icomrade
e446603ea2 Fix combat logging
In the initialize section of the fsm r_player_unconscious and
r_player_timeout return their default values (false and 0). Also, the
Vanilla server-side combat check doesn't appear to work, or it doesn't
work with the antihack disabled (I haven't tested with it enabled).

New variable inCombat is set more quickly than the combatTimeout
variable
2016-07-26 20:51:10 -04:00
ebaydayz
3a5fc91329 Fix missing string typo
My mistake from
7751914428
2016-07-17 16:00:12 -04:00
ebaydayz
7751914428 Rename vanilla strings from #1708
When localizing vanilla strings please do not put "EPOCH" in their name
or include them in the dayz_epoch package of the stringtable. This
creates more work to backport common translation updates and vice versa.
2016-07-17 14:02:04 -04:00
oiad
3d75c67574 Localization updates
Some localization updates and some code optimization.
2016-07-17 22:23:25 +12:00
icomrade
6fa3365b70 check if player is alive for humanity change 2016-04-29 17:19:48 -04:00
icomrade
89eea668f5 better math 2016-04-29 17:00:56 -04:00
icomrade
8158245b83 Possible fix for #1645 2016-04-29 16:48:14 -04:00
ebaydayz
5157228e67 Update all cutText to dayz_rollingMessages 2016-04-16 15:47:49 -04:00
ebaydayz
3ed4a95c14 Rework death messages
MPHit does not always fire when a player is killed:
https://community.bistudio.com/wiki/ArmA_2:_Event_Handlers#MPHit

Using either MPHit or MPKilled is not a good idea here. There is already
a local 'killed' event handler which fires on player death
(player_death.sqf). That script sends a PV (priority message) to the
server which triggers server_playerDied. That means fnc_plyrHit needed
to finish sending its data to the server via public setVariables
(non-priority messages) before server_playerDied executed. Triggering
both these scripts at the same time was a bad idea.

Instead of sending the data to the server via setVariable I just
included it in PVDZ_plr_Death. This also lets us pass extra information
from the damage handler like ammo type, cause of death, etc. Still need
to test, but it should be more reliable and performant than
fnc_playerHit called from MPHit or MPKilled.
2016-03-23 19:52:04 -04:00
ebaydayz
f0757b1544 Send dayz_playerName as array
This avoids triggering PV value restrictions when the player has
keywords or special characters in their name.
2016-03-20 22:12:11 -04:00
icomrade
68da397c52 Finish Medical and Sleep to UiSleep 2016-03-05 22:34:25 -05:00
icomrade
b96cd2d971 Update compiles - 2 more files to do
fn_selfActions.sqf
player_updateGui.sqf
2016-02-29 00:26:12 -05:00
[VB]AWOL
e7571b072d commented out more diag_logs 2014-06-02 13:40:26 -05:00
icomrade
e54b9983dd Replace forEach with Count
Use count where you do not need _forEachIndex variable, it's quicker
than forEach.
2014-05-27 15:37:57 -04:00
icomrade
b80bb88467 Add missing variable + RPT cleanup
fix 2 dup string warnings
fix "Cannot delete class rscdisplayinfo" warning.
Start extended vehicle damage debugging.
2014-03-26 02:40:24 -04:00
Florian Kinder
bf13a783d9 Updated startcombattimer variable 2014-02-20 18:01:16 +01:00
[VB]AWOL
cbcc5a63f6 fixed #1040 2014-01-29 14:21:40 -06:00
Skaronator
40e4239d42 More PVS/PVC Stuff 2014-01-16 14:39:53 +01:00
Skaronator
a7d27c0829 Complete #941 - Not Tested 2014-01-12 16:04:03 +01:00