W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: W0LF:Release_1.0.6
Branches Tags
W0LF:master W0LF:Release_1.0.7.1 W0LF:Release_1.0.7 W0LF:revert-2028-patch-8 W0LF:Release_1.0.6.2 W0LF:Release_1.0.6.1 W0LF:Release_1.0.6 W0LF:vbawol-patch-1 W0LF:DayZ-1.8.7-Rebase W0LF:gh-pages W0LF:beta W0LF:production W0LF:Animal-AI-0.1 W0LF:RC2-1.0.5.2 W0LF:RC1-1.0.5.2 W0LF:Release_1.0.5.1 W0LF:Release-1.0.5 W0LF:Release_1.0.4.2 W0LF:Release_1.0.4.1 W0LF:Release-1.0.4
W0LF:1.0.7.1 W0LF:1.0.7 W0LF:1.0.6.2 W0LF:1.0.6.1 W0LF:1.0.6 W0LF:1.0.5.1 W0LF:1.0.5 W0LF:1.0.4.2 W0LF:1.0.4.1 W0LF:1.0.4a W0LF:1.0.4 W0LF:1.0.3.1c W0LF:1.0.3.1b W0LF:1.0.3.1a W0LF:1.0.3.1 W0LF:1.0.3 W0LF:1.0.2.5 W0LF:1.0.2.4
...
compare: W0LF:1.0.6.1
Branches Tags
W0LF:master W0LF:Release_1.0.7.1 W0LF:Release_1.0.7 W0LF:revert-2028-patch-8 W0LF:Release_1.0.6.2 W0LF:Release_1.0.6.1 W0LF:Release_1.0.6 W0LF:vbawol-patch-1 W0LF:DayZ-1.8.7-Rebase W0LF:gh-pages W0LF:beta W0LF:production W0LF:Animal-AI-0.1 W0LF:RC2-1.0.5.2 W0LF:RC1-1.0.5.2 W0LF:Release_1.0.5.1 W0LF:Release-1.0.5 W0LF:Release_1.0.4.2 W0LF:Release_1.0.4.1 W0LF:Release-1.0.4
W0LF:1.0.7.1 W0LF:1.0.7 W0LF:1.0.6.2 W0LF:1.0.6.1 W0LF:1.0.6 W0LF:1.0.5.1 W0LF:1.0.5 W0LF:1.0.4.2 W0LF:1.0.4.1 W0LF:1.0.4a W0LF:1.0.4 W0LF:1.0.3.1c W0LF:1.0.3.1b W0LF:1.0.3.1a W0LF:1.0.3.1 W0LF:1.0.3 W0LF:1.0.2.5 W0LF:1.0.2.4

244 Commits
Release_1. ... 1.0.6.1

Author SHA1 Message Date
ebayShopper
d86aef88b3 Update change log 2017-03-01 16:01:47 -05:00
ebayShopper
9434d43561 Fix undefined error fnc_spawnObjects 
My mistake from 26c1bd9
 2017-03-01 13:42:21 -05:00
ebayShopper
2032094fb4 Fix undefined groupTags error 
My mistake from 6736cd9
 2017-03-01 11:24:09 -05:00
icomrade
cf661380b6 Properly inherit Tank class 
fixes #1899 which resulted from improper base class inheritince from
pull request https://github.com/EpochModTeam/DayZ-Epoch/pull/1513
 2017-02-28 19:51:55 -05:00
icomrade
1649d63716 Fix undefined variable _display error 2017-02-28 19:49:44 -05:00
ebayShopper
61630e91b3 Update scripts.txt exceptions 
- Removed some unneeded exceptions
- Moved tree chop PVEH to server compile only so client does not need
setdamage exception
- Replaced "showCommandingMenu" filter with stricter
"menu" filter
- Renamed two files with no changes for easier filtering of
"menu"

Vanilla
commits:
1d639b557b
3a29242537
5cdf249ea9
 2017-02-28 18:26:37 -05:00
ebayShopper
fa7a98708a Remove some redundant PV and SV value BE filters 
- Fixed some "say", "switch" and "call" exceptions were broken

- Anything containing call is covered by 5 "call"
- Anything containing spawn is covered by 5 "spawn"
- Anything containing { or ( is covered by the first line
- Anything containing setDi is covered by 5 "setDi"
- Anything containing bis_ is covered by 5 bis_
- Anything containing bis_fnc is covered by 5 "BIS_fnc"
- Anything containing server_ is covered by 5 server_
- Anything containing fnc_ is covered by 5 fnc_
- Anything containing count is covered by 5 "count"
- Anything containing onPlayer is covered by 5 "onPlayer"
- Anything containing this is logged by 1 "this"
- Anything containing for is logged by 1 "for"
- Anything containing ' is covered by 5 "'"
- Anything containing terminate is covered by 5 "terminate"
- removed duplicate getVariable filter
- createDialog is covered by 5 "createD"
- set, exec and str with two single spaces are covered by the same with
one single space
- removed some set, exec and str that were already covered by the line
directly above or below them
- removed some old dayz function names that aren't used anymore.

- made first line in setvariableval.txt stricter (no exceptions) by
moving "+" to a separate line
 2017-02-26 22:16:38 -05:00
ebayShopper
122d9e16f7 Update player_packTent again 2017-02-26 16:43:33 -05:00
ebayShopper
62312a85c7 Add message for already wearing clothes 
Because it isn't always obvious.
 2017-02-26 15:31:59 -05:00
ebayShopper
f0ef0fce35 Make server_playerSync exit log more accurate 
This will now show INFO instead of ERROR when sync exits while a player
is changing clothes.
 2017-02-26 15:28:17 -05:00
ebayShopper
0eaa995d27 Fix action in progress message in player_packTent 2017-02-26 14:03:39 -05:00
oiad
ea94ec4e8b Extend DZE_GodModeBase to built items (#1898) 
This now makes buildables properly apply godmode instead of having to
wait till restart for:

* Being built
* Being upgraded
* Being downgraded
master
 2017-02-26 13:50:11 -05:00
ebayShopper
d12fda5e21 Add a few missing playerIsNear checks 
Blocks duping method reported by Sercan and confirmed with @oiad .
Thanks
 2017-02-25 17:29:27 -05:00
ebayShopper
a3f2b8db57 Fix a few floating loot pos small in firestation 2017-02-25 15:54:13 -05:00
ebayShopper
55eddfead8 Fix potential undefined error on bear trap trigger 
https://github.com/EpochModTeam/DayZ-Epoch/issues/1891#issuecomment-282476563
 2017-02-25 12:37:32 -05:00
ebayShopper
e8b328ff9c Fix remote vehicle lock and unlock actions refresh 
Thanks @oiad
 2017-02-24 19:55:24 -05:00
oiad
33fd92db67 Extend epoch_tempKeys to be able to read from backpack as well. (#1897) 
* Extend epoch_tempKeys to be able to read from backpack as well.

* Rework
 2017-02-24 16:58:16 -05:00
ebayShopper
bb6acc4e7b Remove needless recompile of player_spawnCheck 
This was recompiling it every six seconds unnecessarily.
 2017-02-24 15:43:37 -05:00
ebayShopper
6736cd92ff Update group tags again 
Also fixed wrong string name "STR_EPOCH_RADIO_CONTACT_LOST" thanks @oiad
 2017-02-24 14:11:55 -05:00
ebayShopper
221b8cc4b9 Fix group tags syntax error 2017-02-23 17:17:50 -05:00
ebayShopper
e1340821e7 Fix group tags startup 2017-02-23 17:04:30 -05:00
ebayShopper
0e4e762bf2 Add missing disableSerialization in groupTags.sqf 2017-02-23 16:32:44 -05:00
ebayShopper
8608b1ad1d Fix G36C ACOG 
Vanilla commit:

2fb799235b
 2017-02-23 11:57:07 -05:00
ebayShopper
5a034163af Update scripts.txt exception 2017-02-22 19:58:28 -05:00
ebayShopper
ffb88a0d7b Fix body marker only showing one body 2017-02-21 19:02:42 -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
ebayShopper
12f59f046c Update Core Patch BIS_Effects again 
Updated to same formatting and comments as latest Corepatch files:

https://github.com/Goliath86/CorePatch/tree/master/CorePatch_FIS/data/scripts

airdestruction.sqf:
- fixed _velocity variable was undefined
- updated, Sa-Matra removed clearVehicleInit
- !isNull checks are not needed because (local objNull) returns false
and (speed objNull) returns zero

BIS_Effects_startEvent:
- 6th parameter is not used in BIS_Effects_Burn, neither in the old nor
new version.

Although the formatting is ugly, it is better to stay consistent with
Bohemia's so they are easy to compare with future updates and
scripts.txt exceptions are the same whether the official or custom files
are used.

Added Sa-Matra's final commit from yesterday:

5e696bebdc

This partially reverts c15caf5.
 2017-02-20 18:47:35 -05:00
ebayShopper
74ce95d4b1 Comment unused vanilla PVEHs 
Vanilla commit:

69002014b2
 2017-02-20 13:28:19 -05:00
ebayShopper
b786432526 Reduce pain shake intensity and frequency 
Vanilla commit:

4fb7bcbd5b
 2017-02-19 19:31:01 -05:00
ebayShopper
4b1ecb4c3b Update vanilla repair action 
Vanilla commit:

9bdce88f1a
 2017-02-19 19:17:50 -05:00
ebayShopper
afd093c72e Make smoke and grenade tripwires single use 
Vanilla commit:

0780b490ad
 2017-02-19 19:08:16 -05:00
ebayShopper
27bca9a7d9 Update vanilla presets 
Vanilla commit:

8574fd898d
 2017-02-19 18:56:52 -05:00
ebayShopper
9e0c251baf Update vanilla building again 
Vanilla commits:

ddcc7c7349

e4144e561f
 2017-02-19 18:44:47 -05:00
ebayShopper
fdf24d4013 Update vanilla vehicle_getOut again 
Vanilla commits:

508e73d59c

cd260ad1f0

2078268b67
 2017-02-19 16:54:59 -05:00
ebayShopper
d975def6a1 Remove unnecessary rules and watermark waitUntils 2017-02-18 13:34:49 -05:00
icomrade
28fa8ef31e Update to Core Patch BIS_Effects 2017-02-13 18:15:15 -05:00
ebayShopper
e2742ed18a Fix add melee to full toolbelt eating weapon 
Melee weapons were eaten when trying to add them to a full toolbelt
because BIS_fnc_invAdd failed.
 2017-02-13 16:21:08 -05:00
ebayShopper
6af3588f09 Update change log 2017-02-13 14:59:46 -05:00
ebayShopper
6e846847de Only run group tags loop when in a group 2017-02-13 14:27:49 -05:00
oiad
e8dd8fac63 Stop server_publishVehicle3 duping a vehicle if hive fails to update (#1895) 
* Stop server_publishVehicle3 duping a vehicle if hive fails to update

server_publishVehicle3 first creates the vehicle in the database then
reads it back to see if it's successful, previously it wasn't deleting
the vehicle if it failed.

Added a 1 second delay after the vehicle delete to stop duping of
vehicles also.

Fixed references to server_deleteObj that were using 2 parameters
instead of the required 3 and updated the example.

* Rework
 2017-02-13 14:09:21 -05:00
ebayShopper
2ef93e6c57 Fix panic sound chance from fbc56ff #1861 
Previously was ~8% chance every 1 second, so ~72% chance to play once or
more every 9 seconds.

Now it is a 50% chance to play once every 9 seconds.
 2017-02-12 16:04:48 -05:00
ebayShopper
fbc56ff556 Fix panic sound overlapping #1861 2017-02-12 15:08:37 -05:00
ebayShopper
952beed531 Tag map markers with player names #1871 
closes #1871
 2017-02-11 17:15:49 -05:00
ebayShopper
c24f70d8be Remove misspelled building class Land_buova4_winter 
Reported by Epoch forums user Jamrock
 2017-02-10 17:07:46 -05:00
A Man
c2ef6de95d Adding missing CompactPack to traders (#1894) 2017-02-09 14:42:03 -05:00
ebaydayz
18191b0e3a Use effectiveCommander for humanity hit 2017-02-05 16:30:32 -05:00
ebaydayz
5884ef6445 Block Topolka Dam walk under water glitch 
https://github.com/DayZMod/DayZ/issues/826
 2017-02-05 14:35:58 -05:00
oiad
b06cb360b6 Update stringtable.xml to be more englishy (#1893) 2017-02-05 14:15:32 -05:00
ebaydayz
5ba1fb4431 1061 RC1 test build 2017-02-03 16:03:20 -05:00
ebaydayz
76971cbaf4 Prevent sprint and prone through doors glitch 2017-02-02 16:57:30 -05:00
ebaydayz
d8d2c03512 Move clean wounds warning to rollingMessages 
Vanilla commit:

49d9b6ff3c
 2017-02-02 15:32:12 -05:00
ebaydayz
59b1d1ea60 Update vanilla building 
Vanilla commits:

8fdd0e915a

6afd0bc103
 2017-02-02 15:28:39 -05:00
ebaydayz
2bf589e151 Update vanilla antiwall 
Vanilla commit:

4f102f501b
 2017-02-02 15:07:46 -05:00
ebaydayz
b0ba29440d Update vanilla vehicle_getOut 
Vanilla commit:

492ba6d33a
 2017-02-02 14:58:47 -05:00
ebaydayz
097a02b19a Make zombie_agent.fsm customizable for admins #1877 
Also fixed HandleDamage EH was added twice. We moved it to the configs
and forgot to take it out of the FSM in 6853263.
 2017-02-01 20:36:00 -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
9f7ae93bef Add permanent plot check to player_sleep 2017-01-31 16:15:27 -05:00
ebaydayz
9afb74ff26 Remove plot take ownership feature #1811 
See #1811
 2017-01-31 15:22:23 -05:00
A Man
0fd3034d54 Adding 13 new items and a DZE version of the vss vintorez (#1890) 
* strings for new items

* adding new documents.hpp

* adding new documents

* adding vss vintorez dze

vss vintorez dze spawns with 20 rounds magazine like in epoch 1.0.5.1

* adding vss vintorez dze

* Update stringtable.xml
 2017-01-31 14:52:54 -05:00
ebaydayz
7431042ec7 Update change log 2017-01-30 17:06:56 -05:00
ebaydayz
05f1cf9fe0 Use nearObjects instead of nearestObjects for spawn check #1816 
Lowered spawn check radius for loot and zombies to the same as 1051.
(200m)
 2017-01-30 15:45:14 -05:00
ebaydayz
752ed00566 Use playersNumber for player count in sched_animals #1889 
This won't count AI units unless they are spawned on side west.
 2017-01-30 13:41:19 -05:00
ebaydayz
2ecb614534 Update comments for POI spawning 
Vanilla commits:

1f89bcfb98

0defa2af1e
 2017-01-29 20:14:43 -05:00
ebaydayz
8c1caa9c1c Remove some redundant checks 
Vanilla commits:

da7061429a

da55eaa53e
 2017-01-29 19:36:48 -05:00
ebaydayz
3224a21363 Remove some unused setVariables 2017-01-29 16:09:50 -05:00
ebaydayz
cfd0f74870 Send damage selection normally for RPT log c10a7c3 2017-01-29 12:02:27 -05:00
ebaydayz
611fd73bbd Shorten some isKindOf checks 2017-01-28 21:04:26 -05:00
ebaydayz
9270050bc6 Update damage handler again 
This fixes hits from players shooting from vehicle weapons not showning
in server RPT.
 2017-01-28 20:38:35 -05:00
ebaydayz
c10a7c3bc9 Update damage handler 
- Added damage and selection to server RPT hit log
- Increased damage a bit for RunOver due to consistently low damage in
testing
 2017-01-28 16:08:56 -05:00
ebaydayz
c227bb6019 Add note about port forwarding in README 2017-01-28 12:42:44 -05:00
ebaydayz
a1c470d56f Hide group name tags at startup when streamerMode is on 2017-01-27 20:39:22 -05:00
ebaydayz
d30b7b5ffc Prevent queuing multiple vehicle upgrades 2017-01-27 20:23:36 -05:00
ebaydayz
028924770f Increase headshot damage for non-zombie hits 
A single headshot with a DMR from ~500m will now kill instead of doing
~8k blood as it did previously.
 2017-01-27 17:43:29 -05:00
ebaydayz
cc720f95b7 Offset DynamicText death message when in vehicle 
Prevents vehicle health bar overlapping death message.
 2017-01-27 16:38:50 -05:00
ebaydayz
1bb894b1c9 Add missing private var in player_death 2017-01-27 16:13:58 -05:00
ebaydayz
c21a7311a5 Move POI back to local spawned #1816 2017-01-27 14:51:18 -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
c7b71f93f0 Remove fn_upgradeActions 
Vanilla commit:

02bc22f325
 2017-01-26 21:19:17 -05:00
ebaydayz
6c2f5448e1 Update a Russian translation 
e009aee8de (commitcomment-20629913)
 2017-01-26 14:34:21 -05:00
ebaydayz
04986190d9 Update change log 
Removed unused variable from c641bc2
 2017-01-25 16:10:42 -05:00
ebaydayz
c641bc20a8 Properly disable antiTP and sched security when dayz_antihack=0; 
This prevents them being called unnecessarily on loop.
 2017-01-25 15:02:05 -05:00
ebaydayz
7d6319fa30 Remove PVEH when death messages are disabled 2017-01-25 13:51:01 -05:00
ebaydayz
fc40845583 Remove a duplicate translation 2017-01-25 13:45:09 -05:00
ebaydayz
405dd7e519 Disable flies by default and add enableFlies config variable 
Also, when enabled, flies now spawn ten minutes after the player's death
instead of two minutes after as recommended by @oiad .
 2017-01-25 13:05:09 -05:00
ebaydayz
5d330e1c71 Disable vanilla antiwall objects and infected camps by default 
The antiwall wrecks are removable on Epoch. Also Epoch has its own
player_antiWall function. We did not spawn these objects in 1051.

The infected camps add additional random spawned camp sites in the woods
with lots of dead soldier bodies, fires, water barrels and tents. We did
not have these in 1051 either. Disabling them by default will improve
FPS a little.
 2017-01-24 20:30:36 -05:00
ebaydayz
20ee8f8734 Remove RadioProtocolEmpty 
This reverts cf64805.
 2017-01-24 17:45:32 -05:00
ebaydayz
dae53a6bf8 Remove unnecessary check from 6c62b3f 
This was made redundant by 6c62b3f .
 2017-01-24 16:09:22 -05:00
ebaydayz
6c62b3f8e4 Rework player_death for respawnDelay=0; #1825 
See #1825
 2017-01-24 15:55:15 -05:00
ebaydayz
1133efc2e0 Add README for customizing config traders 2017-01-23 14:21:23 -05:00
ebaydayz
b148293920 Move group icons to separate slower loop 2017-01-22 19:09:02 -05:00
ebaydayz
ff6463473f Update vanilla building 
Vanilla commits:

2ee56936be

8497b42d3f

eb234f8b06
 2017-01-22 14:41:53 -05:00
ebaydayz
f8047167d8 Fix wrong output on ItemKiloHemp for HempSeed 
Reported by Epoch forums user Runewulv
 2017-01-22 13:23:01 -05:00
ebaydayz
93cf3b22d3 Add missing fuel station for sahrani 2017-01-22 12:58:17 -05:00
icomrade
7a6b15d531 Update Scripts.txt 2017-01-21 22:42:32 -05:00
icomrade
b48a0ae2cf Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-01-21 22:41:12 -05:00
icomrade
fc99604108 Better anim reset in player_death 2017-01-21 22:41:09 -05:00
ebaydayz
94f342e7b6 Fix typo from 26c1bd9 2017-01-21 22:36:37 -05:00
ebaydayz
295302d9cb Fix undefined error when dayz_bleedingeffect = 1; #1885 2017-01-21 22:00:30 -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
icomrade
732154037a Disable blood stains by default 
Nice effect, but too intensive in my eyes
 2017-01-21 15:08:29 -05:00
ebaydayz
cc3b8801b7 Update zombie event handlers again 2017-01-20 14:27:55 -05:00
icomrade
c15caf5f8f Improve BIS_Effects fix #1883 
Now stops particle effects loops when wreck is deleted.

Exucuted in an EH, so it should resolve any issue where the corepatch
fix version, or broken A2 version takes priority.

Minor script formating and performance improvements
 2017-01-20 11:51:55 -05:00
ebaydayz
d8828d9df1 Fix "AI" text localization again 
This was my mistake from 131329f. SourceName needs to be checked, not
bodyName.
 2017-01-19 17:36:26 -05:00
ebaydayz
194bad12ea Remove some more unused variables 
Vanilla commit:

68ffe8b158
 2017-01-19 12:27:36 -05:00
A Man
e009aee8de Update stringtable.xml (#1882) 
* Update stringtable.xml

* Move new safe zone strings down to epoch package
 2017-01-18 19:06:32 -05:00
ebaydayz
6d45ecfcac Fix group dialog button scaling again 2017-01-18 17:10:56 -05:00
icomrade
490fb90303 Disallow salvage in DZE_SafeZonePosArray locations 
by request of JohnnyBravo666 on the epoch forums
 2017-01-18 16:43:23 -05:00
ebaydayz
0d2f96b299 Revert lobby and player list background colors to A2OA default 
Partial reverts of my changes in 6732e5c and e0c0669

It requires too many changes to make the whole A2OA UI match.
 2017-01-17 16:00:49 -05:00
ebaydayz
92ee58900c Fix trader menu server RPT logs partially localized on client 2017-01-17 14:39:31 -05:00
oiad
ef5ca5c532 Fix handleSafeGear not showing the failed code correctly (#1880) 
Was displaying failed code as the actual code (obviously wrong)
 2017-01-17 11:58:31 -05:00
ebaydayz
9985f0adbd Fix Bandit1 and Bandit2 skins identical #1874 
Fixes #1874
 2017-01-16 20:27:15 -05:00
ebaydayz
13aaaa5b9a Remove NV cooldown for player zombies #1876 2017-01-16 19:03:49 -05:00
ebaydayz
0b0f2d3455 Update calls to zombie_agent.fsm #1877 
Forgot to update in 6853263

Fixes #1877
 2017-01-16 18:34:47 -05:00
ebaydayz
198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
icomrade
95b5447f7d Update BE Filters 2017-01-14 19:57:11 -05:00
oiad
d68717c7be Fix handleSafeGear not showing eyescan as it should. (#1875) 
This fix makes it so that if the player used Eye Scan it will properly
show eyescan instead of the code.
 2017-01-14 19:53:51 -05:00
oiad
fd0b81118b Move dze_supplyCrate and vein wrecks to CfgLoot (#1863) 
* Move dze_supplyCrate and vein wrecks to CfgLoot

Moves both the supply crates and vein wrecks to the CfgLoot tables so
admins can customize.
Also modifies the main add item statement to allow support for weapons,
magazines and backpack refunding/spawning instead of hard coded
magazines.

Should be backwards compatible with the old style (I did test).

* Remove unused _activatingPlayer variable

* Rework
 2017-01-14 19:40:54 -05:00
icomrade
798a994b02 Should fix full cinder vector #1846 2017-01-14 17:55:56 -05:00
icomrade
f891797a0d Add full screen NVG 
looking through a pinhole gets old
 2017-01-12 15:00:29 -05:00
icomrade
9c81d727e3 Remove IR Laser from DZ L110A1 - Fix #1873 
Thanks @DeVloek
 2017-01-12 13:34:29 -05:00
ebaydayz
0d2f91f3aa Fix trader menu server RPT log partially localized on client 2017-01-11 16:12:17 -05:00
ebaydayz
f25f5e96a6 Fix light fire and build fireplace over water #1866 
Fixes #1866
 2017-01-11 15:25:29 -05:00
ebaydayz
b9d8b5798c Hide group icons for units inside the player's vehicle #1865 
Fixes #1865
 2017-01-10 14:32:04 -05:00
ebaydayz
131329fd59 Fix "AI" text localized on wrong client in death message #1867 
Fixes #1867
 2017-01-10 13:38:00 -05:00
ebaydayz
5c8ae96887 Add military flashlight attachments 
Vanilla commit:

b6ba294b70
 2017-01-09 20:19:01 -05:00
ebaydayz
8ace89ff4d Update removeDamagedVehicles SQL event 2017-01-09 17:43:52 -05:00
ebaydayz
076bd22bfe Update vanilla fence_handleDam.sqf 
Vanilla commit:

ef243327b5
 2017-01-09 17:34:58 -05:00
ebaydayz
9d28504ecf Remove comment in player_wearClothes.sqf 
Vanilla commit:

72b37dc108
 2017-01-09 17:22:41 -05:00
ebaydayz
7857272d82 Add loot pos for some more sahrani and tavi building types 
Vanilla commits:

578e0f5c0a

18d1852b56

bbebc56102

e70074e44f

56d0ab54cb

fa8c01bae4

Added some new building types. No existing buildings were removed or
changed, just moved around to sync order.
 2017-01-09 17:01:13 -05:00
ebaydayz
e4d48cbf38 Revert pain effect to pre-1.8 version #1839 
Same as 1051

Vanilla commit:

9b6d3dcd9c
 2017-01-07 16:51:48 -05:00
ebaydayz
503206cad8 Update version numbers 2017-01-07 15:39:11 -05:00
ebaydayz
fa89487f22 Revert pain effect to original #1839 2017-01-07 14:09:52 -05:00
icomrade
0c4d77d2aa Fix running corpses 2017-01-07 11:39:18 -05:00
icomrade
70948ad0a2 Fix unconcious input lock #1860 
due to disableUserInput being a POS
 2017-01-07 11:25:57 -05:00
ebaydayz
80def55420 Show respawn from player zombie or broken legs as suicide 2017-01-06 19:30:05 -05:00
ebaydayz
ad556aa0cb Remove two hardcoded Chernarus checks 
Vanilla commit:

c8455bb718
 2017-01-06 17:58:13 -05:00
ebaydayz
58025f591f Fix certain buildables not removable #1859 2017-01-06 16:18:59 -05:00
ebaydayz
571e8d7b11 Add LightPole_DZ to DZE_isRemovable #1859 2017-01-06 15:53:38 -05:00
ebaydayz
33672d99ee Lower or remove nutrition hit for some actions #1857 
Fixes #1857
 2017-01-06 13:27:22 -05:00
ebaydayz
3a7744d18d Add back 1051 handling of RepairParts not listed in config 2017-01-06 12:36:08 -05:00
oiad
c5deead4fd Allow merlin_hc3 to be repaired properly (#1858) 
The merlin has 20 windows + 2 side windows, glass 7 - 20 were showing up
as PartGeneric and breaking the repair script for some reason.

https://github.com/EpochModTeam/DayZ-Epoch/issues/1856#issue-199105821
 2017-01-06 11:18:55 -05:00
ebaydayz
e074ef0d44 Fix rapid starvation and dehydration from chainsaw and chop wood 
Chainsaw is never used in player_chopWood.sqf. It is only called via
right click on Hatchet which was removed anyway.

The player already takes a nutrition hit on every swing of the hatchet,
and it can take up to twelve swings to chop down one tree.
 2017-01-05 19:38:03 -05:00
oiad
d0257b3c7d Add logging failed safe/lockbox and door lock/unlock/failed code attempts (#1853) 
* Add logging failed safe/lockbox and door lock/unlock/failed code attempts

This adds logging for both safes and lockboxes for failed code attempts.

Also adds logging for locking, unlocking and failed code attempts for
doors.

"salival (playerUID) FAILED unlocking LockBox with code: Red11 (actual:
Red57) @110069 [11044.4,8438.32,0.652]"
"salival (playerUID) UNLOCKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) PACKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: EYESCAN (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: 100 (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"

* Revert wrong hinge type

* Remove unused DZE_Lock_Door

* Rework

* Remove redundant code, Make single currency costs use BIS_fnc_numberText

* Rework

* Add changelog line
 2017-01-05 16:45:10 -05:00
ebaydayz
731175f46b Prevent abuse of combine M24 and 2RndShotGun ammo #1848 
Prevents duping exploit described in #1848

Fixes #1848
 2017-01-04 16:16:15 -05:00
ebaydayz
cfe01e609e Set RU crates cargo capacity back to normal 2017-01-04 12:43:04 -05:00
ebayShopper
e453c7ee0c Fix wrong classname DZ_ExplosivesBoxRU in loot table #1852 2017-01-04 12:20:56 -05:00
ebaydayz
8d7799d180 Update change log 2017-01-03 16:47:26 -05:00
oiad
6f072982c3 Add harder penalties for wrong combination on doors, More spelling mistakes. (#1847) 
* More spelling mistakes

Further to commit:
0e938ba8f3

* Add harder penalties for wrong combination on doors

This adds a variable (DZE_doorManagementHarderPenalty) to make attempts
at code breaking doors harder. This will exponentially increment the
time between attempts or if you set it to false will make it 5 seconds
between attempts.

Unlike the original (that was useless TBH) this will actually lock out
the combo lock UI until the timer is set.

Will reset completely after 120 seconds.

* Add German translations

* Resolve merge conflict

* Resolve merge conflict
 2017-01-03 16:39:05 -05:00
ebaydayz
0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
ebaydayz
d124a5d2f7 Make switch weapon interrupt autorun 
Fixes #1850
 2017-01-02 14:41:53 -05:00
ebaydayz
d5a3cdb2e3 Remove antiwall glitch blocks for vanilla hospitals 2017-01-02 13:36:59 -05:00
icomrade
62b7c2194b Lazily implement nutrition configuration 
also tweak the working values for chopping wood
 2017-01-01 20:24:48 -05:00
ebaydayz
5cb485ccfb Prevent purchasing negative number of items 
Fixes mistake from ffef031 @icomrade . _amount here is the quantity the
player enters in the quantity box when buying. The only time it is less
than or equal to zero is if the player enters zero or a negative number.
It has nothing to do with the buy or sell price.

Thanks Sercan for reporting.
 2017-01-01 18:32:20 -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
ebaydayz
30f1827509 Prevent 'name' error when player is killed while logging in 
Prevents WARNING: Function 'name' - x is dead when player is killed
while logging in.
 2016-12-31 18:20:49 -05:00
ebaydayz
0b27653833 Add config variable DZE_ServerLogHits 2016-12-31 17:37:34 -05:00
ebaydayz
4fa36dfd94 Fix selling of Javelin, Stinger and some other items 
Fixes #1844
 2016-12-31 17:14:16 -05:00
Kobayashi
79bbc2c5a4 Backwards array call to Z_checkArrayInConfig (#1845) 
Z_checkArrayInConfig is expecting weapons in position 0 for _this, all other stuff like get z_at_getGearItems.sqf and z_at_getVehicleItems.sqf passes the weapons array in position 0.
 2016-12-31 16:03:16 -05:00
ebaydayz
7ce4ba32a2 Add shadow to dayz_rollingMessages 2016-12-30 16:40:10 -05:00
ebaydayz
d4b286660f Fix base objects duplicating when using plot take ownership #1811 
Fixes #1811
 2016-12-30 16:29:34 -05:00
icomrade
2d595118c3 Building upgrades from backpack 2016-12-30 16:16:51 -05:00
ebaydayz
e33519ffd4 Readd changes from #1836 
I accidentally removed these when resolving merge conflicts with 854c41c
.
 2016-12-30 14:16:18 -05:00
ebaydayz
05e7a41c0e Update change log 2016-12-30 13:50:21 -05:00
ebaydayz
76e80a9388 Merge remote-tracking branch 'origin/master' 2016-12-29 21:06:54 -05:00
ebaydayz
101a6fc698 Fix wrong eventhandlers on viral zeds #1819 2016-12-29 20:53:35 -05:00
oiad
854c41cf8c switchModel, jerry_fill, packTent changes/fixes (#1836) 
* switchModel, jerry_fill, water_fill, drinkWater, packTent changes/fixes

player_packTent: Add private array since there was none. Make it match
player_packVault so a player can't pack the tent with others near (to
stop duping)

water_fill:
Fixed the massive lag issue with the check for ponds etc, Originally was
being done searching for all which is quite intensive, now only
searching for waterholeproxy which matches all the water holes on
chernarus I could try.
Fixed a few localizations. Thanks @schwanzkopfhegel

player_drinkWater: Same as above. Also removed a lot of unused private
variables.

jerry_fill:
Made the minimum fill level of fuel tanks 10% of
dayz_randomMaxFuelAmount so the tank will always have fuel
Fixed issue with ItemFuelBarrel only using 40 litres from a tank.
Thanks @schwanzkopfhegel
Display how much fuel was needed if the tank is empty
Fix issue if the tank was empty that dayz_actionInProgress was not reset

player_switchModel:
Fixed issue of coins dissapearing on gear change
Fixed old commented out code that was broken so now you will go back
into the camera view you were in before you changed clothes

* Revert drinkWater/water_fill changes

My previous commit can only be used on chernarus since it's the only map
that has the waterholeproxy we rely on.

* crafting localization fix

* Update german translations

* Rework

* Missed private variable

* Rework again

* Update german string
 2016-12-29 19:47:04 -05:00
icomrade
b355ae6a61 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-12-29 15:51:06 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz 
should fix #1838 Translation fixes are probably necessary
 2016-12-29 15:50:53 -05:00
A Man
c5ac6e458b Changing Fire Barrel output (#1843) 
The fire barrel output should be a fire barrel not a empty fuel barrel.
 2016-12-29 15:50:29 -05:00
ebaydayz
3176e1619d Set POI and infectiousWaterHoles off by default 2016-12-28 17:33:03 -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
icomrade
b807648cc6 Fix #1831 generator inventory not saving 2016-12-28 16:00:56 -05:00
icomrade
fc9b01e91c Add HiveExt.ini config variable MaintenanceObjects 
see bc67e02a223d0d2b9e9688cb5a2ce047edb60e1d for hiveExt changes
 2016-12-28 13:08:21 -05:00
ebaydayz
0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
A Man
3151c0df84 Update player_craftItem.sqf (#1830) 
Adding the ability to craft with all Dayz_Ignators when dayz_matchboxCount = true; For example crafting a Firebarrel
 2016-12-26 14:11:22 -05:00
ebaydayz
64f6a9daa3 Exit vanilla craft item when action is in progress 
Fixes #1826
 2016-12-25 20:01:55 -05:00
ebaydayz
b962bd50b9 Use faster switch in repair and salvage 
7496ef5d5c (commitcomment-20292237)
 2016-12-25 17:51:32 -05:00
ebaydayz
1d0a1bf9a2 Add comment about disabling GemWorthArray 2016-12-25 17:29:53 -05:00
oiad
75243933b4 Move more debug lines to #ifdef (#1829) 
* Move more debug lines to #ifdef

Tidys up server RPT

Also make the combination rolling text overwrite the previous build
spam.

* Make additional changes
 2016-12-25 17:20:30 -05:00
ebaydayz
7496ef5d5c Fix undefined color error in repair_vehicle.sqf 
Same color error as f92b751 .

Also same issue in salvage_vehicle.sqf as described in #1828

Added setVariable exceptions for tank hit points.
 2016-12-24 20:17:08 -05:00
Kobayashi
811e06ffe2 Detection of part doesn't work (#1828) 
For tanks and other vehicles not explicitly defined in configs, _part will return with "" using gettext(), evaluating if it is nil doesn't do anything. With this change it will properly allow for repairing tracks on tanks with scrap metal.
 2016-12-24 19:27:25 -05:00
ebaydayz
7e341739ee Readd hive shutdown code from 1051 #1822 
Fixes hive connection error when child 302 call fails.
 2016-12-24 18:09:01 -05:00
ebaydayz
d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -05:00
ebaydayz
6f0c70989b Remove unnecessary check in player_spawn_2 
This doesn't run on the server.
 2016-12-23 14:59:55 -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
f1b991acd2 Add M4SPR_DZE which spawns with 30Rnd Stanag default 2016-12-22 15:42:00 -05:00
oiad
9889c8cd76 Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg (#1824) 
* server_updateObject force update for single currency

This modifies server_updateObject to force update/save to the hive if
the item being saved is in the DZE_MoneyStorageClasses array.

Previously if you force saved the object multiple times, the coins would
not get updated until the inventory changed, which if this was for a
bank object it would never update.

(This applies if you are using PVDZ_veh_Save to save the object)

* z_at_calcDefaultCurrencyNoImg prettyfication

This fixes a long standing issue in my brain about how this text was
always displayed, to me it seemed very untidy and just thrown together
(since I borrowed it from the IMG version)

Changes the output from this example: 7 Ruby 1 Amethyst 3 Gold 4 10oz
Silver 5 Silver
To this prettier and more logical example: 7 Ruby, 1 Amethyst, 3 Gold, 4
10oz Silver and 5 Silver

Make texts great again!

* z_at_logtrade fixes

Removes hard coded "Coins" text and replaces it with configVariables
version.

Also removes duplicate code and simplifies it.

* Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg

This merges these two files together since they are largely the same,
this also adds an optional argument to change the font size which is
useful for custom scripts that use this function.

Examples of use:

[_number,true] call z_calcCurrency; // Return a string of text with no
images
[_number,false] call z_calcCurrency; // Return a string of text with
images
[_number,false,0.7] call z_calcCurrency; // Return a string of text with
the currency in it and sets the font size to 0.7
 2016-12-22 14:16:38 -05:00
ebaydayz
5b7b1d69bd Add HALO spawn height config var 
Height can be changed without overwriting player_monitor.fsm now.

Also
fixed my mistake from 3257d0f, need to HALO directly from debug pos for
antiTP compatibility.
 2016-12-13 19:50:22 -05:00
oiad
ce75f87e1d server_updateObject force update for single currency (#1821) 
This modifies server_updateObject to force update/save to the hive if
the item being saved is in the DZE_MoneyStorageClasses array.

Previously if you force saved the object multiple times, the coins would
not get updated until the inventory changed, which if this was for a
bank object it would never update.

(This applies if you are using PVDZ_veh_Save to save the object)
 2016-12-13 13:06:57 -05:00
ebaydayz
c9c31c1a32 Fix wrong bleeding icon on vanilla status UI 
Now using the correct updated icon from vanilla. All other icons are up
to date.
 2016-12-13 12:14:53 -05:00
ebaydayz
b62569932d Fix missing return variable in sched_antiTeleport 
My mistake from 5058308
 2016-12-12 16:22:43 -05:00
ebaydayz
b4c239729c Fix self actions duplicating when changing clothes and looking at a safe 
This was also a bug in 1051. Thanks to Epoch forums user jOoPs for
reporting.
 2016-12-12 15:23:31 -05:00
ebaydayz
bff2a3091d Remove two unused files 
Vanilla commit:

64ea1eaa76
 2016-12-11 15:25:57 -05:00
ebaydayz
3257d0fd88 Move HALO spawn below enableSimulation in player_monitor.fsm #1809 
Fixes stuck floating in air on Napf when dayz_paraspawn = true; Should
also fix #1809.

Fixes #1809
 2016-12-11 13:44:01 -05:00
ebaydayz
46355aed38 Add back missing Epoch player_antiWall call #1817 2016-12-10 21:20:04 -05:00
ebaydayz
2a1bd74eca Fix no damage from hitting ground after HALO if autoOpenChute=-1 
My mistake when adding this.
 2016-12-10 20:25:36 -05:00
ebaydayz
6ecdabc92d Fix swimming in ground glitch at certain spots on Napf 2016-12-10 16:36:51 -05:00
ebaydayz
d0e8291159 Fix floating arrows 
Fixes #1815
 2016-12-10 15:06:48 -05:00
icomrade
f18451ab48 Fix black crush in areas of shadows 2016-12-09 14:14:10 -05:00
ebaydayz
c3bf1d29d6 Fix arrow and other WeaponHolderBase inherited destrType #1815 
Prevents catching on fire when destroyed.
 2016-12-09 13:28:31 -05:00
ebaydayz
4e92255749 Remove equip_Crossbow_Kit from loot tables for now #1814 2016-12-09 12:33:54 -05:00
icomrade
67e0dfee81 Remove Turbo and HoldBreath key blocks 2016-12-08 17:11:45 -05:00
icomrade
f34d1820bb Fix full cinder wall vector building #1813 2016-12-08 16:46:23 -05:00
ebaydayz
2c8f236f95 Fix death message in potential case of suicide 2016-12-08 14:37:04 -05:00
ebaydayz
0d4d288d81 Fix DMR and M24 ammo price 2016-12-08 13:37:16 -05:00
ebaydayz
f92b751ae3 Fix undefined color error in salvage_vehicle.sqf 
Color was undefined if part damage was in any of these ranges:
0.2501 - 0.2599
0.5001 - 0.5999
0.7501 - 0.7599

Fixes related RPT errors:
Unknown attribute any>Remove
Unknown attribute -
Unknown attribute LFWheel
Unknown attribute (76%
Unknown attribute Damage)</t>
 2016-12-07 18:50:01 -05:00
ebaydayz
a60c1931ee Update default steam ports and disable mission voting 
These default ports tend to work best for both A2 and A3 as recommended
here:

https://community.bistudio.com/wiki/Arma_3_Dedicated_Server#Port_Forwarding

Most Epoch servers only run one mission, so players should not be able
to vote for a mission change.
 2016-12-07 16:31:49 -05:00
ebaydayz
90977e4a31 Update painkillers 
Vanilla commit:

1596a17b09
 2016-12-07 15:20:17 -05:00
ebaydayz
5094e61723 Update zombie pathing 
Vanilla commit:

f47d6fe5b9
 2016-12-07 13:25:19 -05:00
ebaydayz
dab70963d6 Update POI spawning again 
Vanilla commits:

d98cc5d700

e2afec6a21

5b85b311ed

55518ed792

4a5cb525ef
 2016-12-07 12:57:06 -05:00
ebaydayz
2160437e79 Convert POI to compact array format 
Vanilla commit:

c71d8cb23c
 2016-12-06 19:26:00 -05:00
icomrade
ef8f838238 Update Readme.md 2016-12-06 16:33:53 -05:00
icomrade
90f967c38c Update Readme.md 2016-12-06 16:33:37 -05:00
ebaydayz
638c7dd8b8 Remove some unused variables 2016-12-06 15:02:18 -05:00
ebaydayz
9234244c72 Clarify diag_log 2016-12-06 14:31:30 -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
86d16131bc Update change log 2016-12-06 13:10:07 -05:00
ebaydayz
dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz
c3af66b23a Fix ServerMagArray count error 
(select 2) selects 3rd element

From 252843d @icomrade
 2016-12-05 15:45:42 -05:00
ebaydayz
1bb76d2d22 Resolve merge conflict for #1807 2016-12-05 14:40:21 -05:00
ebaydayz
5058308f00 Prevent issues caused by respawn_west marker being moved 
Vanilla commit:

39bcedb4b6
 2016-12-05 14:37:28 -05:00
ebaydayz
2db6692643 Fix undefined var dayz_clientPreload during intro.sqs 2016-12-05 11:14:06 -05:00
ebaydayz
4dc667ac7e Remove unnecessary quotes in scripts.txt 
They are only needed if the keyword contains spaces.
 2016-12-04 21:51:05 -05:00
ebaydayz
44e585343f Update for servers that had single currency 3.0 installed 
Makes life easier for people upgrading 1051 databases. Otherwise their
client will error out on loop in fn_selfActions because dayz_onBack will
be a number when it should be a string.

https://epochmod.com/forum/topic/28493-alpha-release-single-currency-30-storage-default-hive-no-global-banking/
 2016-12-04 19:00:46 -05:00
ebaydayz
eb150a8289 Fix typo from 9ae0e7e 2016-12-04 14:52:57 -05:00
ebaydayz
9ae0e7eb11 Fix conversion of medical array for old characters 
Fixes some converted characters having a <null> value in the "rh_factor"
slot of their medical array causing them to fail to save.
 2016-12-04 14:38:47 -05:00
ebaydayz
7ab09b9a9f Fix error with converted characters medical array 
Select 12 actually selects the 13th item in an array, so the rh_factor
line will error if the array is equal to twelve.

This was responsible for some converted characters having a <null> value
in the "rh_factor" slot of their medical array causing them to fail to
save.
 2016-12-04 14:18:37 -05:00
ebaydayz
7af0cb2910 Lower numpad minus keydown timer for block cheats 
Fewer false positives
 2016-12-04 11:37:03 -05:00
ebaydayz
f03f116dfc Fix Arma cheats still enterable under certain circumstances 
Thanks to Epoch forums user Golgofinyanin for reporting.
https://epochmod.com/forum/profile/13156-golgofinyanin/
 2016-12-03 16:50:55 -05:00
ebaydayz
45159d81c2 Update pain sound effect 
Vanilla commit:

7cdb2e67fd
 2016-12-03 13:25:31 -05:00
ebaydayz
43d14dbdba Avoid potential issues with double private vars 
_message is a commonly used var name
 2016-12-02 14:39:04 -05:00
ebaydayz
5d1a6939e6 Fix refuel at gas station with generator #1806 
Fixed mistake from: e398250

The refuel code was only running if a fuel truck was passed to the
script.

Also removed fuel truck classes that do not exist from the
dze_fueltruckarray.
 2016-12-02 12:34:51 -05:00
ebaydayz
eacc362e38 Fix z_hunter texture #1805 2016-12-02 10:51:13 -05:00
ebaydayz
119470809f Disable moving of group dialog 2016-12-01 20:31:04 -05:00
ebaydayz
baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
ebaydayz
40ea519fd3 Temp fix for vault_pitch.sqf error in 1.0.6 release 2016-12-01 15:31:09 -05:00
ebaydayz
c0d5fcf17c Fix vault_pitch PVDZ_obj_Publish array 
106 server_publishObject expects inventory as 4th element.
 2016-12-01 15:15:04 -05:00
A Man
90453641d4 adding 3 missing german strings (#1804) 2016-12-01 12:46:09 -05:00
ebaydayz
1cd069e2d8 Uncomment PVDZ_dayzCarBomb 
Not sure if functional atm, but still in use if ItemCarBomb is script
spawned and right clicked (not obtainable by default). My mistake from
b6d88b1
 2016-12-01 10:32:25 -05:00
ebaydayz
1dd337b8ed Add @ndavalos and @SmokeyBR to credits in README 
Both contributed numerous corrections and bug reports. Thanks
 2016-12-01 10:28:10 -05:00
475 changed files with 9470 additions and 21448 deletions
Expand all files Collapse all files

106
CHANGE LOG 1.0.6.1.txt Normal file
View File

@@ -0,0 +1,106 @@
[NEW] Added config variable DZE_HaloSpawnHeight. @ebayShopper
[NEW] Added config variable DZE_ServerLogHits for logging source damage, weapon, ammo and distance to server RPT.
[NEW] Added M4SPR_DZE and VSS_vintorez_DZE which spawn with larger magazines by default. #1823 #1890 @AirwavesMan
[NEW] Building upgrades now source parts from the player's backpack and main inventory. @icomrade
[NEW] Server owners can configure nutrition system effects with DZE_NutritionDivisor in configVariables.sqf @icomrade
[NEW] Added back DZE_doorManagementHarderPenalty config variable. Required wait between incorrect entries of manual door codes is multiplied by two each time, starting at five seconds. #1847 @oiad
[NEW] Added server logging of failed unlock attempts on doors, safes and lockboxes. Also added server logging of all door locking and unlocking. #1853 @oiad
[NEW] Added loot positions for some more Sahrani and Tavi buildings
[NEW] Added military flashlight attachments
[NEW] Added full screen night vision goggles, classname: "NVGoggles_DZE" (must be added to traders by server owners) @icomrade
[NEW] Added setting to easily disable base takeover and configure which items are removable without ownership or access. See DZE_restrictRemoval in configVariables.sqf. #1886 @AirwavesMan @oiad
[NEW] Map markers are now automatically tagged with the name of the player who placed them. This can be easily removed or customized by admins. #1871 @looter809
[NEW] Added block in keyboard.sqf for sprint and prone through locked doors glitch. @LunaCB
[CHANGED] Turbo and HoldBreath keybindings are now allowed again. @icomrade
[CHANGED] Commented drink from hands at ponds due to client FPS impact. Players can still fill drinks at ponds by right clicking a container. #1816
[CHANGED] Disabled vanilla antiwall, POI, infectious waterhole and infected camp map additions by default due to negative FPS impact. They can be enabled in init.sqf and server_monitor. #1816
[CHANGED] Added shadow to dayz_rollingMessages white text so it is visible on light colored backgrounds and looks like cutText.
[CHANGED] Reverted pain to old violent shaking effect instead of subtle gun sway. #1839 @AirwavesMan @schwanzkopfhegel
[CHANGED] Reverted lobby and player list background colors to A2OA default instead of dark grey
[CHANGED] Salvage vehicle actions are no longer allowed in positions defined in DZE_SafeZonePosArray
[CHANGED] The town generator and comfrey plant spawner loops are now fully disabled when dayz_townGenerator=false; to improve client FPS. #1816
[CHANGED] AntiTP and scheduled security are now fully disabled when dayz_antihack=0. #1816
[CHANGED] Changed default value for the variable dayz_bleedingeffect to 2 (blood particle effect only) due to negative FPS impact. Set to 3 to enable blood stains again. #1816
[CHANGED] Group icons have been moved to a separate slower loop which only runs when in a group, and the group system is disabled by default. See configVariables.sqf to enable. #1816
[CHANGED] Flies now spawn ten minutes after death instead of right away. Flies are also disabled by default due to negative FPS impact. See init.sqf to enable. #1816
[CHANGED] SpawnCheck for loot and zombies has been lowered to 200m and switched to nearObjects instead of nearestObjects (same as 1051) for better client FPS. #1816
[CHANGED] Increased head shot damage for normal hits (non-zombie and non-melee)
[CHANGED] Slightly increased damage from vehicle run over
[CHANGED] Moved study body back to fn_selfActions for easy admin customization.
[CHANGED] Players can now lock and unlock a vehicle when the key is in their backpack. This can be changed in epoch_tempKeys. #1897 @oiad
[CHANGED] The vanilla building PVEHs have been commented out because we don't support or use the vanilla base objects currently.
[FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper
[FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper
[FIXED] Issue where Arma cheats could still be entered under certain conditions without pressing LeftShift at the same time as NumPadMinus. @ebayShopper
[FIXED] Tag friendly still showing after player accepts and related issue with BackpackAntiTheft. #1807 @oiad
[FIXED] Undefined variable dayz_clientPreload error on main menu during intro.sqs. #1810 @ndavalos @ebayShopper
[FIXED] Giving pain killers to another player no longer removes pain from the player giving the pain killers.
[FIXED] Occasional undefined error for text color attribute when repairing and salvaging vehicles. @ebayShopper
[FIXED] M24 ammo prices are now 1/4 of DMR ammo prices, so no profit can be made by combining M24 rounds. @looter809 @ebayShopper
[FIXED] Full cinderblock walls now work properly with vector building #1813. @DeVloek @icomrade
[FIXED] Death message showing incorrectly when players suicide under certain conditions. @oiad @ebayShopper
[FIXED] Death message sometimes showing incorrectly due to spawn delay. #1833 @schwanzkopfhegel @ebayShopper
[FIXED] Corpses occasionally being deleted right away due to delay between PVS and bodyName setVariable. #1825 @ebayShopper
[FIXED] WoodenArrow and other WeaponHolderBase inherited objects catching fire when destroyed due to destrType. #1815 @DeVloek @ebayShopper
[FIXED] Arrows floating in air when shot at same position against a wall multiple times. #1815 @DeVloek @ebayShopper
[FIXED] Swimming in ground glitch when relogging at certain positions on certain maps like Napf and Tavi. @ebayShopper
[FIXED] No damage from hitting ground after HALO jump when DZE_HaloOpenChuteHeight was set to -1. @ebayShopper
[FIXED] Added back missing call to Epoch player_antiWall function for preventing base glitching. #1817 @ndavalos @ebayShopper
[FIXED] HALO fresh spawns stuck swimming in air on Napf and failing to start correctly sometimes. #1809 @oiad @ebayShopper
[FIXED] Self actions sometimes duplicating when changing clothes and looking at a safe. @jOoPs @ebayShopper
[FIXED] Wrong bleeding icon on vanilla status UI. @jOoPs
[FIXED] It is no longer possible to autoRun under ponds on Chernarus, Namalsk and Napf. #1827 @schwanzkopfhegel
[FIXED] Hive connection error after the first and only online player disconnects during the object stream at server start up. #1822 @AirwavesMan @ebayShopper
[FIXED] Vanilla player_craftItem not exiting when action is already in progress. #1826 @schwanzkopfhegel
[FIXED] Fire barrel kit can be crafted with partially full matchboxes now. #1830 @AirwavesMan
[FIXED] Viral zeds stuck and not moving from their spawn location due to wrong init event handler. #1819 @DeVloek
[FIXED] Handling of boiled water bottles < 10 oz #1838 (Also removed the requirement to have an empty tin can to boil water) @icomrade @schwanzkopfhegel
[FIXED] Generator inventory not saving #1831 @icomrade @schwanzkopfhegel
[FIXED] Filling fuel barrels takes the correct amount from fuel tanks now (210 instead of 40 litres). #1834 @schwanzkopfhegel @oiad
[FIXED] Unable to sell some launchers like Javelin and Stinger which have the same classname for ammo and weapon. #1844 @ndavalos
[FIXED] Long search delay when filling water bottles, drinking from hands and drinking from empty cans is fixed on Chernarus, Namalsk and Napf. #1835 @schwanzkopfhegel
[FIXED] Players can not purchase a negative number of items anymore.
[FIXED] Switching weapons properly interrupts autorun now. #1850 @DeVloek
[FIXED] Duplicate matchbox or knife error when lighting a fire or gutting with multiple matchboxes or knives on toolbelt. #1849 @DeVloek
[FIXED] RU crates having zero cargo capacity and wrong classname DZ_ExplosivesBoxRU in loot table. #1852 @oiad
[FIXED] Combining M24 or 2Rnd shotgun ammo can no longer be abused to dupe mags via the method described in #1848. @DeVloek
[FIXED] Rapid starvation or dehydration when using chainsaw, chopping wood or pushing plane. Also lowered or removed nutrition hit for several actions. #1857 @TheZog
[FIXED] Unable to repair or salvage vehicle parts not listed in the RepairParts config, like Merlin glass and tank tracks. #1828 #1856 @ndavalos @schwanzkopfhegel @oiad
[FIXED] Unable to remove LightPole_DZ, DeerStand_DZ, MetalGate_DZ and StickFence_DZ. #1859 @TheZog
[FIXED] Unconscious locked input when running #1860 @icomrade @DeVloek
[FIXED] Running corpses when the dead player has no primary weapon @icomrade
[FIXED] "AI" text localized on wrong client in death messages #1867 @LunaCB
[FIXED] Trader menu server RPT logs partially localized on clients @oiad
[FIXED] Group icons will not show for units inside the player's vehicle anymore (helis, large planes, etc.). #1865 @schwanzkopfhegel
[FIXED] Lighting fires and building fireplaces not working on platforms raised over the sea #1866 @schwanzkopfhegel
[FIXED] Bandit1_DZ and Bandit2_DZ were the same. Bandit1_DZ is back to the normal non-camo skin now. #1874 @DeVloek
[FIXED] If a player force kills their game immediately after dying their body will no longer disappear. #1825 @looter809
[FIXED] Some AI behavior was broken due to RadioProtocolEmpty. Unfortunately this reintroduces group chat spam.
[FIXED] Players can no longer pack a tent while sleeping.
[FIXED] Players can no longer walk under water at Topolka Dam. @Bruce-LXXVI
[FIXED] server_PublishVehicle3 will no longer dupe a vehicle if it fails to read the vehicle back from the database. @oiad
[FIXED] Panic sounds will no longer overlap when the player is attacked by zombies. #1861 @DeVloek
[FIXED] Melee weapons will no longer be eaten when attempting to add them to a full toolbelt.
[FIXED] Updated to Sa-Matra's latest Core Patch BIS Effects which fix the fire in the sky bug again. #1883 @oiad @icomrade
[FIXED] Mark body now marks all of your bodies instead of just one. @oiad
[FIXED] Group and body markers correctly update on the GPS mini map now.
[FIXED] Vehicle lock and unlock actions are now refreshed correctly without needing to look away and back again. @oiad
[FIXED] A potential undefined error on bear trap trigger. @oiad
[FIXED] A few floating loot positions in firestation.
[FIXED] Blocked a duping method involving changing clothes. Thanks to Sercan for reporting. @oiad
[FIXED] Buildables now properly apply godmode if enabled during the restart window. @oiad
[FIXED] G36C ACOG attachment
[NOTE] The fixes below are included in the 1.0.6 Build C server package released December 29th, 2016 (http://dayzepoch.com/a2dayzepoch.php)
[FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. @icomrade
[FIXED] Error with object publishing when snap building is disabled. @ebayShopper
[FIXED] Error handling upgraded 1051 databases that resulted in a <null> value for "rh_factor" and array for "bloodtype" in character_data medical field. @ebayShopper
[FIXED] Error in server_playerSetup that resulted in a <null> value for dayz_onBack in character_data inventory if player had no weapon on back. @ebayShopper
[FIXED] Doors and plots not getting cleaned up properly. See new MaintenanceObjects variable and explanation in HiveExt.ini. @icomrade
[REMOVED] Antiwall glitch blocks for vanilla hospitals since Epoch uses DayZero hospitals. @jOoPs
[REMOVED] "Take ownership" on plot pole due to it being unnecessary and causing base objects to duplicate. #1811 @BNG-Lance @Clanwarfare
[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.

142
CHANGE LOG 1.0.6.txt
View File

@@ -1,142 +0,0 @@
[NEW] Fully updated to DayZ 1.8.8 base @icomrade @ebayShopper
[NEW] 1.8.8 attachments, blood trails, community weapons, traps and tripwires
[NEW] 1.8.8 journal and crafting menu are now functional (default 'J' key)
[NEW] 1.8.8 spawn selection, set dayz_spawnselection = 1; in init.sqf to enable (Chernarus only)
[NEW] 1.8.8 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
[NEW] 1.8.8 weapon switching and hotkeys (1 = primary, 2 = pistol, 3 = melee (or rifle onBack if DZE_TwoPrimaries=2;))
[NEW] Players can carry more than one primary (one hidden on back). See configVariables.sqf for details @icomrade
[NEW] Many new configuration options are available for admins. See dayz_code\configVariables.sqf and mission\init.sqf for descriptions.
[NEW] Optional rules feed on player login, set dayz_enableRules in init.sqf
[NEW] Streamer mode is toggleable by player in game options. Setting enabled hides server water mark and rules feed. @ebayShopper
[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebayShopper
[NEW] Optional dark UI by @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ code fixes by @SplenectomY @icomrade #1622
[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
[NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebayShopper
[NEW] Autorun hotkey ('0' key)
[NEW] Earplugs hotkey ('F1' key)
[NEW] Group system ('F5' key) with database save. Settings available in configVariables.sqf. CommandBar and RadioProtocol spam are now disabled via config. @icomrade @ebayShopper
[NEW] Snap building, use DZE_modularBuild = true; in init.sqf to enable. @raymix
[NEW] Auto login when a player joins the server, default 10 seconds, requires mission update (disable in description.ext by setting defValueParam1 = 31;) @icomrade
[NOTE] Auto login does not force a player who aborted from the game, back to the lobby, to login
[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable.
[NEW] Dayz_townGenerator = true; in init.sqf enables vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. @ebayShopper
[NEW] Database backup script. See Server Files\Tools\. @RimBlock
[NEW] Upgraded (_DZE1,2,3,4) ArmoredSUV and Kamaz classes are now available. #1518 #1538 @McKeighan
[NEW] Added increased waves during stormy weather #974 @FramedYannick @ebayShopper
[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebayShopper
[NEW] A much improved version of Zupa's Advanced Trading 2.1+ is now the default config trader menu, NOT COMPATIBLE WITH DATABASE TRADERS @icomrade @Windmolders
[NEW] With config based traders categories can be reused by setting the duplicate=#; value. # is the category number to copy. @ebayShopper
[NEW] With config based traders upgraded vehicles can now be sold for the same price as their original. #1745 @oiad
[NEW] With config based traders the buy or sell price of any item can be set to -1 to forbid the respective trading action. @icomrade
[NEW] Gems are now treated as variable value currency (Advanced Trading only). Configure gem values using DZE_GemWorthArray =[]; See configVariables.sqf. @icomrade
[NEW] Gem rarity is now configurable for mining using DZE_GemOccurance =[]; See configVariables.sqf. @icomrade
[NEW] A Plot For Life v2.5+ by RimBlock is now included and enabled by default, see configVariables.sqf @RimBlock @icomrade
[NEW] Build Vectors v4+ by Striker is now included, only enabled with Snap building. Note there is no option to turn off Vector Building with Snap Building enabled @strikerforce @icomrade
[NEW] Door Management v3.0+ by Zupa is now included and enabled by default with variable DZE_doorManagement, see configVariables.sqf @DevZupa @Bruce-LXXVI @ebayShopper
[NEW] Plot Management v2.1+ by Zupa is now included and enabled by default with variable DZE_permanentPlot, see configVariables.sqf @DevZupa @Bruce-LXXVI @icomrade
[NEW] Precise Base Building v1.0.5+ by Mikeeeyy is now included. @Mikeeeyy @icomrade @ebayShopper
[NEW] You may toggle vehicle destruction effects to prevent damage from vehicle explosions (useful to prevent griefing from ramming) use DZE_NoVehicleExplosions = true; to enable #1198 @icomrade
[NEW] Temperature factors are now configurable with DZE_TempVars see configVariables.sqf. @icomrade
[NEW] Weather effects are now configurable with DZE_WeatherVariables. See DynamicWeatherEffects.sqf for info on these values. @icomrade
[NEW] Full height cinderblock wall kits are now in game, classname "full_cinder_wall_kit" #1172 @icomrade
[NEW] You can exclude built items from the god mode base function using DZE_GodModeBaseExclude = []; which is an array of item classnames
[NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf
[NEW] More possible causes of death added to study body: fell, ran over, shot, melee, zombie @ebayShopper
[NEW] Player-list no longer shows who's in lobby or ingame.
[NEW] 35 new male clothing classes added. #1732 #1734 @AirWavesMan
[NEW] Added new _DZ variants of BRDM2, AN2, HMMWV, Mi17 and Cessna classes with radar disabled. #1746 @AirWavesMan
[NEW] Added SCAR Mk16 and Mk17 variants, L86 and AA12 to loot tables and traders. #1743 @AirWavesMan
[NEW] Players can now manually push stuck planes backwards to free them. @ebayShopper
[NEW] Salvage can now be disabled on locked vehicles via DZE_salvageLocked variable. #1757 @oiad
[NEW] You may now rearm pooks and other helicopter, vehicle, pilot and driver weapons. @icomrade
[NEW] Death messages now use a PVEH instead of the unreliable MPHit. Added localization, more causes of death, systemChat and dynamicText killfeed options. @ebayShopper
[NEW] Parachute can now auto open at a set height during HALO jump. Altitude and speed meter can also be enabled. See configVariables.sqf. @ebayShopper
[NEW] Added hatch, fold and ramp animation UserActions to ArmoredSUV, AH1Z, MV22 and UH1Y configs. @ebayShopper
[NEW] VON in side and global is now blocked by default. See configVariables.sqf to change blocked VON channels. @icomrade @ebayShopper
[NEW] Arma cheat input (LeftShift + NumPad-) is now blocked by default to prevent abuse of FPS cap and EndMission commands for duping. @icomrade
[CHANGED] Combattimeout now uses diag_tickTime instead of time.
[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
[CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
[CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x
[CHANGED] All instances of sleep were replaced with the more reliable uiSleep where possible. @icomrade
[CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade
[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebayShopper
[CHANGED] With R3Fweight on overburdened players are now forced to move slowly instead of being knocked out. The scream was also removed. #1145 @icomrade @ebayShopper
[CHANGED] Abort and respawn are now disabled immediately in the pause menu onLoad to compensate for low fps delay. @ebayShopper
[CHANGED] Player_onPause is now customizable by admins along with the new unscheduled fn_pauseMenuChecks. #1340 @Rimblock @ebayShopper
[CHANGED] Satchel charges, mines and launcher rounds now take one inventory slot instead of multiple for consistency with all other Epoch items. @ebayShopper
[FIXED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebayShopper
[FIXED] Zombies now target and attack players far more accurately than in 1.0.5.1.
[FIXED] Server position sync bug after falling unconscious. Fixes AI on server not seeing the player after knock out and position revert after relog. #1522 @ebayShopper
[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebayShopper #1613
[FIXED] Character sometimes failing to sync after changing clothes #1545
[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
[FIXED] CH53 gear when locked #1364 @icomrade
[FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
[FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
[FIXED] Crossbow quivers not working #1355 @icomrade
[FIXED] Crash_spawner & Supply_drop modules spawning inaccessible loot piles #1408 #1390 @Uro1
[FIXED] Several script errors in dayz_server #1421 #1425 @ebayShopper
[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1. @Uro1
[FIXED] Eating while inside a vehicle did not drop empty can @deadeye2
[FIXED] Zombie loot error when using loot tables in mission file @deadeye2
[FIXED] Trader menu expected array error #1618-1620 @ebayShopper
[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
[FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu
[FIXED] Copy key failing when player doesn't have a backpack @ebayShopper
[FIXED] Fire barrels not being detected over water @pj999 @icomrade #1559 #1564
[FIXED] Opening supply crates over water no longer drops the items on the sea floor @pj999 @icomrade #1558
[FIXED] Plot pole required message not updating to reflect DZE_PlotPole radius @mathewjknott @icomrade #1274
[FIXED] Slow login timer and incorrect loading screen message when login times out @icomrade
[FIXED] Combine mags not working for Revolver and M1911 ammo @Terrien @ebayShopper #1313
[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebayShopper #1514
[FIXED] Smoke countermeasures are now visible @Markokil321 @icomrade #1440
[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebayShopper #1599
[FIXED] Safes and lockboxes occasionally wiped when opening after restart and locking not being logged to RPT @ebayShopper #1413 #1503
[FIXED] Greatly optimized safe gear handling. Safe inventories are no longer sent to all machines over the network on server startup and each lock. @ebayShopper
[FIXED] Common duping methods exploiting safes no longer work with the new safe gear handling code. #1341 @RimBlock @ebayShopper
[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts. @icomrade #1504
[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebayShopper
[FIXED] Player no longer hears radiation sound when changing clothes. @ebayShopper
[FIXED] Ponds and lakes are now detected correctly in player_goFishing and player_drinkWater. #1678 @ebayShopper
[FIXED] Players are now ejected and force killed when their vehicle is destroyed. This applies to all vehicles except cars. Cars eject, but do not force kill. @icomrade
[NOTE] Servers that use safezones must configure DZE_SafeZonePosArray, otherwise passengers of vehicles in safezones will be killed on destruction of their vehicle. See configVariables.sqf.
[FIXED] Players are no longer able to brute force doors or safes by the method described in #1187 @icomrade
[FIXED] Some buildables not displaying removal option #1135 @icomrade
[FIXED] Study body message saying his/he on female players. @ebayShopper
[FIXED] Destroyed ore veins and ammo crates are now deleted globally after being removed. #1730 @icomrade
[FIXED] UH1Y and AH6X unknown animation source RPT errors. Added back observer seats to AH6X and UH1Y without thermal imaging. @icomrade
[FIXED] Players can no longer relog over bases in a helicopter, parachute or plane to get inside. @ebayShopper
[FIXED] Mozzie helicopter noises, and crashed mozzies bouncing into orbit. @icomrade
[FIXED] Firing from vehicles puts you in combat now. @icomrade
[FIXED] Players will no longer end up swimming in the ground after spawn, relog or clothes change on maps with respawn_west in the water. @ebayShopper
[FIXED] It is no longer possible to drag players through base walls when they are unconscious. @icomrade
[FIXED] Purchased vehicles should no longer spawn inside each other on trader helipads. @icomrade
[FIXED] Humanity hit is now applied correctly to players shooting from vehicles. @ebayShopper
[FIXED] Chopped down trees are now synced for JIP players, so they no longer respawn on relog. @ebayShopper
[FIXED] Several errors with loading and unloading unconscious players from vehicles. @oiad @ebayShopper
[FIXED] Occasional glitch death when opening parachute during HALO jump. @ebayShopper
[UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
[UPDATED] .bat files updated in Config-Examples @Raziel23x
[UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
[UPDATED] Epoch.sql, 1.0.6_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
[INFO] Server owners must update to the new Hive DLL included in the 1.0.6 release, changes in the source code can be found here: https://github.com/vbawol/DayZhiveEpoch/pull/13
[INFO] Many weapon and item classnames changed. Admins must update their traders. See SQL\1.0.6_Updates and dayz_code\Configs\CfgServerTrader
[INFO] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt
[INFO] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
[INFO] If you use any community mods included in this release (AdvancedTrading, BuildVectors, Door/PlotManagement, SnapBuild, PlotForLife, PreciseBuilding, DZGM, etc.) you MUST uninstall them from your mission. They have been improved and many bugs have been fixed. Get updated copies from https://github.com/EpochModTeam/DayZ-Epoch
[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) are confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
[INFO] Server owners and players should use the stable branch of ArmA 2 OA
[INFO] The A2OA Linux server version is 1.63.130836 at the time of release. Until it is updated with the core patch fixes Linux server admins will need to patch their mission: https://github.com/DayZMod/DayZ/issues/732
[INFO] Models/textures by Paul Tomany. @Sequisha.
[INFO] Special thanks to http://verthosting.com for hosting our development server.

1
Documents/1.0.6 Variable Name Changes.txt
View File

@@ -1,6 +1,7 @@
1.0.5.1 --> 1.0.6 Variable Name Changes:
- Duplicate functions have been renamed:
- dayz_gui --> sched_gui
- dayz_HungerThirst --> dayz_NutritionSystem
- dayz_objectUID3 --> dayz_objectUID2
- DZE_getModelName --> fn_getModelName

2
README.md
View File

@@ -112,6 +112,8 @@ GitHub Contributors (In order of most commits)
* AirwavesMan - https://github.com/AirwavesMan
* Raziel23x - https://github.com/Raziel23x
* strikerforce - https://github.com/strikerforce
* ndavalos - https://github.com/ndavalos
* SmokeyBR - https://github.com/SmokeyBR
--------------------------
Special thanks

54
SQF/dayz_code/Configs/CfgLoot/Buildings/Farm.hpp
View File

@@ -45,10 +45,6 @@ class Land_Barn_W_01: Farm {
lootPosSmall[] = {{4.09351,10.3872,-2.69559},{0.10791,3.48096,-2.64446},{-4.51636,-12.2603,-2.67148},{3.54419,-15.8311,-2.63077}};
};
class land_shed_m01: Farm { //DZE ADDED
zedPos[] = {{0.218262,-1.78369,-0.347349}};
};
class Land_Barn_W_02: Farm {
zedPos[] = {{3.35938,-0.151367,-2.31305},{-2.84351,0.213867,-2.31177},{-2.94604,-5.01465,-2.28998},{2.53711,-5.89258,-2.28949},{3.16479,5.56543,-2.28406},{-5.63306,4.83105,-2.26355}};
//lootPos[] = {{3.17,5.57,-2.28},{2.54,-5.89,-2.29},{-2.84,0.21,-2.31},{-5.63,4.83,-2.26},{-0.21,3.44,-2.31},{-0.74,-5.93,-2.31}};
@@ -78,28 +74,52 @@ class Land_Shed_W02: Farm {
zedPos[] = {{0.688232,1.88281,-0.00292969}};
lootPos[] = {{0.688232,1.88281,-0.00292969}};
};
//DZE ADDED BELOW
// ALT-MAP Support
class Land_sara_stodola: Farm { // brown wooden barn one story
zedPos[] = {{-0.637695,2.9707,-2.19523},{0.459961,0.398438,-2.19523}};
lootPos[] = {{5.01367,3.33118,-2.19523},{2.51758,1.05737,-2.19523},{-1.30957,-1.02954,-2.19523},{-4.24414,4.0238,-2.19523},{5.16211,-0.661621,-2.19523}};
};
//land_domek_podhradi_1 in Residential.hpp
class land_jzd_stodola2: Farm { // one story cement, sliding wooe doors, hay bales inside
zedPos[] = {{5.2832,-11.1592,-2.0262},{-2.20215,-0.935547,-2.0262}};
lootPos[] = {{8.15527,11.8477,-2.0262},{5.5127,5.6377,-2.0262},{-4.16113,3.67383,-2.0262},{7.53223,-14.4741,-2.0262},{1.16992,0.390625,1.31123}};
};
class land_jzd_kr2: Farm { // one story cement barn
zedPos[] = {{2.12061,-22.3691,-6.30976},{2.86523,-3.03125,-6.17321},{0.813965,4.67188,-6.17321}};
//lootPos[] = {{3.86279,9.33008,-2.05339},{-2.43359,-9.56152,-2.0534},{2.12061,-22.3691,-6.30976},{2.13379,17.9229,-6.30976},{2.86523,-3.03125,-6.17321},{0.813965,4.67188,-6.17321}};
lootPos[] = {{1.92139,-4.90527,-6.17321},{0.709961,5.00488,-6.17321},{1.8623,7.37109,1.40623},{3.00684,-3.30566,1.41873},{-3.0625,-3.38477,-2.05339},{-2.62646,10.8418,-2.05339}};
};
class land_jzd_kr1: Farm { // one story cement barn
zedPos[] = {{0.0078125,-1.14941,-2.14676},{-4.2085,-12.3887,-2.14676},{0.878906,-9.51953,-6.26657}};
//lootPos[] = {{-2.42578,6.77832,-2.14676},{0.0078125,-1.14941,-2.14676},{-4.2085,-12.3887,-2.14676},{0.878906,-9.51953,-6.26657},{-0.756348,0.71875,-6.26657}};
lootPos[] = {{-1.04834,-3.67578,-6.27279},{1.63818,0.775391,-6.27279},{-1.41992,5.10449,-6.27279},{-0.993164,2.94629,-2.15298},{0.717285,-3.79688,-2.15298}};
};
class land_jzd_stodola2: Farm { // one story cement, sliding wooe doors, hay bales inside
zedPos[] = {{5.2832,-11.1592,-2.0262},{-2.20215,-0.935547,-2.0262}};
//lootPos[] = {{5.2832,-11.1592,-2.0262},{4.56445,10.0796,-2.0262},{-2.20215,-0.935547,-2.0262},{4.02734,4.24463,-2.0262}};
lootPos[] = {{8.15527,11.8477,-2.0262},{5.5127,5.6377,-2.0262},{-4.16113,3.67383,-2.0262},{7.53223,-14.4741,-2.0262},{1.16992,0.390625,1.31123}};
//land_hut02 in Residential.hpp
//land_hut01 in Residential.hpp
//land_hut04 in Residential.hpp
//Land_House_L_8_EP1 in Residential.hpp
//Land_House_L_3_EP1 in Residential.hpp
//Land_House_L_4_EP1 in Residential.hpp
//Land_House_L_6_EP1 in Residential.hpp
class land_smd_hut02: Farm { // grass hut
lootPos[] = {{0.338867,0.525391,-0.445763}};
};
class land_smd_hut01: Farm { // grass hut
zedPos[] = {{1.9834,-3.39844,-0.44834}};
lootPos[] = {{0.223633,-0.512695,-0.44834},{3.22607,1.40723,-0.44834}};
};
class land_smd_hut04: Farm { // grass hut
lootPos[] = {{0.250977,1.02734,-0.437198}};
};
//Land_bouda2_vnitrek in Residential.hpp
class Land_smd_sara_stodola2: Farm { // brown open barn
zedPos[] = {{1.01563,-0.325195,-2.16877}};
lootPos[] = {{4.57617,0.255859,-2.16877},{-4.61133,-1.60156,-2.16877},{-5.38281,2.94336,-2.16877}};
};
// ALT-MAP Support
//DZE ADDED BELOW
class land_jzd_stodola1: Farm {
lootPos[] = {{-3.81592,-11.418,-2.0262},{1.73877,-6.20605,-2.0262},{-4.13477,-0.265625,-2.0262},{-1.04883,0.180664,-2.0262}};
};
class Land_sara_stodola: Farm { // brown wooden barn one story
zedPos[] = {{-0.637695,2.9707,-2.19523},{0.459961,0.398438,-2.19523}};
//lootPos[] = {{2.72266,-1.14648,-2.19523},{4.06152,3.59375,-2.19523},{-3.32324,3.92969,-2.19523},{-3.99219,-0.698242,-2.19523}};
lootPos[] = {{5.01367,3.33118,-2.19523},{2.51758,1.05737,-2.19523},{-1.30957,-1.02954,-2.19523},{-4.24414,4.0238,-2.19523},{5.16211,-0.661621,-2.19523}};
};
class land_shed_m01: Farm {
zedPos[] = {{0.218262,-1.78369,-0.347349}};
};

212
SQF/dayz_code/Configs/CfgLoot/Buildings/Industrial.hpp
View File

@@ -1043,6 +1043,135 @@ class Land_Ind_Quarry : Industrial
};
lootPos[] = {{-4.53,-6.8,5.25},{-4.36,16.23,5.26},{0.74,-10.68,-7.48},{-2.97,-15.79,-7.48},{-7.11,3.25,-7.48},{6.12,6.62,-7.48},{6.38,9.22,-7.48},{-7.12,13.38,-7.48},{-4.55,6.12,5.29}};
};
// ALT-MAP Support
class Land_MBG_Warehouse : Industrial // cement garage with roll up doors
{
zombieChance =1;
zedPos[] = { {18.6279,-11.8701,-6.14345},{18.7441,-3.52979,-6.14345},{19.6816,10.3794,-6.14345} };
lootPos[] = {
{18.6279,-11.8701,-6.14345},
{18.7441,-3.52979,-6.14345},
{19.6816,10.3794,-6.14345},
{19.3037,-4.68115,-2.84345},
{20.1992,9.28613,-2.84345},
{-14.5117,-11.2427,5.15655},
{19.957,-11.1582,5.15655},
{4.71289,1.58838,5.15655}
};
};
class Land_aif_tovarna1 : Industrial // concrete, blue sliding doors, generators upstairs
{
zombieChance =1;
zedPos[] = { {0.583008,-5.31641,-6.33001},{-9.15723,0.269531,-6.33001} };
lootPos[] = { {-10.3301,-8.71875,-0.352261}, {2.54883,3.63672,-0.352261},{-5.18652,-8.57422,2.39782},{2.47559,0.566406,2.39782},{-0.111328,0.832031,5.31266},{-8.40918,-5.96484,5.31261} };
};
class Land_MBG_Radiotelescope : Industrial // radio telescope
{
zedPos[] = { {1.30273,-5.41602,-8.95671},{-5.34375,2.29785,-9.72141},{-0.125,6.33398,-9.952} };
};
//Land_House_C_10_EP1 in Residential.hpp
class land_mbg_garage_single_b: Industrial {
lootPos[] = {
{2.54492,3.97607,-1.03899},
{4.13672,-0.0625,-1.03899}
};
lootPosSmall[] = {
{4.50586,2.56982,-1.03899}
};
zedPos[] = {{2.96094,6.3374,-0.133815}};
};
class Land_seb_bouda_plech : Industrial // shed
{
zedPos[] = {{0.587891,-0.694336,-1.25855},{-1.32471,2.75488,-1.72853}};
lootPos[] = {{0.518555,-1.09863,-1.24038},{0.78418,0.317871,-1.30457},{-1.39551,-1.56641,-1.72854},{1.45264,1.75,-1.72855}};
};
//Land_hut_old01 in Residential.hpp
//land_bunka in Office.hpp
class land_molovabud2 : Industrial // brick and concrete
{
zedPos[] = {{0.902344,2.01514,-1.51244},{-0.229492,2.83521,-1.51244}};
lootPos[] = {{-1.29492,4.75195,-2.46292},{2.67529,3.74512,-2.46296},{2.27832,-6.29395,-2.46296},{-1.73779,-6.27246,-2.46292},{0.274902,-5.6543,-2.46294},
{-0.87793,4.93457,-2.46293},{-7.5376,4.89258,1.41187}};
};
class land_molovabud1: Industrial { // brick and concrete
lootPos[] = {{-2.4458,2.20703,1.27995},{-4.68164,1.95508,1.27995},{-7.92822,6.29199,1.27995},{-1.81055,-1.29199,1.56745}};
};
class land_seb_rozvodna: Industrial {
lootPos[] = {{-1.2168,2.9668,0.583904}};
};
class land_provoz2 : Industrial // brick with metal roof
{
zedPos[] = {{-3.44727,-2.83105,-2.30756},{3.27734,1.92676,-2.30756}};
lootPos[] = {{3,0.40332,-2.51849},{-4.00488,0.662598,-2.51849},{3.23877,-2.76855,-2.30756},{-3.35352,1.86328,-2.30756}};
};
class land_sklad2 : Industrial // brick garage with metal roof
{
zedPos[] = {{2.60986,-1.60938,-2.38225},{3.19336,2.91602,-2.38225},{-2.04541,-0.470703,-2.38225}};
lootPos[] = {{2.60986,-1.60938,-2.38225},{3.19336,2.91602,-2.38225},{-2.04541,-0.470703,-2.38225}};
};
class land_hala1 : Industrial // brick factory with tanks inside
{
zedPos[] = {{2.23096,-5.30859,-3.98352},{1.9248,-3.57227,4.05042},{3.47656,1.4502,4.04957}};
lootPos[] = {{2.23096,-5.30859,-3.98352},{1.9248,-3.57227,4.05042},{3.47656,1.4502,4.04957}};
};
class land_seb_main_fac : Industrial // large concrete factory
{
zedPos[] = {{2.23096,-5.30859,-3.98352},{1.9248,-3.57227,4.05042},{3.47656,1.4502,4.04957}};
lootPos[] = {{4.19727,-1.7002,-5.81592},{13.6123,-3.59717,-5.75059},{18.8447,-0.019043,-5.83285},{4.12305,15.0049,8.63872},{2.93262,5.25195,8.63872},
{19.748,12.3213,8.63872},{20.1475,5.85547,8.63872},{-6.57617,4.96094,4.16873},{-4.16797,9.9248,4.16873}};
};
class land_garaze: Industrial {
lootPos[] = {{-0.00292969,-7.72925,-2.12658},{3.7334,1.02759,-2.12658},{3.2793,6.28857,-2.12658},{6.72949,7.34131,-2.12658},{1.68848,-3.91479,-2.12658}};
};
class Land_vys_budova_p1 : Industrial // one story garage 1 broken wood door
{
zedPos[] = {{5.57129,-4.15234,-2.09256},{4.67871,0.528564,-2.09256},{5.05273,4.5957,-2.09255}};
lootPos[] = {{-4.2168,-3.61816,-2.96085},{-4.59521,3.25635,-2.96088},{3.84375,2.55566,-2.96088},{1.14941,8.65527,5.59122},{-5.85205,2.18896,5.59122},
{-3.25635,-9.58398,5.59122},{-2.90771,-0.239746,5.59869},{-1.104,-0.294434,2.12335},{-1.09863,0.403809,-0.407806},{4.30469,-1.36182,-2.96088}};
};
class Land_Ind_Oil_Tower_EP1: Industrial
{
lootPos[] = {{ 3.55743,-5.92773,-12.9755 },{ 4.63086,1.24902,-12.9932 },{ -0.240356,-1.08252,-12.9875 },{ 6.87689,-6.34961,-8.00889 },{ 2.31177,0.231689,-8.00478 }};
};
class Land_tovarna1: Industrial
{
lootPos[] = {{ 2.83887,5.23889,-5.75442 },{ -2.30774,7.31934,-5.75442 },{ -11.0908,5.44897,-5.75442 },{ -11.4746,-1.5791,-5.75442 },{ -5.52405,1.68994,-5.75442 },{ 2.82605,1.4801,-5.75442 },
{ 2.44128,-6.50256,-5.75442 },{ -6.68335,-0.453369,2.17997 },{ -3.81812,0.690186,2.17997 },{ 2.78735,1.19409,2.17997 },{ 1.59167,-6.06665,2.17997 },{ -2.4646,-5.63696,2.17997 },{ -5.77393,-7.28271,2.17997 },{ -0.484985,-3.14197,4.82992 }};
};
class Land_Fort_Watchtower : Industrial //
{
zedPos[] = {{0.271973,0.984497,-2.21036}};
lootPos[] = {{0.126953,-0.00146484,-2.21036}};
};
class Land_ibr_FuelStation_Build: Industrial // gas station
{
lootChance = 0.5;
zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
zedPos[] = {{2.19458,-0.13916,-1.33611}};
lootPos[] = {{-1.34521,1.40698,-1.33611},{2.27051,-0.949951,-1.33611},{-2.23193,-1.146,-1.33589},{-0.185059,0.775146,-1.33609}};
};
class Land_House_C_12_EP1: Industrial // makeshift repair shop w/car ramps
{
zedPos[] = {{2.11182,-8.16724,1.00763},{1.85498,-3.48828,-2.63601},{-2.74854,0.133301,-2.63601},{2.65674,-5.69165,-2.63601},{-2.60742,-7.35913,1.0174}};
lootPos[] = {{-3.27197,-1.5813,-3.50101},{-2.09863,-6.13086,-3.52102},{-2.979,-8.6936,0.141808},{-2.66602,-3.0437,0.139957},{5.91016,-3.59204,0.132626},{2.33154,-1.00244,-3.51937}};
lootPosSmall[] = {{-4.03857,-2.06226,-2.43102},{-4.02344,-1.44019,-3.11102},{-3.55371,-0.618164,-3.29102},{7.38184,0.690674,-3.12101},{-2.99268,-6.54883,3.45573},{7.58105,-2.40894,0.112629},{-1.79004,-3.58325,0.128376},{-2.05713,-9.00806,0.150394}};
};
class LAND_garaz_bez_tanku: Industrial // barrier garage thing walk up sides
{
lootPos[] = {{-2.98047,0.0463867,3.41651}};
lootPosSmall[] = {{-1.36499,-0.579102,3.42651}};
zedPos[] = {{-5.14404,-2.02295,-1.71924},{4.92676,-2.67383,-1.71924}};
};
class Land_leseni2x: Industrial
{
lootPos[] = {{1.15625,-0.206055,2.55466}};
};
class Land_smd_garaz_open: Industrial // garage with 3 green doors
{
lootPos[] = {{-5.10742,-0.351563,-1.22162},{-1.11328,-0.112305,-1.22162},{3.65039,-0.338867,-1.22162}};
};
// ALT-MAP Support
//DZE ADDED BELOW
class land_trubice: Industrial {
lootPos[] = {{-2.36719,2.7627,2.59438},{5.82715,3.01563,2.59438},{1.57617,0.709961,2.59438}};
@@ -1061,9 +1190,6 @@ class land_cast1: Industrial {
class land_panelova: Industrial {
lootPos[] = {{16,-14.6357,-4.04666},{3.79102,1.25659,-4.08966},{-15.4639,-8.38086,-4.08966},{-14.3535,-0.195313,-4.08966},{-1.61719,-12.8313,-4.08966},{15.4287,-4.25635,3.37273},{9.19336,-14.6272,3.37141},{5.80957,9.09253,3.37141},{9.95508,9.7937,3.37141},{-8.11523,-2.98291,3.34401},{-15.2598,-8.56641,3.34401}};
};
class land_garaze: Industrial {
lootPos[] = {{-0.00292969,-7.72925,-2.12658},{3.7334,1.02759,-2.12658},{3.2793,6.28857,-2.12658},{6.72949,7.34131,-2.12658},{1.68848,-3.91479,-2.12658}};
};
class land_seb_bouda3: Industrial {
lootPos[] = {{2.63574,-3.0332,-1.72872},{-2.71875,-5.08691,-1.72873},{-3.00293,-1.50781,-1.72877},{-2.91357,3.86328,-1.72876},{3.12891,3.01563,-1.72879}};
};
@@ -1079,9 +1205,6 @@ class land_seb_mine_main_opt: Industrial {
class land_seb_mine_near: Industrial {
lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
};
class land_molovabud1: Industrial {
lootPos[] = {{-2.4458,2.20703,1.27995},{-4.68164,1.95508,1.27995},{-7.92822,6.29199,1.27995},{-1.81055,-1.29199,1.56745}};
};
class land_f_b1: Industrial { // one story garage and ramp
zedPos[] = {{2.6582,-3.80225,-3.08734},{3.87988,2.10889,-3.1054}};
//lootPos[] = {{-3.18848,-0.702148,-2.21533},{-2.42188,-4.46582,-2.21533}};
@@ -1100,9 +1223,6 @@ class land_seb_vod_vez: Industrial {
class land_seb_near_fac: Industrial {
lootPos[] = {{-10.4116,-18.0859,1.75552}};
};
class land_seb_rozvodna: Industrial {
lootPos[] = {{-1.2168,2.9668,0.583904}};
};
class Land_FuelStation_Build_PMC : Industrial //IndustrialFuel
{
@@ -1110,13 +1230,6 @@ class Land_FuelStation_Build_PMC : Industrial //IndustrialFuel
{-1.51141,1.30359,-1.33611},
{2.23376,0.0710449,-1.33611}};
};
class Land_leseni2x: Industrial
{
lootPos[] = {
{1.15625,-0.206055,2.55466}};
};
class land_bouda_garaz: Industrial
{
lootPos[] = {
@@ -1138,35 +1251,6 @@ class land_dum_istan2_02: Industrial
{-0.566406,-3.44775,-4.14959},
{-2.00146,1.43604,-4.14959}};
};
class LAND_garaz_bez_tanku: Industrial
{
lootPos[] = {
{-2.98047,0.0463867,3.41651}
};
lootPosSmall[] = {
{-1.36499,-0.579102,3.42651}
};
zedPos[] = {{-5.14404,-2.02295,-1.71924},{4.92676,-2.67383,-1.71924}};
};
class Land_tovarna1: Industrial
{
lootPos[] = {
{ 2.83887,5.23889,-5.75442 },
{ -2.30774,7.31934,-5.75442 },
{ -11.0908,5.44897,-5.75442 },
{ -11.4746,-1.5791,-5.75442 },
{ -5.52405,1.68994,-5.75442 },
{ 2.82605,1.4801,-5.75442 },
{ 2.44128,-6.50256,-5.75442 },
{ -6.68335,-0.453369,2.17997 },
{ -3.81812,0.690186,2.17997 },
{ 2.78735,1.19409,2.17997 },
{ 1.59167,-6.06665,2.17997 },
{ -2.4646,-5.63696,2.17997 },
{ -5.77393,-7.28271,2.17997 },
{ -0.484985,-3.14197,4.82992 }};
};
class Land_Ind_Garage01_EP1: Industrial
{
lootPos[] = {
@@ -1181,27 +1265,6 @@ class Land_Ind_Garage01_EP1: Industrial
};
zedPos[] = {{0.125488,0.557861,-0.357141},{1.11084,-1.33643,-0.36116}};
};
class land_mbg_garage_single_b: Industrial {
lootPos[] = {
{2.54492,3.97607,-1.03899},
{4.13672,-0.0625,-1.03899}
};
lootPosSmall[] = {
{4.50586,2.56982,-1.03899}
};
zedPos[] = {{2.96094,6.3374,-0.133815}};
};
class Land_House_C_12_EP1: Industrial
{
lootPos[] = {
{-3.27197,-1.5813,-3.50101},{-2.09863,-6.13086,-3.52102},{-2.979,-8.6936,0.141808},{-2.66602,-3.0437,0.139957},{5.91016,-3.59204,0.132626},{2.33154,-1.00244,-3.51937}
};
lootPosSmall[] = {
{-4.03857,-2.06226,-2.43102},{-4.02344,-1.44019,-3.11102},{-3.55371,-0.618164,-3.29102},{7.38184,0.690674,-3.12101},{-2.99268,-6.54883,3.45573},{7.58105,-2.40894,0.112629},{-1.79004,-3.58325,0.128376},{-2.05713,-9.00806,0.150394}
};
zedPos[] = {{2.11182,-8.16724,1.00763},{1.85498,-3.48828,-2.63601},{-2.74854,0.133301,-2.63601},{2.65674,-5.69165,-2.63601},{-2.60742,-7.35913,1.0174}};
};
class Land_Ind_Oil_Pump_EP1: Industrial
{
lootPos[] = {
@@ -1250,12 +1313,6 @@ class Land_Ind_FuelStation_Build_EP1: Industrial
zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
lootPos[] = {{-1.34521,1.40698,-1.33611},{2.27051,-0.949951,-1.33611},{-2.23193,-1.146,-1.33589},{-0.185059,0.775146,-1.33609}};
};
class Land_ibr_FuelStation_Build: Industrial //IndustrialFuel
{
lootChance = 0.5;
zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
lootPos[] = {{-1.34521,1.40698,-1.33611},{2.27051,-0.949951,-1.33611},{-2.23193,-1.146,-1.33589},{-0.185059,0.775146,-1.33609}};
};
class hiluxWreck: Industrial
{
zombieClass[] = {"zZombie_Base","z_hunter"};
@@ -1264,13 +1321,4 @@ class hiluxWreck: Industrial
minRoaming = 1;
maxRoaming = 2;
lootPos[] = {};
};
class Land_Ind_Oil_Tower_EP1: Industrial
{
lootPos[] = {
{ 3.55743,-5.92773,-12.9755 },
{ 4.63086,1.24902,-12.9932 },
{ -0.240356,-1.08252,-12.9875 },
{ 6.87689,-6.34961,-8.00889 },
{ 2.31177,0.231689,-8.00478 }};
};
};

166
SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp
View File

@@ -54,7 +54,7 @@ class Land_a_stationhouse : Military
{15.436,2.85498,-9.47058},{17.9861,-6.52832,-9.47058},{1.22583,2.24463,-9.47058},{-3.9126,-7.29834,-9.47058},{-2.28271,-6.21094,-4.6489},{-1.604,-8.68018,-0.043786},{-1.104,-5.60938,4.41139},{-3.55811,-8.56787,4.41139},{-2.99219,-8.27148,8.49209}
};
lootPosSmall[] = {
{14.6826,3.55029,-8.25058},{9.97266,3.48584,-9.40058},{19.1477,-6.69629,-9.36058},{19.1719,-7.47998,-9.36058},{0.513672,1.19336,-9.39058},{0.51416,3.3418,-8.63058},{0.52124,1.92334,-7.87058},{-1.63623,-8.99756,-9.39058},{-3.5647,-9.01855,-8.63058},{-0.76709,-8.99072,-7.87058},{-2.40137,-9.03027,-8.25058},{-4.50391,-5.27588,-4.6489},{-1.02393,-9.02051,0.0562134},{-0.771484,-8.3335,0.0762138},{-0.7229,-9.03076,1.19621},{-4.40308,-8.7666,4.41139},{-2.27783,-5.35303,4.41139},{-4.4541,-8.81055,8.49209},{9.12549,3.64697,-8.25058}
{14.6826,3.55029,-8.25058},{9.97266,3.48584,-9.40058},{18.15,-6.73,-9.36},{18.08,-6.05,-9.44},{-0.52,1,-8.63},{-0.49,2.59,-8.28},{-0.41,1.76,-9.37},{-1.63623,-8.99756,-9.39058},{-3.5647,-9.01855,-8.63058},{-0.76709,-8.99072,-7.87058},{-2.40137,-9.03027,-8.25058},{-4.50391,-5.27588,-4.6489},{-1.02393,-9.02051,0.0562134},{-0.771484,-8.3335,0.0762138},{-0.7229,-9.03076,1.19621},{-4.40308,-8.7666,4.41139},{-2.27783,-5.35303,4.41139},{-4.4541,-8.81055,8.49209},{9.12549,3.64697,-8.25058}
};
};
@@ -223,6 +223,11 @@ class Land_Mil_Barracks_L: Military {
lootPos[] = {{-0.82,-4.72,-2.2},{4,-5.22,-2.21},{7.3,-4.04,-2.21}};
};
// ALT-MAP Support
class Land_budova4_in: Military // barracks broken blue front door. cannot enter inner rooms
{
zedPos[] = {{-3.94531,2.27344,-1.88723},{-0.0566406,2.2666,-1.88723},{6.27148,2.5752,-1.88723}};
lootPos[] = {{ -6.50415,2.1416,-1.88723 },{ -1.66162,2.10168,-1.88723 },{ 2.94312,2.297,-1.88723 },{ 5.34082,-1.82922,-1.88723 }};
};
class Land_kostel_trosky: MilitarySpecial // church ruins
{
zedPos[] = {{-0.388672,10.0176,-5.37072},{-2.97852,-0.816406,-5.55207}};
@@ -233,6 +238,7 @@ class Land_MBG_Killhouse_3: Military // cement 2 story
zedPos[] = {{-4.10547,-0.466797,0.451439},{-2.06152,3.2168,0.451439},{-10.7031,3.0293,0.451439},{-8.07715,-1.2168,0.451439}};
lootPos[] = {{-4.10547,-0.466797,0.451439},{-2.06152,3.2168,0.451439},{-10.7031,3.0293,0.451439},{-8.07715,-1.2168,0.451439}};
};
//Land_MBG_Killhouse_4 in Residential.hpp
class Land_aif_strazni_vez: Military // metal platform-overlook
{
lootPos[] = {{0.113281,0.859375,1.46157},{-1.24023,1.25195,1.46157}};
@@ -242,25 +248,83 @@ class Land_MBG_Killhouse_2: Military // cement 2 story
zedPos[] = {{-4.58887,-4.49023,-2.79856},{1.78516,1.58887,3.80144}};
lootPos[] = {{-4.58887,-4.49023,-2.79856},{6.50488,5.86328,-2.79856},{-6.24365,-4.69336,0.501437},{-4.99805,-4.63281,3.80144},{5.48828,-3.87793,3.80144}};
};
class Land_buova4_winter: MilitarySpecial // winter version of military barracks
{
zedPos[] = {{-1.95361,2.57813,-1.1084},{5.46289,2.5791,-1.1084},{1.29346,-2.16211,-1.09839},{-1.78369,-0.166992,-1.09839},{-5.39355,-2.11719,-1.09839},{-5.4707,2.58203,-1.09839},{-1.80664,-1.97559,-1.09827},{5.38965,-1.75781,-1.09827},{-9.1499,-2.55859,-1.09827},{1.4668,-0.129883,-1.09814},{-4.77881,0.0498047,-1.09814},{-8.32617,-0.144531,-1.09814}};
lootChance = 0.3;
lootPos[] = {{-0.39,-2.02,-1.1},{-5.67,1.68,-1.1},{-1.95,2.58,-1.11},{5.46,2.58,-1.11},{6.37,-1.22,-0.93},{-0.24,-1.04,0.1},{-3.53,-0.38,-1.1},{-5.39,-2.23,-1.1},{-6.78,-1.34,-0.7},{-9.07,-0.53,-1.1},{2.97,-0.92,-1.1},{1.11,-2.35,-1.1}};
//Land_A_Villa_EP1 in Office.hpp
class Land_budova4_winter: MilitarySpecial { // winter version of military barracks
lootPos[] = {{-7.73389,0.300049,-1.09824},{-7.7666,1.97388,-1.09824},{-5.85645,1.92651,-1.09824},{-4.82373,0.194336,-1.09824},{-4.82715,-2.00244,-1.09824},{-8.09766,-2.28149,-1.09824},{-3.06787,2.24805,-1.09824},{-1.65283,-1.91821,-1.09824},{-1.41309,-0.034668,-1.09824},{0.266602,1.76807,-1.09824},{1.28369,0.289307,-1.09824},{1.81982,-2.28687,-1.09824},{4.37549,2.14941,-1.09824},{5.61865,1.71338,-1.09824},{5.06787,-1.74316,-1.09824},{2.54785,2.33716,-1.09824}};
};
class land_pozorovatelna: Military { // concrete tower
//lootChance = 0.3;
lootPos[] = {{-2.36328,-2.79248,-2.49767},{3.11426,-2.92969,-2.49767},{0.740234,2.47852,-2.49767},{-1.67578,-2.50049,7.54509},{-1.23047,1.90283,7.54509},{2.88477,2.08496,7.54509},{2.61426,-2.48096,7.54509},{0.491211,-0.290527,7.54509}};
};
class land_hlaska: Military // metal platform
{
lootChance = 0.3;
lootPos[] = {{-0.802246,0.614258,3.77092},{0.917969,0.9375,3.77093}};
};
class Land_MBG_Killhouse_1: Military // cement block building
{
lootChance = 0.25;
lootPos[] = {{-1.98071,5.50488,1.25144},{-2.79443,0.65625,-2.04856},{2.88354,2.7627,-2.04856}};
};
class land_army_hut2_int: Military // beige hut on blocks
{
lootPos[] = {{ -0.421387,-0.0517578,-0.948329 },{ 1.80103,0.945313,-0.948329 },{ 2.24585,-2.6875,-0.948329 },{ -1.24561,-1.53955,-0.948329 }};
};
class land_army_hut_int: Military // beige hut on blocks
{
lootPos[] = {{ 2.7959,-5.07373,-1.33056 },{ 2.79785,-2.1626,-1.33056 },{ -0.943359,-0.060791,-1.35981 },{ 0.689453,1.87134,-1.36167 }};
};
class Land_army_hut3_long_int: Military // beige hut on blocks
{
lootPos[] = {{ -2.88721,-4.36035,-1.23617 },{ 0.753906,-3.90039,-1.23617 },{ -2.53711,-1.95117,-1.23617 },{ -2.27856,-0.211914,-1.23617 },{ -0.0664063,-1.70801,-1.23617 },{ 0.141113,2.31104,-1.23617 }};
};
//Land_ibr_terminal in Office.hpp
class Land_smd_garaz_s_tankem: Military // garage - blockade - ladder
{
zedPos[] = {{5.83203,2.34961,-2.49103}};
lootPos[] = {{5.83203,2.34961,-2.49103},{-0.569336,3.00684,3.4697}};
};
class land_smd_army_hut2_int: Military { // beige hut on blocks
lootPos[] = {{-0.848633,-1.24316,-0.948334},{-1.92383,-0.00390625,-0.948334},{2.7959,-0.0146484,-0.948334}};
lootPosSmall[] = {{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}};
zedPos[] = {{-3.35352,-2.65332,-0.407364},{0.475586,3.37402,-0.350555}};
};
class land_smd_army_hut2: Military { // beige hut on blocks
lootPos[] = {{0.447266,-4.6543,-1.33328}};
lootPosSmall[] = {{-0.257813,-5.02539,-0.623276},{3.02832,-6.1582,-1.33328}};
zedPos[] = {{0.552734,6.06836,-0.515976},{-3.86816,-5.6875,-1.13228}};
};
class Land_smd_SS_hangar_withdoor: Military
{
maxRoaming = 3;
zedPos[] = {{10.957,-16.6943,-5.87254},{-11.3311,-15.499,-5.87254},{-9.27832,2.05566,-5.87254}};
lootChance = 0.4;
lootPos[] = {{10.957,-16.6943,-5.87254},{-11.3311,-15.499,-5.87254},{-9.27832,2.05566,-5.87254},{-11.0947,21.3438,-5.87254},{10.7002,17.6221,-5.87254},{11.4658,1.51367,-5.87254},{12.9443,-15.6855,-5.87254}};
lootGroup = Hangar;
};
class Land_smd_budova4_in: MilitarySpecial // barracks blue doors internal rooms
{
zedPos[] = {{5.9375,1.33496,-1.88723}};
lootChance = 0.3;
lootPos[] = {{5.68359,-1.41211,-1.88723},{-7.21484,2.17285,-1.88723},{-4.04492,2.07227,-1.88723},{-0.4375,1.95898,-1.88723},{3.23633,2.06348,-1.88723},{0.804688,-0.614258,-1.88723},{-1.2793,-1.0791,-1.88723},{-6.87695,-1.35156,-1.88723}};
};
class land_smd_army_hut3_long_int: Military { // wide 3 doors bunks
lootPos[] = {{0.643555,5.24219,-0.0739136},{-2.78809,3.13672,-1.27391},{-2.80957,5.27441,-0.863907},{-3.13086,-3.3584,-1.27391},{-0.875977,-0.6875,-1.27391}};
lootPosSmall[] = {{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}};
zedPos[] = {{3.37598,0.145508,-0.938461},{-4.52734,0.833984,-1.2229}};
};
class land_smd_hlaska: Military { // wide 3 doors bunks
lootPos[] = {{-0.724609,0.822266,3.77092}};
lootPosSmall[] = {{1.06201,-0.864258,3.77092},{-1.04688,-0.759766,3.77092}};
zedPos[] = {{-0.18457,-3.13574,-2.25991}};
};
class Land_smd_kostel_trosky: MilitarySpecial // church ruins
{
lootPos[] = {{3.83789,0.8125,-4.81671},{0.206055,12.3555,-5.09952}};
};
// ALT-MAP Support
//DZE ADDED BELOW
class land_pozorovatelna: Military { // concrete tower
//lootChance = 0.3;
//lootPos[] = {{-0.717773,-3.02612,-2.49767},{2.99414,2.67017,-2.49767},{0.761719,-2.20044,7.54509},{-0.482422,1.19702,7.54508},{1.85156,1.9812,7.54508}};
lootPos[] = {{-2.36328,-2.79248,-2.49767},{3.11426,-2.92969,-2.49767},{0.740234,2.47852,-2.49767},{-1.67578,-2.50049,7.54509},{-1.23047,1.90283,7.54509},{2.88477,2.08496,7.54509},{2.61426,-2.48096,7.54509},{0.491211,-0.290527,7.54509}};
};
class land_AII_last_floor: MilitarySpecial {
zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
lootChance = 0.5;
@@ -273,32 +337,9 @@ class land_AII_middle_floor: MilitarySpecial {
maxRoaming = 3;
lootPos[] = {{-7.64941,4.97412,0.510368},{-7.7207,5.10498,0.510216},{-7.27979,-0.931152,0.518509},{8.47461,-2.3252,-4.63377},{9.20508,0.508301,-4.63377},{4.36768,3.7998,-4.63377},{-0.669434,2.74805,-4.63377},{-10.3594,5.03516,-4.63377},{-13.9766,9.10059,-4.63377},{-8.021,1.22314,-4.63377},{6.07227,-2.64551,-4.63377},{-8.75293,8.79297,-2.10379}};
};
class Land_budova4_winter: MilitarySpecial {
lootPos[] = {{-7.73389,0.300049,-1.09824},{-7.7666,1.97388,-1.09824},{-5.85645,1.92651,-1.09824},{-4.82373,0.194336,-1.09824},{-4.82715,-2.00244,-1.09824},{-8.09766,-2.28149,-1.09824},{-3.06787,2.24805,-1.09824},{-1.65283,-1.91821,-1.09824},{-1.41309,-0.034668,-1.09824},{0.266602,1.76807,-1.09824},{1.28369,0.289307,-1.09824},{1.81982,-2.28687,-1.09824},{4.37549,2.14941,-1.09824},{5.61865,1.71338,-1.09824},{5.06787,-1.74316,-1.09824},{2.54785,2.33716,-1.09824}};
};
class land_vstup: Military {
lootPos[] = {{-11.51,-2.64844,-1.53312},{-6.24463,-2.85059,-1.53312},{-1.16992,-2.84961,-1.53312},{2.70898,-2.85059,-1.53312}};
};
class land_smd_hlaska: Military {
lootPos[] = {
{-0.724609,0.822266,3.77092}
};
lootPosSmall[] = {
{1.06201,-0.864258,3.77092},
{-1.04688,-0.759766,3.77092}
};
zedPos[] = {{-0.18457,-3.13574,-2.25991}};
};
class land_smd_army_hut2: Military {
lootPos[] = {
{0.447266,-4.6543,-1.33328}
};
lootPosSmall[] = {
{-0.257813,-5.02539,-0.623276},
{3.02832,-6.1582,-1.33328}
};
zedPos[] = {{0.552734,6.06836,-0.515976},{-3.86816,-5.6875,-1.13228}};
};
class land_smd_ss_hangard_withdoor: MilitaryIndustrial {
lootPos[] = {
{0.236328,3.4209,-5.87254},{-14.0732,22.499,-5.87254},{13.1895,22.2031,-5.87254},{-13.8877,-10.5459,-5.87254},{2.10742,-19.8496,-5.87254}
@@ -317,15 +358,6 @@ class land_budova5: Military {
};
zedPos[] = {{-3.04492,2.0332,-1.40211}};
};
class land_smd_army_hut2_int: Military {
lootPos[] = {
{-0.848633,-1.24316,-0.948334},{-1.92383,-0.00390625,-0.948334},{2.7959,-0.0146484,-0.948334}
};
lootPosSmall[] = {
{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}
};
zedPos[] = {{-3.35352,-2.65332,-0.407364},{0.475586,3.37402,-0.350555}};
};
class land_smd_strazni_vez: Military {
lootPos[] = {
{-1.68066,-1.30273,2.00299}
@@ -336,16 +368,6 @@ class land_smd_strazni_vez: Military {
};
zedPos[] = {{-1.14844,0.125977,2.28799},{1.04102,2.45898,-1.76974}};
};
class land_smd_army_hut3_long_int: Military {
lootPos[] = {
{0.643555,5.24219,-0.0739136},{-2.78809,3.13672,-1.27391},{-2.80957,5.27441,-0.863907},{-3.13086,-3.3584,-1.27391},{-0.875977,-0.6875,-1.27391}
};
lootPosSmall[] = {
{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}
};
zedPos[] = {{3.37598,0.145508,-0.938461},{-4.52734,0.833984,-1.2229}};
};
class land_st_vez: MilitarySpecial {
lootPos[] = {{-5.56445,4.23975,-3.31476},{-5.05566,-3.17627,-3.31476},{4.12109,3.92822,2.42732},{-1.73389,2.68896,6.40834},{-4.23584,1.29736,6.40834},{-3.80322,-1.09277,6.40834},{0.430664,1.31787,6.40834},{-2.45166,-2.16748,6.40834},{-0.608398,-0.57666,-11.095},{-2.08691,1.10303,-11.0649},{0.259277,-3.89697,-3.31476},{3.9375,3.30957,-8.50825}};
};
@@ -378,44 +400,6 @@ class land_ind_pec_03a: MilitaryIndustrial
};
zedPos[] = {{1.979,15.7012,3.48646},{5.93604,16.2686,3.48582},{6.50586,13.8198,-4.22628},{12.314,9.64258,-4.22628},{6.15381,9.78711,-4.22628},{6.34424,-2.52051,-0.953124},{-5.04004,-4.30566,-4.22628},{-5.77588,-21.0293,-4.22628}};
};
class Land_budova4_in: Military // barracks broken blue front door. cannot enter inner rooms
{
zedPos[] = {{-3.94531,2.27344,-1.88723},{-0.0566406,2.2666,-1.88723},{6.27148,2.5752,-1.88723}};
//lootPos[] = {{-5.49609,2.13135,-1.88723},{-1.57031,2.29199,-1.88723},{2.43945,2.21387,-1.88723},{5.92383,-2.44678,-1.88723}};
lootPos[] = {
{ -6.50415,2.1416,-1.88723 },
{ -1.66162,2.10168,-1.88723 },
{ 2.94312,2.297,-1.88723 },
{ 5.34082,-1.82922,-1.88723 }};
};
class land_army_hut_int: Military
{
lootPos[] = {
{ 2.7959,-5.07373,-1.33056 },
{ 2.79785,-2.1626,-1.33056 },
{ -0.943359,-0.060791,-1.35981 },
{ 0.689453,1.87134,-1.36167 }};
};
class Land_army_hut3_long_int: Military
{
lootPos[] = {
{ -2.88721,-4.36035,-1.23617 },
{ 0.753906,-3.90039,-1.23617 },
{ -2.53711,-1.95117,-1.23617 },
{ -2.27856,-0.211914,-1.23617 },
{ -0.0664063,-1.70801,-1.23617 },
{ 0.141113,2.31104,-1.23617 }};
};
class land_army_hut2_int: Military
{
lootPos[] = {
{ -0.421387,-0.0517578,-0.948329 },
{ 1.80103,0.945313,-0.948329 },
{ 2.24585,-2.6875,-0.948329 },
{ -1.24561,-1.53955,-0.948329 }};
};
class Land_Mil_Barracks_EP1: Military
{
lootPos[] = {};

86
SQF/dayz_code/Configs/CfgLoot/Buildings/Office.hpp
View File

@@ -89,7 +89,66 @@ class Land_aif_hotel_bio : Office // multi-story hotel with balconies
lootPos[] = {{-17.8848,-6.33398,-8.52153},{16.8477,-12.5811,-8.52153},{17.8984,12.9102,-8.52153},{-1.51172,11.0117,-8.52153},{-23.4453,-5.7998,-0.835522},
{-22.4063,-16.8887,3.01448},{-5.8418,5.27832,6.86919},{16.7227,16.8076,6.86919},{18.2676,-14.2627,6.86919},{-16.8984,-16.3701,6.86919}};
};
// ALT-MAP Support
class land_mbg_apartments_big_04: Office { // multi-story cement, 3 non-enterable garages
lootPos[] = {
{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}
};
lootPosSmall[] = {
{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}
};
zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
};
//land_vysoky2 in Residential.hpp
//land_dlouhy1 in Residential.hpp
class Land_ibrPanelak: Land_Panelak{};
class Land_ibrPanelak2: Land_Panelak2{};
class LAND_konecna : Office
{
lootPos[] = {{14.8423,-0.987793,-1.59364},
{16.873,-2.86865,-1.59364},
{13.3672,-9.11377,-1.59364},
{5.09497,-9.98682,-1.59364},
{-24.8281,-1.17871,-1.59364},
{-14.0747,-7.3042,-1.59364},
{-19.0789,0.98291,-1.59364},
{4.67944,0.805176,-1.59364},
{-11.4639,-10.1475,-1.59364}};
};
// ALT-MAP Tavi
// ALT-MAP SAHRANI
class Land_smd_dum_olez_istan1_open2 : Office // same as Land_Panelak2
{
zedPos[] = {{-3.77344,1.99414,-1.84398},{1.31641,-2.06934,-1.84399}};
lootPos[] = {{-5.99023,-5.60449,-1.84398},{6.73145,1.43555,-1.84399},{4.90332,-3.25098,1.37497},{-1.73145,-3.67773,1.37497},{-7.09375,-3.92773,1.37497}};
};
class Land_smd_hotel_riviera2 : Office // 2 story motel blue tiles
{
zedPos[] = {{-9.32324,-7.52173,-0.321464},{2.03027,-6.70923,-0.321464}};
lootPos[] = {{-9.32324,-7.52173,-0.321464},{2.03027,-6.70923,-0.321464}};
};
class Land_smd_hotel_riviera1 : Office // 2 story motel blue tiles
{
zedPos[] = {{-10.7217,-6.02148,-0.322234},{-4.7041,-6.77051,-0.321464},{8.9541,-6.33838,-0.321464}};
lootPos[] = {{-10.7217,-6.02148,-0.322234},{-4.7041,-6.77051,-0.321464},{8.9541,-6.33838,-0.321464}};
};
class Land_smd_hotel : Office // 4 story apartment building
{
zedPos[] = {{-16.1006,0.519043,-7.74672},{-0.744141,10.0884,-7.74672}};
lootPos[] = {{-0.744141,10.0884,-7.74672},{14.6982,-16.9382,-7.74672},{4.86719,14.0911,-7.74672},{-20.9121,-5.11133,-0.759434},{-20.6094,-6.26953,2.74057},{-20.6172,-15.1313,2.74057},
{-17.0537,17.2102,6.24485},{14.3779,2.7583,6.24485},{20.75,6.71948,-0.759434},{20.9033,14.7278,-4.25943},{20.541,5.12622,-4.25943}};
};
class Land_smd_dum_istan4_detaily1 : Office // 4 story hotel
{
zedPos[] = {{-2.51367,6.55078,-7.28588},{4.54834,6.33984,-7.28588},{2.58838,-3.21289,-4.33588}};
lootPos[] = {{2.58838,-3.21289,-4.33588}};
};
//Land_smd_dum_istan4 in Residential.hpp
class Land_smd_hospoda_mesto : Office // pub HOSTINEC
{
zedPos[] = {{4.85254,-4.82422,-5.17996},{3.28711,6.78125,-1.2485}};
lootPos[] = {{3.05957,-2.43555,-5.18104},{2.88574,5.32422,-5.19056},{3.27246,1.20703,-5.19001},{1.75098,-1.28906,-5.17993},{-7.48535,-4.07617,-1.2291},{2.63184,-1.78516,-1.2417}};
};
// ALT-MAP Support
//DZE BELOW
class LAND_ibr_bank: Office
@@ -109,20 +168,6 @@ class land_bunka: Office {
lootPos[] = {{1.83496,0.451172,-1.51244},{-2.04492,2.11377,-1.51245},{3.07324,2.41675,-1.51245}};
};
class LAND_konecna : Office
{
lootPos[] = {{14.8423,-0.987793,-1.59364},
{16.873,-2.86865,-1.59364},
{13.3672,-9.11377,-1.59364},
{5.09497,-9.98682,-1.59364},
{-24.8281,-1.17871,-1.59364},
{-14.0747,-7.3042,-1.59364},
{-19.0789,0.98291,-1.59364},
{4.67944,0.805176,-1.59364},
{-11.4639,-10.1475,-1.59364}};
};
class Land_ibrPanelak: Land_Panelak{};
class Land_ibrPanelak2: Land_Panelak2{};
class Land_ibr_terminal: Office
{
lootPos[] = {
@@ -223,17 +268,6 @@ class Land_MBG_Police_Station: Office
{ -2.3125,6.18774,1.68834 }};
};
class land_mbg_apartments_big_04: Office { // multi-story cement, 3 non-enterable garages
//lootPos[] = {{-3.8877,1.5293,-3.19898},{4.02832,0.519531,-3.19898},{3.97266,1.04883,-0.15098},{-3.33691,1.17188,-0.15098},{3.7002,0.867188,2.89702},{-3.55762,0.628906,2.89702},{-6.69922,2.30859,5.94502},{8.12402,-1.16211,5.94502}};
lootPos[] = {
{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}
};
lootPosSmall[] = {
{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}
};
//zedPos[] = {{0.592773,-0.105469,-7.46618},{0.290039,1.49023,-7.43577}};
zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
};
class land_mbg_ger_estate_2: Office { // 2 stucco red/orange light by door
//lootPos[]={{5.34766,-0.882813,-2.13187},{2.38281,-1.03418,-2.13187},{2.54688,-4.41602,-2.13187},{-7.71094,-2.73242,-2.13187},{-2.22656,5.91602,-2.13187},{-5.36328,4.46387,-2.13187}};
lootPos[] = {

855
SQF/dayz_code/Configs/CfgLoot/Buildings/Residential.hpp
View File

@@ -41,16 +41,6 @@ class Land_hut06 : Residential
lootPos[] = {{0.328125,2.26953,-1.57786},{-0.552368,-0.0620117,-1.53837}};
};
class land_r_housev2_04: Residential { //DZE ADDED
lootPos[] = {
{0.364502,3.06128,-4.08876},{-4.49097,3.29565,-4.0887},{7.0625,-1.54053,-4.09079}
};
lootPosSmall[] = {
{-5.88696,2.77051,-4.08894},{-4.32666,6.00415,-4.0887},{7.37158,4.41968,-4.08918},{6.17065,2.39063,-4.09028}
};
zedPos[] = {{-1.72021,2.7146,-3.20429},{2.7522,2.9668,-3.20421},{4.73706,-0.942627,-3.20546}};
};
class Land_Hlidac_budka : Residential
{
zedPos[] = {{2.02051,0.444336,-0.81366},{-0.460938,1.75879,-0.78363},{-2.31836,1.5127,-0.78363}};
@@ -352,11 +342,48 @@ class Land_Panelak3 : Residential
lootPos[] = {{2.00415,-1.33325,12.3769},{0.0378418,-1.23608,-10.8254}};
};
// ALT-MAP Support
class Land_sara_Domek_sedy: Residential // single story stucko #39
{
zedPos[] = {{1.72266,2.12744,-2.14196}};
lootPos[] = {{-1.76367,-1.11328,-2.14196},{-5.0127,3.01953,-2.14196},{5.41211,2.625,-2.14196},{4.86035,-0.738281,-2.14196}};
};
class land_mbg_brickhouse_01: Residential // 2 story brick outer staircase stripped
{
zedPos[] = {{2.13965,2.89258,-3.35652}};
lootPos[] = {{-7.06543,4.02197,-0.051506},{5.55518,-0.523438,-0.051506},{-0.717773,4.01855,-0.051506},{-2.00293,-2.35107,-3.35652},{4.99219,-0.20752,-3.35652},{-6.80469,3.94043,-3.35652}};
};
class Land_dum_mesto_in: Residential // 2 story some boarded windows estate
{
zedPos[] = {{4.85645,1.62305,-1.28095}};
lootPos[] = {{ -5.53796,-2.51996,-3.99769 },{ -4.66113,1.34052,-4.26331 },{ -4.9137,3.4718,-4.26331 },{ 0.397583,-2.74866,-4.26418 },{ 2.18762,0.74707,-4.26418 },{ 4.94128,-1.67108,-4.26418 },{ 4.48279,2.82495,-4.26418 },{ 1.11023,4.69928,-2.75561 },{ 4.98938,3.79883,-1.28095 },{ 5.55957,-1.61218,-1.28095 },{ 0.695679,-2.18268,-1.28095 },{ -2.42969,-1.18854,-1.27582 },{ -4.77722,3.51996,-1.27582 }};
};
class Land_dum_mesto2: Residential // 2 stucco red/orange light by door
{
zedPos[] = {{-3.01074,1.48145,-0.945732}};
lootPos[] = {{2.46582,7.10742,-4.34475},{2.87305,4.03906,-4.34475},{-3.56738,4.05078,-4.34475},{-2.49902,0.46875,-4.34475},{1.77734,-7.41797,-4.34475},{-3.24512,-7.69922,-4.34475},{-3.16113,-1.58984,-4.34475},{3.19531,1.64258,-0.945168},{-3.19141,7.76563,-0.944004},{-0.253906,4.78516,-0.944004},{-3.35645,-5.74414,-0.944004},{-1.70508,-7.22656,-0.944004},{1.21973,-1.07617,-0.944004}};
};
//Land_MBG_GER_ESTATE_2 in Office.hpp
class Land_MBG_GER_HUS_4 : Residential // 2 stucco red/orage light by door
{
zedPos[] = {{-3.01074,1.48145,-0.945732}};
lootPos[]={{-4.05176,0.607422,-0.112886},{4.31885,2.46094,-0.112885},{4.58203,-2.88672,-0.112886},{5.85449,1.11523,-3.11289},{3.30811,-5.375,-3.11289},{-3.5708,6.20703,-3.11288}};
};
class Land_dum_rasovna: Residential // old stucco window-dor-door tile roof
{
lootPos[] = {{-1.271,3.38281,-2.69958},{3.14893,3.86255,-2.69958},{3.30957,-4.17871,-2.69958},{-0.936523,-1.97412,0.242605},{1.05518,3.77271,0.242605}};
lootPosSmall[] = {{-0.964844,-3.52148,0.952604},{0.613281,-0.726807,-2.69958},{3.69873,-1.69995,-2.69958}};
zedPos[] = {{-1.08252,-1.93018,-1.79458},{-1.68555,2.19971,-1.79458}};
};
class Land_cihlovej_dum_in: Residential { // door, red-blu light, 2 windows
zedPos[] = {{-1.69922,0.681641,-1.8147}};
lootPos[] = {{-0.0117188,0.0441895,-1.81473},{-1.76758,2.24805,-1.8147},{-2.88965,-1.64795,-1.8147},{1.84277,-2.07983,-1.81471},{1.58691,-1.3374,-5.27588},{1.22852,2.57324,-5.27588}};
};
class land_mbg_ger_rhus_1: Residential { // brick 1 door 4 windows
lootChance = 0.3;
lootPos[] = {{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}};
lootPosSmall[] = {{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}};
zedPos[] = {{-2.03125,6.38867,-2.93606},{-8.33398,-5.82813,-2.73209}};
};
class Land_MBG_GER_RHUS_2 : Residential // cement 1 door 4 windows
{
zedPos[] = {{-2.77441,-3.31738,-3.36569}};
@@ -375,9 +402,325 @@ class Land_mbg_apartments_big_01 : Residential // brick with archways, limited a
{
lootPos[]={{-4.7915,4.07861,4.80171},{-6.07764,-4.86182,4.80168},{9.38916,-7.12158,-1.05012},{-11.3857,-5.63916,-1.05012},{-11.2231,8.8335,-1.05013},{11.4961,7.89697,-1.05012},{4.59082,-5.81592,-4.34196}};
};
class Land_dum_ras: Residential { // stucco 1 window, 2 doors
zedPos[] = {{0.891602,2.02539,-2.66959},{0.189453,-3.6333,-2.66958},{0.952148,2.08594,0.272604}};
lootPos[] = {{-1.53223,3.34424,-2.66958},{1.36621,-0.507813,-2.66958},{0.860352,3.72705,0.272604},{-0.767578,-1.96289,0.272604},{-0.27832,-3.96045,0.272604}};
};
class Land_deutshe_mini : Residential // stucco 3 windows, doorway
{
zedPos[] = {{2.51074,-2.4657,-2.74846},{2.51953,1.31262,-2.74846}};
lootPos[] = {{-4.34277,-2.54297,-2.74846},{-0.624023,-0.357422,-2.74846},{0.853516,1.04395,-2.74846},{-2.75781,2.44336,-2.74846}};
};
class land_seb_bouda1: Residential { // cement floor1, wooden floor2
zedPos[] = {{-2.27832,0.0546875,0.573326},{-0.192871,-2.34766,1.13067}};
lootPos[] = {{2.49316,-2.44238,1.13067},{-0.645996,-2.44824,1.13067},{-0.924316,-0.460938,0.573963},{-2.89697,1.9043,0.571716},{2.80566,1.2334,-3.28989},{-2.38672,-0.893555,-3.28989},{-2.7666,2.41699,-3.28989}};
};
class land_x_vez_tex: Residential { // brick tower
zedPos[] = {{-0.80957,1.62183,-4.59428}};
lootPos[] = {{0.433105,-1.02734,-0.273926},{1.00391,3.02197,-0.272713},{1.36426,0.449219,-0.273571},{-1.89795,3.22168,-0.27232},{-5.00537,-3.64307,-0.274128}};
};
class Land_House_K_3_EP1: Residential // beige stucco
{
lootPos[] = {{ 0.524414,3.5166,-0.53767 },{ 1.53491,-0.0644531,-0.790318 },{ -0.887451,0.615234,-0.790318 },{ -4.46191,1.38379,-0.795597 },{ 1.1001,5.40723,2.81719 }};
};
class Land_House_C_5_V2_EP1: Residential // beige stucco
{
lootPos[] = {{ 3.42529,1.77832,-1.36692 },{ -3.6687,1.98779,-1.36692 },{ -2.0271,-2.9126,-1.36692 },{ -1.271,-3.94385,1.33329 }};
};
class Land_House_C_5_V3_EP1: Residential // beige stucco
{
lootPos[] = {
{2.43799,1.03662,2.2605},{-1.00391,-3.9248,1.22732},{0.83374,4.91699,-0.671498},{-1.63037,3.66699,-1.4815},{-1.24463,-3.43701,-1.4815}
};
lootPosSmall[] = {
{3.44287,1.23535,1.4205},{3.64917,3.85156,1.4605},{-0.623779,-5.09424,1.24732},{2.31201,0.770996,-0.0414982},{2.53198,0.82959,-0.731498},{1.81738,5.23926,-1.4815},{-4.40332,0.501465,-1.0415},{-0.46582,-2.83594,-1.0815},{-0.466797,-3.58984,-0.401499}
};
zedPos[] = {{-3.54736,1.73535,-0.596497},{2.47021,4.54834,-0.59645},{1.73682,2.96338,2.2955},{-3.40234,-4.05664,2.18232}};
};
class Land_House_L_1_EP1: Residential // beige stucco
{
lootPos[] = {{1.63135,-1.2251,-0.619034},{-0.165039,-1.74463,-0.6114815},{-1.18311,-0.15918,-0.596542}};
};
class Land_House_C_5_V1_EP1: Residential // beige stucco
{
lootPos[] = {{1.01025,4.85181,-1.4815},{3.42773,1.4248,-1.4915},{-1.62939,-4.69336,-1.4815},{-1.56982,3.66333,-1.4915},{2.28418,1.03076,2.2605},{-0.941895,-3.75952,1.16351}};
lootPosSmall[] = {{0.615479,4.92847,-0.671498},{2.23071,0.780518,-0.411497},{2.61011,0.823975,-1.0915},{-4.35205,-0.0966797,-1.0515},{-0.5271,-2.93677,-1.4215},{-4.2854,3.09082,-1.4715},{-4.42822,-5.13232,-1.4815},{-0.468018,-3.18481,-0.0414963},{2.96582,1.17114,2.2605},{1.85205,4.83716,1.7605}};
zedPos[] = {{-3.11206,1.50952,-0.596497},{2.39453,4.8396,-0.592795},{1.48633,3.10425,2.2955}};
};
class Land_House_C_2_EP1: Residential // beige stucco 2 rollup doors on right., blue door on left
{
lootPos[] = {{-3.63477,2.83398,-2.27891},{5.94116,1.08691,-2.30269},{0.387207,1.1936,-1.47782},{5.49438,-1.47388,1.56868},{-2.24487,-1.44019,0.547503},{-2.01343,3.41553,0.547503},{5.06909,1.21997,0.746294},{5.75464,-4.69043,0.794252}};
lootPosSmall[] = {{0.1604,1.06812,-2.00456},{-0.469482,1.10962,-2.2006},{1.1167,0.707031,-1.78269},{-1.62158,-1.72437,1.1175},{-1.63965,-1.27368,1.4575},{5.88379,-3.06787,1.17425},{-2.31738,3.16724,1.3775},{-1.8562,3.80322,1.3775},{-0.393799,3.50586,-1.61131},{6.06934,0.0444336,-2.07269},{-1.95215,-1.91943,-2.33913},{2.17334,-1.75024,0.74663}};
zedPos[] = {{-0.131592,3.38794,1.63951},{-4.25537,1.24023,1.4225},{2.3269,1.89136,-1.43735},{-1.87183,-0.48584,-1.4121},{1.21802,-1.58765,1.67137}};
};
class Land_House_K_7_EP1: Residential // beige stucco
{
lootPos[] = {{ -0.995361,1.89014,-0.218372 },{ -4.9541,3.85254,-0.218374 },{ -3.4502,4.0376,3.32767 }};
};
class Land_House_C_4_EP1: Residential // beige stucco
{
lootPos[] = {{ 5.38452,-0.364746,-3.48355 },{ 3.16089,2.81616,-3.48355 },{ -3.36499,2.44629,-3.48355 },{ -4.60474,0.0483398,-3.48355 },
{ 4.34985,-0.835205,-0.35146 },{ 1.84668,-3.7168,-0.352423 },{ -1.23096,-5.15308,-0.27861 },{ -4.16602,2.48022,-0.348963 }};
};
class Land_House_C_11_EP1: Residential // 2 story wood railings
{
lootPos[] = {{ -4.875,-3.75586,-2.45703 },{ -1.22852,-3.17529,-2.08453 },{ 6.55859,0.731934,-2.08453 },{ 4.74072,3.21436,-2.08453 },{ 4.39551,0.458984,-2.08453 },{ 0.449219,-3.03857,0.972969 },{ 4.8291,3.44629,0.972969 }};
};
class Land_House_C_1_EP1: Residential //
{
lootPos[] = {{-3.62476,-1.83301,-0.967744},{3.19263,-2.92676,-0.937744},{7.94824,-1.15381,-0.957744}};
lootPosSmall[] = {{-7.64917,-2.33325,-0.257745},{-2.65161,-2.34473,-0.717744},{2.07666,-3.62549,-0.0177441},{7.56982,-2.3689,-0.257744},{2.6355,-1.62378,-0.947745}};
zedPos[] = {{-5.45166,-0.360596,-0.0527439},{5.60938,-1.80347,-0.0527439}};
};
class Land_dum_istan3_hromada2: Residential // brick 2 story
{
lootPos[] = {{ 1.67627,3,-4.62603 },{ -1.47363,4.92285,-1.28517 },{ 6.43848,1.93555,2.08801 }};
lootPosSmall[] = {{7.02344,5.71191,2.08801},{0.856445,-1.72266,-1.28517},{-2.51758,1.2002,-1.28517},{5.18945,2.93848,-4.62604}};
zedPos[] = {{-1.77148,2.59961,-0.410172},{4.46387,1.85254,-3.75103}};
};
class Land_House_C_3_EP1: Residential //
{
lootPos[] = {{ 6.61987,-1.8667,-3.91483 },{ 5.80493,1.21094,-3.91483 },{ -7.11523,2.78418,-3.86868 },{ -6.45874,-0.478271,-3.86868 },{ -6.37598,-2.27344,-3.86868 },{ -4.84521,-2.55664,0.576136 },{ -1.21606,-1.24634,1.96108 }};
};
class Land_House_C_1_v2_EP1 : Residential //
{
lootPos[] = {{6.24365,-0.537109,-1.30966},{4.14746,1.3584,-1.31308}};
};
class Land_House_C_9_EP1: Residential //
{
lootPos[] = {{ -3.47339,2.13086,-3.74726 },{ -3.17773,4.19849,-3.74837 },{ -0.839844,5.7041,-3.74944 },{ 4.67529,1.19897,-3.74832 },{ 4.20508,-1.85229,-3.74805 },{ 1.01074,-0.609619,-0.152166 },{ 0.213379,1.56616,-0.152166 },{ 1.66138,4.33472,-0.152166 },{ 4.38208,-5.14136,-0.152166 }};
};
class Land_House_K_1_EP1: Residential //
{
lootPos[] = {{ -0.685547,4.02161,1.56626 },{ 3.71387,5.48114,1.56626 },{ 3.23438,2.35388,1.56626 },{ -3.30566,4.65558,1.54929 },{ -3.77539,2.02087,1.60863 }};
};
class Land_House_K_8_EP1: Residential //
{
lootPos[] = {{2.94263,2.71948,3.34996},{-0.0541992,3.51294,3.34996},{-2.81274,1.99365,0.231133},{-2.59253,3.66528,-1.81557},{-2.55493,-2.54126,-2.63675},{2.97803,-1.89355,-2.64059}};
lootPosSmall[] = {{-0.681641,0.580322,3.54996},{1.30103,3.72339,3.81996},{1.45947,2.58374,3.34996},{-3.10376,-1.51025,3.34996},{-4.21533,1.6499,0.0964928},{3.22192,3.68018,0.234936},{-3.19409,-1.90552,0.496338},{3.31445,-0.210938,-1.82104},{3.00293,-0.161865,-2.16398},{0.443359,-3.27417,-2.67695},{-3.1377,1.33936,-2.2182}};
zedPos[] = {{-2.60083,-1.24683,-1.66764},{3.30005,-1.26563,1.12351},{-0.615479,2.00049,1.1274},{-1.73755,2.1958,-1.708}};
};
class Land_House_C_5_EP1: Residential //
{
lootPos[] = {{ 3.1499,2.39502,-1.36692 },{ -1.80127,-2.98022,-1.36692 }};
};
class Land_dum_istan3_pumpa: Residential // brick
{
lootPos[] = {{-2.14502,3.03662,-1.86787},{4.09619,-0.563965,1.47485},{0.189453,0.540039,1.47485},{-1.73682,2.44775,1.47485}};
};
class land_sara_domek_kovarna: Residential
{
zedPos[] = {{0.0998535,-0.891602,-0.880356}};
};
class land_sara_domek_hospoda: Residential
{
lootPos[] = {{-2.14844,-3.56396,-2.74878}};
lootPosSmall[] = {{-1.16064,-4.72485,-2.75951}};
zedPos[] = {{1.48291,-3.28223,-1.85291}};
};
class LAND_vokzal_big: Residential // Train Station
{
lootPos[] = {{7.28613,-0.216797,-7.96283},{6.84961,2.56152,-7.96283},{6.9834,-4.98047,-7.96283},{-7.07227,1.28223,-7.96283}};
};
class LAND_Zachytka : Residential
{
lootPos[] = {
{3.79492,-4.12891,-2.02697},
{-4.92285,-6.8584,-2.02697},
{-3.6543,-6.7002,-2.02697},
{-2.60449,-6.87891,-2.02697},
{-1.82422,0.0361328,-2.02697},
{-6.2832,-4.51074,-2.02697},
{-3.60547,5.1875,-2.02697},
{4.42188,11.2158,-2.02697}};
};
class LAND_hospoda : Residential
{
lootPos[] = {
{3.46094,-1.42871,-1.80302},
{2.40137,-1.22656,-1.80307},
{7.81836,-1.63281,-1.80282},
{2.04004,-6.71777,-1.80289},
{-5.56641,0.793945,-1.80295},
{-4.18164,8.64063,-1.80286},
{1.16602,5.0791,-1.80348},
{1.21582,3.73242,-1.8034},
{0.248047,5.55176,-1.80324},
{-1.84766,3.92969,-1.80313},
{-1.85254,0.222656,-1.80321}};
};
class LAND_Kiosk2 : Residential
{
lootPos[] = {{-20.7441,45.2878,3.05876},{-3.80933,-33.6328,3.02246},{-3.57007,-22.666,3.02246},{4.76587,-24.3711,-0.618923},
{-1.10449,43.1938,-0.58263},{8.77441,23.7346,-0.845428},{-9.86914,41.6533,3.05876},{7.84668,20.991,4.76736},{6.91211,27.9067,10.1178}};
};
class LAND_skola : Residential
{
lootPos[] = {
{15.8508,20.459,-2.00361},
{29.0132,22.3887,-2.00361},
{30.6335,16.1104,-2.00361},
{30.7412,5.33691,-2.00361},
{18.7554,5.07324,-2.00361},
{2.84912,14.2744,-2.00361},
{-1.27197,12.2324,-2.00361},
{-5.66699,16.6445,-2.00361},
{-2.93408,22.0967,-2.00361},
{5.48535,21.7969,-2.00361},
{-9.52954,-8.64063,-2.00361},
{-18.5305,-9.60449,-2.00361},
{-23.9783,-0.905273,-2.00361},
{-8.50586,13.9482,-2.00361},
{5.84448,0.175781,-2.00361},
{2.56885,-14.167,-2.00361},
{-3.15063,-14.084,-2.00361},
{-3.76294,-21.2754,-2.00361},
{5.4397,-24.5635,-2.00361},
{18.5049,-11.9141,-2.00361},
{10.7795,-18.4443,-2.00361},
{18.3979,-21.9854,1.22083},
{20.1707,-14.1572,1.22083},
{30.334,5.12402,1.22083},
{22.9521,12.1387,1.22083},
{1.45825,18.208,1.22083},
{-5.56128,20.1572,1.22083},
{-6.19165,15.4678,1.22083},
{-1.05029,9.69141,1.22083},
{6.17896,5.19434,1.22083},
{5.00513,2.78711,1.22083},
{5.81836,-5.65625,1.22083},
{-0.54541,-15.1104,1.22083},
{1.8418,-19.8584,1.22083},
{-2.10864,-21.9961,1.22083},
{-5.78857,-24.9277,1.22083},
{16.3679,-15.4463,1.22083},
{28.0537,-17.1328,1.22083},
{22.1833,11.416,-2.00361}};
};
class LAND_Tav_Panelak2 : Residential
{
lootPos[] = {{2.7627,-5.62524,5.43665},
{2.63867,-0.156494,5.43665},
{3.4873,2.76855,5.43665},
{6.06152,3.64966,5.43665},
{6.70996,0.734619,5.43665},
{4.71875,-1.69263,5.43665},
{-0.347656,-2.23315,5.43665},
{0.814453,-1.73901,2.71097},
{-0.545898,-2.29468,2.71097},
{-0.415039,4.25122,1.32864},
{0.75,-2.01318,0.0714264},
{0.644531,-1.86401,-2.62859}};
};
class LAND_Tav_panelak : Residential
{
lootPos[] = {{5.24121,-6.39453,2.77144},
{6.71191,-5.43262,2.77144},
{4.65625,-1.83838,2.77144},
{6.69531,0.225586,2.77144},
{6.54395,3.06519,2.77144},
{3.40234,3.32324,2.77144},
{2.61523,0.798096,2.77144},
{2.7041,-4.98389,2.77144},
{3.66016,-6.17651,2.77144},
{-0.982422,-1.86328,2.77144},
{-0.904297,4.13086,1.32864},
{0.942383,-2.10474,0.0714226},
{-2.56836,-1.68628,0.0714226},
{-2.69531,3.42407,0.0714226},
{-6.24902,3.01392,0.0714226},
{-6.07227,0.556396,0.0714226},
{-5.75488,-2.03857,0.0714226},
{-6.66406,-4.34497,0.0714226},
{-5.49219,-6.70581,0.0714226},
{-2.41602,-4.19434,0.0714226},
{-3.70801,-6.17212,0.0714226}};
};
class LAND_Tav_Panelak3 : Residential
{
lootPos[] = {{0.0878906,0.793457,-10.8154},{-0.810547,3.44824,-10.8154}};
};
class LAND_Big_Panelak : Residential
{
lootPos[] = {{3.30566,-9.23413,-14.7521},{3.10059,-7.05005,-14.7521},{5.36914,0.495361,-14.7521},{-0.236328,-3.16772,-14.7521},{3.05078,-0.838379,-14.7521}};
};
class LAND_Posta : Residential
{
lootPos[] = {{-17.4678,-9.28809,1.00044},{-16.5732,-1.32227,1.00044},{-3.60254,-5.11377,1.00044},{9.72168,-6.61035,1.00044},{17.333,-8.2085,1.00044},
{13.3633,7.1958,1.00044},{1.56445,8.49707,1.00044}};
};
class Land_smd_dum_istan2b : Residential // stucco 4 windows up, 2 down on left
{
zedPos[] = {{-2.41797,2.20996,-2.34969}};
lootPos[] = {{5.30371,-3.37402,0.822983},{-2.41504,-4.07617,0.823578},{-3.25977,-2.8623,3.80017},{-3.63574,1.1543,3.8002}};
};
class land_smd_dum_olez_istan1_open: Residential { // worn stucco 3 windows up, stairs-door on left, 1 window down
lootPos[] = {{-5.4375,-4.38379,1.35497},{5.75781,-3.31934,1.35497},{1.53516,-2.0625,1.35497},{-2.14941,-4.56445,-1.85398},{-6.79688,2.14453,-1.84398},{3.61523,-0.371094,-1.824}};
lootPosSmall[] = {{-6.11914,-4.14453,2.16497},{2.4707,3.67773,1.96497},{6.42773,-0.5,1.34497},{7.48047,2.37109,-1.434},{-1.98047,-4.16504,-1.07398},{-7.60254,-4.06348,-0.883982},{-7.74902,2.51074,-1.16398},{5.85352,2.37695,-1.854}};
zedPos[] = {{1.33691,-5.02441,-1.5178},{-4.22168,4.75391,-1.66303}};
};
class Land_smd_dum_olez_istan2_maly_open : Residential // worn stucco 3 windows up, stairs-door on left, 1 window down
{
zedPos[] = {{-2.6709,-1.38867,-1.87241}};
lootPos[] = {{-2.33594,2.87939,-1.87241},{-0.493164,-1.98486,1.34656}};
};
class land_smd_dum_olez_istan2_open: Residential { // cement open door shutter window wood canopy
lootPos[] = {{0.0185547,4.61133,0.0584984},{0.412598,-4.66211,0.338498},{-5.71582,5.63477,-0.431501},{-4.5127,-4.87695,-0.431501}};
lootPosSmall[] = {{-1.46338,6.05078,0.718499},{-4.68652,-3.71973,0.528499},{-0.162109,-4.69238,0.0184984},{-6.41113,5.08398,0.798498}};
zedPos[] = {{4.92383,-3.12109,0.0317497}};
};
class Land_smd_house_y_open : Residential // cement open door, AC, blue roof
{
zedPos[] = {{-0.40625,3.14844,-1.40688}};
lootPos[] = {{2.68066,-3.13281,-1.40688},{2.41504,3.57764,-1.40688},{-3.43652,2.75293,-1.40688}};
};
class Land_majak : Residential // stone lighthouse
{
zedPos[] = {{-0.756836,1.10938,-8.07302}};
lootPos[] = {{-0.756836,1.10938,-8.07302},{-0.483398,-0.784668,-8.07302},{0.208984,-1.5918,1.72248}};
};
class Land_smd_sara_zluty_statek_in : Residential //
{
zedPos[] = {{4.76367,-2.59277,-2.91795}};
lootPos[] = {{3.50293,-2.22168,-2.91434},{8.08105,2.90723,-2.8938},{3.50586,3.97852,-2.88629},{-1.37305,1.58594,-2.88646}};
};
class Land_smd_dum_olezlina_open : Residential // 4 windows up 3 down and door
{
zedPos[] = {{3.68604,1.09766,-3.83481}};
lootPos[] = {{3.68604,1.09766,-3.83481},{-2.39355,-2.43457,-3.83481},{-4.78809,-2.15039,-0.434065}};
};
class Land_majak2 : Residential // stone lighthouse
{
zedPos[] = {{0.125977,1.02539,-8.07302}};
lootPos[] = {{-0.570801,1.09668,-8.07302},{1.74023,1.0752,1.72248}};
};
class Land_smd_budova3_open : Residential // blue doors + fireplace
{
zedPos[] = {{1.44531,-0.165039,-1.91334}};
lootPos[] = {{-0.738281,-1.79004,-1.9121},{-1.49609,2.75537,-1.9142}};
};
//Land_budova5 in Military.hpp
class land_smd_dum_istan3_hromada: Residential { //brick 2 story with awning
lootPos[] = {{0.293945,-1.60156,-3.328},{-1.91406,-1.65332,-3.328}};
lootPosSmall[] = {{0.551758,-4.12695,-3.328},{0.626953,-0.547852,-3.328}};
zedPos[] = {{-0.154297,5.01172,-2.46689},{-9.95117,1.99902,-2.46689},{10.2998,1.82227,-2.68886}};
};
class Land_smd_kasarna : Residential //
{
zedPos[] = {{6.47363,20.6445,-8.77723},{-14.2305,16.1533,-8.77723}};
};
// ALT-MAP Support
//DZE ADDED BELOW
class land_r_housev2_04: Residential {
lootPos[] = {
{0.364502,3.06128,-4.08876},{-4.49097,3.29565,-4.0887},{7.0625,-1.54053,-4.09079}
};
lootPosSmall[] = {
{-5.88696,2.77051,-4.08894},{-4.32666,6.00415,-4.0887},{7.37158,4.41968,-4.08918},{6.17065,2.39063,-4.09028}
};
zedPos[] = {{-1.72021,2.7146,-3.20429},{2.7522,2.9668,-3.20421},{4.73706,-0.942627,-3.20546}};
};
class land_rozvodna: Residential {
lootPos[] = {{-6.8208,-1.58789,-0.369419}};
};
@@ -400,27 +743,13 @@ class land_senik: Residential {
class land_zd_1: Residential {
lootPos[] = {{2.14258,3.37402,-3.67255},{-1.60645,-3.25098,-3.67255},{0.649902,-2.38086,-3.67255},{-1.16113,1.41406,-3.67255},{2.88721,-2.80078,-3.67255},{-4.45117,-3.0127,-4.04225},{-5.94385,3.13867,-4.04225}};
};
class Land_dum_ras: Residential { // stucco 1 window, 2 doors
zedPos[] = {{0.891602,2.02539,-2.66959},{0.189453,-3.6333,-2.66958},{0.952148,2.08594,0.272604}};
//lootPos[] = {{0.891602,2.02539,-2.66959},{0.189453,-3.6333,-2.66958},{0.952148,2.08594,0.272604}};
lootPos[] = {{-1.53223,3.34424,-2.66958},{1.36621,-0.507813,-2.66958},{0.860352,3.72705,0.272604},{-0.767578,-1.96289,0.272604},{-0.27832,-3.96045,0.272604}};
};
class land_plynom: Residential {
lootPos[] = {{1.07568,-0.65625,2.21929},{-0.184082,-1.46973,2.21929},{-1.24854,-0.0126953,2.21929},{1.1377,-0.887695,-2.60304},{-1.3877,0.386719,-2.60304},{-0.822754,-1.33398,-2.60304}};
};
class land_x_vez_tex: Residential { // brick tower
zedPos[] = {{-0.80957,1.62183,-4.59428}};
//lootPos[] = {{-0.80957,1.62183,-4.59428},{-1.18555,0.894531,-4.59901},{-0.114258,1.20581,-0.273163},{-3.95801,5.15552,-0.271477}};
lootPos[] = {{0.433105,-1.02734,-0.273926},{1.00391,3.02197,-0.272713},{1.36426,0.449219,-0.273571},{-1.89795,3.22168,-0.27232},{-5.00537,-3.64307,-0.274128}};
};
class land_marsh1: Residential {
lootPos[] = {{3.76953,-5.73193,-3.95897},{-0.986816,-4.26074,-3.95897},{2.52637,0.376465,-3.95897},{4.78955,2.92969,-3.95897},{4.56543,6.82227,-3.95897},{-2.88184,4.24121,-4.01684}};
};
class land_seb_bouda1: Residential { // cement floor1, wooden floor2
zedPos[] = {{-2.27832,0.0546875,0.573326},{-0.192871,-2.34766,1.13067}};
//lootPos[] = {{-2.27832,0.0546875,0.573326},{-0.192871,-2.34766,1.13067}};
lootPos[] = {{2.49316,-2.44238,1.13067},{-0.645996,-2.44824,1.13067},{-0.924316,-0.460938,0.573963},{-2.89697,1.9043,0.571716},{2.80566,1.2334,-3.28989},{-2.38672,-0.893555,-3.28989},{-2.7666,2.41699,-3.28989}};
};
class land_cihlovej_dum_mini: Residential {
lootPos[] = {{-2.4646,-0.78418,-2.86942},{-1.75586,2.88525,-2.86942},{2.76587,2.08154,-2.86942},{1.96265,-1.98877,-2.86942},{0.0109863,0.876465,-2.86942},{0.116455,3.05762,-2.86942}};
};
@@ -433,11 +762,6 @@ class Land_hruzdum: Residential {
};
zedPos[] = {{-1.66382,-1.14795,-3.82291},{-2.79248,3.60742,-0.251995}};
};
class Land_cihlovej_dum_in: Residential { // door, red-blu light, 2 windows
zedPos[] = {{-1.69922,0.681641,-1.8147}};
//lootPos[]={{-1.69922,0.681641,-1.8147},{1.97852,1.83496,-5.27588},{-1.44531,0.173828,-1.81471},{-0.0527344,-1.43359,-1.81472}};
lootPos[] = {{-0.0117188,0.0441895,-1.81473},{-1.76758,2.24805,-1.8147},{-2.88965,-1.64795,-1.8147},{1.84277,-2.07983,-1.81471},{1.58691,-1.3374,-5.27588},{1.22852,2.57324,-5.27588}};
};
class land_smd_cihlovej_dum_mini: Residential {
lootPos[] = {
{0.623047,2.39746,-2.58942},{0.0996094,0.995117,-2.86942},{-4.05957,-1.01953,-2.86942},{-8.86328,2.89453,-2.86942}
@@ -460,34 +784,6 @@ class land_smd_dum_olez_istan2_open2: Residential {
};
zedPos[] = {{5.4502,-3.21729,0.207455}};
};
class land_smd_dum_olez_istan2_open: Residential {
lootPos[] = {
{0.0185547,4.61133,0.0584984},{0.412598,-4.66211,0.338498},{-5.71582,5.63477,-0.431501},{-4.5127,-4.87695,-0.431501}
};
lootPosSmall[] = {
{-1.46338,6.05078,0.718499},{-4.68652,-3.71973,0.528499},{-0.162109,-4.69238,0.0184984},{-6.41113,5.08398,0.798498}
};
zedPos[] = {{4.92383,-3.12109,0.0317497}};
};
class land_smd_dum_olez_istan1_open: Residential {
lootPos[] = {
{-5.4375,-4.38379,1.35497},{5.75781,-3.31934,1.35497},{1.53516,-2.0625,1.35497},{-2.14941,-4.56445,-1.85398},{-6.79688,2.14453,-1.84398},{3.61523,-0.371094,-1.824}
};
lootPosSmall[] = {
{-6.11914,-4.14453,2.16497},{2.4707,3.67773,1.96497},{6.42773,-0.5,1.34497},{7.48047,2.37109,-1.434},{-1.98047,-4.16504,-1.07398},{-7.60254,-4.06348,-0.883982},{-7.74902,2.51074,-1.16398},{5.85352,2.37695,-1.854}
};
zedPos[] = {{1.33691,-5.02441,-1.5178},{-4.22168,4.75391,-1.66303}};
};
class land_smd_dum_istan3_hromada: Residential {
lootPos[] = {
{0.293945,-1.60156,-3.328},{-1.91406,-1.65332,-3.328}
};
lootPosSmall[] = {
{0.551758,-4.12695,-3.328},{0.626953,-0.547852,-3.328}
};
zedPos[] = {{-0.154297,5.01172,-2.46689},{-9.95117,1.99902,-2.46689},{10.2998,1.82227,-2.68886}};
};
class land_panelova3: Residential {
lootPos[] = {{-0.0615234,2.92871,0.0510063},{6.44482,-0.967773,0.0510063},{6.26807,-3.85547,0.0510063},{-0.0327148,-5.30273,0.0510063}};
};
@@ -546,252 +842,12 @@ class Land_Ruin_Cowshed_c_PMC : Residential
{
lootPos[] = {{5.05737,2.52881,-3.09486}};
};
class LAND_Tav_Panelak2 : Residential
{
lootPos[] = {{2.7627,-5.62524,5.43665},
{2.63867,-0.156494,5.43665},
{3.4873,2.76855,5.43665},
{6.06152,3.64966,5.43665},
{6.70996,0.734619,5.43665},
{4.71875,-1.69263,5.43665},
{-0.347656,-2.23315,5.43665},
{0.814453,-1.73901,2.71097},
{-0.545898,-2.29468,2.71097},
{-0.415039,4.25122,1.32864},
{0.75,-2.01318,0.0714264},
{0.644531,-1.86401,-2.62859}};
};
class LAND_Tav_panelak : Residential
{
lootPos[] = {{5.24121,-6.39453,2.77144},
{6.71191,-5.43262,2.77144},
{4.65625,-1.83838,2.77144},
{6.69531,0.225586,2.77144},
{6.54395,3.06519,2.77144},
{3.40234,3.32324,2.77144},
{2.61523,0.798096,2.77144},
{2.7041,-4.98389,2.77144},
{3.66016,-6.17651,2.77144},
{-0.982422,-1.86328,2.77144},
{-0.904297,4.13086,1.32864},
{0.942383,-2.10474,0.0714226},
{-2.56836,-1.68628,0.0714226},
{-2.69531,3.42407,0.0714226},
{-6.24902,3.01392,0.0714226},
{-6.07227,0.556396,0.0714226},
{-5.75488,-2.03857,0.0714226},
{-6.66406,-4.34497,0.0714226},
{-5.49219,-6.70581,0.0714226},
{-2.41602,-4.19434,0.0714226},
{-3.70801,-6.17212,0.0714226}};
};
class LAND_Tav_Panelak3 : Residential
{
lootPos[] = {{0.0878906,0.793457,-10.8154},
{-0.810547,3.44824,-10.8154}};
};
class LAND_Big_Panelak : Residential
{
lootPos[] = {{3.30566,-9.23413,-14.7521},
{3.10059,-7.05005,-14.7521},
{5.36914,0.495361,-14.7521},
{-0.236328,-3.16772,-14.7521},
{3.05078,-0.838379,-14.7521}};
};
class LAND_Posta : Residential
{
lootPos[] = {{-17.4678,-9.28809,1.00044},
{-16.5732,-1.32227,1.00044},
{-3.60254,-5.11377,1.00044},
{9.72168,-6.61035,1.00044},
{17.333,-8.2085,1.00044},
{13.3633,7.1958,1.00044},
{1.56445,8.49707,1.00044}};
};
class LAND_skola : Residential
{
lootPos[] = {
{15.8508,20.459,-2.00361},
{29.0132,22.3887,-2.00361},
{30.6335,16.1104,-2.00361},
{30.7412,5.33691,-2.00361},
{18.7554,5.07324,-2.00361},
{2.84912,14.2744,-2.00361},
{-1.27197,12.2324,-2.00361},
{-5.66699,16.6445,-2.00361},
{-2.93408,22.0967,-2.00361},
{5.48535,21.7969,-2.00361},
{-9.52954,-8.64063,-2.00361},
{-18.5305,-9.60449,-2.00361},
{-23.9783,-0.905273,-2.00361},
{-8.50586,13.9482,-2.00361},
{5.84448,0.175781,-2.00361},
{2.56885,-14.167,-2.00361},
{-3.15063,-14.084,-2.00361},
{-3.76294,-21.2754,-2.00361},
{5.4397,-24.5635,-2.00361},
{18.5049,-11.9141,-2.00361},
{10.7795,-18.4443,-2.00361},
{18.3979,-21.9854,1.22083},
{20.1707,-14.1572,1.22083},
{30.334,5.12402,1.22083},
{22.9521,12.1387,1.22083},
{1.45825,18.208,1.22083},
{-5.56128,20.1572,1.22083},
{-6.19165,15.4678,1.22083},
{-1.05029,9.69141,1.22083},
{6.17896,5.19434,1.22083},
{5.00513,2.78711,1.22083},
{5.81836,-5.65625,1.22083},
{-0.54541,-15.1104,1.22083},
{1.8418,-19.8584,1.22083},
{-2.10864,-21.9961,1.22083},
{-5.78857,-24.9277,1.22083},
{16.3679,-15.4463,1.22083},
{28.0537,-17.1328,1.22083},
{22.1833,11.416,-2.00361}};
};
class LAND_Zachytka : Residential
{
lootPos[] = {
{3.79492,-4.12891,-2.02697},
{-4.92285,-6.8584,-2.02697},
{-3.6543,-6.7002,-2.02697},
{-2.60449,-6.87891,-2.02697},
{-1.82422,0.0361328,-2.02697},
{-6.2832,-4.51074,-2.02697},
{-3.60547,5.1875,-2.02697},
{4.42188,11.2158,-2.02697}};
};
class LAND_hospoda : Residential
{
lootPos[] = {
{3.46094,-1.42871,-1.80302},
{2.40137,-1.22656,-1.80307},
{7.81836,-1.63281,-1.80282},
{2.04004,-6.71777,-1.80289},
{-5.56641,0.793945,-1.80295},
{-4.18164,8.64063,-1.80286},
{1.16602,5.0791,-1.80348},
{1.21582,3.73242,-1.8034},
{0.248047,5.55176,-1.80324},
{-1.84766,3.92969,-1.80313},
{-1.85254,0.222656,-1.80321}};
};
class LAND_Kiosk2 : Residential
{
lootPos[] = {
{-20.7441,45.2878,3.05876},
{-3.80933,-33.6328,3.02246},
{-3.57007,-22.666,3.02246},
{4.76587,-24.3711,-0.618923},
{-1.10449,43.1938,-0.58263},
{8.77441,23.7346,-0.845428},
{-9.86914,41.6533,3.05876},
{7.84668,20.991,4.76736},
{6.91211,27.9067,10.1178}};
};
class Land_deutshe_mini : Residential // stucco 3 windows, doorway
{
zedPos[] = {{2.51074,-2.4657,-2.74846},{2.51953,1.31262,-2.74846}};
//lootPos[] = {{2.51074,-2.4657,-2.74846},{2.51953,1.31262,-2.74846}};
lootPos[] = {
{-4.34277,-2.54297,-2.74846},
{-0.624023,-0.357422,-2.74846},
{0.853516,1.04395,-2.74846},
{-2.75781,2.44336,-2.74846}};
};
class LAND_vokzal_big: Residential
{
lootPos[] = {
{7.28613,-0.216797,-7.96283},
{6.84961,2.56152,-7.96283},
{6.9834,-4.98047,-7.96283},
{-7.07227,1.28223,-7.96283}};
};
class Land_dum_mesto2: Residential // 2 stucco red/orange light by door
{
zedPos[] = {{-3.01074,1.48145,-0.945732}};
//lootPos[]={{1.31836,4.90625,-4.34475},{-3.01074,1.48145,-0.945732},{-1.86816,4.46582,-0.944004},{-1.43652,-1.51563,-0.944004},{1.40234,-7.55664,-0.944},{1.05273,5.43994,-4.34475}};
lootPos[] = {
{2.46582,7.10742,-4.34475},
{2.87305,4.03906,-4.34475},
{-3.56738,4.05078,-4.34475},
{-2.49902,0.46875,-4.34475},
{1.77734,-7.41797,-4.34475},
{-3.24512,-7.69922,-4.34475},
{-3.16113,-1.58984,-4.34475},
{3.19531,1.64258,-0.945168},
{-3.19141,7.76563,-0.944004},
{-0.253906,4.78516,-0.944004},
{-3.35645,-5.74414,-0.944004},
{-1.70508,-7.22656,-0.944004},
{1.21973,-1.07617,-0.944004}};
};
class Land_sara_Domek_sedy: Residential // single story stucko #39
{
zedPos[] = {{1.72266,2.12744,-2.14196}};
//lootPos[]={{4.39453,3.2583,-2.14196},{-5.47656,1.50586,-2.14196},{-1.81445,1.95605,-2.14196}};
lootPos[] = {
{-1.76367,-1.11328,-2.14196},
{-5.0127,3.01953,-2.14196},
{5.41211,2.625,-2.14196},
{4.86035,-0.738281,-2.14196}};
};
class Land_dum_rasovna: Residential // old stucco window-dor-door tile roof
{
//lootPos[]={{-1.11914,0.794922,-2.66958},{-0.580078,-3.34766,-2.66958},{1.80664,2.07227,0.272606}};
lootPos[] = {
{-1.271,3.38281,-2.69958},{3.14893,3.86255,-2.69958},{3.30957,-4.17871,-2.69958},{-0.936523,-1.97412,0.242605},{1.05518,3.77271,0.242605}
};
lootPosSmall[] = {
{-0.964844,-3.52148,0.952604},{0.613281,-0.726807,-2.69958},{3.69873,-1.69995,-2.69958}
};
//zedPos[] = {{-1.11914,0.794922,-2.66958}};
zedPos[] = {{-1.08252,-1.93018,-1.79458},{-1.68555,2.19971,-1.79458}};
};
class land_sara_domek_kovarna: Residential
{
zedPos[] = {{0.0998535,-0.891602,-0.880356}};
};
class land_sara_domek_hospoda: Residential
{
lootPos[] = {
{-2.14844,-3.56396,-2.74878}
};
lootPosSmall[] = {
{-1.16064,-4.72485,-2.75951}
};
zedPos[] = {{1.48291,-3.28223,-1.85291}};
};
class Land_majak_podesta: Residential
{
lootPos[] = {
{-1.22461,-2.17969,2.28329},
{1.14844,-2.9707,2.28329}};
};
class land_mbg_brickhouse_01: Residential // 2 story brick outer staircase stripped
{
zedPos[] = {{2.13965,2.89258,-3.35652}};
//lootPos[]={{2.13965,2.89258,-3.35652},{-3.04443,1.43359,-3.35652},{1.77637,1.81055,-0.051506}};
lootPos[] = {
{-7.06543,4.02197,-0.051506},
{5.55518,-0.523438,-0.051506},
{-0.717773,4.01855,-0.051506},
{-2.00293,-2.35107,-3.35652},
{4.99219,-0.20752,-3.35652},
{-6.80469,3.94043,-3.35652}};
};
class land_nasypka: Residential
{
lootPos[] = {
@@ -802,15 +858,6 @@ class land_nasypka: Residential
};
zedPos[] = {{1.50659,-0.027832,-5.55527}};
};
class Land_dum_istan3_pumpa: Residential
{
lootPos[] = {
{-2.14502,3.03662,-1.86787},
{4.09619,-0.563965,1.47485},
{0.189453,0.540039,1.47485},
{-1.73682,2.44775,1.47485}};
};
class land_dum_istan3: Residential
{
lootPos[] = {
@@ -875,54 +922,6 @@ class land_hut04: Residential
{ -1.07227,-0.354492,-0.437198 },
{ 0.939697,2.78271,-0.437198 }};
};
class Land_dum_mesto_in: Residential // 2 story some boarded windows estate
{
zedPos[] = {{4.85645,1.62305,-1.28095}};
//lootPos[]={{-4.05469,4.21289,-4.26331},{4.85645,1.62305,-1.28095},{-3.86035,-4.19531,-1.11247}};
lootPos[] = {
{ -5.53796,-2.51996,-3.99769 },
{ -4.66113,1.34052,-4.26331 },
{ -4.9137,3.4718,-4.26331 },
{ 0.397583,-2.74866,-4.26418 },
{ 2.18762,0.74707,-4.26418 },
{ 4.94128,-1.67108,-4.26418 },
{ 4.48279,2.82495,-4.26418 },
{ 1.11023,4.69928,-2.75561 },
{ 4.98938,3.79883,-1.28095 },
{ 5.55957,-1.61218,-1.28095 },
{ 0.695679,-2.18268,-1.28095 },
{ -2.42969,-1.18854,-1.27582 },
{ -4.77722,3.51996,-1.27582 }};
};
class Land_dum_istan3_hromada2: Residential
{
lootPos[] = {
{ 1.67627,3,-4.62603 },
{ -1.47363,4.92285,-1.28517 },
{ 6.43848,1.93555,2.08801 }
};
lootPosSmall[] = {
{7.02344,5.71191,2.08801},
{0.856445,-1.72266,-1.28517},
{-2.51758,1.2002,-1.28517},
{5.18945,2.93848,-4.62604}
};
zedPos[] = {{-1.77148,2.59961,-0.410172},{4.46387,1.85254,-3.75103}};
};
class land_mbg_ger_rhus_1: Residential { // brick 1 door 4 windows
lootChance = 0.3;
//lootPos[]={{-1.69922,0.681641,-1.8147},{1.97852,1.83496,-5.27588},{-1.44531,0.173828,-1.81471},{-0.0527344,-1.43359,-1.81472}};
lootPos[] = {
{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}
};
lootPosSmall[] = {
{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}
};
//zedPos[] = {{-1.69922,0.681641,-1.8147}};
zedPos[] = {{-2.03125,6.38867,-2.93606},{-8.33398,-5.82813,-2.73209}};
};
class land_mbg_killhouse_4: Residential { // cement 2 story
//lootPos[] = {{2.97949,2.16211,-3.84318},{6.88184,-3.24219,-3.84317},{-3.87012,5.46484,-3.84317},{0.474609,-5.08398,-0.543175},{6.9248,2.49219,-0.543175},{-2.39063,-0.128906,-0.543179}};
lootPos[] = {
@@ -934,84 +933,6 @@ class land_mbg_killhouse_4: Residential { // cement 2 story
//zedPos[] = {{2.97949,2.16211,-3.84318},{-3.87012,5.46484,-3.84317},{6.9248,2.49219,-0.543175}};
zedPos[] = {{0.597656,-6.93311,-3.62662},{-8.15625,1.8877,-3.62662}};
};
class Land_House_C_1_EP1: Residential
{
lootPos[] = {
{-3.62476,-1.83301,-0.967744},{3.19263,-2.92676,-0.937744},{7.94824,-1.15381,-0.957744}
};
lootPosSmall[] = {
{-7.64917,-2.33325,-0.257745},{-2.65161,-2.34473,-0.717744},{2.07666,-3.62549,-0.0177441},{7.56982,-2.3689,-0.257744},{2.6355,-1.62378,-0.947745}
};
zedPos[] = {{-5.45166,-0.360596,-0.0527439},{5.60938,-1.80347,-0.0527439}};
};
class Land_House_C_2_EP1: Residential
{
lootPos[] = {
{-3.63477,2.83398,-2.27891},{5.94116,1.08691,-2.30269},{0.387207,1.1936,-1.47782},{5.49438,-1.47388,1.56868},{-2.24487,-1.44019,0.547503},{-2.01343,3.41553,0.547503},{5.06909,1.21997,0.746294},{5.75464,-4.69043,0.794252}
};
lootPosSmall[] = {
{0.1604,1.06812,-2.00456},{-0.469482,1.10962,-2.2006},{1.1167,0.707031,-1.78269},{-1.62158,-1.72437,1.1175},{-1.63965,-1.27368,1.4575},{5.88379,-3.06787,1.17425},{-2.31738,3.16724,1.3775},{-1.8562,3.80322,1.3775},{-0.393799,3.50586,-1.61131},{6.06934,0.0444336,-2.07269},{-1.95215,-1.91943,-2.33913},{2.17334,-1.75024,0.74663}
};
zedPos[] = {{-0.131592,3.38794,1.63951},{-4.25537,1.24023,1.4225},{2.3269,1.89136,-1.43735},{-1.87183,-0.48584,-1.4121},{1.21802,-1.58765,1.67137}};
};
class Land_House_C_3_EP1: Residential
{
lootPos[] = {
{ 6.61987,-1.8667,-3.91483 },
{ 5.80493,1.21094,-3.91483 },
{ -7.11523,2.78418,-3.86868 },
{ -6.45874,-0.478271,-3.86868 },
{ -6.37598,-2.27344,-3.86868 },
{ -4.84521,-2.55664,0.576136 },
{ -1.21606,-1.24634,1.96108 }};
};
class Land_House_C_4_EP1: Residential
{
lootPos[] = {
{ 5.38452,-0.364746,-3.48355 },
{ 3.16089,2.81616,-3.48355 },
{ -3.36499,2.44629,-3.48355 },
{ -4.60474,0.0483398,-3.48355 },
{ 4.34985,-0.835205,-0.35146 },
{ 1.84668,-3.7168,-0.352423 },
{ -1.23096,-5.15308,-0.27861 },
{ -4.16602,2.48022,-0.348963 }};
};
class Land_House_C_5_EP1: Residential
{
lootPos[] = {
{ 3.1499,2.39502,-1.36692 },
{ -1.80127,-2.98022,-1.36692 }};
};
class Land_House_C_5_V2_EP1: Residential
{
lootPos[] = {
{ 3.42529,1.77832,-1.36692 },
{ -3.6687,1.98779,-1.36692 },
{ -2.0271,-2.9126,-1.36692 },
{ -1.271,-3.94385,1.33329 }};
};
class Land_House_C_5_V3_EP1: Residential
{
lootPos[] = {
{2.43799,1.03662,2.2605},{-1.00391,-3.9248,1.22732},{0.83374,4.91699,-0.671498},{-1.63037,3.66699,-1.4815},{-1.24463,-3.43701,-1.4815}
};
lootPosSmall[] = {
{3.44287,1.23535,1.4205},{3.64917,3.85156,1.4605},{-0.623779,-5.09424,1.24732},{2.31201,0.770996,-0.0414982},{2.53198,0.82959,-0.731498},{1.81738,5.23926,-1.4815},{-4.40332,0.501465,-1.0415},{-0.46582,-2.83594,-1.0815},{-0.466797,-3.58984,-0.401499}
};
zedPos[] = {{-3.54736,1.73535,-0.596497},{2.47021,4.54834,-0.59645},{1.73682,2.96338,2.2955},{-3.40234,-4.05664,2.18232}};
};
class Land_House_C_5_V1_EP1: Residential
{
lootPos[] = {
{1.01025,4.85181,-1.4815},{3.42773,1.4248,-1.4915},{-1.62939,-4.69336,-1.4815},{-1.56982,3.66333,-1.4915},{2.28418,1.03076,2.2605},{-0.941895,-3.75952,1.16351}
};
lootPosSmall[] = {
{0.615479,4.92847,-0.671498},{2.23071,0.780518,-0.411497},{2.61011,0.823975,-1.0915},{-4.35205,-0.0966797,-1.0515},{-0.5271,-2.93677,-1.4215},{-4.2854,3.09082,-1.4715},{-4.42822,-5.13232,-1.4815},{-0.468018,-3.18481,-0.0414963},{2.96582,1.17114,2.2605},{1.85205,4.83716,1.7605}
};
zedPos[] = {{-3.11206,1.50952,-0.596497},{2.39453,4.8396,-0.592795},{1.48633,3.10425,2.2955}};
};
class Land_House_K_6_EP1: Residential
{
lootPos[] = {
@@ -1025,19 +946,6 @@ class Land_House_K_6_EP1: Residential
{2.10864,0.180664,1.47076},
{-4.10083,-2.09082,1.55551}};
};
class Land_House_C_9_EP1: Residential
{
lootPos[] = {
{ -3.47339,2.13086,-3.74726 },
{ -3.17773,4.19849,-3.74837 },
{ -0.839844,5.7041,-3.74944 },
{ 4.67529,1.19897,-3.74832 },
{ 4.20508,-1.85229,-3.74805 },
{ 1.01074,-0.609619,-0.152166 },
{ 0.213379,1.56616,-0.152166 },
{ 1.66138,4.33472,-0.152166 },
{ 4.38208,-5.14136,-0.152166 }};
};
class Land_House_C_10_EP1: Residential
{
lootPos[] = {
@@ -1048,34 +956,6 @@ class Land_House_C_10_EP1: Residential
};
zedPos[] = {{0.153076,-2.36743,-3.31192},{-0.96167,-7.51587,-3.32074},{2.4646,5.95142,-3.2957},{-3.10596,6.55762,-3.29418},{2.66089,5.73584,0.00634003},{-1.50708,7.18359,0.00669289},{-0.899902,-4.46045,0.00529861}};
};
class Land_House_C_11_EP1: Residential
{
lootPos[] = {
{ -4.875,-3.75586,-2.45703 },
{ -1.22852,-3.17529,-2.08453 },
{ 6.55859,0.731934,-2.08453 },
{ 4.74072,3.21436,-2.08453 },
{ 4.39551,0.458984,-2.08453 },
{ 0.449219,-3.03857,0.972969 },
{ 4.8291,3.44629,0.972969 }};
};
class Land_House_K_3_EP1: Residential
{
lootPos[] = {
{ 0.524414,3.5166,-0.53767 },
{ 1.53491,-0.0644531,-0.790318 },
{ -0.887451,0.615234,-0.790318 },
{ -4.46191,1.38379,-0.795597 },
{ 1.1001,5.40723,2.81719 }};
};
class Land_House_K_7_EP1: Residential
{
lootPos[] = {
{ -0.995361,1.89014,-0.218372 },
{ -4.9541,3.85254,-0.218374 },
{ -3.4502,4.0376,3.32767 }};
};
class Land_House_L_7_EP1: Residential
{
lootPos[] = {
@@ -1094,16 +974,6 @@ class Land_House_L_6_EP1: Residential
{ 3.15381,-2.12427,1.28099 },
{ -3.74268,-2.23193,-1.53738 }};
};
class Land_House_K_8_EP1: Residential
{
lootPos[] = {
{2.94263,2.71948,3.34996},{-0.0541992,3.51294,3.34996},{-2.81274,1.99365,0.231133},{-2.59253,3.66528,-1.81557},{-2.55493,-2.54126,-2.63675},{2.97803,-1.89355,-2.64059}
};
lootPosSmall[] = {
{-0.681641,0.580322,3.54996},{1.30103,3.72339,3.81996},{1.45947,2.58374,3.34996},{-3.10376,-1.51025,3.34996},{-4.21533,1.6499,0.0964928},{3.22192,3.68018,0.234936},{-3.19409,-1.90552,0.496338},{3.31445,-0.210938,-1.82104},{3.00293,-0.161865,-2.16398},{0.443359,-3.27417,-2.67695},{-3.1377,1.33936,-2.2182}
};
zedPos[] = {{-2.60083,-1.24683,-1.66764},{3.30005,-1.26563,1.12351},{-0.615479,2.00049,1.1274},{-1.73755,2.1958,-1.708}};
};
class Land_House_K_5_EP1: Residential
{
lootPos[] = {
@@ -1115,23 +985,6 @@ class Land_House_K_5_EP1: Residential
{ 4.17725,0.271484,2.4009 },
{ 1.30908,1.50195,1.55225 }};
};
class Land_House_K_1_EP1: Residential
{
lootPos[] = {
{ -0.685547,4.02161,1.56626 },
{ 3.71387,5.48114,1.56626 },
{ 3.23438,2.35388,1.56626 },
{ -3.30566,4.65558,1.54929 },
{ -3.77539,2.02087,1.60863 }};
};
class Land_House_L_1_EP1: Residential
{
lootPos[] = {
{1.63135,-1.2251,-0.619034},
{-0.165039,-1.74463,-0.6114815},
{-1.18311,-0.15918,-0.596542}};
};
class Land_House_L_3_EP1: Residential
{
lootPos[] = {

7
SQF/dayz_code/Configs/CfgLoot/Buildings/ResidentialRuins.hpp
View File

@@ -61,4 +61,9 @@ class land_seb_residental: ResidentialRuins { //ruins
lootPos[] = {{3.74902,4.38379,-2.37675}};
zedPos[] = {{-4.70215,6.14648,-3.70411},{2.15479,8.1123,-3.7844},{-4.03955,6.47949,0.530872},{-4.41943,-7.93652,0.397972},{-1.40479,-7.99414,0.394527}};
};
// ALT-MAP Support
//Land_House_L_9_EP1 in Residential.hpp
class Land_dum_zboreny_total: ResidentialRuins { //ruins
lootPos[] = {{-4.32422,-1.71094,-2.31456}};
};
//Land_dulni_bs in Residential.hpp
// ALT-MAP Support

3
SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
View File

@@ -41,6 +41,7 @@ class CfgLoot
#include "Groups\Weapons.hpp"
#include "Groups\Clothes.hpp"
#include "Groups\Backpacks.hpp"
#include "Groups\Wrecks.hpp"
// Points of interest
#include "Groups\CrashSite.hpp"
@@ -113,4 +114,4 @@ class CfgLoot
// Buildings
#include "CfgBuildingPos.hpp"
};
};
};

3
SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
View File

@@ -90,7 +90,6 @@ AmmoMilitaryLow[] =
{Loot_MAGAZINE, 3, 20Rnd_B_765x17_Ball},
{Loot_MAGAZINE, 4, 20Rnd_762x51_DMR},
{Loot_MAGAZINE, 4, 20Rnd_762x51_FNFAL},
//Epoch 1.0.6
{Loot_MAGAZINE, 3, 20Rnd_762x51_B_SCAR},
{Loot_MAGAZINE, 4, 20Rnd_B_AA12_Pellets},
{Loot_MAGAZINE, 4, 20Rnd_B_AA12_74Slug},
@@ -110,7 +109,6 @@ AmmoMilitaryHigh[] =
{Loot_MAGAZINE, 10, 30Rnd_556x45_Stanag},
{Loot_MAGAZINE, 5, 30Rnd_556x45_G36},
{Loot_MAGAZINE, 5, 100Rnd_556x45_BetaCMag},
//Epoch 1.0.6
{Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR},
{Loot_MAGAZINE, 5, 20Rnd_B_AA12_Pellets},
{Loot_MAGAZINE, 5, 20Rnd_B_AA12_74Slug},
@@ -330,7 +328,6 @@ assaultrifleammo[] = {
{Loot_MAGAZINE, 10, 30Rnd_545x39_AK},
{Loot_MAGAZINE, 5, 30Rnd_556x45_StanagSD},
{Loot_MAGAZINE, 8, 20Rnd_762x51_FNFAL},
//Epoch 1.0.6
{Loot_MAGAZINE, 6, 20Rnd_762x51_B_SCAR}
};
machinegunammo[] = {

6
SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp
View File

@@ -26,5 +26,7 @@ AttachmentsWest[] =
{Loot_MAGAZINE, 2, Attachment_M203},
{Loot_MAGAZINE, 1, Attachment_Sup556},
{Loot_MAGAZINE, 3, Attachment_Sup9},
{Loot_MAGAZINE, 3, Attachment_SA58RIS}
};
{Loot_MAGAZINE, 3, Attachment_SA58RIS},
{Loot_MAGAZINE, 3, Attachment_MFL},
{Loot_MAGAZINE, 3, Attachment_MFL_Pist}
};

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
View File

@@ -19,7 +19,7 @@ Castle[] =
//Items
{Loot_MAGAZINE, 4, ItemSandbag},
{Loot_MAGAZINE, 1, equip_Crossbow_Kit},
// {Loot_MAGAZINE, 1, equip_Crossbow_Kit}, //not functional yet
{Loot_MAGAZINE, 3, equip_rope},
{Loot_MAGAZINE, 4, PartWoodPile},
{Loot_MAGAZINE, 2, ItemComboLock},

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
View File

@@ -11,7 +11,7 @@ Church[] =
{Loot_GROUP, 4, backpacks},
//Items
{Loot_MAGAZINE, 1, equip_Crossbow_Kit},
// {Loot_MAGAZINE, 1, equip_Crossbow_Kit}, //not functional yet
{Loot_MAGAZINE, 4, ItemBookBible},
{Loot_MAGAZINE, 2, equip_rag},

4
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
View File

@@ -4,7 +4,8 @@ Construction[] =
{Loot_MAGAZINE, 9, ItemPlank},
{Loot_MAGAZINE, 5, ItemStone}, // Used for crafting and vanilla buildables
{Loot_MAGAZINE, 8, equip_nails},
//{Loot_MAGAZINE, 9, equip_metal_sheet_rusted},
// {Loot_MAGAZINE, 3, ItemScrews},
// {Loot_MAGAZINE, 9, equip_metal_sheet_rusted},
{Loot_MAGAZINE, 9, equip_metal_sheet},
{Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, ItemComboLock},
@@ -25,7 +26,6 @@ Construction[] =
{Loot_MAGAZINE, 1, equip_brick},
{Loot_MAGAZINE, 3, equip_duct_tape},
{Loot_MAGAZINE, 2, equip_hose},
// {Loot_MAGAZINE, 3, ItemScrews},
// {Loot_MAGAZINE, 1, equip_scrapelectronics},
{Loot_MAGAZINE, 2, equip_1inch_metal_pipe},
{Loot_MAGAZINE, 2, equip_2inch_metal_pipe},

4
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
View File

@@ -102,8 +102,8 @@ MilitarySpecial[] =
{Loot_CONTAINER, 1.8, DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14}, //7.62x39
{Loot_CONTAINER, 0.8, DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5}, //7.62x54R
// {Loot_CONTAINER, 0.5, DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7}, //7.62x54R
{Loot_CONTAINER, 0.2, DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15}, //GP-25
{Loot_CONTAINER, 0.2, DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7}, //Grenades
{Loot_CONTAINER, 0.2, DZ_ExplosiveBoxRU, AmmoBoxRU4, 5, 15}, //GP-25
{Loot_CONTAINER, 0.2, DZ_ExplosiveBoxRU, AmmoBoxRU5, 3, 7}, //Grenades
//Other
{Loot_MAGAZINE, 3, FoodMRE},

4
SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
View File

@@ -56,7 +56,6 @@ sniperrifles[] = {
{Loot_WEAPON, 0.6, SCAR_H_LNG_Sniper_SD},
{Loot_WEAPON, 1, M14_DZ}, //M14_EP1
{Loot_WEAPON, 0.7, DMR_DZ}, //DMR
//Epoch 1.0.6
{Loot_WEAPON, 0.8, SCAR_H_LNG_Sniper}, //Mk17 Sniper
{Loot_WEAPON, 0.6, M110_NVG_EP1} //M110 NVG
};
@@ -103,7 +102,6 @@ assaultrifles[] = {
{Loot_WEAPON, 0.2, BAF_L85A2_RIS_SUSAT},
{Loot_WEAPON, 0.3, L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
{Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo},
//Epoch 1.0.6
{Loot_WEAPON, 0.2, BAF_L85A2_RIS_ACOG}, //L85A2 ACOG
//Mk16
{Loot_WEAPON, 0.2, SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD
@@ -132,13 +130,11 @@ machineguns[] = {
{Loot_WEAPON, 0.8, M240_DZ},
{Loot_WEAPON, 0.9, M249_DZ},
{Loot_WEAPON, 0.5, Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
//Epoch 1.0.6
{Loot_WEAPON, 0.9, BAF_L86A2_ACOG} //L86A2 ACOG
};
militaryshotguns[] = {
{Loot_WEAPON, 2, Saiga12K},
{Loot_WEAPON, 2, Remington870_FL_DZ}, //Remington870_lamp
{Loot_WEAPON, 2, M1014_DZ}, //M1014
//Epoch 1.0.6
{Loot_WEAPON, 1, AA12_PMC} //AA12 Shotgun
};

29
SQF/dayz_code/Configs/CfgLoot/Groups/Wrecks.hpp Normal file
View File

@@ -0,0 +1,29 @@
Land_iron_vein_wreck[] =
{
{Loot_MAGAZINE,85,PartOre,10,10},
{Loot_MAGAZINE,10,PartOreSilver,0,10},
{Loot_MAGAZINE,5,PartOreGold,0,5}
};
Land_silver_vein_wreck[] =
{
{Loot_MAGAZINE,80,PartOreSilver,10,10},
{Loot_MAGAZINE,15,PartOreGold,2,6},
{Loot_MAGAZINE,5,PartOre,0,1}
};
Land_gold_vein_wreck[] =
{
{Loot_MAGAZINE,80,PartOreGold,10,10},
{Loot_MAGAZINE,15,PartOreSilver,2,6},
{Loot_MAGAZINE,5,PartOre,0,1}
};
Land_ammo_supply_wreck[] =
{
{Loot_MAGAZINE, 20, 2000Rnd_762x51_M134},
{Loot_MAGAZINE, 20, 29Rnd_30mm_AGS30},
{Loot_MAGAZINE, 20, 50Rnd_127x107_DSHKM},
{Loot_MAGAZINE, 20, 48Rnd_40mm_MK19},
{Loot_MAGAZINE, 20, 100Rnd_127x99_M2}
};

5
SQF/dayz_code/Configs/CfgMagazines/Attachments/Attachments.hpp
View File

@@ -4,6 +4,9 @@
#include "FL.hpp"
#include "FL_Pist.hpp"
#include "MFL.hpp"
#include "MFL_Pist.hpp"
#include "CCO.hpp"
#include "Holo.hpp"
#include "ACOG.hpp"
@@ -21,4 +24,4 @@
#include "Ghillie.hpp"
#include "SA58RIS.hpp"
#include "SA58RIS.hpp"

21
SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL.hpp Normal file
View File

@@ -0,0 +1,21 @@
class Attachment_MFL : CA_Magazine
{
scope = public;
count = 1;
type = WeaponSlotItem;
model = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\flashlight_rifle.p3d";
picture = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\data\m_flashlight_rifle_ca.paa";
displayName = $STR_DZ_ATT_MFL_RFL_NAME;
descriptionShort = $STR_DZ_ATT_MFL_RFL_DESC;
class ItemActions
{
class AttachToPrimary
{
text = $STR_DZ_ATT_ACT_TO_PRIMARY;
script = "; [_id,1] call player_attachAttachment";
};
};
};

21
SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp Normal file
View File

@@ -0,0 +1,21 @@
class Attachment_MFL_Pist : CA_Magazine
{
scope = public;
count = 1;
type = WeaponSlotItem;
model = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\flashlight_pistol.p3d";
picture = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\data\m_flashlight_pistol_ca.paa";
displayName = $STR_DZ_ATT_MFL_PST_NAME;
descriptionShort = $STR_DZ_ATT_MFL_PST_DESC;
class ItemActions
{
class AttachToSecondary
{
text = $STR_DZ_ATT_ACT_TO_SECONDARY;
script = "; [_id,0] call player_attachAttachment";
};
};
};

264
SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
View File

@@ -264,4 +264,266 @@ class ItemWaterbottle9oz : ItemWaterbottle {
script = "spawn player_fillWater;";
};
};
};
};
//inherit from ItemWaterbottle because that's how the crafting script checks required input
class ItemWaterbottle1ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE1OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE1OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
wateroz = 1;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,100,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle2ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE2OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE2OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
wateroz = 2;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,200,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle3ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE3OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE3OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
wateroz = 3;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,300,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle4ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE4OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE4OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
wateroz = 4;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,400,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle5ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE5OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE5OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
wateroz = 5;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,500,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle6ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE6OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE6OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
wateroz = 6;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,600,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle7ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE7OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE7OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
wateroz = 7;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,700,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle8ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE8OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE8OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
wateroz = 8;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,800,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle9ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE9OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE9OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
wateroz = 9;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,900,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};

2
SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
View File

@@ -1171,7 +1171,7 @@ class ItemKiloHemp : CA_Magazine
class Crafting1
{
text = $STR_EPOCH_PLAYER_269a;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {""};
requiretools[] = {"ItemKnife"};
output[] = {{"ItemHempSeed",5}};

2
SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
View File

@@ -59,7 +59,7 @@ class PartWoodPile : CA_Magazine
class ItemActions {
class Build {
text = $STR_ACTIONS_MAKEFIRE;
script = "spawn player_makeFire;";
script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet
use[] = {"PartWoodPile"};
};
class Crafting

4
SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp
View File

@@ -14,7 +14,7 @@ class ItemSodaEmpty : HandGrenade
class Drink
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_drinkWater;";
script = ";[_id] spawn player_fillWater;";
};
class Crafting {
text = "Melt into Bars";
@@ -43,7 +43,7 @@ class TrashTinCan : HandGrenade
class Drink
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_drinkWater;";
script = ";[_id] spawn player_fillWater;";
};
class Crafting {
text = "Melt into Bars";

10
SQF/dayz_code/Configs/CfgServerTrader/Category/Attachments.hpp
View File

@@ -19,11 +19,21 @@ class Category_693 {
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class Attachment_MFL_Pist {
type = "trade_items";
buy[] = {4,"ItemGoldBar"};
sell[] = {2,"ItemGoldBar"};
};
class Attachment_FL {
type = "trade_items";
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class Attachment_MFL {
type = "trade_items";
buy[] = {4,"ItemGoldBar"};
sell[] = {2,"ItemGoldBar"};
};
class Attachment_CCO {
type = "trade_items";
buy[] = {4,"ItemGoldBar"};

4
SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp
View File

@@ -26,8 +26,8 @@ class Category_577 {
};
class 20Rnd_762x51_DMR {
type = "trade_items";
buy[] = {6,"ItemGoldBar"};
sell[] = {3,"ItemGoldBar"};
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class 5Rnd_86x70_L115A1 {
type = "trade_items";

5
SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp
View File

@@ -29,6 +29,11 @@ class Category_538 {
buy[] = {8,"ItemSilverBar10oz"};
sell[] = {4,"ItemSilverBar10oz"};
};
class DZ_CompactPack_EP1 {
type = "trade_backpacks";
buy[] = {1,"ItemGoldBar"};
sell[] = {5,"ItemSilverBar10oz"};
};
class DZ_British_ACU {
type = "trade_backpacks";
buy[] = {4,"ItemGoldBar"};

8
SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp
View File

@@ -6,13 +6,13 @@ class Category_624 {
};
class 5Rnd_762x51_M24 {
type = "trade_items";
buy[] = {1,"ItemSilverBar10oz"};
sell[] = {5,"ItemSilverBar"};
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class 20Rnd_762x51_DMR {
type = "trade_items";
buy[] = {6,"ItemGoldBar"};
sell[] = {3,"ItemGoldBar"};
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class 10Rnd_762x54_SVD {
type = "trade_items";

7
SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyToolbeltItems.hpp
View File

@@ -34,6 +34,13 @@ class Category_679 {
buy[] = {-1,"ItemGoldBar"}; // Sell only
sell[] = {1,"ItemGoldBar"};
};
/*
class NVGoggles_DZE {
type = "trade_weapons";
buy[] = {6,"ItemGoldBar"};
sell[] = {3,"ItemGoldBar"};
};
*/
class ItemFlashlight {
type = "trade_weapons";
buy[] = {2,"ItemSilverBar"};

6
SQF/dayz_code/Configs/CfgServerTrader/README.txt Normal file
View File

@@ -0,0 +1,6 @@
To customize config traders copy this CfgServerTrader folder to your mission.
Then in description.ext replace this line:
#include "\z\addons\dayz_code\Configs\CfgServerTrader\CfgServerTrader.hpp"
with this:
#include "CfgServerTrader\CfgServerTrader.hpp"

12
SQF/dayz_code/Configs/CfgTownGenerator/chernarusWaters.hpp
View File

@@ -2363,4 +2363,16 @@
};
};
class W182 { //Blocks Topolka Dam walk under water glitch
position[] = {10299.095,3659.8674,2.4993041};
size = 50;
buildings = 1;
class Object0 {
type = "MAP_pond_big_01";
position[] = {10299.095,3659.8674,2.4993041};
direction = 0;
onFire = 0;
};
};

35
SQF/dayz_code/Configs/CfgVehicles/Buildings/WaterSources.hpp Normal file
View File

@@ -0,0 +1,35 @@
#define ACTION_DRINK class Drink\
{\
displayName = $STR_ACTIONS_DRINK2;\
displayNameDefault = $STR_ACTIONS_DRINK2;\
priority = 3;\
radius = 3;\
position = "";\
showWindow = 1;\
onlyForPlayer = 1;\
shortcut = "";\
condition = "(['Drink',this] call userActionConditions)";\
statement = "['hands'] spawn player_fillWater;";\
};
class Land_pumpa: House
{
class UserActions {ACTION_DRINK};
};
class Land_Misc_Well_C_EP1: House_EP1
{
class UserActions {ACTION_DRINK};
};
class Land_Misc_Well_L_EP1: House_EP1
{
class UserActions {ACTION_DRINK};
};
class Land_Barrel_water: Thing
{
class UserActions {ACTION_DRINK};
};
#undef ACTION_DRINK

209
SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
View File

@@ -234,171 +234,45 @@ class CfgVehicles {
};
};
class Tank: LandVehicle {
class Sounds: Sounds {
class Engine;
class Movement;
};
driverOpticsModel = "\ca\Tracked\optika_tank_driver";
commanderCanSee = 31;
gunnerCanSee = 30;
getInAction = "GetInMedium";
getOutAction = "GetOutMedium";
cargoGetInAction[] = {"GetInLow"};
cargoGetOutAction[] = {"GetOutLow"};
audible = 18;
sensitivityEar = "0.0075 /3";
armorStructural = 2;
class AnimationSources;
class HitPoints {
class HitHull {
armor = 1;
material = -1;
name = "NEtelo";
visual = "telo";
passThrough = 1;
};
class HitLTrack {
armor = 0.15;
material = -1;
name = "pas_L";
visual = "pas_L";
passThrough = 0.3;
};
class HitRTrack {
armor = 0.15;
material = -1;
name = "pas_P";
visual = "pas_P";
passThrough = 0.3;
};
class HitEngine {
armor = 0.35;
material = -1;
name = "motor";
visual = "motor";
passThrough = 0.2;
minimalHit = 0.02;
};
};
weapons[] = {};
magazines[] = {};
class Turrets {
class MainTurret: NewTurret {
gunnerAction = "ManActTestDriverOut";
gunnerOpticsModel = "\ca\Tracked\optika_tank_gunner";
gunnerOutOpticsModel = "\ca\Weapons\optika_empty";
gunBeg = "usti hlavne";
gunEnd = "konec hlavne";
memoryPointsGetInGunner = "pos gunner";
memoryPointsGetInGunnerDir = "pos gunner dir";
gunnerGetInAction = "GetInHigh";
gunnerGetOutAction = "GetOutHigh";
viewGunnerInExternal = 0;
primaryGunner = 1;
gunnerOpticsEffect[] = {"TankGunnerOptics2","OpticsBlur1","OpticsCHAbera1"};
gunnerOutOpticsEffect[] = {};
class HitPoints {
class HitTurret {
armor = 1;
material = -1;
name = "vez";
visual = "vez";
passThrough = 1;
};
class HitGun {
armor = 0.3;
material = -1;
name = "zbran";
visual = "zbran";
passThrough = 0;
};
};
class Turrets {
class CommanderOptics: NewTurret {
proxyType = "CPCommander";
proxyIndex = 1;
gunnerName = "$STR_POSITION_COMMANDER";
primaryGunner = 0;
primaryObserver = 1;
stabilizedInAxes = "StabilizedInAxesNone";
body = "obsTurret";
gun = "obsGun";
animationSourceBody = "obsTurret";
animationSourceGun = "obsGun";
animationSourceHatch = "hatchCommander";
soundServo[] = {"\ca\sounds\vehicles\servos\turret-1",0.01,1,10};
gunBeg = "";
gunEnd = "";
minElev = -4;
maxElev = 20;
initElev = 0;
minTurn = -360;
maxTurn = 360;
initTurn = 0;
commanding = 2;
outGunnerMayFire = 1;
inGunnerMayFire = 1;
viewGunnerInExternal = 0;
gunnerOpticsModel = "\ca\Tracked\optika_tank_driver";
gunnerOutOpticsModel = "\ca\Weapons\optika_empty";
gunnerOutOpticsColor[] = {0,0,0,1};
gunnerOutForceOptics = 0;
gunnerOutOpticsShowCursor = 0;
gunnerOpticsEffect[] = {};
gunnerOutOpticsEffect[] = {};
memoryPointGunnerOutOptics = "commander_weapon_view";
memoryPointGunnerOptics = "commanderview";
memoryPointsGetInGunner = "pos commander";
memoryPointsGetInGunnerDir = "pos commander dir";
gunnerGetInAction = "GetInHigh";
gunnerGetOutAction = "GetOutHigh";
memoryPointGun = "gun_muzzle";
selectionFireAnim = "zasleh_1";
class ViewOptics {
initAngleX = 0;
minAngleX = -30;
maxAngleX = 30;
initAngleY = 0;
minAngleY = -100;
maxAngleY = 100;
initFov = 0.155;
minFov = 0.0625;
maxFov = 0.466;
};
class ViewGunner {
initAngleX = 5;
minAngleX = -65;
maxAngleX = 85;
initAngleY = 0;
minAngleY = -150;
maxAngleY = 150;
initFov = 0.7;
minFov = 0.25;
maxFov = 1.1;
};
};
};
};
};
soundDammage[] = {"\ca\Tracked\Data\Sound\alarm_loop1",0.000316228,1};
supplyRadius = 1.5;
class ViewOptics: ViewOptics {
initAngleX = 0;
minAngleX = -30;
maxAngleX = 30;
initAngleY = 0;
minAngleY = -100;
maxAngleY = 100;
initFov = 0.466;
minFov = 0.466;
maxFov = 0.466;
};
smokeLauncherGrenadeCount = 6;
smokeLauncherVelocity = 15;
smokeLauncherOnTurret = 1;
smokeLauncherAngle = 120;
};
class Tank: LandVehicle {
class HitPoints
{
class HitEngine;
class HitHull;
class HitLTrack;
class HitRTrack;
};
class ViewPilot;
class ViewOptics;
class Turrets
{
class MainTurret: NewTurret
{
class Turrets;
class HitPoints
{
class HitTurret;
class HitGun;
};
};
};
class CargoLight;
class Sounds: Sounds
{
class Engine;
class Movement;
};
class SpeechVariants
{
class Default;
class EN;
class CZ;
class CZ_Akuzativ;
class RU;
};
class Eventhandlers;
};
class Truck;
//External Class
@@ -454,9 +328,11 @@ class CfgVehicles {
{
class DestructionEffects;
};
class House_EP1;
class SpawnableWreck : House {};
class Strategic;
class NonStrategic;
class Thing;
// class Land_Fire;
class BuiltItems;
class Building;
@@ -578,6 +454,7 @@ class CfgVehicles {
#include "Buildings\Land_telek1.hpp"
#include "Buildings\Land_VASICore.hpp"
#include "Buildings\Land_Vysilac_FM.hpp"
#include "Buildings\WaterSources.hpp"
//Duplicates of Epoch items in DZE\Prop_Defs.hpp
//#include "CamoNetting.hpp"
@@ -601,7 +478,7 @@ class CfgVehicles {
//Antihack
#include "antihack_logic.hpp"
#include "antihack_plants.hpp"
#include "antihack_weaponholders.hpp"
//#include "antihack_weaponholders.hpp"
//EPOCH
#include "DZE\Wrecks.hpp"

6
SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp
View File

@@ -6,7 +6,8 @@
onlyForPlayer = 1;\
shortcut = "";\
condition = "(['Repair',this] call userActionConditions)";\
statement = "this call player_repairVehicle;"
statement = "this call player_repairVehicle;";\
hideOnUse = 0
#define ACTION_SALVAGE displayName = $STR_ACTIONS_SALVAGEVEH;\
displayNameDefault = $STR_ACTIONS_SALVAGEVEH;\
@@ -16,7 +17,8 @@
onlyForPlayer = 1;\
shortcut = "";\
condition = "(['Salvage',this] call userActionConditions)";\
statement = "this call player_salvageVehicle;"
statement = "this call player_salvageVehicle;";\
hideOnUse = 0
#define ACTION_PUSH displayName = $STR_ACTIONS_PUSH;\
displayNameDefault = $STR_ACTIONS_PUSH;\

48
SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp
View File

@@ -252,26 +252,26 @@ class Land_iron_vein_wreck: ruins {
scope = protected;
model = "\z\addons\dayz_epoch\models\iron_vein_wreck.p3d";
displayName = $STR_ORE_VEIN_WRECK_IRON;
removeoutput[] = {{"PartOre",{10,10}},{"PartOreSilver",{0,10}},{"PartOreGold",{0,5}}};
//removeoutput[] = {{"PartOre",{10,10}},{"PartOreSilver",{0,10}},{"PartOreGold",{0,5}}}; // Moved to CfgLoot group
};
class Land_silver_vein_wreck: ruins {
scope = protected;
model = "\z\addons\dayz_epoch\models\silver_vein_wreck.p3d";
displayName = $STR_ORE_VEIN_WRECK_SILVER;
removeoutput[] = {{"PartOreSilver",{10,10}},{"PartOre",{0,1}},{"PartOreGold",{6,4}}};
//removeoutput[] = {{"PartOreSilver",{10,10}},{"PartOre",{0,1}},{"PartOreGold",{6,4}}}; // Moved to CfgLoot group
};
class Land_gold_vein_wreck: ruins {
scope = protected;
model = "\z\addons\dayz_epoch\models\gold_vein_wreck.p3d";
displayName = $STR_ORE_VEIN_WRECK_GOLD;
removeoutput[] = {{"PartOreGold",{10,10}},{"PartOre",{0,1}},{"PartOreSilver",{6,4}}};
//removeoutput[] = {{"PartOreGold",{10,10}},{"PartOre",{0,1}},{"PartOreSilver",{6,4}}}; // Moved to CfgLoot group
};
class Land_ammo_supply_wreck: ruins {
scope = protected;
model = "\z\addons\dayz_epoch\models\ammo_supply_wreck.p3d";
displayName = $STR_EPOCH_BULK_NAME;
removeoutput[] = {{"100Rnd_762x54_PK",{0,1}},{"29Rnd_30mm_AGS30",{0,1}},{"50Rnd_127x107_DSHKM",{0,1}},{"100Rnd_127x99_M2",{0,1}},{"2000Rnd_762x51_M134",{0,1}},{"48Rnd_40mm_MK19",{0,1}},{"100Rnd_762x51_M240",{0,1}}};
//removeoutput[] = {{"100Rnd_762x54_PK",{0,1}},{"29Rnd_30mm_AGS30",{0,1}},{"50Rnd_127x107_DSHKM",{0,1}},{"100Rnd_127x99_M2",{0,1}},{"2000Rnd_762x51_M134",{0,1}},{"48Rnd_40mm_MK19",{0,1}},{"100Rnd_762x51_M240",{0,1}}}; // Moved to CfgLoot group
};
@@ -359,21 +359,21 @@ class Land_DZE_WoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
{
displayName=$STR_EPOCH_DOORS_LOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
statement="this animate [""Open_hinge"", 0]";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_hinge"", 0]";
};
class Unlock_Door : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
statement="this animate [""Open_hinge"", 1]";
};
class Unlock_Door_Dialog : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition=" !keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
condition="!keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;if(DZE_doorManagement) then {createdialog ""DoorAccess"";} else {createdialog ""ComboLockUI"";};";
};
};
@@ -459,21 +459,21 @@ class Land_DZE_LargeWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
{
displayName=$STR_EPOCH_DOORS_LOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
statement="this animate [""Open_hinge"", 0]";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_hinge"", 0]";
};
class Unlock_Door : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
statement="this animate [""Open_hinge"", 1]";
};
class Unlock_Door_Dialog : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition=" !keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
condition="!keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;if(DZE_doorManagement) then {createdialog ""DoorAccess"";} else {createdialog ""ComboLockUI"";};";
};
};
@@ -559,21 +559,21 @@ class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
{
displayName=$STR_EPOCH_DOORS_LOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
statement="this animate [""Open_hinge"", 0]";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_hinge"", 0]";
};
class Unlock_Door : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
statement="this animate [""Open_hinge"", 1]";
};
class Unlock_Door_Dialog : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition=" !keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
condition="!keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;if(DZE_doorManagement) then {createdialog ""DoorAccess"";} else {createdialog ""ComboLockUI"";};";
};
};
@@ -624,21 +624,21 @@ class CinderWallDoorLocked_DZ: CinderWallDoorLocked_DZ_Base {
{
displayName=$STR_EPOCH_DOORS_LOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
statement="this animate [""Open_latch"", 0]";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_latch"", 0]";
};
class Unlock_Door : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 0)";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 0)";
statement="this animate [""Open_latch"", 1]";
};
class Unlock_Door_Dialog : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition=" !keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
condition="!keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;if(DZE_doorManagement) then {createdialog ""DoorAccess"";} else {createdialog ""ComboLockUI"";};";
};
};
@@ -727,21 +727,21 @@ class CinderWallDoorSmallLocked_DZ: CinderWallDoorLocked_DZ_Base {
{
displayName=$STR_EPOCH_DOORS_LOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
statement="this animate [""Open_latch"", 0]";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_latch"", 0]";
};
class Unlock_Door : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition="( !keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 0)";
condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 0)";
statement="this animate [""Open_latch"", 1]";
};
class Unlock_Door_Dialog : Open_Door
{
displayName=$STR_EPOCH_DOORS_UNLOCK;
//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 0)";
condition=" !keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
condition="!keypadCancel and DZE_Lock_Door != (this getvariable['CharacterID','0'])";
statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;if(DZE_doorManagement) then {createdialog ""DoorAccess"";} else {createdialog ""ComboLockUI"";};";
};
};

5
SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
View File

@@ -404,7 +404,7 @@ class FireBarrel_DZ:Land_Fire_barrel
armor = 400;
vehicleClass = "Fortifications";
constructioncount = 2;
removeoutput[] = {{"ItemFuelBarrelEmpty",1}};
removeoutput[] = {{"ItemFireBarrel_kit",1}};
nounderground = 0;
/*class EventHandlers
{
@@ -649,6 +649,7 @@ class StickFence_DZ: Wall_FenW2_6_EP1
offset[] = {0,4.5,0};
displayName = $STR_EPOCH_STICKFENCE;
vehicleClass = "Fortifications";
removeoutput[] = {{"stick_fence_kit",1}};
};
class ASC_EU_LHVOld;
class LightPole_DZ: ASC_EU_LHVOld
@@ -659,6 +660,7 @@ class LightPole_DZ: ASC_EU_LHVOld
displayName = $STR_EPOCH_LIGHTPOLE;
vehicleClass = "Fortifications";
maintainBuilding[] = {{"ItemLightBulb",1}};
removeoutput[] = {{"light_pole_kit",1}};
};
class Land_Misc_Scaffolding;
class Scaffolding_DZ: Land_Misc_Scaffolding
@@ -678,6 +680,7 @@ class Scaffolding_DZ: Land_Misc_Scaffolding
typicalCargo[] = {};
offset[] = {0,9,3};
cost = 0;
removeoutput[] = {{"ItemScaffoldingKit",1}};
};
class WoodGate_DZ: BuiltItems
{

48
SQF/dayz_code/Configs/CfgVehicles/RepairParts.hpp
View File

@@ -69,6 +69,48 @@ class RepairParts : AllVehicles
class HitGlass6 {
part = "PartGlass";
};
class HitGlass7 {
part = "PartGlass";
};
class HitGlass8 {
part = "PartGlass";
};
class HitGlass9 {
part = "PartGlass";
};
class HitGlass10 {
part = "PartGlass";
};
class HitGlass11 {
part = "PartGlass";
};
class HitGlass12 {
part = "PartGlass";
};
class HitGlass13 {
part = "PartGlass";
};
class HitGlass14 {
part = "PartGlass";
};
class HitGlass15 {
part = "PartGlass";
};
class HitGlass16 {
part = "PartGlass";
};
class HitGlass17 {
part = "PartGlass";
};
class HitGlass18 {
part = "PartGlass";
};
class HitGlass19 {
part = "PartGlass";
};
class HitGlass20 {
part = "PartGlass";
};
class HitVRotor {
part = "PartGeneric";
};
@@ -84,4 +126,10 @@ class RepairParts : AllVehicles
class HitHull {
part = "PartGeneric";
};
class HitLTrack {
part = "PartGeneric";
};
class HitRTrack {
part = "PartGeneric";
};
};

45
SQF/dayz_code/Configs/CfgVehicles/Skins.hpp
View File

@@ -8,22 +8,6 @@ class CAManBase: Man //includes all skins except animals
class HitHead;
class HitBody;
};
class UserActions
{
class StudyBody
{
displayName = $STR_ACTION_STUDYBODY;
displayNameDefault = $STR_ACTION_STUDYBODY;
priority = 0;
radius = 3;
position = "";
showWindow = 0;
onlyForPlayer = 1;
shortcut = "";
condition = "(['StudyBody',this] call userActionConditions)";
statement = "this call player_studyBody;";
};
};
};
class Civilian: CAManBase
{
@@ -122,19 +106,7 @@ class Survivor3_DZ : Survivor2_DZ {
//See DZE\Females.hpp for female characters
class Bandit1_DZ : Survivor_DZ { //GER_Soldier_EP1
scope = public;
displayName = $STR_CHAR_2;
model = "\ca\characters_E\GER\GER_rifleman";
portrait = "\Ca\characters_E\data\portraits\ger_soldier_CA";
identityTypes[] = {"Language_DE_EP1","Head_DE","CDF_Glasses"};
class Wounds
{
tex[] = {};
mat[] = {};
};
hiddenSelections[] = {"Camo"};
};
//Bandit1_DZ moved to DZE section below
class Rocket_DZ: Survivor_DZ { //BAF_Soldier_Officer_W
scope = public;
@@ -354,7 +326,20 @@ class INS_Worker2_DZ: INS_Worker2 {
// bandits
class Soldier_Crew_PMC;
class Bandit2_DZ: Soldier_Crew_PMC {
class Bandit1_DZ : Soldier_Crew_PMC { //Normal black PMC vest bandit
displayName = $STR_CHAR_2;
side = 1;
weapons[] = {"Throw","Put"};
model = "\dayz\characters\man_bandit";
portrait = "\Ca\characters_E\data\portraits\ger_soldier_CA";
magazines[] = {};
backpack = "";
respawnWeapons[] = {"Throw","Put"};
respawnMagazines[] = {};
weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072";
canHideBodies = 1;
};
class Bandit2_DZ: Soldier_Crew_PMC { //German bright color camo bandit
scope = public;
side = 1;
displayName = $STR_CHAR_2;

4
SQF/dayz_code/Configs/CfgVehicles/Traps.hpp
View File

@@ -335,7 +335,7 @@ class TrapTripwireGrenade : TrapItems {
script = "tripgrenade"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state
singleUse = 0;
singleUse = 1;
requireplot = 0;
constructioncount = 1;
@@ -387,7 +387,7 @@ class TrapTripwireSmoke : TrapItems {
script = "tripsmoke"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state
singleUse = 0;
singleUse = 1;
requireplot = 0;
constructioncount = 1;

20
SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
View File

@@ -3,6 +3,7 @@ class WoodenArrowF : WeaponHolderBase {
scope = public;
displayName = $STR_ITEMWOODENARROW_CODE_NAME;
model = "\dayz_weapons\models\bolt";
destrType = "DestructNo";
class eventHandlers
{
@@ -14,6 +15,8 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase
scope=2;
displayName=$STR_EQUIP_NAME_CROWBAR;
model="\dayz_equip\models\crowbar.p3d";
destrType = "DestructNo";
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -23,6 +26,7 @@ class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for pl
scope = public;
displayName = $STR_EQUIP_NAME_SledgeHammer;
model="\z\addons\dayz_epoch\models\sledge_mag.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgWeapons','ItemSledge'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -34,6 +38,8 @@ class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase
scope=2;
displayName=$STR_EQUIP_NAME_BASEBALLBAT;
model="\z\addons\dayz_communityassets\models\baseball_bat.p3d";
destrType = "DestructNo";
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','MeleeBaseBallBat'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -44,6 +50,8 @@ class WeaponHolder_MeleeBatBarbed: WeaponHolderBase
scope=2;
displayName=$STR_CRAFT_NAME_BaseBallBatBarbed;
model="\z\addons\dayz_communityassets\models\baseball_bat.p3d";
destrType = "DestructNo";
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','MeleeBaseBallBatBarbed'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -54,6 +62,8 @@ class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase
scope=2;
displayName=$STR_CRAFT_NAME_NailedBaseballBat;
model="\z\addons\dayz_communityassets\models\baseball_bat_nails.p3d";
destrType = "DestructNo";
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','MeleeBaseBallBatNails'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -65,6 +75,8 @@ class WeaponHolder_MeleeMachete: WeaponHolderBase
scope=2;
displayName=$STR_EQUIP_NAME_MACHETE;
model="\z\addons\dayz_communityassets\models\machete.p3d";
destrType = "DestructNo";
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','MeleeMachete'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -74,6 +86,8 @@ class WeaponHolder_ItemJerrycanEmpty : WeaponHolderBase {
scope = public;
displayName = "$STR_EQUIP_NAME_39";
model = "\dayz_equip\proxy\jerrycan_side.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','ItemJerrycanEmpty'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
@@ -82,6 +96,7 @@ class WeaponHolder_ItemFuelcanEmpty : WeaponHolderBase {
scope = public;
displayName = $STR_ITEM_NAME_FUELCAN_EMPTY;
model = "z\addons\dayz_communityassets\models\fuelcan.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','ItemFuelcanEmpty'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -91,6 +106,7 @@ class WeaponHolder_ItemFuelcan : WeaponHolderBase {
scope = public;
displayName = $STR_ITEM_NAME_FUELCAN;
model = "z\addons\dayz_communityassets\models\fuelcan.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','ItemFuelcan'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -101,6 +117,7 @@ class WeaponHolder_ItemCamoNet : WeaponHolderBase {
displayName = $STR_ITEM_NAME_CAMONET;
// model = "dayz_equip\proxy\tentbag.p3d"; // was models\tentbag_gear.prd ...
model = "z\addons\dayz_communityassets\models\packed_net_green.p3d"; // was models\tentbag_gear.prd ...
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','forest_net_kit'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -111,6 +128,7 @@ class WeaponHolder_ItemDomeTent : WeaponHolderBase {
scope = public;
displayName = $STR_VEH_NAME_DOME_TENT;
model = "\dayz_equip\proxy\tentbag.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','ItemDomeTent'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -121,6 +139,7 @@ class WeaponHolder_ItemDesertTent : WeaponHolderBase {
scope = public;
displayName = $STR_VEH_NAME_DESERT_TENT;
model = "\dayz_equip\proxy\tentbag.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','ItemDesertTent'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
@@ -131,6 +150,7 @@ class WeaponHolder_ItemCrate : WeaponHolderBase {
scope = public;
displayName = $STR_ITEM_NAME_equip_crate;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
destrType = "DestructNo";
class eventHandlers {
init = "[(_this select 0),'cfgMagazines','equip_crate'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";

4
SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp
View File

@@ -23,7 +23,9 @@ class Swarm_Base : Citizen1 {
class Eventhandlers {
init = "_this call zombie_initialize;";
//local = "if(_this select 1) then {[(position (_this select 0)),(_this select 0),true] execFSM '\z\AddOns\dayz_code\system\fn_swarmagent.fsm'};";
local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] call zombie_initialize;";
HandleDamage = "_this call local_zombieDamage;";
Killed = "[_this,'zombieKills'] call local_eventKill;";
};
class HitPoints {

7
SQF/dayz_code/Configs/CfgVehicles/Zeds/ViralZeds.hpp
View File

@@ -21,12 +21,7 @@
BleedChance = 30;
forcedSpeed = 6;
class Eventhandlers
{
init = "_this call zombie_initialize;";
//local = "_z = _this select 0; if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; }; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [(position _z), _z, true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';";
local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [(position _z), _z, true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';";
};
//Inherits eventHandlers from zZombie_Base
class HitPoints {
class HitHead {

12
SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp
View File

@@ -23,14 +23,10 @@ class WildZombie_Base : Zed_Base {
forcedSpeed = 6;
class Eventhandlers {
init = "_this call zombie_initialize;";
local = "_z = _this select 0;" \n
// "if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { " \n
// "PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; };" \n
"if (!(_this select 1)) exitWith {};" \n
"if (isServer) exitWith { _z call sched_co_deleteVehicle; };" \n
"[(position _z), _z, true] execFSM '\z\AddOns\dayz_code\system\zombie_wildagent.fsm';";
//if(_this select 1) then {[(position (_this select 0)),(_this select 0),true] execFSM '\z\AddOns\dayz_code\system\zombie_wildagent.fsm'};";
init = "_this execFSM ""\z\AddOns\dayz_code\system\zombie_wildagent.fsm""";
local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] execFSM '\z\AddOns\dayz_code\system\zombie_wildagent.fsm';";
HandleDamage = "_this call local_zombieDamage;";
Killed = "[_this,'zombieKills'] call local_eventKill;";
};
class HitPoints {

7
SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp
View File

@@ -52,9 +52,8 @@ class zZombie_Base : Zed_Base {
class Eventhandlers
{
init = "_this execFSM ""\z\AddOns\dayz_code\system\zombie_agent.fsm""";
//local = "_z = _this select 0; if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; }; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [(position _z), _z, true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';";
local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [(position _z), _z, true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';";
init = "_this call zombie_initialize;";
local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] call zombie_initialize;";
HandleDamage = "_this call local_zombieDamage;";
Killed = "[_this,'zombieKills'] call local_eventKill;";
};
@@ -74,7 +73,6 @@ class zZombie_Base : Zed_Base {
condition = "(['Butcher',this] call userActionConditions)";
statement = "this spawn player_butcher;";
};
delete StudyBody;
};
class HitPoints {
@@ -376,6 +374,7 @@ class z_hunter : zZombie_Base {
zombieLoot = ZombieHunter;
model = "\ca\characters2\civil\Woodlander\Woodlander";
hiddenSelections[] = {"Camo"};
hiddenSelectionsTextures[] = {"\ca\characters2\civil\woodlander\data\woodlander_v3_co.paa"};
class Wounds {
tex[] = {};

3
SQF/dayz_code/Configs/CfgVehicles/antihack_weaponholders.hpp
View File

@@ -1,4 +1,4 @@
// these objects can't be banned, so let's transform them to some dull objects
/*// these objects can't be banned, so let's transform them to some dull objects
class RUBasicAmmunitionBox: House {
model = "\ca\weapons\AmmoBoxes\RUSpecialWeapons.p3d";
vehicleClass = "RUBasicAmmunitionBox";
@@ -11,3 +11,4 @@
model = "\ca\weapons\AmmoBoxes\RUBasicWeapons.p3d";
vehicleClass = "RUBasicWeaponsBox";
};
*/

15
SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
View File

@@ -26,7 +26,8 @@ class CfgWeapons
#include "Weapon\Sniper\AS50.hpp"
#include "Weapon\Sniper\M107.hpp"
#include "Weapon\Sniper\KSVK.hpp"
#include "Weapon\Sniper\M4SPR.hpp"
#include "Weapon\Sniper\VSSVintorez.hpp"
//each include is preceded by its required external references.
@@ -234,6 +235,7 @@ class CfgWeapons
/* TOOLS */
#include "Tools\Binocular.hpp"
#include "Tools\NVG.hpp"
#include "Tools\Chainsaw.hpp"
#include "Tools\Map.hpp"
@@ -262,6 +264,7 @@ class CfgWeapons
#include "Tools\Radio.hpp"
#include "Item\ItemKeyKit.hpp"
#include "Item\ItemKeys.hpp"
#include "Item\Documents.hpp"
@@ -290,8 +293,8 @@ class CfgWeapons
{
class Drink
{
text = "Drink";
script = "spawn player_drinkWater;";
text = $STR_ACTIONS_DRINK2;
script = ";[_id] spawn player_fillWater;";
};
};
};
@@ -308,9 +311,9 @@ class CfgWeapons
{
class Drink
{
text = "Drink";
script = "spawn player_drinkWater;";
text = $STR_ACTIONS_DRINK2;
script = ";[_id] spawn player_fillWater;";
};
};
};*/
};
};

81
SQF/dayz_code/Configs/CfgWeapons/Item/Documents.hpp Normal file
View File

@@ -0,0 +1,81 @@
class Kostey_notebook;
class Notebook_bio_DZE: Kostey_notebook
{
displayname = $STR_EQUIP_NOTEBOOK_BIO;
descriptionShort= $STR_EQUIP_NOTEBOOK_BIO_DESC;
};
class Notebook_che_DZE: Kostey_notebook
{
displayname = $STR_EQUIP_NOTEBOOK_CHE;
descriptionShort= $STR_EQUIP_NOTEBOOK_CHE_DESC;
};
class Notebook_phy_DZE: Kostey_notebook
{
displayname = $STR_EQUIP_NOTEBOOK_PHY;
descriptionShort= $STR_EQUIP_NOTEBOOK_PHY_DESC;
};
class Notebook_secret_DZE: Kostey_notebook
{
displayname = $STR_EQUIP_NOTEBOOK_SECRET;
descriptionShort= $STR_EQUIP_NOTEBOOK_SECRET_DESC;
};
class Notebook_herbs_DZE: Kostey_notebook
{
displayname = $STR_EQUIP_NOTEBOOK_HERBS;
descriptionShort= $STR_EQUIP_NOTEBOOK_HERBS_DESC;
};
class Moscow_Bombing_File;
class Document_Random_DZE: Moscow_Bombing_File
{
displayname = $STR_EQUIP_DOCUMENT_RANDOM;
descriptionShort= $STR_EQUIP_DOCUMENT_RANDOM_DESC;
};
class Document_Military_DZE: Moscow_Bombing_File
{
displayname = $STR_EQUIP_DOCUMENT_MILITARY;
descriptionShort= $STR_EQUIP_DOCUMENT_MILITARY_DESC;
};
class Document_Topsecret_DZE: Moscow_Bombing_File
{
displayname = $STR_EQUIP_DOCUMENT_TOPSECRET;
descriptionShort= $STR_EQUIP_DOCUMENT_TOPSECRET_DESC;
};
class Cobalt_File;
class Manual_electronics_DZE: Cobalt_File
{
displayname = $STR_EQUIP_MANUAL_ELECTRONICS;
descriptionShort= $STR_EQUIP_MANUAL_ELECTRONICS_DESC;
};
class Manual_camera_DZE: Cobalt_File
{
displayname = $STR_EQUIP_MANUAL_CAMERA;
descriptionShort= $STR_EQUIP_MANUAL_CAMERA_DESC;
};
class Manual_repair_DZE: Cobalt_File
{
displayname = $STR_EQUIP_MANUAL_REPAIR;
descriptionShort= $STR_EQUIP_MANUAL_REPAIR_DESC;
};
class Kostey_map_case;
class Map_Military_DZE: Kostey_map_case
{
displayname = $STR_EQUIP_MAP_Military;
descriptionShort= $STR_EQUIP_MAP_Military_DESC;
};
class Map_Survivor_DZE: Kostey_map_case
{
displayname = $STR_EQUIP_MAP_SURVIVOR;
descriptionShort= $STR_EQUIP_MAP_SURVIVOR_DESC;
};

71
SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp
View File

@@ -16,6 +16,7 @@ class G17_DZ : glock17_EP1
{
Attachment_Sup9 = "G17_SD_DZ";
Attachment_FL_Pist = "G17_FL_DZ";
Attachment_MFL_Pist = "G17_MFL_DZ";
};
};
@@ -51,6 +52,38 @@ class G17_FL_DZ : G17_DZ
};
};
class G17_MFL_DZ : G17_DZ
{
model = "z\addons\dayz_communityweapons\g17\g17_fl.p3d";
picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_fl_ca.paa";
displayName = $STR_DZ_WPN_G17_MFL_NAME;
class FlashLight
{
color[] = {0.9, 0.0, 0.0, 0.9};
ambient[] = {0.1, 0.0, 0.0, 1.0};
position = "flash dir";
direction = "flash";
angle = 30;
scale[] = {1, 1, 0.5};
brightness = 0.08;
};
class Attachments
{
Attachment_Sup9 = "G17_SD_MFL_DZ";
};
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_PST_RMVE;
script = "; ['Attachment_MFL_Pist',_id,'G17_DZ'] call player_removeAttachment";
};
};
};
class G17_SD_DZ : M9SD
{
model = "z\addons\dayz_communityweapons\g17\g17_sd.p3d";
@@ -74,6 +107,7 @@ class G17_SD_DZ : M9SD
class Attachments
{
Attachment_FL_Pist = "G17_SD_FL_DZ";
Attachment_MFL_Pist = "G17_SD_MFL_DZ";
};
class ItemActions
@@ -119,4 +153,39 @@ class G17_SD_FL_DZ : G17_SD_DZ
script = "; ['Attachment_FL_Pist',_id,'G17_SD_DZ'] call player_removeAttachment";
};
};
};
};
class G17_SD_MFL_DZ : G17_SD_DZ
{
model = "z\addons\dayz_communityweapons\g17\g17_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_G17_SD_MFL_NAME;
class FlashLight
{
color[] = {0.9, 0.0, 0.0, 0.9};
ambient[] = {0.1, 0.0, 0.0, 1.0};
position = "flash dir";
direction = "flash";
angle = 30;
scale[] = {1, 1, 0.5};
brightness = 0.08;
};
class Attachments {};
class ItemActions
{
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup9',_id,'G17_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_PST_RMVE;
script = "; ['Attachment_MFL_Pist',_id,'G17_SD_DZ'] call player_removeAttachment";
};
};
};

94
SQF/dayz_code/Configs/CfgWeapons/Rifles/Crossbow.hpp
View File

@@ -9,6 +9,17 @@
brightness = 0.1;\
};
#define CROSSBOW_MFLASHLIGHT class FlashLight\
{\
color[] = {0.9, 0.0, 0.0, 0.9};\
ambient[] = {0.1, 0.0, 0.0, 1.0};\
position = "fl_start";\
direction = "fl_dir";\
angle = 40;\
scale[] = {1, 1, 0.5};\
brightness = 0.08;\
};
class Crossbow_Base : Rifle
@@ -53,6 +64,7 @@ class Crossbow_DZ : Crossbow_Base
{
Attachment_CCO = "Crossbow_CCO_DZ";
Attachment_FL = "Crossbow_FL_DZ";
Attachment_MFL = "Crossbow_MFL_DZ";
Attachment_SCOPED = "Crossbow_Scope_DZ";
};
};
@@ -81,6 +93,30 @@ class Crossbow_FL_DZ : Crossbow_DZ
};
};
class Crossbow_MFL_DZ : Crossbow_DZ
{
model = "z\addons\community_crossbow\models\crossbow_fl.p3d";
picture = "\z\addons\community_crossbow\icons\crossbow_fl.paa";
displayName = $STR_DZ_WPN_CROSSBOW_MFL_NAME;
CROSSBOW_MFLASHLIGHT
class Attachments
{
Attachment_CCO = "Crossbow_CCO_MFL_DZ";
Attachment_SCOPED = "Crossbow_Scope_MFL_DZ";
};
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Crossbow_DZ'] call player_removeAttachment";
};
};
};
/*CCO*/
@@ -94,6 +130,7 @@ class Crossbow_CCO_DZ : Crossbow_DZ
class Attachments
{
Attachment_FL = "Crossbow_CCO_FL_DZ";
Attachment_MFL = "Crossbow_CCO_MFL_DZ";
};
class ItemActions
@@ -132,6 +169,32 @@ class Crossbow_CCO_FL_DZ : Crossbow_CCO_DZ
};
};
class Crossbow_CCO_MFL_DZ : Crossbow_CCO_DZ
{
model = "z\addons\community_crossbow\models\crossbow_cco_fl.p3d";
picture = "\z\addons\community_crossbow\icons\crossbow_scoped.paa";
displayName = $STR_DZ_WPN_CROSSBOW_CCO_MFL_NAME;
CROSSBOW_MFLASHLIGHT
class Attachments {};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'Crossbow_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Crossbow_CCO_DZ'] call player_removeAttachment";
};
};
};
/*Scope*/
@@ -152,6 +215,7 @@ class Crossbow_Scope_DZ : Crossbow_DZ
class Attachments
{
Attachment_FL = "Crossbow_Scope_FL_DZ";
Attachment_MFL = "Crossbow_Scope_MFL_DZ";
};
class ItemActions
@@ -190,4 +254,32 @@ class Crossbow_Scope_FL_DZ : Crossbow_Scope_DZ
};
};
#undef CROSSBOW_FLASHLIGHT
class Crossbow_Scope_MFL_DZ : Crossbow_Scope_DZ
{
model = "z\addons\community_crossbow\models\crossbow_scoped_fl.p3d";
picture = "\z\addons\community_crossbow\icons\crossbow_scoped_fl.paa";
displayName = $STR_DZ_WPN_CROSSBOW_SCOPE_MFL_NAME;
CROSSBOW_MFLASHLIGHT
class Attachments {};
class ItemActions
{
class RemoveScope
{
text = $STR_DZ_ATT_PU_RMVE;
script = "; ['Attachment_SCOPED',_id,'Crossbow_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Crossbow_Scope_DZ'] call player_removeAttachment";
};
};
};
#undef CROSSBOW_FLASHLIGHT
#undef CROSSBOW_MFLASHLIGHT

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
View File

@@ -52,6 +52,7 @@ class G36C_DZ : G36C
{
Attachment_CCO = "G36C_CCO_DZ";
Attachment_Holo = "G36C_Holo_DZ";
Attachment_ACOG = "G36C_ACOG_DZ";
Attachment_Sup556 = "G36C_SD_DZ";
};
};
@@ -72,6 +73,7 @@ class G36C_SD_DZ : G36_C_SD_eotech
{
Attachment_CCO = "G36C_CCO_SD_DZ";
Attachment_Holo = "G36C_Holo_SD_DZ";
Attachment_ACOG = "G36C_ACOG_SD_DZ";
};
class ItemActions

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp
View File

@@ -3,7 +3,7 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim
model = "z\addons\dayz_communityweapons\l110a1\l110a1_cco.p3d";
picture = "\z\addons\dayz_communityweapons\l110a1\data\w_l110a1_cco_ca.paa";
displayName = $STR_DZ_WPN_L110A1_CCO_NAME;
irDistance = 0;
type = WeaponSlotPrimary;
magazines[] =
@@ -29,7 +29,7 @@ class L110A1_Holo_DZ : L110A1_CCO_DZ
model = "z\addons\dayz_communityweapons\l110a1\l110a1_holo.p3d";
picture = "\z\addons\dayz_communityweapons\l110a1\data\w_l110a1_holo_ca.paa";
displayName = $STR_DZ_WPN_L110A1_HOLO_NAME;
class ItemActions
{
class RemoveHolo

259
SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp
View File

@@ -9,6 +9,17 @@
brightness = 0.1;\
}
#define M16A4_MFLASHLIGHT class FlashLight\
{\
color[] = {0.9, 0.0, 0.0, 0.9};\
ambient[] = {0.1, 0.0, 0.0, 1.0};\
position = "flash dir";\
direction = "flash";\
angle = 30;\
scale[] = {1, 1, 0.5};\
brightness = 0.08;\
}
#define M16A4_ACOG modelOptics = "\Ca\weapons_E\SCAR\ACOG_TA31_optic_4x.p3d";\
class OpticsModes\
{\
@@ -53,13 +64,13 @@ class M16A4_DZ : M16A2
model = "z\addons\dayz_communityweapons\m16a4\m16a4.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_ca.paa";
displayName = $STR_DZ_WPN_M16A4;
/*
magazines[] =
/*magazines[] =
{
30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD
};
*/
};*/ //Allow use of G36 mags
class Attachments
{
Attachment_CCO = "M16A4_CCO_DZ";
@@ -67,6 +78,7 @@ class M16A4_DZ : M16A2
Attachment_ACOG = "M16A4_ACOG_DZ";
Attachment_M203 = "M16A4_GL_DZ";
Attachment_FL = "M16A4_FL_DZ";
Attachment_MFL = "M16A4_MFL_DZ";
};
};
@@ -96,6 +108,32 @@ class M16A4_FL_DZ : M16A4_DZ
};
};
class M16A4_MFL_DZ : M16A4_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_MFL;
M16A4_MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "M16A4_CCO_MFL_DZ";
Attachment_Holo = "M16A4_Holo_MFL_DZ";
Attachment_ACOG = "M16A4_ACOG_MFL_DZ";
Attachment_M203 = "M16A4_GL_MFL_DZ";
};
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_DZ'] call player_removeAttachment";
};
};
};
class M16A4_GL_DZ : M16A4_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl.p3d";
@@ -111,6 +149,7 @@ class M16A4_GL_DZ : M16A4_DZ
Attachment_Holo = "M16A4_GL_Holo_DZ";
Attachment_ACOG = "M16A4_GL_ACOG_DZ";
Attachment_FL = "M16A4_GL_FL_DZ";
Attachment_MFL = "M16A4_GL_MFL_DZ";
};
class ItemActions
@@ -153,6 +192,36 @@ class M16A4_GL_FL_DZ : M16A4_GL_DZ
};
};
class M16A4_GL_MFL_DZ : M16A4_GL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_gl_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_GL_MFL;
M16A4_MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "M16A4_GL_CCO_MFL_DZ";
Attachment_Holo = "M16A4_GL_Holo_MFL_DZ";
Attachment_ACOG = "M16A4_GL_ACOG_MFL_DZ";
};
class ItemActions
{
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M16A4_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_GL_DZ'] call player_removeAttachment";
};
};
};
//CCO
@@ -166,6 +235,7 @@ class M16A4_CCO_DZ : M16A4_DZ
{
Attachment_M203 = "M16A4_GL_CCO_DZ";
Attachment_FL = "M16A4_CCO_FL_DZ";
Attachment_MFL = "M16A4_CCO_MFL_DZ";
};
class ItemActions
@@ -204,6 +274,32 @@ class M16A4_CCO_FL_DZ : M16A4_FL_DZ
};
};
class M16A4_CCO_MFL_DZ : M16A4_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_cco_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_cco_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_CCO_MFL;
class Attachments
{
Attachment_M203 = "M16A4_GL_CCO_MFL_DZ";
};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'M16A4_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_CCO_DZ'] call player_removeAttachment";
};
};
};
class M16A4_GL_CCO_DZ : M16A4_GL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_cco.p3d";
@@ -213,6 +309,7 @@ class M16A4_GL_CCO_DZ : M16A4_GL_DZ
class Attachments
{
Attachment_FL = "M16A4_GL_CCO_FL_DZ";
Attachment_MFL = "M16A4_GL_CCO_MFL_DZ";
};
class ItemActions
@@ -258,6 +355,34 @@ class M16A4_GL_CCO_FL_DZ : M16A4_GL_FL_DZ
};
};
class M16A4_GL_CCO_MFL_DZ : M16A4_GL_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_cco_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_gl_cco_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_GL_CCO_MFL;
class Attachments {};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'M16A4_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M16A4_CCO_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_GL_CCO_DZ'] call player_removeAttachment";
};
};
};
//Holo
@@ -271,6 +396,7 @@ class M16A4_Holo_DZ : M16A4_DZ
{
Attachment_M203 = "M16A4_GL_Holo_DZ";
Attachment_FL = "M16A4_Holo_FL_DZ";
Attachment_MFL = "M16A4_Holo_MFL_DZ";
};
class ItemActions
@@ -309,6 +435,32 @@ class M16A4_Holo_FL_DZ : M16A4_FL_DZ
};
};
class M16A4_Holo_MFL_DZ : M16A4_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_holo_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_holo_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_HOLO_MFL;
class Attachments
{
Attachment_M203 = "M16A4_GL_Holo_MFL_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'M16A4_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_Holo_DZ'] call player_removeAttachment";
};
};
};
class M16A4_GL_Holo_DZ : M16A4_GL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_holo.p3d";
@@ -318,6 +470,7 @@ class M16A4_GL_Holo_DZ : M16A4_GL_DZ
class Attachments
{
Attachment_FL = "M16A4_GL_Holo_FL_DZ";
Attachment_MFL = "M16A4_GL_Holo_MFL_DZ";
};
class ItemActions
@@ -363,6 +516,34 @@ class M16A4_GL_Holo_FL_DZ : M16A4_GL_FL_DZ
};
};
class M16A4_GL_Holo_MFL_DZ : M16A4_GL_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_holo_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_gl_holo_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_GL_HOLO_MFL;
class Attachments {};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'M16A4_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M16A4_Holo_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_GL_Holo_DZ'] call player_removeAttachment";
};
};
};
//ACOG
@@ -377,8 +558,9 @@ class M16A4_ACOG_DZ : M16A4_DZ
class Attachments
{
Attachment_M203 = M16A4_GL_ACOG_DZ;
Attachment_FL = M16A4_ACOG_FL_DZ;
Attachment_M203 = "M16A4_GL_ACOG_DZ";
Attachment_FL = "M16A4_ACOG_FL_DZ";
Attachment_MFL = "M16A4_ACOG_MFL_DZ";
};
class ItemActions
@@ -401,7 +583,7 @@ class M16A4_ACOG_FL_DZ : M16A4_FL_DZ
class Attachments
{
Attachment_M203 = M16A4_GL_ACOG_FL_DZ;
Attachment_M203 = "M16A4_GL_ACOG_FL_DZ";
};
class ItemActions
@@ -419,6 +601,34 @@ class M16A4_ACOG_FL_DZ : M16A4_FL_DZ
};
};
class M16A4_ACOG_MFL_DZ : M16A4_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_acog_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_acog_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_ACOG_MFL_NAME;
M16A4_ACOG;
class Attachments
{
Attachment_M203 = "M16A4_GL_ACOG_MFL_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'M16A4_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_ACOG_DZ'] call player_removeAttachment";
};
};
};
class M16A4_GL_ACOG_DZ : M16A4_GL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_acog.p3d";
@@ -429,7 +639,8 @@ class M16A4_GL_ACOG_DZ : M16A4_GL_DZ
class Attachments
{
Attachment_FL = M16A4_GL_ACOG_FL_DZ;
Attachment_FL = "M16A4_GL_ACOG_FL_DZ";
Attachment_MFL = "M16A4_GL_ACOG_MFL_DZ";
};
class ItemActions
@@ -475,4 +686,34 @@ class M16A4_GL_ACOG_FL_DZ : M16A4_GL_FL_DZ
script = "; ['Attachment_FL',_id,'M16A4_GL_ACOG_DZ'] call player_removeAttachment";
};
};
};
};
class M16A4_GL_ACOG_MFL_DZ : M16A4_GL_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m16a4\m16a4_gl_acog_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_gl_acog_fl_ca.paa";
displayName = $STR_DZ_WPN_M16A4_GL_ACOG_MFL_NAME;
M16A4_ACOG;
class Attachments {};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'M16A4_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M16A4_ACOG_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M16A4_GL_ACOG_DZ'] call player_removeAttachment";
};
};
};

575
SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
View File

@@ -9,6 +9,17 @@
brightness = 0.1;\
}
#define M4A1_MFLASHLIGHT class FlashLight\
{\
color[] = {0.9, 0.0, 0.0, 0.9};\
ambient[] = {0.1, 0.0, 0.0, 1.0};\
position = "flash dir";\
direction = "flash";\
angle = 30;\
scale[] = {1, 1, 0.5};\
brightness = 0.08;\
}
#define M4A1_M203 muzzles[] = {this, M203Muzzle};\
handAnim[]={"OFP2_ManSkeleton","\Ca\weapons\data\Anim\M16GL.rtm"}
@@ -59,13 +70,13 @@ class M4A1_DZ : M4A1
displayName = $STR_DZ_WPN_M4A1_NAME;
handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"};
/*
magazines[] =
/*magazines[] =
{
30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD
};
*/
};*/ //Allow use of G36 mags
class Attachments
{
Attachment_CCO = "M4A1_CCO_DZ";
@@ -74,6 +85,7 @@ class M4A1_DZ : M4A1
Attachment_M203 = "M4A1_GL_DZ";
Attachment_Sup556 = "M4A1_SD_DZ";
Attachment_FL = "M4A1_FL_DZ";
Attachment_MFL = "M4A1_MFL_DZ";
};
};
@@ -110,6 +122,39 @@ class M4A1_FL_DZ : M4A1_DZ
};
};
class M4A1_MFL_DZ : M4A1_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_MFL_NAME;
M4A1_MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "M4A1_CCO_MFL_DZ";
Attachment_Holo = "M4A1_Holo_MFL_DZ";
Attachment_ACOG = "M4A1_ACOG_MFL_DZ";
Attachment_M203 = "M4A1_GL_MFL_DZ";
Attachment_Sup556 = "M4A1_SD_MFL_DZ";
};
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_DZ'] call player_removeAttachment";
//script is formatted by ui_selectSlot to:
//"_id = 'M4A1_MFL_DZ' ; ['Attachment_MFL',_id,'M4A1_DZ'] call player_removeAttachment;"
//REGEX
//script = "\[Attachment_([_a-zA-Z0-9]+)\,[_a-zA-Z0-9]+\,([_a-zA-Z0-9]+)\] call player_removeAttachment";
//script = "; \['Attachment_$1',_id,'$2'\] call player_removeAttachment";
};
};
};
class M4A1_SD_DZ : M4A1_AIM_SD_camo
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_sd.p3d";
@@ -117,13 +162,13 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo
displayName = $STR_DZ_WPN_M4A1_SD_NAME;
handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"};
/*
magazines[] =
/*magazines[] =
{
30Rnd_556x45_StanagSD,
30Rnd_556x45_Stanag
};
*/
};*/ //Allow use of G36 mags
class Attachments
{
Attachment_CCO = "M4A1_CCO_SD_DZ";
@@ -131,6 +176,7 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo
Attachment_ACOG = "M4A1_ACOG_SD_DZ";
Attachment_M203 = "M4A1_GL_SD_DZ";
Attachment_FL = "M4A1_SD_FL_DZ";
Attachment_MFL = "M4A1_SD_MFL_DZ";
};
class ItemActions
@@ -174,6 +220,37 @@ class M4A1_SD_FL_DZ : M4A1_SD_DZ
};
};
class M4A1_SD_MFL_DZ : M4A1_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_SD_MFL_NAME;
M4A1_MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "M4A1_CCO_SD_MFL_DZ";
Attachment_Holo = "M4A1_Holo_SD_MFL_DZ";
Attachment_ACOG = "M4A1_ACOG_SD_MFL_DZ";
Attachment_M203 = "M4A1_GL_SD_MFL_DZ";
};
class ItemActions
{
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_SD_DZ'] call player_removeAttachment";
};
};
};
//Grenade launcher
class M4A1_GL_DZ : M4A1_DZ
@@ -191,6 +268,7 @@ class M4A1_GL_DZ : M4A1_DZ
Attachment_ACOG = "M4A1_GL_ACOG_DZ";
Attachment_Sup556 = "M4A1_GL_SD_DZ";
Attachment_FL = "M4A1_GL_FL_DZ";
Attachment_MFL = "M4A1_GL_MFL_DZ";
};
class ItemActions
@@ -234,6 +312,37 @@ class M4A1_GL_FL_DZ : M4A1_GL_DZ
};
};
class M4A1_GL_MFL_DZ : M4A1_GL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_MFL_NAME;
M4A1_MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "M4A1_GL_CCO_MFL_DZ";
Attachment_Holo = "M4A1_GL_Holo_MFL_DZ";
Attachment_ACOG = "M4A1_GL_ACOG_MFL_DZ";
Attachment_Sup556 = "M4A1_GL_SD_MFL_DZ";
};
class ItemActions
{
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_DZ'] call player_removeAttachment";
};
};
};
class M4A1_GL_SD_DZ : M4A1_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_sd.p3d";
@@ -248,6 +357,7 @@ class M4A1_GL_SD_DZ : M4A1_SD_DZ
Attachment_Holo = "M4A1_GL_Holo_SD_DZ";
Attachment_ACOG = "M4A1_GL_ACOG_SD_DZ";
Attachment_FL = "M4A1_GL_SD_FL_DZ";
Attachment_MFL = "M4A1_GL_SD_MFL_DZ";
};
class ItemActions
@@ -300,6 +410,41 @@ class M4A1_GL_SD_FL_DZ : M4A1_GL_SD_DZ
};
};
class M4A1_GL_SD_MFL_DZ : M4A1_GL_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_SD_MFL_NAME;
M4A1_MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "M4A1_GL_CCO_SD_MFL_DZ";
Attachment_Holo = "M4A1_GL_Holo_SD_MFL_DZ";
Attachment_ACOG = "M4A1_GL_ACOG_SD_MFL_DZ";
};
class ItemActions
{
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_SD_DZ'] call player_removeAttachment";
};
};
};
//CCO
@@ -315,6 +460,7 @@ class M4A1_CCO_DZ : M4A1_DZ
Attachment_M203 = "M4A1_GL_CCO_DZ";
Attachment_Sup556 = "M4A1_CCO_SD_DZ";
Attachment_FL = "M4A1_CCO_FL_DZ";
Attachment_MFL = "M4A1_CCO_MFL_DZ";
};
class ItemActions
@@ -354,6 +500,33 @@ class M4A1_CCO_FL_DZ : M4A1_FL_DZ
};
};
class M4A1_CCO_MFL_DZ : M4A1_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_cco_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_cco_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_CCO_MFL_NAME;
class Attachments
{
Attachment_M203 = "M4A1_GL_CCO_MFL_DZ";
Attachment_Sup556 = "M4A1_CCO_SD_MFL_DZ";
};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'M4A1_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_CCO_DZ'] call player_removeAttachment";
};
};
};
class M4A1_CCO_SD_DZ : M4A1_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_cco_sd.p3d";
@@ -364,6 +537,7 @@ class M4A1_CCO_SD_DZ : M4A1_SD_DZ
{
Attachment_M203 = "M4A1_GL_CCO_SD_DZ";
Attachment_FL = "M4A1_CCO_SD_FL_DZ";
Attachment_MFL = "M4A1_CCO_SD_MFL_DZ";
};
class ItemActions
@@ -412,6 +586,37 @@ class M4A1_CCO_SD_FL_DZ : M4A1_SD_FL_DZ
};
};
class M4A1_CCO_SD_MFL_DZ : M4A1_SD_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_cco_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_cco_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_CCO_SD_MFL_NAME;
class Attachments
{
Attachment_M203 = "M4A1_GL_CCO_SD_MFL_DZ";
};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'M4A1_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_CCO_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_CCO_SD_DZ'] call player_removeAttachment";
};
};
};
//Grenade launcher
class M4A1_GL_CCO_DZ : M4A1_GL_DZ
@@ -424,6 +629,7 @@ class M4A1_GL_CCO_DZ : M4A1_GL_DZ
{
Attachment_Sup556 = "M4A1_GL_CCO_SD_DZ";
Attachment_FL = "M4A1_GL_CCO_FL_DZ";
Attachment_MFL = "M4A1_GL_CCO_MFL_DZ";
};
class ItemActions
@@ -472,6 +678,37 @@ class M4A1_GL_CCO_FL_DZ : M4A1_GL_FL_DZ
};
};
class M4A1_GL_CCO_MFL_DZ : M4A1_GL_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_cco_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_cco_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_CCO_MFL_NAME;
class Attachments
{
Attachment_Sup556 = "M4A1_GL_CCO_SD_MFL_DZ";
};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'M4A1_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_CCO_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_CCO_DZ'] call player_removeAttachment";
};
};
};
class M4A1_GL_CCO_SD_DZ : M4A1_GL_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_cco_sd.p3d";
@@ -481,6 +718,7 @@ class M4A1_GL_CCO_SD_DZ : M4A1_GL_SD_DZ
class Attachments
{
Attachment_FL = "M4A1_GL_CCO_SD_FL_DZ";
Attachment_MFL = "M4A1_GL_CCO_SD_MFL_DZ";
};
class ItemActions
@@ -536,6 +774,40 @@ class M4A1_GL_CCO_SD_FL_DZ : M4A1_GL_SD_FL_DZ
};
};
class M4A1_GL_CCO_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_cco_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_cco_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_CCO_SD_MFL_NAME;
class Attachments {};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'M4A1_GL_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_CCO_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_GL_CCO_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_CCO_SD_DZ'] call player_removeAttachment";
};
};
};
//Holo
@@ -551,6 +823,7 @@ class M4A1_Holo_DZ : M4A1_DZ
Attachment_M203 = "M4A1_GL_Holo_DZ";
Attachment_Sup556 = "M4A1_Holo_SD_DZ";
Attachment_FL = "M4A1_Holo_FL_DZ";
Attachment_MFL = "M4A1_Holo_MFL_DZ";
};
class ItemActions
@@ -590,6 +863,33 @@ class M4A1_Holo_FL_DZ : M4A1_FL_DZ
};
};
class M4A1_Holo_MFL_DZ : M4A1_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_holo_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_holo_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_HOLO_MFL_NAME;
class Attachments
{
Attachment_M203 = "M4A1_GL_Holo_MFL_DZ";
Attachment_Sup556 = "M4A1_Holo_SD_MFL_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'M4A1_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_Holo_DZ'] call player_removeAttachment";
};
};
};
class M4A1_Holo_SD_DZ : M4A1_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_holo_sd.p3d";
@@ -600,6 +900,7 @@ class M4A1_Holo_SD_DZ : M4A1_SD_DZ
{
Attachment_M203 = "M4A1_GL_Holo_SD_DZ";
Attachment_FL = "M4A1_Holo_SD_FL_DZ";
Attachment_MFL = "M4A1_Holo_SD_MFL_DZ";
};
class ItemActions
@@ -648,6 +949,37 @@ class M4A1_Holo_SD_FL_DZ : M4A1_SD_FL_DZ
};
};
class M4A1_Holo_SD_MFL_DZ : M4A1_SD_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_holo_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_holo_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_HOLO_SD_MFL_NAME;
class Attachments
{
Attachment_M203 = "M4A1_GL_Holo_SD_MFL_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'M4A1_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_Holo_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_Holo_SD_DZ'] call player_removeAttachment";
};
};
};
//Grenade launcher
class M4A1_GL_Holo_DZ : M4A1_GL_DZ
@@ -660,6 +992,7 @@ class M4A1_GL_Holo_DZ : M4A1_GL_DZ
{
Attachment_Sup556 = "M4A1_GL_Holo_SD_DZ";
Attachment_FL = "M4A1_GL_Holo_FL_DZ";
Attachment_MFL = "M4A1_GL_Holo_MFL_DZ";
};
class ItemActions
@@ -708,6 +1041,37 @@ class M4A1_GL_Holo_FL_DZ : M4A1_GL_FL_DZ
};
};
class M4A1_GL_Holo_MFL_DZ : M4A1_GL_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_holo_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_holo_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_HOLO_MFL_NAME;
class Attachments
{
Attachment_Sup556 = "M4A1_GL_Holo_SD_MFL_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'M4A1_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_Holo_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_Holo_DZ'] call player_removeAttachment";
};
};
};
class M4A1_GL_Holo_SD_DZ : M4A1_GL_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_holo_sd.p3d";
@@ -717,6 +1081,7 @@ class M4A1_GL_Holo_SD_DZ : M4A1_GL_SD_DZ
class Attachments
{
Attachment_FL = "M4A1_GL_Holo_SD_FL_DZ";
Attachment_MFL = "M4A1_GL_Holo_SD_MFL_DZ";
};
class ItemActions
@@ -772,6 +1137,39 @@ class M4A1_GL_Holo_SD_FL_DZ : M4A1_GL_SD_FL_DZ
};
};
class M4A1_GL_Holo_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_holo_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_holo_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_HOLO_SD_MFL_NAME;
class Attachments {};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'M4A1_GL_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_Holo_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_GL_Holo_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_Holo_SD_DZ'] call player_removeAttachment";
};
};
};
//ACOG
@@ -786,9 +1184,10 @@ class M4A1_ACOG_DZ : M4A1_DZ
class Attachments
{
Attachment_M203 = M4A1_GL_ACOG_DZ;
Attachment_Sup556 = M4A1_ACOG_SD_DZ;
Attachment_FL = M4A1_ACOG_FL_DZ;
Attachment_M203 = "M4A1_GL_ACOG_DZ";
Attachment_Sup556 = "M4A1_ACOG_SD_DZ";
Attachment_FL = "M4A1_ACOG_FL_DZ";
Attachment_MFL = "M4A1_ACOG_MFL_DZ";
};
class ItemActions
@@ -811,8 +1210,8 @@ class M4A1_ACOG_FL_DZ : M4A1_FL_DZ
class Attachments
{
Attachment_M203 = M4A1_GL_ACOG_FL_DZ;
Attachment_Sup556 = M4A1_ACOG_SD_FL_DZ;
Attachment_M203 = "M4A1_GL_ACOG_FL_DZ";
Attachment_Sup556 = "M4A1_ACOG_SD_FL_DZ";
};
class ItemActions
@@ -830,6 +1229,35 @@ class M4A1_ACOG_FL_DZ : M4A1_FL_DZ
};
};
class M4A1_ACOG_MFL_DZ : M4A1_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_acog_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_acog_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_ACOG_MFL_NAME;
M4A1_ACOG;
class Attachments
{
Attachment_M203 = "M4A1_GL_ACOG_MFL_DZ";
Attachment_Sup556 = "M4A1_ACOG_SD_MFL_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'M4A1_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_ACOG_DZ'] call player_removeAttachment";
};
};
};
class M4A1_ACOG_SD_DZ : M4A1_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_acog_sd.p3d";
@@ -840,8 +1268,9 @@ class M4A1_ACOG_SD_DZ : M4A1_SD_DZ
class Attachments
{
Attachment_M203 = M4A1_GL_ACOG_SD_DZ;
Attachment_FL = M4A1_ACOG_SD_FL_DZ;
Attachment_M203 = "M4A1_GL_ACOG_SD_DZ";
Attachment_FL = "M4A1_ACOG_SD_FL_DZ";
Attachment_MFL = "M4A1_ACOG_SD_MFL_DZ";
};
class ItemActions
@@ -869,7 +1298,7 @@ class M4A1_ACOG_SD_FL_DZ : M4A1_SD_FL_DZ
class Attachments
{
Attachment_M203 = M4A1_GL_ACOG_SD_FL_DZ;
Attachment_M203 = "M4A1_GL_ACOG_SD_FL_DZ";
};
class ItemActions
@@ -892,6 +1321,39 @@ class M4A1_ACOG_SD_FL_DZ : M4A1_SD_FL_DZ
};
};
class M4A1_ACOG_SD_MFL_DZ : M4A1_SD_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_acog_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_acog_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_ACOG_SD_MFL_NAME;
M4A1_ACOG;
class Attachments
{
Attachment_M203 = "M4A1_GL_ACOG_SD_MFL_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'M4A1_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_ACOG_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_ACOG_SD_DZ'] call player_removeAttachment";
};
};
};
//Grenade launcher
class M4A1_GL_ACOG_DZ : M4A1_GL_DZ
@@ -904,8 +1366,9 @@ class M4A1_GL_ACOG_DZ : M4A1_GL_DZ
class Attachments
{
Attachment_Sup556 = M4A1_GL_ACOG_SD_DZ;
Attachment_FL = M4A1_GL_ACOG_FL_DZ;
Attachment_Sup556 = "M4A1_GL_ACOG_SD_DZ";
Attachment_FL = "M4A1_GL_ACOG_FL_DZ";
Attachment_MFL = "M4A1_GL_ACOG_MFL_DZ";
};
class ItemActions
@@ -933,7 +1396,7 @@ class M4A1_GL_ACOG_FL_DZ : M4A1_GL_FL_DZ
class Attachments
{
Attachment_Sup556 = M4A1_GL_ACOG_SD_FL_DZ;
Attachment_Sup556 = "M4A1_GL_ACOG_SD_FL_DZ";
};
class ItemActions
@@ -956,6 +1419,39 @@ class M4A1_GL_ACOG_FL_DZ : M4A1_GL_FL_DZ
};
};
class M4A1_GL_ACOG_MFL_DZ : M4A1_GL_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_acog_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_acog_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_ACOG_MFL_NAME;
M4A1_ACOG;
class Attachments
{
Attachment_Sup556 = "M4A1_GL_ACOG_SD_MFL_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'M4A1_GL_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_ACOG_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_ACOG_DZ'] call player_removeAttachment";
};
};
};
class M4A1_GL_ACOG_SD_DZ : M4A1_GL_SD_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_acog_sd.p3d";
@@ -966,7 +1462,8 @@ class M4A1_GL_ACOG_SD_DZ : M4A1_GL_SD_DZ
class Attachments
{
Attachment_FL = M4A1_GL_ACOG_SD_FL_DZ;
Attachment_FL = "M4A1_GL_ACOG_SD_FL_DZ";
Attachment_MFL = "M4A1_GL_ACOG_SD_MFL_DZ";
};
class ItemActions
@@ -1024,6 +1521,42 @@ class M4A1_GL_ACOG_SD_FL_DZ : M4A1_GL_SD_FL_DZ
};
};
class M4A1_GL_ACOG_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ
{
model = "z\addons\dayz_communityweapons\m4a1\m4a1_gl_acog_sd_fl.p3d";
picture = "\z\addons\dayz_communityweapons\m4a1\data\w_m4a1_gl_acog_sd_fl_ca.paa";
displayName = $STR_DZ_WPN_M4A1_GL_ACOG_SD_MFL_NAME;
M4A1_ACOG;
class Attachments {};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'M4A1_GL_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveGL
{
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'M4A1_ACOG_SD_MFL_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup556',_id,'M4A1_GL_ACOG_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'M4A1_GL_ACOG_SD_DZ'] call player_removeAttachment";
};
};
};
#undef M4A1_FLASHLIGHT
#undef M4A1_MFLASHLIGHT
#undef M4A1_M203
#undef M4A1_ACOG
#undef M4A1_ACOG

136
SQF/dayz_code/Configs/CfgWeapons/Rifles/Mosin.hpp
View File

@@ -9,6 +9,17 @@
brightness = 0.1;\
};
#define MOSIN_MFLASHLIGHT class FlashLight\
{\
color[] = {0.9, 0.0, 0.0, 0.9};\
ambient[] = {0.1, 0.0, 0.0, 1.0};\
position = "fl_start";\
direction = "fl_dir";\
angle = 40;\
scale[] = {1, 1, 0.5};\
brightness = 0.08;\
};
#define MOSIN_BELT magazineReloadTime = 4.7;
#define MOSIN_BROKEN magazines[] = {};
@@ -57,6 +68,7 @@ class Mosin_DZ : Mosin_Base
{
Attachment_SCOPED = "Mosin_PU_DZ";
Attachment_FL = "Mosin_FL_DZ";
Attachment_MFL = "Mosin_MFL_DZ";
Attachment_BELT = "Mosin_Belt_DZ";
};
};
@@ -91,6 +103,31 @@ class Mosin_FL_DZ : Mosin_DZ
};
};
class Mosin_MFL_DZ : Mosin_DZ
{
model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_FL_animated";
picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891_FL.paa";
displayName = $STR_DZ_WPN_MOSIN_MFL_NAME;
descriptionShort = $STR_DZ_WPN_MOSIN_DESC;
MOSIN_MFLASHLIGHT
class Attachments
{
Attachment_SCOPED = "Mosin_PU_MFL_DZ";
Attachment_BELT = "Mosin_Belt_MFL_DZ";
};
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Mosin_DZ'] call player_removeAttachment";
};
};
};
class Mosin_Belt_DZ : Mosin_DZ
{
model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_belt_animated";
@@ -104,6 +141,7 @@ class Mosin_Belt_DZ : Mosin_DZ
{
Attachment_SCOPED = "Mosin_PU_Belt_DZ";
Attachment_FL = "Mosin_Belt_FL_DZ";
Attachment_MFL = "Mosin_Belt_MFL_DZ";
};
class ItemActions
@@ -146,6 +184,36 @@ class Mosin_Belt_FL_DZ : Mosin_FL_DZ
};
};
class Mosin_Belt_MFL_DZ : Mosin_MFL_DZ
{
model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_belt_FL_animated";
picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891B_FL.paa";
displayName = $STR_DZ_WPN_MOSIN_BELT_MFL_NAME;
descriptionShort = $STR_DZ_WPN_MOSIN_DESC;
MOSIN_BELT
class Attachments
{
Attachment_SCOPED = "Mosin_PU_Belt_MFL_DZ";
};
class ItemActions
{
class RemoveBelt
{
text = $STR_DZ_ATT_BELT_RMVE;
script = "; ['Attachment_BELT',_id,'Mosin_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Mosin_Belt_DZ'] call player_removeAttachment";
};
};
};
/* PU Scope */
@@ -171,6 +239,7 @@ class Mosin_PU_DZ : Mosin_Base
class Attachments
{
Attachment_FL = "Mosin_PU_FL_DZ";
Attachment_MFL = "Mosin_PU_MFL_DZ";
Attachment_BELT = "Mosin_PU_Belt_DZ";
};
@@ -214,6 +283,36 @@ class Mosin_PU_FL_DZ : Mosin_PU_DZ
};
};
class Mosin_PU_MFL_DZ : Mosin_PU_DZ
{
model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_scoped_FL_animated";
picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891S_FL.paa";
displayName = $STR_DZ_WPN_MOSIN_PU_MFL_NAME;
descriptionShort = $STR_DZ_WPN_MOSIN_DESC;
MOSIN_MFLASHLIGHT
class Attachments
{
Attachment_BELT = "Mosin_PU_Belt_MFL_DZ";
};
class ItemActions
{
class RemoveScope
{
text = $STR_DZ_ATT_PU_RMVE;
script = "; ['Attachment_SCOPED',_id,'Mosin_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Mosin_PU_DZ'] call player_removeAttachment";
};
};
};
class Mosin_PU_Belt_DZ : Mosin_PU_DZ
{
model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_belt_scoped_animated";
@@ -226,6 +325,7 @@ class Mosin_PU_Belt_DZ : Mosin_PU_DZ
class Attachments
{
Attachment_FL = "Mosin_PU_Belt_FL_DZ";
Attachment_MFL = "Mosin_PU_Belt_MFL_DZ";
};
class ItemActions
@@ -277,5 +377,39 @@ class Mosin_PU_Belt_FL_DZ : Mosin_PU_FL_DZ
};
};
class Mosin_PU_Belt_MFL_DZ : Mosin_PU_MFL_DZ
{
model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_belt_scoped_FL_animated";
picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891SB_FL.paa";
displayName = $STR_DZ_WPN_MOSIN_PU_BELT_MFL_NAME;
descriptionShort = $STR_DZ_WPN_MOSIN_DESC;
MOSIN_BELT
class Attachments {};
class ItemActions
{
class RemoveScope
{
text = $STR_DZ_ATT_PU_RMVE;
script = "; ['Attachment_SCOPED',_id,'Mosin_Belt_MFL_DZ'] call player_removeAttachment";
};
class RemoveBelt
{
text = $STR_DZ_ATT_BELT_RMVE;
script = "; ['Attachment_BELT',_id,'Mosin_PU_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Mosin_PU_Belt_DZ'] call player_removeAttachment";
};
};
};
#undef MOSIN_FLASHLIGHT
#undef MOSIN_BELT
#undef MOSIN_MFLASHLIGHT
#undef MOSIN_BELT

32
SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
View File

@@ -9,6 +9,17 @@
brightness = 0.1;\
}
#define R870_MFLASHLIGHT class FlashLight\
{\
color[] = {0.9, 0.0, 0.0, 0.9};\
ambient[] = {0.1, 0.0, 0.0, 1.0};\
position = "flash dir";\
direction = "flash";\
angle = 30;\
scale[] = {1, 1, 0.5};\
brightness = 0.08;\
}
class Remington870_DZ : Rifle
{
scope = public;
@@ -49,6 +60,7 @@ class Remington870_DZ : Rifle
class Attachments
{
Attachment_FL = "Remington870_FL_DZ";
Attachment_MFL = "Remington870_MFL_DZ";
};
};
@@ -68,4 +80,22 @@ class Remington870_FL_DZ : Remington870_DZ
script = "; ['Attachment_FL',_id,'Remington870_DZ'] call player_removeAttachment";
};
};
};
};
class Remington870_MFL_DZ : Remington870_DZ
{
model = "\dayz_weapons\models\Remington870_lamp.p3d";
displayname = $STR_DZ_WPN_R870_MFL_NAME;
descriptionShort = $STR_DZ_WPN_R870_FL_DESC;
R870_MFLASHLIGHT;
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'Remington870_DZ'] call player_removeAttachment";
};
};
};

139
SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp
View File

@@ -9,6 +9,17 @@
brightness = 0.1;\
}
#define MFLASHLIGHT class FlashLight\
{\
color[] = {0.9, 0.0, 0.0, 0.9};\
ambient[] = {0.1, 0.0, 0.0, 1.0};\
position = "flash dir";\
direction = "flash";\
angle = 30;\
scale[] = {1, 1, 0.5};\
brightness = 0.08;\
}
class SA58_DZ : Sa58V_EP1
{
model = "z\addons\dayz_communityweapons\sa58\sa58.p3d";
@@ -24,7 +35,7 @@ class SA58_DZ : Sa58V_EP1
class Attachments
{
Attachment_SA58RIS = SA58_RIS_DZ;
Attachment_SA58RIS = "SA58_RIS_DZ";
};
};
@@ -36,10 +47,11 @@ class SA58_RIS_DZ : SA58_DZ
class Attachments
{
Attachment_CCO = SA58_CCO_DZ;
Attachment_Holo = SA58_Holo_DZ;
Attachment_ACOG = SA58_ACOG_DZ;
Attachment_FL = SA58_RIS_FL_DZ;
Attachment_CCO = "SA58_CCO_DZ";
Attachment_Holo = "SA58_Holo_DZ";
Attachment_ACOG = "SA58_ACOG_DZ";
Attachment_FL = "SA58_RIS_FL_DZ";
Attachment_MFL = "SA58_RIS_MFL_DZ";
};
};
@@ -53,9 +65,9 @@ class SA58_RIS_FL_DZ : SA58_RIS_DZ
class Attachments
{
Attachment_CCO = SA58_CCO_FL_DZ;
Attachment_Holo = SA58_Holo_FL_DZ;
Attachment_ACOG = SA58_ACOG_FL_DZ;
Attachment_CCO = "SA58_CCO_FL_DZ";
Attachment_Holo = "SA58_Holo_FL_DZ";
Attachment_ACOG = "SA58_ACOG_FL_DZ";
};
class ItemActions
@@ -68,6 +80,31 @@ class SA58_RIS_FL_DZ : SA58_RIS_DZ
};
};
class SA58_RIS_MFL_DZ : SA58_RIS_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_ris_fl.p3d";
picture = "\z\addons\dayz_communityweapons\sa58\data\w_sa58_ris_fl_ca.paa";
displayName = $STR_DZ_WPN_SA58_RIS_MFL_NAME;
MFLASHLIGHT;
class Attachments
{
Attachment_CCO = "SA58_CCO_MFL_DZ";
Attachment_Holo = "SA58_Holo_MFL_DZ";
Attachment_ACOG = "SA58_ACOG_MFL_DZ";
};
class ItemActions
{
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'SA58_RIS_DZ'] call player_removeAttachment";
};
};
};
class SA58_CCO_DZ : SA58_RIS_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_cco.p3d";
@@ -82,7 +119,8 @@ class SA58_CCO_DZ : SA58_RIS_DZ
class Attachments
{
Attachment_FL = SA58_CCO_FL_DZ;
Attachment_FL = "SA58_CCO_FL_DZ";
Attachment_MFL = "SA58_CCO_MFL_DZ";
};
class ItemActions
@@ -120,6 +158,31 @@ class SA58_CCO_FL_DZ : SA58_CCO_DZ
};
};
class SA58_CCO_MFL_DZ : SA58_CCO_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_cco_fl.p3d";
picture = "\z\addons\dayz_communityweapons\sa58\data\w_sa58_cco_fl_ca.paa";
displayName = $STR_DZ_WPN_SA58_CCO_MFL_NAME;
MFLASHLIGHT;
class Attachments {};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'SA58_RIS_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'SA58_CCO_DZ'] call player_removeAttachment";
};
};
};
class SA58_Holo_DZ : SA58_CCO_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_holo.p3d";
@@ -128,7 +191,8 @@ class SA58_Holo_DZ : SA58_CCO_DZ
class Attachments
{
Attachment_FL = SA58_Holo_FL_DZ;
Attachment_FL = "SA58_Holo_FL_DZ";
Attachment_MFL = "SA58_Holo_MFL_DZ";
};
class ItemActions
@@ -166,6 +230,31 @@ class SA58_Holo_FL_DZ : SA58_Holo_DZ
};
};
class SA58_Holo_MFL_DZ : SA58_Holo_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_holo_fl.p3d";
picture = "\z\addons\dayz_communityweapons\sa58\data\w_sa58_holo_fl_ca.paa";
displayName = $STR_DZ_WPN_SA58_HOLO_MFL_NAME;
MFLASHLIGHT;
class Attachments {};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SA58_RIS_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'SA58_Holo_DZ'] call player_removeAttachment";
};
};
};
class SA58_ACOG_DZ : SA58_CCO_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_acog.p3d";
@@ -213,7 +302,8 @@ class SA58_ACOG_DZ : SA58_CCO_DZ
class Attachments
{
Attachment_FL = SA58_ACOG_FL_DZ;
Attachment_FL = "SA58_ACOG_FL_DZ";
Attachment_MFL = "SA58_ACOG_MFL_DZ";
};
class ItemActions
@@ -249,4 +339,29 @@ class SA58_ACOG_FL_DZ : SA58_ACOG_DZ
script = "; ['Attachment_FL',_id,'SA58_ACOG_DZ'] call player_removeAttachment";
};
};
};
};
class SA58_ACOG_MFL_DZ : SA58_ACOG_DZ
{
model = "z\addons\dayz_communityweapons\sa58\sa58_acog_fl.p3d";
picture = "\z\addons\dayz_communityweapons\sa58\data\w_sa58_acog_fl_ca.paa";
displayName = $STR_DZ_WPN_SA58_ACOG_MFL_NAME;
MFLASHLIGHT;
class Attachments {};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SA58_RIS_MFL_DZ'] call player_removeAttachment";
};
class RemoveFlashlight
{
text = $STR_DZ_ATT_FL_RFL_RMVE;
script = "; ['Attachment_MFL',_id,'SA58_ACOG_DZ'] call player_removeAttachment";
};
};
};

1
SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp
View File

@@ -61,6 +61,7 @@ class ItemKnifeBlunt : ItemKnife_Base
{
scope = public;
descriptionShort = $STR_EQUIP_CODE_DESC_4;
sharpnessRemaining = "ItemKnifeBlunt";
class ItemActions
{
class FixKnife

53
SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
View File

@@ -17,21 +17,16 @@ class ItemMatchboxEmpty : ItemMatchbox_base
//Loot Spawn Table.
class ItemMatchbox : ItemMatchbox_base
{
scope = public;
class Ignators
{
chance = 0.12;
matches = -1;
qtyRemaining = "Item5Matchbox";
};
scope = public;
matches = -1;
qtyRemaining = "Item5Matchbox";
class ItemActions
{
class Use
{
text = $STR_ACTIONS_MAKEFIRE;
script = "spawn player_makeFire;";
script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet
use[] = {"PartWoodPile"};
};
};
@@ -41,50 +36,30 @@ class ItemMatchbox : ItemMatchbox_base
class Item5Matchbox : ItemMatchbox
{
descriptionShort = $STR_EQUIP_DESC_3_A;
class Ignators
{
matches = 5;
qtyRemaining = "Item4Matchbox";
};
matches = 5;
qtyRemaining = "Item4Matchbox";
};
class Item4Matchbox : ItemMatchbox
{
descriptionShort = $STR_EQUIP_DESC_3_B;
class Ignators
{
qtyRemaining = "Item3Matchbox";
matches = 4;
};
qtyRemaining = "Item3Matchbox";
matches = 4;
};
class Item3Matchbox : ItemMatchbox
{
descriptionShort = $STR_EQUIP_DESC_3_C;
class Ignators
{
qtyRemaining = "Item2Matchbox";
matches = 3;
};
qtyRemaining = "Item2Matchbox";
matches = 3;
};
class Item2Matchbox : ItemMatchbox
{
descriptionShort = $STR_EQUIP_DESC_3_D;
class Ignators
{
qtyRemaining = "Item1Matchbox";
matches = 2;
};
qtyRemaining = "Item1Matchbox";
matches = 2;
};
class Item1Matchbox : ItemMatchbox
{
descriptionShort = $STR_EQUIP_DESC_3_E;
class Ignators
{
qtyRemaining = "ItemMatchboxEmpty";
matches = 1;
};
qtyRemaining = "ItemMatchboxEmpty";
matches = 1;
};

7
SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp Normal file
View File

@@ -0,0 +1,7 @@
class NVGoggles;
class NVGoggles_DZE: NVGoggles
{
displayName = "NVG (Full Screen)";
modelOptics = "";
descriptionShort = "Full Screen Night Vision Goggles";
};

6
SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M4SPR.hpp Normal file
View File

@@ -0,0 +1,6 @@
class M4SPR;
class M4SPR_DZE: M4SPR
{
//Moved 30Rnd Stanag to first in array
magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_StanagSD", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "30Rnd_556x45_G36SD"};
};

5
SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/VSSVintorez.hpp Normal file
View File

@@ -0,0 +1,5 @@
class VSS_vintorez;
class VSS_vintorez_DZE: VSS_vintorez
{
magazines[] = {"20Rnd_9x39_SP5_VSS", "10Rnd_9x39_SP5_VSS"};
};

7
SQF/dayz_code/Configs/RadioProtocol.hpp
View File

@@ -1,5 +1,5 @@
//Disable automatic group chat spam "CEASE FIRE", "READY", "REGROUP", "UNKNOWN 12'OCLOCK", etc.
class RadioProtocolEmpty {
//Disables automatic group chat spam "CEASE FIRE", "READY", "REGROUP", "UNKNOWN 12'OCLOCK", etc. but breaks some AI behavior (like driving land vehicles)
/*class RadioProtocolEmpty {
class Words {};
class Arguments {};
class Default {priority = -1; timeout = -1;};
@@ -249,4 +249,5 @@ class RadioProtocol_WMN_EP1_TK: RadioProtocolEmpty {};
class RadioProtocolEN: RadioProtocolEmpty {};
class RadioProtocolRU: RadioProtocolEmpty {};
class RadioProtocolCZ: RadioProtocolEmpty {};
class RadioProtocol_BAF: RadioProtocolEmpty {};
class RadioProtocol_BAF: RadioProtocolEmpty {};
*/

24
SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp
View File

@@ -52,9 +52,9 @@ class DZ_GroupButton: RscButton {
text = "";
type = 16;
action = "";
x = .317;
w = .058 * safeZoneW;
h = .05 * safeZoneH;
x = .314;
w = .16;
h = .1;
color[] = {0.95, 0.95, 0.95, 1.0};
color2[] = {0.95, 0.95, 0.95, 1};
colorDisabled[] = {1, 1, 1, 0.25};
@@ -87,7 +87,7 @@ class DZ_GroupButton: RscButton {
};
class TextPos {
left = .002;
top = .0181 * safeZoneH;
top = .0325;
right = .002;
bottom = .005;
};
@@ -119,7 +119,7 @@ class DZ_GroupDialog {
colorBackground[] = {};
colorText[] = {};
text = "\z\addons\dayz_code\gui\grey\ui_background_controls_ca.paa";
moving = 1;
moving = 0;
x = .0;
y = .1;
w = 1.0;
@@ -179,7 +179,7 @@ class DZ_GroupDialog {
text = $STR_UI_CLOSE;
onButtonClick = "findDisplay 80000 closeDisplay 2;";
x = .03;
y = .6525;
y = .65;
};
class Invite: DZ_GroupButton {
idc = 3;
@@ -193,18 +193,18 @@ class DZ_GroupDialog {
onButtonClick = "(_this select 0) ctrlShow false; call dayz_kickFromGroup;";
y = .239;
};
class Disband: DZ_GroupButton {
idc = 5;
text = $STR_EPOCH_DISBAND;
onButtonClick = "(_this select 0) ctrlShow false; call dayz_disbandGroup;";
y = .349;
};
class Promote: DZ_GroupButton {
idc = 10;
text = $STR_EPOCH_PROMOTE;
onButtonClick = "(_this select 0) ctrlShow false; call dayz_promotePlayer;";
y = .294;
};
class Disband: DZ_GroupButton {
idc = 5;
text = $STR_EPOCH_DISBAND;
onButtonClick = "(_this select 0) ctrlShow false; call dayz_disbandGroup;";
y = .349;
};
class Leave: DZ_GroupButton {
idc = 6;
text = $STR_EPOCH_LEAVE;

109
SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp
View File

@@ -99,47 +99,9 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
y = "(02/100) * SafeZoneH + SafeZoneY";
w = "(96/100) * SafeZoneW";
h = "(06/100) * SafeZoneH";
colorBackground[] = {0.1, 0.1, 0.1, 0.68};
colorBackground[] = {49/255, 36/255, 25/255, 173/255};
text = $STR_UI_LOBBY;
};
class TextMission : RscText {
idc = 1002;
x = "(02/100) * SafeZoneW + SafeZoneX";
y = "(9.5/100) * SafeZoneH + SafeZoneY";
w = "(18/100) * SafeZoneW";
h = "(3/100) * SafeZoneH";
SizeEx = 0.03;
text = $STR_DISP_SRVSETUP_NAME;
colorText[] = {0.95, 0.95, 0.95, 1};
};
class ValueMission : RscText {
idc = 101;
x = "(20/100) * SafeZoneW + SafeZoneX";
y = "(9.5/100) * SafeZoneH + SafeZoneY";
w = "(40/100) * SafeZoneW";
h = "(3/100) * SafeZoneH";
SizeEx = 0.03;
colorText[] = {0.95, 0.95, 0.95, 1};
};
class CA_TextDescription : RscText {
idc = 1004;
x = "(02/100) * SafeZoneW + SafeZoneX";
y = "(12.5/100) * SafeZoneH + SafeZoneY";
w = "(18/100) * SafeZoneW";
h = "(3/100) * SafeZoneH";
SizeEx = 0.03;
text = $STR_DISP_SRVSETUP_DESC;
colorText[] = {0.95, 0.95, 0.95, 1};
};
class CA_ValueDescription : RscText {
idc = 103;
x = "(20/100) * SafeZoneW + SafeZoneX";
y = "(12.5/100) * SafeZoneH + SafeZoneY";
w = "(78/100) * SafeZoneW";
h = "(3/100) * SafeZoneH";
SizeEx = 0.03;
colorText[] = {0.95, 0.95, 0.95, 1};
};
class TextIsland: RscText
{
idc = 1003;
@@ -199,61 +161,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
text = $STR_MP_PLAYERS;
x = "(2/100) * SafeZoneW + SafeZoneX"; // to left
w = "(96/100) * SafeZoneW"; // wide
colorText[] = {0.95, 0.95, 0.95, 1};
class ScrollBar {
color[] = {1, 1, 1, 0.6};
colorActive[] = {0.5, 0.5, 0.5, 1};
colorDisabled[] = {1, 1, 1, 0.3};
thumb = "\z\addons\dayz_code\gui\grey\igui_scrollbar_thumb_ca.paa";
arrowFull = "\z\addons\dayz_code\gui\grey\igui_arrow_top_active_ca.paa";
arrowEmpty = "\z\addons\dayz_code\gui\grey\igui_arrow_top_ca.paa";
border = "\z\addons\dayz_code\gui\grey\igui_border_scroll_ca.paa";
};
};
class CA_B_Lock : RscShortcutButton {
idc = 118;
x = "(39/100) * SafeZoneW + SafeZoneX";
y = "(93/100) * SafeZoneH + SafeZoneY";
w = 0.183825;
color[] = {0.95, 0.95, 0.95, 1.0};
animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa";
animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa";
animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa";
animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa";
animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa";
animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa";
};
class CA_B_DSinterface : RscShortcutButton {
idc = 1012;
default = 0;
onButtonClick = "openDSInterface;";
shortcuts[] = {};
x = "(2.75/100) * SafeZoneW + SafeZoneX";
y = "(93/100) * SafeZoneH + SafeZoneY";
w = 0.26;
text = $STR_DISP_SERVER_CONTROL;
color[] = {0.95, 0.95, 0.95, 1.0};
animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa";
animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa";
animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa";
animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa";
animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa";
animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa";
};
class CA_B_Kick : RscShortcutButton {
idc = 116;
default = 0;
shortcuts[] = {0x00050000 + 2};
x = "(83/100) * SafeZoneW + SafeZoneX";
y = "(14/100) * SafeZoneH + SafeZoneY";
text = $STR_DISP_MP_KICKOFF;
color[] = {0.95, 0.95, 0.95, 1.0};
animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa";
animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa";
animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa";
animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa";
animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa";
animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa";
};
class CA_ButtonContinue : RscShortcutButton {
idc = 1;
@@ -263,13 +170,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
y = "(93/100) * SafeZoneH + SafeZoneY";
text = $STR_DISP_OK;
onButtonClick = "((findDisplay 70) displayCtrl 300) ctrlShow false;";
color[] = {0.95, 0.95, 0.95, 1.0};
animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa";
animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa";
animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa";
animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa";
animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa";
animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa";
};
class CA_ButtonCancel : RscShortcutButton {
idc = 2;
@@ -280,13 +180,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
w = 0.203825;
text = $STR_DISP_BACK;
onButtonClick = "with uiNameSpace do {RscDMSLoad=nil;};"; // autologon at logon on next server
color[] = {0.95, 0.95, 0.95, 1.0};
animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa";
animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa";
animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa";
animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa";
animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa";
animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa";
};
class Y_GamerCard: RscActiveText
{

8
SQF/dayz_code/Configs/RscDisplay/RscMap.hpp
View File

@@ -27,8 +27,6 @@ class RscDisplayMainMap
h = "0.832";
colorBackground[] = {0.30,0.30,0.30,0.85};
};
class DiaryList: RscIGUIListBox
{
idc = 1001;
@@ -42,4 +40,10 @@ class RscDisplayMainMap
h = "0";
};
};
};
class RscDisplayInsertMarker
{
idd = 54;
onUnload = "if (!isNil 'player_markMap') then {(_this select 0) call player_markMap;};";
};

8
SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
View File

@@ -640,24 +640,24 @@ class RscTitles
colorText[] = {0,0,0,1};
colorBackground[] = {0,0,0,0};
sizeEx = 14 * GUI_GRID_H;
shadow = 0;
shadow = 1;
class Attributes
{
color = "#FFFFFF";
shadow = 0;
shadow = 1;
valign = "top";
align = "center";
};
};
};
};
class DZ_GroupIcons
class DZ_GroupTags
{
idd = -1;
movingEnable = 1;
enableSimulation = 1;
enableDisplay = 1;
onLoad = "uiNamespace setVariable ['DZ_GroupIcons',_this select 0];";
onLoad = "uiNamespace setVariable ['DZ_GroupTags',_this select 0];";
duration = 99999999999999999;
fadein = 0;
fadeout = 0;

4
SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
View File

@@ -76,7 +76,7 @@ class AdvancedTrading
class ZSC_RscButtonMenu_Z3: AT_Zupa_BlueButton
{
idc = -1;
text = $STR_EPOCH_TRADE_VEHICLE;
text = $STR_DN_VEHICLE;
x = 0.41 * safezoneW + safezoneX;
y = 0.26 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
@@ -417,7 +417,7 @@ class AdvancedTrading
class RscText_AT18: ZSC_RscText
{
idc = 7410;
text = $STR_EPOCH_TRADE_NOTHING;
text = $STR_EVAL_TYPENOTHING;
x = 0.46 * safezoneW + safezoneX;
y = 0.72 * safezoneH + safezoneY;
w = 0.13 * safezoneW;

77
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -339,81 +339,6 @@ class RscDisplayDiary {
delete DiaryBackground;
delete CA_PlayerName;
delete CA_CurrentTaskLabel;
class CA_MainBackground : IGUIBack {
idc = 1020;
x = "SafeZoneX + 0.010 * SafeZoneW";
y = "SafeZoneY + 0.031";
w = "0.98*SafeZoneW";
h = 0.082;
colorbackground[] = {0.1, 0.1, 0.1, 0.85};
};
class CA_TopicsBackground : IGUIBack {
idc = 1021;
x = "0.010*SafeZoneW + SafeZoneX";
y = "SafeZoneY + 0.117";
w = "0.146*SafeZoneW";
h = 0.53;
colorbackground[] = {0.1, 0.1, 0.1, 0.85};
};
class CA_SubTopicsBackground : IGUIBack {
idc = 1022;
x = "0.16*SafeZoneW + SafeZoneX";
y = "SafeZoneY + 0.117";
w = "0.283*SafeZoneW";
h = 0.53;
colorbackground[] = {0.1, 0.1, 0.1, 0.85};
};
class CA_ContentBackground : IGUIBack {
idc = 1023;
x = "0.446*SafeZoneW + SafeZoneX";
y = "SafeZoneY + 0.117";
w = "SafeZoneW * 0.544";
h = 0.832;
colorbackground[] = {0.1, 0.1, 0.1, 0.85};
};
class DiaryList : RscIGUIListBox {
idc = 1001;
onLBSelChanged = "[_this select 0, _this select 1, 'List'] call compile preprocessFileLineNumbers 'ca\Warfare2\Scripts\Client\GUI\GUI_logEH.sqf'; private ['_dummy']; _dummy = [_this,'onLBSelChanged'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf';";
default = 1;
x = "0.010*SafeZoneW + SafeZoneX";
y = "SafeZoneY + 0.137";
w = "0.146*SafeZoneW";
h = 0.6;
colorText[] = {0.95, 0.95, 0.95, 1};
colorSelectBackground[] = {0, 0, 0, 1.0};
colorSelectBackground2[] = {0, 0, 0, 0.8};
class ScrollBar {
color[] = {1, 1, 1, 0.6};
colorActive[] = {0.5, 0.5, 0.5, 1};
colorDisabled[] = {1, 1, 1, 0.3};
thumb = "\z\addons\dayz_code\gui\grey\igui_scrollbar_thumb_ca.paa";
arrowFull = "\z\addons\dayz_code\gui\grey\igui_arrow_top_active_ca.paa";
arrowEmpty = "\z\addons\dayz_code\gui\grey\igui_arrow_top_ca.paa";
border = "\z\addons\dayz_code\gui\grey\igui_border_scroll_ca.paa";
};
};
class CA_DiaryIndex : RscIGUIListBox {
idc = 1002;
onLBSelChanged = "[_this select 0, _this select 1, 'Index'] call compile preprocessFileLineNumbers 'ca\Warfare2\Scripts\Client\GUI\GUI_logEH.sqf';";
default = 0;
x = "0.16*SafeZoneW + SafeZoneX";
y = "SafeZoneY + 0.137";
w = "0.283*SafeZoneW";
h = 0.6;
sizeEx = 0.034;
colorText[] = {0.95, 0.95, 0.95, 1};
colorSelectBackground[] = {0, 0, 0, 1.0};
colorSelectBackground2[] = {0, 0, 0, 0.8};
class ScrollBar {
color[] = {1, 1, 1, 0.6};
colorActive[] = {0.5, 0.5, 0.5, 1};
colorDisabled[] = {1, 1, 1, 0.3};
thumb = "\z\addons\dayz_code\gui\grey\igui_scrollbar_thumb_ca.paa";
arrowFull = "\z\addons\dayz_code\gui\grey\igui_arrow_top_active_ca.paa";
arrowEmpty = "\z\addons\dayz_code\gui\grey\igui_arrow_top_ca.paa";
border = "\z\addons\dayz_code\gui\grey\igui_border_scroll_ca.paa";
};
};
};
};
@@ -507,7 +432,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
class CA_B_Respawn : CA_B_SAVE {
idc = 1010;
//onButtonClick = "hint str (_this select 0);";
onButtonClick = "if ((alive player) && (r_fracture_legs or {player isKindOf 'PZombie_VB'})) then { player SetDamage 1;};";
onButtonClick = "if ((alive player) && (r_fracture_legs or {player isKindOf 'PZombie_VB'})) then { [player,'suicide'] call player_death; };";
y = 0.2537 + 0.101903 * 2;
text = $STR_DISP_INT_RESPAWN;
default = 0;

2
SQF/dayz_code/actions/AdvancedTrading/defaultInit.sqf
View File

@@ -35,5 +35,5 @@ Z_canAfford = CPP PATH(z_at_canAfford.sqf);
Z_calcFreeSpace = CPP PATH(z_at_calcFreeSpace.sqf);
Z_returnChange = CPP PATH(z_at_returnChange.sqf);
Z_payDefault = CPP PATH(z_at_payDefault.sqf);
z_calcDefaultCurrencyNoImg = CPP PATH(z_at_calcDefaultCurrencyNoImg.sqf);
z_calcCurrency = CPP PATH(z_at_calcCurrency.sqf);
ZUPA_fnc_removeWeaponsAndMagazinesCargo = CPP PATH(zupa_fnc_removeWeaponsAndMagazinesCargo.sqf);

6
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf
View File

@@ -103,7 +103,7 @@ _enoughMoney = false;
_moneyInfo = [false, [], [], [], 0];
if (Z_SingleCurrency) then {
_enoughMoney = if (_wealth >= _priceToBuy) then { true } else { false };
_enoughMoney = (_wealth >= _priceToBuy);
} else {
_moneyInfo = _priceToBuy call Z_canAfford;
_enoughMoney = _moneyInfo select 0;
@@ -212,7 +212,7 @@ if (_enoughMoney) then {
if (_x select 1 == "trade_weapons") then {
_count = 0;
while {_count < (_x select 9)} do {
_hasPrimary = if (primaryWeapon player != "") then {true} else {false};
_hasPrimary = (primaryWeapon player != "");
if (_hasPrimary && getNumber (configFile >> "CfgWeapons" >> (_x select 0) >> "type") == 1) then {
dayz_onBack = _x select 0; //Add to back
} else {
@@ -254,7 +254,7 @@ if (_enoughMoney) then {
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_COINS",[_priceToBuy] call BIS_fnc_numberText,CurrencyName];
} else {
_tCost = "";
_tCost = _priceToBuy call z_calcDefaultCurrencyNoImg;
_tCost = [_priceToBuy,true] call z_calcCurrency;
if (_tCost != "") then { systemChat format[localize "STR_EPOCH_TRADE_BUY_SUCCESS",_tCost]; };
};
} else {

169
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcCurrency.sqf Normal file
View File

@@ -0,0 +1,169 @@
private ["_GemTotal","_GemTotal2","_ItemAmethyst","_ItemCitrine","_ItemEmerald","_ItemObsidian","_ItemRuby","_ItemSapphire","_ItemTopaz","_array","_briefcase_100oz","_fontSize","_gem","_gold_10oz","_gold_10oz_a","_gold_10oz_b","_gold_1oz","_gold_1oz_a","_gold_1oz_b","_noIMG","_pic","_silver_10oz","_silver_10oz_a","_silver_10oz_b","_silver_1oz","_silver_1oz_a","_silver_1oz_b","_string","_total","_value","_localize"];
_total = _this select 0;
_noIMG = _this select 1;
_fontSize = if (count _this > 2) then {_this select 2} else {1};
_localize = count _this < 4; //Do not localize for server RPT log
_array = [];
_string = "";
_ItemTopaz = 0;
_ItemObsidian = 0;
_ItemSapphire = 0;
_ItemAmethyst = 0;
_ItemEmerald = 0;
_ItemCitrine = 0;
_ItemRuby = 0;
_GemTotal = 0;
_GemTotal2 = _total;
{
_gem = _x;
_value = DZE_GemWorthList select _forEachIndex;
switch(_gem) do {
case 'ItemTopaz': {
_ItemTopaz = floor(_GemTotal2 / _value);
if (_ItemTopaz >= 1) then {
_GemTotal = (_value * _ItemTopaz) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemObsidian': {
_ItemObsidian = floor(_GemTotal2 / _value);
if (_ItemObsidian >= 1) then {
_GemTotal = (_value * _ItemObsidian) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemSapphire': {
_ItemSapphire = floor(_GemTotal2 / _value);
if (_ItemSapphire >= 1) then {
_GemTotal = (_value * _ItemSapphire) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemAmethyst': {
_ItemAmethyst = floor(_GemTotal2 / _value);
if (_ItemAmethyst >= 1) then {
_GemTotal = (_value * _ItemAmethyst) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemEmerald': {
_ItemEmerald = floor(_GemTotal2 / _value);
if (_ItemEmerald >= 1) then {
_GemTotal = (_value * _ItemEmerald) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemCitrine': {
_ItemCitrine = floor(_GemTotal2 / _value);
if (_ItemCitrine >= 1) then {
_GemTotal = (_value * _ItemCitrine) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemRuby': {
_ItemRuby = floor(_GemTotal2 / _value);
if (_ItemRuby >= 1) then {
_GemTotal = (_value * _ItemRuby) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
};
} forEach DZE_GemList;
_total = _GemTotal2;
_briefcase_100oz = floor(_total / 10000);
_gold_10oz_a = floor(_total / 1000);
_gold_10oz_b = _briefcase_100oz * 10;
_gold_10oz = (_gold_10oz_a - _gold_10oz_b);
_gold_1oz_a = floor(_total / 100);
_gold_1oz_b = _gold_10oz_a * 10;
_gold_1oz = (_gold_1oz_a - _gold_1oz_b);
_silver_10oz_a = floor(_total / 10);
_silver_10oz_b = _gold_1oz_a * 10;
_silver_10oz = (_silver_10oz_a - _silver_10oz_b);
_silver_1oz_a = floor(_total);
_silver_1oz_b = _silver_10oz_a * 10;
_silver_1oz = (_silver_1oz_a - _silver_1oz_b);
{ //sort gems so they display on total price in order of descending worth
if (!isNil {call compile format["_%1",_x]} && {(call compile format["_%1",_x]) > 0}) then {
if (_noIMG) then {
_pic = if (_localize) then {getText (configFile >> 'CfgMagazines' >> _x >> 'displayName')} else {_x};
_array set [count _array, format["%1 %2",(call compile format["_%1",_x]),_pic]];
} else {
_pic = getText (configFile >> 'CfgMagazines' >> _x >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",(call compile format["_%1",_x]),_pic, _string,_fontSize];
};
};
} count DZE_GemList;
if (_noIMG) then {
if (_briefcase_100oz >= 2) then {
_array set [count _array, format["%1 %2s",_briefcase_100oz,if (_localize) then {localize "STR_EPOCH_BRIEFCASE"} else {"Briefcase"}]];
};
if (_briefcase_100oz == 1) then {
_array set [count _array, format["%1 %2",_briefcase_100oz,if (_localize) then {localize "STR_EPOCH_BRIEFCASE"} else {"Briefcase"}]];
};
} else {
if (_briefcase_100oz > 0) then {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemBriefcase100oz' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_briefcase_100oz,_pic, _string,_fontSize];
};
};
if (_gold_10oz > 0) then {
if (_noIMG) then {
_array set [count _array, format["%1 %2",_gold_10oz,if (_localize) then {localize "STR_EPOCH_10OZGOLD"} else {"10oz Gold"}]];
} else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar10oz' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_gold_10oz,_pic, _string,_fontSize];
};
};
if (_gold_1oz > 0) then {
if (_noIMG) then {
_array set [count _array, format["%1 %2",_gold_1oz,if (_localize) then {localize "STR_EPOCH_GOLD"} else {"Gold"}]];
} else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_gold_1oz,_pic, _string,_fontSize];
};
};
if (_silver_10oz > 0) then {
if (_noIMG) then {
_array set [count _array, format["%1 %2",_silver_10oz,if (_localize) then {localize "STR_EPOCH_10OZSILVER"} else {"10oz Silver"}]];
} else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar10oz' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_silver_10oz,_pic, _string,_fontSize];
};
};
if (_silver_1oz > 0) then {
if (_noIMG) then {
_array set [count _array, format["%1 %2",_silver_1oz,if (_localize) then {localize "STR_EPOCH_SILVER"} else {"Silver"}]];
} else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_silver_1oz,_pic, _string,_fontSize];
};
};
if (_noIMG) then {
{
if (_forEachIndex == 0) then {
_string = _x;
} else {
if (_forEachIndex == ((count _array) - 1)) then {
_string = _string + " and " + _x;
} else {
_string = _string + ", " + _x;
};
};
} forEach _array;
};
_string

119
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrency.sqf
View File

@@ -1,119 +0,0 @@
private ["_ItemTopaz","_GemTotal","_ItemTopaz_ItemTopaz","_GemTotal2","_ItemObsidian","_ItemSapphire","_ItemAmethyst","_ItemEmerald","_ItemCitrine","_ItemRuby","_gem","_value","_pic","_string","_total","_briefcase_100oz","_gold_10oz_a","_gold_10oz_b","_gold_10oz","_gold_1oz_a","_gold_1oz_b","_gold_1oz","_silver_10oz_a","_silver_10oz_b","_silver_10oz","_silver_1oz_a","_silver_1oz_b","_silver_1oz"];
_total = _this;
_string = "";
_ItemTopaz = 0;
_ItemObsidian = 0;
_ItemSapphire = 0;
_ItemAmethyst = 0;
_ItemEmerald = 0;
_ItemCitrine = 0;
_ItemRuby = 0;
_GemTotal = 0;
_GemTotal2 = _total;
{
_gem = _x;
_value = DZE_GemWorthList select _forEachIndex;
switch(_gem) do {
case 'ItemTopaz': {
_ItemTopaz = floor(_GemTotal2 / _value);
if (_ItemTopaz >= 1) then {
_GemTotal = (_value * _ItemTopaz) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemObsidian': {
_ItemObsidian = floor(_GemTotal2 / _value);
if (_ItemObsidian >= 1) then {
_GemTotal = (_value * _ItemObsidian) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemSapphire': {
_ItemSapphire = floor(_GemTotal2 / _value);
if (_ItemSapphire >= 1) then {
_GemTotal = (_value * _ItemSapphire) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemAmethyst': {
_ItemAmethyst = floor(_GemTotal2 / _value);
if (_ItemAmethyst >= 1) then {
_GemTotal = (_value * _ItemAmethyst) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemEmerald': {
_ItemEmerald = floor(_GemTotal2 / _value);
if (_ItemEmerald >= 1) then {
_GemTotal = (_value * _ItemEmerald) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemCitrine': {
_ItemCitrine = floor(_GemTotal2 / _value);
if (_ItemCitrine >= 1) then {
_GemTotal = (_value * _ItemCitrine) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemRuby': {
_ItemRuby = floor(_GemTotal2 / _value);
if (_ItemRuby >= 1) then {
_GemTotal = (_value * _ItemRuby) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
};
} forEach DZE_GemList;
_total = _GemTotal2;
_briefcase_100oz = floor(_total / 10000);
_gold_10oz_a = floor(_total / 1000);
_gold_10oz_b = _briefcase_100oz * 10;
_gold_10oz = (_gold_10oz_a - _gold_10oz_b);
_gold_1oz_a = floor(_total / 100);
_gold_1oz_b = _gold_10oz_a * 10;
_gold_1oz = (_gold_1oz_a - _gold_1oz_b);
_silver_10oz_a = floor(_total / 10);
_silver_10oz_b = _gold_1oz_a * 10;
_silver_10oz = (_silver_10oz_a - _silver_10oz_b);
_silver_1oz_a = floor(_total);
_silver_1oz_b = _silver_10oz_a * 10;
_silver_1oz = (_silver_1oz_a - _silver_1oz_b);
{ //sort gems so they display on total price in order of descending worth
if (!isNil {call compile format["_%1",_x]} && {(call compile format["_%1",_x]) > 0}) then {
_pic = getText (configFile >> 'CfgMagazines' >> _x >> 'picture');
_string = format["%3<t size='1'>%1x</t><img image='%2'/>",(call compile format["_%1",_x]),_pic, _string];
};
} count DZE_GemList;
if (_briefcase_100oz > 0) then {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemBriefcase100oz' >> 'picture');
_string = format["%3<t size='1'>%1x</t><img image='%2'/>",_briefcase_100oz,_pic, _string];
};
if (_gold_10oz > 0) then {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar10oz' >> 'picture');
_string = format["%3<t size='1'>%1x</t><img image='%2'/>",_gold_10oz,_pic, _string];
};
if (_gold_1oz > 0) then {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar' >> 'picture');
_string = format["%3<t size='1'>%1x</t><img image='%2'/>",_gold_1oz,_pic, _string];
};
if (_silver_10oz > 0) then {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar10oz' >> 'picture');
_string = format["%3<t size='1'>%1x</t><img image='%2'/>",_silver_10oz,_pic, _string];
};
if (_silver_1oz > 0) then {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar' >> 'picture');
_string = format["%3<t size='1'>%1x</t><img image='%2'/>",_silver_1oz,_pic, _string];
};
_string

151
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrencyNoImg.sqf
View File

@@ -1,151 +0,0 @@
private ["_ItemTopaz","_GemTotal","_ItemTopaz_ItemTopaz","_GemTotal2","_ItemObsidian","_ItemSapphire","_ItemAmethyst","_ItemEmerald","_ItemCitrine","_ItemRuby","_gem","_value","_string","_total","_briefcase_100oz","_gold_10oz_a","_gold_10oz_b","_gold_10oz","_gold_1oz_a","_gold_1oz_b","_gold_1oz","_silver_10oz_a","_silver_10oz_b","_silver_10oz","_silver_1oz_a","_silver_1oz_b","_silver_1oz","_dname"];
_total = _this;
_string = "";
_ItemTopaz = 0;
_ItemObsidian = 0;
_ItemSapphire = 0;
_ItemAmethyst = 0;
_ItemEmerald = 0;
_ItemCitrine = 0;
_ItemRuby = 0;
_GemTotal = 0;
_GemTotal2 = _total;
{
_gem = _x;
_value = DZE_GemWorthList select _forEachIndex;
switch(_gem) do {
case 'ItemTopaz': {
_ItemTopaz = floor(_GemTotal2 / _value);
if (_ItemTopaz >= 1) then {
_GemTotal = (_value * _ItemTopaz) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemObsidian': {
_ItemObsidian = floor(_GemTotal2 / _value);
if (_ItemObsidian >= 1) then {
_GemTotal = (_value * _ItemObsidian) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemSapphire': {
_ItemSapphire = floor(_GemTotal2 / _value);
if (_ItemSapphire >= 1) then {
_GemTotal = (_value * _ItemSapphire) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemAmethyst': {
_ItemAmethyst = floor(_GemTotal2 / _value);
if (_ItemAmethyst >= 1) then {
_GemTotal = (_value * _ItemAmethyst) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemEmerald': {
_ItemEmerald = floor(_GemTotal2 / _value);
if (_ItemEmerald >= 1) then {
_GemTotal = (_value * _ItemEmerald) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemCitrine': {
_ItemCitrine = floor(_GemTotal2 / _value);
if (_ItemCitrine >= 1) then {
_GemTotal = (_value * _ItemCitrine) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
case 'ItemRuby': {
_ItemRuby = floor(_GemTotal2 / _value);
if (_ItemRuby >= 1) then {
_GemTotal = (_value * _ItemRuby) + _GemTotal;
_GemTotal2 = _total - _GemTotal;
};
};
};
} forEach DZE_GemList;
_total = _GemTotal2;
_briefcase_100oz = floor(_total / 10000);
_gold_10oz_a = floor(_total / 1000);
_gold_10oz_b = _briefcase_100oz * 10;
_gold_10oz = (_gold_10oz_a - _gold_10oz_b);
_gold_1oz_a = floor(_total / 100);
_gold_1oz_b = _gold_10oz_a * 10;
_gold_1oz = (_gold_1oz_a - _gold_1oz_b);
_silver_10oz_a = floor(_total / 10);
_silver_10oz_b = _gold_1oz_a * 10;
_silver_10oz = (_silver_10oz_a - _silver_10oz_b);
_silver_1oz_a = floor(_total);
_silver_1oz_b = _silver_10oz_a * 10;
_silver_1oz = (_silver_1oz_a - _silver_1oz_b);
{ //sort gems so they display on total price in order of descending worth
if (!isNil {call compile format["_%1",_x]} && {(call compile format["_%1",_x]) > 0}) then {
_dname = getText (configFile >> 'CfgMagazines' >> _x >> 'displayName');
if (_string == "") then {
_string = format["%1 %2",(call compile format["_%1",_x]),_dname];
} else {
_string = format["%2 %1 %3",(call compile format["_%1",_x]),_string,_dname];
};
};
} count DZE_GemList;
if (_briefcase_100oz >= 2) then {
if (_string == "") then {
_string = format["%1 %2s",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"];
} else {
_string = format["%2 %1 %3s",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
};
};
if (_briefcase_100oz == 1) then {
if (_string == "") then {
_string = format["%1 %2",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"];
} else {
_string = format["%2 %1 %3",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
};
};
if (_gold_10oz > 0) then {
if (_string == "") then {
_string = format["%1 %2",_gold_10oz,localize "STR_EPOCH_10OZGOLD"];
} else {
_string = format["%2 %1 %3",_gold_10oz,_string,localize "STR_EPOCH_10OZGOLD"];
};
};
if (_gold_1oz > 0) then {
if (_string == "") then {
_string = format["%1 %2",_gold_1oz,localize "STR_EPOCH_GOLD"];
} else {
_string = format["%2 %1 %3",_gold_1oz,_string,localize "STR_EPOCH_GOLD"];
};
};
if (_silver_10oz > 0) then {
if (_string == "") then {
_string = format["%1 %2",_silver_10oz,localize "STR_EPOCH_10OZSILVER"];
} else {
_string = format["%2 %1 %3",_silver_10oz,_string,localize "STR_EPOCH_10OZSILVER"];
};
};
if (_silver_1oz > 0) then {
if (_string == "") then {
_string = format["%1 %2",_silver_1oz,localize "STR_EPOCH_SILVER"];
} else {
_string = format["%2 %1 %3",_silver_1oz,_string,localize "STR_EPOCH_SILVER"];
};
};
_string

6
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcPrice.sqf
View File

@@ -33,15 +33,15 @@ if (Z_SingleCurrency) then {
{
_sellPrice = _sellPrice + ((_x select 2) * (_x select 11));
} count Z_SellArray;
_ctrlText = _sellPrice call Z_calcDefaultCurrency;
_ctrlText = [_sellPrice,false] call Z_calcCurrency;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_SELLING", count Z_SellArray];
} else {
{
_sellPrice = _sellPrice + ((_x select 2) * (_x select 11) * (_x select 9));
_bTotal = _bTotal + (_x select 9);
} count Z_BuyingArray;
_ctrlText = _sellPrice call Z_calcDefaultCurrency;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_BUYING", _bTotal];
_ctrlText = [_sellPrice,false] call Z_calcCurrency;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_BUYING", _bTotal];
};
ctrlSetText [Z_AT_PRICEDISPLAY, ''];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_PRICEINFO) ctrlSetStructuredText parseText _ctrlText;

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf
View File

@@ -67,6 +67,8 @@ _totalPrice = 0;
_pic = "";
_text = "";
_type = getText(missionConfigFile >> "CfgTraderCategory" >> _cat >> _y >> "type");
// Make sure type matches for items that have the same weapon and magazine classname (i.e. PipeBomb, Mine, Javelin, etc.)
if ((_type == "trade_items" && !(_y in _mags)) or (_type == "trade_weapons" && !(_y in _weaps))) exitWith {};
_sell = getArray(missionConfigFile >> "CfgTraderCategory" >> _cat >> _y >> "sell");
_buy = getArray(missionConfigFile >> "CfgTraderCategory" >> _cat >> _y >> "buy");
if (_swap) then {_y = "ItemBloodbag"};

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getBackpackItems.sqf
View File

@@ -25,5 +25,5 @@ if (!isNull _backpack) then {
_normalMags = _freeSpace select 5;
_normalWeaps = _freeSpace select 6;
[_normalMags,_normalWeaps, typeOf _backpack,[]] call Z_checkArrayInConfig;
[_normalWeaps, _normalMags, typeOf _backpack,[]] call Z_checkArrayInConfig;
};

45
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf
View File

@@ -1,50 +1,29 @@
private ["_Z_logTrade","_classNames","_className","_amounts","_amount","_prices","_price","_quantity","_queueAmounts","_queueNames","_queuePrices","_index","_buyOrSell"];
_Z_logTrade = {
private ["_buyOrSell","_className","_container","_currency","_price","_quantity","_tCost"];
private ["_buyOrSell","_className","_container","_price","_quantity"];
_className = _this select 0;
_quantity = _this select 1;
_buyOrSell = _this select 2;
_price = _this select 3;
_container = switch (Z_SellingFrom) do {
case 0 : {localize "STR_EPOCH_TRADE_BACKPACK"};
case 1 : {localize "STR_EPOCH_TRADE_VEHICLE"};
case 2 : {localize "STR_UI_GEAR"};
case 0 : {"backpack"};
case 1 : {"vehicle"};
case 2 : {"gear"};
};
_tCost = _price call Z_calcDefaultCurrencyNoImg;
_currency = if (Z_SingleCurrency) then {"Coins"} else {""};
_price = if (Z_singleCurrency) then {format ["%1 %2",[_price] call BIS_fnc_numberText,CurrencyName]} else {[_price,true,1,1] call Z_calcCurrency};
// Log to client RPT
if (Z_SingleCurrency) then {
if (_buyOrSell == "buy") then {
diag_log format["%5: Purchased %4x %1 into %7 at %2 for %3 %6",_className,inTraderCity,_price,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
} else {
diag_log format["%5: Sold %4x %1 from %7 at %2 for %3 %6",_className,inTraderCity,_price,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
};
if (_buyOrSell == "buy") then {
diag_log format["%1: Purchased %2x %3 into %4 at %5 for %6",localize "STR_EPOCH_PLAYER_289",_quantity,_className,_container,inTraderCity,_price];
} else {
if (_buyOrSell == "buy") then {
diag_log format["%5: Purchased %4x %1 into %7 at %2 for %3",_className,inTraderCity,_tCost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
} else {
diag_log format["%5: Sold %4x %1 from %7 at %2 for %3",_className,inTraderCity,_tCost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
};
};
diag_log format["%1: Sold %2x %3 from %4 at %5 for %6",localize "STR_EPOCH_PLAYER_289",_quantity,_className,_container,inTraderCity,_price];
};
// Log to server RPT
if (DZE_serverLogTrades) then {
if (Z_SingleCurrency) then {
if (_buyOrSell == "buy") then {
PVDZE_obj_Trade = [player,0,0,_className,inTraderCity,_currency,_price,_quantity,_container,false];
} else {
PVDZE_obj_Trade = [player,0,1,_className,inTraderCity,_currency,_price,_quantity,_container,false];
};
} else {
if (_buyOrSell == "buy") then {
PVDZE_obj_Trade = [player,0,0,_className,inTraderCity,_currency,_tCost,_quantity,_container,false];
} else {
PVDZE_obj_Trade = [player,0,1,_className,inTraderCity,_currency,_tCost,_quantity,_container,false];
};
};
PVDZE_obj_Trade = [player,0,if (_buyOrSell == "buy") then {0} else {1},_className,inTraderCity,false,_price,_quantity,_container,false];
publicVariableServer "PVDZE_obj_Trade";
};
};
@@ -84,4 +63,4 @@ if (count _queueNames > 0) then {
for "_i" from 0 to (count _queueNames)-1 do {
[_queueNames select _i, _queueAmounts select _i, _buyOrSell, _queuePrices select _i] call _Z_logTrade;
};
};
};

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
View File

@@ -227,7 +227,7 @@ if (typeName _money == "SCALAR") then {
} else {
_success = [_money,0,false,0,[],[],false] call Z_returnChange;
_tCost = "";
_tCost = _money call z_calcDefaultCurrencyNoImg;
_tCost = [_money,true] call z_calcCurrency;
if (_tCost != "") then { systemChat format[localize "STR_EPOCH_TRADE_SELL_SUCCESS",_tCost]; };
};
_itemsToLog call Z_logTrade;

8
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_toBuyingList.sqf
View File

@@ -3,15 +3,11 @@ private ["_amount","_index","_index2","_temp"];
_index = _this select 0;
_amount = parseNumber(_this select 1);
if (!isNil "_index" && {_index > -1} && {typeName _amount == "SCALAR"}) then {
if (!isNil "_index" && {_index > -1} && {typeName _amount == "SCALAR"} && {_amount > 0}) then {
_temp = [] + (Z_BuyableArray select _index);
_temp set [9,(ceil _amount)];
Z_BuyingArray set [count(Z_BuyingArray),_temp];
if (_amount > 0) then {
_index2 = lbAdd [Z_AT_BUYINGLIST, format["%1x: %2",_temp select 9,_temp select 3]];
} else {
_index2 = lbAdd [Z_AT_BUYINGLIST, localize "STR_EPOCH_TRADE_NOT_SELLING"];
};
_index2 = lbAdd [Z_AT_BUYINGLIST, format["%1x: %2",_temp select 9,_temp select 3]];
lbSetPicture [Z_AT_BUYINGLIST, _index2, _temp select 4];
call Z_calcPrice;
};

1
SQF/dayz_code/actions/AdvancedTrading/init.sqf
View File

@@ -66,7 +66,6 @@ if (isNil "Z_AdvancedTradingInit") then {
Z_fillBuyingList = CPP PATH(z_at_fillBuyingList.sqf);
Z_displayFreeSpace = CPP PATH(z_at_displayFreeSpace.sqf);
Z_allowBuying = CPP PATH(z_at_allowBuying.sqf);
Z_calcDefaultCurrency = CPP PATH(z_at_calcDefaultCurrency.sqf);
DZE_deleteTradedVehicle = CPP PATH(DZE_deleteTradedVehicle.sqf);
Z_AdvancedTradingInit = true;

56
SQF/dayz_code/actions/boil.sqf
View File

@@ -1,4 +1,4 @@
private ["_bottletext","_tin1text","_tin2text","_tintext","_hasbottleitem","_hastinitem","_qty","_dis","_sfx","_bottleInfected"];
private ["_bottletext","_tin1text","_tin2text","_tintext","_hastinitem","_qty","_dis","_sfx","_WB2Add"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_22" call dayz_rollingMessages;};
dayz_actionInProgress = true;
@@ -7,27 +7,27 @@ _bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "dis
_tin1text = getText (configFile >> "CfgMagazines" >> "TrashTinCan" >> "displayName");
_tin2text = getText (configFile >> "CfgMagazines" >> "ItemSodaEmpty" >> "displayName");
_tintext = format["%1 / %2",_tin1text,_tin2text];
_hasbottleitem = (("ItemWaterBottle" in magazines player) || {"ItemWaterBottleInfected" in magazines player} || {"ItemWaterBottleSafe" in magazines player});
_hastinitem = false;
//_hasbottleitem = (("ItemWaterBottle" in magazines player) || {"ItemWaterBottleInfected" in magazines player} || {"ItemWaterBottleSafe" in magazines player});
_qty = 0;
_qty = _qty + ({
_x in ["ItemWaterBottleInfected","ItemWaterBottle","ItemWaterBottleSafe","ItemWaterbottle1oz","ItemWaterbottle2oz","ItemWaterbottle3oz","ItemWaterbottle4oz","ItemWaterbottle5oz","ItemWaterbottle6oz","ItemWaterbottle7oz","ItemWaterbottle8oz","ItemWaterbottle9oz"];
} count magazines player);
a_player_boil = true;
player removeAction s_player_boil;
//s_player_boil = -1;
_bottleInfected = if ("ItemWaterBottleInfected" in magazines player) then {true} else {false};
//_bottleInfected = ("ItemWaterBottleInfected" in magazines player);
/* //canteens are metal, we only use canteens in Epoch
_hastinitem = false;
{
if (_x in magazines player) exitWith {_hastinitem = true;};
} count boil_tin_cans;
if (!_hasbottleitem) exitWith {format[localize "str_player_31",_bottletext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false;};
if (!_hastinitem) exitWith {format[localize "str_player_31",_tintext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false;};
if (_hasbottleitem and _hastinitem) then {
_qty = 0;
_qty = _qty + ({_x == "ItemWaterBottleInfected"} count magazines player);
_qty = _qty + ({_x == "ItemWaterBottle"} count magazines player);
_qty = _qty + ({_x == "ItemWaterBottleSafe"} count magazines player);
if (!_hastinitem) exitWith {format[localize "str_player_31",_tintext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false; dayz_actionInProgress = false;};
*/
if (_qty > 0) then {
player playActionNow "Medic";
uiSleep 1;
_dis=10;
@@ -35,29 +35,35 @@ if (_hasbottleitem and _hastinitem) then {
[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
[player,_dis,true,(getPosATL player)] call player_alertZombies;
uiSleep 5;
for "_x" from 1 to _qty do {
if ("ItemWaterBottleInfected" in magazines player) then {
player removeMagazine "ItemWaterBottleInfected";
} else {
if ("ItemWaterBottleSafe" in magazines player) then {
player removeMagazine "ItemWaterBottleSafe";
} else {
player removeMagazine "ItemWaterBottle";
};
_WB2Add = "ItemWaterBottleBoiled";
switch (true) do {
case ("ItemWaterBottleInfected" in magazines player): { player removeMagazine "ItemWaterBottleInfected"; };
case ("ItemWaterBottleSafe" in magazines player): { player removeMagazine "ItemWaterBottleSafe"; };
case ("ItemWaterBottle" in magazines player): { player removeMagazine "ItemWaterBottle"; };
case ("ItemWaterbottle1oz" in magazines player): { player removeMagazine "ItemWaterbottle1oz"; _WB2Add = "ItemWaterbottle1ozBoiled"; };
case ("ItemWaterbottle2oz" in magazines player): { player removeMagazine "ItemWaterbottle2oz"; _WB2Add = "ItemWaterbottle2ozBoiled"; };
case ("ItemWaterbottle3oz" in magazines player): { player removeMagazine "ItemWaterbottle3oz"; _WB2Add = "ItemWaterbottle3ozBoiled"; };
case ("ItemWaterbottle4oz" in magazines player): { player removeMagazine "ItemWaterbottle4oz"; _WB2Add = "ItemWaterbottle4ozBoiled"; };
case ("ItemWaterbottle5oz" in magazines player): { player removeMagazine "ItemWaterbottle5oz"; _WB2Add = "ItemWaterbottle5ozBoiled"; };
case ("ItemWaterbottle6oz" in magazines player): { player removeMagazine "ItemWaterbottle6oz"; _WB2Add = "ItemWaterbottle6ozBoiled"; };
case ("ItemWaterbottle7oz" in magazines player): { player removeMagazine "ItemWaterbottle7oz"; _WB2Add = "ItemWaterbottle7ozBoiled"; };
case ("ItemWaterbottle8oz" in magazines player): { player removeMagazine "ItemWaterbottle8oz"; _WB2Add = "ItemWaterbottle8ozBoiled"; };
case ("ItemWaterbottle9oz" in magazines player): { player removeMagazine "ItemWaterbottle9oz"; _WB2Add = "ItemWaterbottle9ozBoiled"; };
};
if (dayz_waterBottleBreaking && {[0.1] call fn_chance}) then {
player addMagazine "ItemWaterBottleDmg";
//systemChat (localize ("str_waterbottle_broke"));
localize "str_waterbottle_broke" call dayz_rollingMessages;
} else {
player addMagazine "ItemWaterBottleBoiled";
player addMagazine _WB2Add;
};
};
format [localize "str_player_boiledwater",_qty] call dayz_rollingMessages;
} else {
localize "str_player_02" call dayz_rollingMessages;
//localize "str_player_02" call dayz_rollingMessages;
format[localize "str_player_31",_bottletext,localize "str_player_31_fill"] call dayz_rollingMessages;
};
a_player_boil = false;

9
SQF/dayz_code/actions/doorManagement/player_enterCode.sqf
View File

@@ -1,14 +1,17 @@
private "_display";
// Close DoorAccess
_display = findDisplay 61144;
_display closeDisplay 2;
if (dayz_lastCodeFail > diag_tickTime) exitWith {
format [localize "STR_EPOCH_PLAYER_19_WAIT",round(dayz_lastCodeFail - diag_tickTime)] call dayz_rollingMessages;
};
if (DZE_doorManagementAllowManualCode) then {
//DZE_Lock_Door != (this getvariable['CharacterID','0']);
DZE_topCombo = 0;
DZE_midCombo = 0;
DZE_botCombo = 0;
createDialog "ComboLockUI";
} else {
localize "STR_EPOCH_DOORACCESS_NOMANUAL" call dayz_rollingMessages;
};
};

65
SQF/dayz_code/actions/fill_nearestVehicle.sqf
View File

@@ -1,36 +1,26 @@
private ["_isVehicle","_configSrcVeh","_capacitySrc","_nameTextSrc","_started","_finished","_animState","_isMedic","_newFuel","_abort","_newFuelSrc","_canSize","_vehicle","_configVeh","_capacity","_nameText","_isOk","_vehicleSrc","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle"];
private ["_isFuelTruck","_fuelTruckCapacity","_started","_finished","_animState","_isMedic","_newFuel","_abort","_newFuelSrc","_canSize","_vehicle","_configVeh","_capacity","_nameText","_fuelTruck","_findNearestVehicle"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;};
dayz_actionInProgress = true;
_isVehicle = false;
_vehicleSrc = _this select 3;
_fuelTruck = _this select 3;
_abort = false;
if(!(isNull _vehicleSrc)) then {
_isVehicle = ((_vehicleSrc isKindOf "AllVehicles") && !(_vehicleSrc isKindOf "Man"));
if (!isNull _fuelTruck) then {
_isFuelTruck = true;
// If fuel source is vehicle get actual capacity
_configSrcVeh = configFile >> "cfgVehicles" >> TypeOf(_vehicleSrc);
_capacitySrc = getNumber(_configSrcVeh >> "fuelCapacity");
_nameTextSrc = getText(_configSrcVeh >> "displayName");
_fuelTruckCapacity = getNumber (configFile >> "cfgVehicles" >> typeOf _fuelTruck >> "fuelCapacity");
} else {
_isFuelTruck = false;
};
// Get all nearby vehicles within 30m
_findNearestVehicles = nearestObjects [player, ["AllVehicles"], 30];
_findNearestVehicle = [];
{
//diag_log ("FILL = " + str(_x) + " = " + str(_vehicleSrc));
if ((alive _x) && {_x != _vehicleSrc} && {!(_x isKindOf "Man")}) exitWith {
if ((alive _x) && {_x != _fuelTruck} && {!(_x isKindOf "Man")}) exitWith {
_findNearestVehicle set [(count _findNearestVehicle),_x];
};
} count _findNearestVehicles;
_IsNearVehicle = count (_findNearestVehicle);
if(_IsNearVehicle >= 1) then {
} count (nearestObjects [player, ["AllVehicles"], 30]);
if (count _findNearestVehicle >= 1) then {
// select the nearest one
_vehicle = _findNearestVehicle select 0;
@@ -39,10 +29,8 @@ if(_IsNearVehicle >= 1) then {
_capacity = getNumber(_configVeh >> "fuelCapacity");
_nameText = getText(_configVeh >> "displayName");
_isOk = true;
// perform fuel up
while {_isOk} do {
while {true} do {
// qty to add per loop
_canSize = (_capacity / 10);
@@ -53,7 +41,6 @@ if(_IsNearVehicle >= 1) then {
_finished = false;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
@@ -87,15 +74,14 @@ if(_IsNearVehicle >= 1) then {
};
_abort = true;
} else {
if(_isVehicle) then {
_newFuelSrc = ((((fuel _vehicleSrc) * _capacitySrc) - _canSize) / _capacitySrc);
_newFuel = (((fuel _vehicle) * _capacity) + _canSize);
_newFuel = (((fuel _vehicle) * _capacity) + _canSize);
if (_isFuelTruck) then {
_newFuelSrc = ((((fuel _fuelTruck) * _fuelTruckCapacity) - _canSize) / _fuelTruckCapacity);
if (_newFuelSrc > 0) then {
if (local _vehicleSrc) then {
[_vehicleSrc,_newFuelSrc] call local_setFuel;
//_vehicleSrc setFuel _newFuelSrc;
if (local _fuelTruck) then {
[_fuelTruck,_newFuelSrc] call local_setFuel;
} else {
PVDZ_send = [_vehicleSrc,"SetFuel",[_vehicleSrc,_newFuelSrc]];
PVDZ_send = [_fuelTruck,"SetFuel",[_fuelTruck,_newFuelSrc]];
publicVariableServer "PVDZ_send";
};
if (_newFuel >= _capacity) then {_newFuel = 1; _abort = true;} else {_newFuel = (_newFuel / _capacity);};
@@ -110,13 +96,26 @@ if(_IsNearVehicle >= 1) then {
} else {
_abort = true;
};
} else {
//Filling near vehicle at gas station with generator
if (_newFuel >= _capacity) then {_newFuel = 1; _abort = true;} else {_newFuel = (_newFuel / _capacity);};
if (local _vehicle) then {
[_vehicle,_newFuel] call local_setFuel;
} else {
PVDZ_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZ_send";
};
[player,"refuel",0,false] call dayz_zombieSpeak;
format[localize "str_epoch_player_132",_nameText,round(_newFuel*100)] call dayz_rollingMessages;
};
};
if(_abort) exitWith {};
if (_abort) exitWith {
["Working",0,[0,1,3,0]] call dayz_NutritionSystem;
};
uiSleep 1;
};
} else {
localize "str_epoch_player_27" call dayz_rollingMessages;
};

2
SQF/dayz_code/actions/fill_startGenerator.sqf
View File

@@ -9,7 +9,6 @@ s_player_fillgen = 1;
// Use target from addaction
_vehicle = _this select 3;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
@@ -78,6 +77,7 @@ if (_finished) then {
_vehicle setVariable ["GeneratorSound", _soundSource,true];
localize "str_epoch_player_28" call dayz_rollingMessages;
["Working",0,[0,1,3,0]] call dayz_NutritionSystem;
};
} else {
// Start generator

32
SQF/dayz_code/actions/gather_meat.sqf
View File

@@ -1,4 +1,4 @@
private ["_item","_type","_hasHarvested","_knifeArray","_PlayerNear","_isListed","_activeKnife","_text","_dis","_sfx","_sharpnessRemaining","_qty","_chance","_string","_isZombie","_humanity"];
private ["_item","_type","_hasHarvested","_knifeArray","_PlayerNear","_isListed","_activeKnife","_text","_dis","_sfx","_qty","_string","_isZombie","_humanity"];
_isZombie = _this isKindOf "zZombie_base";
if (dayz_actionInProgress) exitWith {
@@ -36,10 +36,8 @@ if ((count _knifeArray) < 1) exitWith {
};
if ((count _knifeArray > 0) and !_hasHarvested) then {
private "_qty";
//Select random can from array
_activeKnife = _knifeArray call BIS_fnc_selectRandom;
//Use sharpest knife player has
_activeKnife = _knifeArray select 0;
//Get Animal Type
_isListed = isClass (configFile >> "CfgSurvival" >> "Meat" >> _type);
@@ -68,29 +66,7 @@ if ((count _knifeArray > 0) and !_hasHarvested) then {
//if (!achievement_Gut) then {achievement_Gut = true;};
};
if (dayz_knifeDulling) then {
_sharpnessRemaining = getText (configFile >> "cfgWeapons" >> _activeKnife >> "sharpnessRemaining");
switch _activeKnife do {
case "ItemKnife" : {
//_chance = getNumber (configFile >> "cfgWeapons" >> _activeKnife >> "chance");
if ([0.2] call fn_chance) then {
player removeWeapon _activeKnife;
player addWeapon _sharpnessRemaining;
//systemChat (localize "str_info_bluntknife");
localize "str_info_bluntknife" call dayz_rollingMessages;
};
};
case "ItemKnifeBlunt" : {
//do nothing
};
default {
player removeWeapon _activeKnife;
player addWeapon _sharpnessRemaining;
};
};
};
["knives",0.2] call fn_dynamicTool;
uiSleep 6;
if (_isZombie) then {

9
SQF/dayz_code/actions/hotwire_veh.sqf
View File

@@ -1,4 +1,4 @@
private ["_vehicle","_removed","_vehType"];
private ["_time","_vehicle","_removed","_vehType"];
_vehicle = _this select 3;
if (dayz_actionInProgress) exitWith {localize "STR_EPOCH_PLAYER_32" call dayz_rollingMessages;};
@@ -20,10 +20,14 @@ if (_removed == 1) then {
_vehType = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName");
if ((random 10) <= 7.5) then {
PVDZE_veh_Lock = [_vehicle,false];
_time = diag_tickTime;
if (local _vehicle) then {
PVDZE_veh_Lock call local_lockUnlock
PVDZE_veh_Lock call local_lockUnlock;
} else {
publicVariable "PVDZE_veh_Lock";
//Wait for lock status to update over network (can take up to a few seconds)
waitUntil {uiSleep 0.1;(!locked _vehicle or (diag_tickTime - _time > 4))};
};
format [localize "STR_EPOCH_PLAYER_33_OK",_vehType] call dayz_rollingMessages;
} else {
@@ -31,6 +35,7 @@ if (_removed == 1) then {
};
};
//Let fn_selfActions run now
s_player_lockUnlock_crtl = -1;
s_player_lockUnlockInside_ctrl = -1;
dayz_actionInProgress = false;

52
SQF/dayz_code/actions/jerry_fill.sqf
View File

@@ -1,6 +1,6 @@
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_34" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_fuelcans","_qty20","_qty5","_qty40","_magazines","_cursorTarget","_fuelAmount"];
private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_fuelCans","_qty20","_qty5","_qty210","_magazines","_cursorTarget","_fuelAmount","_fuelNeeded"];
player removeAction s_player_fillfuel;
//s_player_fillfuel = -1;
@@ -11,22 +11,22 @@ _magazines = magazines player;
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (isNil "_fuelAmount") then {
_fuelAmount = floor(Random dayz_randomMaxFuelAmount);
_fuelAmount = floor(Random dayz_randomMaxFuelAmount) max (dayz_randomMaxFuelAmount * 0.10);
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
};
if (_fuelAmount < 5) exitWith { format[localize "str_fill_notenough",typeOf _cursorTarget,_fuelAmount] call dayz_rollingMessages; };
_qty5 = {_x == "ItemFuelcanEmpty"} count _magazines;
_qty20 = {_x == "ItemJerrycanEmpty"} count _magazines;
_qty210 = {_x == "ItemFuelBarrelEmpty"} count _magazines;
diag_log format["Fill Jerry, %1 - %2",_cursorTarget,_fuelAmount];
_fuelNeeded = (_qty5 * 5) + (_qty20 * 20) + (_qty210 * 210);
_fuelcans = ["ItemFuelcanEmpty","ItemJerrycanEmpty","ItemFuelBarrelEmpty"];
if (_fuelAmount < _fuelNeeded) then {format[localize "str_fill_notenough",typeOf _cursorTarget,_fuelAmount,_fuelNeeded] call dayz_rollingMessages;};
_fuelCans = ["ItemFuelcanEmpty","ItemJerrycanEmpty","ItemFuelBarrelEmpty"];
_qty = 0;
_qty = {_x in _fuelcans} count _magazines;
_qty20 = {_x == "ItemJerrycanEmpty"} count _magazines;
_qty5 = {_x == "ItemFuelcanEmpty"} count _magazines;
_qty40 = {_x == "ItemFuelBarrelEmpty"} count _magazines;
_qty = {_x in _fuelCans} count _magazines;
if (("ItemJerrycanEmpty" in _magazines) or ("ItemFuelcanEmpty" in _magazines) or ("ItemFuelBarrelEmpty" in _magazines)) then {
player playActionNow "Medic";
@@ -58,18 +58,6 @@ if (("ItemJerrycanEmpty" in _magazines) or ("ItemFuelcanEmpty" in _magazines) or
r_doLoop = false;
if (_finished) then {
for "_x" from 1 to _qty20 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (_fuelAmount >= 20) then {
_fuelAmount = _fuelAmount - 20;
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
player removeMagazine "ItemJerrycanEmpty";
player addMagazine "ItemJerrycan";
} else {
_qty = _qty - 1;
};
};
for "_x" from 1 to _qty5 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
@@ -82,11 +70,23 @@ if (("ItemJerrycanEmpty" in _magazines) or ("ItemFuelcanEmpty" in _magazines) or
_qty = _qty - 1;
};
};
for "_x" from 1 to _qty40 do {
for "_x" from 1 to _qty20 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (_fuelAmount >= 40) then {
_fuelAmount = _fuelAmount - 40;
if (_fuelAmount >= 20) then {
_fuelAmount = _fuelAmount - 20;
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
player removeMagazine "ItemJerrycanEmpty";
player addMagazine "ItemJerrycan";
} else {
_qty = _qty - 1;
};
};
for "_x" from 1 to _qty210 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (_fuelAmount >= 210) then {
_fuelAmount = _fuelAmount - 210;
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
player removeMagazine "ItemFuelBarrelEmpty";
player addMagazine "ItemFuelBarrel";
@@ -102,4 +102,4 @@ if (("ItemJerrycanEmpty" in _magazines) or ("ItemFuelcanEmpty" in _magazines) or
} else {
localize "str_player_10" call dayz_rollingMessages;
};
dayz_actionInProgress = false;
dayz_actionInProgress = false;

11
SQF/dayz_code/actions/lock_veh.sqf
View File

@@ -1,4 +1,4 @@
private["_vehicle"];
private ["_time","_vehicle"];
_vehicle = _this select 3;
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_37" call dayz_rollingMessages;};
@@ -10,14 +10,19 @@ s_player_lockUnlock_crtl = 1;
s_player_lockUnlockInside_ctrl = 1;
PVDZE_veh_Lock = [_vehicle,true];
if(player distance _vehicle < 10) then {
_time = diag_tickTime;
if (player distance _vehicle < 10) then {
if (local _vehicle) then {
PVDZE_veh_Lock call local_lockUnlock
PVDZE_veh_Lock call local_lockUnlock;
} else {
publicVariable "PVDZE_veh_Lock";
//Wait for lock status to update over network (can take up to a few seconds)
waitUntil {uiSleep 0.1;(locked _vehicle or (diag_tickTime - _time > 4))};
};
};
//Let fn_selfActions run now
s_player_lockUnlock_crtl = -1;
s_player_lockUnlockInside_ctrl = -1;
dayz_actionInProgress = false;

4
SQF/dayz_code/actions/maintain_area.sqf
View File

@@ -45,7 +45,7 @@ _req = {
_count = _this;
_amount = _count * DZE_maintainCurrencyRate;
_itemText = if (Z_SingleCurrency) then { CurrencyName } else { _amount call z_calcDefaultCurrencyNoImg };
_itemText = if (Z_SingleCurrency) then { CurrencyName } else { [_amount,true] call z_calcCurrency };
[_amount,_itemText]
};
@@ -64,7 +64,7 @@ _maintain = {
_wealth = player getVariable[Z_MoneyVariable,0];
if (Z_SingleCurrency) then {
_enoughMoney = if (_wealth >= _amount) then { true } else { false };
_enoughMoney = (_wealth >= _amount);
} else {
Z_Selling = false; // Initialize gem currency before Z_canAfford.
_moneyInfo = _amount call Z_canAfford;

124
SQF/dayz_code/actions/modular_build.sqf
View File

@@ -1,8 +1,8 @@
// If an array was passed redirect to vanilla player_build (Epoch items pass a string)
if (!isNil "_this" && {typeName _this == "ARRAY"} && {count _this > 0}) exitWith {_this spawn player_buildVanilla;};
private ["_abort","_reason","_distance","_isNear","_lockable","_isAllowedUnderGround","_offset","_classname","_zheightdirection","_zheightchanged","_rotate","_objectHelperPos","_objectHelperDir","_objHDiff","_position","_isOk","_dir","_vector","_cancel","_location2","_buildOffset","_location","_limit","_started","_finished","_animState","_isMedic","_proceed","_counter","_dis","_sfx","_combination_1_Display","_combination_1","_combination_2","_combination_3","_combination","_combinationDisplay","_combination_4","_num_removed","_tmpbuilt","_vUp","_classnametmp","_text","_ghost","_objectHelper","_location1","_object","_helperColor","_canDo","_pos","_onLadder","_vehicle","_inVehicle","_needNear","_canBuild"];
private ["_abort","_reason","_distance","_isNear","_lockable","_isAllowedUnderGround","_offset","_classname","_zheightdirection","_zheightchanged","_rotate","_objectHelperPos","_objectHelperDir","_objHDiff","_position","_isOk","_dir","_vector","_cancel","_location2","_buildOffset","_location","_limit","_started","_finished","_animState","_isMedic","_proceed","_counter","_dis","_sfx","_combination_1_Display","_combination_1","_combination_2","_combination_3","_combination","_combinationDisplay","_combination_4","_num_removed","_tmpbuilt","_vUp","_classnametmp","_text","_ghost","_ghost2","_VectorWorkAround","_objectHelper","_location1","_object","_object2","_helperColor","_canDo","_pos","_onLadder","_vehicle","_inVehicle","_needNear","_canBuild"];
//Check if building already in progress, exit if so.
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_40" call dayz_rollingMessages;};
dayz_actionInProgress = true;
@@ -43,9 +43,8 @@ if (_inVehicle) exitWith {dayz_actionInProgress = false; localize "str_epoch_pla
if (_onLadder) exitWith {dayz_actionInProgress = false; localize "str_player_21" call dayz_rollingMessages;};
if (player getVariable["combattimeout",0] >= diag_tickTime) exitWith {dayz_actionInProgress = false; localize "str_epoch_player_43" call dayz_rollingMessages;};
DZE_buildItem = _this; //This is a magazine! It's global to allow access to it from outside functions
DZE_buildItem = _this;
// Need Near Requirements
_abort = false;
_reason = "";
@@ -99,29 +98,40 @@ if (_canBuild select 0) then {
};
_ghost = getText (configFile >> "CfgVehicles" >> _classname >> "ghostpreview");
_lockable = 0; //default define if lockable not found in config file below
if(isNumber (configFile >> "CfgVehicles" >> _classname >> "lockable")) then { //find out if item is lockable object
_lockable = getNumber(configFile >> "CfgVehicles" >> _classname >> "lockable"); // 2=lockbox, 3=combolock, 4=safe
_lockable = 0;
if(isNumber (configFile >> "CfgVehicles" >> _classname >> "lockable")) then {
_lockable = getNumber(configFile >> "CfgVehicles" >> _classname >> "lockable");
};
_isAllowedUnderGround = 1; //check if allowed to build under terrain
_isAllowedUnderGround = 1;
if(isNumber (configFile >> "CfgVehicles" >> _classname >> "nounderground")) then {
_isAllowedUnderGround = getNumber(configFile >> "CfgVehicles" >> _classname >> "nounderground");
};
_offset = getArray (configFile >> "CfgVehicles" >> _classname >> "offset"); //check default distance offset, define if does not exist
_offset = getArray (configFile >> "CfgVehicles" >> _classname >> "offset");
_objectHelper = objNull;
_isOk = true;
_location1 = [player] call FNC_GetPos; // get inital players position
_dir = getDir player; //required to pass direction when building
_location1 = [player] call FNC_GetPos;
_dir = getDir player;
_ghost2 = "";
_VectorWorkAround = false;
if (_classname == "CinderWall_DZ") then {
_ghost2 = _ghost;
_ghost = "CinderWallHalf_Preview_DZ";
_VectorWorkAround = true;
};
// if ghost preview available use that instead
if (_ghost != "") then {
_classname = _ghost;
};
_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; //object preview, not an actual object that will be built
_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"];
_object2 = ObjNull;
if (_VectorWorkAround) then {
_object2 = _ghost2 createVehicleLocal [0,0,0];
hideObject _object;
};
if((count _offset) <= 0) then {
_offset = [0,(abs(((boundingBox _object)select 0) select 1)),0];
@@ -131,7 +141,12 @@ if (_canBuild select 0) then {
_helperColor = "#(argb,8,8,3)color(0,0,0,0,ca)";
_objectHelper setobjecttexture [0,_helperColor];
_objectHelper attachTo [player,_offset];
_object attachTo [_objectHelper,[0,0,0]];
if (_VectorWorkAround) then {
_object attachTo [_objectHelper,[0,0,-1.65]];
_object2 attachTo [_object,[0,0,1.65]];
} else {
_object attachTo [_objectHelper,[0,0,0]];
};
if (isClass (configFile >> "SnapBuilding" >> _classname)) then {
["","","",["Init",_object,_classname,_objectHelper]] spawn snap_build;
@@ -221,7 +236,7 @@ if (_canBuild select 0) then {
DZE_memDir = getDir _objectHelper;
[_objectHelper,[DZE_memForBack,DZE_memLeftRight,DZE_memDir]] call fnc_SetPitchBankYaw;
_objectHelper setPosATL _objectHelperPos;
_objectHelper setVelocity [0,0,0]; //fix sliding glitch
_objectHelper setVelocity [0,0,0];
helperDetach = true;
};
DZE_F = false;
@@ -294,6 +309,10 @@ if (_canBuild select 0) then {
_dir = getDir _object;
_vector = [(vectorDir _object),(vectorUp _object)];
deleteVehicle _object;
if (_VectorWorkAround) then {
detach _object2;
deleteVehicle _object2;
};
detach _objectHelper;
deleteVehicle _objectHelper;
};
@@ -304,6 +323,10 @@ if (_canBuild select 0) then {
_reason = format[localize "STR_EPOCH_BUILD_FAIL_MOVED",DZE_buildMaxMoveDistance];
detach _object;
deleteVehicle _object;
if (_VectorWorkAround) then {
detach _object2;
deleteVehicle _object2;
};
detach _objectHelper;
deleteVehicle _objectHelper;
};
@@ -314,6 +337,10 @@ if (_canBuild select 0) then {
_reason = format[localize "STR_EPOCH_BUILD_FAIL_TOO_FAR",DZE_buildMaxMoveDistance];
detach _object;
deleteVehicle _object;
if (_VectorWorkAround) then {
detach _object2;
deleteVehicle _object2;
};
detach _objectHelper;
deleteVehicle _objectHelper;
};
@@ -324,6 +351,10 @@ if (_canBuild select 0) then {
_reason = format[localize "STR_EPOCH_BUILD_FAIL_HEIGHT",DZE_buildMaxHeightDistance];
detach _object;
deleteVehicle _object;
if (_VectorWorkAround) then {
detach _object2;
deleteVehicle _object2;
};
detach _objectHelper;
deleteVehicle _objectHelper;
};
@@ -334,6 +365,10 @@ if (_canBuild select 0) then {
_reason = localize "str_epoch_player_43";
detach _object;
deleteVehicle _object;
if (_VectorWorkAround) then {
detach _object2;
deleteVehicle _object2;
};
detach _objectHelper;
deleteVehicle _objectHelper;
};
@@ -344,6 +379,10 @@ if (_canBuild select 0) then {
_reason = localize "STR_EPOCH_PLAYER_46";
detach _object;
deleteVehicle _object;
if (_VectorWorkAround) then {
detach _object2;
deleteVehicle _object2;
};
detach _objectHelper;
deleteVehicle _objectHelper;
};
@@ -354,29 +393,20 @@ if (_canBuild select 0) then {
_counter = 0;
_location = [0,0,0];
//No building on roads unless toggled
if (!DZE_BuildOnRoads) then {
if (isOnRoad _position) then { _cancel = true; _reason = localize "STR_EPOCH_BUILD_FAIL_ROAD"; };
};
// No building in trader zones
if(!canbuild) then { _cancel = true; _reason = format[localize "STR_EPOCH_PLAYER_136",localize "STR_EPOCH_TRADER"]; };
if(!_cancel) then {
_classname = _classnametmp;
// Start Build
_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; //create actual object that will be published to database
_tmpbuilt setdir _dir; //set direction inherited from passed args from control
_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
_tmpbuilt setdir _dir;
_tmpbuilt setVariable["memDir",_dir,true];
// Get position based on object
_location = _position;
if((_isAllowedUnderGround == 0) && ((_location select 2) < 0)) then { //check Z axis if not allowed to build underground
_location set [2,0]; //reset Z axis to zero (above terrain)
if((_isAllowedUnderGround == 0) && ((_location select 2) < 0)) then {
_location set [2,0];
};
_tmpbuilt setVectorDirAndUp _vector;
@@ -395,16 +425,16 @@ if (_canBuild select 0) then {
if (surfaceIsWater _location) then {
_tmpbuilt setPosASL _location;
_location = ASLtoATL _location; //Database uses ATL
_location = ASLtoATL _location;
} else {
_tmpbuilt setPosATL _location;
};
format[localize "str_epoch_player_138",_text] call dayz_rollingMessages;
_limit = 3; //times it takes to build by default
_limit = 3;
if (DZE_StaticConstructionCount > 0) then { //if count is manually overridden inside init.sqf, use that instead, else use limits configured in config files
if (DZE_StaticConstructionCount > 0) then {
_limit = DZE_StaticConstructionCount;
}
else {
@@ -413,14 +443,9 @@ if (_canBuild select 0) then {
};
};
while {_isOk} do { //publish phase
while {_isOk} do {
format[localize "str_epoch_player_139",_text, (_counter + 1),_limit] call dayz_rollingMessages; //report how many steps are done out of total limit
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
player playActionNow "Medic"; //animation
//alert zombies
player playActionNow "Medic";
_dis=20;
_sfx = "repair";
[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
@@ -431,7 +456,7 @@ if (_canBuild select 0) then {
_started = false;
_finished = false;
while {r_doLoop} do { //while player is not interrupted, go trough animations
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
@@ -452,16 +477,16 @@ if (_canBuild select 0) then {
r_doLoop = false;
if(!_finished) exitWith { //exit if interrupted
if(!_finished) exitWith {
_isOk = false;
_proceed = false;
};
if(_finished) then { //if animation finished, add to build count
if(_finished) then {
_counter = _counter + 1;
};
if(_counter == _limit) exitWith { //if all steps done proceed with next step, otherwise cancel publish
if(_counter == _limit) exitWith {
_isOk = false;
_proceed = true;
};
@@ -472,8 +497,8 @@ if (_canBuild select 0) then {
_num_removed = ([player,DZE_buildItem] call BIS_fnc_invRemove); //remove item's magazine from inventory
if(_num_removed == 1) then {
["Working",0,[20,10,5,0]] call dayz_NutritionSystem;
call player_forceSave;
format[localize "str_build_01",_text] call dayz_rollingMessages;
_tmpbuilt setVariable ["OEMPos",_location,true]; //store original location as a variable
@@ -538,13 +563,14 @@ if (_canBuild select 0) then {
};
publicVariableServer "PVDZ_obj_Publish";
format[localize "str_epoch_player_140",_combinationDisplay,_text] call dayz_rollingMessages; //display new combination
[format[localize "str_epoch_player_140",_combinationDisplay,_text],1] call dayz_rollingMessages; //display new combination
systemChat format[localize "str_epoch_player_140",_combinationDisplay,_text];
} else { //if not lockable item
_tmpbuilt setVariable ["CharacterID",dayz_characterID,true];
// fire?
if(_tmpbuilt isKindOf "Land_Fire_DZ") then { //if campfire, then spawn, but do not publish to database
if (_tmpbuilt isKindOf "Land_Fire_DZ") then { //if campfire, then spawn, but do not publish to database
[_tmpbuilt,true] call dayz_inflame;
_tmpbuilt spawn player_fireMonitor;
} else {
if (DZE_permanentPlot) then {
@@ -562,6 +588,10 @@ if (_canBuild select 0) then {
publicVariableServer "PVDZ_obj_Publish";
};
};
if (DZE_GodModeBase && {!(_classname in DZE_GodModeBaseExclude)}) then {
_tmpbuilt addEventHandler ["HandleDamage",{false}];
_tmpbuilt enableSimulation false;
};
} else { //if magazine was not removed, cancel publish
deleteVehicle _tmpbuilt;
localize "str_epoch_player_46" call dayz_rollingMessages;
@@ -584,4 +614,4 @@ if (_canBuild select 0) then {
};
};
dayz_actionInProgress = false;
dayz_actionInProgress = false;

8
SQF/dayz_code/actions/object_build.sqf
View File

@@ -15,6 +15,8 @@ _uid = getPlayerUID player;
_keepOnSlope = 0 == (getNumber (configFile >> "CfgVehicles" >> _classname >> "canbevertical"));
//_damageArray = (getArray (configFile >> "CfgVehicles" >> _classname >> "damageValues"));
Dayz_constructionContext set [ 4, false ]; // Stop the construction mode, cf. player_build.sqf
//if (count Dayz_constructionContext < 5) then { Dayz_constructionContext set [ 5, false ]; // };
@@ -61,8 +63,8 @@ if (_build) then {
_variables set [ count _variables, ["ownerArray", [getPlayerUID player]]];
_variables set [ count _variables, ["padlockCombination", _passcode]];
_object removeAllEventHandlers "HandleDamage";
_object addeventhandler ["HandleDamage",{ diag_log (_this); if ((_this select 4) == 'PipeBomb') then { _this call fnc_Obj_FenceHandleDam; } else { false }; } ];
//_object removeAllEventHandlers "HandleDamage";
//_object addeventhandler ["HandleDamage",{ [_this,_damageArray] call fnc_Obj_FenceHandleDam; } ];
};
_object setVariable ["characterID",dayz_characterID, true];
@@ -76,7 +78,7 @@ if (_build) then {
};
/* //set fuel, Later use Generator
if (_object isKindOf "Generator_DZ") then {
if (typeOf _object == "Generator_DZ") then {
diag_log format["Object: %1, Fuel: %2",_object,fuel _object];
if (local _object) then {
_object setFuel 0;

27
SQF/dayz_code/actions/object_disassembly.sqf
View File

@@ -1,9 +1,9 @@
private ["_cursorTarget","_onLadder","_isWater","_alreadyRemoving","_characterID","_objectID","_objectUID","_ownerArray","_dir",
"_realObjectStillThere","_upgrade","_entry","_parent","_requiredParts","_requiredTools","_model","_toolsOK","_displayname",
"_whpos","_i","_wh","_object","_vector","_dis","__FILE__","_puid","_variables"];
"_whpos","_wh","_object","_vector","_dis","_puid","_variables"];
_cursorTarget = _this select 3;
_cursorTarget = _this;
// ArmaA2 bug workaround: sometimes the object is null
if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then {
@@ -13,9 +13,7 @@ if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then {
if(isNull _cursorTarget) exitWith { localize "str_disassembleNoOption" call dayz_rollingMessages; };
//Remove action Menu
player removeAction s_player_disassembly;
s_player_disassembly = -1;
if (player getVariable["alreadyBuilding",0] == 1) exitWith { localize "str_upgradeInProgress" call dayz_rollingMessages; };
//Normal blocked stuff
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
@@ -40,6 +38,9 @@ _upgrade = typeOf _cursorTarget;
_entry = configFile >> "CfgVehicles" >> _upgrade;
r_interrupt = false;
_disassemblyParts = [] + (getArray (_entry >> "Disassembly" >> "removedParts"));
_disassemblyReturnChance = [] + (getNumber (_entry >> "Disassembly" >> "removedChance"));
for "_i" from 1 to 20 do {
_parent = inheritsFrom _entry;
_requiredParts = [] + (getArray (_parent >> "Upgrade" >> "requiredParts"));
@@ -71,9 +72,7 @@ for "_i" from 1 to 20 do {
_cursorTarget = objNull;
if (_realObjectStillThere) then { // send to server the destroy request
_realObjectStillThere = false;
_activatingPlayer = player;
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
PVDZ_obj_Destroy = [_objectID,_objectUID,player];
publicVariableServer "PVDZ_obj_Destroy";
diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZ_obj_Destroy];
};
@@ -92,9 +91,15 @@ for "_i" from 1 to 20 do {
_wh setDir (30*_i);
_wh setPosATL _whpos;
{
if (isClass (configFile >> "CfgMagazines" >> _x))
then { _wh addMagazineCargoGlobal [_x, 1]; }
else { _wh addWeaponCargoGlobal [_x, 1]; };
//Never return _disassemblyParts_.
if (!(_x in _disassemblyParts)) then {
//Random other returned items.
if ([_disassemblyReturnChance] call fn_chance) then {
if (isClass (configFile >> "CfgMagazines" >> _x))
then { _wh addMagazineCargoGlobal [_x, 1]; }
else { _wh addWeaponCargoGlobal [_x, 1]; };
};
};
} forEach _requiredParts;
diag_log [diag_ticktime, __FILE__, "Pile created with:", _requiredParts];

11
SQF/dayz_code/actions/object_dismantle.sqf
View File

@@ -1,4 +1,4 @@
private ["_object","_proceed","_rndattemps","_limit","_dismantleToo","_ownerID","_objectID","_objectUID","_playerID","_claimedBy","_tools","_exit","_end","_onLadder","_isWater","_isOk","_counter","_text","_dis","_sfx","_animState","_started","_finished","_isMedic","_holder"];
private ["_object","_proceed","_rndattemps","_limit","_dismantleToo","_ownerID","_objectID","_objectUID","_playerID","_claimedBy","_tools","_exit","_end","_onLadder","_isWater","_isOk","_counter","_text","_dis","_sfx","_animState","_started","_finished","_isMedic"];
_object = _this;
_proceed = false;
@@ -11,9 +11,6 @@ _limit = 1 + round(random _rndattemps);
//Dismantle magazine type
_dismantleToo = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "dismantle" >> "dismantleToo");
//Object location
_pos = getposATL _object;
//Object info
_ownerID = _object getVariable["CharacterID","0"];
_objectID = _object getVariable["ObjectID","0"];
@@ -165,9 +162,5 @@ if (_proceed) then {
//Need to update for sanity no client should ever create or delete anything
deleteVehicle _object;
//PVDZ_obj_Create = ["WeaponHolder",_pos,["ItemTankTrap"]];
//publicVariableServer "PVDZ_obj_Create";
_holder = createVehicle ["WeaponHolder", _pos, [], 0, "CAN_COLLIDE"];
_holder addmagazinecargoGlobal [_dismantleToo,1];
[_dismantleToo,1,1] call fn_dropItem;
};

10
SQF/dayz_code/actions/object_maintenance.sqf
View File

@@ -7,7 +7,7 @@
private ["_isMedic","_cursorTarget","_item","_classname","_displayname","_requiredTools","_requiredParts","_onLadder","_isWater","_upgradeParts","_startMaintenance","_dis","_sfx","_started","_finished","_animState","_isRefuel"];
_cursorTarget = _this select 3;
_cursorTarget = _this;
// ArmaA2 bug workaround: sometimes the object is null
if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then {
@@ -19,9 +19,9 @@ if(isNull _cursorTarget) exitWith {
localize "str_maintenanceNoOption" call dayz_rollingMessages;
};
//Remove action Menu
player removeAction s_player_maintenance;
s_player_maintenance = -1;
if (player getVariable["alreadyBuilding",0] == 1) exitWith {
localize "str_upgradeInProgress" call dayz_rollingMessages;
};
//Item
_item = typeof _cursorTarget;
@@ -104,7 +104,7 @@ if (_startMaintenance) then {
publicVariableServer "PVDZ_veh_Save";
};
//PVDZ_object_replace = [_cursorTarget];
//PVDZ_object_replace = _cursorTarget;
//publicVariableServer "PVDZ_object_replace";
};

2
SQF/dayz_code/actions/object_pickup.sqf
View File

@@ -34,7 +34,7 @@ if (_classname isKindOf "TrapBear") exitWith { deleteVehicle _holder; };
player playActionNow "PutDown";
//Adding random chance of arrow is re-usable on pickup
_broken = if ((_classname == "1Rnd_Arrow_Wood") && {[0.15] call fn_chance}) then {true} else {false};
_broken = ((_classname == "1Rnd_Arrow_Wood") && {[0.15] call fn_chance});
if (_broken) exitWith { deleteVehicle _holder; localize "str_broken_arrow" call dayz_rollingMessages; };
_claimedBy = _holder getVariable["claimed","0"];

38
SQF/dayz_code/actions/object_upgradeStorage.sqf
View File

@@ -9,12 +9,14 @@
};
*/
private ["_objclass","_cursorTarget","_item","_classname","_requiredTools","_requiredParts","_upgrade","_upgradeConfig",
if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
dayz_actionInProgress = true;
private ["_cursorTarget","_item","_classname","_requiredTools","_requiredParts","_upgrade","_upgradeConfig",
"_upgradeDisplayname","_onLadder","_isWater","_upgradeParts","_startUpgrade","_missingPartsConfig","_textMissingParts","_dis",
"_sfx","_ownerID","_objectID","_objectUID","_alreadyupgrading","_dir","_weapons","_magazines","_backpacks","_object",
"_objWpnTypes","_objWpnQty","_countr","_itemName","_vector"];
"_objWpnTypes","_objWpnQty","_countr","_itemName","_vector","_playerNear"];
_objclass = _this;
_cursorTarget = _this select 3;
_item = typeof _cursorTarget;
@@ -53,7 +55,15 @@ _isWater = (surfaceIsWater (getPosATL player)) or dayz_isSwimming;
_upgradeParts = [];
_startUpgrade = true;
if(_isWater or _onLadder) exitWith { localize "str_CannotUpgrade" call dayz_rollingMessages; };
if(_isWater or _onLadder) exitWith {dayz_actionInProgress = false; localize "str_CannotUpgrade" call dayz_rollingMessages;};
// Make sure you are the closest player to the object
_playerNear = _cursorTarget call dze_isnearest_player;
if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
// Make sure no other players are nearby
_playerNear = {isPlayer _x} count (([_cursorTarget] call FNC_GetPos) nearEntities ["CAManBase",10]) > 1;
if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
// lets check player has requiredTools for upgrade
{
@@ -104,7 +114,7 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
if (_alreadyupgrading == 1) exitWith { localize "str_upgradeInProgress" call dayz_rollingMessages; };
_cursorTarget setVariable["alreadyupgrading",1];
_cursorTarget setVariable["alreadyupgrading",1,true];
uiSleep 0.03;
@@ -129,11 +139,8 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
player playActionNow "Medic";
//remove old tent
_activatingPlayer = player;
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
PVDZ_obj_Destroy = [_objectID,_objectUID,player];
publicVariableServer "PVDZ_obj_Destroy";
if (isServer) then { PVDZ_obj_Destroy call server_deleteObj; };
deleteVehicle _cursorTarget;
// remove parts from players inventory before creation of new tent.
@@ -186,8 +193,13 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
uiSleep 3;
//publish new tent
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[_weapons,_magazines,_backpacks]];
//publish new tent
if (DZE_permanentPlot) then {
_object setVariable ["ownerPUID",dayz_playerUID,true];
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos, dayz_playerUID],[_weapons,_magazines,_backpacks]];
} else {
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[_weapons,_magazines,_backpacks]];
};
publicVariableServer "PVDZ_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
@@ -196,4 +208,6 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
} else {
localize "str_upgradeNoOption" call dayz_rollingMessages;
*/
};
};
dayz_actionInProgress = false;

17
SQF/dayz_code/actions/object_upgradebuilding.sqf
View File

@@ -1,23 +1,17 @@
/*
This script is not part of dayz permission must be given to use. r4z0r49@gmail.com or skype me R4Z0R49.
Simple class system to use this script.
class Upgrade {
requiredTools[] = {"ItemToolbox"};
requiredParts[] = {"equip_crate","PartWoodPile"};
create = "TentStorage1";
};
debugged by facoptere@gmail.com
*/
private ["_cursorTarget","_type","_class","_requiredTools","_requiredParts","_upgradeType","_producedParts","_randomCreate",
private ["_nearByChoppers","_cursorTarget","_type","_class","_requiredTools","_requiredParts","_upgradeType","_producedParts","_randomCreate",
"_upgradeClass","_onLadder","_isWater","_ok","_missing","_upgradeParts","_dis","_characterID","_objectID","_objectUID",
"_ownerArray","_ownerPasscode","_dir","_vector","_object","_puid","_clanArray","_wh","_variables"];
//systemchat str _this;
_cursorTarget = _this select 3;
_cursorTarget = _this;
// ArmaA2 bug workaround: sometimes the object is null
if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then {
_cursorTarget = nearestObjects [ player modelToWorld [0,1.5,0] , ["DZ_buildables","BuiltItems"], 1.5];
@@ -25,8 +19,8 @@ if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then {
};
if (isNull _cursorTarget) exitWith {};
player removeAction s_player_building;
s_player_building = -1;
_nearByChoppers = _cursorTarget nearObjects ["Helicopter", 10];
if (count _nearByChoppers > 1) exitwith { localize "str_upgradevehctooClose" call dayz_rollingMessages; };
_type = typeof _cursorTarget;
_class = configFile >> "CfgVehicles" >> _type;
@@ -131,8 +125,7 @@ _object setVariable ["characterID",_characterID,true];
//remove old object
deleteVehicle _cursorTarget;
_activatingPlayer = player;
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
PVDZ_obj_Destroy = [_objectID,_objectUID,player];
publicVariableServer "PVDZ_obj_Destroy";
// create a weaponholder with dismissed parts

3
SQF/dayz_code/actions/player_Constructionitem.sqf
View File

@@ -74,7 +74,6 @@ if (_hasInput) then {
player playActionNow "PutDown";
//Hack to get craft menu to use build needs a good tidy up
[_orignalClass,"Build","ItemActions"] spawn player_build;
dayz_actionInProgress = true;
[_orignalClass,"Build","ItemActions"] spawn player_build;
};
};

Some files were not shown because too many files have changed in this diff Show More