W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,282 Commits 20 Branches 18 Tags
6fec7bc4a207f66eb2945c7f49a10ac49c1a6f57
Commit Graph

190 Commits

Author SHA1 Message Date
ebayShopper
39e05ad0e4 Update vanilla building 
Vanilla commits:

2ec04a7f8d

f333910f95

156b90ccb5
 2017-06-10 10:45:14 -04:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt 
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

Removed
two unused files and a few variables made redundant by actionInProgress
 2017-06-06 15:25:14 -04:00
ebayShopper
e99792d0f4 Update jerry_fill.sqf 
Vanilla commit:

ef236938c1
 2017-04-14 11:26:23 -04:00
ebayShopper
df526285cd Fix potential undefined dayz_characterID variable on login 
The scheduler can start running fn_selfActions before player_monitor.fsm
defines dayz_characterID when login or network return is slow.
 2017-04-08 19:19:47 -04:00
ebayShopper
746b921321 Use nearEntities for plot pole searches 
Also made 73899d5 compatible with DZE_permanentPlot = false; at the
request of @oiad
 2017-03-29 16:04:48 -04:00
ebayShopper
92b09aa530 Remove some unused variables 
Vanilla commit:

6479708205
 2017-03-05 12:17:09 -05:00
ebayShopper
d416ae80ab Move study body back to fn_selfActions 
Adding UserActions to players (CAManBase) is not efficient, because the
condition evaluates onEachFrame when you are "inside" that vehicle type.
Also admins usually want to add more custom actions to dead bodies
anyway.
https://community.bistudio.com/wiki/addAction#Syntax

This partially reverts 3aad4b6.
 2017-02-21 15:12:41 -05:00
ebaydayz
6aa5c9b64f Add setting to disable base takeover #1886 
No classes inherit from Generator_DZ, so there is no need to use
isKindOf over typeOf.
 2017-02-01 12:16:16 -05:00
ebaydayz
9afb74ff26 Remove plot take ownership feature #1811 
See #1811
 2017-01-31 15:22:23 -05:00
ebaydayz
8c1caa9c1c Remove some redundant checks 
Vanilla commits:

da7061429a

da55eaa53e
 2017-01-29 19:36:48 -05:00
ebaydayz
d8ac3f42b1 Remove unnecessary check for upgrade storage 
Fixes desert tent not upgradeable

Vanilla commit:

4e886c8c27
 2017-01-27 13:17:14 -05:00
ebaydayz
4613e0c084 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	CHANGE LOG 1.0.6.1.txt
 2017-01-21 21:46:58 -05:00
ebaydayz
26c1bd9a86 Properly disable town generator and plant spawner loops 
Stops intensive loop from running unnecessarily when dayz_townGenerator
= false; The comfrey plants are pointless atm since the only thing they
may be used for is crafting a sepsis bandage.

Also added waterHoleProxy for Napf and Namalsk placed by @skigoggles

Vanilla commit:

b5a9125086
 2017-01-21 21:44:43 -05:00
