Commit Graph

779 Commits

Author SHA1 Message Date
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
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
05fa3e6a9a Update keyboard_keys after changing controls in-game
Vanilla commit:

e9b21a7e79

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

6326f1186d
2016-10-11 13:06:57 -04:00
ebaydayz
7869288f39 Reblock turbo when on foot
Vanilla commit:

5bf403bb43

See:

46af339ce5
2016-10-10 16:34:40 -04:00
icomrade
347c531edc Fix reversed variable 2016-10-10 15:38:09 -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:

dfb199fbc3
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
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
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
3604d77823 Fix reversed comments for RunOver/Dragged
Vanilla commit:

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

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
icomrade
5381748c63 better gear menu check
should be less annoying
2016-10-05 20:13:26 -04:00
ebaydayz
97796bf524 Update change log 2016-10-03 15:45:13 -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
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
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
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
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
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
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
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
ebaydayz
b4be955a0d Update new runover death message 2016-09-28 18:57:09 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
79c6d605a5 Add back playMoveNow in fn_unconscious.sqf
Partially reverting 341d45f

See comment on 341d45f
2016-09-27 16:50:59 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
icomrade
58e90da07d Fix transfusion in vehicle 2016-09-27 12:46:13 -04:00
icomrade
514ac67650 Better OnPause 2016-09-25 20:31:38 -04:00
icomrade
40d419e475 Re-add abort timeout
Timeout is no longer restarted when you click abort and the loop now
closes the gear menu so the player cannot attempt to dupe with the gear
menu and abort menu open at the same time.
2016-09-23 19:10:39 -04:00
icomrade
770378b3af Private array 2016-09-23 17:22:57 -04:00
ebaydayz
c1763171db Fix damage on local trader city objects
This fixes local trader city objects taking damage from being run over.
2016-09-23 12:08:51 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
ebaydayz
33cf7611ed Don't allow jerry fill from destroyed fuel source
Vanilla commit:

90251abab3

9204c15d3f
2016-09-21 16:53:29 -04:00
ebaydayz
29d9ed9211 Set unit posATL in switchModel if respawn is in water
Reverts:

bcc16a0135

See:

e8e5d24e80
2016-09-17 15:41:49 -04:00