Commit Graph

108 Commits

Author SHA1 Message Date
worldwidesorrow a33a2bfcdf Remove variable medForceUpdate and replace execVM with called function. 2019-12-11 18:48:17 -06:00
worldwidesorrow bbdaf0cffe Uploading new files for load functions
The files are heavily edited.
2019-12-11 18:34:41 -06:00
worldwidesorrow 1b9679d646 Delete unload_wounded.sqf 2019-12-11 18:33:32 -06:00
worldwidesorrow a56643f466 Delete unLoad_act.sqf 2019-12-11 18:33:26 -06:00
worldwidesorrow 390aa9a0f7 Delete load_wounded.sqf 2019-12-11 18:33:20 -06:00
worldwidesorrow 269e5b1182 Delete load_act.sqf 2019-12-11 18:33:13 -06:00
worldwidesorrow cbca10ccae New files uploaded for the load functions
These files are heavily edited, so it is easier to just upload new copies.
2019-12-11 18:17:42 -06:00
ebayShopper cfc6ad08af Remove unused parameter in PVDZ_hlt_Bleed
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/83bf13c786a94e24b609958b5d2b73c473a3e3d9
2017-12-17 12:44:03 -05:00
ebayShopper 6fec7bc4a2 Fix short knockouts for tranquilizer bolt
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/9b5d1409bd0db4b98863f7eb85813a6a63d444ec
2017-06-23 18:16:57 -04:00
ebayShopper 09b376c584 Fix dramatic recoil camera shake bug
As reported in:

https://epochmod.com/forum/topic/43817-horrible-visual-recoil-bug-since-1061/

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1d80da581353323cdd1bb6f7a678e35e9b7c7af2
2017-06-11 18:33:25 -04:00
ebayShopper 48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
https://github.com/DayZMod/DayZ/commit/f99a3deced4f4314c4b9a26c1c822e5c5d7f90eb
https://github.com/DayZMod/DayZ/commit/731b957e8e1c3f1bb08474fb397af6165e48a8df

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
ebayShopper 53158a11ed Remove rtitleText in fillBloodBag.sqf
Not necessary to inform recipient and prevents two messages on screen at
once for instigator.

Classic bloodbag system is now added in vanilla too.

Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/bee9bd16382f4c1ece397cd029bb61c775024144
2017-03-19 16:35:17 -04:00
ebayShopper 92b09aa530 Remove some unused variables
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/6479708205bccbb4bdd1379a53d9aeed5613f08a
2017-03-05 12:17:09 -05:00
ebayShopper 9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/78b608c854b90640ca1d46ae6c2708b525bc55e0
2017-03-05 09:59:11 -05:00
ebaydayz d8d2c03512 Move clean wounds warning to rollingMessages
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/49d9b6ff3c8b5a5b4f8399f4d797de917d5d8946
2017-02-02 15:32:12 -05:00
ebaydayz 295302d9cb Fix undefined error when dayz_bleedingeffect = 1; #1885 2017-01-21 22:00:30 -05:00
ebaydayz d509c15c82 Split player_death into scheduled and unscheduled #1833
Death message was sometimes showing incorrectly due to spawn delay.

Also the sched_corpses two minute loop was occasionally deleting bodies
right away because bodyName setVariable was delayed by the time it took
PVDZ_plr_death to send (up to a few seconds). See #1825
2016-12-28 16:16:46 -05:00
ebaydayz 90977e4a31 Update painkillers
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1596a17b09cfa9c31b38cf1e4f25ef149ff4f4aa
2016-12-07 15:20:17 -05:00
ebaydayz 7f239754cc Fix anitbiotics to remote player cures own infection
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/4c6b45d50751b90f035b3caf69443dda614bddb5
2016-11-21 14:33:20 -05:00
ebaydayz 43330c2046 Diminish humanity reward for transfusion
As suggested on:
cdb9776
and
https://github.com/DayZMod/DayZ/issues/731
2016-11-15 15:31:58 -05:00
ebaydayz cdb9776d4e Add bloodbag cooldown 2016-11-15 13:57:40 -05:00
ebaydayz abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz e55960b6f9 Don't allow giving bloodbag to player with full blood
Reverted be214d3 because this is a more complete solution
2016-11-11 17:03:50 -05:00
ebaydayz dba59af7c1 Fix undefined vars in unload_act.sqf 2016-11-10 19:14:29 -05:00
ebaydayz ed49630e0c Fix load wounded wrong variable 2016-11-10 19:13:40 -05:00
ebaydayz be214d3cc5 Fix give bloodbag option showing when it shouldn't 2016-11-10 18:46:39 -05:00
ebaydayz 5d64449210 Add missing private var in antibiotics.sqf 2016-11-10 18:37:14 -05:00
ebaydayz 2f86984f93 Fix antibiotics not reducing when given to remote player 2016-11-10 17:51:54 -05:00
ebaydayz dd2a21a867 Update medPainkiller.sqf 2016-11-02 20:21:55 -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 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 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
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
icomrade 58e90da07d Fix transfusion in vehicle 2016-09-27 12:46:13 -04:00
icomrade 6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
ebaydayz e8e5d24e80 Fix swimming in ground glitch
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
https://github.com/EpochModTeam/DayZ-Epoch/commit/e85f6ad1b598afb07327b81a50d853e76cbb7f2c
2016-09-13 18:36:06 -04:00
ebaydayz e85f6ad1b5 Consolidate transfusion scripts
Consolidated transfusion and transfusion_noBloodTypes to one script.