oiad
a68e4b273b fix epoch_tempKeys.sqf making massive arrays. (#1884) 
* fix epoch_tempKeys.sqf making massive arrays.

epoch_tempKeys was making a massive array every time it was called due
to them setting the array size to the _ownerKeyId instead of count
_temp_keys_names.

For example: Call this function 10k times in testkit and see it lag the
client due to making a massive array over and over again.

```"[[["9379"],[<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<n
"Test script finished. Code took 0.440002 seconds to run"
```

With fixed code:
```"[[["9379"],["Yellow Key (65d0)"]],false]"
"Test script finished. Code took 0.000991821 seconds to run"
```

* Update fn_selfActions to support fixed epoch_tempKeys fix.

Forgot this from my previous commit, this will select the right key now
for displaying in the unlock_veh.sqf (I broke this with my previous
commit)

* Rework
 2017-01-21 17:01:42 -05:00
ebaydayz
198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
ebaydayz
0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
ebaydayz
e4aeee37fd Use waterHoleProxy in drink water and fill water #1835 
The slow searches are needed on other maps until waterHoleProxy objects
are added for them. They need to be added at every pond and
non-"Land_pumpa" well. Right now Chernarus is the only map that has them
placed.

Fixes #1835
Fixes #1841
 2017-01-01 16:55:00 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz 
should fix #1838 Translation fixes are probably necessary
 2016-12-29 15:50:53 -05:00
ebaydayz
0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
ebaydayz
bf00c3f8bb Correct comment from 4d3f707 again 2016-12-22 22:20:47 -05:00
ebaydayz
0ffbdde2e8 Correct comment from 4d3f707 2016-12-22 22:17:27 -05:00
ebaydayz
4d3f707417 Stop autoRun and remove drink from hands at ponds #1827 
Fixes #1827
 2016-12-22 21:52:22 -05:00
ebaydayz
66f87fac46 Move two localizations to epoch package in stringtable 
Vanilla doesn't refund modulars when deconstructing, Epoch does. Also
upgrade was moved to UserActions of dayz_buildings in vanilla.
 2016-12-06 13:59:25 -05:00
ebaydayz
6cdc0a51c9 Add extra animations to ArmoredSUV, MV22, UH1Y 2016-11-26 21:14:12 -05:00
ebaydayz
ea389b59ea Remove unneeded isKindOf "Man" checks 
"Man" includes animals and zombies:

https://community.bistudio.com/wiki/ArmA_2:_CfgVehicles#Man_Class_Vehicles
 2016-11-23 14:43:59 -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
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
de44b32c83 Remove unneeded isBicycle check in fn_selfActions 
Bicycles always have characterID=0, so there is no need to check.
 2016-11-14 14:38:45 -05:00
ebaydayz
abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
icomrade
fb734e30c7 allow removal of generator 2016-11-07 17:24:54 -05:00
ebaydayz
e1bf11c4bb Remove empty folder 2016-11-06 13:15:18 -05:00
oiad
b1171c5f9b player_wearclothes changes, string changes and maintain area moving (#1783) 
* player_wearclothes changes, string changes and maintain area moving

Adds 2 toggles for admins to modify:

DZE_backpackRemove forces the player to drop his/her backpack when they
change gear.
DZE_maintainCurrencyRate modifies the amount of worth each item is worth
to maintain.

Changes the error message in player_wearClothes to tell the player why
they can't change gear yet
Remove some debug lines that spam RPT

* Rework

Rework as per @ebaydayz

* Rework

Rework
 2016-10-30 14:11:54 -04:00
ebaydayz
c4ef6e3115 Hide showOnScreen for lock and unlock inside vehicle action 2016-10-29 17:06:47 -04:00
ebaydayz
fda831bf4f Consolidate redundant getPlayerUID in selfActions 
Vanilla commit:

8c51a24956
 2016-10-29 15:25:36 -04:00
ebaydayz
9689301b07 Hide show on screen text for Vehicle Locked and Destroy %1 2016-10-20 14:46:08 -04:00
ebaydayz
5e170029d0 Fix dayz_playerUID undefined in selfActions when target is not null at login 
Selfactions can run before dayz_playerUID is defined in
player_monitor.fsm.
 2016-10-20 14:34:48 -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
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
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
33cf7611ed Don't allow jerry fill from destroyed fuel source 
Vanilla commit:

90251abab3

9204c15d3f
 2016-09-21 16:53:29 -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
e5e212bbc2 Add comment about salvage vehicle work around 2016-09-09 12:58:41 -04:00
oiad
51f85acb9e Toggle for salvaging from locked vehicles (#1757) 
* Toggle for salvaging from locked vehicles

This adds the ability to remove salvaging from locked vehicles which
helps avoid griefing
Fixes a spelling mistake for a localization string
Makes it possible to salvage 0% damaged items again, this was disabled
as per
3292d84b85
I've had this running on my server for a year or so with no issues (not
that it doesn't affect it, i've just never seen it)

* Toggle salvagable locked vehicles changers

@ebaydayz fixed
 2016-09-08 17:32:27 -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
134a614255 Remove FNC_getPlayerUID 
It's been over two years since it was added. All servers should be
updated to steam ID by now.
 2016-08-23 15:40:26 -04:00
ebaydayz
7d27b5c0b1 Remove DZE_advancedTrading config variable 
The legacy config trader menu was removed, so this variable is redundant
now.
 2016-08-23 14:26:17 -04:00