Commit Graph

259 Commits

Author SHA1 Message Date
icomrade
52c9c7ceda Somewhat better VON Block
Not perfect, occasionally the player can double tap a button to lock VON
on - which now they cannot turn off unless they open the escape menu and
double tap to turn off.

Chat channel changes are now blocked when VON is active.

ActionKeys are now recalculated on key binding change, but it is
important to note that double tap bindings DO NOT work with the
ActionKeys command. This is why inputAction check is neccesary

Summary: Double tapping a key to lock von on (VoiceOverNet) is not
reliably blocked, nor is it blocked at all in secondary
displays/dialogs. otherwise, this works pretty well.
2016-11-26 18:48:11 -05:00
ebaydayz
7c566a1345 Remove unused variable dayz_deseedloot 2016-11-26 14:08:34 -05:00
ebaydayz
d14416931a Fix VON block mistake from b9a5c59
I forgot filterCheats is already called in keyboard.sqf
2016-11-25 19:31:14 -05:00
ebaydayz
b9a5c59660 Include all controls in VON block
Moved to display 46 keydown since keydown on 63 only fires after the VON
transmission has already started (slight delay).

Added mouseButtonDown so it can not be bypassed via assigning a mouse
button.
2016-11-25 18:22:41 -05:00
ebaydayz
b6d88b1329 Update vanilla building
Vanilla commits:

9b2092c9f7

674624d122
2016-11-25 16:25:26 -05:00
ebaydayz
ec6b5eb679 Move Repair and Salvage back to fn_selfActions
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
2016-11-23 13:34:22 -05:00
ebaydayz
2f1c57047a Fix infectedWaterHoles init for non-cherno maps 2016-11-20 20:03:18 -05:00
ebaydayz
3aad4b61e9 Move some addActions to config UserActions
Should improve client FPS while still allowing conditions and scripts to
be customized.

Some special vehicles like MV22, UH1Y, etc. have UserActions overwritten
in their configs, so please let me know if you find any others that do
not get the option to repair or salvage because UserActions is
overwritten in their config. I think I got them all.

Vanilla commits:

a8c4238c0c

350d73abe1
2016-11-20 19:47:21 -05:00
ebaydayz
b01a4165a8 Comment some unused achievement code
Vanilla commits:

3ec1cc3c5d

3171f68bee
2016-11-18 13:22:36 -05:00
icomrade
e398250489 Fix refuel trucks, add upgraded trucks to array
Issue was:
A. with locality, we were checking the wrong vehicle in one instance and