Selfbloodbag.sqf will never run if DZE_selftransfuse = false; because
the right click action is hidden.

Total blood quantity is now added in 1/4 increments during self bloodbag
as intended instead of all at once.
2016-09-13 15:02:16 -04:00
ebaydayz 32db983f34 Fix undefined amount when bloodbagging remote player 2016-09-08 20:00:38 -04:00
ebaydayz ed47a63313 Make log more accurate in server_playerSync
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/45ac48b5955c73b0b12fdccaed6573910170f3a7

https://github.com/DayZMod/DayZ/commit/ca23681a7d022d3ffeadfd9bf91b1942526b54ee
2016-08-12 16:41:45 -04:00
ebaydayz 7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

https://github.com/DayZMod/DayZ/commit/3db0fe8e7a3df0c2ab9e0f6bb220acf84e450da3

https://github.com/DayZMod/DayZ/commit/73a63898f11501c4aad83ead106c90b3e49461ac

https://github.com/DayZMod/DayZ/commit/08e18d5b526f8f8ee570fed1a3640d217f7fa83b

https://github.com/DayZMod/DayZ/commit/126da2dcd38a03d5583627607a78d37ad7f64091

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

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

https://github.com/DayZMod/DayZ/commit/5fcca134f05ddf3e4b9458cf9fe54154a9575616

https://github.com/DayZMod/DayZ/commit/c9c1fc934d449b33a9ef3bf14a82b5a40d93874b
2016-08-11 15:16:53 -04:00
ebaydayz 2f844060ec Add handling of other fadeSound events in player_toggleMuteSound
Fixes icon staying up after fadeSound to 1 by unconscious and low blood
events.
2016-07-20 17:36:40 -04:00
oiad 3d75c67574 Localization updates
Some localization updates and some code optimization.
2016-07-17 22:23:25 +12:00
ebaydayz fe8c5e7950 Fix infinite antibiotics when given to another player
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/4e6ea245771d1e926f757a7438362dea0cc6ad4d
2016-05-21 15:08:57 -04:00
icomrade 6e430bdb84 Change self transfuse timeout to 2 min default
Also properly handle the infection chance
2016-05-06 11:52:36 -04:00
icomrade 6ab855fd9d Forgot to set this variable in selfbloodbag.sqf 2016-05-06 11:45:34 -04:00
icomrade 3f10228b95 should fix knockout issue with self bloodbag
issue most likely happened if you used a typed bag not matching your
blood type when the classic system is enabled.
2016-05-03 16:34:28 -04:00
ebaydayz bf9140f1b5 Fix dayz_nutrition RPT error on login
Looks like the error was:
r_player_Nutrition = [_NutritionLoss];
It should have used the set command, since the array was already defined
in variables.sqf. But there is no need to use an array for a single
value anyway.

Fixes RPT error on login:
Error in expression <hyd"] spawn player_death;
};
};

if (dayz_nutrition > 0) then {
_Nutrition = >
Error position: <dayz_nutrition > 0) then {
_Nutrition = >
Error Undefined variable in expression: dayz_nutrition
File z\addons\dayz_code\system\player_spawn_2.sqf, line 182
2016-04-26 18:46:36 -04:00
ebaydayz 5157228e67 Update all cutText to dayz_rollingMessages 2016-04-16 15:47:49 -04:00
ebaydayz 993ce14da6 Remove unnecessary key event handler reset
No need to reset the key event handler again in player_monitor.fsm, it
is already done onPreloadFinished.
2016-04-15 20:16:13 -04:00