B. with variable names, since we called local_setFuel and _vehicle was
private already from the calling script we ran into an issue with
duplicate variables causing the command to fail. local_setFuel doesnt
really need any local variable so I removed them and this fixed the
issue (script filters may need to be adjusted accordingly)
2016-11-16 14:53:17 -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
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
oiad
d7f35c0cf3 Fix spelling mistake of classname DZ_Czech_Vest_Pouch (#1792)
* Fix spelling mistake of classname DZ_Czech_Vest_Pouch

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per

* More typo SQL goodness

As per subject
2016-11-04 21:40:27 -04:00
A Man
41324139eb Adding CanvasHut_DZ to DZE_isRemovable (#1785)
* Adding CanvasHut_DZ to DZE_isRemovable

CanvasHut_DZ had no remove option.

* Update Prop_Defs.hpp
2016-10-31 19:26:40 -04:00
ebaydayz
dbb9e97efc Update group dialog 2016-10-28 20:10:18 -04:00
ebaydayz
f770b0a85d Add group system
Initial commit, not tested in multiplayer yet. Some revisions still left
to do.
2016-10-27 16:06:49 -04:00
ebaydayz
f21b4f0f41 Remove t_stub_picea.p3d from dayz_trees
See:

bf31d8f6e7 (commitcomment-19441154)
2016-10-15 16:48:29 -04:00
ebaydayz
7044b0095d Get player name before death
Vanilla commit:

3e8c9410c5
2016-10-13 16:01:55 -04:00
icomrade
bf31d8f6e7 Update tree array for NAPF
thanks @ndavalos
2016-10-12 14:55:24 -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
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
2ee06afea7 Sync chopped down trees for JIP players
Vanilla commit:

a57478fb1a
2016-10-05 17:24:10 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -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
7f0935c639 add floors to drop array 2016-09-22 15:14:05 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
ebaydayz
c7a6c71330 Disable vanilla base building actions for now
Since we are not going to use vanilla base building.
2016-09-12 16:11:29 -04:00
ebaydayz
2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
ebaydayz
16e4dc7b30 Move HeliCrash and CarePackage area variables to markers
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

Also removed some hardcoded checks for Chernarus, since
dayz_townGenerator should always be off on other maps for now. Someone
may add town generator coordinates for other maps later.

Related vanilla commits:

b20b402bf0

7c8b69eb82

7dfd3ef9cf
2016-09-11 14:45:49 -04:00
oiad
d6324723e9 Plot management force maintain option
This replaces the "refresh" menu option with a "force maintain" option.
Allows you to maintain the base even if it doesn't need it to either get
all your items in sync or if you are going away or similar.

Tested with:
dze_permanent plot true/false
z_singlecurrency true/false

Also fixes an undefined variable error in system_monitor that was
introduced
8f58baf3f2
2016-08-28 20:13:25 +12:00
ebaydayz
c2b16f0828 Consolidate DZE_ActionInProgress and r_action_count to one variable
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
2016-08-25 15:38:27 -04:00
ebaydayz
c871c1e2c1 Move DZE_ConfigTrader to configVariable.sqf
Most servers will want to use config traders.
2016-08-23 14:10:10 -04:00
ebaydayz
164ba6a135 Remove unused variable dayz_baseTypes
Vanilla commit:

220178844f
2016-08-23 14:02:20 -04:00
ebaydayz
29acecc2f2 Retire DZE_MissionLootTable variable
AFAIK there is no performance difference between configFile and
missionConfigFile.

Using missionConfigFile by default simplifies loot scripts and makes the
extra config variable unnecessary. It's one less step for admins to
customize their tables.
2016-08-23 12:57:12 -04:00
ebaydayz
10b006d4eb Improve readability of trade_any type lists 2016-08-23 11:57:09 -04:00
ebaydayz
745e287202 Add option to push stuck planes
Also changed flip vehicle back to 1051 default which allowed players to
flip non-ATVs with help.
2016-08-21 16:45:32 -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
bfca19bf80 Remove some unused legacy code 2016-08-18 17:00:08 -04:00
oiad
c738710b77 Plot management fixes (#1735)
* Plot management fixes

This hopefully adds a few more items to the maintain list (@icomrade)
Uses epoch_returnChange to accurately and tidily return change and
handle money.
Localize maintain_area.sqf for single currency servers

* Plot Management tidyness

Fixing tidy issues

* Plot management changes

Fix maintenance variables as per @ebaydayz

* Plot management

Missed one

* Plot management fixes and default maintain_area fixes.

Convert original maintain_area.sqf to epoch_returnChange, I used the
plot management localization strings since I liked them better, the
epoch ones don't make a lot of sense really. Makes no difference if plot
management is turned off anyway.
Change the single currency version to work a lot better than it did, I
put the cost per item to 100 to be more in line with what I would expect
on a server

Changed _range to use DZE_maintainRange (DZE_plotPole select 0 + 20)
2016-08-15 14:49:56 -04:00
A Man
1145f97e1b Adding the skin FR_Sapper (#1734)
* Added one new skin

* Added one new skin

* Added one new skin and class RepairVehicle

Added one new skin and class RepairVehicle: None { show = 0; };

* Added one new skin

* Added one new skin

* Update EpochSkins.hpp

* Added one new skin

* Added one new skin

* Added one new skin
2016-08-12 20:54:24 -04:00
A Man
bbb8c803b6 Adding many new skins (#1732)
* New Skins

Added all new skins to the loot table.

* Added new skins

* New skins for trading

* New skins for trading

* New skins for trading

* Added new skins

* Added new skins

* Strings for new skins

* Added new skins to player classes

* Added weight for new skins
2016-08-12 15:37:48 -04:00
ebaydayz
9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

707a591765

c453cdedd2

Set to double vanilla default value since Epoch has a lot more large
vehicles with 1000+ fuel capacity.
2016-08-11 18:08:21 -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
ebaydayz
7a4775beea Fix needing to click lock/unlock twice from inside vehicle to take effect
No reason to use spawn here. Spawn can have a delay. Since
fn_selfActions runs faster it can register the vehicle as still locked
or unlocked after you clicked the action.
2016-08-05 14:38:12 -04:00
ebaydayz
fd2eb14c5e Give inTraderCity a default value
There is no point in setting inTraderCity = "Any"; since you can use the
isInTraderCity variable to check if a player is in any trader city. Also
"Any" will return false for isNil, so the only time "Unknown Trader
City" was being used was when the player had not entered any city yet.
If they left a known trader and went to an unknown one the RPT message
would say "bought x at Any". Now it will correctly say "Unknown Trader"
anytime a purchase is made without inTraderCity being set.
2016-07-29 15:48:51 -04:00
icomrade
082c0c13e6 Fix dog meat not being cookable 2016-07-21 19:56:37 -04:00
ebaydayz
e62c882127 Remove duplicate ObjectUID fix variables
No longer needed as per:

51be8aa8a5

8e87448fe7
2016-07-17 17:17:38 -04:00