1714 Commits

Author SHA1 Message Date
icomrade
066b6bd598 Revert "Update player_countMagazinesWBackpack.sqf" 2019-01-22 13:13:14 -05:00
ebayShopper
156d2d043d Update publicvariableval.txt
vanilla commit:
https://github.com/DayZMod/Battleye-Filters/commit/8c43660
2019-01-20 14:16:11 -05:00
ebayShopper
ebc952e94d Update add_recommended_mysql_events.sql
required declaration for functions in MySQL server 8.0+
2019-01-20 12:24:27 -05:00
vbawol
3c4c927dae Merge pull request #2028 from F507DMT/patch-8
Update player_countMagazinesWBackpack.sqf
2019-01-14 12:32:53 -08:00
F507DMT
967abbdcd9 Update player_countMagazinesWBackpack.sqf
There may be too long pauses with low FPS.
2019-01-15 01:58:39 +06:00
vbawol
bcf54dd1a5 Merge pull request #2027 from F507DMT/patch-7
Update private tags
2019-01-07 09:24:29 -06:00
F507DMT
b4e5a38db5 Update private tags 2019-01-07 21:23:08 +06:00
oiad
0391fef4ff Update private tags
This was breaking scripts that use a variable called `_chance`

_chance = 30;
[player,"repair",0,false,50] call dayz_zombieSpeak;

_chance would get changed to 0
2019-01-05 11:12:29 +13:00
oiad
387f77b9da Update private tags 2019-01-05 09:32:12 +13:00
vbawol
44229f35e3 Merge pull request #2026 from F507DMT/patch-6
Update player_countMagazines.sqf
2019-01-04 07:24:38 -06:00
F507DMT
3dc7db7a7a Update player_countMagazines.sqf
Variables("_item","_val","_max") get lost in other scripts, causing errors.
2019-01-04 18:49:20 +06:00
A Man
3bbdcb9e88 Fix missing semicolon (#2024) 2018-10-10 06:21:45 +13:00
A Man
2e15009299 Adding 93 new zombie models (#2023)
* Adding 93 new zombie models based on arma 2 skins

* Adding zombie strings

* Adding new zombie loot groups

* Adding new zombie loot groups, update pilot and doctor loot group

* Adding some new zombies to crash sites

* Adding new hunter zombies to farm buildings

* Adding new hunter zombies to hunting buildings

* Adding new military zombies to military buildings

* Adding new zombies to residential buildings

* Adding new zombies to supermarket buildings

* New zombie documentation file

* Update CHANGE LOG 1.0.6.3.txt

* Capitalize all english zombie names at beginning
2018-10-09 19:35:06 +13:00
A Man
e26fb24ab9 Fixing wrong cargo count of Refuel Trucks (#2021)
* Update Kamaz Refuel

* Update MTVR Refuel

* Update Ural Refuel

* Update V3S Refuel

* Wrong cargo count of Refuel Trucks
2018-08-13 08:23:20 +12:00
ebayShopper
be777dd42a Fix distanceFoot database stat
Vanilla commit: 741df60085
2018-07-29 13:54:57 -04:00
ebayShopper
2c4f06c984 Disable auto refuel, repair and rearm at WarfareBVehicleServicePoint
Vanilla commit:
53bfc597d6
2018-07-29 12:21:00 -04:00
ebayShopper
392f8cb7b3 Update player_buildingDowngrade.sqf
Fixes #2018
2018-06-17 12:38:32 -04:00
ebayShopper
937741dc7d Update tame_dog.sqf
Fixes #2019
2018-06-17 11:50:36 -04:00
oiad
c3cbca144e Add penalties for wrong safe/lockbox code
As per
6f072982c3 (diff-2b5340930b14ce1ae29d38ebc575c75a)
2018-05-26 21:42:50 +12:00
oiad
efc57840d2 Make upgrade localization overwrite displayed dayz_rollingMessages
By the look of it, I broke this file when I commited:
d7a3b30753
it seems it's to do with CRLF vs LF line endings.

Unfortunately, to fix it you have to commit the whole file again, zzz.
2018-05-21 23:04:02 +12:00
oiad
8f5a699278 Update localization 2018-05-21 22:50:39 +12:00
oiad
a88eb092eb Update localization 2018-05-21 22:28:09 +12:00
A Man
e36dbe0862 Changing picture of empty barrels, germany typo fix (#2016)
* Fix german typo

* Change item picture for the new empty barrels

Methylamin Barrel Empty and Oil Barrel Empty had the same item picture as a filled barrels. It is better to have on all empty barrels the same picture like the empty fuel barrel.
2018-05-09 06:57:04 +12:00
ebayShopper
b80736f7a1 Update old hatchback translation
Vanilla commit:
9215b54736
2018-04-28 12:20:32 -04:00
oiad
562b9cff10 Add missing craftables to maintain array
"GunRack_DZ","WoodCrate_DZ","OutHouse_DZ","StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ"
arent a child of any of the other objects to be maintained and aren't in
the list
2018-04-16 23:45:14 +12:00
oiad
bac0071745 Remove duplicate "DZ_buildables"
DZ_buildables is already part of DZE_maintainClasses
2018-04-16 23:45:14 +12:00
ebayShopper
d6cf70711a Add NV back to DMR_DZ and M4SPR_DZE after CorePatch
See:
https://github.com/Goliath86/CorePatch/blob/master/CorePatch_Weapons/description.txt#L18

Consistent with f663cdc

Default A2OA versions can be used if no NVG is desired
2018-04-08 13:56:37 -04:00
ebayShopper
d249227fa6 Fix 45Rnd_545x39_RPK error with A2OA CorePatch update
This magazine was removed in this commit: https://github.com/Goliath86/CorePatch/commit/fef9bcc

The CorePatch data update was pushed to A2OA stable branch on March 27th, 2018.

To avoid errors for this before Epoch 1.0.6.3 patch is released remove all instances of it from custom scripts, loot tables and trader files. Run the query below to remove all instances from the database.

Fixes  #2011
2018-04-07 14:37:24 -04:00
W0LF
0b8b6cba18 Update Russian translation (#2012) 2018-04-03 21:24:03 +12:00
oiad
9d86d46075 Update German translation
Thanks @Relentless
2018-03-31 21:29:16 +13:00
oiad
f65dedf9ed Change DZE_limitPlots to be configurable
This allows you to now specificy a maximum amount of plots per player
for them to place.

This is disabled by default.
2018-03-31 15:53:56 +13:00
oiad
6efd94f638 Add sorted classname lists for all Epoch 1.0.6.2 items 2018-03-31 10:13:16 +13:00
oiad
e1f655106e Add prelocked versions of cinder door/garage
This is as per the wooden versions, adds cinder_door_kit_locked and
cinder_garage_kit_locked.

The same could be done for the version with the door WITHOUT the door
lock, but I feel this is enough.
2018-03-30 23:49:45 +13:00
ebayShopper
21412b74d2 Move ItemKeys back to dayz_code
This reverts commit c4682e5

Fixes #2010
2018-02-06 18:55:35 -05:00
icomrade
f03f2454c9 Update for A2 1.64 GetHit
Replaced vehicle sethit/setvariable method with sethit/gethit and removed setvariable "Hit_" commands for vehicles (hit_partname can now probably be added to the setvariable filters list).

Modified object_getHit.sqf return to now provide the selection name in order to reduce redundant config lookups. Returns '[Damage, Part Name]', instead of just 'Damage'

Modified vehicle_GetHitpoints.sqf to remove incorrect hipoints from returning. Previously this script would return all hitpoints from any vehicle the current vehicle config inherited from, even if the hitpoint didn't exist in the calling vehicle. this posed a problem since getHit on an invalid part name returns Nil
2018-01-21 17:26:35 -05:00
ebayShopper
d48c9070e8 Revert the last two commits
This reverts commits b5f3f30 and 3e0ddef.

Discussed with oiad on discord:
- BIS_fnc_areEqual is much slower than short string comparisons
- String in array form is three times longer, which means more data sent over the network

This way keeps authKey as a string and still avoids pvval kicks.
2018-01-21 13:54:20 -05:00
oiad
3e0ddef7b1 Fix more dayz_serverKey from b5f3f306de
Thanks to @AirwavesMan for the heads up
Hopefully no more! :)
2018-01-21 12:48:52 +13:00
oiad
b5f3f306de Fix publicVariableEval kicks from RNG fail
RNG can be a cruel mistress.
Fixes: Value Restriction #121 "PVDZE_veh_Publish2" =
[[99,[4763.93,7521.36,-0.000228882]],"CSJ_GyroCover",false,"ItemKeyBlack958",<NULL-object>,"iN4r7X7Psetsq"]

Thanks @AirwavesMan
2018-01-18 22:37:38 +13:00
ebayShopper
3c4e12149a Fix addBackpack scripts.txt exception typo
Missed a space in exception for remove.sqf

Reported by Epoch forums user Dz.Red
https://epochmod.com/forum/topic/44837-please-help-to-configure-battleye-filters-1062/
2018-01-17 18:02:54 -05:00
ebayShopper
e04f0fcac5 Add status icons disabled notification
Vanilla commit:
fe063a8896
2018-01-17 17:17:33 -05:00
ebayShopper
634a01a8d3 Block firing during unconscious wake up animation
Vanilla commit:
10cb55b8aa
2018-01-17 17:02:27 -05:00
ebayShopper
42e519a92e Remove bush b_corylus.p3d from tree list
Vanilla commit:
f2bafae2ff
2018-01-17 16:55:59 -05:00
ebayShopper
eb756bf325 Update vanilla object disassembly
Vanilla commit:
11e360732e
2018-01-17 16:50:30 -05:00
ebayShopper
07d8543e1d Update vanilla chop wood
Vanilla commits:
a17b0572eb
7793017310
2018-01-17 16:43:12 -05:00
ebayShopper
6caba339c9 Update change log
Minor improvement to b791dee and 6248add
2018-01-11 15:41:13 -05:00
ebayShopper
048caa56f4 Fix another zero_building too high to enter
Vanilla commit:
d6bf213fd1
2018-01-10 15:46:24 -05:00
ebayShopper
2855997c86 Disable POI fires when POIs are off
Vanilla commit:
ebad05fe5b
2018-01-10 15:35:38 -05:00
oiad
b791deeea8 Condense variables and remove unneeded _isPZombie checks
We're already checking for _isPZombie here:
https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/compile/fn_selfActions.sqf#L223
so we don't need to check it again with the trader or the attach to
heli.

Condensed the distance check to a variable
2018-01-06 17:37:06 +13:00
oiad
564e3da5c2 Add playerNear check to downgrading
Fixes dupe while downgrading locked doors, thanks @Shu for reporting
2018-01-02 20:57:07 +13:00
ebayShopper
2ea22a69a0 Fix a misaligned town generator wreck
Vanilla commit:

464dbb77ba
2017-12-31 16:35:30 -05:00
oiad
141b25e204 Update DZE_SafeZonePosCheck with missing operator
I possibly just need a little more sleep and a little less epoch time
2017-12-30 23:07:36 +13:00
oiad
6248addc3f Make Safe Zone Zombie and Loot spawning a toggle
As requested by a few admins that didn't realise it was now hard coded
to disable loot/zombie spawning
This requires the check since we're also using DZE_SafeZonePosCheck for
DZE_buildChecks with a forced radius.
2017-12-30 22:03:31 +13:00
ebayShopper
e89eebc843 Fix ArmoredSUV gunner glitch #2009
Fixes #2009

Note the fn_damageActions.sqf change can be applied without the config
change and it will still fix the problem most of the time.
2017-12-29 17:21:40 -05:00
ebayShopper
eaaedf21c0 Fix a few more glitched map objects
Vanilla commit:

7d669a390b
2017-12-29 15:42:55 -05:00
oiad
2d437b444c Update README.md 2017-12-29 16:54:22 +13:00
ebayShopper
a0812585c3 Update server install ReadMe formatting 2017-12-27 15:04:22 -05:00
icomrade
ad27a943a9 1.0.6.2 cleanup 2017-12-27 01:53:34 -05:00
ebayShopper
02ac978f61 Update scripts.txt again 2017-12-26 19:13:49 -05:00
ebayShopper
9d7a1ba99e Update publicvariable.log
Removed two exceptions that are no longer used
2017-12-26 17:15:14 -05:00
ebayShopper
8c9d2ea44d Move server configs outside A2OA folder
This is to prevent config.cfg, BEServer.cfg and HiveExt.ini passwords
being read by in-game scripts. Also consolidated to a single folder so
we only need to maintain one copy of BattlEye filters, HiveExt.ini,
basic.cfg and server.Arma2OAProfile. These files are identical for all
maps.

Updated rotate_logs.bat with missing files
2017-12-26 16:28:38 -05:00
ebayShopper
694ea87d0d Update scripts.txt
- Updated exceptions, added new filters and removed some which were not
useful
- Removed exceptions for testkit because it is not part of the mod
- Added notes to clarify for now, will move this info to BI wiki later
- Removed two unused files
2017-12-26 00:55:10 -05:00
oiad
7dd4ae453d Fix battleye kick from 4ea3f36830
4ea3f36830/SQF/dayz_code/system/antihack.sqf
updated but the scripts.txt filter was forgotten
2017-12-26 15:51:43 +13:00
oiad
91669fae74 Fix Overwatch G3 glitch for combining
Fix
https://github.com/EpochModTeam/DayZ-Epoch/issues/1995#issuecomment-348188066
2017-12-26 11:58:36 +13:00
W0LF
c3d482a230 Update Russian translations (#2008)
* Update Russian translations

* remove some periods
2017-12-23 14:12:17 -05:00
ebayShopper
cd65d1d00f Revert hospital loot chance
This reverts commit 921eb6d.

Vanilla commit:

fba39c7c55
2017-12-22 17:40:07 -05:00
ebayShopper
0690e85a22 Hide more map objects that clip in Land_houseV_2T2
Vanilla commit:

504da5afbb
2017-12-21 17:06:05 -05:00
ebayShopper
2c83f2dfe4 Fix autorun freeze when spamming key 2017-12-21 13:23:23 -05:00
ebayShopper
76cff85fc1 Update some Russian translations
Vanilla commit:

6c69b18e2f
2017-12-20 17:32:00 -05:00
ebayShopper
4561deefa6 Update compatible magazines for DZ weapons
See comments on commit e99d625
2017-12-20 15:32:29 -05:00
oiad
e99d6259a2 Fix L85A2_SD_Base not using SD mags
Thanks @worldwidesorrow

https://github.com/EpochModTeam/DayZ-Epoch/issues/2000#issuecomment-352939774
2017-12-20 17:40:11 +13:00
ebayShopper
2a2198af68 Fix #2007
Oversight in e1b6125
2017-12-19 13:27:11 -05:00
oiad
1941832b3b Fix https://github.com/EpochModTeam/DayZ-Epoch/issues/2006
Partial revert
9b96ddd2c3
Thanks @ndavalos
2017-12-19 19:10:49 +13:00
ebayShopper
efaf1f9399 Update ReadMes
@oiad please keep Epoch specific strings in the dayz_epoch package

The status icons translation was identical to English. @AirwavesMan the
second word is not capitalized for consistency with all other settings
in the game options menu. https://i.imgur.com/eIbPBlM.jpg
2017-12-18 17:53:27 -05:00
icomrade
fce987877b update changelog 2017-12-17 20:33:12 -05:00
icomrade
226c8d97aa Update DatabaseMySQL to 5.7.20 + TBB
Repack server test build
2017-12-17 19:58:38 -05:00
ebayShopper
bcf5e69e79 Add example basic.cfg and BEServer.cfg
Vanilla commits:

9007658941

4f25bbe442
2017-12-17 18:19:40 -05:00
ebayShopper
cfc6ad08af Remove unused parameter in PVDZ_hlt_Bleed
Vanilla commit:

83bf13c786
2017-12-17 12:44:03 -05:00
ebayShopper
7668152118 Remove some more glitched map objects
Vanilla commits:

db5aa2063c

88458846e9

1ec13bdfd0
2017-12-17 12:19:28 -05:00
oiad
7857dedc86 Add German translations
Thanks @AirwavesMan for providing the translations!
2017-12-17 21:34:38 +13:00
oiad
e0b444c3fd Update stringtables, fix translations 2017-12-17 14:50:32 +13:00
icomrade
84a868bbda add consume back to FoodPumpkin
https://epochmod.com/forum/topic/44747-cannot-eat-pumpkins-after-106/
2017-12-16 18:58:56 -05:00
oiad
edc6224bc3 Fix broken string table name
String STR_ITEM_DESC_tent_poles not found
2017-12-17 11:24:10 +13:00
oiad
373aeb2db7 Update stringtable.xml 2017-12-17 11:12:18 +13:00
oiad
7a93b5649a Add testkit link 2017-12-16 21:42:54 +13:00
A Man
d56f3a68f4 7 new items, missing localizations (#2004)
7 new items - server admins can add them if desired

Adding a better and some missing localizations

Adding a localization for the car bomb
2017-12-14 13:29:20 -05:00
ebayShopper
b9c9d504d0 Stop antiwall running on m240 nest getOut 2017-12-13 13:52:58 -05:00
ebayShopper
3077b886af Update 1.9 addons link
Thanks @worldwidesorrow
2017-12-13 13:16:13 -05:00
icomrade
f2d21a8889 update test server IP 2017-12-12 13:49:59 -05:00
ebayShopper
dd2ba5cf6a Fix mission check typo
My mistake in 410ef64
2017-12-11 17:59:27 -05:00
Kobayashi
5ef4f4b2ba remove private declaration _foreachindex (#2001) 2017-12-11 17:06:03 +13:00
ebayShopper
410ef644ae Add better handling of very large files in mission check
Thanks to Dihan for pointing this out.
2017-12-10 17:12:33 -05:00
ebayShopper
894dafe4f5 Update change log 2017-12-10 16:47:24 -05:00
ebayShopper
d79cf0e0bb Update test build ReadMe 2017-12-08 19:19:52 -05:00
ebayShopper
97323d98d2 Add 1062-RC1 test build 2017-12-08 19:04:35 -05:00
ebayShopper
13c90993fc Sync Zupa dialog colors
Heights on the trader menu filter search box and amount box have also
been fixed.
Old: https://imgur.com/a/ld4XF
New: https://imgur.com/a/9T8VP
2017-12-08 18:03:23 -05:00
ebayShopper
b35b49bd90 Only refresh group menu player list for changes 2017-12-05 17:26:11 -05:00
ebayShopper
e2a410b95a Update AH6X config
This partially reverts commit 95310b9.

Update for model change in commit 43d349c

Turret animation source errors have been fixed in Streatman's new model,
so this is no longer necessary.
2017-12-05 15:16:36 -05:00
ebayShopper
6edc98adb9 Fix death cam height and rare duplicate weapon error
Vanilla commit:

1e01536fa7
2017-12-05 14:19:55 -05:00
ebayShopper
5e9a7271e9 Add option to toggle status icons
Vanilla commit:

44bb49e326
2017-12-04 18:14:48 -05:00
ebayShopper
da7ea3bb4e Do not set player in combat for throwing flare or chemlight
Vanilla commit:

848b03042d
2017-12-04 14:59:21 -05:00
ebayShopper
b39a15cdd7 Update vanilla building
Vanilla commit:

ad0d514118
2017-12-04 13:49:12 -05:00
ebayShopper
5ca381e95a Remove some glitched map objects
Vanilla commits:

f1b7ffe327

08a883c288

368dd0e8d5

b0f60765d9

4ae5006f8b
2017-12-04 12:47:15 -05:00
ebayShopper
ea2367a30b Update vanilla CfgBanned
Vanilla commit:

0e00ac244b
2017-12-04 11:57:29 -05:00
ebayShopper
973247950e Fix fresh spawns running on login
Vanilla commit:

cbb1b7ab90
2017-12-02 17:27:41 -05:00
ebayShopper
fa0dfd4c47 Define fn_addCargo on server
Needed to define on both in 2f178d8 @oiad
2017-12-01 13:47:34 -05:00
ebayShopper
357b8635a8 Disable laser on new L85s
Vanilla commit:

c94bf00986
2017-12-01 11:07:16 -05:00
ebayShopper
139b81d190 Fix RHIB2Turret bad vehicle type crew error
https://epochmod.com/forum/topic/44700-bad-vehicle-type/
2017-11-29 12:54:44 -05:00
ebayShopper
038da982b4 Update SQL for removed policecar
Vanilla commit:

b6252d75ec
2017-11-28 15:51:22 -05:00
ebayShopper
4727ba4e67 Update L85 config for Epoch
Allow default magazines
2017-11-27 18:02:42 -05:00
ebayShopper
cf74f12f6c Correct an L85 classname from #1996 2017-11-26 18:35:15 -05:00
ebayShopper
7fd8c750d2 Add Land_houseV_2T2 interior
Vanilla commits:

4607ceaff0

b1eba5c54b

7711839323

8f74d2bb24

Also applied corrections mentioned in #1996
2017-11-26 18:29:13 -05:00
worldwidesorrow
c2dd9016cb Update trader files for Streatman's new L85 and SVD models (#1996)
* Update FriendlyAssaultRifle.hpp

* Update FriendlySniperRifle.hpp

* Update BanditMilitaryArmed.hpp

* Update Rifles.hpp

* Update Snipers.hpp
2017-11-26 17:43:06 -05:00
ebayShopper
d6f88fbf8a Add new L85 and SVD variants
Vanilla commits:

8951508770

aad4569581

58e594553b

eaf9648253
2017-11-26 17:39:02 -05:00
ebayShopper
2e01a8d8eb Update stringtable.xml
Vanilla commit:

39927eaa47
2017-11-25 16:05:20 -05:00
ebayShopper
ac10daeb4d Update humanity morphing
Vanilla commits:

33d4165e64

6674be6d5f

f4d18a6fef
2017-11-25 14:52:06 -05:00
ebayShopper
1e65d5d324 Move server_getDiff to missionNameSpace
Vanilla commits:

dc984fd219

d82f430c28
2017-11-25 12:47:25 -05:00
ebayShopper
90487cde10 Update player_fired.sqf
Vanilla commits:

70fc007062

f327c99b02
2017-11-22 12:49:06 -05:00
ebayShopper
c671cf9661 Update player_death.sqf
Vanilla commit:

0e0ffa1d6e
2017-11-21 16:30:19 -05:00
ebayShopper
4ea3f36830 Update PVDZ_sec_atp logs
This reverts commit 7b287a2

Vanilla commit:

a81dd8164c
2017-11-21 15:05:07 -05:00
ebayShopper
61786244bc Update zombie_agent.fsm
The only changes were to apply these two commits:

91f94a5ab9

4bc07b71e7
2017-11-20 16:42:05 -05:00
ebayShopper
4b486559b9 Update shotgun configs
Vanilla commit:

cad0a6fd2d
2017-11-20 15:38:00 -05:00
ebayShopper
4b4bdbbc29 Update vanilla player_breakin.sqf
Vanilla commits:

63aaf07a30

b074e7d847

fb3f69a69a

416cc5dcf1

b6c0dd5849

39a3d45965
2017-11-20 13:57:19 -05:00
ebayShopper
633ea92c18 Update vanilla town generator
Vanilla commit:

bf47e028ee
2017-11-20 11:51:16 -05:00
ebayShopper
921eb6d935 Increase hospital loot chance
Vanilla commit:

47deb21f8f
2017-11-20 11:47:52 -05:00
ebayShopper
43d349c4f3 Increase coverage angle of LandVehicle headlights
Vanilla commits:

194479c98e

369bc6c5f3

5b591a25c1

78d65bd1ae
2017-11-19 16:36:48 -05:00
ebayShopper
89a43cad8a Update vanilla vehicle_getOut log
Vanilla commits:

403861fa1a

b4798403a8
2017-11-19 10:31:51 -05:00
ebayShopper
137f448793 Update vanilla fence damage
Vanilla commits:

b56d85eb99

2eb963dc3f

8b4a985cf6
2017-11-18 17:43:06 -05:00
oiad
9b96ddd2c3 Consolidate ItemKeyXXX/Colors to arrays.
Tidies up scripts inside epoch and for script creators.
Moved z_at_buyItems to epoch_generateKey.
2017-11-19 11:27:02 +13:00
oiad
2f178d8978 Consolidate weapon/magazine/backpack adding to function
This moves a lot of duplicated code from a server side only function
(server_addCargo) to a client/server function called fn_addCargo.
2017-11-19 11:06:00 +13:00
ebayShopper
63fe9f8e87 Revert Topolka dam fix
This reverts 5884ef6

Vanilla commit:

a71efab3d3
2017-11-18 14:20:08 -05:00
ebayShopper
1825fab321 Update vanilla POI
Vanilla commits:

d1c8ccb00f

6c70d01b2a
2017-11-18 14:13:02 -05:00
ebayShopper
9d64d318f6 Revert 83dd363, c4816c8
This reverts commits c4816c8 and 83dd363.

These were not errors, oiad did not properly update his dayz_server
before testing.

Renamed variables and added comments to clarify object or position can
be used
2017-11-18 11:39:41 -05:00
oiad
c4816c8d18 Fix error from c2d2ad2956 (diff-a36371a7b1009b3a95c359f8b1cfa)
Type name error, type Array expected Object
2017-11-18 23:11:18 +13:00
oiad
83dd363ff1 Fix error from c2d2ad2956 (diff-a36371a7b1009b3a95c359f8b1cfa)
Type name error, type Array expected Object
2017-11-18 23:02:00 +13:00
ebayShopper
4953f33fdb Add configurable loot refresh timer
Vanilla commits:

2eb963dc3f

657aaba83a
2017-11-17 17:47:28 -05:00
ebayShopper
01292cb036 Update equip_nails loot chance
Vanilla commits:

34b0d75aa3

874bc1c875
2017-11-17 14:40:27 -05:00
ebayShopper
895aa62369 Update vanilla antiwall glitch
Vanilla commits:

10f9cd2c1b

669b793354 (diff-768fdf583c42ac37d1163a8e6fe31244)
2017-11-17 14:19:17 -05:00
ebayShopper
231a9e5d92 Fix floating loot positions in hotel
These were slightly off https://imgur.com/a/CuSV9
2017-11-17 13:31:47 -05:00
ebayShopper
53e0e4cb5b Update mission.sqm addons list 2017-11-17 13:16:47 -05:00
ebayShopper
6acd3c30ef Fix a stringtable typo 2017-11-14 17:11:32 -05:00
ebayShopper
14a6252911 Fix DZE_BuildHeightLimit behavior
Corrections for #1988
@BigEgg17 abs(_objHDiff) only tells you how much you have raised the
ghost from where it was when you started building. To test the actual
height above ground or sea level you need to use _position select 2.

Say DZE_BuildHeightLimit was 60m and DZE_buildMaxMoveDistance was 20m.
If the player started building at 55m and then raised the object 20m,
they would be allowed to build at 75m with your check.

Also getPosATL should not be used here. For example, I am swimming on
the surface of the water on Napf and getPosATL returns a height of 29m.

@oiad you missed zombie_wildGenerate.sqf in #1987
2017-11-14 13:09:15 -05:00
ebayShopper
c1110fc61c Fix a rare error with keyboard_keys
Some combo binds will cause actionKeys to return a number greater than
six digits. See AgentRev's note:
https://community.bistudio.com/wiki/actionKeys

An example is NumLock + P [1.15763e+009]. Using a number this large as
an index errors out. Example:
test_array = [];
test_array set [9999991,true];

But six digits or less will not error:
test_array = [];
test_array set [999999,true];
2017-11-13 17:34:43 -05:00
ebayShopper
eefcdf2610 Add basic security checks to object_killed
PVDZ_veh_Save = [_obj,"killed"]; could be abused in the same way as
server_deleteObj (42e0047)
2017-11-13 16:14:22 -05:00
ebayShopper
9fd8293246 Update server_publishVehicle3.sqf
This partially reverts f2360a9

Moved cargo fill after setPos because holding vehicle at [0,0,0] (water
location) too long may cause it to explode.
2017-11-12 11:49:59 -05:00
oiad
a1c14a2fd3 Fix broken DZE_SafeZonePosCheck for built items near safezones.
This was forgotten from my original commits
2017-11-12 12:40:34 +13:00
ebayShopper
9574aca91e Change publishVeh2 and 3 to call instead of spawn
Following 95b3174 it is now possible to use call to avoid suspension mid
execution as described in:

https://epochmod.com/forum/topic/43805-epoch-shed_safetyvehiclesqf-issue/?tab=comments#comment-292696
2017-11-11 15:59:23 -05:00
ebayShopper
67f89ceb53 Fix pricing mistake from #1982
Sell price of AKS74U_SD_DZ and AKS74U_Kobra_SD_DZ were wrong, since they
use 545 silencer (3 Goldbar). Sell price of Mosin PU variants was wrong
since it uses SCOPED not PSO attachment. @worldwidesorrow

Also corrected comment, extra Sa58 are camo variants while _DZ variants
are non-camo, so not entirely redundant

Lowered sell price of hemp, since these plants are pretty common. They
are guaranteed spawns In their spawn locations, and you can easily get 5
or more per server restart.
2017-11-10 15:38:31 -05:00
ebayShopper
0fadd1e5fc Slightly speed up a switch model check
Check once instead of twice
2017-11-10 12:03:05 -05:00
ebayShopper
ac32a8b2cd Configure DZE_SafeZonePosArray by default
Zeds and loot should not spawn in trader cities by default, regardless
of whether the server uses safe zones.

For servers that do not use safezones, the only other things affected
are salvage and instant kill for vehicle explosions in trader cities.
Neither is a significant issue. Most servers use safezones anyway.

Following d750f57, changed to exitWith so the check is only called once
instead of multiple times. Also no need to call again in
zombie_generate, since that function is only called by
building_spawnZombies which already checks it.
2017-11-09 13:52:32 -05:00
ebayShopper
89d10fc973 Revert "Only allow lock removal if door is unlocked"
This reverts commit b8dba25

As discussed with oiad on Discord, this serves no purpose now, since
DZE_lockDoor == charID means the player either just unlocked, built,
upgraded or downgraded the door, so they want to see the action.
Logically a combo lock can be removed while a door is open. In case of
it being locked, you already know the code, so it is assumed you put it
in before removing it. Completing two-three steps at once is more
convenient for the player.

Also removed _isDestructable because there are no classes which inherit
from "BuiltItems" and have a lock
2017-11-08 14:15:25 -05:00
ebayShopper
a7959c26de Fix build checks mistake in bbb7da7
@oiad when exitWith is inside an if () then it only exits that control
structure, not the whole script, so _canBuild could be overwritten by
_toolCheck below.
2017-11-08 10:59:22 -05:00
ebayShopper
441110d05b Fix wrong bleeding icon on Epoch legacy status UI
Thanks to Epoch forums user Angelone for reporting
2017-11-07 17:24:09 -05:00
ebayShopper
e1b6125761 Fix Javelin selling and _HasKey check again
@oiad Add the Javelin magazine as trade_items to a trader which only
sells magazines (like FriendlyAssaultRifleAmmo) and the Javelin weapon
as trade_weapons to a trader which only sells weapons (like
FriendlyAssaultRifle), then test your changes from f8a230e with both in
your gear. You will see it allows you to sell all the magazines and the
weapon at both traders. This is because the only condition to add the
item to the sellable array is that it exists as an entry in the
category. It never checks the entry type. This commit will check to make
sure the type matches in the config and the player's inventory.

I changed your static "trade_any_vehicle" to find the type in the
config, because it could also be "trade_any_boat/bicycle/vehicle_free".
Boats are handled differently for the hitpoints check in sellItems.sqf.

Also I noticed that both the _HasKey check and your new _y == _myVehType
check were not working for upgraded vehicles _DZE[1-4] because they had
been swapped out to  _baseVehicle. I forgot to account for that when I
added that feature.

This should resolve both problems. I tested both and everything looks
good. It can do with some more thorough testing though. Note
DZE_SaleRequiresKey is false by default.
2017-11-07 16:53:33 -05:00
ebayShopper
f2360a9cd8 Do not use localize on server machine
These were resulting in sloppy mixed language sentences.

The server language never changes, so localize should not be used server
side, unless complete translations are added for all logs, which is not
worth the effort. Only admins see them, unlike client side strings which
are seen by everyone.
2017-11-05 15:05:59 -05:00
ebayShopper
5a5323bdd7 Move large format strings to str formatText
These may exceed 2048 in some cases, so best to be safe and use str
formatText.

Partial revert of fbfb124 to more readable form
2017-11-05 12:12:26 -05:00
ebayShopper
ff397773b1 Update version numbers 2017-11-04 16:14:16 -04:00
ebayShopper
c2d2ad2956 Fix remove.sqf error from e079381
Wrecks were not deleted after removal following this change @icomrade

e079381931 (diff-e057d99bdf425219ff82fc6220a85b86L154)

In object_upgradeBuilding playerNear was exiting without readding
removed magazines.

I moved deletion back client side in packTent and upgradeStorage for
now, because there is potential for duping via pulling gear out of the
old tent during the deletion delay. PVS can be delayed especially when
the server is under load, so it can take a few seconds for the server to
delete the object after sending the request. These two scripts should be
the only ones where that could be problematic. Packing and upgrading
tents should eventually be moved completely server side like safes.
2017-11-04 14:35:51 -04:00
ebayShopper
4570c96f7f Update change log 2017-11-03 18:34:14 -04:00
ebayShopper
42e00475d6 Add sender verification to publish and swap object
Continuation of 8035df0

This is important to have on publish to identify cheaters who spam
create objects in the database or create objects with bad inventory.

- Renamed variables to backport to vanilla
- Removed % and & due to code filtering in publicvariableval.txt

Changes in modular_build.sqf were the same as player_build.sqf.

Tested with building, upgrading buildable/vehicle/tent, downgrading,
buying a vehicle, destroying tent and removing an object.
2017-11-03 16:09:14 -04:00
ebayShopper
6e48434001 Lower destroyed vehicle cleanup time to 5 minutes
Update to 78460ce
2017-10-31 14:06:43 -04:00
ebayShopper
f74e065de1 Remove redundant setVariable in humanityMorph
Setvariables made redundant by 9cc3c82

Also changed removeEventHandler to remove all, so if switchModel exits
at one of the exitWiths the player will not be left invincible.
2017-10-29 15:39:05 -04:00
ebayShopper
a229057fc6 Readd shift + P block
My mistake in 780d5d8, I forgot actionKeys doesn't work on combination
binds.
2017-10-28 18:45:04 -04:00
ebayShopper
780d5d8775 Fix force save when pressing F4
Forgot to remove F4 from the blocked list in 5acad04 @icomrade so it was
being overwritten.

Shift + P is not a hardcoded engine bind. It is just the default
DSInterface bind, so actionKeys "DSInterface" covers that in f760896.
2017-10-28 18:34:37 -04:00
ebayShopper
82ccecef6c Fix occassional reposition to roof on namalsk, napf, tavi
Closes #1993
2017-10-26 18:08:12 -04:00
icomrade
33b1b8877f Merge pull request #1992 from AirwavesMan/master
Adding door localization
2017-10-26 09:18:51 -04:00
A Man
b904ba4ca7 update 2017-10-26 15:02:35 +02:00
A Man
150068a205 Adding door localization 2017-10-26 02:14:27 +02:00
A Man
9f7695385d Update doors with localization 2017-10-26 02:13:50 +02:00
icomrade
7cd8cd18d4 revert 68be0c6003 2017-10-25 16:23:49 -04:00
ebayShopper
97a30adc3b Fix gem sell currency typo
@icomrade Correct me if I'm wrong, but it looks like this was a copy paste typo from https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcBuyableList.sqf#L57

in 83694a4
2017-10-25 14:12:01 -04:00
oiad
64b5659bbd Better checks for removing the owner of plots/doors
Revert
f0e8796996

Partial revert:
2f0774d531 (diff-c3aa237d9007054fc3a724116a5d9f1a)

This is a better check for removing the owner of plots/doors based on
conversations on discord.
Plot/door owner can remove them selves
plot/door friends can't remove plot owner
plot/door admins can remove anyone
2017-10-24 20:19:21 +13:00
A Man
7a8d23bdeb German stringstable overhaul again (#1991)
* German stringstable overhaul

* update

* update

* update
2017-10-22 20:11:35 +13:00
icomrade
0a2c352993 Merge pull request #1990 from oiad/patch-2
Fix issues with DZE_limitPlots
2017-10-15 11:56:13 -04:00
oiad
f0e8796996 Check if players are owner of other plots correctly
This fixes the checking done not picking up that a player was the owner of the plot by the userlist on the plot when it wasn't them that placed it
2017-10-16 00:04:59 +13:00
oiad
de94cdfb23 Check plot ownership when removing players from plot pole
Additional work for 73899d520f (diff-0cdf3d56b40b62e92b498e7362874f34)
This fixes an issue of players removing them selves from a plot so a friend can become plot owner and bypass the original DZE_limitPlots check
2017-10-15 23:53:24 +13:00
icomrade
eb4cc51239 Merge pull request #1989 from dreamforceinc/patch-1
Update russian translation.
2017-10-10 19:32:56 -04:00
W0LF
765ed17a78 Update russian translation. 2017-10-10 23:43:05 +03:00
icomrade
298b3e823b Merge pull request #1988 from BigEgg17/master
Added option to limit build height
2017-10-08 13:37:31 -04:00
BigEgg
e9ff8ff45b Removed "=" from dze_buildChecks.sqf
Salival recommended a >=, however upon further thought, this would be irrelevant as this variable is meant to prevent building over a certain height, not at that specific height. Having >= would restrict building at exactly 30 meters for example rather than simply above it. The = sign was also not used in modular_build.sqf
2017-10-08 00:12:19 -05:00
BigEgg
dc3939fce5 Update Change Log 2017-10-08 00:06:18 -05:00
BigEgg
3521447972 Update Change Log 2017-10-08 00:02:49 -05:00
BigEgg
20d2d1f078 Altered variable in configVariables.sqf
Salival recommended that I change the variable name to DZE_BuildHeightLimit.
2017-10-07 23:55:01 -05:00
BigEgg
c00b0ad1af Added build height check to modular_build.sqf 2017-10-07 23:53:20 -05:00
BigEgg
ac72c00687 Added build height check to dze_buildChecks.sqf 2017-10-07 23:45:27 -05:00
BigEgg
820d8bdf2b Update stringtable.xml 2017-10-07 23:42:00 -05:00
BigEgg
730dcb88a2 Add DZE_HeightLimit to configVariables.sqf 2017-10-07 23:14:30 -05:00
icomrade
67ebb65081 Merge pull request #1987 from oiad/patch-1
Alter DZE_SafeZonePosCheck to allow custom radii
2017-10-05 09:58:03 -04:00
oiad
6f7f1c7f93 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:30:48 +13:00
oiad
c1c0db9b95 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:29:58 +13:00
oiad
2a5dab6d89 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:28:59 +13:00
oiad
b318ee5c8b Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:27:58 +13:00
oiad
0aafb1d827 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:27:09 +13:00
oiad
1f1e96b8fe Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:25:31 +13:00
icomrade
e079381931 move deleteVehicle to server 2017-09-26 16:18:47 -04:00
icomrade
02ff9be46d init vars earlier in updgrade veh
also move vehicle later so the player can't get in until after vehicle is fully initialized
2017-09-25 12:36:37 -04:00
icomrade
95b3174e04 move SQF wait/loop to get OID to SQL Procedure
for some reason you cannot directly get the OID using SELECT LAST_INSERT_ID(); and you cannot return it within the same hive call as the insert call (????).

Requires new procedure for 1.0.6.2
2017-09-25 12:14:41 -04:00
icomrade
cb5d61eff7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-09-19 12:28:19 -04:00
icomrade
83eb130fd2 add BAF_L85A2_RIS_TWS_DZ #1983 2017-09-19 12:27:33 -04:00
ebayShopper
6ab4faba39 Update AI hit log
Correction for 6239959

@oiad isPlayer is not reliable on dead units which may be passed to
fa_plr2Str. Also, the other scripts which call fa_plr2Str always provide
a player, so we only want to check for AI on the hit log source.
2017-09-19 12:11:27 -04:00
icomrade
f69bd80f43 revert distance to player check
Occasionally errors out, but may not be worth implementing in Epoch due to the increased loot
2017-09-15 21:12:30 -04:00
icomrade
51ccf16c30 Fix dupe caused by dupe fix
thanks JasomTM and Salival
2017-09-15 20:16:59 -04:00
icomrade
3593e146c3 remove UH1Y gunner optics overlay
The default venom doesn't actually have an overlay, and it's pretty annoying anyway
2017-09-14 20:17:57 -04:00
icomrade
a4195948ed Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-09-14 18:24:22 -04:00
icomrade
b24129afd9 update changelog 2017-09-14 18:24:16 -04:00
icomrade
64cb21b00e Merge pull request #1982 from worldwidesorrow/master
Trader Updates for 1.0.6.2
2017-09-14 16:38:20 -04:00
worldwidesorrow
4e7f184033 Add files via upload 2017-09-14 14:42:32 -05:00
icomrade
b8d5c7cda7 Change slow zombie behavior and variable
thanks for the idea DieTanx. note: The only changes to the FSM were in the action field of the UnitReady condition
2017-09-14 12:44:44 -04:00
icomrade
7ae6aa56dd Fix #1981 and Incidental dupe
thanks @AirwavesMan
2017-09-13 14:51:34 -04:00
icomrade
d750f576ed Prevent Zed + loot spawn in safezones
thanks BaroN for the idea
2017-09-13 12:45:00 -04:00
icomrade
404210ac04 update version 2017-09-12 17:34:54 -04:00
icomrade
4773ef5af7 Fix No Owner Spam
Doesn't make sense deleting a display would cause issue on a machine without a display... typical BIS BS
2017-09-12 15:11:51 -04:00
icomrade
7637ee6cac Merge pull request #1980 from oiad/patch-15
Fix auto unlock to function like storage
2017-09-11 22:50:30 -04:00
oiad
50ec89489d Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:51:48 +12:00
oiad
76bafe55ec Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:50:52 +12:00
oiad
27801a111b Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:49:32 +12:00
icomrade
2a65a4119d Merge pull request #1979 from oiad/patch-14
Move more diag_log to debug lines
2017-09-08 20:43:58 -04:00
oiad
e8a64c3757 Move more diag_log to debug lines 2017-09-09 12:16:58 +12:00
oiad
ea38067cc1 Move more diag_log to debug lines 2017-09-09 12:11:38 +12:00
icomrade
569b1d3701 Merge pull request #1978 from oiad/patch-10
Add extra magazine instead of reloading current one
2017-09-08 18:52:13 -04:00
oiad
bc93e246ee Add extra magazine instead of reloading current one
e7ffb88075
2017-09-09 09:22:51 +12:00
icomrade
fc23bc73b2 remove hotfix from check 2017-09-08 11:42:03 -04:00
icomrade
b7eeaf2283 scripts.txt 2017-09-08 11:29:27 -04:00
icomrade
e9abd7b161 revise changelog note 2017-09-08 11:29:20 -04:00
icomrade
e0005850b8 Prevent loot pile cleanup right next to player
726155f16d
2017-09-08 11:12:40 -04:00
icomrade
0a54dd02a2 Remove 1.0.6.1A Hotfix from Missions 2017-09-08 11:07:57 -04:00
icomrade
82db7d8109 consolidate eval 2017-09-08 10:11:20 -04:00
icomrade
a21f4f797d Merge pull request #1977 from oiad/patch-8
Allow modular buildables to refund defined parts
2017-09-08 10:07:28 -04:00
icomrade
26da25bf42 Merge pull request #1976 from oiad/patch-7
Only allow lock removal if door is unlocked
2017-09-08 10:05:28 -04:00
icomrade
7a3c831eb3 Merge pull request #1975 from oiad/patch-13
Exclude DZE_PlotManagementAdmins from build checks (safeZone/no build…
2017-09-08 10:05:02 -04:00
icomrade
894ea80c16 Merge pull request #1974 from oiad/patch-3
Add support for keeping the key on vehicle sale
2017-09-08 10:04:35 -04:00
icomrade
1f929b526b Merge pull request #1972 from oiad/patch-12
Fix javelin/stinger selling
2017-09-08 10:04:10 -04:00
icomrade
7ad57d999f Merge pull request #1968 from oiad/patch-6
Switch forgotten "time" to "diag_tickTime"
2017-09-08 10:03:44 -04:00
icomrade
89019f1ced Merge pull request #1967 from oiad/patch-5
Fix bad sentences for locking/packing fails.
2017-09-08 10:03:12 -04:00
icomrade
ec78f61918 Merge pull request #1966 from oiad/patch-4
Dont show incomplete lockbox code
2017-09-08 10:03:01 -04:00
icomrade
58171acda2 Merge pull request #1964 from oiad/patch-2
Remove comment for engine starting/stopping
2017-09-08 10:02:31 -04:00
icomrade
23597db275 Merge pull request #1963 from oiad/patch-1
Fix vehicles bouncing when upgrading.
2017-09-08 10:01:49 -04:00
icomrade
6239959a13 Merge pull request #1962 from oiad/master
AI hit messages and continuity
2017-09-08 10:01:31 -04:00
oiad
cdd0db805f Remove debug lines 2017-09-03 19:27:30 +12:00
oiad
5378b1ad76 Fix random count 2017-09-03 19:18:55 +12:00
oiad
ce756a0622 Allow modular buildables to refund defined parts 2017-09-03 19:13:56 +12:00
oiad
0507563e17 Allow modular buildables to refund defined parts 2017-09-03 19:11:53 +12:00
oiad
e1f48ea557 Allow modular buildables to refund defined parts
This allows typically not refunded modular buildables to be configured by the server admin.

	For example:
	DZE_modularConfig = [
		["CinderWall_DZ", [["CinderBlocks",7],["MortarBucket",2]]],
		["CinderWallDoor_DZ", [["CinderBlocks",7],["MortarBucket",2],["ItemTankTrap",3],["ItemPole",[1,3]]]]
	];

	This would refund 7 cinder blocks and 2 mortar for "CinderWall_DZ"
	For "CinderWallDoor_DZ" you would get 7 cinder blocks, 2 mortar, 3 tank traps and a random number of poles between 1 and 3.
	The refund amount can be an array where the first param is the minimum and the second is the maximum, it will refund a random amount between them.

Thanks to @BigEgg for the suggestion and sample code.
2017-09-03 19:03:33 +12:00
oiad
b8dba25cc5 Only allow lock removal if door is unlocked 2017-09-03 13:56:06 +12:00
oiad
08796c65de Update server_swapObject.sqf 2017-08-31 00:07:16 +12:00
oiad
5eba1edf4b Update server_publishVehicle.sqf 2017-08-31 00:06:44 +12:00
oiad
9b79dde3aa Update server_publishVehicle3.sqf 2017-08-31 00:05:35 +12:00
oiad
bbb7da7c3c Exclude DZE_PlotManagementAdmins from build checks (safeZone/no build near) 2017-08-31 00:03:36 +12:00
oiad
7a40f5d621 Add support for keeping the key on vehicle sale 2017-08-30 23:48:48 +12:00
oiad
63bc345f9f Add support for keeping the key on vehicle sale 2017-08-30 23:47:20 +12:00
oiad
f8a230e3b1 Fix javelin/stinger selling
The previous fix 4fa36dfd94 was not working correctly, if you had say the a stinger launcher and a stinger ammo it would detect them both as weapons, this properly classifies them and all others as how they should be.

Moved to use epoch_tempKeys also

This forces the player to only be able to sell a vehicle from the gear menu instead of backpack and vehicle menu since most of the time you would be using add all.

From: https://epochmod.com/forum/topic/44413-prevent-selling-vehicles-from-backpack/?tab=comments#comment-297328
2017-08-26 09:56:28 +12:00
oiad
7decf4dd9e Switch forgotten "time" to "diag_tickTime"
Seems like these were forgotten at some point, the rest are diag_tickTime
2017-08-21 20:50:23 +12:00
oiad
5fc0b36e5b Fix bad sentences for locking/packing fails. 2017-08-20 23:00:35 +12:00
oiad
403e40063f Update server_handleSafeGear.sqf 2017-08-19 20:28:46 +12:00
oiad
367d74f3f4 Update server_handleSafeGear.sqf 2017-08-19 11:53:11 +12:00
oiad
ecf013839e Dont show incomplete lockbox code
If the player enters a wrong code the algorithm can make the entered code seem completely bogus, let's just exit out of the routine if that's the case.

Sample bad code (Just hit red key):
```11:45:54 "salival (playerUID) FAILED unlocking LockBox with code: Red0-9900 (actual: Red34) @038117 [3899.36,3580.24,1.632]"```
2017-08-19 11:46:35 +12:00
oiad
e21e0e217f Remove comment for engine starting/stopping
Actually makes this functional without editing it, this is quite useful for custom scripts.
2017-08-17 23:33:51 +12:00
oiad
bdfbcb1e32 Fix vehicles bouncing when upgrading.
This helps stop vehicles bouncing when being upgraded.
The Vehicle Key Changer script I rewrote uses the epoch vehicle upgrade system to claim/change the vehicle key, we noticed that it was causing the vehicles to bounce, but VKC uses all the position functions from the epoch script so it's not something that VKC has introduced.
2017-08-17 23:28:16 +12:00
oiad
4355824aad Revert commit 2017-08-17 23:25:08 +12:00
oiad
d04a99aa04 Fix vehicles bouncing when upgrading.
This helps stop vehicles bouncing when being upgraded.
The Vehicle Key Changer script I rewrote uses the epoch vehicle upgrade system to claim/change the vehicle key, we noticed that it was causing the vehicles to bounce, but VKC uses all the position functions from the epoch script so it's not something that VKC has introduced.
2017-08-17 23:19:48 +12:00
oiad
7428f3fd1f AI hit messages and continuity
This changes the hit messages to only show AI instead of the AI's names.
Changes this:
20:08:37 "P1ayer PID#7(salival) hit by PID#1(Qadeer Hakimi) with
vil_G36VA4Eot/B_556x45_Ball <ammo left:25> from 356 meters in head_hit
for 0 damage"
To this:
20:08:37 "P1ayer PID#7(salival) hit by AI with
vil_G36VA4Eot/B_556x45_Ball <ammo left:25> from 356 meters in head_hit
for 0 damage"

Sanity fix for hit and kill for vehicles so they match:
Before:
22:44:03 "P1ayer PID#3(salival) hit by AI in Pickup (PK) DZ from 15
meters in head_hit for 0.88666 damage"
After:
22:44:03 "P1ayer PID#3(salival) hit by AI with a Pickup (PK) DZ from 15
meters in head_hit for 0.88666 damage"
Kill message:
22:44:04 "salival (76561197999617086) salival was killed
by AI with a Pickup_PK_INS_DZ from 15m"
2017-08-17 23:09:10 +12:00
ebayShopper
026788e714 Block another A2OA script execution exploit
Thanks to Dihan for reporting on Discord.

This exploit may work with other event handlers, displays and controls.
Please leave a comment if you find any others that work. I tested GPS,
abort, MP setup and group menu displays, as well as the map diary list
box controls, but none of those had this problem.

This should be fixed with an A2OA patch, please report to Bohemia.
2017-08-13 16:07:03 -04:00
icomrade
368aa1217b Merge pull request #1961 from oiad/master
Condense locked status to a variable
2017-08-06 14:40:28 -04:00
oiad
2a01194d87 Condense locked status to a variable
This will be easier for custom mods that use the lock checking
(vkc/virtual garage etc) as well as removing overhead from
fn_selfActions
2017-08-06 09:41:23 +12:00
icomrade
de36dee67c Update scripts.txt 2017-08-04 20:59:11 -04:00
icomrade
b701907c18 Merge pull request #1960 from oiad/master
extend epoch_tempKeys to return key classnames also
2017-08-04 10:03:24 -04:00
oiad
751fdc9e82 extend epoch_tempKeys to return key classnames also 2017-08-04 23:18:27 +12:00
icomrade
68be0c6003 remove squad xml input box
doesn't actually stop a squad xml from being loaded, but if the player opens the panel the url will be erased from their profile file
2017-08-03 17:01:30 -04:00
icomrade
ae0ddbe735 duplicates 2017-08-03 17:00:09 -04:00
icomrade
e2f14dcb04 adjust filters 2017-08-02 18:59:15 -04:00
icomrade
e326678504 Don't str str 2017-08-02 18:57:26 -04:00
icomrade
f7608965df remove server control panel 2017-08-01 20:54:39 -04:00
icomrade
9cc3c82d5d set humanity early 2017-08-01 19:34:15 -04:00
icomrade
fbfb124296 use str instead of format 2017-08-01 17:39:53 -04:00
icomrade
9acae56aba more scripts.txt filters 2017-07-30 18:41:57 -04:00
icomrade
6c7b884958 restrict again 2017-07-30 18:39:38 -04:00
icomrade
688c6a9423 increment version 2017-07-30 17:57:39 -04:00
ebayShopper
7a68f9f70b Add some basic compatibility for Ruegen map 2017-07-30 16:28:37 -04:00
ebayShopper
84556c9d03 Revert group menu color scheme to A2OA default 2017-07-30 12:44:58 -04:00
icomrade
de92ae22be reduce charset 2017-07-29 21:12:23 -04:00
icomrade
096da756fe Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-07-29 21:09:26 -04:00
icomrade
8035df0ba0 Rudimentary auth for DeleteObj
limits distance to object, as well as validating random auth key.  added server_deleteObjDirect which is only for direct execution on the server, whereas server_deleteObj should be used for PVEH execution only
2017-07-29 21:09:20 -04:00
oiad
09bfddb46c Remove extra fn_selfActions check for refueling. (#1958) 2017-07-29 17:59:52 -04:00
icomrade
9b3ccaaa02 forgot 2017-07-29 17:32:08 -04:00
icomrade
4191fbfc3a should fix invincibility 2017-07-29 17:31:23 -04:00
icomrade
bc4be38629 tweak switch model/morph again 2017-07-29 14:50:24 -04:00
icomrade
ff7ec49ac5 make important point 2017-07-26 17:58:02 -04:00
icomrade
a0a54fbb7b Update PV filter 2017-07-26 16:37:33 -04:00
icomrade
bd35e0a574 Should prevent change clothes dupe
awaiting feedback, but I half-commited it in my previous commit accidently, so whatever
2017-07-26 12:46:58 -04:00
icomrade
73926b8785 prevent logout with d/c #1938
Should work to prevent the issue described in #1938 by disabling the abort option, causing the player to alt + F4 if they want to log out without reconnecting. which results in the gear pile/weaponholder from not being created.
2017-07-26 12:39:37 -04:00
icomrade
5acad04c43 should fix #1938
Also prevents logout on onPause conditions, i.e. logout if in combat, another player is near, or a zombie is near
2017-07-25 14:32:49 -04:00
ebayShopper
db0ef1b744 Update publicvariableval.txt radio filter
c4c9e1da0a (commitcomment-23071506)
2017-07-13 19:18:59 -04:00
ebayShopper
c4c9e1da0a Kick for radio commands in publicvariableval.txt 2017-07-12 20:34:51 -04:00
ebayShopper
635e1e5483 Use alive for gut zombie check #1957
Closes #1957
2017-07-08 15:40:06 -04:00
ebayShopper
78460ce4fc Delete all CrateLong in cleanup
Continuation of aab4262

Did not realize multiple are created for each vehicle
2017-06-24 15:27:22 -04:00
ebayShopper
aab4262ebb Add cleanup of destroyed vehicles and CraterLong 2017-06-24 11:14:39 -04:00
A Man
a7f2c88c32 Fix Corepatch AS50 magazine spawn (#1955)
* Fix Corepatch AS50 magazine spawn

The Corepatch broke some of the AS50 magazine spawns. Im not sure why it happend sometimes and sometimes not.

This message showed up sometimes: No entry 'bin\config.bin/CfgMagazines-5Rnd_127x99_as50_CP'.

The CorePatch use that: 

e0d06f7086/CorePatch_CIT_14888/config.cpp

This commit should fix that error message and the AS50 name as well.

* Define 5Rnd_127x99_as50_CP class

* Update AS50 fix

* Revert AS50 ammo fix
2017-06-24 09:34:53 -04:00
ebayShopper
efccc4a28d Remove take mine action from engineer skins
Closes #1954
2017-06-24 09:28:17 -04:00
ebayShopper
6fec7bc4a2 Fix short knockouts for tranquilizer bolt
Vanilla commit:

9b5d1409bd
2017-06-23 18:16:57 -04:00
ebayShopper
bd9aee620f Lower journal cover sound volume
Vanilla commit:

7e5b0a98a7
2017-06-23 15:19:26 -04:00
icomrade
38de4b0859 no longer needed 2017-06-19 14:57:16 -04:00
icomrade
7771920dc7 fix worlds error
should have just done it this way first :/
2017-06-19 14:56:40 -04:00
icomrade
c4682e5346 Mitigate PboDLL limitation
this mitigates a newly introduced/reduced limitation on config size/entries when rapying content with Mikero's PBO tools. This issue will unfortunately not be fixed, hence moving keys to Epoch_B
2017-06-18 21:39:22 -04:00
icomrade
67bc61ff94 access is useless, update CFG Worlds 2017-06-16 13:35:32 -04:00
icomrade
78c980f14a update loot pos for TV tower + ATC 2017-06-16 13:34:59 -04:00
ebayShopper
09b376c584 Fix dramatic recoil camera shake bug
As reported in:

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

Vanilla commit:

1d80da5813
2017-06-11 18:33:25 -04:00
ebayShopper
88f7687bec Prevent double death issue
Prevents conflicts with using setDamage or setHit to kill a player as
described in:

https://epochmod.com/forum/topic/43990-when-player-dies-kill-message-appears-twice-and-spawn-in-worldspace/#comment-293696

Vanilla commit:

a7b650daa1
2017-06-11 17:57:49 -04:00
ebayShopper
75ba14a68d Fix stringtable typo 2017-06-11 17:52:59 -04:00
ebayShopper
e0d271671a Remove unused crafting recipes
Vanilla commits:

809de6a0a3

93c128085a
2017-06-10 13:06:16 -04:00
ebayShopper
5864bbcbf8 Readd crossbow reload sound
Vanilla commit:

c4e9b85e7d
2017-06-10 12:09:22 -04:00
ebayShopper
ddd66777df Add fuel containers loot group
Vanilla commits:

e51bde7c31

4e938fdaf7
2017-06-10 11:36:52 -04:00
ebayShopper
39e05ad0e4 Update vanilla building
Vanilla commits:

2ec04a7f8d

f333910f95

156b90ccb5
2017-06-10 10:45:14 -04:00
ebayShopper
867c618470 Fix double tranquilized message
Vanilla commit:

ee22070e9a
2017-06-10 10:17:30 -04:00
ebayShopper
abdb3e0e42 Fix survival time not counted after clothes change
Vanilla commits:

cf4fde6335

74dd04616f
2017-06-10 10:07:19 -04:00
ebayShopper
90d84648cd Add CZ550 and Enfield bolt animations by @Streatman
Vanilla commits:

a9dfb45bec

4d4373ba80

8dc4f22346

7fa4ba43fe

d8fd0dd0dc
2017-06-10 09:13:06 -04:00
ebayShopper
72df07bdf2 Remove medic animation from lock and unlock safe
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
2017-06-06 18:53:44 -04:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
icomrade
36b67affee More lootPos 2017-04-30 10:18:25 -04:00
icomrade
0281c329b3 Loot pos updates
still need lootposSmall definitions. I think that these should be the
extent of new/changed buildings - aside from the TV/radio tower on green
mountain, which I cannot get the replacement model to spawn for
2017-04-29 19:10:56 -04:00
ebayShopper
b5c2cd11cc Add download link in sever install guide 2017-04-22 13:51:26 -04:00
ebayShopper
373dd73825 Update server install guide formatting 2017-04-22 13:46:08 -04:00
icomrade
0b76e73592 update changelog and credits 2017-04-21 13:04:36 -04:00
ebayShopper
3560ac65b7 Allow anyone to lock a door #1944 2017-04-20 14:50:10 -04:00
d003c62872 Update stringtable.xml (#1951)
Added russian translation for "STR_EPOCH_PLOTMANAGEMENT_CANT_REMOVE" and "STR_EPOCH_DOORMANAGEMENT_CANT_REMOVE" (#1948)
2017-04-20 13:13:15 -04:00
ebayShopper
78c4ebd597 Add hidden gear display for force saves
Vanilla commits:

a4f8690404

9170e0f8a0
2017-04-17 17:04:17 -04:00
oiad
2f0774d531 Forbid removing the plot/door owner from objects (#1948)
This makes it so only the door or plot owner can remove them selves from
doors/plots or the UIDS in
DZE_PlotManagementAdmins/DZE_DoorManagementAdmins.
2017-04-17 13:52:36 -04:00
740e171d86 stringtable.xml (#1947)
* stringtable.xml

Improvement russian translation.

* Update stringtable.xml

* Update stringtable.xml
2017-04-17 13:37:14 -04:00
ebayShopper
75a12ad953 Rejoin group after dropping and picking back up radio 2017-04-17 11:49:54 -04:00
ebayShopper
3b12dc09d3 Remove two unused files 2017-04-16 17:46:55 -04:00
ebayShopper
0553f743d5 Increase preview offset for BagFenceRound and Safe
Collisions with the player caused sliding when the safe was pitched
forward. It was the same issue with proning against the sandbag. #1945

Note the player can still cause collision sliding by using snap to get
the preview closer to them.
2017-04-16 14:39:07 -04:00
oiad
8d3be10e61 Fix BagFenceRound making the player slide (#1946)
Fixes: https://github.com/EpochModTeam/DayZ-Epoch/issues/1945
2017-04-16 13:54:25 -04:00
ebayShopper
78fbd7ac53 Remove some unnecessary translations
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
2017-04-15 14:19:26 -04:00
icomrade
f20982fe85 Update HiveExt with Vanilla changes
@ebayShopper
2017-04-14 18:21:16 -04:00
ebayShopper
4bf4c62b1d Make free slots display more accurate in gear
Use the cursorTarget at the time the gear dialog was opened instead of
the cursorTarget at the time the script runs. The script can be delayed
by several seconds (spawn is scheduled).
2017-04-14 17:18:16 -04:00
ebayShopper
e99792d0f4 Update jerry_fill.sqf
Vanilla commit:

ef236938c1
2017-04-14 11:26:23 -04:00
ebayShopper
9fc72a8b87 Change dayz_survived to actual play time
Vanilla commits:

18eaecb19f

b76b1200ca

78ea61e334

8309427f0d

Should be ready for Hive update @icomrade . If you upload it to a test
folder I'll test it.
2017-04-13 18:35:28 -04:00
ebayShopper
267f34572e Update object_upgradeStorage.sqf
Vanilla commit: 6e4a697
2017-04-13 14:38:07 -04:00
ebayShopper
272fd5f1ef Update stringtable.xml 2017-04-13 13:02:57 -04:00
1bd70a3d2d stringtable.xml (#1943)
Adding and reworking some russian translation. Again.
2017-04-13 12:56:24 -04:00
ebayShopper
1065e722a6 Allow removal of RIS from SA58_RIS_DZ
Note RIS can not be removed from higher variants due to other
attachments depending on the RIS being attached first.

Closes #1940
2017-04-12 13:42:39 -04:00
oiad
bf6a980d4c Dont show you have the item if it's not nearby (#1937)
* Dont show you have the item if it's not nearby

This was showing you had a vehicle in the trader menu even if it was
over the other side of the map, I think this works better only showing
it if it's within the trader zone.

* Forgot missing operator
2017-04-10 20:03:37 -04:00
ebayShopper
c39fc86972 Update Napf and Namalsk waterHoleProxy again
Some were still missing after 89292b3. These are now complete
auto-generated lists for the whole map.
2017-04-10 17:39:50 -04:00
ebayShopper
a3df5ca2dc Remove unused legacy wrecks #1933 2017-04-09 14:30:54 -04:00
ebayShopper
df526285cd Fix potential undefined dayz_characterID variable on login
The scheduler can start running fn_selfActions before player_monitor.fsm
defines dayz_characterID when login or network return is slow.
2017-04-08 19:19:47 -04:00
oiad
992ab199dd Convert DZE_SafeZoneNoBuildItems to handle nested arrays for custom d… (#1934)
* Convert DZE_SafeZoneNoBuildItems to handle nested arrays for custom distances per items.

This makes the DZE_SafeZoneNoBuildItems be able to handle nested arrays,
This allows you to set custom distances per item instead of having it
all the default distance.

E.g DZE_SafeZoneNoBuildItems =
["VaultStorageLocked","LockboxStorageLocked",["Plastic_Pole_EP1_DZ",1300]];

* Fix forgotten exitWith syntax.

* Removed unneeded check.
2017-04-08 18:45:29 -04:00
ebayShopper
89292b3f37 Correct some waterHole positions for Napf and Namalsk
https://epochmod.com/forum/topic/43623-cant-fill-water-bottles-on-napf/
2017-04-08 16:05:59 -04:00
abdca1bd30 Russian translations in stringtable.xml (#1935)
Adding and reworking some russian translation. Not completed yet!
2017-04-07 17:42:11 -04:00
ebayShopper
3bdbc020c4 Fix error from 4b14397 2017-04-05 17:13:09 -04:00
ebayShopper
75cf8648d7 Fix error from 95ab6a2 2017-04-05 15:59:15 -04:00
ebayShopper
4b14397c7b Fix purchased boat not spawning on helipad
https://epochmod.com/forum/topic/43644-problem-with-napf-boat-spawn-in-1061/
2017-04-05 15:49:16 -04:00
ebayShopper
95ab6a28ab Fix unable to sell _DZE1-4 cars when base is removed from trader
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/
2017-04-05 12:04:00 -04:00
ebayShopper
b70555e664 Delete added trees after chopping down
Like 496681c, if a tree or plant was added with createVehicle it can be
deleted with deleteVehicle.
2017-04-04 13:55:43 -04:00
ebayShopper
496681cd9b Add support for harvesting added plants
Closes #1928
2017-04-04 13:32:06 -04:00
ebayShopper
cb09bb6bc9 Tweak RunOver damage scaling again 2017-04-03 15:31:14 -04:00
ebayShopper
f51ae4f071 Tweak RunOver damage scaling
More RunOver damage is processed after b3fdd26. This number may need to
be tweaked further after more testing.

This reverts 7d6651b.
2017-04-01 17:23:32 -04:00
ebayShopper
107bb6d227 Fix group saving issue 2017-04-01 15:29:12 -04:00
ebayShopper
f8aff48ab9 Update dayz_filterGroup
This sometimes throws WARNING: Function 'name' - x is dead RPT, so
"alive" appears to update too slowly for this as mentioned in:
https://community.bistudio.com/wiki/Talk:alive
2017-04-01 14:23:07 -04:00
ebayShopper
663170ae32 Remove upgrade option from dayz police car
Also added setvariable.txt exceptions for missing police car hitpoints

Fixes #1929
2017-04-01 13:48:02 -04:00
oiad
088945e074 Remove public variable event handler when using config traders. (#1930)
* Remove public variable event handler when using config traders.

This stops the public variable event handler from being loaded when
you're using config based traders, it's not needed in this situation

* Change nearestObjects to nearEntities in z_checkCloseVehicle.sqf

* Fixes vehicle selling not able to sell correctly

If more than 1 vehicle of the same classname was in a trader and the
local vehicle was further away it would not be able to be sold till
moved closer. We are using DZE_myVehicle for everything and we do
previous checks to make sure it's not null and local so we can assume it
is okay to use.

Fixes
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/#comment-290036
2017-04-01 13:02:51 -04:00
ebayShopper
7d6651b1fe Use normal scaling for RunOver head hits 2017-03-31 19:22:42 -04:00
ebayShopper
3dc71602c0 Fix death message killer inaccurate in some cases 2017-03-31 18:30:39 -04:00
ebayShopper
6717b0c26e Remove client side disable sim on DZE_GodModeBase objects
Continuation of d7a3b30
This partially reverts ea94ec4.

Epoch has never disabled simulation client side on any buildables prior
to ea94ec4. We now know it disables storage capability, may disable
lighting the object with scripted light sources and potentially cause
other issues.
https://community.bistudio.com/wiki/enableSimulation

If we readd this in the future it should be well tested. It should also
be done properly in the vehicle init field, so it takes affect on all
clients, including JIP, instead of only the player building it (until
they relog).
2017-03-31 16:15:07 -04:00
ebayShopper
d5e808e4d1 Lower group icons resource layer
Following 12abbfa
2017-03-31 15:12:24 -04:00
ebayShopper
0e244196e5 Update keyboard.sqf
Forgot to remove after
https://github.com/EpochModTeam/DayZ-Epoch/commit/d1d5fe5#diff-91da615cb902d0198b7cd4c9b91b6fd0L351
2017-03-31 12:33:17 -04:00
ebayShopper
b3fdd26d3b Update fn_damageHandler.sqf
Continuation of 50ba58f

Also removed some unused variables
2017-03-30 17:26:25 -04:00
ebayShopper
746b921321 Use nearEntities for plot pole searches
Also made 73899d5 compatible with DZE_permanentPlot = false; at the
request of @oiad
2017-03-29 16:04:48 -04:00
ebayShopper
30d961931f Fix unable to sell classic 'ItemBloodbag' at traders
Mistake from 4fa36df
2017-03-29 12:22:31 -04:00
ebayShopper
c6c7472ab7 Hide corpse markers for bodies that are hidden 2017-03-28 14:31:29 -04:00
icomrade
35556adbfb Merge pull request #1918 from oiad/master
Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
2017-03-28 08:53:14 -07:00
icomrade
54fc40fbe3 Fix DZE_defaultSkin 2017-03-28 11:52:12 -04:00
oiad
d7a3b30753 Fix for unable to access shed/geared objects until you relog.
https://epochmod.com/forum/topic/43482-storage-sheds-issue/
2017-03-28 19:25:14 +13:00
icomrade
12abbfa686 Should fix #1926 2017-03-27 23:53:08 -04:00
icomrade
0275c58a89 Fix CFGMoves Server CTD
Reported to CorePatch maintainer.
2017-03-27 18:16:51 -04:00
ebayShopper
c501a80dd7 Cleanup formatting from #1921 2017-03-26 14:37:14 -04:00
F507DMT
226dfcce53 Update object_monitorGear.sqf (#1921)
A few optimizations.

_weapons = []; THEN agen - _weapons = (getWeaponCargo _object) select 1; Same with _magazines, _backpacks
_weapons THEN use only one time: count _weapons, same with _control,_magazines, _backpacks
use many time (typeOf _object), better use one variable for that: _type

FIX in loop:
one more check old this bag: https://www.youtube.com/watch?v=3ecWX21wEe4

Use this, if you think it's right
2017-03-26 14:12:33 -04:00
F507DMT
04d1622bc9 Update fill_nearestVehicle.sqf (#1923)
() - condition
{} - code execution, heavier code
2017-03-26 13:27:26 -04:00
ebayShopper
50ba58f5ae Fix death message showing RunOver when it shouldn't 2017-03-25 20:05:36 -04:00
ebayShopper
87abb204e9 Prevent drop melee weapon dupe
Also simplified player_addToolbelt by removing unnecessary code.

See: https://github.com/EpochModTeam/DayZ-Epoch/pull/1916
2017-03-25 16:27:58 -04:00
oiad
5abdefe792 Update german string 2017-03-25 10:06:48 +13:00
ebayShopper
289a042e1d Update scripts.txt createVehicleLocal exceptions
Update for 6a711de
2017-03-23 16:52:15 -04:00
ebayShopper
6a711deccc Add reliable workaround for swimming in ground and air issue
Fixes #1913
2017-03-23 15:58:14 -04:00
oiad
9d6d1386cd Add german string 2017-03-24 06:52:34 +13:00
oiad
73899d520f Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
This adds DZE_limitPlots where admins can restrict a player to only
having 1 plot pole. Disabled by default.
2017-03-23 22:39:22 +13:00
ebayShopper
665ecd9146 Add filter cheats back to map display
I removed this in 416fdbc, but upon testing again it appears I was wrong
and this is still needed. #1915
2017-03-22 15:49:05 -04:00
ebayShopper
ad7a12771a Fix swimming in ground again #1913
Closes #1913
2017-03-22 14:59:31 -04:00
ebayShopper
fa18cbce51 Add ghost models for tents
Vanilla commits:

8c48716c43

67c031697b
2017-03-20 18:32:44 -04:00
ebayShopper
8b3f28dc0c Update player_sharpen.sqf
Fixes extra knife being deleted if player already had a fully sharpened
knife on their toolbelt (duplicate weapon).

Vanilla commit:

0332fcbe71
2017-03-20 18:18:04 -04:00
ebayShopper
d4eb7ac6e4 Block bypassing unconscious wake up animation with bandage
Vanilla commit:

698eacba79
2017-03-20 18:01:30 -04:00
ebayShopper
da3b345921 Update push plane conditions
Vanilla commit:

23f6ffab90
2017-03-20 17:44:46 -04:00
ebayShopper
93d6c85dbc Skip gear sound in player_forceSave
Don't play sound when gear flashes open momentarily for force save and
backpack mag ammo count.

Vanilla commit:

98784aae79
2017-03-20 17:26:41 -04:00
ebayShopper
8d545d14a1 Fix dayz_lastSave variable again
Continuation of bca17aa.

This variable is set in player_forceSave and uses diag_tickTime.

Vanilla commits:

f8c88502e8

98af0ed8b9
2017-03-20 16:46:11 -04:00
ebayShopper
7833f6743f Update zombie_agent.fsm
Vanilla commits:

3571cf9384

728c83bdbd
2017-03-20 16:31:04 -04:00
ebayShopper
e38f47375c Fix some issues with traps
Removed two unused files.

Vanilla commits:

42e72463a3

02726fb192

6a7c53ebcf

1fb6308995

9543ea057f
2017-03-20 15:53:35 -04:00
ebayShopper
100f9f5da8 Fix unable to chop down POI trees
Vanilla commit:

0bc12e21b0
2017-03-20 14:58:49 -04:00
ebayShopper
e81f19757e Move POI back to global spawn again
These contain trees and buildings which need their chopped/destroyed
status synchronized for all clients.

This reverts c21a731.

Vanilla commit:

32f2fa3b22
2017-03-20 14:25:32 -04:00
A Man
098f580c3d german string update (#1912)
* german string update

* Updating german death messages

* Update

* update
2017-03-20 13:38:23 -04:00
ebayShopper
3d8814bc33 Update vanilla building
Vanilla commit:

5604a8820b
2017-03-19 16:59:41 -04:00
ebayShopper
53158a11ed Remove rtitleText in fillBloodBag.sqf
Not necessary to inform recipient and prevents two messages on screen at
once for instigator.

Classic bloodbag system is now added in vanilla too.

Vanilla commits:

cb71d926ed

bee9bd1638
2017-03-19 16:35:17 -04:00
oiad
9324deffaf server_updateObject better version. (#1910)
Cheers @ebayShopper
2017-03-16 11:46:23 -04:00
icomrade
ad8fe42eeb Merge pull request #1909 from oiad/master
Revert force coins update, Add seperate coins update
2017-03-15 15:09:39 -07:00
oiad
8c42460ba9 Revert force coins update, Add seperate coins update
This reverts
ce75f87e1d
2017-03-16 06:56:29 +13:00
icomrade
bca17aa2d6 Fix forcesave check
thanks @eraser1
2017-03-14 14:51:22 -04:00
icomrade
2e3f13bda2 oops 2017-03-12 22:24:16 -04:00
A Man
ab15716913 Fixing very old spelling mistake (#1906)
* Fixing very old spelling mistake

Thanks @Daddelbandit

* Update mission.sqm

* Update mission.sqm

* Update mission.sqm
2017-03-12 19:20:51 -04:00
ebayShopper
c19a138804 Use formatText in mission check
Avoids format character limit
closes #1905
2017-03-11 20:41:33 -05:00
oiad
2ec5390b70 Standardize coin variables, prevent coins not refreshing on skin change. (#1904)
* Standardize coin variables, prevent coins not refreshing on skin change.

* Add missing commit
2017-03-11 13:05:34 -05:00
icomrade
6871da6168 add hotfix files to mission check 2017-03-10 13:56:17 -05:00
icomrade
a3f22197de 1.0.6.1 hotfix A
update changelog
add mission check
add fixes for group icons and nutrition to mission files
2017-03-10 13:50:33 -05:00
ebayShopper
f22460491a Fix group tags scaling glitch
My mistake from b148293
2017-03-09 13:10:29 -05:00
icomrade
50b71a08b7 Update changelog 2017-03-08 13:58:54 -05:00
icomrade
7a6c6df33b re-add config for nutrition 2017-03-08 13:57:00 -05:00
ebayShopper
da34b688d2 Fix hunger and thirst "working" hits way too high
By default this was multiplying all "Working" hunger and thirst hits by
10 @icomrade  because (1 min 0.1) always picks 0.1. For example:
dayz_thirst = dayz_thirst + (5 / 0.1)
dayz_thirst = dayz_thirst + 50

A config variable isn't really needed for this, since it is only used in
one file. It can be easily configured in compiles.sqf which most servers
already overwrite anyway.

This reverts 62b7c21.
2017-03-08 13:08:46 -05:00
ebayShopper
92b09aa530 Remove some unused variables
Vanilla commit:

6479708205
2017-03-05 12:17:09 -05:00
ebayShopper
5c0e8473df Add a few Namalsk and Takistan loot positions
This adds a few new buildings. Most buildings were just moved around
with no changes.

Vanilla commit:

0173614d0c
2017-03-05 11:13:19 -05:00
ebayShopper
9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

78b608c854
2017-03-05 09:59:11 -05:00
ebayShopper
cfe7b97c73 Update two scripts.txt exceptions
Made buttonclick exception a little stricter

Consolidated two setPosASL exceptions that were both in
plotToggleMarkers.sqf
2017-03-04 15:28:23 -05:00
ebayShopper
3f3d8ce357 Disable A2 auto-refuel feature on KamazRefuel trucks #1855
Fixes #1855

Mistake from 0701e5b
2017-03-03 13:30:13 -05:00
A Man
496ae979b3 Update strings for two missing german translations (#1900) 2017-03-02 12:43:38 -05:00
icomrade
5f51dcca44 Cleanup TestBuild 2017-03-02 09:55:19 -05:00
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
icomrade
1afbc38566 Cleanup for Release
we don't use the redryder source on here anymore
2016-11-30 13:12:50 -05:00
ebaydayz
74cc99ddad Remove identical lootPos comment
There was no difference between the lootpos except spacing after the
commas.
2016-11-30 12:17:06 -05:00
icomrade
c56e0d722c oops, these were already defined 2016-11-30 11:58:35 -05:00
ebaydayz
4ffa25adf2 Improve rejoined group message grammar 2016-11-30 11:58:29 -05:00
icomrade
fc98864db9 LootPos for @MGTDB 2016-11-30 11:55:20 -05:00
ebaydayz
546dc4fc41 Update scripts.txt 2016-11-30 11:54:26 -05:00
ebaydayz
bee00e9a57 EnableRadio if globalChat death messages are on 2016-11-30 00:36:51 -05:00
ebaydayz
27ee69695c Update my username in readmes 2016-11-30 00:08:52 -05:00
ebaydayz
416fdbc4ab Improve filterCheats and VON block
Filter cheats is now added to the main options menus that needed it.

It is not needed on the map (display 12) because KeyDown for display 46
also fires when it is open. So filterCheats was firing twice (once on
each display) in that case.

KeyDown does not fire on display 63 at all
regardless of whether PTT or VON is held down, toggled or chat open.
Keydown does fire on 55, but only after the mic icon is locked on, so it
is of limited use. MouseButtonDown does not fire on 55 or 63. So it is
useless to add to those displays. You can confirm this with:
(findDisplay 63) displayAddEventHandler ["KeyDown","systemchat
'fired';"];

Filter cheats is now only checked on display 46 when a
voice, channel, or cheat key is pressed instead of on every key press.
This still works 100% of the time for blocking cheat input. For
performance reasons it's probably not worth checking all the conditions
in filterCheats with every key press on display46 just for the VON
block. Doing so covers some edge combination bind cases better, so it
may be worth considering again if no better alternative is found. For
now this solution is good enough to cover the majority of cases without
slowing down the keyhandler during normal usage.

The VON message now
tells you exactly which channel block you triggered instead of listing
all of them.

Fixed issue mentioned in 52c9c7c with VON getting stuck on when using a
double tap keybind.

Tested:
1. Talk in side with regular/combo/mouse bind
2. Change channels
while mic is locked on with regular/combo/mouse bind
3. Change channels
with Up/Down arrows while chat is open.
4. Trying all cases in steps 1-3
with a dialog open.

It is possible to bypass the VON block with some different control
settings and combinations of the above, but for default controls and
common usage it works the majority of the time.
2016-11-29 23:44:28 -05:00
ebayShopper
429a6aec9b Disable moving group dialog 2016-11-29 12:14:08 -05:00
ebayShopper
77d5ffc3eb Add missing setVariable hitpoints for CH53 and Merlin 2016-11-29 11:44:48 -05:00
ebayShopper
2cb55d85cd Don't show low FPS hint when map is open
FPS is automatically capped on map display.
2016-11-29 11:10:00 -05:00
icomrade
ee63d526f0 Remove extra column from coins SQL update 2016-11-27 22:10:57 -05:00
ebaydayz
185d84f14f Remove unneeded global var Z_AT_FolderLocation
This variable is not useful. If you change it you need to copy all the
AT files to your mission.

It is fewer files in the mission to just overwrite the path in compiles
and fn_selfActions.

Also fixed mistake with not replacing macros in scripts.txt with their
actual values.
2016-11-27 20:30:34 -05:00
ebaydayz
ca73853179 Update readme 2016-11-27 19:02:10 -05:00
icomrade
1123f67747 Clarify server install guide 2016-11-27 15:21:39 -05:00
ebaydayz
5986b00823 Update server install readme 2016-11-27 14:42:55 -05:00
ebaydayz
a8ab2f5d54 Allow drinking from hands at ponds on Cherno
Town generator configs may be added for other maps in the future.
2016-11-27 14:04:18 -05:00
ebaydayz
6abd92034a Make bloodbag interrupt message more accurate
The blood bag isn't actually removed in any of the three cases this
message is used.
2016-11-27 12:21:44 -05:00
ebaydayz
19e3947669 Fix empty snack bags giving drink option
Thanks @Helios27

https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-263117080
2016-11-27 12:02:29 -05:00
oiad
0b10b85e3a player_upgrade combination fix (#1803)
Adds systemChat to receive the combination for whatever you upgrade as
well as dayz_rollingMessages.

The same as what modular_build does.
2016-11-27 11:36:47 -05:00
ebaydayz
15fa1fc7a7 Update test build 2016-11-26 21:34:58 -05:00
A Man
560e8bce82 german string update (#1802) 2016-11-26 21:26:59 -05:00
ebaydayz
6cdc0a51c9 Add extra animations to ArmoredSUV, MV22, UH1Y 2016-11-26 21:14:12 -05:00
icomrade
18616828f3 Update ReadMe.md 2016-11-26 19:06:24 -05:00
icomrade
d0932790c8 Update Test Build 2016-11-26 19:04:20 -05:00
icomrade
52c9c7ceda Somewhat better VON Block
Not perfect, occasionally the player can double tap a button to lock VON
on - which now they cannot turn off unless they open the escape menu and
double tap to turn off.

Chat channel changes are now blocked when VON is active.

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

Summary: Double tapping a key to lock von on (VoiceOverNet) is not
reliably blocked, nor is it blocked at all in secondary
displays/dialogs. otherwise, this works pretty well.
2016-11-26 18:48:11 -05:00
ebaydayz
7c566a1345 Remove unused variable dayz_deseedloot 2016-11-26 14:08:34 -05:00
oiad
511dfd4025 dze_buildchecks plot pole distance fix (#1801)
Fixes the proper distance checks for dze_buildChecks.
2016-11-26 14:03:09 -05:00
ebaydayz
effabd711d Remove some more excessive client log spam
Only needed when debugging zombie targetting
2016-11-26 13:45:03 -05:00
ebaydayz
6f7a69fd68 Update REsec.hpp allowed execVM
Update for new corepatch:

https://github.com/Goliath86/CorePatch/blob/master/CorePatch_Modules/Functions/main.sqf#L9

Also fixed false positive due to case sensitivity:
"WARNING RE rexecVMcode with illegal
args:[any,any,"ca\modules\Functions\init.sqf"]"
2016-11-26 13:34:00 -05:00
ebaydayz
d14416931a Fix VON block mistake from b9a5c59
I forgot filterCheats is already called in keyboard.sqf
2016-11-25 19:31:14 -05:00
ebaydayz
27f492f401 Fix typo in VON block
My mistake from b9a5c59
2016-11-25 18:42:38 -05:00
ebaydayz
808c8cf736 Hide group icons on death screen 2016-11-25 18:30:48 -05:00
ebaydayz
b9a5c59660 Include all controls in VON block
Moved to display 46 keydown since keydown on 63 only fires after the VON
transmission has already started (slight delay).

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

9b2092c9f7

674624d122
2016-11-25 16:25:26 -05:00
icomrade
1097eaba0c Add block for voice channels
use DZE_DisabledChannels as decribed in configvariables.sqf
2016-11-25 13:05:27 -05:00
ebaydayz
cf64805d10 Disable RadioProtocol group chat spam
Works well with AI, still needs multiplayer testing.
2016-11-24 17:46:57 -05:00
ebaydayz
2b6481a515 Fix dead body cleanup mistake from 97431f8 2016-11-24 14:13:32 -05:00
ebaydayz
97431f81c2 Should fix flies spawning where player relogs
AI mods will need to setVariable "bodyName" on their dead units to
prevent them being cleaned up.
2016-11-23 17:14:00 -05:00
ebaydayz
f49c8a4ed6 Remove excessive REsec log spam on clients 2016-11-23 15:48:55 -05:00
ebaydayz
ea389b59ea Remove unneeded isKindOf "Man" checks
"Man" includes animals and zombies:

https://community.bistudio.com/wiki/ArmA_2:_CfgVehicles#Man_Class_Vehicles
2016-11-23 14:43:59 -05:00
ebaydayz
c202c697eb Update loot spawn.sqf
Vanilla commit:

4752621ffc
2016-11-23 13:50:24 -05:00
ebaydayz
ec6b5eb679 Move Repair and Salvage back to fn_selfActions
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
2016-11-23 13:34:22 -05:00
ebaydayz
edb622d8bd Update test build 2016-11-21 21:08:15 -05:00
ebaydayz
aea0bb1298 Update animal cleanup on log out
Partial revert of 0483fa6
2016-11-21 20:54:33 -05:00
ebaydayz
43b900835e Fix infectiousWaterholes init again 2016-11-21 20:28:07 -05:00
ebaydayz
0483fa61f6 Fix live animals being deleted in front of players
Vanilla commits:

e14d45a55b

9d6be1731e
2016-11-21 18:49:03 -05:00
ebaydayz
d7ecf29744 Update infectious waterholes
Vanilla commit:

0dadb0897c
2016-11-21 18:39:50 -05:00
ebaydayz
6853263f3d Update zombie generate
Vanilla commits:

09aa9f8879

68be696c4d
2016-11-21 18:33:41 -05:00
ebaydayz
2924daf0c4 Add missing createDialog scripts.txt exception 2016-11-21 15:11:17 -05:00
ebaydayz
6aa0cb8215 Update vanilla building
Vanilla commits:

a351c810d5

dfc46eff7b
2016-11-21 14:57:02 -05:00
ebaydayz
7f239754cc Fix anitbiotics to remote player cures own infection
Vanilla commit:

4c6b45d507
2016-11-21 14:33:20 -05:00
ebaydayz
2d394c32da Move sharpen action to ItemKnifeBlunt
Avoids confusing message "Missing ItemKnifeBlunt to do this"
2016-11-21 13:55:09 -05:00
ebaydayz
0c9fbc40c8 Remove Salvage from Bicycle in configs 2016-11-21 13:43:11 -05:00
ebaydayz
5e97435d7b Fix can't sell classic bloodbag 2016-11-20 21:24:27 -05:00
ebaydayz
901329c9ec Fix vanilla crafting actionInProgress 2016-11-20 20:34:05 -05:00
ebaydayz
2f1c57047a Fix infectedWaterHoles init for non-cherno maps 2016-11-20 20:03:18 -05:00
ebaydayz
3aad4b61e9 Move some addActions to config UserActions
Should improve client FPS while still allowing conditions and scripts to
be customized.

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

Vanilla commits:

a8c4238c0c

350d73abe1
2016-11-20 19:47:21 -05:00
oiad
ef1ad261e2 scripts.txt addition for plot management (#1799)
Missed exception for plot management
2016-11-20 12:44:08 -05:00
ebaydayz
efeadcfa35 Rename selectPlayer and selectGroupMember functions
Fewer scripts.txt exceptions needed
2016-11-19 19:39:08 -05:00
ebaydayz
76d9de9e53 Update change log 2016-11-18 21:12:17 -05:00
ebaydayz
edec813d3e Update test build 2016-11-18 20:22:21 -05:00
ebaydayz
0525763ffb Update German translations from #1798
Submitted by @DAmNRelentless and reviewed by @AirwavesMan
2016-11-18 19:46:24 -05:00
ebaydayz
f307386cb2 Fix cherno field hospital tent position
Vanilla commit:

7e18cef9cb
2016-11-18 18:43:28 -05:00
ebaydayz
da5285e0ec Update damage handler diag_log
Vanilla commit:

21864d065c
2016-11-18 16:36:37 -05:00
ebaydayz
bec4ccce38 Update dayz_server
Vanilla commits:

95bf775fd2

6e638aeb8c
2016-11-18 15:28:00 -05:00
ebaydayz
5072ea4e8b Update infectious waterholes init
Vanilla commits:

a61088d9e8

0d18630c11
2016-11-18 14:16:45 -05:00
ebaydayz
b01a4165a8 Comment some unused achievement code
Vanilla commits:

3ec1cc3c5d

3171f68bee
2016-11-18 13:22:36 -05:00
ebaydayz
ad9a287d00 Remove unused Lada base class
Also removed some values that are already inhertied from 8429ad1
2016-11-18 12:18:13 -05:00
ebaydayz
6769104580 Add some missing scripts.txt exceptions 2016-11-17 16:01:20 -05:00
ebaydayz
8429ad1fbc Clear typicalCargo for some vehicles missing it
Prevents preloading units, may help with load times a little.
2016-11-17 15:40:08 -05:00
icomrade
e398250489 Fix refuel trucks, add upgraded trucks to array
Issue was:
A. with locality, we were checking the wrong vehicle in one instance and

B. with variable names, since we called local_setFuel and _vehicle was
private already from the calling script we ran into an issue with
duplicate variables causing the command to fail. local_setFuel doesnt
really need any local variable so I removed them and this fixed the
issue (script filters may need to be adjusted accordingly)
2016-11-16 14:53:17 -05:00
ebaydayz
f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz
20d84ddba8 Sort scripts.txt alphabetically
Missed these
2016-11-15 17:22:36 -05:00
ebaydayz
acef12a7f9 Add some scripts.txt filters
These will probably need some additional exceptions and corrections.

Please post the scripts.log entry if you get any kicks or logs that are
not from custom changes or third party mods.
2016-11-15 17:07:00 -05:00
ebaydayz
43330c2046 Diminish humanity reward for transfusion
As suggested on:
cdb9776
and
https://github.com/DayZMod/DayZ/issues/731
2016-11-15 15:31:58 -05:00
ebaydayz
110f677f1e Fix allowDammage typo for easier scripts.txt filtering 2016-11-15 14:34:42 -05:00
ebaydayz
cdb9776d4e Add bloodbag cooldown 2016-11-15 13:57:40 -05:00
ebaydayz
414fd7e1b7 Add auto open chute option to HALO 2016-11-14 20:25:26 -05:00
ebaydayz
de44b32c83 Remove unneeded isBicycle check in fn_selfActions
Bicycles always have characterID=0, so there is no need to check.
2016-11-14 14:38:45 -05:00
ebaydayz
81013ace75 Fix gear menu bypass mistake from 89078d1 2016-11-13 15:02:36 -05:00
ebaydayz
89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
ebaydayz
e6b9644b71 Update test build 2016-11-12 22:01:03 -05:00
ebaydayz
e506a97ad6 Remove redundant check in player_onPause
Switch executes the first case that matches and does not check any more
cases after that. So these conditions are always met when this case is
checked.
https://community.bistudio.com/wiki/switch_do
2016-11-12 21:22:11 -05:00
oiad
be1fb51fe8 player_onPause fixes (#1796)
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
2016-11-12 20:56:58 -05:00
ebaydayz
00f1f8537a Remove redundant unconscious checks in damage handler
This is already check above. My mistake from e4ede46
2016-11-12 20:12:04 -05:00
ebaydayz
e266fee651 Fix right click on radio generic error 2016-11-12 19:16:19 -05:00
ebaydayz
abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz
8b3376643d Fix unload patients action not being removed from vehicle 2016-11-12 17:23:52 -05:00
ebaydayz
e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz
e260d335ce Don't allow loading unconscious player into locked vehicle 2016-11-12 16:12:48 -05:00
ebaydayz
db3d9bf474 Update vanilla object_maintenance.sqf
Vanilla commit:

f6e98f3be0
2016-11-12 15:19:42 -05:00
ebaydayz
f87ac79acc Add missing private var in hotwire_veh.sqf 2016-11-12 14:54:29 -05:00
A Man
6ac9c879f0 Update german strings (#1795) 2016-11-12 14:44:05 -05:00
ebaydayz
e55960b6f9 Don't allow giving bloodbag to player with full blood
Reverted be214d3 because this is a more complete solution
2016-11-11 17:03:50 -05:00
ebaydayz
fe773bd571 Send notfication to player kicked from group 2016-11-11 15:46:44 -05:00
ebaydayz
f43348ebf6 Consolidate isServer checks for poi
Vanilla commit:

fbcabc6d60
2016-11-11 15:19:57 -05:00
ebaydayz
00b09a86c5 Remove self from saved group 2016-11-11 14:58:21 -05:00
ebaydayz
6db0c3380f Remove unneeded isServer check
Missed one from 88870a6
2016-11-11 14:54:23 -05:00
ebaydayz
88870a6b2a Sync closeDisplay exit codes for easier scripts.txt filtering 2016-11-11 14:48:41 -05:00
icomrade
489e0bbc77 Merge pull request #1794 from oiad/master
hotwire vehicle changes
2016-11-10 21:51:49 -05:00
oiad
d28ac4de22 Hotwire rework
Rework again! - Readd sleep
2016-11-11 15:49:08 +13:00
oiad
b0926b2a82 Hotwire rework
Hotwire rework
2016-11-11 14:45:48 +13:00
oiad
ef5b5ae38f Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-11-11 14:38:27 +13:00
ebaydayz
e927a759fe Fix load wounded mistake from 343003d 2016-11-10 20:33:24 -05:00
oiad
979323932c Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-11-11 13:15:50 +13:00
ebaydayz
dba59af7c1 Fix undefined vars in unload_act.sqf 2016-11-10 19:14:29 -05:00
ebaydayz
ed49630e0c Fix load wounded wrong variable 2016-11-10 19:13:40 -05:00
ebaydayz
343003d9dd Fix load wounded action undefined error 2016-11-10 19:12:43 -05:00
ebaydayz
be214d3cc5 Fix give bloodbag option showing when it shouldn't 2016-11-10 18:46:39 -05:00
ebaydayz
5d64449210 Add missing private var in antibiotics.sqf 2016-11-10 18:37:14 -05:00
oiad
dd0363b4e8 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-11-11 11:52:38 +13:00
ebaydayz
2f86984f93 Fix antibiotics not reducing when given to remote player 2016-11-10 17:51:54 -05:00
oiad
310fef893d Hotwire vehicle changes
Adds a localization for hotwire kit working
Updates localization for hotwire kit failing
Adds medic animation/sound and zombie notify
2016-11-11 10:45:07 +13:00
oiad
42beaa43b6 Merge branch 'master' of https://github.com/oiad/DayZ-Epoch 2016-11-11 10:38:15 +13:00
ebaydayz
2cb3dac0be Fix vehicle damage handler bug
Fixes vehicle appearing to repair itself on first hit. SetDamage 0 was
running if no parts were damaged because "totalDmg" is not a hitpoint.

Vanilla commit:

92ab8fe2d4
2016-11-10 15:51:36 -05:00
oiad
21fdbe3378 Merge remote-tracking branch 'refs/remotes/upstream/master' 2016-11-11 01:18:55 +13:00
ebaydayz
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
ebaydayz
eedf7dd12c Fix door and plot management display text for mustBeClose
Also removed unneeded uiNamespace vars.
2016-11-08 19:27:05 -05:00
ebaydayz
e3bb7e11b9 Remove unneeded global var dayz_myGroup 2016-11-08 17:11:39 -05:00
ebaydayz
32b9c84784 Add notification messages for group changes 2016-11-08 16:39:50 -05:00
ebaydayz
ba43900036 Revert "Allow blunt knife for item actions"
This reverts commit 59a0548f5d.
2016-11-07 17:37:46 -05:00
ebaydayz
261dc4b373 Allow crafting with dull knife
Output is still reduced for dull knife when gutting animals.
2016-11-07 17:37:22 -05:00
icomrade
fb734e30c7 allow removal of generator 2016-11-07 17:24:54 -05:00
icomrade
59a0548f5d Allow blunt knife for item actions 2016-11-07 17:14:30 -05:00
ebaydayz
01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz
33ed3737a5 Fix gear pistol background image direction
Vanilla commit:

f1c883636a
2016-11-07 15:25:50 -05:00
ebaydayz
e0c06692e2 Update scrollbar color in lobby and player list
To match 6732e5c
2016-11-07 15:21:56 -05:00
icomrade
8bf41e1ed3 Tweak weather values
it doesn't have to be so gloomy all the time
2016-11-07 13:11:58 -05:00
ebaydayz
ecc1ca0aeb Add missing private var 2016-11-06 20:29:17 -05:00
ebaydayz
b312fc2685 Update test build 2016-11-06 20:24:28 -05:00
ebaydayz
fd44e0b7d3 Fix group save after kick 2016-11-06 20:01:27 -05:00
ebaydayz
4c6e2454c3 Prevent non-leader from disbanding group 2016-11-06 15:28:59 -05:00
ebaydayz
4317a6459a Don't show scoreboard on death
We already removed the scoreboard:

https://github.com/DayZMod/DayZ/blob/Development/SQF/dayz_code/Configs/CfgArma.hpp#L198-L209

So this just prevents the white line and redundant count down showing on
screen when you die:
https://community.bistudio.com/wiki/Description.ext#respawnDialog
2016-11-06 15:24:37 -05:00
ebaydayz
f0d89d5993 Round server fps diag_log 2016-11-06 14:06:40 -05:00
ebaydayz
4263b0732f Allow damage from tripwire grenade
Vanilla commit:

30c746892f
2016-11-06 13:39:30 -05:00
ebaydayz
e1bf11c4bb Remove empty folder 2016-11-06 13:15:18 -05:00
ebaydayz
de46a173dc Fix errors when removing traps
Vanilla commit:

b558351a06
2016-11-06 13:05:46 -05:00
ebaydayz
88691fe9d1 Fix mistake in remove.sqf
DZE_DoorsLocked is a list of strings, not objects. I'm surprised no one
noticed this before.
2016-11-06 12:28:26 -05:00
ebaydayz
bfa7aefb3a Update BE selectplayer.txt filter
Vanilla commit:

f0dc54bff1
2016-11-05 20:59:13 -04:00
ebaydayz
677abe62aa Remove vanilla camo net
Duplicate of Epoch one.

Also had sliding issues when building because it did not have the proper
Epoch offset.
2016-11-05 20:53:22 -04:00
oiad
0159b1418d Remove unreferrenced file (#1793)
This is an old file from A plot for life, we also use player_build for
tents now.
2016-11-05 20:40:35 -04:00
ebaydayz
754fc3744e Add delay at group startup 2016-11-05 19:18:51 -04:00
ebaydayz
eaebdb7d93 Revert "Disable RadioProtocol spam"
This reverts commit ac99e45854.
2016-11-05 18:47:54 -04:00
ebaydayz
8c72946ffd Hide disband button after player loses leader 2016-11-05 18:08:46 -04:00
ebaydayz
615f21165a Fix rejoin group after change clothes
Also removed redundant delete and remove for _oldUnit since it is
already done in call _switchUnit
2016-11-05 17:48:07 -04:00
ebaydayz
d97478239c Fix undefined error when trap is deleted
Getvariable returns undefined if the object is null.

https://community.bistudio.com/wiki/getVariable
2016-11-05 16:42:09 -04:00
ebaydayz
564144ee41 Revert vanilla work bench to player_buildVanilla
Partial revert of:

2d9097a6af

This workbench is currently not obtainable either by crafting or the
loot tables, so it is not used anyway. But with Epoch player_build
attempting to build it sends the player flying / sliding backwards at
high speed. Using the vanilla player_build that does not happen.

I tested building all the other items changed in the above commit and
none of them have this problem.
2016-11-05 16:34:00 -04:00
ebaydayz
13a3083bae Remove right click build sandbag action on shovel
Right click action on sandbag is more up to date
2016-11-05 15:32:49 -04:00
oiad
d7f35c0cf3 Fix spelling mistake of classname DZ_Czech_Vest_Pouch (#1792)
* Fix spelling mistake of classname DZ_Czech_Vest_Pouch

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per

* More typo SQL goodness

As per subject
2016-11-04 21:40:27 -04:00
ebaydayz
12032477d4 Remove vanilla dismantle on sandbag and hedgehog
Epoch handles this in fn_selfActions
2016-11-04 20:46:53 -04:00
A Man
1223e08d79 Fixing string is not displayed correctly (#1791)
* Fixing not shown string

* Fixing not shown string
2016-11-04 20:42:24 -04:00
oiad
cbe51bcad1 SQL Update fix for MeleeHatchet_DZE -> MeleeHatchet, localization fix (#1790)
Makes MeleeHatchet_DZE for converted bases properly get renamed
Changes Destroy to Remove since you're not completely destroying it
2016-11-04 20:15:31 -04:00
A Man
106b90dbfa Update for german strings (#1789)
* Update for german strings

* Update stringtable.xml
2016-11-04 19:24:42 -04:00
ebaydayz
c314febe45 Remove unneeded controls from game options 2016-11-04 19:17:43 -04:00
ebaydayz
6732e5cb67 Recolor lobby and player list to dark grey 2016-11-04 18:56:33 -04:00
oiad
497b065663 Localization changes/additions. (#1787)
* Localization changes/additions.

Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.

* Toolbox change

Update camonet removal to 10m instead of 5m

* Safe zone no building near/blacklisted buildings no building near

Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.

* typo

fix typo

* Safezone/blacklisted changes

As per requests.

* Rework

Rework

* Remove unused variables

as per subject

* Misc changes

Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces

* rework

rework
2016-11-04 12:08:47 -04:00
ebaydayz
dd2a21a867 Update medPainkiller.sqf 2016-11-02 20:21:55 -04:00
ebaydayz
93a988955f Use shorter file names for groups 2016-11-02 17:25:25 -04:00
ebaydayz
ac99e45854 Disable RadioProtocol spam
Seems to stop most groupChat spam and doesn't appear to cause any
issues.

If you still see group chat spam after this commit or notice any issues
with it please post a comment.
2016-11-02 16:58:25 -04:00
ebaydayz
f87e064798 Add example server difficulty profile file 2016-11-01 16:10:35 -04:00
A Man
560580b0a2 Removing 2 old rightclick actions, shorter german text (#1786)
* Removing old code

Build Sandbag Fence is not longer used since the rightclick action to build a sandbag.

* Removing old code

Old code "remove tank trap" is not longer used since we have the scroll action for that.

* Update Prop_Defs.hpp

* Cutting some strings, removing old strings

* Update stringtable.xml
2016-11-01 15:10:59 -04:00
icomrade
3be7d1e0e6 Add logger info to hiveext.ini 2016-11-01 11:06:42 -04:00
A Man
41324139eb Adding CanvasHut_DZ to DZE_isRemovable (#1785)
* Adding CanvasHut_DZ to DZE_isRemovable

CanvasHut_DZ had no remove option.

* Update Prop_Defs.hpp
2016-10-31 19:26:40 -04:00
ebaydayz
3572709697 Merge pull request #1784 from AirwavesMan/master
New german strings
2016-10-31 19:01:23 -04:00
ebaydayz
bff0e3281a Auto promote group leader after changing clothes 2016-10-31 18:11:28 -04:00
A Man
da4bf5d9da New german strings 2016-10-31 22:44:46 +01:00
ebaydayz
f21b5b74a7 Add systemChat message when a new player joins the group 2016-10-31 17:30:03 -04:00
ebaydayz
1b3ed13a47 Remove unnecessary check in damage diag_log
Vanilla commit:

e826a8bda9
2016-10-31 16:04:27 -04:00
ebaydayz
3a3413caf5 Allow tools to exceed transportMaxWeapons when buying in bag 2016-10-31 13:54:40 -04:00
ebaydayz
866358e4d0 Add launcher handling to advanced trading 2016-10-31 13:07:07 -04:00
ebaydayz
cd48b883a7 Remove unused localization for maintain 2016-10-30 16:23:55 -04:00
ebaydayz
064fa8c8d0 Only spawn wild dogs if dayz_tameDogs is enabled 2016-10-30 15:47:01 -04:00
ebaydayz
25d6b6e448 Increase DZ_BlackScreen resource layer
Prevent rolling messages from showing over the top of it.

Also fixed grammar typo @oiad
2016-10-30 15:34:24 -04:00
ebaydayz
b2d668812b Update change log 2016-10-30 14:54:20 -04:00
oiad
b1171c5f9b player_wearclothes changes, string changes and maintain area moving (#1783)
* player_wearclothes changes, string changes and maintain area moving

Adds 2 toggles for admins to modify:

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

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

* Rework

Rework as per @ebaydayz

* Rework

Rework
2016-10-30 14:11:54 -04:00
ebaydayz
abb0475d28 Use joinSilent instead of join 2016-10-30 13:54:55 -04:00
ebaydayz
6d8afc9d32 Revert "Send new group to server for update"
This reverts commit 3f83354066.
2016-10-30 12:50:37 -04:00
ebaydayz
3f83354066 Send new group to server for update 2016-10-29 18:38:53 -04:00
ebaydayz
c4ef6e3115 Hide showOnScreen for lock and unlock inside vehicle action 2016-10-29 17:06:47 -04:00
ebaydayz
92d6257b92 Updated humanity Regen when under 1
Vanilla commit:

8e844e2b63
2016-10-29 16:05:08 -04:00
ebaydayz
9a4afbfc43 Update vanilla maintain
Vanilla commit:

997b8bac9a
2016-10-29 15:56:47 -04:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
ebaydayz
fda831bf4f Consolidate redundant getPlayerUID in selfActions
Vanilla commit:

8c51a24956
2016-10-29 15:25:36 -04:00
ebaydayz
07525388a6 Hide group buttons on use 2016-10-29 15:08:46 -04:00
ebaydayz
127be2472d Add delay before group update 2016-10-28 21:24:03 -04:00
ebaydayz
dbb9e97efc Update group dialog 2016-10-28 20:10:18 -04:00
ebaydayz
c2e63f63ae Merge pull request #1782 from oiad/master
Reduce client RPT spam
2016-10-28 20:01:07 -04:00
oiad
cf8e06bc8b Reduce client RPT spam
As per subject
2016-10-29 12:59:21 +13:00
oiad
1c7e96a0ff Advanced trading modifications, maintain_area modifications (#1780)
* Advanced trading modifications, maintain_area modifications

This lot of changes brings forth the following:

Sets up a "default" set of compiles that are the minimum needed for
maintain_area.sqf and custom scripts to utilize the gem based currency
that @icomrade added.

maintain_area.sqf: This will now utilize the gem based currency system.

Removed the redundant Z_Vehicle and replaced it with the Epoch built in
DZE_myVehicle

z_at_buyItems: Code tidying and optimization

z_at_checkCloseVehicle: Tidied up the code since removing Z_Vehicle
allowed us to remove some now useless code.

z_at_getVehicleItems: Removed the nearestObjects check for your vehicle
since we now do z_checkCloseVehicle on Advanced trading start up.

* Advanced trading missed redundant variables

As per description

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Revert "Advanced trading rework"

This reverts commit a589bd19b9.

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Advanced trading rework

More rework

* Remove single currency add/remove coins functions

at request of @ebaydayz.
2016-10-28 19:29:04 -04:00
A Man
aa267bda2c Adding many new strings (#1781)
* More Stringtable updates

Ive added and corrected more german strings. Some german strings were too long. Lots of building items needed a localization. Adding after request the Winter Ghillie Suit localization for Namalsk compatibility.

* Update for new localization

* Update for localization

* Update for new localization

* Update again

* localization update

* Update stringtable.xml

* Update Doors.hpp

* Update ModularBuilding.hpp

* Update stringtable.xml

* Update stringtable.xml

* Update Doors.hpp

* Update Prop_Defs.hpp
2016-10-28 15:05:35 -04:00
ebaydayz
98be67b59c Add safezone scaling to group dialog buttons 2016-10-27 20:16:35 -04:00
ebaydayz
f770b0a85d Add group system
Initial commit, not tested in multiplayer yet. Some revisions still left
to do.
2016-10-27 16:06:49 -04:00
icomrade
f92d84f720 Fix issue laying down near buildables 2016-10-26 16:58:06 -04:00
ebaydayz
c7d9741be4 Add height check for logout in air vehicle exploit
This prevents players who logout in grounded air vehicles from being relocated.
2016-10-25 18:48:54 -04:00
ebaydayz
84d549d0a1 Revisions for #1777 (#1778)
* Update z_at_buyItems.sqf

* Update z_at_buyItems.sqf

* Update z_at_canAfford.sqf

* Update z_at_fillBuyableList.sqf

All of this is already checked in z_checkCloseVehicle at startup. If Z_VehicleChanges between the time the menu is started and the buyable list is filled it's not a big deal, since it only affects the highlighted color.

* Update server_handleSafeGear.sqf

* Update snappoints.hpp

* Update z_at_buyItems.sqf
2016-10-25 13:59:56 -04:00
oiad
bef2506653 Advanced trading fixes, server_handleSafeGear human readibility (#1777)
* Advanced trading fixes

Fixes a few issues and a dupe with advanced trading as well as some
localization of where a vehicle key is going.

Z_at_buyItems: Now adds localization for the key getting added to your
toolbelt, backpack and vehicle, this stops players thinking they didn't
get a key when infact it was added to their backpack/vehicle.

Z_at_canAfford.sqf: This fixes a dupe from a bad copy paste for whomever
wrote this script, it was using _backpackMoney in the
z_allowTakingMoneyFromVehicle part, changed to the proper variable
_vehicleMoney.

z_at_fillBuyableList.sqf: this fixes a bug where a vehicle would show
green even when it isn't local, just basically added more checking to
make sure the vehicle it's making green in the list is a) local, b)
alive and that the typeOf == _name.

z_at_logTrade.sqf: fixes some tidyness.

advancedTrading/init.sqf: adds a z_checkCloseVehicle call otherwise even
with Z_AllowTakingMoneyFromVehicle = true it will not get currency from
your vehicle until you clicked on the "Vehicle" tab.

dayz_server/server_tradeObject.sqf: More tidying as per the
z_at_logTrade and removes the useless Player:, as it is obvious a player
has bought something not an AI.

dayz_server/server_handleSafeGear.sqf: Makes the diag_log at the end
more human readable with GPS coordinates as well as the lock code for
the safe or the lockbox.

* advanced trading fixes. I hate you github

WHY U GET MISSED?? STUPID GITHUB.

* snappoints changes

Fixes the issue @SmokeyBR reported
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-253864795
Adds all floor types to snap list for all barriers so you can snap a
sandbag etc to a floor instead of manually lining it up
2016-10-25 13:10:48 -04:00
icomrade
56abe26b92 Fix combat in AH6 2016-10-21 12:09:51 -04:00
ebaydayz
6713c1cf70 Lower nutrition values for push plane
Vanilla commit:

81297c8e26

Now using the same as refuel.

It takes a lot of pushes to move the plane any significant distance
(usually 10-20).
2016-10-20 15:28:23 -04:00
ebaydayz
9689301b07 Hide show on screen text for Vehicle Locked and Destroy %1 2016-10-20 14:46:08 -04:00
ebaydayz
5e170029d0 Fix dayz_playerUID undefined in selfActions when target is not null at login
Selfactions can run before dayz_playerUID is defined in
player_monitor.fsm.
2016-10-20 14:34:48 -04:00
ebaydayz
74879c85a4 Update onPlayerDisconnect.sqf
Vanilla commit:

b103437918
2016-10-20 14:03:44 -04:00
ebaydayz
00bc2170ec Update test build 2016-10-20 13:18:57 -04:00
ebaydayz
cf0ef07ade Fix process hit running twice
Vanilla commit:

604c1f0577
2016-10-20 13:00:58 -04:00
ebaydayz
e50ce31d08 Update changelog
Not currently functional
2016-10-19 21:00:27 -04:00
ebaydayz
b8aba38dca Fix humanity hit when crashing vehicle 2016-10-19 19:53:52 -04:00
ebaydayz
17c0661094 Increase crash damage scale 2016-10-19 18:29:25 -04:00
ebaydayz
8beba72cbb Remove unneeded check in toggle streamer mode 2016-10-19 16:02:43 -04:00
ebaydayz
d13aafcd0c Add streamer mode game options setting
The chat list does not appear to be toggleable on the fly because it is
a display with no accessible controls. Giving it an idd and using
closeDisplay did not work. So it needs to be manually set off screen in
its config or covered up.
2016-10-19 15:49:30 -04:00
icomrade
d116bfecb4 Should fix BIS_Effect eject/kill
excludes cars now
2016-10-19 13:23:44 -04:00
icomrade
606098a1e3 Fixes SetFace error 2016-10-19 12:45:35 -04:00
ebaydayz
869e95eb2c Fix wrong variable name in z_at_calcFreeSpace
I didn't catch this mistake before because _backpack was not in the private array, so it was still defined from the script that called this function. Thanks @oiad
2016-10-18 15:56:45 -04:00
ebaydayz
fffcf43bbb Spawn infectious waterholes locally on each machine
Vanilla commits:

2d47c7250c

94a0bac524

44b7114129
2016-10-17 16:49:24 -04:00
ebaydayz
228ac99eb1 Set body studied status globally so confirmed kill is only added once
7402b240df
ensures _source will always be a player, so it's no longer necessary to
check that.

Vanilla commit:

a8c9eaebe0
2016-10-17 16:11:54 -04:00
ebaydayz
1964a084ff Avoid sending humanity hit if source is local
We only want to send a humanity hit if the source is a remote player.
Note it's not necessary to check isNull since (isPlayer objNull) returns
false.

Vanilla commit:

7402b240df
2016-10-17 14:52:34 -04:00
icomrade
fd0a4685fe Update private array
6cf740e7d4 caused undefined variable
errors since the variables were private in 2 places. _forced and
_recorddmg should be declared private in the top of the script where
they are defined, not in the compile.
2016-10-16 12:53:20 -04:00
ebaydayz
84d58a5932 Update vanilla chop wood and mine stone tool break chance
Vanilla commits applied:

5010767849

ac39f46a8c
2016-10-15 17:15:31 -04:00
ebaydayz
f21b4f0f41 Remove t_stub_picea.p3d from dayz_trees
See:

bf31d8f6e7 (commitcomment-19441154)
2016-10-15 16:48:29 -04:00
ebaydayz
7ddee142b0 Update confirmed kills system
Vanilla commits applied:

347105c036

e6b6814f51

1009828d8e
2016-10-15 15:08:48 -04:00
ebaydayz
81aed28f87 Update vanilla break in chance for tool damage
Vanilla commit:

9de0fbd15f
2016-10-15 14:29:30 -04:00
ebaydayz
2ee3d44b87 Fix blood regen with classic nutrition system
Vanilla commit:

d1542874b1
2016-10-15 14:05:15 -04:00
A Man
5ec92bcd65 Updating german stringtable, tent fix, loot table changes (#1776)
* Updating german stringtable

The update for STR_ACTIONS_2TB and STR_ACTIONS_RFROMTB are important. That fixes a very old bug. It was no really readable in german because the words were a way to long.

* Add files via upload

* Fixing Desert Tent pack output

When packing a DesertTent the output was ItemDomeTent not ItemDesertTent

* Decreasing hotwire kit chance

* Decreasing hotwire kit chance

* Decreasing hotwire kit and combo lock chance

* Decreasing combo lock chance, fixing loot group

* Fixing loot group

* Lowering ammo box spawn chances again.

* Fixing Desert Tent pack output all versions
2016-10-15 13:47:13 -04:00
ebaydayz
a6cb29aa7e Prevent spamming sleep on tent
Vanilla commit:

e9df65bc56
2016-10-15 12:04:44 -04:00
ebaydayz
05fda7b229 Block binding multiple controls to hold breath
Vanilla commits:

d77c47fdc1

2ffe5b4337
2016-10-14 20:14:34 -04:00
ebaydayz
9f608fdf44 Add humanity gain for giving splint to other players
Vanilla commit:

879d6ee4bf
2016-10-14 16:26:57 -04:00
ebaydayz
01a5bbe687 Update Melee bat damage
Vanilla commit:

b3781670b4
2016-10-14 16:18:52 -04:00
ebaydayz
0da569acad Update zombie_agent.fsm
Vanilla commit:

402bb4e109
2016-10-14 16:14:43 -04:00
ebaydayz
6cf740e7d4 Update _object_damage private array
Vanilla commits:

21ea5984c9

a13e7240dc
2016-10-14 16:07:03 -04:00
ebaydayz
5e51787e59 Remove rSwitchMove in Turbo key block
Vanilla commit:

8b551681d9
2016-10-14 15:03:53 -04:00
ebaydayz
d44696be3a Delay player_death 1s if spawned from Killed EH
Vanilla commit:

96c9be3ecf
2016-10-14 12:40:19 -04:00
ebaydayz
916f1733eb Add back melee ammo after removal for BIS_fnc_inv
Vanilla commit:

516d1d538c
2016-10-13 20:26:07 -04:00
ebaydayz
7044b0095d Get player name before death
Vanilla commit:

3e8c9410c5
2016-10-13 16:01:55 -04:00
ebaydayz
0b9c4a7ade Allow physics damage from vehicle crash
Vanilla commit:

804445830f

This was exiting with 0 damage if _hit=="". It accounts for vehicles not
being damaged at all when crashing full speed into walls. It was also
causing the player to sometimes glitch out of the vehicle or into the
ground when crashing as you noticed before @icomrade.

Also fixed driver getting a humanity hit for damaging passengers in
crash. Reverting 22b2a3a since this is more reliable.
2016-10-13 13:45:01 -04:00
icomrade
c89031e089 Fix clothes change exit on gear count fail 2016-10-13 11:42:01 -04:00
icomrade
aac372d320 Remove animation for switching clothes
If the gear sync script is called during the animation, the player will
fail the gear sync and not change clothes. After removing the anim this
no longer happens. Also I think this is a BS change that only
inconveniences the player and makes something that is already cumbersome
even more so
2016-10-13 11:40:54 -04:00
icomrade
edfba1516b Fice setFace error, use player's face for SP skins 2016-10-13 11:37:50 -04:00
icomrade
32131f866c Use OA config values for _DZ weapons 2016-10-12 15:01:56 -04:00
icomrade
bf31d8f6e7 Update tree array for NAPF
thanks @ndavalos
2016-10-12 14:55:24 -04:00
ebaydayz
46a1441773 Avoid format character limit in server_hiveReadWrite
Vanilla commit:
https://github.com/DayZMod/DayZ/pull/757
2016-10-12 13:36:19 -04:00
ebaydayz
854cbefdb2 Make all player names the same color in the lobby
Vanilla commit:

8614f37ccf
2016-10-12 12:21:42 -04:00
ebaydayz
22b2a3a79f Prevent humanity hit to driver when crash damages passengers
I forgot to account for this when allowing humanity hit to players in a
vehicle:

15e923fb19
2016-10-11 19:57:14 -04:00
ebaydayz
05fa3e6a9a Update keyboard_keys after changing controls in-game
Vanilla commit:

e9b21a7e79

@icomrade we forgot to refresh keyboard_keys after the player changes
their controls in-game. The keyhandler was still using the old
keyboard_keys array since it is only set once at login time. The new
keys they set in-game wouldn't work until they relogged.
2016-10-11 15:34:10 -04:00
ebaydayz
fbb8cc645c Prevent automatic humanity morph when in vehicles
Vanilla commit:

6326f1186d
2016-10-11 13:06:57 -04:00
ebaydayz
f8f9fbc57a Play medic animation when changing clothes
Vanilla commit:

b91c850f5f
2016-10-10 16:45:57 -04:00
icomrade
6f9316e496 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-10-10 16:40:05 -04:00
icomrade
920c359e46 Adjust nutrition values and exclude chainsaw
Everytime a piece of wood was spawned resulting from a chainsaw the
player would become more hungry and thirsty. Obviously in less than 10
seconds this would kill the player if they chopped multiple trees down.
2016-10-10 16:40:01 -04:00
ebaydayz
7869288f39 Reblock turbo when on foot
Vanilla commit:

5bf403bb43

See:

46af339ce5
2016-10-10 16:34:40 -04:00
icomrade
0c1e9205ab Remove fuel tank and engine salvage 2016-10-10 16:25:25 -04:00
icomrade
f663cdcb39 Use OA config definitions for DMR
fixes NVGs
2016-10-10 16:12:49 -04:00
icomrade
347c531edc Fix reversed variable 2016-10-10 15:38:09 -04:00
ebaydayz
1bb6554211 Update test build 2016-10-08 21:30:08 -04:00
ebaydayz
5fdbced171 Add more loot and zed positions for namalsk
Vanilla commits applied:

57511ad463

7745633e8e

0e237c0274

95d3f94f88

6e4598a3e1

081620cccb
2016-10-08 19:58:58 -04:00
ebaydayz
4670f16e89 Rename _isOwner variable to _hasAccess
This is a more logical name in these cases, since friendlies and admins
are not the owner.
2016-10-08 15:57:51 -04:00
ebaydayz
e6d1e0050d Remove redundant _canDo and cursorTarget checks in selfActions
Vanilla commit:

dfb199fbc3
2016-10-08 15:36:38 -04:00
ebaydayz
534abdbdf0 Remove excessive door management config variables
Too many config variables made this unnecessarily complicated. Most
servers will want the defaults. For those that want to customize further
they can easily overwrite these files.

These seem like the most logical defaults to me. Allow all of these
people to manage and unlock by default:
- door owner
- plot owner
- plot friend
- plot admin
- door friend
- door admin

Door friends should be able to manage by default so they don't have to
wait for the owner to come back online to add someone as a door friend.

Plot friends and plot admins can get around the door by removing it and
building another one anyway, so locking them out is pointless. It is
still useful to have these as separate variables for servers that do not
require plot poles though.

Regular friendlies should not be included by default, since we have the
more fine grained plot friends and door friends lists for that. Regular
friendlies will probably be replaced by groups in the near future
anyway.

Please post a comment if there are any issues with these defaults I'm
forgetting. Thanks.
2016-10-08 14:49:59 -04:00
ebaydayz
f395f2303c Update 30m_plot_kit classname in epoch.sql #1775
@oiad #1775
2016-10-08 12:44:34 -04:00
ebaydayz
0f0dcfd522 Merge pull request #1775 from oiad/master
Rename plot pole and dze_BuildChecks changes.
2016-10-08 12:36:36 -04:00
ebaydayz
d3bd2ba4a1 Update vanilla barn loot pos
Vanilla commit:

b8eed6fc70
2016-10-08 12:07:07 -04:00
oiad
78fac87333 dze_BuildChecks changes
This changes the reasons to be more understandable about why you can't
build somewhere.
Some localization fixes to be more englishy.
2016-10-08 12:53:25 +13:00
oiad
5bc36166a7 Rename plot pole from "30m_plot_kit" to "plot_pole_kit"
Sanity change since the plot pole is not fixed at 30 meters and is
configurable.
2016-10-08 12:51:21 +13:00
ebaydayz
8a2d95295b Restrict access to show plot boundary action
Only the owner, plot owner, plot friends and plot admins should be able
to see the plot boundary. Randoms just use it for griefing.

Also renamed the targetX variables to the more appropriate doorX in
fn_check_access since they are only used if the target is a door.
2016-10-07 17:39:06 -04:00
ebaydayz
c0d7917603 Add note about Linux server 2016-10-07 15:56:27 -04:00
ebaydayz
a909d713c3 Fix death message handling of vehicle explosion 2016-10-07 15:08:00 -04:00
ebaydayz
79d2b268a8 Changed loot_spawn to use PositionAGL
Vanilla commit:

7e413848fb
2016-10-07 14:41:47 -04:00
ebaydayz
3604d77823 Fix reversed comments for RunOver/Dragged
Vanilla commit:

ef3600bd32
2016-10-07 14:19:08 -04:00
icomrade
b25b7636a7 Direct menu to cursortarget or player
Please test the living hell out of this.
2016-10-07 13:46:53 -04:00
ebaydayz
5b158b398a Fix damage handling of vehicle explosions
Vanilla commit:

589791e9f9

This was being falsely triggered before because the distance (3m) was
far too small and it was only counting fast moving vehicles. The player
can be damaged up to 25m away from the vehicle explosion.

The comment was incorrect. It can be easily checked by using the
included diag_log at the top of this file.
2016-10-07 13:42:05 -04:00
ebaydayz
b193ad925a Use more efficient check for "shot" death message
Most of the time the source will be local (zombie) or player (physics).
The next most common will be getting shot by a remote player, the least
common will be getting shot by a remote vehicle.
2016-10-06 19:13:46 -04:00
ebaydayz
7909f0089f Make minor adjustments to damage handler
These variables were moved down so they aren't checked unnecessarily
when the script exits.
2016-10-06 16:25:39 -04:00
oiad
5472eda2a8 Add M240Nest_DZ to maintain classes variable. (#1773)
* Add M240Nest_DZ to maintain classes variable.

This makes it so M240Nest can be maintained. (Which it should be)
2016-10-06 14:46:35 -04:00
ebaydayz
976314df24 Merge pull request #1774 from AirwavesMan/master
Fixed GP25 wrong text
2016-10-06 14:26:37 -04:00
A Man
e55b0b1ce5 GP25 wrong text
GP25 had the wrong description text.
2016-10-06 20:07:54 +02:00
icomrade
5381748c63 better gear menu check
should be less annoying
2016-10-05 20:13:26 -04:00
ebaydayz
50584d3ff4 Update test build 2016-10-05 17:41:40 -04:00
ebaydayz
2ee06afea7 Sync chopped down trees for JIP players
Vanilla commit:

a57478fb1a
2016-10-05 17:24:10 -04:00
ebaydayz
6e544e447e Fix some missing spaces in stringtable from #1772 2016-10-05 15:27:26 -04:00
ebaydayz
f41dbf377c Remove duplicate UH1H_DZ2 class
Duplicate of UH1H_2_DZ

This was not in 1051, so no need to swap in SQL updates.
2016-10-05 13:31:39 -04:00
ebaydayz
8c237492b9 Update vanilla player_build
Vanilla commit:

fd8e1e2baa
2016-10-05 13:01:40 -04:00
A Man
2519d7e52e Addong german strings, updating heli displaynames, new UH-1H DZE (#1772)
* Updating displaynames 

Unfortunately I gave a few choppers their class names as displaynames. That should be better now.

* Adding DZE for UH1H_2 variant, displayname update

Adding the UH1H_DZE with no ammo. Adding better displaynames for the UH1H

* Updating german strings

Adding a lot german strings and correcting a few.

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml
2016-10-05 12:51:50 -04:00
ebaydayz
2109fdba03 Prevent sell from vehicle dupe
Prevents dupe described here:

https://epochmod.com/forum/topic/41891-resource-a-collection-of-anti-dupes/#comment-281324
2016-10-05 12:17:17 -04:00
ebaydayz
d109d9fb01 Fix SVD_DZ alternative iron sight
Vanilla commit:

8027cf6917
2016-10-03 16:49:26 -04:00
ebaydayz
97796bf524 Update change log 2016-10-03 15:45:13 -04:00
ebaydayz
df39ea0f30 Fix DomeTentStorage SQL Update
The Epoch dome tents had more cargo space than the default vanilla ones,
so we have to use the level 1 upgraded version to prevent gear falling
out.

Also corrected swap for DesertTent.
2016-10-03 13:17:10 -04:00
ebaydayz
a8e9c71ed1 Update some loot spawn rates
Vanilla commits applied:

8be21c0322

256212388d

8d928c4c8f

b83d74e076
2016-10-03 12:53:15 -04:00
ebaydayz
da524041ee Update vanilla fences
Vanilla commits applied:

c5f2447f14

45e757ece2
2016-10-03 12:27:43 -04:00
ebaydayz
591af81575 Add exit in fn_waitForObject.sqf
This is just in case something goes very wrong (like bad server lag) and
the object doesn't spawn.
2016-10-02 22:30:38 -04:00
ebaydayz
8196c2343a Fix inCombat checks from 0a17804
My mistake from 0a17804
2016-10-02 21:13:17 -04:00
ebaydayz
004a3bcde4 Fix wrong string used for Mountain Green soda
Mountain green was using the mountain dew strings too. These strings
were unused.
2016-10-02 20:31:52 -04:00
ebaydayz
87bebfad1f Improve publishVeh2 diag_log 2016-10-02 20:07:03 -04:00
ebaydayz
4faa1cbaab Set third parameter after findSafePos
All other scripts using findSafePos either set the third parameter or
use a getPosATL/etc. instead before the position is saved to database.

Also partially reverted d6e78b2 since it is not needed.
2016-10-02 18:51:46 -04:00
icomrade
1af4cc070f Fix issue with objects spawning in debug
better logging as well.

I haven't had objects purchased spawn in the debug, only those spawned
in with the admin tools since the position doesn't always have a third
element.
2016-10-02 16:20:35 -04:00
ebaydayz
de219116a8 Optimize save after trade
See my comment on b806043

Veh_setFixServer only runs on the server, so the client does not need to
compile it.

The PVDZ_veh_Save PVEH is only added on the server, so it should never
be sent with regular publicVariable anymore.
2016-10-02 15:44:51 -04:00
icomrade
353d3732d1 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-10-02 15:00:49 -04:00
icomrade
f66c512485 Revert SQL changes, update key gen
slightly different generation scheme
2016-10-02 15:00:35 -04:00
ebaydayz
91f168011c Remove unused variable from #1770
_inventoryMoney was unused @oiad
2016-10-02 14:11:20 -04:00
ebaydayz
c4f861630d Fix typo from 55910cc
Variable is not defined in this script.
2016-10-02 13:57:33 -04:00
ebaydayz
55910cc3d2 Remove humanity hit for killing player zombies
If you kill a player zombie you should not lose humanity. Player_death
is now synced with the humanity hit code in the damage handler.

Also the killing blow set variable was moved up because the same
conditions were already checked above.
2016-10-02 13:50:30 -04:00
ebaydayz
4509902822 Remove source object from Humanity hit network send
Source object is always player and not needed anymore after 8ea21a2
2016-10-02 13:26:11 -04:00
oiad
9fd2f2270b Advance trading gem fixes/localizations (#1771)
* Advanced trading combine/return change

Fixes combining/returnChange to squash gems into usable currency so they
can properly be used in the economy
Stringtable fixes for duplicates

* Localization additions

More localizations
2016-10-02 13:06:31 -04:00
ebaydayz
f353967abb Remove duplicate transfusion in progress messages
In addition to 11fa6a6

Vanilla commit:

f4aac518c1
2016-10-01 20:06:59 -04:00
icomrade
02218b736c Update epoch.sql 2016-10-01 19:37:56 -04:00
ebaydayz
17b30a7a2e Fix AI damage scaling
Fixes shots from AI using default scaling. For example AK_74 was doing
200 blood per shot or 60 shots to kill.
2016-10-01 17:45:46 -04:00
ebaydayz
e630f428bc Enable self bloodbag by default
Most server will want this on, even vanilla has it enabled by default.
2016-10-01 16:00:46 -04:00
ebaydayz
d6e78b27f0 Add setVelocity in publishVehicle2
This prevents trader spawned vehicles from floating.
2016-10-01 15:56:52 -04:00
ebaydayz
8ea21a2c81 Fix humanity hit for units in vehicles
The only change is a removal of this check and the corresponding
tabs/spacing:

if (_object == player) then {

That returns false if the player is in a vehicle. It is not needed since
PVCDZ_plr_Humanity EH only fires on the intended player now (sent with
PVC instead of PV).
2016-10-01 13:43:30 -04:00
ebaydayz
0a17804e36 Change inCombat to bool instead of number
When a variable is only going to be 0 or 1 it makes more sense to use a
bool.

Also avoided unnecessary network broadcasts of inCombat from e446603
2016-10-01 13:07:59 -04:00
ebaydayz
76273d06cd Fix undefined error _hasBloodBag in fn_damageActions
When this function was passed an empty array (like a player with no
magazines) it returned undefined because the inside of the forEach loop
did not execute.
2016-10-01 11:31:24 -04:00
oiad
11fa6a631c Minor fixes (#1770)
* Minor fixes

Simplifies the serverside logging to be more human readable
Removes duplicate transfusion text

* Minor fix

Minor fix for syntax
2016-09-30 22:10:56 -04:00
ebaydayz
341e734373 Change satchel and mines to single gear slot
For consistency with all other items in Epoch.
2016-09-30 21:47:48 -04:00
ebaydayz
ff8fb18cbf Correct stringtable explosion death grammar
Proper grammar when used in:
His name was %1, it appears he died from %2
and
%1 died from %2
2016-09-30 21:05:20 -04:00
ebaydayz
d9b785750d Fix death messages vehicle detection again 2016-09-30 20:51:34 -04:00
ebaydayz
88c1b83c31 Fix mine detection in death messages again 2016-09-30 20:06:18 -04:00
ebaydayz
1fb0b1004d Fix typo from d335ee2 2016-09-30 19:16:38 -04:00
ebaydayz
d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz
b45d6d9a24 Color new killfeed death messages
The player who died is colored red and the killer is colored green. The
weapon now points in the direction of the player who died.

Also reverted 66fd5be since it did not help. It is already done globally
in player_death.sqf anyway. I tested again and this actually fixes the
problem.
2016-09-29 20:26:26 -04:00
icomrade
1b91e808dd remove unused variable 2016-09-29 15:59:52 -04:00
icomrade
e49d786e2a Fix gear access on locked vehicles
This will be annoying in bases for sure, but cursorTarget just doesn't
work reliably.
2016-09-29 15:58:28 -04:00
ebaydayz
b4be955a0d Update new runover death message 2016-09-28 18:57:09 -04:00
ebaydayz
66fd5bee57 Clear combat status on death
This prevents "player combat logged" message after a player dies. The
alive check should prevent this in onPlayerDisconect, but it is
apparently unreliable or slow to update.
2016-09-28 14:46:59 -04:00
icomrade
c746d98853 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-27 20:55:13 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
dbd84e419b Use spawn for dynamicText kill feed
My mistake from 9b13bd0
2016-09-27 20:54:38 -04:00
ebaydayz
15b05dc84b Fix return change free space check when buying into vehicle
This fixes incorrect return of "not enough space to accept change" when
purchasing large quantities of magazines into a vehicle.

Thanks @oiad for noticing this.
2016-09-27 19:09:54 -04:00
ebaydayz
a2fcb69579 Remove scheduler_corpse setPosATL
Vanilla commit:

b4b54b51cc
2016-09-27 17:20:24 -04:00
ebaydayz
f15db73072 Update vanilla player_build
Vanilla commits:

f1e12509e1

ce98e0b1d5
2016-09-27 17:15:43 -04:00
ebaydayz
79c6d605a5 Add back playMoveNow in fn_unconscious.sqf
Partially reverting 341d45f

See comment on 341d45f
2016-09-27 16:50:59 -04:00
ebaydayz
cc28d43d25 Remove unit's local event handler anticheat check
The createUnit remote execution locality exploit was fixed in current
A2OA stable patch 131129:
https://forums.bistudio.com/topic/186695-a2a2oa-patch-18122015/

This is now unnecessary and would needlessly restrict modders.
2016-09-27 16:04:14 -04:00
ebaydayz
ceebaac579 Allow MAAWS HEAT round in createVehicle.txt
These are in the Epoch loot tables.
2016-09-27 15:26:09 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
icomrade
58e90da07d Fix transfusion in vehicle 2016-09-27 12:46:13 -04:00
icomrade
8c3fe83a87 Better UID Calculation + Longer ObjectUID Column
Don't even bother using vector in the key calculation, the sqf ObjectUID
isn't as critical anymore. This method will be much faster.

Changed ObjectUID column to Varchar since with this key generation
method we can approach the BigINT ceiling much quicker than we used to.
2016-09-26 16:34:26 -04:00
icomrade
111d9e46f0 Update Test Build and Readme 2016-09-26 13:52:30 -04:00
icomrade
514ac67650 Better OnPause 2016-09-25 20:31:38 -04:00
ebaydayz
7ae35316ed Merge pull request #1769 from oiad/master
Advanced trading bugfix, Snap building typo and snap point fixes
2016-09-24 12:25:14 -04:00
oiad
c02053176d Advanced trading bugfix, Snap building typo and snap point fixes
Fixes a bug with advanced trading green "you have this item" text in
buyables list, this was showing you had the item when you didn't.
Snap building typo
Snap building snap points for large cinder walls as reported by
@SmokeyBR
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-248021073
2016-09-24 18:53:02 +12:00
icomrade
40d419e475 Re-add abort timeout
Timeout is no longer restarted when you click abort and the loop now
closes the gear menu so the player cannot attempt to dupe with the gear
menu and abort menu open at the same time.
2016-09-23 19:10:39 -04:00
icomrade
770378b3af Private array 2016-09-23 17:22:57 -04:00
icomrade
cabf978fe7 Modify linebreaks in stringtable for parsetext 2016-09-23 16:59:17 -04:00
icomrade
e8006a40af Non-blocked messages
Displays at the bottom center of the screen. This now accepts formated
(structured) text, see https://community.bistudio.com/wiki/parseText for
more info
2016-09-23 14:02:31 -04:00
ebaydayz
c1763171db Fix damage on local trader city objects
This fixes local trader city objects taking damage from being run over.
2016-09-23 12:08:51 -04:00
ebaydayz
c4388356e5 Add setVariable.txt BE exception 2016-09-23 11:18:00 -04:00
ebaydayz
cc03256475 Update purchased vehicle spawn location
If there was no helipad available findSafePos was called. If that failed
it spawned the vehicle in the debug zone.

Calling findSafePos is no longer necessary since we are now using
createVehicle "NONE".
2016-09-22 18:12:52 -04:00
icomrade
7f0935c639 add floors to drop array 2016-09-22 15:14:05 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
icomrade
43547c8273 Better key calculation
append diag_ticktime to key. Max length is 24 characters in the DB so
the limit so this shouldn't cause issues unless the server is up for
hundreds of days.
2016-09-22 13:26:15 -04:00
ebaydayz
b315c15cb0 Update vanilla chop wood
Vanilla commit:

1bca531254
2016-09-21 18:43:23 -04:00
ebaydayz
5e71793c17 Update vanilla building
Vanilla commits applied:

44f2552ff2

213a333ce5

423d53299d

43bce6554f

f551cdac6e
2016-09-21 17:14:13 -04:00
ebaydayz
33cf7611ed Don't allow jerry fill from destroyed fuel source
Vanilla commit:

90251abab3

9204c15d3f
2016-09-21 16:53:29 -04:00
ebaydayz
ef065aeb35 Fix plot management buildables in range display count
See #1735
2016-09-21 15:52:14 -04:00
ebaydayz
f3ccb74eab Also update objects if player is dead in onPlayerDisconnect
I just noticed before 5f0c2fc this was also running if the player was
dead. Now it will run if the player is alive in playerSync otherwise it
will run here if they are dead.
2016-09-21 11:41:41 -04:00
icomrade
a60556e8a3 Update SQL 2016-09-21 11:32:20 -04:00
icomrade
c042145081 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-21 11:09:50 -04:00
icomrade
4e946552fd Fix combat logging
Thanks @ndavalos

@ebaydayz since this was moved after player_sumMedical is called in
5f0c2fcc49
it would no longer save the modified unconcious and timeout vars to the
DB.
2016-09-21 11:09:03 -04:00
ebaydayz
01b45121d8 Fix dayz_townGeneratorBlacklist not working
I forgot to update it when these were moved to global spawn recently.
2016-09-20 20:19:47 -04:00
ebaydayz
e2c2a2a76a Fix 309 error for newly placed safe inventory
See my comments on ae78fde and a3c3ccc

The object_maintenance function is only for vanilla buildables and is
currently not used. It immediately overwrites with a 306 call.
2016-09-20 13:47:18 -04:00
ebaydayz
e94a66e9fd Merge pull request #1768 from AirwavesMan/master
Adding more loot table for zombies
2016-09-20 12:03:30 -04:00
ebaydayz
ac95c6b0df Make plot and door friends lists backwards compatible
This prevents errors when upgrading 1051 databases that had plot or door
management installed.

See comments at:

fe9b8fdcb4
2016-09-19 20:21:27 -04:00
icomrade
b9ec6df95e Revert "Update object management name strings to array format"
This reverts commit fe9b8fdcb4.
2016-09-19 19:43:21 -04:00
A Man
7b22d9dd14 New loot tables for zombies
Adding 3 new  loot tables
2016-09-20 01:28:42 +02:00
A Man
7ea6e9c7a4 Zombie loot update
Adding 3 more options for zombie loot to give admins better possibilities to customize the zombie loot.
2016-09-20 01:27:31 +02:00
A Man
5e3d4c7890 Zombie loot update 2016-09-20 01:25:20 +02:00
icomrade
fe9b8fdcb4 Update object management name strings to array format 2016-09-19 16:34:02 -04:00
ebaydayz
1b7d7a2ecb Clarify benchmark diag_log 2016-09-19 16:23:33 -04:00
ebaydayz
0ab73aa821 Merge pull request #1767 from AirwavesMan/master
Small loot position update
2016-09-19 16:13:36 -04:00
A Man
b751ffb278 Small loot position update
Adding Land_stan to loot positions. It is the same like the Camp. Increasing the high of loot positions to prevent loot from spawning in the ground.
2016-09-19 21:45:19 +02:00
ebaydayz
13600e9d4c Update 1.8.8 addons link again 2016-09-19 15:39:56 -04:00
icomrade
a30ae01af3 Add SQL Update for Coins in Inventory Column 2016-09-19 15:38:34 -04:00
ebaydayz
df70d1f4a3 Clarify comment about grass 2016-09-19 15:34:40 -04:00
icomrade
c97015fb9a Re-add removal of fuel tanks and engine
Thanks for the tip on fuel tanks @SmokeyBR
2016-09-19 14:11:45 -04:00
icomrade
91e5e875c2 Force save after building and maintain 2016-09-19 13:48:27 -04:00
icomrade
5f33fd3ef5 Fix R3F Tired 2016-09-19 13:39:58 -04:00
icomrade
37a717fe3f Fix generator gear display and Offroad hud
using generator as a tent should have no adverse effects.

Thanks @SmokeyBR
2016-09-19 12:08:25 -04:00
ebaydayz
cb6a985645 Update change log
Fixed several typos. Updated outdated info.
Removed the [FIXED] line for DarkUI because that UI was not present in
1051.
2016-09-18 17:49:46 -04:00
ebaydayz
61f38fc259 Use number instead of string for weapon slot type in configs
This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
2016-09-18 14:58:35 -04:00
icomrade
9ec514cab1 Update Test Build to RC2
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766
2016-09-18 09:48:01 -04:00
ebaydayz
708328e486 Avoid gear update for empty random vehicles
There is no need to update the inventory if no loot was added.

My mistake from d98025c
2016-09-17 19:07:08 -04:00
ebaydayz
d0e7b26121 Fix wrong distance in relocate diag_log
My mistake from 9c2f151
2016-09-17 18:15:16 -04:00
ebaydayz
3d0c5b13cf Fix playerSync error from 5f0c2fc
@icomrade There are cases where playerSync will receive > 3 params if
achievements are passed. Example:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/system/player_spawn_2.sqf#L305
2016-09-17 17:43:41 -04:00
ebaydayz
29d9ed9211 Set unit posATL in switchModel if respawn is in water
Reverts:

bcc16a0135

See:

e8e5d24e80
2016-09-17 15:41:49 -04:00
ebaydayz
5f0c2fcc49 Speed up onPlayerDisconnect some more
Moved combat log setVariables to playerSync. Now the player object is no
longer needed for any of the code at the bottom of playerSync or
onPlayerDisconnected.

Update objects is already performed at the bottom of playerSync. There
is no reason to do it again in playerDisconnect since it calls
playerSync.
2016-09-17 15:02:00 -04:00
ebaydayz
da70306291 Speed up playerSync a little
Removed unused variables and redundant checks.

_Force was always true so any condition with an OR _force in it was the
same as (true) i.e. redundant.
2016-09-17 14:03:05 -04:00
ebaydayz
9c2f15159a Correct Air relocate in server_playerSync
@icomrade you forgot to change the _playerObj variable to _character
when you moved this.

Also if BIS_fnc_findSafePos was successful on the first attempt the way
you had it would use the original _charPos instead of the successful
return because you never set _charPos = _newPos;

ed3227fa7a
2016-09-17 13:07:27 -04:00
ebaydayz
bc4cb49463 Remove redundant characterID check in server_playerSync
I made no changes apart from removing the (_characterID != "0") check
and the corresponding spacing/tabs.

If _characterID == "0" the script would have already exited on line 30.
2016-09-17 12:18:54 -04:00
ebaydayz
a63da4606d Speed up onPlayerDisconnect a little
Removed redundant diag_log since it is already done in dayz_recordLogin.

Removed noatlf4 variable because we use inCombat instead. Noatlf4 is
only set if the player is hit in the damage handler, while inCombat is
set any time the player is in combat.
2016-09-17 12:05:32 -04:00
ebaydayz
b9507b2eb4 Don't hideObject on debug floor
e8e5d24e80 (commitcomment-19060242)
2016-09-16 17:17:02 -04:00
ebaydayz
bcc16a0135 Roll back to old swimming in ground fix
See
e8e5d24e80 (commitcomment-19053648)
comments
2016-09-16 13:26:27 -04:00
ebaydayz
b4ad50bf8f Add comment about grass height 2016-09-16 12:27:32 -04:00
ebaydayz
0ab46abd52 Don't spawn epoch dynamic debris if town generator is on
Vanilla town generator debris can end up spawning inside of epoch
dynamic debris if both are enabled.
2016-09-15 17:07:11 -04:00
ebaydayz
6e57bc6f6f Revert fix invisible primary stance glitch
Partial revert from:

e8e5d24e80

Can't seem to reproduce this one now with this commit reverted. If
anyone has working repro steps let me know.
2016-09-15 16:49:19 -04:00
ebaydayz
7415c21c2b Small update to object_build
Vanilla commit:

a10173443b
2016-09-15 12:48:31 -04:00
ebaydayz
b2dfa058b0 Simplify double negative in fn_unconscious
Simpler than:

b609dcf519
2016-09-15 12:44:47 -04:00
icomrade
b609dcf519 Update fn_unconscious.sqf 2016-09-14 18:01:18 -04:00
icomrade
0802ecc0ed Do not require plot to build traps 2016-09-14 17:48:23 -04:00
icomrade
c0e0684841 Fix duplicate english string 2016-09-14 17:12:07 -04:00
icomrade
625333985d don't rearm horns 2016-09-14 16:52:51 -04:00
ebaydayz
815b54ec44 Fix gut dog
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
2016-09-14 16:42:25 -04:00
ebaydayz
b349150548 Don't auto disable sound mute when exiting vehicle
Let the player choose when to disable so there aren't any unexpected
drastic volume changes.

Vanilla commit:

60f4968f23
2016-09-14 15:36:35 -04:00
ebaydayz
ce6dffde3d Add A2OA translations for open and close door 2016-09-14 14:46:58 -04:00
ebaydayz
ea9c25f54b Merge pull request #1764 from AirwavesMan/master
Adding new german strings
2016-09-14 14:05:31 -04:00
icomrade
a5ffceeb17 Update 1.0.6_Updates.sql
comments need spaces otherwise MySQL workbench bitches
2016-09-14 12:47:23 -04:00
A Man
940efd1f2e Small Update 2016-09-14 02:53:13 +02:00
A Man
63c8a89514 Adding lots of new german strings
Ive changed some other strings too
2016-09-14 02:42:24 +02:00
ebaydayz
e8e5d24e80 Fix swimming in ground glitch
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
e85f6ad1b5
2016-09-13 18:36:06 -04:00
ebaydayz
e85f6ad1b5 Consolidate transfusion scripts
Consolidated transfusion and transfusion_noBloodTypes to one script.

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

Total blood quantity is now added in 1/4 increments during self bloodbag
as intended instead of all at once.
2016-09-13 15:02:16 -04:00
ebaydayz
a8e5aba517 Remove some redundant createVehicle filters part 2
These are covered by the first line now.

Vanilla commit:

cd52730484
2016-09-13 11:45:36 -04:00
ebaydayz
4a2bf1c006 Remove redundant createVehicle filters
These are covered by the first line now
2016-09-13 11:20:47 -04:00
ebaydayz
c7a6c71330 Disable vanilla base building actions for now
Since we are not going to use vanilla base building.
2016-09-12 16:11:29 -04:00
icomrade
a09e364ec1 Don't block damage from explosives 2016-09-12 14:42:18 -04:00
ebaydayz
29c16dc59f Consolidate duplicate sell distance variables 2016-09-12 14:14:38 -04:00
ebaydayz
2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

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

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
icomrade
26f9102a00 These are used
I didn't save all before commiting :(
2016-09-12 12:57:08 -04:00
icomrade
06202e753f Minor loot/crafting cleanup
removed DayZ fences and unused item, added some crafting supplies to
trader (marginal savings if you craft bandages as opposed to buying
them)
2016-09-12 12:55:47 -04:00
ebaydayz
d98025c8d9 Fix random spawned vehicle loot saving
Dynamic vehicle loot will save to database now even if no players
interact with the vehicle before restart.
2016-09-12 12:23:23 -04:00
ebaydayz
66ac72ea9d Add setPos.txt BE exception for WoodenArrowF
4214d99bb1
2016-09-11 18:12:34 -04:00
icomrade
252843dee7 should fix error 2016-09-11 16:40:15 -04:00
icomrade
82c8d4d538 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-11 16:38:30 -04:00
icomrade
203975def7 Rearm driver weapons (pook rearming) 2016-09-11 16:38:26 -04:00
ebaydayz
8bcd3a44e6 Keep Epoch strings in the dayz_epoch package of stringtable
@oiad Please keep Epoch specific strings in the dayz_epoch package.
Vanilla does not have any of these items.
2016-09-11 15:40:16 -04:00
ebaydayz
16e4dc7b30 Move HeliCrash and CarePackage area variables to markers
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

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

Related vanilla commits:

b20b402bf0

7c8b69eb82

7dfd3ef9cf
2016-09-11 14:45:49 -04:00
icomrade
48334e76d4 Update spawned vehicle inventory after publishing 2016-09-11 14:43:26 -04:00
icomrade
caddfafc78 oops 2016-09-11 14:24:20 -04:00
icomrade
b806043a4a Save player and vehicle after trade
Also forgot to commit a change yesterday
2016-09-11 12:52:38 -04:00
ebaydayz
b835059885 Merge pull request #1763 from oiad/master
Localization additions
2016-09-11 10:13:56 -04:00
oiad
64348b1f84 Localization additions
Adds some more text to localization, Moves sandbags around so they are
all next to each other.
2016-09-11 15:21:43 +12:00
icomrade
b305e7d793 Don't force save at login
Thanks for the heads up ebay
2016-09-10 20:45:39 -04:00
icomrade
286f7d6017 whitelist laser on turret 2016-09-10 16:07:38 -04:00
icomrade
0dcc75e5ec Limit to crew 2016-09-10 15:53:16 -04:00
icomrade
14bf9f9018 Fix combat in vehicles 2016-09-10 15:34:54 -04:00
icomrade
ed3227fa7a Fix dupe on disconnect
I moved the relocation code to player_sync, I didn't notice any errors
but just check to make sure it's working okay.
2016-09-10 13:43:56 -04:00
ebaydayz
bbe6be6c31 Rename Multiplayer Setup to Lobby
Vanilla commit:

fd90a380a7
2016-09-10 13:19:31 -04:00
ebaydayz
3b8f89f18d Add version number in mission briefingDescription
Provide some useful info here instead of just repeating the
briefingName.
2016-09-10 12:26:13 -04:00
oiad
fed89a0ed2 Advanced trading and safe GUI changes (#1762)
* Advanced trading and safe GUI changes

This adds displaying of item/backpack/weapon/vehicle descriptions
Moves Weapons display on vehicles to a modular type, so if the vehicle
has no weapons it wont display, same with Description

Fixes an issue with safes not sounding keyclicks, at present they are
only active if you have music turned on, since I don't play with music
on (and many others) you will never hear them and when you do, the DTMF
signals they use are really obnoxious.

Replaced the sound with the one from the lockboxes, it's still audible
but very reasonable.

* Advanced trading fixes

Rework for my previous commit @ebaydayz

* Localization additions

Missing from previous commit
2016-09-10 12:09:27 -04:00
ebaydayz
f57e303355 Update vanilla fence building
Vanilla commits applied:

e88a5c42bc

fe95643511

9a82b8307c

5a305198c7

be872601c9

44a25b1b4a

7bfeab3c13

cc5f02a41a
2016-09-10 11:25:10 -04:00
ebaydayz
11a3df0177 Add note about database in Test Build Readme 2016-09-09 14:55:20 -04:00
ebaydayz
cb09377d26 Add GPS, Rangefinder and NVG back as sell only
Partially reverts
7435548582
@AirwavesMan now that buy or sell only is available via:

ffef031863
2016-09-09 14:05:06 -04:00
ebaydayz
8f25cc70db Localize sell and buy only messages
PrimaryWeapon always returns "", never nil unless the player object
isNull (in which case this script would not be running).

Fixed cases where a nil variable would throw an error when checking the
next condition.
2016-09-09 13:53:20 -04:00
ebaydayz
e5e212bbc2 Add comment about salvage vehicle work around 2016-09-09 12:58:41 -04:00
ebaydayz
eadbbb18bf Fix double tap bunny hop with no weapon glitch
Also makes it easier to bunny hop in quick succession. Previously double
tap triggered a bunny hop immediately followed by a regular vault.

Vanilla commit:

5833c76491
2016-09-09 11:41:09 -04:00
ebaydayz
32db983f34 Fix undefined amount when bloodbagging remote player 2016-09-08 20:00:38 -04:00
ebaydayz
a666389026 Merge pull request #1761 from oiad/master
Salvage vehicles last changes
2016-09-08 17:48:09 -04:00
oiad
75f4f2fa1f Salvage vehicles last fixes.
Add changelog and enable by default
2016-09-09 09:46:51 +12:00
oiad
51f85acb9e Toggle for salvaging from locked vehicles (#1757)
* Toggle for salvaging from locked vehicles

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

* Toggle salvagable locked vehicles changers

@ebaydayz fixed
2016-09-08 17:32:27 -04:00
ebaydayz
4731780f5a Fix diag_log when vehicle spawn limit is reached
Prevents benchmark diag_log showing negative number of vehicles spawned.
2016-09-07 11:18:37 -04:00
ebaydayz
771284a297 Auto select main weapon after throwing
Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

08449fdfda
2016-09-06 16:36:45 -04:00
icomrade
bbf0ac583d whitelist pook grenades 2016-09-05 15:39:58 -04:00
ebaydayz
c8b3053496 Remove unused keyboard_keys function
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

f5780256ee
2016-09-05 14:16:38 -04:00
ebaydayz
cab627e3de Add note about server_timeSync name change 2016-09-04 14:40:03 -04:00
ebaydayz
530ed4b3b4 Only exit for playerNear if supply crate wreck or mine wreck 2016-09-03 20:16:21 -04:00
ebaydayz
70ebd6dbcb MISSION_ROOT variable is no longer needed
Also @icomrade you accidentally committed the testkit code to
chernarus11 init.sqf. Removed it for you.
2016-09-03 16:33:17 -04:00
icomrade
ffef031863 Allow disabling of buying or selling
Set price of the item to -1 in the Cfg traders files to disallow buying
or selling
2016-09-03 14:26:43 -04:00
icomrade
1b60d0d963 I should be more careful 2016-09-02 19:18:33 -04:00
icomrade
d1d5fe54f3 Fix cheat handling
This adds keydown handler for chat, map, and diary displays.
Additionally, this can be used to handle malicious chat input without a
delay by modifying the associated compile
2016-09-02 19:14:21 -04:00
ebaydayz
7be75c4674 Remove random unused faco code 2016-09-02 13:25:51 -04:00
icomrade
413e86b521 Reconfigure pook and autogyro magazines
This allows players to carry the magazines, without modification to
ammo.sqf the side guns of the pook transport are supported to be
rearmed. Modification will be required to allow turrets assigned to the
pilot to be rearmed, such as the pook H13 gunship and mozzie grenades.
2016-09-02 12:24:39 -04:00
ebaydayz
ab6fa80697 Wait for BIS_fnc_init on login
Fixes occassional case of undefined errors for BIS functions on client
when login completed very fast.
2016-09-02 12:03:14 -04:00
icomrade
678acff706 cleanup comment 2016-08-31 18:08:58 -04:00
icomrade
04b6707191 Fix Mozzies/gyrocopters
Fixes wrecks bouncing 500m into the sky, players not dying when crashing
these vehicles, and sound falloff (someone verify in a multiplayer game,
I teleported away from a flying mozzie and it appeared fixed).

I made a new startup and stop sound for the mozzie which is acceptable I
think, but I'm using the MV22 Osprey noise startup and stop noises for
the gyrocopter. The osprey startup is fairly well fitting, but the stop
noice is out of place, if anyone can come up with a better noise please
change it otherwise if it's out of place enough I'll just remove it
altogether.
2016-08-31 18:04:40 -04:00
ebaydayz
b9dc98ac6f Revert move Shift +- to function
See:

51caa509cb (commitcomment-18834096)
2016-08-31 13:46:26 -04:00
ebaydayz
51caa509cb Comment out Gcam keys and move Shift+- to function
Vanilla commit:

8ed8ab6b5c
2016-08-30 14:18:38 -04:00
icomrade
92b4c8785d Disable shift + - input
shift + - is used to ented arma "chests" which allow the player to issue
endMission, and limit their fps (min 5 fps limit). This unfortunately
disables the flush cheat, but attempts to filter out input and allow
flush are not reliable.
2016-08-29 13:49:05 -04:00
icomrade
78d17a5f87 Use real path 2016-08-29 13:31:07 -04:00
ebaydayz
16f17aafee Revert "Don't call player_forceSave when gear menu is aborted"
This reverts commit 91e312fdc7.
2016-08-29 12:05:50 -04:00
ebaydayz
cc9ba66888 Add Anzio_20_DZ
https://github.com/EpochModTeam/DayZ-Epoch/pull/1680#issuecomment-243150947
2016-08-29 12:01:06 -04:00
ebaydayz
91e312fdc7 Don't call player_forceSave when gear menu is aborted
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242992472
2016-08-28 16:18:53 -04:00
ebaydayz
a245690cae Use looser values for logout in air vehicle fix
Fixes problems with
7b354e7d55
2016-08-28 12:40:32 -04:00
icomrade
0887b80556 Fix server_monitor
thanks @Bruce-LXXVI
2016-08-28 12:10:01 -04:00
ebaydayz
7b354e7d55 Fix relog over base in air vehicle to get inside exploit
Tested over forest, regular terrain and water without issue.
2016-08-28 11:35:32 -04:00
ebaydayz
0f043313ab Merge pull request #1756 from oiad/master
Plot management force maintain option
2016-08-28 10:09:32 -04:00
oiad
d6324723e9 Plot management force maintain option
This replaces the "refresh" menu option with a "force maintain" option.
Allows you to maintain the base even if it doesn't need it to either get
all your items in sync or if you are going away or similar.

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

Also fixes an undefined variable error in system_monitor that was
introduced
8f58baf3f2
2016-08-28 20:13:25 +12:00
ebaydayz
755adc7798 Initialize CurrencyName in configVariables.sqf
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242927452
2016-08-27 15:09:49 -04:00
ebaydayz
04b6711822 Round humanity in journal
Vanilla commit:

145ec00b76
2016-08-27 10:11:49 -04:00
ebaydayz
3f27bef1e3 Add version define in config.cpp
Vanilla commit:

75ff017b53
2016-08-27 10:09:55 -04:00
ebaydayz
f2c39e0038 Fix wrong _name variable in server_onPlayerDisconnect
My mistake from #1753, name is already passed from onPlayerDisconnected:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/init/server_functions.sqf#L141
2016-08-27 09:48:14 -04:00
ebaydayz
6494d0e11b Add note about x86 version of redistributable 2016-08-27 09:13:19 -04:00
Niklas Wagner
65593be995 Add German String (#1755) 2016-08-27 14:38:33 +02:00
Niklas Wagner
10e34cf62b Merge pull request #1755 from oiad/master
Supply crate localization fixes
2016-08-27 14:32:15 +02:00
oiad
f838739975 Supply crate localization fixes
Extends the displayName RSC width to the same as the description (Not
sure why this was so small, it truncated longer display names)
Added localization strings for all the supply crates so they were easier
to distinguish in the gear menu.
2016-08-28 00:02:27 +12:00
icomrade
95310b9000 Re-add observer to UH1Y and AH6X
This fixes config errors for unknown animation sources for both
vehicles. The turrets do not have thermal capabilities and this restores
the missing co-pilot/observer seat in the UH1Y. Also I can't seem to get
the turret on the AH6X to rotate, but if someone knows how please leave
a comment or commit the changes. there's currently no overlay for the
observer of the AH6X since it can't move I feel it's limited enough
without an overlay like the UH1Y.
2016-08-26 15:21:03 -04:00
ebaydayz
ae329db599 Add TurnLeft and TurnRight actionkeys to interrupt
Fixes #1753
2016-08-25 17:42:24 -04:00
ebaydayz
c2b16f0828 Consolidate DZE_ActionInProgress and r_action_count to one variable
There is no point in having two variables for the same purpose.

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

I will make this change in vanilla too.
2016-08-25 15:38:27 -04:00
ebaydayz
6b101d3c2e Apply missing updates to epoch.sql
All updates in 1.0.6_Updates.sql are now applied to epoch.sql.
2016-08-25 13:08:46 -04:00
ebaydayz
cb17d6bd06 Update test build 2016-08-24 20:26:51 -04:00
ebaydayz
a0973f12a1 Minor improvement to diag_log 2016-08-24 14:02:05 -04:00
ebaydayz
a8e2ce07b5 Optimize some createVehicleLocal
https://community.bistudio.com/wiki/Code_Optimisation#createVehicle.28Local.29
2016-08-24 13:34:11 -04:00
ebaydayz
56d63f608a Comment out CfgLoot include in configFile
No need to load twice.
2016-08-24 12:50:20 -04:00
icomrade
6068d62b2b Fix BRDM kick 2016-08-23 20:31:56 -04:00
ebaydayz
632f70482e Merge pull request #1752 from AirwavesMan/master
Better Cessna display names
2016-08-23 19:38:38 -04:00
ebaydayz
b4b8d3dc00 Remove DayZ_UseSteamID variable
Forgot to remove with
134a614255
2016-08-23 19:31:59 -04:00
ebaydayz
93d152209a Use distance > 0 instead of BIS_fnc_areEqual
This is faster and actually works.
2016-08-23 19:24:41 -04:00
ebaydayz
8af3d001ba Revert "Add faster array compare function"
This reverts commit d7cc4be585.
2016-08-23 18:22:06 -04:00
A Man
454583a461 Better Cessna display names 2016-08-24 00:11:22 +02:00
ebaydayz
a323f453d2 Make minor change to fn_waitForObject.sqf 2016-08-23 17:49:53 -04:00
ebaydayz
134a614255 Remove FNC_getPlayerUID
It's been over two years since it was added. All servers should be
updated to steam ID by now.
2016-08-23 15:40:26 -04:00
ebaydayz
7d27b5c0b1 Remove DZE_advancedTrading config variable
The legacy config trader menu was removed, so this variable is redundant
now.
2016-08-23 14:26:17 -04:00
ebaydayz
c871c1e2c1 Move DZE_ConfigTrader to configVariable.sqf
Most servers will want to use config traders.
2016-08-23 14:10:10 -04:00
ebaydayz
164ba6a135 Remove unused variable dayz_baseTypes
Vanilla commit:

220178844f
2016-08-23 14:02:20 -04:00
ebaydayz
6783ef9b1d Merge pull request #1751 from oiad/master
Plot/Door management userlist fix
2016-08-23 13:51:42 -04:00
ebaydayz
bebff83996 Update german translation #1749
Sorry @AirwavesMan I missed that you wanted to change this too.
2016-08-23 13:34:36 -04:00
ebaydayz
e74f12752b Remove unused duplicate clothing translations
Vanilla commit:

a49042262c
2016-08-23 13:29:44 -04:00
ebaydayz
81473754f9 Revert unnecessary change from #1747
https://github.com/EpochModTeam/DayZ-Epoch/pull/1747#issuecomment-241802114
2016-08-23 13:12:01 -04:00
ebaydayz
29acecc2f2 Retire DZE_MissionLootTable variable
AFAIK there is no performance difference between configFile and
missionConfigFile.

Using missionConfigFile by default simplifies loot scripts and makes the
extra config variable unnecessary. It's one less step for admins to
customize their tables.
2016-08-23 12:57:12 -04:00
ebaydayz
10b006d4eb Improve readability of trade_any type lists 2016-08-23 11:57:09 -04:00
ebaydayz
5c13101254 Add arrays slightly faster in dynamic_vehicle.sqf
Set is faster when adding a single element to an array, but + is faster
for combining arrays (or append in A3).
2016-08-23 11:34:58 -04:00
ebaydayz
d7cc4be585 Add faster array compare function
Vanilla commit:

7bbeab4e7d
2016-08-23 11:17:07 -04:00
oiad
4da8e07cb0 Plot/Door management userlist fix
This fixes the userlist from overflowing onto the Add button when
there's too many users in the userlist.
2016-08-23 23:25:46 +12:00
icomrade
8c43b0fc1a Move actualSpawnMarkerCount
thanks for the tip @ndavalos
2016-08-22 23:21:08 -04:00
icomrade
0e3e352491 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-22 21:30:07 -04:00
icomrade
3dc7f21de6 Adjust toneMaping
A little less gloom by default
2016-08-22 21:29:59 -04:00
ebaydayz
2ceac68f84 Update test build 2016-08-22 20:22:49 -04:00
ebaydayz
38b2a551bd Fix fn_waitForObject handling multiple of same object type
Forgot to handle case where there is already one or more of that object
type in the area (safes, cars, etc.).
2016-08-22 20:14:11 -04:00
icomrade
a70501cf59 Use GetOut
Doesn't create a parachute with air vehicles
2016-08-22 19:28:50 -04:00
ebaydayz
2dd36bcda5 Add missing exception for PVDZ_Server_buildLock
Vanilla commit:

00cae30559
2016-08-22 17:07:59 -04:00
ebaydayz
bc7bef857f Fix r_action_count not reset in player_buildVanilla exit 2016-08-22 16:54:14 -04:00
ebaydayz
4c856e5bb1 Update test build to 1.8.8 dev addons
Dayz_buildings was updated to enable vanilla base building again for
1.8.8 release. Also dayz_equip and some others were updated to fix minor
errors.

This allows us to test vanilla building in combination with epoch
building.
2016-08-22 16:29:57 -04:00
ebaydayz
f1430fc41b Add note about A2OA version in TestBuild ReadMe 2016-08-22 13:37:51 -04:00
ebaydayz
61ebe75601 Merge pull request #1748 from oiad/master
Advanced trading fix
2016-08-22 12:25:13 -04:00
oiad
89a43cb2d8 Advanced trading fix
This fixes the issue that @ndavalos found:
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-241289082
2016-08-22 21:10:46 +12:00
icomrade
c4aa469e41 Don't send to original player 2016-08-21 18:36:20 -04:00
oiad
6bdc3956fb Plot / door management userlist sorting (#1747)
* Plot / door management userlist sorting

This correctly sorts the nearby humans list in both mods, I have this
running on my 1051 server with no issues, @ebaydayz please advise if
this is not right, I've tested it pretty well and it is indeed selecting
the right person/UID

* Door/plot management fixes

As per @ebaydayz
2016-08-21 17:19:52 -04:00
ebaydayz
8ef349e2bb Make minor adjustment to push stuck plane action 2016-08-21 17:03:47 -04:00
ebaydayz
745e287202 Add option to push stuck planes
Also changed flip vehicle back to 1051 default which allowed players to
flip non-ATVs with help.
2016-08-21 16:45:32 -04:00
icomrade
9aa1784f23 Globally remove wrecked objects
using PVEH PVDZE_obj_Remove. Wrecks only exist for the players currently
in the server when the parent object is destroyed. Passing the object
through the PVEH does not work.
2016-08-21 15:46:33 -04:00
icomrade
2ef433dc93 Server_monitor fixes
revert _serverVehicleCounter to array, since I didn't notice it was
referenced in another file. Don't attempt to load objectData dump if the
vehicle count is 0 since the file won't be created.
2016-08-21 14:36:11 -04:00
icomrade
f50666190b accidentally removed _hiveLoaded 2016-08-21 14:20:45 -04:00
ebaydayz
f8334c8315 Update dynamic_vehicle.sqf with new Cessna and AN2 2016-08-21 14:09:05 -04:00
ebaydayz
df67a35bc7 Add new AN2 skins to trader 2016-08-21 13:48:23 -04:00
ebaydayz
c412287972 Fix shotgun ammo case sensitivity in SQL updates
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-241269173
2016-08-21 13:13:51 -04:00
ebaydayz
da2faeb6d0 Add back fall damage block for local explosion cheats
Vanilla commit:

a02294421c
2016-08-21 13:06:02 -04:00
ebaydayz
19dd6f26ab Add setVariable exception for Merlin hit part 2016-08-21 12:41:00 -04:00
ebaydayz
289b1307ff Fix speed typo in damage handler and vehicle getOut
Vanilla commit:

1f6dd9f787
2016-08-21 12:06:12 -04:00
ebaydayz
92fbfdfdae Fix gunshot study body death message
Vanilla commit:

9993400f97
2016-08-21 12:02:10 -04:00
ebaydayz
fd90eda8ae Update vanilla player build
Vanilla development commits applied:

a2193626a0

deb7207672

2de1d90edd

8a914606cf
2016-08-21 11:58:32 -04:00
ebaydayz
f0e0f6d6e4 Temp Bypass for tents and stashes for collision checks.
Vanilla development commit:

143f8e4dcb
2016-08-21 11:39:19 -04:00
A Man
49c6e0c318 Adding many new vehicles to configs (#1746)
* Adding display name for UH60M_MEV_EP1_DZ

* Adding 6 new Mi17 variants to config

Armed:
Mi17_TK_EP1
Mi17_UN_CDF_EP1
Mi17_CDF

Unarmed:
Mi17_medevac_CDF
Mi17_medevac_Ins
Mi17_medevac_RU

* Adding new line for Cessna.hpp

* Adding Cessna to the configs

That removes the radar function from the cessans.

* Adding 1 new An2 version to the config

* Adding 2 more HMMWVs to the config

Ive lowered the maxspeed from the HMMVW_DZ because all HMMWVs have a maxspeed of 100.

New classes:

HMMWV_Armored
HMMWV_M2

* Adding BRDM2 to configs

* Adding line for BRDM2_DZ.hpp

* Update after comments

* Update again

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update HMMWV.hpp

80 is the same as the other high tier armored HMMWV above. 40 is the same as the low tier ones.

* Update HMMWV.hpp

* Update HMMWV.hpp

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update CHANGE LOG 1.0.6.txt

* Update UH60.hpp

* Update Cessna_DZ.hpp

* Update Cessna_DZ.hpp

* Update NeutralAirplanes.hpp

* Update MI17.hpp

* Update AN2_DZ.hpp
2016-08-21 09:19:34 -04:00
icomrade
43275aa8e6 Update server and DLL 2016-08-20 19:25:47 -04:00
icomrade
00fa89d08f Server_monitor.sqf with new object stream method
Allows server to use either legacy loading method by itterating
callExtension (using  _legacyStreamingMethod = true). Otherwise, the
hive will dump objects to a file, write the filename to the server's
profile and it is deleted next restart, each filename is unique every
startup.

Associated hive commit:
bc5d5c56a8
2016-08-20 19:24:24 -04:00
ebaydayz
d20221caf3 Crash site spawns lowered to 1 at startup. Spawn frequency changed.
Vanilla development commit:

a2040214dc
2016-08-20 16:32:56 -04:00
ebaydayz
38e30d2565 Remove duplicate drink string
Vanilla development commit:

c25213fbb4
2016-08-19 15:41:50 -04:00
ebaydayz
f3370cbc4b Give vehUpgraded a default value #1745
@oiad No need to check _vehtrade in this case it will always be true if
_vehUpgraded != ""
2016-08-19 14:17:13 -04:00
ebaydayz
461424ff41 Merge pull request #1745 from oiad/master
Advanced trading selling upgraded vehicles.
2016-08-19 14:10:32 -04:00
oiad
d987fb290c Advanced trading selling upgraded vehicles.
These changes allow the player to sell upgraded vehicles with them not
being added to the trader (as to not polute the lists). This basically
refers to an upgraded vehicle as a child of the base vehicle so it will
get the same sell price as the base vehicle.

This still follows the original trading convention, the vehicle base
needs to be in the trader category, i.e you cant sell an armored SUV at
stary vehicle trader.
2016-08-19 22:15:47 +12:00
ebaydayz
554dad4e9e Add plot pole to setDamageOnAge SQL event include
Like locked doors, plot poles can also have UIDs in their inventory now,
since plot for life and plot management were added.

Thanks @oiad
2016-08-18 17:06:44 -04:00
ebaydayz
bfca19bf80 Remove some unused legacy code 2016-08-18 17:00:08 -04:00
ebaydayz
509c2b17d6 Fix typo from 5d372d3
5d372d3
2016-08-18 13:30:19 -04:00
ebaydayz
0394c61183 Match Adv Trade blue color for compatible highlight
Matches blue used in advancedTrading.hpp, slightly lighter and easier to
see on dark grey background. @oiad 42ebfb5
2016-08-18 13:27:00 -04:00
ebaydayz
5d372d3351 Add UH60M_MEV #1743
Added to traders in #1743
2016-08-18 13:01:08 -04:00
ebaydayz
0475e0fcb2 Merge pull request #1744 from oiad/master
Advanced trading buyable list changes
2016-08-18 12:11:48 -04:00
oiad
42ebfb54d7 Advanced trading buyable list changes
Further changes Advanced trading buyable list to show the item as blue
if it's compatible attachment wise and ammo wise.

This will get overwritten if the player has the item in their inventory
by staying green.

Also fixes a small bug I put into my last commit by not showing up for
boats/bikes etc.
2016-08-18 22:02:51 +12:00
ebaydayz
73a5f54f05 Slightly adjust some assault rifle loot chances 2016-08-17 20:46:58 -04:00
ebaydayz
2d73b13b06 Remove random empty lines in stringtable
leftover from da21433 @oiad
2016-08-17 20:20:49 -04:00
A Man
9cce8910c2 Adding many new weapons (#1743)
* Update stringtable.xml

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

Lowering DMR spawnrate
2016-08-17 20:05:46 -04:00
ebaydayz
3103195017 Fix switch weapon addAction with nothing in hands
The addAction click was doing an animation without switching when the
player had a primary or melee on back but nothing in hands.

Probably present in vanilla too, will check later.
2016-08-17 15:26:24 -04:00
icomrade
879ed7d479 re-add sim enable 2016-08-17 15:25:59 -04:00
icomrade
488952e3b6 more server_monitor changes
Forgot to include this with the previous commit
2016-08-17 15:20:08 -04:00
icomrade
78665f3ed7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-17 15:18:42 -04:00
icomrade
6d45a8f2b6 use createVeh non-array on the server
Faster by my testing. Also, some more performance related changes to
server_monitor
2016-08-17 15:17:43 -04:00
ebaydayz
a345b69a77 Swap vanilla ItemPadLock for Epoch ItemComboLock
This greatly simplifies things over having two separate combo lock
classes.
2016-08-17 13:27:08 -04:00
ebaydayz
d62a69b9f5 ArmoredSUV transportMaxMagazines change #1588
Fixes #1588
2016-08-17 10:18:11 -04:00
ebaydayz
a2eb4af312 Merge pull request #1742 from oiad/master
Advanced trading change to buyables list
2016-08-17 09:56:21 -04:00
A Man
4e65c4b473 Add missing re-combine actions for magazines (#1741)
* Updating strings for missing magazins

Adding new magazine names to make it similar to the dayz 1.8.7. names.

Adding 
Mk17
M17 SD
M107
KSVK
L115
VSS

* Adding missing magazines and re-combine option

Mk17
Mk17 SD

* Adding missing magazines and re-combine option

M107
KSVK
L115
VSS

* Update stringtable.xml

Moved new strings to epoch package

* Update 762x51.hpp

Adding the SD indicator. I think the SB instead of SD is too confusing. So everyone knows it is SD ammo.
2016-08-17 09:45:15 -04:00
oiad
fc2c03d0d3 Advanced trading change to buyables list
This changes Advanced trading to change the item color to green if it
matches with an item is in your inventory, in your weapon slots (main
slot and dayz_onBack) is the same backpack and is a vehicle you are
local to.

This brings it in line with default trader, except we're using local
here since that's all that matters.

Thanks to @ebaydayz for the suggestion.
2016-08-17 22:52:05 +12:00
ebaydayz
f04d581b4d Cleanup Adv Trade parseText formatting
Just added line breaks so it is easier to count the format order.
2016-08-16 17:07:33 -04:00
ebaydayz
e02f8ba8ff Use BIS_fnc_numberText for SC number displays again
Missed some @ndavalos
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854
2016-08-16 16:44:56 -04:00
ebaydayz
3f3f1a32ed Use BIS_fnc_numberText for SC number displays
See:

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854

That should be all of them @ndavalos let me know if I missed any.
2016-08-16 16:28:06 -04:00
ebaydayz
72f6dbc849 Fix can't pack tent with DZE_permanentPlot=true
Thanks @nigeyuk and @oiad
2016-08-16 15:09:10 -04:00
ebaydayz
263a46f5c0 Add dayz_onBack to R3F weight total
thanks @AirwavesMan
2016-08-16 14:23:55 -04:00
A Man
7435548582 Small trader changes (#1740)
* Update FriendlyVehicleParts.hpp

Moving Mixed Oil to building supplies.

* Update FriendlyBuildingSupplies.hpp

Adding Mixed Oil.

* Update FriendlyToolbeltItems.hpp

Removing GPS, Range Finder and Night Vision from buylist. These items should be rare items and harder to find than other items.
2016-08-16 13:41:17 -04:00
icomrade
d4f5881155 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-15 21:35:13 -04:00
icomrade
4a4e7952d0 Much faster server_monitor
in my testing createvehicle non-array is more than 2x as fast as
createvehicle array. Also includes some changes by @ndavalos in the RC1
issues thread.
2016-08-15 21:35:00 -04:00
ebaydayz
c66bd67f01 Remove duplicate translations again
Missed a few @oiad  ;)
2016-08-15 20:07:34 -04:00
ebaydayz
da2143336a Remove duplicate translations from stringtable
Submitted by @oiad
2016-08-15 19:58:52 -04:00
ebaydayz
b7ec9fc5aa Merge pull request #1739 from AirwavesMan/master
Updating CfgWeapons and harvest Wood
2016-08-15 18:56:15 -04:00
A Man
ad1e54af58 Updating for more wood
Updating for more wood from trees like in 1051.
2016-08-16 00:38:59 +02:00
A Man
14e4e0ac5a Updating for old magazines 2016-08-16 00:35:13 +02:00
ebaydayz
ae8329e55b Further simplify maintain_area.sqf again 2016-08-15 18:05:42 -04:00
ebaydayz
72c9c9eb38 Further simplify maintain_area.sqf 2016-08-15 17:54:16 -04:00
ebaydayz
b37445a4d5 Fix mistake from 15763f4
#1735

15763f4f2a
2016-08-15 17:21:13 -04:00
ebaydayz
8465c88b8f Merge pull request #1737 from AirwavesMan/master
Adding missing items
2016-08-15 16:47:10 -04:00
ebaydayz
15763f4f2a Consolidate maintain scripts
Thanks to @oiad for making this easy #1735
2016-08-15 16:33:00 -04:00
A Man
1795b03d24 Adding missing items
Adding missing items when using dayz_knifeDulling = true; anddayz_matchboxCount = true; and ItemFishingPole
2016-08-15 21:03:26 +02:00
oiad
c738710b77 Plot management fixes (#1735)
* Plot management fixes

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

* Plot Management tidyness

Fixing tidy issues

* Plot management changes

Fix maintenance variables as per @ebaydayz

* Plot management

Missed one

* Plot management fixes and default maintain_area fixes.

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

Changed _range to use DZE_maintainRange (DZE_plotPole select 0 + 20)
2016-08-15 14:49:56 -04:00
A Man
fc0f0dc896 Updating loot table and loot chances (#1736)
* Update Generic.hpp

Adding some magazines

* Update Police.hpp

Adding Loot Group AmmoCivilian and removing magazines

* Update Industrial.hpp

Removing  Sandbags, Wire and Tank Traps from normal Industrial spawn and moved them to Military Industrial- Lowering spawn chance of Planks, Consumable and Generic. Ive tested the new loot chances and they working fine.

* Update Hangar.hpp

Changing spawn chances of almost every item and adding PartEngine, PartGeneric, PartGlass to loot table. New hanger loot works good and feels much better than before.

* Update Military.hpp

Removing Loot Group Generic and Sandbags from Military and MilitarySpecial Loot. Adding Engine, Sandbags, Tank Traps, Wire and Loot Group Generic to MilitaryIndustrial. That works very well. 
If you looting baracks and finding most of the time sandbags and generic loot it is frustrating. Now it feels better and more balanced.

* Update Military.hpp

Updating loot chances
2016-08-15 12:40:59 -04:00
ebaydayz
c75ccbb8b3 Move _hit == "" exitWith further down in damage handler
Vanilla development commit:

837a2623b0
2016-08-13 20:22:57 -04:00
icomrade
9d6c17d706 Update server pbo 2016-08-13 18:10:14 -04:00
icomrade
56d7ac8d4f Fix disableuserinput in unconcious 2016-08-13 16:50:26 -04:00
icomrade
341d45f440 Remove excessive anim on recover unconcious 2016-08-13 16:12:50 -04:00
ebaydayz
cb3be8b547 Add minor improvement to safe diag_log 2016-08-13 13:20:36 -04:00
icomrade
18643fec95 Move disableUSerInput in unconcious code 2016-08-13 11:52:05 -04:00
icomrade
8dde92b377 Fix unconcious warping
Also comment out the part where vehicles have their engine turned off or
the player is ejected, since this behavior makes no sense.
2016-08-13 10:32:28 -04:00
icomrade
92cb4f4493 Should fix #1733 2016-08-12 23:40:46 -04:00
icomrade
cbf87cb1e4 Revert "Should fix #1733"
This reverts commit b6ffa37c1b.
2016-08-12 23:39:17 -04:00
icomrade
fd3475a617 Should fix switching clothes 2016-08-12 23:07:01 -04:00
icomrade
e8cd89a194 Switch to call compile
Should be much faster
2016-08-12 22:32:48 -04:00
icomrade
b6ffa37c1b Should fix #1733 2016-08-12 22:14:52 -04:00
ebaydayz
c46f55b496 Update test build 2016-08-12 22:00:58 -04:00
ebaydayz
ac30e8addd Remove ctrl alt del force save
See
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239595150
2016-08-12 21:51:09 -04:00
ebaydayz
21bee1899e Remove some duplicate translations 2016-08-12 21:19:24 -04:00
A Man
1145f97e1b Adding the skin FR_Sapper (#1734)
* Added one new skin

* Added one new skin

* Added one new skin and class RepairVehicle

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

* Added one new skin

* Added one new skin

* Update EpochSkins.hpp

* Added one new skin

* Added one new skin

* Added one new skin
2016-08-12 20:54:24 -04:00
ebaydayz
f529e5d724 Add PV value exception for SetFuel
Fixes kick when refueling
2016-08-12 20:16:16 -04:00
ebaydayz
74579bcf2f Allow remove with Crowbar in hands or onBack
Now crowbar can be in your toolbelt, hands or onBack when removing
modular items, mining ore, opening supply crates, etc.
2016-08-12 19:38:23 -04:00
ebaydayz
7b287a2a23 Send PVDZ_sec_atp messages as array
Vanilla development commits:

6e0fd6203b

78ed0665fa
2016-08-12 17:23:49 -04:00
ebaydayz
ed47a63313 Make log more accurate in server_playerSync
Vanilla development commits:

45ac48b595

ca23681a7d
2016-08-12 16:41:45 -04:00
A Man
bbb8c803b6 Adding many new skins (#1732)
* New Skins

Added all new skins to the loot table.

* Added new skins

* New skins for trading

* New skins for trading

* New skins for trading

* Added new skins

* Added new skins

* Strings for new skins

* Added new skins to player classes

* Added weight for new skins
2016-08-12 15:37:48 -04:00
ebaydayz
36196661ea Update arrow and quiver classnames
Vanilla development commit:

1561c3cfd8
2016-08-12 14:00:32 -04:00
icomrade
8f58baf3f2 Slightly mroe performant server_monitor 2016-08-12 01:50:54 -04:00
icomrade
c2b85718fa Wrong variable 2016-08-11 22:47:09 -04:00
ebaydayz
b2394703f3 Update vanilla player build
Vanilla development commit:

20f992fcb7
2016-08-11 20:01:53 -04:00
ebaydayz
d60600a825 Fixed missing tags.
Vanilla development commit:

ed4ba17a1c
2016-08-11 19:50:03 -04:00
ebaydayz
9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

707a591765

c453cdedd2

Set to double vanilla default value since Epoch has a lot more large
vehicles with 1000+ fuel capacity.
2016-08-11 18:08:21 -04:00
ebaydayz
f985c50382 Updated Nutrition Values for refueling vehicles. (per can)
Vanilla development commit:

fac691a614
2016-08-11 16:01:16 -04:00
ebaydayz
7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

3db0fe8e7a

73a63898f1

08e18d5b52

126da2dcd3

d5fa323865

d37526fcc6

5fcca134f0

c9c1fc934d
2016-08-11 15:16:53 -04:00
icomrade
4019d0c351 Should stop vehicles from falling through buildables 2016-08-11 13:19:24 -04:00
ebaydayz
2fdc87a86c Clarify comment 2016-08-11 11:15:51 -04:00
icomrade
a885c8c147 Should fix Dynamic Vehicle Issues 2016-08-10 20:50:33 -04:00
ebaydayz
72656ed001 Greatly optimize safe gear handling
- Safe inventory arrays are no longer sent over network to all machines
on server startup and on each lock/unlock
- Disabled user input then closed gear dialog during safe
lock/unlock/pack to block various duping methods.
- Moved safe creation, deletion and gear handling to server. This cuts
down on add[Magazine/Weapon/Backpack]Cargo, createVehicle and
deleteVehicle BE logs.
2016-08-10 20:34:54 -04:00
icomrade
f186e256cb Tree chopping changes
Allow player to get more than 1 item out of a single tree. Using ItemLog
would allow the player to get too much wood if using a hatchet so I
changed it back to PartWoodPile.
2016-08-10 13:06:20 -04:00
icomrade
f9fdb1f3f7 Re-add humanity gain on zombie kill
For some reason this was removed in
77e760fe73
@ebaydayz
2016-08-10 12:13:11 -04:00
icomrade
4fc2a3b7d6 r_action_count needed for combine mags 2016-08-09 22:05:57 -04:00
ebaydayz
c62e3147c8 Do not send purchased vehicle marker arrow over network
Only the player buying the vehicle needs to see the arrow.

Also fixed CfgMagazines error from:
2c4c75c67c (diff-fcf3df9a25b3d05402ab4e4809673194R6)
@icomrade
2016-08-09 14:52:15 -04:00
ebaydayz
1ed78cc085 Remove unused file object_updatePosition.sqf 2016-08-09 11:06:57 -04:00
ebaydayz
bc7c1879a3 Store plot and door friends names as array
Avoids setVariable value restrictions for players with special
characters in their name.

Also avoids issues with storing non-ASCII characters from player names
in DB inventory field.
2016-08-09 10:48:31 -04:00
ebaydayz
d5ec0d9728 Remove duplicate PVDZ_obj_Fire exception
407134e1a2
2016-08-08 19:55:11 -04:00
icomrade
5c383c82dd More efficent evaluation for object spawning
We shouldn't need to check typenames since many of the DB columns don't
accept anything but appropriate values and the hive will check if some
fields are corrupt already.
2016-08-07 20:41:43 -04:00
icomrade
1f19147165 Update DLL 2016-08-07 14:51:41 -04:00
icomrade
a9926bc073 Remove damage check from dayz_server
Moved to HiveEXT MySQL query. Thanks for the suggestion @ndavalos
2016-08-07 14:38:44 -04:00
icomrade
2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
ebaydayz
0491b32c66 Fix 106 SQL updates find and replace
Thanks @ndavalos

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-238063917
2016-08-07 10:57:11 -04:00
ebaydayz
a6d280995a Merge pull request #1728 from oiad/master
Cinder block text changes
2016-08-06 19:52:30 -04:00
oiad
aa6dd4fa4d Cinder block text changes
This makes Block doorways and block garage door ways Cinder doorways and
Cinder garage door ways so they will be alphabetized properly.

It was always annoying having block doorways not near cinder stuff.
2016-08-07 11:28:26 +12:00
ebaydayz
2980d849bf Formatting cleanup
- Removed random spaces
- Added back comments so it is easier to compare
- Removed redundant } else {
2016-08-06 14:47:10 -04:00
ebaydayz
73bcb6b856 Update test build 2016-08-06 12:04:42 -04:00
ebaydayz
950ef04855 Properly separate allowed toolbelt and binocular count
It should no longer be possible to overflow your toolbelt or binocular
slots now.
2016-08-06 11:08:01 -04:00
ebaydayz
875b34417e Add missing HangarSmall loot group 2016-08-05 19:17:16 -04:00
ebaydayz
7a4775beea Fix needing to click lock/unlock twice from inside vehicle to take effect
No reason to use spawn here. Spawn can have a delay. Since
fn_selfActions runs faster it can register the vehicle as still locked
or unlocked after you clicked the action.
2016-08-05 14:38:12 -04:00
ebaydayz
c51fd11511 Use better method to find player's vehicle in Advanced Trading #1725 2016-08-05 13:43:58 -04:00
ebaydayz
f6e10dd71c Add gear icons to trader menu vehicle cargo space display
- Added gear icons to vehicle cargo space display instead of
Weps/Mags/Bags text

- Decreased info text to 0.7 all around. Can be reverted to 0.8 if
preferred, but 0.7 or smaller is needed for vehicle info class, display
name and weapons list to avoid cutting off the dialog on normal and
larger interface sizes.

#1724
2016-08-04 20:36:36 -04:00
ebaydayz
60e6b85c4d Don't show fuelCapactiy for bicycles in Advanced Trading 2016-08-04 17:37:53 -04:00
ebaydayz
c52187220c Fix message when buying multiple backpacks into empty gear 2016-08-04 16:16:13 -04:00
ebaydayz
c47adbbdb0 Remove CZ_VestPouch_EP1 from traders
This backpack is pointless, since it is the same model as
DZ_Czech_Vest_Puch with half the slots. The traders already have
DZ_Czech_Vest_Puch.
2016-08-04 15:44:58 -04:00
ebaydayz
d91bde9e53 Fix return change overflow check
Thanks @oiad

- Added compensation for money which will be removed from gear and
backpack
- Improved readability
2016-08-04 14:22:33 -04:00
icomrade
1b685581e3 Add condition 2016-08-03 22:18:42 -04:00
icomrade
b10e73b1b8 Update SQL 2016-08-03 22:14:42 -04:00
icomrade
b8c3aec4e0 New DLL + Test Build 2016-08-03 20:12:46 -04:00
icomrade
aacd3b78f7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-03 19:58:53 -04:00
icomrade
657fe60f26 Better maintain
Intensive commands are processed on the client only, as opposed to
twice. an array of objects, their corresponding UID and ID are sent to
the server. Sending the objects as an array, despite the size the array
can reach, should be better than the way this was set up before.

Needs testing on a full server however.
2016-08-03 19:54:06 -04:00
ebaydayz
5a55bcb9b0 Forbid buying >1 of any tool into gear
Previous duplicate check only checked player's current tools and the
buying array types for >1 of the same tool (not buying array amounts).

Also added prevention of binocular slot overflow.
2016-08-03 18:56:42 -04:00
icomrade
b2eacfbe73 Fix private array 2016-08-03 18:34:49 -04:00
icomrade
ae78fde067 Add coin support to dayz_Server and login
New variables: DZE_groupManagement = false; //Enable or disable group
management. Enabled by default
DZE_MoneyStorageClasses = []; // If using a Single currency system
(Z_SingleCurrency = true;), this is an array of object classes players
can store coins in

if Z_SingleCurrency = true; the hive is now set up to handle coin
updates on players, characters, and objects.
if DZE_groupManagement = true; the hive is now set up to save groups

group and coin variables are set in player_monitor.fsm, for
vehicles/objects it's set in the server_monitor.sqf file for objects in
the DZE_MoneyStorageClasses array

Also, this commit includes a change to the way the hive spawns in
vehicles. vehicles are now created at [0,0,0] and moved using setPosATL
to their saved position. Thanks for the tip @ndavalos  @eraser1
2016-08-03 18:01:22 -04:00
ebaydayz
de9d3feb0f Updated Some loot Locations.
Vanilla development commit:

db96d1c8c5

Note: does not affect buildings with Epoch loot positions. Vanilla
positions are commented out on those buildings.
2016-08-03 14:28:23 -04:00
ebaydayz
47e6366985 Updated Vanilla Buildables collision Checks.
Vanilla development commit:

8e2953ab67
2016-08-03 13:55:43 -04:00
ebaydayz
376befd613 Minor Advanced Trading string semantics changes
#1724
2016-08-03 13:38:09 -04:00
ebaydayz
382f3bc451 Add buying to and selling from dayz_onBack
Also:
- Fixed typo Z_fill(e)TradeTitle
- Fixed "not enough slots to accept change" message shows when "not
enough money" should show instead
2016-08-02 14:19:59 -04:00
ebaydayz
a95925aac5 Make free slots display for gear more logical
- Don't show tool slots as available weapon slots in gear. Player is
informed of tool slots count in systemChat.
- Don't show pistol mag slots as available item slots in gear. Player is
informed of pistol mag slots count in systemChat. Only pistol ammo and
bandages can be purchased into them.
- Removed "Stand still to complete trade" message since the medic
animation loop is no longer used
- Added back backpack mags count message and avoided redundant "Backpack
space exceeded message" @oiad
ee3eb845a3 (commitcomment-18483149)
2016-08-02 11:55:50 -04:00
A Man
f3c80934b4 Small loot tweaks for balance (#1719)
* Small loot tweak

Lowered the spawn chance of duct tape a bit.

* Small loot tweaks

Smaller spawn chance of binoculars, Knife and maps
2016-08-01 18:13:05 -04:00
ebaydayz
ee3eb845a3 Remove selling backpacks from vehicles
I don't think we should allow selling backpacks from vehicles because we
can not get backpack contents.

We can only remove all backpacks with clearBackpackCargo and then add
back new empty backpacks for ones that weren't sold.

This means players may unintentionally wipe all contents of all other
backpacks in their vehicle when they only want to sell one.

Thanks @AirwavesMan for catching this.

Also made changes discussed in #1718 @oiad
2016-08-01 17:14:42 -04:00
ebaydayz
3bf9c4452e Update test build
Since some mission file paths changed
2016-08-01 10:10:00 -04:00
ebaydayz
d2bf8b30eb Update config trader from 34f9f97
Forgot to update m16a2_dz (supports GL now).

34f9f97aa3
2016-07-31 20:32:53 -04:00
ebaydayz
287a80c417 Add extra note about changed item classnames
Since a lot of people are missing this.
2016-07-31 20:17:08 -04:00
ebaydayz
a5be49c546 Add handling of magazine overflow in AdvTrade and free slot icons
- Added proper handling of pistol mags and regular mags in gear to
prevent magazine overflow
- Added pre-check if return change will overflow gear + backpack free
space. If change will not fit in gear + backpack free space then buy is
prevented with a message notifying the player. In the case of a sale it
proceeds anyway, but notifies player if overflow occurs (see comments in
returnChange)
- Consolidated duplicate code for calculating free space and returning
cargo of an object into new calcFreeSpace
- Old calculateFreeSpace renamed to displayFreeSpace
- Added Weps/Mags/Bags icons to free slot numbers display
2016-07-31 18:38:53 -04:00
ebaydayz
d7cb2b446e Merge pull request #1717 from oiad/master
Backpack sound fix
2016-07-30 18:42:29 -04:00
oiad
6a5d03f143 Backpack sound fix
Fix backpack sound error, re: @ndavalos
2016-07-31 10:26:31 +12:00
icomrade
24f6a0ab9a Correct build text 2016-07-30 17:06:46 -04:00
ebaydayz
cc129cf403 Fix buyItems error from #1716 @oiad 2016-07-30 12:28:33 -04:00
ebaydayz
fbffd8e9cb Fix hit_glass setVariable filter
@icomrade - In regex character classes only match each single character.
So a range with more than one character on one end (20) won't work:
http://www.regular-expressions.info/charclass.html

You can see that by running this code in-game with your old filter and
it will kick you:
player setVariable ["hit_glass3",1,true];

Adding the + on the end makes it match the character class one or more
times, so now it will match any integer >= 0.
2016-07-30 12:07:26 -04:00
ebaydayz
8589b9d46d Fix fn_collisions in wrong folder
My mistake from
657830291b
2016-07-30 11:07:04 -04:00
ebaydayz
1700224124 New Var added for antiWallHacks.
Vanilla development commit:

224be14533
2016-07-30 10:51:42 -04:00
icomrade
60c37e8b76 Fix duplicate action fix when crafting 2016-07-30 10:37:19 -04:00
ebaydayz
657830291b Updated vanilla Collision system
Vanilla development commit:

0a1db17343
2016-07-30 10:34:25 -04:00
ebaydayz
811327de58 Fix typo
Shows "Only 0 backpacks fit in your backpack" until the translation is
updated.
2016-07-30 10:11:40 -04:00
ebaydayz
6b5fbe433c Fix errors from #1716
Careful @oiad
2016-07-30 10:08:02 -04:00
oiad
7c4d25ef1a Advanced trading tidying, spelling fixes, private fixes and string fixes (#1716)
* Advanced trading tidying, spelling fixes, private fixes and string fixes.

Fixes snap building issue with metal floors
Fixed spelling mistakes in various scripts
Fixed formatting uglyness in various scripts
Fixed invalid private lines in various scripts
Changed Advanced trading so buying worked more like selling, You can't
select backpack if you don't have a pack nor can you select a vehicle if
you don't have a vehicle.
Removed some redundant strings from Advanced trading and changed a few
of the strings to be more englishy
Removed the ability to buy a backpack into your backpack (You cant do
this anyway)
Fixed a bug where if you had nothing in your backpack it would break the
checkArrayInConfig script so the titlebar would not refresh correctly
Removed slot counts on no backpack and no vehicle (No need for it, just
clutter)
Moved backpack/vehicle checking to z_at_getContainer.sqf

* Last part of tidyness fixes

Last part of tidyness fixes

* Actual backpack fix

Lets actually fix the buying backpack into backpack or backpack when you
already have one.

* Missing from commit

Missing from commit
2016-07-30 10:03:00 -04:00
ebaydayz
1d2fc3b266 Fix item count being overwritten in AdvTrade right list title
When switching back to category view the item count was overwritten
from:

12a9e9f83e

It is no longer needed to set it in changeBuySell since calcPrice runs
every time changeBuySell does. The one exception is when switching back
to category view, but in that case it stays in buy mode anyway.

You forgot to add it for single currency as well @oiad
2016-07-29 16:36:36 -04:00
ebaydayz
fd2eb14c5e Give inTraderCity a default value
There is no point in setting inTraderCity = "Any"; since you can use the
isInTraderCity variable to check if a player is in any trader city. Also
"Any" will return false for isNil, so the only time "Unknown Trader
City" was being used was when the player had not entered any city yet.
If they left a known trader and went to an unknown one the RPT message
would say "bought x at Any". Now it will correctly say "Unknown Trader"
anytime a purchase is made without inTraderCity being set.
2016-07-29 15:48:51 -04:00
icomrade
ac63a7d903 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-29 15:20:36 -04:00
icomrade
c628ad8873 Fix hit_glass kick for some vehicles 2016-07-29 15:20:32 -04:00
ebaydayz
b1ae6c4a60 Fix unknown entity RPT error for Padlock and Frank&Beans
Vanilla development commit:

955c7a263c
2016-07-29 14:34:45 -04:00
icomrade
d0c09e7bac Copy paste typo 2016-07-29 12:06:14 -04:00
icomrade
c694545bce Update server for playerGroup column in HiveExt
Requires DLL Published in this commit as well as a database update.
Execute the added SQL in the 1.0.6_Updates.sql on your database.

Use Hive child 204 to update the new column
_key = format["CHILD:204:%1:%2:%3:", (getPlayerUID player),
dayZ_instance,  [Array of playerUIDs of group members]];
_key call server_hiveWrite;
2016-07-29 12:05:01 -04:00
ebaydayz
c9efb9e9df Fix some undefined variables in Adv Trade systemChat messages
Fixes "Cannot sell any, tires are too damaged." and empty string in
success message.
2016-07-29 11:41:44 -04:00
ebaydayz
b408e76c55 Fix extra spaces in Advanced Trading RPT log
Also fixed missing space in systemChat message.
2016-07-29 11:09:42 -04:00
ebaydayz
ba3677f13d Remove redundant "Gear" text next to portrait in Adv Trade
The menu already says "Buying in" or "Selling from" Gear in the top left
so having it again in the top right is redundant. It was my mistake
adding it there originally.
2016-07-29 10:22:13 -04:00
icomrade
bdf0870f3e Fix keys not deleting
Should work fine, but more validation is always good, I tested selling
from all inventories with DZE_SaleRequiresKey true and false.
2016-07-29 00:55:20 -04:00
icomrade
d31df4f1fc Typos 2016-07-28 21:12:51 -04:00
ebaydayz
f9ca43c795 Don't diag_log player name as array
Forgot to update this diag_log. My mistake from:

28a522ba64
2016-07-28 16:38:55 -04:00
ebaydayz
1bfc6b3c31 Fix combat status_bg not matching other icons' status_bg sizes
See
fbc7754750
for discussion
2016-07-28 15:37:26 -04:00
icomrade
2cdf9b5806 Small fix, revert 1 frame uisleep to regular sleep
I wasn't getting errors without if (gear_done) then {}; surrounding the
uiSleeps, so I don't quite trust the engine was executing them, I also
question the ability of uisleep to handle single frame precision (but I
haven't tested anything regarding this yet).
2016-07-28 14:54:50 -04:00
icomrade
82e2500cac Re-add magazine refill fix when changing clothes
This is the code from 1.0.5.2 before it became 1.0.6, it contains the
fix for backpack wipes in 1.0.5.1. I lightly tested it with 1.0.6 but it
will need more testing before release.
2016-07-28 13:27:30 -04:00
icomrade
21019056c3 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-28 12:54:33 -04:00
icomrade
9552ceea9e Require part to be damaged to be removed
see comments @ 3292d84b85
2016-07-28 12:54:30 -04:00
ebaydayz
0fbf55da06 Move server_traders to dayz_code
This reduces the mission size for servers using default traders. Admins
can easily copy paste over the include to customize.
2016-07-28 12:05:31 -04:00
ebaydayz
82cf8e76f0 Updated Breaking to support Metal Gates.
Vanilla development commit:

bf16f402f6
2016-07-28 11:17:11 -04:00
ebaydayz
e399556af2 Fix wrong handler for PVDZ_Server_processCode
Vanilla development commit:

afbedde9fa
2016-07-28 11:02:28 -04:00
ebaydayz
cbbbe1bd8f Randomized tree directions
Vanilla development commit:

beac505eb4
2016-07-28 10:49:28 -04:00
ebaydayz
e8cbfdffb3 Merge pull request #1713 from oiad/master
Advanced trading tidyness
2016-07-28 09:49:32 -04:00
oiad
12a9e9f83e Advanced trading tidyness
Optimizes the code for the buyitems item listing (What was I thinking!)
Adds item count to buy/sell list (Useful for checking against
backpack/vehicle storage space constraints when buying multiple items)
Small logging fix.
2016-07-28 23:08:11 +12:00
ebaydayz
f84140c555 Don't clear buying list on category switch + AdvTrade fixes
The buying list now acts like a shopping cart. It is no longer cleared
when switching between categories or containers. Closing the dialog or
switching to sell mode still clears it.

Also fixed:
- Filter button in sell mode
- Bug where filtering sellable list readded items already moved to
selling list
- Visual price display not clearing when remove all button is used on
buying list
- Gear container picture showing rank instead of portrait in buy mode
- Dialog is no longer closed when trying to sell zero items
- LbCurSel is now reset when the buyable list is cleared
- Category is no longer opened onLbSelChanged. Instead you need to
double click or use the "View" button, so the arrow keys can be used for
selecting too.
2016-07-27 18:40:03 -04:00
icomrade
bd91044e7b Fix duplicate action check with vanilla objects
+ typo fix
2016-07-27 11:08:50 -04:00
icomrade
49222ac415 Part 2 of salvage change 2016-07-27 11:05:26 -04:00
icomrade
3292d84b85 Allow salvage any part < 100% damage
thanks for pointing this out @LunaCB
2016-07-27 11:02:06 -04:00
icomrade
fd2db4f07d Fix kick when crashing planes 2016-07-27 01:23:38 -04:00
icomrade
b704d6d081 Update CreateVehicle.txt
fixes kick when using Gyro/Mozzie grenades
2016-07-27 01:21:23 -04:00
icomrade
b88cdf217a Repack RC1
Incorrectly packed the updated pbos
2016-07-26 22:32:06 -04:00
icomrade
d8a85753da Update HiveExt.DLL to offset ObjectUID by 1
An ObjectID/UID of 1 is used by some special objects spawned by the
server, this should prevent any issues.
2016-07-26 22:21:32 -04:00
icomrade
5743439626 Update test build to RC1 2016-07-26 21:59:49 -04:00
icomrade
c847f8c756 Remove create stash option 2016-07-26 21:01:21 -04:00
icomrade
f61f5918cf Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 20:51:41 -04:00
icomrade
e446603ea2 Fix combat logging
In the initialize section of the fsm r_player_unconscious and
r_player_timeout return their default values (false and 0). Also, the
Vanilla server-side combat check doesn't appear to work, or it doesn't
work with the antihack disabled (I haven't tested with it enabled).

New variable inCombat is set more quickly than the combatTimeout
variable
2016-07-26 20:51:10 -04:00
icomrade
6f4303b825 Update half cinderblock wall class in sql 2016-07-26 14:38:12 -04:00
icomrade
a72498671d Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 12:52:31 -04:00
icomrade
23a5584b52 Fix up combat icon + update changelog 2016-07-26 12:52:28 -04:00
icomrade
5b23e9f7af Merge pull request #1711 from oiad/master
Snap point changes
2016-07-25 23:49:23 -04:00
icomrade
705057bedb Sync combattimeout on change clothes 2016-07-25 23:22:50 -04:00
icomrade
e08bd750d0 Remove DebugBox_DZ - may fix changing clothes
DebugBox_DZ appears to cause issues when changing clothes. I haven't
died changing clothes ~100 times since its removal. It also solves the
issue of extreme exposure (brightness) after changing clothes

Note: CombatTimeout variable resets after changing clothes
2016-07-25 23:22:03 -04:00
icomrade
8542385142 Update building to also use r_action_count
This is the vanilla variable to prevent duplicate actions
2016-07-25 21:59:11 -04:00
oiad
744f162d71 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 13:25:19 +12:00
oiad
ad9694844d Snap point changes
This correctly fixes snap points for all cinder related to metal floors.

Anything cinder will now correctly snap to full cinder walls and vice
versa
Metal floors will not have gaps so you can correclty create a 1x1 cube
(as it should be)

Renamed cinder_wall_kit to half_cinder_wall_kit to be in line with
full_cinder_wall_kit since I felt it was confusing. cinder_wall_kit
seems like it would be full to me.

Fixed a string issue when building cancelling to make it more readable.
2016-07-26 13:22:10 +12:00
icomrade
fbc7754750 Add combat icon + toggle for Vanilla UI 2016-07-25 20:55:36 -04:00
ebaydayz
66e35d1629 Add new 1.8.7 meat names to 1.0.6 SQL updates 2016-07-25 19:04:17 -04:00
icomrade
b2289e35c5 Fix ear and eye not displaying in Epoch UI 2016-07-25 14:26:43 -04:00
ebaydayz
28a522ba64 Fix PV value kick for player names with special characters
Vanilla development commit:

6b7a55b1ea
2016-07-25 13:37:33 -04:00
icomrade
97a03c84d0 More Permissive Combat Checks
This commit puts the conditions in which a player is put into combat
more in line with 1.0.5.1. Putting the player in combat for having
another player nearby will ruin building for players that are part of a
group. Putting the player into combat if zombies are nearby would make
building way too frustrating (especially if building on an elevated or
enclosed area where zombies are not a threat) and will attack the player
if not dealt with anyway.
2016-07-25 13:00:34 -04:00
ebaydayz
3a203b2720 Cover map bug at Polana factory pond
Vanilla development commits:

bd9ec53854

028490e21b
2016-07-25 12:31:39 -04:00
ebaydayz
03c57f3b77 Fix for Confirmed Kills system on change clothes.
Vanilla development commit:

d499246e2e
2016-07-25 12:19:45 -04:00
ebaydayz
33538520d0 Removed Achievements from network send on login.
Vanilla development commit:

0079818570
2016-07-25 12:16:22 -04:00
ebaydayz
55df36741b Diag_log Cleanup.
Vanilla development commits:

1dbef192bb

10cb0249f0
2016-07-25 12:06:53 -04:00
icomrade
ff6e11708a Un-nerf DMR 2016-07-24 16:14:38 -04:00
icomrade
0563f621e2 Fix full cinder wall snap points 2016-07-24 15:28:18 -04:00
icomrade
51287651f2 Add logging for non-existent loot group small
This can probably be removed for release but for now I noticed
HangarSmall doesn't exist, perhaps others as well.
2016-07-24 13:15:37 -04:00
icomrade
61f59f32a5 Update createvehicle 2016-07-24 01:47:06 -04:00
icomrade
90932d0061 Don't use weaponHolderBase here
it causes the items that are created to be invisible
2016-07-24 01:46:54 -04:00
icomrade
9cdb9eb305 Merge pull request #1710 from oiad/master
Tidyness changes
2016-07-24 00:48:13 -04:00
oiad
2ca7bf59c7 Tidyness changes
This changes a few functions that were being used to use the already
defined variables instead

Fixed a few string issues with Advanced trading and plot managment.
2016-07-24 16:20:39 +12:00
icomrade
b03afef460 A little neater 2016-07-23 19:55:24 -04:00
icomrade
efaad30c32 Remove unneeded waitUntil 2016-07-23 18:11:37 -04:00
icomrade
72c529f94e Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-23 17:19:46 -04:00
icomrade
a3c3ccc3bf Fix door/plot management friends not writing to DB 2016-07-23 17:19:06 -04:00
ebaydayz
8202f7d61b Sync debug check
Vanilla development commit:

0baaac7a91
2016-07-23 15:23:00 -04:00
ebaydayz
cc2aae59eb Change splint recipe
Vanilla development commit:

6ea5d8ebee
2016-07-23 15:12:08 -04:00
ebaydayz
8ed5a9c7a9 Antibiotics combining
Vanilla development commit:

0602d29530
2016-07-23 15:03:49 -04:00
ebaydayz
34f9f97aa3 Icons, 9mm silencer, m16a2
Vanilla development commit:

896825693d
2016-07-23 14:55:04 -04:00
ebaydayz
f76b8493fd Fix category list alignment in advanced trade
Since we changed the alignment back to default the ctrlSetPosition I
added is no longer needed. #1709. With the alignment changed it would
actually run off the background if the category list was too long.
Thanks @oiad
2016-07-23 14:24:54 -04:00
ebaydayz
14f49409dd Merge pull request #1709 from oiad/master
Advanced trading changes
2016-07-23 14:14:33 -04:00
oiad
9efc671abb Advanced trading changes
This changes a few things in Advanced trading, mainly cosmetically.

> Removes all the commented out lines that were the same in defines.sqf,
let me know if these are there for a reason?
> fixes the buying list to have localization support and has a total
item count that works properly.
> cosmetic change displaying backpack info on trader to bring it in line
with the other menus
> adds total item count to the selling list and added localization for
that
2016-07-23 23:30:05 +12:00
icomrade
9c4e30ea08 Fix Advanced Trading Selling + new Var
New variable to configure whether or not the player will need to key to
sell a vehicle. DZE_SaleRequiresKey = false;
2016-07-23 01:16:37 -04:00
icomrade
855a72ca1f Fix kick when crashing UH1Y 2016-07-22 23:44:33 -04:00
icomrade
3da14b34dd Exclude flares
some Epoch helicopters have flares
2016-07-22 23:19:13 -04:00
icomrade
253f5516da more buildable exclusions 2016-07-22 23:09:46 -04:00
icomrade
28f6260c16 Building offset adjustments
Most items are now adjusted so you cannot rotate them and slide
backwards even while laying down. Also fixes full cinderwall build
height offset
2016-07-22 23:07:53 -04:00
icomrade
640e120590 Exception for plot preview 2016-07-22 21:58:12 -04:00
icomrade
bb48baf75c More BE Filter Updates
objgather_Knockdown didn't work in the previous commit
2016-07-22 14:23:46 -04:00
icomrade
745f725c19 BE Filter Update 2016-07-22 12:45:45 -04:00
icomrade
19960f08e2 use player_makeFire to start a fire 2016-07-22 12:23:05 -04:00
icomrade
f808bda2a9 New Config Entry buildText
Allows a string to replace the vehicle display name that will be created
which is typically displayed when building.
2016-07-22 11:06:45 -04:00
icomrade
082c0c13e6 Fix dog meat not being cookable 2016-07-21 19:56:37 -04:00
icomrade
eeed1febad str_player_31_drink doesn't work for some reason... 2016-07-21 19:48:16 -04:00
icomrade
8d7b99e746 Automatically add player to door management 2016-07-21 19:34:42 -04:00
icomrade
75a9ca6848 Fix scaffolding 2016-07-21 17:53:43 -04:00
icomrade
0414c67284 No longer require key to sell a vehicle
Still requires the vehicle to be local, meaning you were the last person
to be in the driver seat.
2016-07-21 17:42:25 -04:00
icomrade
4544e743fd Chopping wood now gives PartWoodPile again 2016-07-21 17:04:18 -04:00
icomrade
51a0640855 Remove right click to harvest wood
You must now actually use the hatchet to chop wood (i think it was like
this in 1.0.5)
2016-07-21 17:03:51 -04:00
icomrade
96ddc8ff62 Add player to plot management by default
+ Some minor private array cleanup
2016-07-21 16:20:41 -04:00
icomrade
3519297e2d Add drinking and emptying of < 10 oz wattter
Amount of water and infection chance are proportional to the amount of
water.
2016-07-21 15:36:55 -04:00
ebaydayz
67f6d86440 Use smaller sound muted UI icon and better alignment
Vanilla development commit:

6aba95d251
2016-07-21 14:58:03 -04:00
ebaydayz
9ea9af3272 Change player list and lobby icons to grey instead of blufor
Vanilla development commits:

36337e3c08

3a2d3ac20d

Connecting and normal icons are the same so players can not tell when
someone is in the lobby.

Also removed:
- player name and rank text shown in the top right of diary
- "Current task:" text shown above player list
- "Pool:" text shown in lobby
2016-07-21 14:50:02 -04:00
ebaydayz
f2687345cd Testing Confirmed Kills System.
Vanilla development commit:
4881e00ecf

New - Journal Kills will only update during the session on confirmed
Kills (study dead body).
2016-07-21 11:31:47 -04:00
ebaydayz
9ae21dd4f5 Rifle flashlight fix, translations
Vanilla development commit:
a850f25e14

- Attachment_FL_Rfl -> Attachment_FL
- Sherbet desc
- Take blood translation
- weapons/mods translation fixes for better strings fitting
2016-07-21 11:12:55 -04:00
icomrade
e3fee60a8f Change water bottle image back to canteen image 2016-07-21 00:35:51 -04:00
icomrade
88c7d7d28b Fix < 10 oz water bottle filling 2016-07-21 00:21:52 -04:00
ebaydayz
1fb1dc9d89 Prevent toggleSoundMute at gender selection screen 2016-07-20 19:21:54 -04:00
ebaydayz
2f844060ec Add handling of other fadeSound events in player_toggleMuteSound
Fixes icon staying up after fadeSound to 1 by unconscious and low blood
events.
2016-07-20 17:36:40 -04:00
ebaydayz
f314a39e43 Add better sound muted status UI icon and background
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
2016-07-20 15:24:31 -04:00
icomrade
d0a2260fb1 Update CHANGE LOG 1.0.6.txt 2016-07-20 13:23:30 -04:00
icomrade
92cbd8a7a9 only sleep if Hive call in loop fails
should improve vehicle spawning time slightly
2016-07-18 21:51:37 -04:00
ebaydayz
2911bffced Fix can't reload partial mag with flares in inventory
Vanilla development commits:

7f7d3e02e7

094f1f18d2

a078e84f11

805b9def10

Also reverted:
51be8aa8a5
since it was not the cause.

See https://github.com/DayZMod/DayZ/issues/641 for the details.
2016-07-18 21:43:08 -04:00
icomrade
2f4815cb39 Update add_recommended_mysql_events.sql
Fix dead link
2016-07-18 16:38:12 -04:00
ebaydayz
e62c882127 Remove duplicate ObjectUID fix variables
No longer needed as per:

51be8aa8a5

8e87448fe7
2016-07-17 17:17:38 -04:00
ebaydayz
3a5fc91329 Fix missing string typo
My mistake from
7751914428
2016-07-17 16:00:12 -04:00
ebaydayz
7751914428 Rename vanilla strings from #1708
When localizing vanilla strings please do not put "EPOCH" in their name
or include them in the dayz_epoch package of the stringtable. This
creates more work to backport common translation updates and vice versa.
2016-07-17 14:02:04 -04:00
icomrade
b9f4aa3ae0 Update ReadMe.md 2016-07-17 12:38:14 -04:00
icomrade
2ecd35ad89 Update ReadMe.md 2016-07-17 12:37:53 -04:00
icomrade
b52c44dadc Rebuild Server PBO 2016-07-17 10:54:38 -04:00
icomrade
c702d92231 Remove SQF Based Duplicate UID Fix
Use the new DLL
2016-07-17 10:52:40 -04:00
icomrade
42db0a9108 Merge pull request #1708 from oiad/master
New test build for 17th July
2016-07-17 10:51:27 -04:00
oiad
ff2097c3bd Localization goof
Forgot a localize, oops.
2016-07-17 22:35:27 +12:00
oiad
3d75c67574 Localization updates
Some localization updates and some code optimization.
2016-07-17 22:23:25 +12:00
oiad
d47d887a66 APFL more fixes
This moves all the PFL stuff into the one if statement for tidyness, no
point having 2 ifs.
2016-07-17 17:03:55 +12:00
oiad
195553c348 Revert "More changes to modular_build"
This reverts commit 707e2ec66d.
2016-07-17 17:00:26 +12:00
oiad
707e2ec66d More changes to modular_build
I wasn't aware modular_build had permanentPlot stuff in it so i've moved
the ownerPUID setting to inside the main PFL stuff. Saves having 2 if
statements.
2016-07-17 16:56:05 +12:00
oiad
c205eda7c9 New test build for 17th July
Updates test build to 17th of July and updates dayz_server with missing
advanced trader fixes from a while ago.
2016-07-17 12:20:16 +12:00
icomrade
8e87448fe7 Add new Hive DLL with ObjectUID Fix 2016-07-16 19:54:56 -04:00
ebaydayz
f60262aff1 Consolidate duplicate Remove Suppressor translations
Vanilla development commit:
66af3465ac
2016-07-16 14:48:53 -04:00
ebaydayz
b49270c3f8 Sync modular_build formatting change with player_build from #1707 2016-07-16 13:47:36 -04:00
oiad
41c9fde480 Plot for life fixes and typo fixes (#1707)
This fixes the issues I was having with APFL, Basically when downgrading
a locked door the ownerPUID was not getting transferred across so it was
getting a 0 PUID set on it once downgraded so you would then lose access
if there was no plot pole.

Now it correctly gets set and instead of doing 2 PVDZE_Obj_Swaps I am
using an if and else statement.

player_upgrade was also not sending the ownerID into the worldspace
field, this seems to differ from the original APFL script. I also added
in code so that if APFL was enabled and uid is 0 we claim the item with
players UID.

This fixes a typo @ebaydayz introduced to spam the .RPT on startup also
for the shotgun and a typo in the credits.
2016-07-16 13:25:14 -04:00
ebaydayz
c9960e1ec3 Fix MP5 and MP5SD mag displayNames reversed
Vanilla development commit:

cb464b1add
2016-07-10 16:59:04 -04:00
ebaydayz
da5c5bf6cc Credit updates for Sound Files.
Vanilla development commits:

e578c6cb39

c575f09c4b

Also synced spacing and tabs from:

73d557806e
2016-07-10 16:44:07 -04:00
ebaydayz
73d557806e Mag names, Attachments names, Translation fixes
Vanilla development commit:

af9e009bae

- renamed magazines for better sorting
- renamed attachments for better sorting ([A] prefix added) some fixes,
some strings moved to proper section
- Remington 870 added to new attachment system (weapon flashlight)
- Double-barrel shotgun will now spawns with pellets and has Doubleshot
option (maybe this will make it more popular?)
2016-07-10 15:25:36 -04:00
ebaydayz
4ff088c80c Remove redundant access checks for upgrade and downgrade
Access control for upgrade and downgrade is now included in
fn_selfActions as per #1706

I moved _upgrade down in fn_selfActions so it is only checked it if the
right conditions are met.
2016-07-09 14:34:38 -04:00
ebaydayz
326fda70b1 Add missing SnapPro commit
Missing SnapPro update from
52d5bf8af4

Fix Wood Floor short side snap point
2016-07-09 12:33:53 -04:00
oiad
06c8fef001 Various changes (snappoints, dooraccess and fn_selfactions) (#1706)
* Changes to snappoints.hpp fixes issues with metal floors snapping to a cinder wall. Cinder to cinder will create small gaps and then metal floors won't properly line up unless you start with a metal floor then snap cinders. By making both the same snap size, this fixes this issue.

Changes to doorAccess.hpp makes it possible to unlock doors and downgrade them again. It was setting dze_lock_door to the players UID instead of the door code as it should so the conditions would not be met in fn_selfActions to give you additional access.

Changes to fn_selfActions refine access to certain points more accurately (the way they should be IMO)

1) Adds a check to see if the building item can be upgraded anymore before presenting the menu, this stops you receiving the "upgrade item" action even when the item is fully upgraded
2) Adds access checks to the maintain individual item menu action so only item owner, plot owner and plot friends will see it, same with the above upgrade item menu action, this will also stop you receiving this when you are on someone elses plot that you may not have access to (I.e it's useless)
3) Changes modular building access to be item owner, plot owner and plot friend to remove modular items.
4) Changes plot managment action menu so item owner, plot owner and plot friend can access it. I thought there could be a situation where item owner != plot owner. This can be reverted if that is never possible.
5) Changes downgrading so only item owner, plot owner and plot friends can access it. If someone has the door code that doesn't mean they should be able to remove the combo (IMO)

* typo.
2016-07-09 12:28:39 -04:00
oiad
e30f18190f This will fix an obvious typo for the variable s_player_upgradeStorage (#1705)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading fixes (again)

* Advanced trading rework

Fixes all problems @ebaydayz

* Rename typo'd variable "s_player_upgradestorage"

This renames an obviously typo'd variable to what it should be.

* fixes derp string.

* asdf (#3)

asdf
2016-07-05 21:40:31 -04:00
ebaydayz
f7d765e669 Fix STR_ACTIONS_LIGHTFIRE listed twice
Vanilla development commit:

ca8434a9b9
2016-07-03 12:26:56 -04:00
ebaydayz
452ce57618 Temperature badges + heatpack changes + some translation fixes
Vanilla development commit:

e89176d565
2016-07-03 12:01:32 -04:00
ebaydayz
cc2918989e Remove duplicate status UI icon files 2016-06-25 10:32:46 -04:00
ebaydayz
eae4428e9f Update SQL maintain event for door management
Since door management uses the inventory field to store doorFriends the
last condition was always returning false and locked doors would never
get damage set on them.
2016-06-22 19:54:06 -04:00
ebaydayz
680659babc Add AirwavesMan and oiad to contributors 2016-06-21 21:25:27 -04:00
ebaydayz
3c76f3c800 Add some new vanilla items to R3F weight
@AirwavesMan - For future reference, if you notice any more new stuff we
forgot to add to the traders we probably forgot to add them to R3F
weight too.
2016-06-21 21:17:22 -04:00
ebaydayz
19285d677a Merge pull request #1704 from AirwavesMan/master
Some more Changes
2016-06-21 20:58:13 -04:00
oiad
801145d664 Advanced trading fixes/modifications (#1698)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading rework

Fixes all problems @ebaydayz
2016-06-21 20:18:41 -04:00
A Man
a7bd47054e Add crafting full cinder wall kit
Add crafting full cinder wall kit.
2016-06-21 23:12:14 +02:00
A Man
999f5fd5c2 Added another string
Added another string for full cinder wall kit.
2016-06-21 23:09:32 +02:00
A Man
6f13f8a36e Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame.
2016-06-21 22:27:41 +02:00
A Man
b8f95b7f75 Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame. I tried to correct it but I saw that the string was too long when you click right on a full cinder wall kit to build it. I renamed both kits so that both kits stand by each other.
2016-06-21 22:25:02 +02:00
A Man
25fbaf5757 Small Loot Tweaks
Increased the chance for MortarBucket and CinderBlocks to spawm. Removed the flashlight from spawn in industrial loot.
2016-06-21 21:58:06 +02:00
A Man
4848c3ef5c Changed Prices for balance
Changed prices for balance.
2016-06-21 21:55:01 +02:00
A Man
6d3a76704c Items Added/ Combo Lock Price Changed
I've added a few vanilla items and changed the price of the Combo Lock.
2016-06-21 21:53:48 +02:00
A Man
f47c4e0f2a Reordered Attachments
Reordered the attachments. Similar items should be next to each other
2016-06-21 21:52:20 +02:00
ebaydayz
63d6cfa87b Update test build 2016-06-20 22:02:28 -04:00
A Man
220fe3696c Backpack prices changed (#1699)
Backpack prices were wrong. It does not make sense to buy a smaller backpack for a higher prices than a bigger backpack.
2016-06-20 21:56:18 -04:00
A Man
2f613226ea Changed more Zombies Typs (#1700)
It does not feel right, when you enter a military area and see only Worker Zombies. I changed the Zombie Typs of the buildings to look more like a military area.
2016-06-20 21:48:45 -04:00
A Man
8b6725f77d Fixed CopperBar Display Text (#1701)
The Display text to craft  1x 10oz copper bar was not visible
2016-06-20 21:43:34 -04:00
A Man
ee6bf997b4 Increased weight of full_cinder_wall_kit (#1702)
The full_cinder_wall_kit had the same weight as the half. I just increased the weight by almost the double amout.
2016-06-20 21:41:12 -04:00
ebaydayz
bf3d03ba13 Only spawn small loot in lootPosSmall positions
I did not realize lootPosSmall positions can only fit small objects like
soda cans etc., so it is not okay to merge them with the main lootPos
arrays. This separates them back out.

This solution will work like 1.0.5.1 CfgLootSmall. <GroupName>Small is
used to spawn additional loot if the building type has lootPosSmall
positions available. It is not necessary to add a <GroupName>Small for
types that do not have lootPosSmall positions.

Some of these objects may still be too big or too small (knife,
binoculars, matchbox, etc.) for the positions and look out of place. If
that is the case please submit a pull with any problematic ones removed
from the <GroupName>Small groups (check if they aren't in 1051
CfgLootSmall first). Balance and rates may need adjustment as I just
took the normal groups and removed large objects from them while trying
to keep similar items to 1.0.5.1 CfgLootSmall.
2016-06-20 21:39:21 -04:00
ebaydayz
c6ddcbdc3e Update test build 2016-06-18 20:10:12 -04:00
ebaydayz
58d2443e77 Add back Epoch custom lootPos and lootPosSmall
Epoch has custom loot positions for many buildings. Most lootPos have
not changed in vanilla since pre 1.7.x.

The vanilla lootPos are now commented out and  custom Epoch ones are
added back. LootPosSmall positions are now included in lootPos and
marked with //DZE EXTRA

LootPosSmall are included and used by default in 1051, so it is simpler
to add them to the main lootPos lists instead of having a separate loop
in buildingSpawnLoot.sqf for them.
2016-06-18 19:58:58 -04:00
A Man
df6c34cfe9 Loot/Traders update (#1696)
* Update Weapons.hpp

* Update Military.hpp

* Update Industrial.hpp

* Update Industrial.hpp

* Update Military.hpp

* Update Residential.hpp

* Update Military.hpp

* Update Military.hpp

* Update BanditClothing.hpp

* Update BanditAmmunition.hpp

* Update BanditHelicopterArmed.hpp

* Update BanditMilitaryArmed.hpp

* Update BanditTrucksArmed.hpp

* Update BanditWeapons.hpp

* Update FriendlyAssaultRifle.hpp

* Update FriendlyBackpacks.hpp

* Update FriendlyBuildingSupplies.hpp

* Update FriendlyCargoTrucks.hpp

* Update FriendlyChemlitesFlares.hpp

* Update FriendlyFuelTrucks.hpp

* Update FriendlyLightMachineGunAmmo.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyPackagedFood.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyPistols.hpp

* Update FriendlyShotgunsandSingleshot.hpp

* Update FriendlyShotgunsandSingleshotAmmo.hpp

* Update FriendlySmokeGrenades.hpp

* Update FriendlySniperRifle.hpp

* Update FriendlySniperRifleAmmo.hpp

* Update FriendlySubmachineGunAmmo.hpp

* Update FriendlySubmachineGuns.hpp

* Update FriendlyToolbeltItems.hpp

* Update FriendlyVehicleParts.hpp

* Update HeroHelicopterArmed.hpp

* Update NeutralAirplanes.hpp

* Update NeutralBlackMarketAmmo.hpp

* Update NeutralBlackMarketWeapons.hpp

* Update NeutralExplosives.hpp

* Update NeutralHelicopterUnarmed.hpp

* Update FriendlyDrinks.hpp

* Update FriendlyLightMachineGun.hpp

* Update NeutralAirplanes.hpp

* Update BanditAmmunition.hpp

* Update FriendlyVehicleParts.hpp

* Update NeutralWholesale.hpp
2016-06-18 12:10:05 -04:00
ebaydayz
5b7ef99569 Fix _distance in dze_buildChecks
Passing false as the second parameter to fnc_find_plots always returns
DZE_PlotPole select 0. In dze_buildchecks we want to use DZE_PlotPole
select 1 if the classname is a plot pole.

_distance is already defined as DZE_PlotPole select 0 in the other three
files, so it is redundant to redefine it as the return value.

In player_upgrade.sqf the check for DZE_permanentPlot is not necessary,
because FNC_check_access handles both cases.
2016-06-16 20:15:51 -04:00
ebaydayz
d74130b477 Rename _playerUID to _id in fn_selfActions
Since this variable can also equal dayz_characterID if DZE_permanentPlot
= false; it makes more sense to name it _id.
2016-06-16 17:01:16 -04:00
A Man
72ea372acf Update Military.hpp (#1695)
I just changed the spawing zombie typ for the military special loot. I noticed that there are only "z_new_worker2-4" zombies in the baracks and got a bit confused. So now we have the military zombies back.
2016-06-16 16:22:12 -04:00
ebaydayz
e08ccaea1b Fix change log typo 2016-06-15 22:03:18 -04:00
ebaydayz
1f4c73bd12 Update change log
It is unnecessary to specify default values in configVariables.sqf
comments. All values in this file will be defaults at release. It can't
be edited by admins directly. They need to copy the variables to their
mission to change them, so they will always be able to reference it for
the defaults.
2016-06-15 21:14:06 -04:00
ebaydayz
01d8197d12 Remove redundant function fn_check_owner_friends
Fn_check_access provides the same functionality and more.

Removed folders that only contained a single file to clean things up.

Also added epoch tag friendly code to vanilla player_updateGui for now.
2016-06-15 20:09:04 -04:00
ebaydayz
fcca975708 Add Bruce-LXXVI to contributors 2016-06-15 18:33:49 -04:00
Bruce-LXXVI
5e53a71e88 Pullrequest/door management (#1694)
* Added doorManagement

* Rename FNC_check_owner --> FNC_check_owner_friends

* Fixed typo

* Fixed bug in FNC_check_owner_friends which allowed every user to manage
every plot and door.

* Removed unused DZE_doorManagementHarderPenalty from configVariables.sqf

* Now checking if _playerUID is in _friendlies for both cases.

* DZE_plotforLife should be DZE_permanentPlot

* Fixed case where DZE_permanentPlot is false.

* Forgot to add STR_EPOCH_CANCEL

* Changed translations to suggested string by ebaydayz.

* Renamed EyeScanner to DoorAccess.

* Reworked access rights for door management.

* DZE_doorManagementMustBeClose = true; //Players must be within 10m of
door to be added as a door friend.

* Fixed copy-paste error.

* Replace count with if

* Remove redundant test.

* Also replaced count in door management admins check.

* Change plotManagement and doorManagement to be consistent to
DayZ_UseSteamID (get UID from FNC_GetPlayerUID).

* Use _playerUID and _characterID more consistent.

* Added german translation to
STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST.
2016-06-15 18:22:01 -04:00
ebaydayz
035a94646b Add createvehicle.txt exception for player zombies 2016-06-12 14:54:33 -04:00
ebaydayz
20066de673 Rename FNC_check_owner --> FNC_check_owner_friends
Use a more descriptive name for what it actually does now.
2016-06-12 13:30:49 -04:00
ebaydayz
835d750c0c Use single config variable for Plot for Life and Plot Management
Plot for Life and Plot Management work best together. They essentially
provide the same functionality. Both let you keep your plot after death
by using UID instead of CharacterID. Plot Management doesn't even have
an option to save characterID, so by default it is always keeping all
friends and the owner permanently until they are removed. The only major
difference between them is Plot For Life also adds permanent ownership
of built items on the plot, which is behavior most people expect. It
doesn't make sense to keep ownership of the plot after death but not the
other objects built on it. The other functionality it adds (take
ownership) can be toggled with a config variable.

It is rare that someone would want Plot For Life enabled, but Plot
Management disabled or vice versa. If they really want that they can
still do it manually, but consolidating them to a single config option
greatly simplifies things for everyone else.

I removed links to mod githubs because many changes have been made to
the 1.0.6 versions, so outdated information there will likely confuse
people. Authors are already credited in the README and change log.

In variables.sqf "DZ_storage_base" is now the parent class which
includes all tents and stashes. DZE_checkNearbyRadius variable is not
used (identical to DZE_PlotPole select 0).
2016-06-12 12:54:46 -04:00
ebaydayz
16c1e9d205 Don't spawn POI objects on non-Chernarus maps
Object coordinates are only provided for Chernarus.
2016-06-10 18:42:18 -04:00
ebaydayz
a7045140a0 Remove some unused legacy code 2016-06-07 16:26:29 -04:00
ebaydayz
0534e95ccc stringtable fixes
Vanilla development commit:

1452ef2537
2016-06-06 21:51:47 -04:00
ebaydayz
2ea627f332 Preliminary BE filters update
The big list of removals in setvariableval.txt and publicvariableval.txt
were duplicates. Other removals are covered by the new regex filter.

Still needs work. If you encounter kicks please post the restriction
type and number along with the log line in the 1.0.6 testing issue.
2016-06-05 17:29:10 -04:00
ebaydayz
98c805e8db Update test build 2016-06-05 11:56:01 -04:00
ebaydayz
d4f6f07093 Fix gut zombie missing knife text
Shows "Missing Hunting Knife to do this" instead of "Missing knife to
gut animal"
2016-06-04 16:38:41 -04:00
ebaydayz
b7a104113f Various stringtable fixes & amendments
Vanilla development commit:

fb397c95ee
2016-06-04 15:23:31 -04:00
ebaydayz
3f96b70d80 Fix Unsupported language English in stringtable RPT error
Vanilla development commit:

b038a1762b

Fixes RPT error "Unsupported language English (or whatever language you
selected) in stringtable" on load.

We do not have <Original> tags on any other strings in the table, so
there is no reason to use them here. They are not needed. If the game is
set to use a language that does not have an entry it uses the first
available entry for that string (which is English for every string in
the table). Keys should not contain only <Original> tags with no other
languages, as it will cause this error.
2016-06-04 14:00:32 -04:00
ebaydayz
e5bfb01189 Fix typo in 1.0.6_Updates.sql 2016-06-02 17:43:46 -04:00
ebaydayz
3cee9cec55 Fix trader weapon swaps in 106 SQL updates
Type 1 is magazine, type 3 is weapon.

Also quantity is normalized to 10 for items and 2 for vehicles now as
per:
bf75e56858 (diff-3a9fcf2e8bd4ce1706bc216f4e9de063L57)
2016-05-31 17:03:26 -04:00
ebaydayz
bf75e56858 Remove 1.0.5_Updates.sql
Updates that were in the 1.0.5.1 release are now included in the main
epoch.sql file, since all servers should have applied them by now.

All new updates since 1.0.5.1 release are now in 1.0.6_Updates.sql.
2016-05-31 16:29:11 -04:00
Nexux
746a4a2d57 1.0.6 update SQL fix attachments (#1693) 2016-05-31 12:43:05 -04:00
ebaydayz
8028efbb69 Allow admin customization of player_onPause #1340
Also disable abort and respawn immediately in pause menu onLoad. New
function fn_pauseMenuChecks allows admins to run unscheduled code in
pause menu onLoad.
2016-05-22 12:26:57 -04:00
ebaydayz
fe8c5e7950 Fix infinite antibiotics when given to another player
Vanilla development commit:

4e6ea24577
2016-05-21 15:08:57 -04:00
ebaydayz
9dafa9d657 Always eject player when vehicle explodes
If the player is in a safezone we still want to eject them, just not
kill them.
2016-05-20 19:54:26 -04:00
ebaydayz
75e3ee58c2 Reduce ItemBloodbag loot chance slightly for classic system
Since typed bags spawn in bulk (usually 2x 4 different bag types) this
reduces bloodbag output slightly when classic system is enabled.

Medboxes were spawning with 3-8 blood bags, this reduces it to about 1-6
which should be similar to 1051 values IIRC. Feel free to adjust this up
or down if needed.
2016-05-20 17:20:10 -04:00
ebaydayz
ec27cfd29c Update dog actions in fn_selfActions
When PlotForLife was added these were not updated to reflect the
_ownerID change:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/compile/fn_selfActions.sqf#L253
2016-05-20 13:45:52 -04:00
ebaydayz
edd53597b0 Don't pass DZE_plotManagement to fn_check_owner
The whole point of a global variable is you do not need to pass it.
DZE_plotManagement and DZE_plotmanagementAdmins are always defined and
do not change, so there is no need to pass them as parameters.
2016-05-20 12:14:48 -04:00
ebaydayz
1a5d26f26d Remove unnecessary else in fn_selfActions
FNC_check_owner returns true for (_isowner select 0) if characterID
matches and plotforLife is disabled. So there is no need for the else
here.
2016-05-20 11:55:52 -04:00
ebaydayz
8beb6e9666 Allow filling generator and destroying tent with barrel and 5L 2016-05-19 20:44:34 -04:00
ebaydayz
d01446414c Move Zupa dialog includes to config.cpp
@icomrade - configFile and missionConfigFile are in different scopes.
Admins can overwrite any dialog in RscDisplay with their own version
included in the mission without getting "class already defined" errors.
I tested to make sure it is possible. So there is no benefit to having
these includes in description.ext.
2016-05-19 18:43:23 -04:00
ebaydayz
301c4348e9 Remove vanilla generator fill actions 2016-05-19 18:35:11 -04:00
ebaydayz
62700f37e4 Add note about splint and broken legs
Since R4z0r doesn't want it changed in vanilla.
2016-05-19 16:29:35 -04:00
ebaydayz
a54e58c60c Localize remaining player_build text
Also added config variables for MaxMove and MaxHeight distance when
building.

_reason was defined twice at the top of player_build.sqf.
2016-05-19 16:15:27 -04:00
ebaydayz
cbca23ddce Remove duplicate ZSCdefines.hpp include
@Bruce-LXXVI it was already included from the mission description.ext
2016-05-19 13:39:38 -04:00
ebaydayz
914b37a413 Pass cursorTarget to maintain_area.sqf
CursorTarget should always be passed from fn_selfActions, not reacquired
in action scripts. This is to ensure the same object is referenced. Plot
Management maintain_area is called from the dialog button, not
fn_selfactions.
2016-05-19 13:10:20 -04:00
ebaydayz
1a238d1719 Fix wrong buildables count displayed in plot management 2016-05-18 20:20:20 -04:00
ebaydayz
d0c4ccca15 Fix wooden splint recipe output
It was outputting two when it should only be one.
2016-05-18 17:10:46 -04:00
ebaydayz
0544ac37fa Fix broken legs icon flashing indefinitely
This keeps the icon solid when your legs are broken instead of flashing
it constantly.
2016-05-18 17:04:44 -04:00
icomrade
2889d8f010 Should fix building issues with player sliding
The change in module_build will only fix items that d ono have an offset
set in the config.

BoundingBox can be a bit generous but the player should be able to work
with any overestimation in size.
2016-05-18 11:01:38 -04:00
icomrade
8fd4c8eb8b Re-add plot check
Accidentally removed this when merging plot for life
2016-05-18 10:13:29 -04:00
ebaydayz
9d51fb2736 Fix plot management buttons color and text alignment
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
2016-05-17 22:02:21 -04:00
icomrade
113dd0618a Add Little Bird killed EH 2016-05-17 20:45:54 -04:00
ebaydayz
f61c6d8dac Add plotManagementMustBeClose config option
Setting false allows adding any online player to plot friends regardless
of their distance from the pole.
2016-05-17 20:09:37 -04:00
ebaydayz
edb64c4e05 Fix plot manage array add errors from 1e65f7a
@icomrade - when you use set to add an element to an array you do not
need to wrap it in brackets [ ] like you do with +.

This was making it a nested array which was not intended in the
original.
2016-05-17 19:30:21 -04:00
ebaydayz
dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -04:00
ebaydayz
a466e43645 Move plotManagement compiles to compiles.sqf
This was needlessly recompiling every time the addAction was clicked.

DisableSerialization is only needed if a display element is stored in a
variable within the current script. The called functions already have
it.
2016-05-17 16:54:58 -04:00
icomrade
ef1d323ef0 Should Fix Issue #1569
Varchar(512) was truncating certain vehicle hitpoints and preventing
vehicle loading. The HiveExt dll handles hitpoints as a string which has
a char limit far greater than 512,  so simply updating the column should
fix the issue.

Also update the ChracterID column for #1371 - new Hive dll will be
required
2016-05-16 13:32:22 -04:00
ebaydayz
65233757e8 Correct duplicate object UID check
I forgot numbers greater than 1 million are truncated when converted to
string:

http://killzonekid.com/arma-scripting-tutorials-float-to-string-position-to-string/

KeyStartNumber exceeded 6 digits which is why it was being truncated to
"1e+011" and getting stuck on loop (as that string was already in
currentObjectUIDs) as mentioned in 2df7279.

Starting at 10, there should never be more than a couple duplicates
generated, so keyStartNumber will never exceed about 100 max.  Added an
exit just for a fail safe.
2016-05-16 11:52:45 -04:00
icomrade
116caaa788 Revert "Remove dayz_objectUID2 from object loading"
This reverts commit 2df7279f1a.
2016-05-15 21:48:24 -04:00
icomrade
71875647e7 Update test build 2016-05-15 19:17:10 -04:00
icomrade
08c16788ae update changelog + fix god exclusion check 2016-05-15 18:57:14 -04:00
icomrade
dc2b97beb6 Revert setPos change from a previous commit 2016-05-15 18:53:40 -04:00
icomrade
2df7279f1a Remove dayz_objectUID2 from object loading
DB with ~4000 vehicles fails to load since this code runs on nearly
every vehicle for some reason. The code should only be called upon
vehicle purchase to increase load time and simply calling
dayz_objectUID2 has no effect.
2016-05-15 18:53:40 -04:00
icomrade
eda3e1c202 Fix vector objects loading in with angle compensation
With the code removed from line 266-271 the server would reset the slope
of the placed object to match the slope of the ground. Do not re-add the
code unless configs are updated with corresponding canbevertical option.
2016-05-15 18:53:40 -04:00
icomrade
e2a14de977 Add exclusions for god mode built objects 2016-05-15 18:53:40 -04:00
icomrade
396d085672 Fix Hive error when saving vector building objects 2016-05-15 18:53:40 -04:00
ebaydayz
7e1fe6fca1 Update test build 2016-05-15 11:32:53 -04:00
icomrade
d442592e55 Fix #1691 2016-05-13 17:40:34 -04:00
icomrade
c118ecbb15 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-13 17:06:46 -04:00
icomrade
6d69ca92e3 Fix undefined player uid in modular build 2016-05-13 17:06:43 -04:00
ebaydayz
914162c698 Update messing variable in pz_feed.sqf
Messing now has a third parameter for dayz_nutrition.
2016-05-13 17:02:44 -04:00
icomrade
33c3c7601f Fix Private Arrays 2016-05-13 16:57:50 -04:00
icomrade
00e2f34734 Forgot variables 2016-05-12 23:47:53 -04:00
icomrade
6c24aaeb3b Add Vector Building 2016-05-12 22:52:04 -04:00
ebaydayz
8b0e03545f Remove legacy config trader menu
Advanced trading now does everything the legacy config menu did and
more.
2016-05-12 16:41:40 -04:00
ebaydayz
3be1d4e6bf Update outhouse and plot pole descriptions
Outhouse no longer includes toilet paper.

Plot pole may cover an arbitrary radius and ownership may not be lost
after death depending on server settings.
2016-05-12 15:10:20 -04:00
ebaydayz
bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
ebaydayz
e60175b30c Fix wrong price when adding multiples of same item to buy list
Modifying _temp was also modifying Z_BuyableArray. An independent copy
of the array was needed.
2016-05-11 15:07:58 -04:00
ebaydayz
5ad1697308 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-11 12:42:51 -04:00
ebaydayz
6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -04:00
icomrade
2d9097a6af Switch all buildables to Epoch building system
Didn't bother switching the stash over since it doesn't appear to be
implemented yet
2016-05-10 11:21:04 -04:00
ebaydayz
5ca182dffe Fix can't sell satchels with Adv. Trade
Some items (like PipeBomb) are a class in both CfgMagazines and
CfgWeapons. BIS_fnc_invRemove uses weapon first, so that is why the
magazine was not being removed. Using config instead of string avoids
this problem.
2016-05-09 14:10:20 -04:00
icomrade
72f3779edb Fix death when changing clothes + minor changes
removing the Respawn EH fixes this, I haven't noticed any adverse
effects from removing it yet.

Also changing groups now deletes the old group. The machine which the
group is local to must execute the deleteGroup command, the server
previously had to wait until the player disconnects to delete their
empty groups.
2016-05-09 00:27:34 -04:00
icomrade
875b63027a Fix plot friends return 2016-05-08 19:13:18 -04:00
ebaydayz
c0cb702534 Add swap for classicBloodBagSystem in Adv. Trade 2016-05-08 17:31:23 -04:00
ebaydayz
5120d8a488 Fix incorrect backpack space calculation
Fixes not being able to purchase into a half full backpack and free slot
counts text incorrect when buying into backpack.
2016-05-08 16:21:24 -04:00
ebaydayz
84e64be47e Don't show debug message when paying with exact amount 2016-05-08 13:30:26 -04:00
ebaydayz
c477304571 Forbid buying duplicate tools into gear 2016-05-08 11:59:25 -04:00
ebaydayz
41e653136f Add attachments compatibility list to trader
Also reduced item info size a bit to better fit normal and large
interface sizes.
2016-05-07 19:29:00 -04:00
ebaydayz
3d4d6f6544 Add SQL query for Precise Base Building 1.0.5
You only need to run this if v1.0.4 was installed on your server
2016-05-07 13:24:27 -04:00
ebaydayz
1fe8a7abf5 Fix typo from 26e6727 2016-05-07 13:14:22 -04:00
ebaydayz
26e67270cb Update Precise Base Building to v1.0.5 by @Mikeeeyy
Note @icomrade : 1.0.6 test servers need to empty object_data or run the
SQL query linked below before applying this update.

http://epochmod.com/forum/topic/15813-release-v105-precise-base-building-persistent-bases-after-restart-updated-220915/#comment-118663
2016-05-07 13:06:20 -04:00
ebaydayz
03e3293795 Add extra vehicle info in Adv. Trading
Translations are from Arma2OA languagecore.pbo
2016-05-06 18:57:53 -04:00
icomrade
6e430bdb84 Change self transfuse timeout to 2 min default
Also properly handle the infection chance
2016-05-06 11:52:36 -04:00
icomrade
6ab855fd9d Forgot to set this variable in selfbloodbag.sqf 2016-05-06 11:45:34 -04:00
ebaydayz
b0ffc1421e Prevent errors if zombie is deleted suddenly 2016-05-05 20:03:41 -04:00
ebaydayz
00cb76a496 Fix Adv. Trading pistol detection
The secondaryWeapon command does not detect pistols. It returns the
unit's launcher.
https://community.bistudio.com/wiki/secondaryWeapon

This fixes the menu always showing your pistol slot as open, even when
you already have one.
2016-05-05 17:25:47 -04:00
ebaydayz
7bc5d7f7f5 Fix full toolbelt showing -2 tool slots in Adv. Trade
Correctly shows zero available tool slots when toolbelt, binocular and
NVG slots are full now.
2016-05-05 16:50:09 -04:00
ebaydayz
fe54b78bdb Add backpack selling to Advanced Trading
It was not possible to sell a backpack from your gear or vehicle.

Added option to sell from gear. Sell backpack from vehicle is still not
possible currently due to Arma limitations.
2016-05-05 14:55:50 -04:00
ebaydayz
2c6ef2ced3 Don't show selected vehicleX message on Adv Trade startup
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
2016-05-05 12:37:10 -04:00
ebaydayz
f900ee4520 Add isInTraderCity to BackpackAntiTheft check 2016-05-05 11:39:18 -04:00
ebaydayz
af14d673f5 Make LMG magazines only take up one slot
All ammo in Configs\CfgMagazines\Magazines\ is back to taking one gear
slot now, same as 1.0.5.1.
2016-05-05 11:14:08 -04:00
ebaydayz
ef2c910bfc Fix open gear backpack slots always showing zero
IsNil returns true as long as the variable is defined. In this case it
is defined as objNull when you have no backpack.
2016-05-04 19:09:10 -04:00
ebaydayz
cb381c5ce3 Fix another transportMaxBackpacks typo
This was responsible for vehicles showing zero and negative numbers of
available backpack slots.
2016-05-04 18:42:20 -04:00
ebaydayz
ed9253671e Always open Advanced Trading in buy mode
Fixes the unintended behavior of swapping between buy and sell each time
the menu is opened.
2016-05-04 16:50:46 -04:00
ebaydayz
349e0a103d Fix trade title showing "Buying in vehicleX" when in sell mode
Tested and confirmed working as intended now.
2016-05-04 16:46:35 -04:00
ebaydayz
85869b32f1 Fix Adv. Trade secondary vehicle check
Forgot this one. See:

f503e53097
2016-05-04 15:53:25 -04:00
ebaydayz
f503e53097 Fix Adv. Trade nearby vehicle check detecting animals
Was getting "Buying in Rabbit" when one was nearby.

No need to check "AllVehicles", this is faster and will get all drivable
vehicle types.
2016-05-04 15:47:47 -04:00
ebaydayz
c4d3f01f38 Don't show enter/leave text when changing clothes in trader 2016-05-04 15:08:19 -04:00
ebaydayz
e6c5930415 Fix unit icon in Advanced Trading selling from gear box
Adds a nice icon of the unit in the top right below "Gear" text.
2016-05-04 14:39:40 -04:00
ebaydayz
800182f7e2 Fix can't buy backpack into vehicle with Advanced Trading
The typo here was causing all vehicles to return 0 for
transportMaxBackpacks.
2016-05-04 14:20:23 -04:00
ebaydayz
5043fafae4 Fix default currency display in Adv. Trading bag item info
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
2016-05-04 12:54:36 -04:00
ebaydayz
085b6d32f9 Enable R3F weight by default
Since we are keeping "everything takes up one gear slot" weight should
be enabled by default. Moved to init.sqf so admins can easily change it.

Also added RedRyder and Anzio_20 weight.
2016-05-04 11:23:50 -04:00
icomrade
8a361a1b44 Wrong order 2016-05-03 23:28:32 -04:00
icomrade
e8abd8f403 Add percent damaged display for maintenance #1583 2016-05-03 23:25:25 -04:00
icomrade
51be8aa8a5 Fix reloading 2016-05-03 20:19:01 -04:00
ebaydayz
ee70dd49d3 Prevent rags duping
Vanilla development commit:

31167114e7
2016-05-03 17:28:33 -04:00
icomrade
3f10228b95 should fix knockout issue with self bloodbag
issue most likely happened if you used a typed bag not matching your
blood type when the classic system is enabled.
2016-05-03 16:34:28 -04:00
icomrade
2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
icomrade
fcb6d1ab26 Fix some items missing removal option #1135 2016-05-03 15:41:33 -04:00
icomrade
cf29731620 Configurable weather effects 2016-05-03 15:21:38 -04:00
Anton
75ae8ad3c0 a couple localization updates (#1690)
* a couple localization updates

* fix merge conflicts

* fix

* fixes
2016-05-03 15:15:44 -04:00
icomrade
5cde6cba69 should fix undefined variable errors 2016-05-03 15:09:13 -04:00
icomrade
7bcc9f305f Configurable temperature effects 2016-05-03 14:31:20 -04:00
icomrade
6936a5dd24 Fix packing storage giving no refund 2016-05-03 14:02:57 -04:00
icomrade
b0df4c7f51 Fix unlocking vehicles after adding plot for life 2016-05-03 13:50:59 -04:00
ebaydayz
1eeaa3e792 Add epoch_generateKey function 2016-05-03 13:35:50 -04:00
ebaydayz
2f98fc0451 Prevent MeleeMagazines being counted by BIS_fnc_inv 2016-05-03 13:35:50 -04:00
icomrade
f8b3ba2105 Fix mistake from Plot for Life addition 2016-05-03 12:53:48 -04:00
icomrade
c2ce8aaf8b better fix for CH53 and add toggle for #1198 2016-05-03 11:14:26 -04:00
icomrade
ea8c14c5fb Fix #1187
keypadCancel returns false when a combo/keypad dialog is not open and
when reset by calling the code keyPadReset = {uiSleep 2; keypadCancel =
false;};

There is a 2 second delay which makes brute forcing very very time
consuming. Note there must be a delay when resetting the variable since
fn_selfactions will update so quickly it will display the
unlock/lock/remove option before onUnload is executed.
2016-05-03 01:19:36 -04:00
icomrade
3c27f76c7c use self actions to spawn plot radius, fixes #1566 2016-05-02 23:06:50 -04:00
icomrade
3c0573258a update changelog 2016-05-02 21:44:45 -04:00
icomrade
eddcf02ab3 Precise Base Building fix 2016-05-02 21:06:44 -04:00
icomrade
5f054393e5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
2016-05-02 20:44:50 -04:00
icomrade
575682b7c8 Add A Plot For Life modification by RimBlock
A Plot For Life also includes Precise Base Building by Mikeeeyy. Precise
base building has no variable to switch it on or off, I don't think it
should.

Seems to work well enough, this may conflict with the duplicate object
uid fix, it appears to spam my server rpt.
2016-05-02 20:42:37 -04:00
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz
8d82693c1b More Advanced Trading localization
Russian translations provided by Epoch forums user koms:
http://epochmod.com/forum/profile/33066-koms/
2016-05-02 17:32:27 -04:00
ebaydayz
c4ed93959e Better combat log detection method on server
"noatlf4" variable is set on server through PV from damage handler. No
need to worry about diag_tickTime difference between clients and server.
2016-05-02 15:12:43 -04:00
ebaydayz
c951680ffd Added new Login Processing check for Ghost mode.
Players who alt f4 while in ghost mode should no longer lose position
updates.

Vanilla development commit:

24194861aa
2016-05-02 14:48:15 -04:00
ebaydayz
99cd64c73b Removed Logging from Temperature system.
Vanilla development commit:

166ae0219c
2016-05-02 14:28:58 -04:00
ebaydayz
dfe68c7824 Removed Achievements from sync.
Vanilla development commit:

09313b2376
2016-05-02 14:26:35 -04:00
ebaydayz
4df9a1e00b Fix wrong translations from #1689 @Adaptivity
@Adaptivity
2016-05-02 14:15:06 -04:00
ebaydayz
adff6440ed Fix errors from #1689 localization
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
2016-05-02 14:03:41 -04:00
Anton
2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
ebaydayz
765b035764 Add note about PVDZ_plr_Save 2016-05-02 11:23:50 -04:00
icomrade
16fe17645f Don't redefine vehicle EH
doing so breaks the destruction fix
2016-05-01 22:10:38 -04:00
ebaydayz
51308c5b32 Fix typo from #1688
Also remove a duplicate string
2016-05-01 21:14:38 -04:00
Bruce-LXXVI
72132aa28a Pullrequest/german translation (#1688)
* Added and reworked german translation.

* Translated AdvancedTrading german strings added by iComrade.

* Changed some german text to fit better.
2016-05-01 21:04:29 -04:00
icomrade
ad4f3d7556 Kill and eject players from all vehicle types except boats
The code in the CH53 SFX file must remain there.

Boats/ships do not properly call the destruction EH files so this fix
doesn't work for them. maybe a killed event handler must be added from
the server?
2016-05-01 21:03:09 -04:00
icomrade
61ffe26fb8 More magazines taking too many slots 2016-05-01 21:00:00 -04:00
ebaydayz
f848305b50 Update Advanced Trading with category reuse support
Tested and working ok.
Updating with change from:

03b8c38c6a
2016-05-01 19:02:29 -04:00
ebaydayz
db62ed2019 Only check isPlayer if isMan in fn_selfActions
Better method than:

66408ded24
2016-05-01 17:24:21 -04:00
ebaydayz
66408ded24 Prevent trader menu action showing on players
Fixes bug where player wearing a skin in serverTraders would show trader
menu action on him.
2016-05-01 17:08:55 -04:00
icomrade
d6236dcb91 Fix improper total price in advanced trading
Also sort gems by value when giving total price.
2016-05-01 16:24:38 -04:00
icomrade
3d3c3abe8c remove unused CA folder 2016-05-01 16:24:05 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
icomrade
d25ad694d8 Fix wrong bloodbag types spawning 2016-05-01 14:15:01 -04:00
icomrade
3f8d79b6ae Update Changelog 2016-05-01 13:41:58 -04:00
ebaydayz
b4cd47f5b5 Update PVDZ_plr_save in advanced trading 2016-05-01 13:21:17 -04:00
icomrade
1e65f7a959 Plot Management cleanup + improvement
New compile DZE_GetPlotFriends

DZE_PlotManagementAdmins allows admin management of plot poles and
buildables near poles

DZE_MaxPlotFriends allows servers to allow more than 6 friends on a pole
at once
2016-05-01 13:20:21 -04:00
icomrade
9e2728af07 Merge pull request #1686 from Bruce-LXXVI/pullrequest/plotManagement
Pullrequest/plot management
2016-05-01 11:05:54 -04:00
ebaydayz
6187006ece Remove duplicate fnc_inString 2016-05-01 11:01:26 -04:00
ebaydayz
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
icomrade
ba751dad4a Fix Generator
Not sure what differences BuiltItems will have as opposed to using the
SkodaBase class.

Switch Off/On are removed because they do nothing anyway (the start/stop
options are in fn_selfAction anyway)
2016-04-30 19:04:52 -04:00
icomrade
deee47b703 Disable OK button before role is selected 2016-04-30 18:33:18 -04:00
icomrade
7a11b508e1 No building in trader
string needs localization
2016-04-30 18:05:58 -04:00
ebaydayz
f44901db1b Prevent spamming change clothes
Vanilla development commit:

98733d37ab
2016-04-30 16:48:05 -04:00
Anton
4e45b23f94 More work on localization support (#1687)
fix stringtable.xml

more fixes

added missing $
2016-04-30 15:54:31 -04:00
icomrade
6deb1a69f1 Tweak gem values
Any value should work for gems.
2016-04-30 11:31:12 -04:00
icomrade
83694a452e Gem Trading mostly finished
Sometimes displays incorrect total price in advanced trading menu.
2016-04-30 11:17:41 -04:00
icomrade
b5c2c6c7bd Fix remove object option 2016-04-29 20:48:16 -04:00
Bruce
59c731ba70 Added ZSCdefines. Checking plotfriends against dayz_playerUID. 2016-04-30 02:01:27 +02:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
icomrade
6fa3365b70 check if player is alive for humanity change 2016-04-29 17:19:48 -04:00
icomrade
89eea668f5 better math 2016-04-29 17:00:56 -04:00
icomrade
9e5d2f1038 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-04-29 16:48:16 -04:00
icomrade
8158245b83 Possible fix for #1645 2016-04-29 16:48:14 -04:00
ebaydayz
d95474b819 Update main readme 2016-04-29 15:06:34 -04:00
icomrade
a86b28b0a7 Fix spawn height for boats, and buying bikes 2016-04-29 00:19:22 -04:00
icomrade
bc0d5027f5 Adv. Trading handle other and free vehicle types
Allow players to sell vehicles without keys and add boat and bike
trading classes to buy/sell
2016-04-28 23:40:28 -04:00
ebaydayz
4b9d6df0bb Finish localization support
Vanilla development commit:

33c6cafbcb
2016-04-28 22:13:48 -04:00
ebaydayz
7f1b8db85a Fix MeleeMagazines showing in crafting UI
Vanilla development commit:

f2e1623ba1
2016-04-28 21:34:00 -04:00
icomrade
bc370475e5 Update ReadMe.md 2016-04-28 21:11:26 -04:00
ebaydayz
2b61ce850a Allow sleeping at all tents
Vanilla development commit:

e647be13c1
2016-04-28 20:30:18 -04:00
icomrade
9df5c5a156 Update test build 2016-04-28 19:38:25 -04:00
icomrade
47070ae4f5 Move advanced trading configs to mission
allows customization by server owners
2016-04-28 19:30:43 -04:00
icomrade
b0afc402e2 Require Config Traders for Advanced Trading
Since advanced trading can now handle vehicles I don't think there's any
point to have the old dialog if using advanced trading.
2016-04-28 18:59:50 -04:00
icomrade
55f3a9dc79 Vehicle selling for advanced trading
This should work fairly okay but I expect there may be a couple exploits
and glitches
2016-04-28 18:35:03 -04:00
ebaydayz
d2ba027863 Perform build checks before removing magazines
Also allow tents and stashes to be built without a plot pole (same as
1051).
2016-04-28 15:32:32 -04:00
ebaydayz
034d898880 Update tent base class name
DZ_storage_base is now the base class for all tent and stash types.
2016-04-28 13:53:21 -04:00
ebaydayz
f42496bb03 Move build checks to separate files
For better organization
2016-04-28 11:52:23 -04:00
icomrade
b5af74b72b Add Vehicle Purchasing to Advanced Trading
Allows 1 vehicle purchase at a time.
Vehicles will still spawn inside each other if one is already parked on
the pad.
2016-04-27 22:04:47 -04:00
icomrade
17c31a5f21 Fix buying from backpacks/vehicles dupe 2016-04-27 19:29:03 -04:00
icomrade
e03b5bdb37 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	CHANGE LOG 1.0.6.txt
2016-04-27 18:26:07 -04:00
icomrade
1585765ca6 Advanced trading by Zupa @Windmolders
Stock configuration and basic integration. WE still need config based
trader setups.
2016-04-27 18:23:55 -04:00
ebaydayz
244b84e74b Update weapon switch hotkey for DZE_TwoPrimaries=2
Also forgot new dropped class for SledgeHammer
2016-04-27 16:11:40 -04:00
ebaydayz
7753ae2859 Add drop weapon action to MeleeSledge 2016-04-27 15:01:34 -04:00
icomrade
1a6593d198 Revert to old chainsaw RTM files 2016-04-27 14:42:50 -04:00
icomrade
7ea9a270f2 New building functions, vanilla building checks
DZE_RequiredItemsCheck returns bool, displays an error of all the tools
the player is missing to build the item.

DZE_BuildChecks returns array of bools, canBuild and if the item is a
plotPole.  Also has the ability to check if the player has required
tools to build using DZE_RequiredItemsCheck.

The vanilla build script still needs to be modified to work over water
and allow players to place floating objects, but now uses plot checks.
It would be easiest to just modify the configs to use the epoch building
scripts instead.

fnc_getSetPos now accepts a position as the second element of the input
array. the object will be set to this position if it is used. This
change requires no code updates

Note: scripts with build and/or tool checks should be updated to use the
new functions
2016-04-27 14:30:11 -04:00
ebaydayz
bb66b4446c Add Anzio 20mm sniper by @arma2WillRobinson to addons list 2016-04-27 12:30:57 -04:00
icomrade
0e0a1e340f Safezone whitelist for eject/destruction fixes
This commit prevents players who destroy their vehicle in god-mode
safezones to be spared by the fixes in #2411973 and #ec7351d

Configurable variable for this change is DZE_SafeZonePosArray = [];

Update suggestion to use the stable branch of A2 OA in the changelog
2016-04-27 00:17:54 -04:00
icomrade
f102240821 Fix death board undefined variable error 2016-04-26 22:46:44 -04:00
ebaydayz
2696869dc2 Fix wrong dayz_minpos and maxpos for Chernarus
Fixes radiation effect when out of map
2016-04-26 21:02:59 -04:00
icomrade
53320178f1 Let Shovel build sandbags, fix errors with toolbox 2016-04-26 18:55:30 -04:00
ebaydayz
bf9140f1b5 Fix dayz_nutrition RPT error on login
Looks like the error was:
r_player_Nutrition = [_NutritionLoss];
It should have used the set command, since the array was already defined
in variables.sqf. But there is no need to use an array for a single
value anyway.

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

if (dayz_nutrition > 0) then {
_Nutrition = >
Error position: <dayz_nutrition > 0) then {
_Nutrition = >
Error Undefined variable in expression: dayz_nutrition
File z\addons\dayz_code\system\player_spawn_2.sqf, line 182
2016-04-26 18:46:36 -04:00
icomrade
2411973de5 Fix CH53 Destruction
Let me know if we can't duplicate the code from the CH53 addon in the
file ch53_monitorSFX.sqf. If that's the case I will use an #include
instead, since the code that kicks and kills players out of the vehicle
goes at the bottom of the file anyway.
2016-04-26 15:16:20 -04:00
icomrade
ec7351dbbc Kill and eject player when their vehicle explodes
Previous changes to the destruction effects file broke previous fixes
that resolved the world is on fire glitch. I reverted those in this
commit.

Note: the CH53 is still broken in this commit
2016-04-26 14:47:52 -04:00
icomrade
16c81e7ce2 Allow players to carry primary weapon on back
Configurable by DZE_TwoPrimaries

0 do not allow primary weapon on back.
1 allow primary weapon on back, but not when holding a primary weapon in
hand.
2 (default) allow player to hold two primary weapons, one on back and
one in their hands
2016-04-26 14:05:37 -04:00
icomrade
c1eb07d99d Add to back for sledgehammer 2016-04-25 22:57:29 -04:00
ebaydayz
d63f48af85 Fix pond detection in player_goFishing
Fixes #1678
Fixed for vanilla too:

8a18fe957c

Ponds and lakes were not being detected at all, neither on foot nor in a
boat.

Tested land (failure), pond, lake and shore both on foot and in a boat.
Working as intended now.
2016-04-25 21:53:31 -04:00
ebaydayz
a57d0b14ae Merge pull request #1684 from arma2WillRobinson/master
adding "\" to picture paths.
2016-04-25 20:00:27 -04:00
ebaydayz
97ad2688bc Enable RedRyder in loot tables again
Config errors are fixed for the next test build.
2016-04-25 19:57:23 -04:00
arma2WillRobinson
303e1bddfd add \ 2016-04-25 16:56:49 -07:00
ebaydayz
69b940704e Removed powerlines from loot tables,
Vanilla development commit, see:

Removed Zeds spawning at powerLines.

b577424e50
2016-04-25 18:02:55 -04:00
ebaydayz
a353f8e0e5 Fix hatchet remove from toolbelt text 2016-04-25 16:36:50 -04:00
ebaydayz
56ea7d1382 Use PVEH instead of MPF for death messages
This way no exception needs to be added in REsec for rSpawn and
dayz_rollingMessages can be used instead of rTitleText.
2016-04-25 16:10:52 -04:00
ebaydayz
5ff4cbd4d8 Merge pull request #1682 from Adaptivity/localizationwork
More progress on localization support
2016-04-25 14:59:40 -04:00
Adaptivity
7b5535a25a fix stringtable 2016-04-25 21:52:49 +03:00
Adaptivity
4dc46705f9 More progress on localization support 2016-04-25 15:47:09 +03:00
icomrade
7db6f63935 Update string for gutting zombies 2016-04-24 21:15:26 -04:00
ebaydayz
6522cca7ce Fix typo from pull #1679
See #1679
2016-04-24 18:58:22 -04:00
ebaydayz
0511dcdb42 Change R3F overburden to force slow move
Better solution than knock out or break legs. See issue #1145
2016-04-24 18:19:01 -04:00
icomrade
9624979785 Fix items taking more than 1 inventory slot 2016-04-24 17:44:58 -04:00
icomrade
4ad652bda6 Merge pull request #1680 from arma2WillRobinson/master
RedRyder Updated
2016-04-24 12:06:15 -04:00
icomrade
77d1bcf8ae Merge pull request #1679 from Adaptivity/master
More localization support
2016-04-24 12:06:09 -04:00
armaWillRobinson
db04ae33a8 patch1 2016-04-24 08:21:14 -07:00
Adaptivity
52ee70394a More localization support 2016-04-24 14:11:14 +03:00
arma2WillRobinson
8b9e5ed244 Merge pull request #3 from EpochModTeam/master
update
2016-04-23 19:42:42 -07:00
ebaydayz
6bee7a17f0 Change R3F weight overburden to break legs
Also BAF_L110A1_Aim_DZE wasn't in 1051, so no need to swap it in DB.
2016-04-23 19:51:56 -04:00
ebaydayz
8582e7b97a Fix README formatting 2016-04-23 14:54:27 -04:00
ebaydayz
f6280a42a8 Fix README formatting 2016-04-23 14:47:58 -04:00
ebaydayz
1859216a94 Update test build and instructions 2016-04-23 14:24:52 -04:00
ebaydayz
406dda1fc2 Merge pull request #1677 from EpochModTeam/DayZ-1.8.7-Rebase
Merge DayZ 1.8.7 Rebase branch
2016-04-23 11:39:51 -04:00
1317 changed files with 75454 additions and 77476 deletions

109
CHANGE LOG 1.0.6.2.txt Normal file
View File

@@ -0,0 +1,109 @@
[NEW] Newest version of DayZero enterable buildings provided by Tansien and Zac https://zombies.nu/. This fixes broken barracks shadows and adds several new interiors. #1601
[NEW] Land_houseV_2T2 is now enterable. Interior modeled by @Streatman
[NEW] Added loot positions for new enterable buildings
[NEW] Added L85 attachments totaling 24 variants, new models by @Streatman. Class L85_Holo_DZ no longer exists and must be updated to L85A2_DZ in custom scripts and SQL, see 1.0.6.2_Updates.sql
[NEW] SVD scope attachments can now be removed, new models by @Streatman
[NEW] Added option to toggle status icons in "Game Options" menu and via F3 hotkey. Note this will also toggle Epoch "friendly" tags because they are the same display.
[NEW] Added DZE_limitPlots so admins can limit plot poles to one per UID, disabled by default. @oiad
[NEW] Pumpkin, sunflower, and hemp plants spawned with createVehicle can be harvested with a knife now. #1928 @F507DMT
[NEW] The journal and dayz_survived variable now contain actual play time [array] instead of days since the character was created [number].
[NEW] Added secondary iron sight to CZ550 modeled by @Streatman
[NEW] Added bolt animations to CZ550 and LeeEnfield modeled by @Streatman
[NEW] Added some basic compatibility for falconsan's Ruegen map (beta version released February 2016)
[NEW] Admins can now define what parts are returned from modular building parts, see configVariables.sqf/DZE_modularConfig @oiad @BigEgg17
[NEW] Added basic server-side authentication to hive object creation/deletion for improved security. Affects Server_(DeleteObj|PublishObj|PublishVeh|SwapObj|UpdateObject), admins and script makers should review the changes if using PVDZ_obj_(Destroy|Publish), PVDZ_veh_Save, PVDZE_obj_Swap, PVDZE_veh_(Publish|Upgrade) or server_deleteObj and verify custom code is compliant with these changes (github.com/EpochModTeam/DayZ-Epoch/commit/42e0047)
[NEW] Added BAF_L85A2_RIS_TWS_DZ to emulate the old behavior of the now NV only BAF_L85A2_RIS_CWS. This weapon is not used by default. Server owners can implement it if desired. #1983
[NEW] Admins can now define a maximum build height, see configVariables.sqf/DZE_BuildHeightLimit. @BigEgg17
[NEW] Admins can now change the lootRefreshTimer for each building type from the default 15 minutes. CfgLoot.hpp must be updated if using custom loot tables.
[UPDATED] Loot and zed spawn is now disabled in trader cities by default. This is configurable in mission\init.sqf via DZE_SafeZonePosArray. Added function to check positions against DZE_SafeZonePosArray "_PosInSafeZone = [_positionOrObjectToCheck] call DZE_SafeZonePosCheck;" An optional radius can be supplied as a second argument i.e: [_positionOrObjectToCheck,500]
[UPDATED] Zombie pathing. Zeds should now run more direct to players and no longer get stuck at the position where a player entered a vehicle.
[UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
[UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
[UPDATED] Owners can no longer be removed by added friends in plot and door management. @oiad
[UPDATED] A new hidden version of the gear menu is now used for force saves so players do not see the dialog flash on screen.
[UPDATED] Anyone can now lock a modular door without knowing the combination or having any special access. #1944 @ndavalos
[UPDATED] Locking and unlocking safes no longer plays the medic animation. #1942 @SmokeyBR
[UPDATED] Locking and unlocking safes now uses call instead of spawn on the server. This fixes the user input lock and safes appearing to disappear momentarily when server FPS is low.
[UPDATED] Added cleanup of destroyed vehicles and CraterLong after 5 minutes in sched_corpses.sqf.
[UPDATED] Reverted group menu color scheme to A2OA default for consistency with game dialogs
[UPDATED] All Zupa dialogs have been updated to use consistent title bar color, button colors, text style and background. The trader menu background is now semi-transparent for increased visibility of surroundings.
[UPDATED] DZE_ZombieSpeed = [min, max]; has replaced the, now removed, DZE_slowZombies variable. set DZE_ZombieSpeed = [2,2]; for DZE_slowZombies = true; behavior. see configvariables.sqf for more info
[UPDATED] Reverted increased waves in stormy weather to Chernarus default settings.
[UPDATED] Removed server control panel, because it is abused by players and not currently used by admins
[UPDATED] Moved large format strings in dayz_server to str formatText to avoid A2 2048 format character limit
[UPDATED] Vehicles can now only be sold from the "Gear" sell menu. This prevents accidental selling when using the "sell all" feature on backpacks and vehicle inventories.
[UPDATED] Added all upgraded weapons to the traders as sell only for the sell price of the base weapon plus the sell price of attachments. This allows them to be sold without removing attachments first. #1982 @worldwidesorrow
[UPDATED] Increased the coverage angle of headlights on land vehicles and added a headlight to the old bicycle
[UPDATED] The huey searchlight and gunner seat now have improved visibility in first person view.
[UPDATED] The AH6X_DZ now uses a new model which removes the camera and computer, adds a search light and fixes unknown animation source turret errors.
[UPDATED] Removed policecar from dayz_vehicles due to model errors, SQL must be updated if this vehicle was used, see 1.0.6.2_Updates.sql
[UPDATED] Player is no longer set in combat for throwing a flare or chemlight
[UPDATED] CSJ_Gyro push script so it no longer spams global setPos. This allows MaxSetPosPerInterval to be filtered in BEServer.cfg.
[UPDATED] Updated DatabaseMySQL.dll to MySQL version 5.7.20, server admins should update to MySQL server 5.7.20 or above. Updated tbb.dll and tbbmalloc.dll to Intel TBB 2018 Update 2
[UPDATED] Some DZ weapons which had magazine types restricted (AK, G17, M249, PDW) can now use all compatible A2 magazines. Silenced DZ weapons can now use both SD and non-SD magazines again.
[UPDATED] Added example basic.cfg and BEServer.cfg files to server configs
[FIXED] Purchased and upgraded vehicles will now spawn quicker and no longer be destroyed by sched_safetyVehicle when server FPS is low. HiveExt.dll and SQL must be updated. See 1.0.6.2_Updates.sql
[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
[FIXED] Trees at POI can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down.
[FIXED] Vanilla POI were updated with new locations and moved back to global spawn again. This synchronizes the POI buildings and trees destroyed/chopped status for all clients.
[FIXED] All traps now need to be armed after placing. This fixes them not triggering right after building.
[FIXED] Smoke and grenade tripwires now require a grenade to rearm after triggering.
[FIXED] Player no longer does medic animation after triggering a single use trap.
[FIXED] Removing a trap with no room in your gear will no longer delete the trap.
[FIXED] Player_forceSave is now called correctly when the abort menu is opened. It was previously using the wrong variable and time.
[FIXED] The unconscious wake up animation can no longer be skipped by using a bandage or other right click actions.
[FIXED] Sharpening a knife will no longer delete one if the player already had a fully sharpened knife on their toolbelt (duplicate weapon).
[FIXED] Swimming in air or ground after relog, clothes change and respawn on certain maps. #1913 @Cherdenko
[FIXED] Arma cheats (LeftShift + NumPad-) enterable on map display and create marker text box. #1915 @BigEgg17
[FIXED] It is no longer possible to duplicate melee weapons by double clicking to drop and right clicking at the same time. @F507DMT
[FIXED] Death messages and damage sometimes showing RunOver when they should not due to a variable not resetting after being runover. @oiad
[FIXED] CFGMoves/Animation CTD on server. @icomrade Thanks Choc for reporting
[FIXED] DayZ_RollingMessage FPS impact. #1926 @BigEgg17
[FIXED] Random skin selection on new character creation with DZE_defaultSkin = [["Male skin1","Male skin2"],["Female skin1","Female skin2"]];
[FIXED] Corpse markers are now deleted for bodies that are hidden.
[FIXED] Unable to eat FoodPumpkin
[FIXED] Unable to sell classic 'ItemBloodbag' at traders @oiad
[FIXED] Unable to sell upgraded _DZE[1-4] vehicle variants if their base vehicle class is removed from the trader configs
[FIXED] The player building a shed, tent or other unlocked storage was unable to use its gear and M240 nests were non-functional until relog when DZE_GodModeBase=true; @oiad
[FIXED] Death message killer inaccurate when player is caused to bleed by one unit and then killed by a different unit shortly after. @oiad
[FIXED] Group saving issue which could potentially join a player to a random group or not save group properly after death.
[FIXED] Harvested pumpkin, sunflower, and hemp plants no longer respawn after relog (allowed infinite harvesting).
[FIXED] Multiple players can no longer harvest the same plant at once. #1928 @F507DMT
[FIXED] Purchased boats sometimes not spawning on helipad even when it is free of obstructions.
[FIXED] Unable to fill water at some ponds and wells on Napf and Namalsk due to missing or misplaced waterHoleProxy.
[FIXED] Potential undefined error for dayz_characterID on login. @oiad
[FIXED] Actions like cook, gather meat, repair, etc. are now interrupted properly if the player vaults, moves or enters a vehicle during the medic animation. #1942 @SmokeyBR
[FIXED] Readded crossbow reload sound
[FIXED] Using setDamage or setHit to kill a player via script will no longer cause a double death.
[FIXED] The dramatic recoil camera shake effect from a nearby bullet hit is now reset correctly instead of remaining permanent.
[FIXED] Added temporary fix for missing AS50 ammo error with beta branch core patch. #1955 @AirwavesMan
[FIXED] Melee and tranquilizer bolt knockouts were usually instant or far shorter than the intended time of 20s-80s.
[FIXED] Multiple dupe fixes - SERVER ADMINS, DO NOT IMPLEMENT SCRIPTS WHICH KICK PLAYERS TO THE LOBBY (ENDMISSION, FAILMISSION, etc.), YOU MUST KICK THEM ENTIRELY OUT OF THE SERVER! (EX: by BE restriction, but with the stock scripts.txt forceEnd, failmission, and endmission should kick the player anyway)
[FIXED] Certain classes (i.e. Satchel Charge) which are both magazines and weapons were not retained through skin change #1981 @AirwavesMan
[FIXED] Blocked another A2OA script execution bug from improperly cleared eventhandlers. See dayz_code\system\antihack.sqf. Thanks to Dihan for reporting
[FIXED] Missing shadows on some _DZ weapons. Thanks @Streatman
[FIXED] Launchers and launcher ammo are now detected correctly in the sell menu when a player has a launcher and ammo with the same classname.
[FIXED] Wrong bleeding icon on Epoch legacy status UI
[FIXED] A locked door can now be auto unlocked right after placement by the player who built it
[FIXED] A rare error in keyboard.sqf for certain combination binds.
[FIXED] Floating loot positions in hotel (Land_HouseB_Tenement)
[FIXED] Updates to humanity and player stats after a skin change not always saving in hive (server_getDiff)
[FIXED] Bad vehicle type crew error for RHIB2Turret on A2OA main menu intro scene
[FIXED] Fresh spawns running on login if they died while running
[FIXED] Death camera height incorrect when player dies above terrain level
[FIXED] Duplicate weapon error when player dies with the same weapon in hands and on back
[FIXED] Vehicle getOut event handler no longer runs on M240 Nest and other static weapons.
[FIXED] Autorun no longer freezes players when they spam the key or attempt to reactivate it near a body of water.
[NOTE] Fixes below were included in hotfix 1.0.6.1A (March 10th 2017) and are now in the default files.
[FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions.
[FIXED] Glitch where group icons scaled very large momentarily while moving off screen.
[NEW] Added temporary check for mission file overwrite exploit. This can be removed after Bohemia patches it.
[INFO] Server admins must update HiveExt.dll.
[INFO] HiveExt.dll has been updated to return character_data duration in the 101 call for the dayz_survived stat. Source is available at github.com/vbawol/DayZhiveEpoch/pull/13 @icomrade
[INFO] HiveExt.dll REQUIRES A NEW PROCEDURE BE ADDED TO YOUR DATABASE FOR IMPROVED VEHICLE/OBJECT SPAWNING LOGIC, SEE 1.0.6.2_UPDATES.SQL!
[INFO] The server config directory should be located outside the server's A2OA directory for security. This is now done in the example server configs by default.
[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.

21
CHANGE LOG 1.0.6.3.txt Normal file
View File

@@ -0,0 +1,21 @@
[NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty @oiad
[NEW] Added 93 new zombie models with loot groups and strings for Server Admins @Airwavesman
[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5)
[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob
[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997)
[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da)
[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a)
[FIXED] Player could shoot during unconscious wake up animation (634a01a)
[FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad @AirwavesMan
[FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly
[FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227)
[FIXED] Disabled Arma's automatic vehicle refuel, repair and rearm at WarfareBVehicleServicePoint buildings (2c4f06c) @dihan48
[FIXED] DistanceFoot database stat was incorrect. @dihan48
[FIXED] Wrong cargo count of Refuel Trucks after last Corepatch. @AirwavesMan
[UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_
[UPDATED] Added notification when status icons are disabled
[UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch
[INFO] Synced with DayZMod upstream up to commit fe063a8

View File

@@ -1,88 +0,0 @@
[NEW] Fully updated to DayZ 1.8.7 base @icomrade @ebaydayz
[NEW] 1.8.7 attachments system, community weapons and buildable base objects
[NEW] 1.8.7 journal and crafting menu are now functional (default 'J' key)
[NEW] 1.8.7 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
[NEW] 1.8.7 weapon switching system and hotkeys (1 = primary, 2 = pistol, 3 = melee)
[NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf
[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz
[NEW] 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 @ebaydayz
[NEW] Autorun hotkey (0 = Toggle auto run) @ebaydayz
[NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix
[NEW] Auto login when a player joins the server, default 10 seconds, requires description.ext update in the mission (disable in description.ext by setting defValueParam1 = 31;) @icomrade
[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable
[NEW] Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable
[NEW] Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable @ebaydayz
[NEW] Match stick counting is disabled by default. Set dayz_matchboxCount = true; in init.sqf to enable @ebaydayz
[NEW] Tool breaking is disabled by default. Set dayz_toolBreaking = true; in init.sqf to enable @ebaydayz
[NEW] Water bottle breaking is disabled by default. Set dayz_waterBottleBreaking = true; in init.sqf to enable @ebaydayz
[NEW] Dayz_townGenerator = true; in init.sqf can enable vanilla map junk in addition to Epoch DynamicDebris. Only works on Chernarus. @ebaydayz
[NEW] DB Backup script. @RimBlock
[NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
[NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
[NEW] UI Update - Graphical and code changes, enable using DZE_UI = "dark"; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/
[NEW] Upgraded (_DZE1,2,3,4) ArmoredSUV and Kamaz classes are now available. #1518 #1538 @McKeighan
[NEW] Added waves effect during stormy weather #974 @FramedYannick @ebaydayz
[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebaydayz
[CHANGED] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt @ebaydayz
[CHANGED] Several weapon, item and tool classnames changed. Admins see SQL\1.0.6_Updates @ebaydayz
[CHANGED] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
[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 replaced with the more reliable uiSleep @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. @ebaydayz
[CHANGED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebaydayz
[FIXED] Zombies now target and attack players correctly with 1.8.7 code
[FIXED] Server position sync bug after falling unconscious #1522 @ebaydayz
[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] Fire cleanup diag_log error in server_functions.sqf #1421 @ebaydayz
[FIXED] NearestObjects position error in server_playerSync.sqf #1425 @ebaydayz
[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
[FIXED] Some counts reverted to forEach. Count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
[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 @ebaydayz
[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 @ebaydayz
[FIXED] DarkUI hunger and thirst inconsistency with vanilla UI and health system @SplenectomY @icomrade #1622
[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 @ebaydayz #1313
[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebaydayz #1514
[FIXED] Smoke countermeasures are now visible @Markokil321 @icomrade #1440
[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebaydayz #1613
[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebaydayz #1599
[FIXED] Safes and lockboxes wiped when opening after restart and locking not being logged to RPT @ebaydayz #1413 #1503
[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts @ebaydayz #1504
[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebaydayz
[FIXED] Reworked death messages. Fixed messages not always showing, undefined errors and wrong distance bug. Added bled out, killed by zombie, etc. MPHit event handler (fnc_plyrHit) is no longer needed. @ebaydayz
[FIXED] Player no longer hears radiation sound when changing clothes. @ebaydayz
[UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > 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.5_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
[INFO] Auto login does not force a player who aborted from the game, back to the lobby, to login
[INFO] (EXTREMELY IMPORTANT) Server owners MUST update their required build and beta to 131129
[INFO] Models/textures by Paul Tomany. @Sequisha.
[INFO] Special thanks to http://verthosting.com for hosting our development server.

View File

@@ -1,12 +1,14 @@
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
- fnc_usec_playerBleed --> fnc_usec_playerHandleBlood
- object_handleServerKilled --> vehicle_handleServerKilled
- object_setFixServer --> fnc_veh_setFixServer
- object_setFixServer --> fnc_veh_setFixServer
- server_timeSync --> sched_sync (moved to scheduler)
- vehicle_handleDamage --> fnc_veh_handleDam
- vehicle_handleKilled --> fnc_veh_handleKilled
@@ -14,13 +16,20 @@
- dayz_allowedObjects --> DayZ_SafeObjects
- dayz_CLBase --> dz_loot_groups (similar not identical)
- dayz_CLChances --> dz_loot_weighted (similar not identical)
- dayz_combat --> no longer exists use (player getVariable["combattimeout",0] >= diag_tickTime)
- dayz_combat --> no longer exists use (player getVariable["inCombat",false])
- dayz_fullMoonNights --> dayz_ForcefullmoonNights
- dayz_MapArea --> no longer exists (was only used for DynamicVehicleArea and HeliCrashArea)
- dayz_sellDistance_vehicle, dayz_sellDistance_boat, dayz_sellDistance_air --> Z_VehicleDistance
- dayz_updateObjects --> DayZ_GearedObjects
- DynamicVehicleArea --> (getMarkerSize "center") select 1
- DZE_ActionInProgress --> dayz_actionInProgress
- DZE_CanPickup --> canPickup
- DZE_trees --> dayz_trees
- freeTarget --> OpenTarget
- HeliCrashArea --> (getMarkerSize "crashsites") select 1
- PVDZE_serverObjectMonitor --> dayz_serverObjectMonitor
- r_action_count --> dayz_actionInProgress (now true/false instead of 1/0)
- selfTransfusionTime --> player getVariable ["LastTransfusion",-(DZE_selfTransfuse_Values select 2)]
- Duplicate public variables have been renamed:
- dayzPlayerLogin --> PVCDZ_plr_Login
@@ -38,7 +47,7 @@
- PVDZE_plr_Login --> PVDZ_plr_Login1
- PVDZE_plr_Login2 --> PVDZ_plr_Login2
- PVDZE_plr_LoginRecord --> PVDZ_plr_LoginRecord
- PVDZE_plr_Save --> PVDZ_plr_Save
- PVDZE_plr_Save --> PVDZ_plr_Save Note: 2nd param is now a nested array (was array) 4th param is now achievements array (was bool)
- PVDZE_plr_SetDate --> dayzSetDate
- PVDZE_send --> PVDZ_send
- PVDZE_Server_Simulation --> PVDZ_Server_Simulation
@@ -53,4 +62,4 @@
- usecEpi --> PVCDZ_hlt_Epi
- usecMorphine --> PVCDZ_hlt_Morphine
- usecPainK --> PVCDZ_hlt_PainK
- usecTransfuse --> PVCDZ_hlt_Transfuse
- usecTransfuse --> PVCDZ_hlt_Transfuse

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.

View File

@@ -0,0 +1,142 @@
[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.

View File

@@ -0,0 +1,772 @@
2S6M_Tunguska
2b14_82mm
2b14_82mm_CDF
2b14_82mm_CZ_EP1
2b14_82mm_GUE
2b14_82mm_INS
2b14_82mm_TK_EP1
2b14_82mm_TK_GUE_EP1
2b14_82mm_TK_INS_EP1
A10
A10_US_EP1
AAV
AGS_CDF
AGS_CZ_EP1
AGS_Ins
AGS_RU
AGS_TK_EP1
AGS_TK_GUE_EP1
AGS_TK_INS_EP1
AGS_UN_EP1
AH1Z
AH1Z_DZ
AH64D
AH64D_EP1
AH6J_EP1
AH6J_EP1_DZ
AH6J_EP1_DZE
AH6X_DZ
AH6X_EP1
AN2_2_DZ
AN2_DZ
ATV_CZ_EP1
ATV_US_EP1
AV8B
AV8B2
AW159_Lynx_BAF
An2_1_TK_CIV_EP1
An2_2_TK_CIV_EP1
An2_2_TK_CIV_EP1_DZ
An2_TK_EP1
ArmoredSUV_PMC
ArmoredSUV_PMC_DZ
ArmoredSUV_PMC_DZE
ArmoredSUV_PMC_DZE1
ArmoredSUV_PMC_DZE2
ArmoredSUV_PMC_DZE3
ArmoredSUV_PMC_DZE4
BAF_ATV_D
BAF_ATV_W
BAF_Apache_AH1_D
BAF_FV510_D
BAF_FV510_W
BAF_GMG_Tripod_D
BAF_GMG_Tripod_W
BAF_GMG_Tripod_W_NoDisassembly
BAF_GPMG_Minitripod_D
BAF_GPMG_Minitripod_W
BAF_GPMG_Minitripod_W_NoDisassembly
BAF_Jackal2_GMG_D
BAF_Jackal2_GMG_W
BAF_Jackal2_L2A1_D
BAF_Jackal2_L2A1_W
BAF_L2A1_Minitripod_D
BAF_L2A1_Minitripod_W
BAF_L2A1_Minitripod_W_NoDisassembly
BAF_L2A1_Tripod_D
BAF_L2A1_Tripod_W
BAF_L2A1_Tripod_W_NoDisassembly
BAF_Merlin_DZE
BAF_Merlin_HC3_D
BAF_Offroad_D
BAF_Offroad_W
BMP2_Ambul_CDF
BMP2_Ambul_INS
BMP2_CDF
BMP2_Gue
BMP2_HQ_CDF
BMP2_HQ_INS
BMP2_HQ_TK_EP1
BMP2_INS
BMP2_TK_EP1
BMP2_UN_EP1
BMP3
BRDM2_ATGM_CDF
BRDM2_ATGM_INS
BRDM2_ATGM_TK_EP1
BRDM2_CDF
BRDM2_Gue
BRDM2_HQ_Gue
BRDM2_HQ_TK_GUE_EP1
BRDM2_HQ_TK_GUE_EP1_DZ
BRDM2_INS
BRDM2_TK_EP1
BRDM2_TK_GUE_EP1
BTR40_MG_TK_GUE_EP1
BTR40_MG_TK_INS_EP1
BTR40_TK_GUE_EP1
BTR40_TK_INS_EP1
BTR60_TK_EP1
BTR90
BTR90_DZ
BTR90_DZE
BTR90_HQ
BTR90_HQ_DZ
BTR90_HQ_DZE
C130J
C130J_US_EP1
C130J_US_EP1_DZ
CDF_WarfareBMGNest_PK
CH53_DZE
CH_47F_BAF
CH_47F_EP1
CH_47F_EP1_DZ
CH_47F_EP1_DZE
CSJ_GyroC
CSJ_GyroCover
CSJ_GyroP
Chukar
Chukar_EP1
D30_CDF
D30_Ins
D30_RU
D30_TK_EP1
D30_TK_GUE_EP1
D30_TK_INS_EP1
DSHKM_CDF
DSHKM_CZ_EP1
DSHKM_Gue
DSHKM_Ins
DSHKM_TK_GUE_EP1
DSHKM_TK_INS_EP1
DSHkM_Mini_TriPod
DSHkM_Mini_TriPod_CDF
DSHkM_Mini_TriPod_TK_GUE_EP1
DSHkM_Mini_TriPod_TK_INS_EP1
F35B
Fishing_Boat
Fort_Nest_M240
GAZ_Vodnik
GAZ_Vodnik_DZ
GAZ_Vodnik_DZE
GAZ_Vodnik_HMG
GAZ_Vodnik_MedEvac
GLT_M300_LT
GLT_M300_ST
GNT_C185
GNT_C185C
GNT_C185C_DZ
GNT_C185E
GNT_C185F
GNT_C185R
GNT_C185R_DZ
GNT_C185T
GNT_C185U
GNT_C185U_DZ
GNT_C185_DZ
GRAD_CDF
GRAD_INS
GRAD_RU
GRAD_TK_EP1
GUE_WarfareBMGNest_PK
HMMWV
HMMWV_Ambulance
HMMWV_Ambulance_CZ_DES_EP1
HMMWV_Ambulance_DES_EP1
HMMWV_Armored
HMMWV_Armored_DZ
HMMWV_Avenger
HMMWV_Avenger_DES_EP1
HMMWV_DES_EP1
HMMWV_DZ
HMMWV_M1035_DES_EP1
HMMWV_M1151_M2_CZ_DES_EP1
HMMWV_M1151_M2_CZ_DES_EP1_DZ
HMMWV_M1151_M2_CZ_DES_EP1_DZE
HMMWV_M1151_M2_DES_EP1
HMMWV_M2
HMMWV_M2_DZ
HMMWV_M998A2_SOV_DES_EP1
HMMWV_M998A2_SOV_DES_EP1_DZ
HMMWV_M998A2_SOV_DES_EP1_DZE
HMMWV_M998_crows_M2_DES_EP1
HMMWV_M998_crows_MK19_DES_EP1
HMMWV_MK19
HMMWV_MK19_DES_EP1
HMMWV_TOW
HMMWV_TOW_DES_EP1
HMMWV_Terminal_EP1
Igla_AA_pod_East
Igla_AA_pod_TK_EP1
Ikarus
Ikarus_TK_CIV_EP1
Ins_WarfareBMGNest_PK
JetSkiYanahui_Blue
JetSkiYanahui_Green
JetSkiYanahui_Red
JetSkiYanahui_Yellow
KORD
KORD_TK_EP1
KORD_UN_EP1
KORD_high
KORD_high_TK_EP1
KORD_high_UN_EP1
Ka137_MG_PMC
Ka137_PMC
Ka52
Ka52Black
Ka60_GL_PMC
Ka60_PMC
Kamaz
KamazOpen
KamazOpen_DZE
KamazOpen_DZE1
KamazOpen_DZE2
KamazOpen_DZE3
KamazOpen_DZE4
KamazReammo
KamazRefuel
KamazRefuel_DZ
KamazRefuel_DZE1
KamazRefuel_DZE2
KamazRefuel_DZE3
KamazRefuel_DZE4
KamazRepair
Kamaz_DZE
Kamaz_DZE1
Kamaz_DZE2
Kamaz_DZE3
Kamaz_DZE4
L39_TK_EP1
LAV25
LAV25_DZ
LAV25_DZE
LAV25_HQ
LAV25_HQ_DZ
LAV25_HQ_DZE
Lada1
Lada1_DZE1
Lada1_DZE2
Lada1_DZE3
Lada1_DZE4
Lada1_TK_CIV_EP1
Lada1_TK_CIV_EP1_DZE1
Lada1_TK_CIV_EP1_DZE2
Lada1_TK_CIV_EP1_DZE3
Lada1_TK_CIV_EP1_DZE4
Lada2
Lada2_DZE1
Lada2_DZE2
Lada2_DZE3
Lada2_DZE4
Lada2_TK_CIV_EP1
Lada2_TK_CIV_EP1_DZE1
Lada2_TK_CIV_EP1_DZE2
Lada2_TK_CIV_EP1_DZE3
Lada2_TK_CIV_EP1_DZE4
LadaLM
LadaLM_DZE1
LadaLM_DZE2
LadaLM_DZE3
LadaLM_DZE4
LandRover_CZ_EP1
LandRover_MG_TK_EP1
LandRover_MG_TK_EP1_DZ
LandRover_MG_TK_EP1_DZE
LandRover_MG_TK_INS_EP1
LandRover_SPG9_TK_EP1
LandRover_SPG9_TK_INS_EP1
LandRover_Special_CZ_EP1
LandRover_Special_CZ_EP1_DZ
LandRover_Special_CZ_EP1_DZE
LandRover_TK_CIV_EP1
M1030
M1030_US_DES_EP1
M1126_ICV_M2_EP1
M1126_ICV_mk19_EP1
M1128_MGS_EP1
M1129_MC_EP1
M1130_CV_EP1
M1133_MEV_EP1
M1135_ATGMV_EP1
M113Ambul_TK_EP1
M113Ambul_TK_EP1_DZ
M113Ambul_UN_EP1
M113Ambul_UN_EP1_DZ
M113_PMC
M113_TK_EP1
M113_TK_EP1_DZ
M113_TK_EP1_DZE
M113_UN_EP1
M113_UN_EP1_DZ
M113_UN_EP1_DZE
M119
M119_US_EP1
M1A1
M1A1_US_DES_EP1
M1A2_TUSK_MG
M1A2_US_TUSK_MG_EP1
M240Nest_DZ
M252
M252_US_EP1
M2A2_EP1
M2A3_EP1
M2HD_mini_TriPod
M2HD_mini_TriPod_US_EP1
M2StaticMG
M2StaticMG_US_EP1
M6_EP1
MAZ_543_SCUD_TK_EP1
MH60S
MH60S_DZ
MH60S_DZE
MH6J_DZ
MH6J_EP1
MK19_TriPod
MK19_TriPod_US_EP1
MLRS
MLRS_DES_EP1
MMT_Civ
MMT_USMC
MQ9PredatorB
MQ9PredatorB_US_EP1
MTVR
MTVR_DES_EP1
MV22
MV22_DZ
Metis
Metis_TK_EP1
Mi171Sh_CZ_EP1
Mi171Sh_CZ_EP1_DZ
Mi171Sh_rockets_CZ_EP1
Mi17_CDF
Mi17_CDF_DZ
Mi17_CDF_DZE
Mi17_Civilian
Mi17_Civilian_DZ
Mi17_DZ
Mi17_DZE
Mi17_Ins
Mi17_TK_EP1
Mi17_TK_EP1_DZ
Mi17_TK_EP1_DZE
Mi17_UN_CDF_EP1
Mi17_UN_CDF_EP1_DZ
Mi17_UN_CDF_EP1_DZE
Mi17_medevac_CDF
Mi17_medevac_CDF_DZ
Mi17_medevac_Ins
Mi17_medevac_Ins_DZ
Mi17_medevac_RU
Mi17_medevac_RU_DZ
Mi17_rockets_RU
Mi24_D
Mi24_D_TK_EP1
Mi24_P
Mi24_V
MtvrReammo
MtvrReammo_DES_EP1
MtvrRefuel
MtvrRefuel_DES_EP1
MtvrRefuel_DES_EP1_DZ
MtvrRefuel_DZ
MtvrRepair
MtvrRepair_DES_EP1
MtvrSalvage_DES_EP1
MtvrSupply_DES_EP1
Offroad_DSHKM_Gue
Offroad_DSHKM_Gue_DZ
Offroad_DSHKM_Gue_DZE
Offroad_DSHKM_Gue_DZE1
Offroad_DSHKM_Gue_DZE2
Offroad_DSHKM_Gue_DZE3
Offroad_DSHKM_Gue_DZE4
Offroad_DSHKM_INS
Offroad_DSHKM_TK_GUE_EP1
Offroad_SPG9_Gue
Offroad_SPG9_TK_GUE_EP1
Old_bike_TK_CIV_EP1
Old_bike_TK_INS_EP1
Old_moto_TK_Civ_EP1
PBX
Pchela1T
Pickup_PK_GUE
Pickup_PK_GUE_DZ
Pickup_PK_GUE_DZE
Pickup_PK_GUE_DZE1
Pickup_PK_GUE_DZE2
Pickup_PK_GUE_DZE3
Pickup_PK_GUE_DZE4
Pickup_PK_INS
Pickup_PK_INS_DZ
Pickup_PK_INS_DZE
Pickup_PK_INS_DZE1
Pickup_PK_INS_DZE2
Pickup_PK_INS_DZE3
Pickup_PK_INS_DZE4
Pickup_PK_TK_GUE_EP1
Pickup_PK_TK_GUE_EP1_DZ
Pickup_PK_TK_GUE_EP1_DZE
Pickup_PK_TK_GUE_EP1_DZE1
Pickup_PK_TK_GUE_EP1_DZE2
Pickup_PK_TK_GUE_EP1_DZE3
Pickup_PK_TK_GUE_EP1_DZE4
RHIB
RHIB2Turret
RHIB_DZ
RU_WarfareBMGNest_PK
S1203_TK_CIV_EP1
S1203_ambulance_EP1
SPG9_CDF
SPG9_Gue
SPG9_Ins
SPG9_TK_GUE_EP1
SPG9_TK_INS_EP1
SUV_Blue
SUV_Blue_DZE1
SUV_Blue_DZE2
SUV_Blue_DZE3
SUV_Blue_DZE4
SUV_Camo
SUV_Camo_DZE1
SUV_Camo_DZE2
SUV_Camo_DZE3
SUV_Camo_DZE4
SUV_Charcoal
SUV_Charcoal_DZE1
SUV_Charcoal_DZE2
SUV_Charcoal_DZE3
SUV_Charcoal_DZE4
SUV_DZ
SUV_Green
SUV_Green_DZE1
SUV_Green_DZE2
SUV_Green_DZE3
SUV_Green_DZE4
SUV_Orange
SUV_Orange_DZE1
SUV_Orange_DZE2
SUV_Orange_DZE3
SUV_Orange_DZE4
SUV_PMC
SUV_PMC_BAF
SUV_Pink
SUV_Pink_DZE1
SUV_Pink_DZE2
SUV_Pink_DZE3
SUV_Pink_DZE4
SUV_Red
SUV_Red_DZE1
SUV_Red_DZE2
SUV_Red_DZE3
SUV_Red_DZE4
SUV_Silver
SUV_Silver_DZE1
SUV_Silver_DZE2
SUV_Silver_DZE3
SUV_Silver_DZE4
SUV_TK_CIV_EP1
SUV_TK_CIV_EP1_DZE1
SUV_TK_CIV_EP1_DZE2
SUV_TK_CIV_EP1_DZE3
SUV_TK_CIV_EP1_DZE4
SUV_TK_EP1
SUV_UN_EP1
SUV_White
SUV_White_DZE1
SUV_White_DZE2
SUV_White_DZE3
SUV_White_DZE4
SUV_Yellow
SUV_Yellow_DZE1
SUV_Yellow_DZE2
SUV_Yellow_DZE3
SUV_Yellow_DZE4
SeaFox
SeaFox_EP1
SearchLight
SearchLight_CDF
SearchLight_Gue
SearchLight_INS
SearchLight_RUS
SearchLight_TK_EP1
SearchLight_TK_GUE_EP1
SearchLight_TK_INS_EP1
SearchLight_UN_EP1
SearchLight_US_EP1
Skoda
SkodaBlue
SkodaBlue_DZE1
SkodaBlue_DZE2
SkodaBlue_DZE3
SkodaBlue_DZE4
SkodaGreen
SkodaGreen_DZE1
SkodaGreen_DZE2
SkodaGreen_DZE3
SkodaGreen_DZE4
SkodaRed
SkodaRed_DZE1
SkodaRed_DZE2
SkodaRed_DZE3
SkodaRed_DZE4
Skoda_DZE1
Skoda_DZE2
Skoda_DZE3
Skoda_DZE4
Smallboat_1
Stinger_Pod
Stinger_Pod_US_EP1
Su25_CDF
Su25_Ins
Su25_TK_EP1
Su34
Su39
T34
T34_TK_EP1
T34_TK_GUE_EP1
T55_TK_EP1
T55_TK_GUE_EP1
T72_CDF
T72_Gue
T72_INS
T72_RU
T72_TK_EP1
T90
TOW_TriPod
TOW_TriPod_US_EP1
TT650_Civ
TT650_Gue
TT650_Ins
TT650_TK_CIV_EP1
TT650_TK_EP1
TowingTractor
Tractor
UAZ_AGS30_CDF
UAZ_AGS30_INS
UAZ_AGS30_RU
UAZ_AGS30_TK_EP1
UAZ_CDF
UAZ_CDF_DZE1
UAZ_CDF_DZE2
UAZ_CDF_DZE3
UAZ_CDF_DZE4
UAZ_INS
UAZ_INS_DZE1
UAZ_INS_DZE2
UAZ_INS_DZE3
UAZ_INS_DZE4
UAZ_MG_CDF
UAZ_MG_INS
UAZ_MG_TK_EP1
UAZ_MG_TK_EP1_DZ
UAZ_MG_TK_EP1_DZE
UAZ_RU
UAZ_RU_DZE1
UAZ_RU_DZE2
UAZ_RU_DZE3
UAZ_RU_DZE4
UAZ_SPG9_INS
UAZ_Unarmed_TK_CIV_EP1
UAZ_Unarmed_TK_CIV_EP1_DZE1
UAZ_Unarmed_TK_CIV_EP1_DZE2
UAZ_Unarmed_TK_CIV_EP1_DZE3
UAZ_Unarmed_TK_CIV_EP1_DZE4
UAZ_Unarmed_TK_EP1
UAZ_Unarmed_TK_EP1_DZE1
UAZ_Unarmed_TK_EP1_DZE2
UAZ_Unarmed_TK_EP1_DZE3
UAZ_Unarmed_TK_EP1_DZE4
UAZ_Unarmed_UN_EP1
UAZ_Unarmed_UN_EP1_DZE1
UAZ_Unarmed_UN_EP1_DZE2
UAZ_Unarmed_UN_EP1_DZE3
UAZ_Unarmed_UN_EP1_DZE4
UH1H_2_DZ
UH1H_2_DZE
UH1H_DZ
UH1H_DZE
UH1H_TK_EP1
UH1H_TK_GUE_EP1
UH1Y
UH1Y_DZ
UH1Y_DZE
UH60M_EP1
UH60M_EP1_DZ
UH60M_EP1_DZE
UH60M_MEV_EP1
UH60M_MEV_EP1_DZ
USEC_ch53_E
USMC_WarfareBMGNest_M240
UralCivil
UralCivil2
UralCivil2_DZE
UralCivil_DZ
UralCivil_DZE
UralOpen_CDF
UralOpen_INS
UralReammo_CDF
UralReammo_INS
UralReammo_TK_EP1
UralRefuel_CDF
UralRefuel_INS
UralRefuel_TK_EP1
UralRefuel_TK_EP1_DZ
UralRepair_CDF
UralRepair_INS
UralRepair_TK_EP1
UralSalvage_TK_EP1
UralSupply_TK_EP1
Ural_CDF
Ural_INS
Ural_TK_CIV_EP1
Ural_UN_EP1
Ural_ZU23_CDF
Ural_ZU23_Gue
Ural_ZU23_INS
Ural_ZU23_TK_EP1
Ural_ZU23_TK_GUE_EP1
V3S_Civ
V3S_Gue
V3S_Open_TK_CIV_EP1
V3S_Open_TK_EP1
V3S_RA_TK_GUE_EP1_DZE
V3S_Reammo_TK_GUE_EP1
V3S_Refuel_TK_GUE_EP1
V3S_Refuel_TK_GUE_EP1_DZ
V3S_Repair_TK_GUE_EP1
V3S_Salvage_TK_GUE_EP1
V3S_Supply_TK_GUE_EP1
V3S_TK_EP1
V3S_TK_EP1_DZE
V3S_TK_GUE_EP1
VWGolf
VWGolf_DZE1
VWGolf_DZE2
VWGolf_DZE3
VWGolf_DZE4
VolhaLimo_TK_CIV_EP1
VolhaLimo_TK_CIV_EP1_DZE1
VolhaLimo_TK_CIV_EP1_DZE2
VolhaLimo_TK_CIV_EP1_DZE3
VolhaLimo_TK_CIV_EP1_DZE4
Volha_1_TK_CIV_EP1
Volha_1_TK_CIV_EP1_DZE1
Volha_1_TK_CIV_EP1_DZE2
Volha_1_TK_CIV_EP1_DZE3
Volha_1_TK_CIV_EP1_DZE4
Volha_2_TK_CIV_EP1
Volha_2_TK_CIV_EP1_DZE1
Volha_2_TK_CIV_EP1_DZE2
Volha_2_TK_CIV_EP1_DZE3
Volha_2_TK_CIV_EP1_DZE4
WarfareBMGNest_M240_US_EP1
WarfareBMGNest_PK_TK_EP1
WarfareBMGNest_PK_TK_GUE_EP1
WarfareReammoTruck_CDF
WarfareReammoTruck_Gue
WarfareReammoTruck_INS
WarfareReammoTruck_RU
WarfareReammoTruck_USMC
WarfareRepairTruck_Gue
WarfareSalvageTruck_CDF
WarfareSalvageTruck_Gue
WarfareSalvageTruck_INS
WarfareSalvageTruck_RU
WarfareSalvageTruck_USMC
WarfareSupplyTruck_CDF
WarfareSupplyTruck_Gue
WarfareSupplyTruck_INS
WarfareSupplyTruck_RU
WarfareSupplyTruck_USMC
ZSU_CDF
ZSU_INS
ZSU_TK_EP1
ZU23_CDF
ZU23_Gue
ZU23_Ins
ZU23_TK_EP1
ZU23_TK_GUE_EP1
ZU23_TK_INS_EP1
Zodiac
car_hatchback
car_hatchback_DZE1
car_hatchback_DZE2
car_hatchback_DZE3
car_hatchback_DZE4
car_sedan
car_sedan_DZE1
car_sedan_DZE2
car_sedan_DZE3
car_sedan_DZE4
datsun1_civil_1_open
datsun1_civil_1_open_DZE
datsun1_civil_1_open_DZE1
datsun1_civil_1_open_DZE2
datsun1_civil_1_open_DZE3
datsun1_civil_1_open_DZE4
datsun1_civil_2_covered
datsun1_civil_2_covered_DZE
datsun1_civil_2_covered_DZE1
datsun1_civil_2_covered_DZE2
datsun1_civil_2_covered_DZE3
datsun1_civil_2_covered_DZE4
datsun1_civil_3_open
datsun1_civil_3_open_DZE
datsun1_civil_3_open_DZE1
datsun1_civil_3_open_DZE2
datsun1_civil_3_open_DZE3
datsun1_civil_3_open_DZE4
hilux1_civil_1_open
hilux1_civil_1_open_DZE
hilux1_civil_1_open_DZE1
hilux1_civil_1_open_DZE2
hilux1_civil_1_open_DZE3
hilux1_civil_1_open_DZE4
hilux1_civil_2_covered
hilux1_civil_2_covered_DZE
hilux1_civil_2_covered_DZE1
hilux1_civil_2_covered_DZE2
hilux1_civil_2_covered_DZE3
hilux1_civil_2_covered_DZE4
hilux1_civil_3_open
hilux1_civil_3_open_DZE
hilux1_civil_3_open_DZE1
hilux1_civil_3_open_DZE2
hilux1_civil_3_open_DZE3
hilux1_civil_3_open_DZE4
hilux1_civil_3_open_EP1
pook_H13_amphib
pook_H13_amphib_CDF
pook_H13_amphib_CIV
pook_H13_amphib_CIV_RU
pook_H13_amphib_GUE
pook_H13_amphib_INS
pook_H13_amphib_PMC
pook_H13_amphib_TAK
pook_H13_amphib_UNO
pook_H13_civ
pook_H13_civ_black
pook_H13_civ_ru
pook_H13_civ_ru_black
pook_H13_civ_ru_slate
pook_H13_civ_ru_white
pook_H13_civ_ru_yellow
pook_H13_civ_slate
pook_H13_civ_white
pook_H13_civ_yellow
pook_H13_gunship
pook_H13_gunship_CDF
pook_H13_gunship_GUE
pook_H13_gunship_INS
pook_H13_gunship_PMC
pook_H13_gunship_TAK
pook_H13_gunship_UNO
pook_H13_medevac
pook_H13_medevac_CDF
pook_H13_medevac_CIV
pook_H13_medevac_CIV_RU
pook_H13_medevac_GUE
pook_H13_medevac_INS
pook_H13_medevac_PMC
pook_H13_medevac_TAK
pook_H13_medevac_UNO
pook_H13_transport
pook_H13_transport_CDF
pook_H13_transport_GUE
pook_H13_transport_INS
pook_H13_transport_PMC
pook_H13_transport_TAK
pook_H13_transport_UNO
smallboat_2
tractorOld

View File

@@ -0,0 +1,490 @@
AA12_PMC
AK74_DZ
AK74_GL_DZ
AK74_GL_Kobra_DZ
AK74_GL_Kobra_SD_DZ
AK74_GL_PSO1_DZ
AK74_GL_PSO1_SD_DZ
AK74_GL_SD_DZ
AK74_Kobra_DZ
AK74_Kobra_SD_DZ
AK74_PSO1_DZ
AK74_PSO1_SD_DZ
AK74_SD_DZ
AKM_DZ
AKM_Kobra_DZ
AKM_PSO1_DZ
AKS74U_DZ
AKS74U_Kobra_DZ
AKS74U_Kobra_SD_DZ
AKS74U_SD_DZ
AKS_74
AKS_74_GOSHAWK
AKS_74_NSPU
AKS_74_U
AKS_74_UN_kobra
AKS_74_kobra
AKS_74_pso
AKS_GOLD
AK_107_GL_kobra
AK_107_GL_pso
AK_107_kobra
AK_107_pso
AK_47_M
AK_47_S
AK_74
AK_74_GL
AK_74_GL_kobra
Anzio_20
Anzio_20_DZ
BAF_AS50_TWS
BAF_AS50_scoped
BAF_AS50_scoped_DZ
BAF_L110A1_Aim_DZE
BAF_L110A1_Aim_Small
BAF_L7A2_GPMG_Small
BAF_L85A2_RIS_ACOG
BAF_L85A2_RIS_CWS
BAF_L85A2_RIS_Holo
BAF_L85A2_RIS_SUSAT
BAF_L85A2_RIS_TWS_DZ
BAF_L85A2_UGL_ACOG
BAF_L85A2_UGL_Holo
BAF_L85A2_UGL_SUSAT
BAF_L86A2_ACOG
BAF_LRR_scoped
BAF_LRR_scoped_W
BAF_NLAW_Launcher
Binocular
Binocular_Vector
Bizon_DZ
Bizon_SD_DZ
CDF_dogtags
CZ550_DZ
ChainSaw
ChainSawB
ChainSawG
ChainSawP
ChainSawR
Cobalt_File
Colt1911
Crossbow_CCO_DZ
Crossbow_CCO_FL_DZ
Crossbow_CCO_MFL_DZ
Crossbow_DZ
Crossbow_FL_DZ
Crossbow_MFL_DZ
Crossbow_Scope_DZ
Crossbow_Scope_FL_DZ
Crossbow_Scope_MFL_DZ
DMR
DMR_DZ
DMR_Gh_DZ
DMR_SKN
Document_Military_DZE
Document_Random_DZE
Document_Topsecret_DZE
EvDogTags
EvKobalt
EvMap
EvMoney
EvMoscow
EvPhoto
FNFAL_ANPVS4_DZ
FNFAL_CCO_DZ
FNFAL_DZ
FNFAL_Holo_DZ
FN_FAL
FN_FAL_ANPVS4
FN_FAL_ANPVS4_DZE
G17_DZ
G17_FL_DZ
G17_MFL_DZ
G17_SD_DZ
G17_SD_FL_DZ
G17_SD_MFL_DZ
G36A_Camo_DZ
G36A_camo
G36C
G36C_ACOG_DZ
G36C_ACOG_SD_DZ
G36C_CCO_DZ
G36C_CCO_SD_DZ
G36C_DZ
G36C_Holo_DZ
G36C_Holo_SD_DZ
G36C_SD_DZ
G36C_camo
G36K
G36K_Camo_DZ
G36K_Camo_SD_DZ
G36K_camo
G36_C_SD_camo
G36_C_SD_eotech
G36a
Igla
ItemCompass
ItemCrowbar
ItemCrowbarBent
ItemDIY_Gate
ItemDIY_metal
ItemDIY_wood
ItemEtool
ItemFishingPole
ItemFlashlight
ItemFlashlightRed
ItemGPS
ItemHatchet
ItemHatchetBroken
ItemKeyKit
ItemKnife
ItemKnife1
ItemKnife2
ItemKnife3
ItemKnife4
ItemKnife5
ItemKnifeBlunt
ItemMachete
ItemMap
ItemMap_Debug
ItemMatchbox
ItemMatchboxEmpty
ItemPickaxe
ItemPickaxeBroken
ItemRadio
ItemShovel
ItemShovelBroken
ItemSledge
ItemSledgeHammer
ItemSledgeHammerBroken
ItemToolbox
ItemWatch
Javelin
KSVK_DZE
Kostey_map_case
Kostey_notebook
Kostey_photos
L110A1_CCO_DZ
L110A1_DZ
L110A1_Holo_DZ
L115A3_2_DZ
L115A3_DZ
L85A2_ACOG_DZ
L85A2_ACOG_FL_DZ
L85A2_ACOG_MFL_DZ
L85A2_ACOG_SD_DZ
L85A2_ACOG_SD_FL_DZ
L85A2_ACOG_SD_MFL_DZ
L85A2_CCO_DZ
L85A2_CCO_FL_DZ
L85A2_CCO_MFL_DZ
L85A2_CCO_SD_DZ
L85A2_CCO_SD_FL_DZ
L85A2_CCO_SD_MFL_DZ
L85A2_DZ
L85A2_FL_DZ
L85A2_Holo_DZ
L85A2_Holo_FL_DZ
L85A2_Holo_MFL_DZ
L85A2_Holo_SD_DZ
L85A2_Holo_SD_FL_DZ
L85A2_Holo_SD_MFL_DZ
L85A2_MFL_DZ
L85A2_SD_Base
L85A2_SD_DZ
L85A2_SD_FL_DZ
L85A2_SD_MFL_DZ
Laserdesignator
LeeEnfield
LeeEnfield_DZ
M1014
M1014_CCO_DZ
M1014_DZ
M1014_Holo_DZ
M110_NVG_EP1
M110_TWS_EP1
M136
M14_CCO_DZ
M14_CCO_Gh_DZ
M14_DZ
M14_EP1
M14_Gh_DZ
M14_Holo_DZ
M14_Holo_Gh_DZ
M16A2
M16A2GL
M16A2_DZ
M16A2_GL_DZ
M16A4_ACG_GL
M16A4_ACOG_DZ
M16A4_ACOG_FL_DZ
M16A4_ACOG_MFL_DZ
M16A4_CCO_DZ
M16A4_CCO_FL_DZ
M16A4_CCO_MFL_DZ
M16A4_DZ
M16A4_FL_DZ
M16A4_GL
M16A4_GL_ACOG_DZ
M16A4_GL_ACOG_FL_DZ
M16A4_GL_ACOG_MFL_DZ
M16A4_GL_CCO_DZ
M16A4_GL_CCO_FL_DZ
M16A4_GL_CCO_MFL_DZ
M16A4_GL_DZ
M16A4_GL_FL_DZ
M16A4_GL_Holo_DZ
M16A4_GL_Holo_FL_DZ
M16A4_GL_Holo_MFL_DZ
M16A4_GL_MFL_DZ
M16A4_Holo_DZ
M16A4_Holo_FL_DZ
M16A4_Holo_MFL_DZ
M16A4_MFL_DZ
M1911_DZ
M24
M240_CCO_DZ
M240_DZ
M240_Holo_DZ
M240_Small
M249_CCO_DZ
M249_DZ
M249_EP1_DZ
M249_EP1_Small
M249_Holo_DZ
M249_Small
M249_TWS_EP1_Small
M249_m145_EP1_DZE
M249_m145_EP1_Small
M24_DZ
M24_Gh_DZ
M24_des_EP1
M32_EP1
M40A3
M40A3_DZ
M40A3_Gh_DZ
M47Launcher_EP1
M4A1
M4A1_ACOG_DZ
M4A1_ACOG_FL_DZ
M4A1_ACOG_MFL_DZ
M4A1_ACOG_SD_DZ
M4A1_ACOG_SD_FL_DZ
M4A1_ACOG_SD_MFL_DZ
M4A1_AIM_SD_camo
M4A1_Aim
M4A1_Aim_camo
M4A1_CCO_DZ
M4A1_CCO_FL_DZ
M4A1_CCO_MFL_DZ
M4A1_CCO_SD_DZ
M4A1_CCO_SD_FL_DZ
M4A1_CCO_SD_MFL_DZ
M4A1_DZ
M4A1_FL_DZ
M4A1_GL_ACOG_DZ
M4A1_GL_ACOG_FL_DZ
M4A1_GL_ACOG_MFL_DZ
M4A1_GL_ACOG_SD_DZ
M4A1_GL_ACOG_SD_FL_DZ
M4A1_GL_ACOG_SD_MFL_DZ
M4A1_GL_CCO_DZ
M4A1_GL_CCO_FL_DZ
M4A1_GL_CCO_MFL_DZ
M4A1_GL_CCO_SD_DZ
M4A1_GL_CCO_SD_FL_DZ
M4A1_GL_CCO_SD_MFL_DZ
M4A1_GL_DZ
M4A1_GL_FL_DZ
M4A1_GL_Holo_DZ
M4A1_GL_Holo_FL_DZ
M4A1_GL_Holo_MFL_DZ
M4A1_GL_Holo_SD_DZ
M4A1_GL_Holo_SD_FL_DZ
M4A1_GL_Holo_SD_MFL_DZ
M4A1_GL_MFL_DZ
M4A1_GL_SD_DZ
M4A1_GL_SD_FL_DZ
M4A1_GL_SD_MFL_DZ
M4A1_HWS_GL
M4A1_HWS_GL_SD_Camo
M4A1_HWS_GL_camo
M4A1_Holo_DZ
M4A1_Holo_FL_DZ
M4A1_Holo_MFL_DZ
M4A1_Holo_SD_DZ
M4A1_Holo_SD_FL_DZ
M4A1_Holo_SD_MFL_DZ
M4A1_MFL_DZ
M4A1_RCO_GL
M4A1_SD_DZ
M4A1_SD_FL_DZ
M4A1_SD_MFL_DZ
M4A3_CCO_EP1
M4A3_RCO_GL_EP1
M4SPR
M4SPR_DZE
M60A4_EP1_DZE
M60A4_EP1_Small
M79_EP1
M9
M9SD
M9_DZ
M9_SD_DZ
MAAWS
MG36
MG36_camo
MP5A5
MP5SD
MP5_DZ
MP5_SD_DZ
MR43_DZ
Makarov
MakarovSD
Makarov_DZ
Makarov_SD_DZ
Manual_camera_DZE
Manual_electronics_DZE
Manual_repair_DZE
Map_Military_DZE
Map_Survivor_DZE
MeleeBaseBallBat
MeleeBaseBallBatBarbed
MeleeBaseBallBatNails
MeleeCrowbar
MeleeFishingPole
MeleeFlashlight
MeleeFlashlightRed
MeleeHatchet
MeleeMachete
MeleeSledge
MetisLauncher
Mk13_EP1
Mk48_CCO_DZ
Mk48_DZ
Mk48_Holo_DZ
Mk_48_DES_EP1_Small
Mk_48_Small
Moscow_Bombing_File
Mosin_BR_DZ
Mosin_Belt_DZ
Mosin_Belt_FL_DZ
Mosin_Belt_MFL_DZ
Mosin_DZ
Mosin_FL_DZ
Mosin_MFL_DZ
Mosin_PU_Belt_DZ
Mosin_PU_Belt_FL_DZ
Mosin_PU_Belt_MFL_DZ
Mosin_PU_DZ
Mosin_PU_FL_DZ
Mosin_PU_MFL_DZ
NVGoggles
NVGoggles_DZE
Notebook_bio_DZE
Notebook_che_DZE
Notebook_herbs_DZE
Notebook_phy_DZE
Notebook_secret_DZE
PDW_DZ
PKM_DZ
PK_Small
PMC_AS50_TWS
PMC_AS50_scoped
PMC_documents
Pecheneg_DZ
Pecheneg_Small
RPG18
RPG7V
RPK74_DZ
RPK74_Kobra_DZ
RPK74_PSO1_DZ
RPK_74
RPK_DZ
RPK_Kobra_DZ
RPK_PSO1_DZ
RedRyder
Remington870_DZ
Remington870_FL_DZ
Remington870_MFL_DZ
Revolver_DZ
SA58_ACOG_DZ
SA58_ACOG_FL_DZ
SA58_ACOG_MFL_DZ
SA58_CCO_DZ
SA58_CCO_FL_DZ
SA58_CCO_MFL_DZ
SA58_DZ
SA58_Holo_DZ
SA58_Holo_FL_DZ
SA58_Holo_MFL_DZ
SA58_RIS_DZ
SA58_RIS_FL_DZ
SA58_RIS_MFL_DZ
SCAR_H_CQC_CCO
SCAR_H_CQC_CCO_SD
SCAR_H_LNG_Sniper
SCAR_H_LNG_Sniper_SD
SCAR_H_STD_EGLM_Spect
SCAR_H_STD_TWS_SD
SCAR_L_CQC
SCAR_L_CQC_CCO_SD
SCAR_L_CQC_EGLM_Holo
SCAR_L_CQC_Holo
SCAR_L_STD_EGLM_RCO
SCAR_L_STD_EGLM_TWS
SCAR_L_STD_HOLO
SCAR_L_STD_Mk4CQT
SMAW
SVD
SVD_CAMO
SVD_DZ
SVD_Gh_DZ
SVD_NSPU_EP1
SVD_PSO1_DZ
SVD_PSO1_Gh_DZ
SVD_des_EP1
Sa58P_EP1
Sa58V_CCO_EP1
Sa58V_EP1
Sa58V_RCO_EP1
Sa61_EP1
Saiga12K
Stinger
Strela
UK59_Base
UK59_DZ
UZI_EP1
UZI_SD_EP1
VSS_vintorez
VSS_vintorez_DZE
Winchester1866_DZ
bizon
bizon_silenced
glock17_EP1
huntingrifle
ksvk
ksvk_Small
m107
m107_DZ
m107_SKN
m107_Small
m107_TWS_EP1
m107_TWS_EP1_Small
m16a4
m16a4_acg
m240_scoped_EP1_DZE
m240_scoped_EP1_Small
m8_SAW
m8_carbine
m8_carbineGL
m8_carbine_pmc
m8_compact
m8_compact_pmc
m8_holo_sd
m8_sharpshooter
m8_tws
m8_tws_sd
revolver_EP1
revolver_gold_EP1

View File

@@ -0,0 +1,632 @@
100Rnd_127x99_L2A1
100Rnd_127x99_M2
100Rnd_556x45_BetaCMag
100Rnd_556x45_BetaCMag_airLock
100Rnd_556x45_M249
100Rnd_762x51_M240
100Rnd_762x54_PK
10Rnd_127x99_m107
10Rnd_303British
10Rnd_762x54_SVD
10Rnd_9x39_SP5_VSS
10Rnd_B_765x17_Ball
10x_303
12Rnd_Quiver_Wood
150Rnd_127x107_DSHKM
150Rnd_127x108_KORD
15Rnd_9x19_M9
15Rnd_9x19_M9SD
15Rnd_W1866_Slug
17Rnd_9x19_glock17
17Rnd_9x19_glock17SD
1Rnd_Arrow_Wood
1Rnd_Bolt_Explosive
1Rnd_Bolt_Tranquilizer
1Rnd_HE_GP25
1Rnd_HE_M203
1Rnd_SMOKE_GP25
1Rnd_SmokeGreen_GP25
1Rnd_SmokeGreen_M203
1Rnd_SmokeRed_GP25
1Rnd_SmokeRed_M203
1Rnd_SmokeYellow_GP25
1Rnd_SmokeYellow_M203
1Rnd_Smoke_M203
2000Rnd_762x51_L94A1
2000Rnd_762x51_M134
200Rnd_556x45_L110A1
200Rnd_556x45_M249
200Rnd_762x51_M240
20Rnd_556x45_Stanag
20Rnd_762x51_B_SCAR
20Rnd_762x51_DMR
20Rnd_762x51_FNFAL
20Rnd_762x51_SB_SCAR
20Rnd_9x39_SP5_VSS
20Rnd_B_765x17_Ball
20Rnd_B_AA12_74Slug
20Rnd_B_AA12_HE
20Rnd_B_AA12_Pellets
250Rnd_127x99_M3P
29Rnd_30mm_AGS30
29Rnd_30mm_AGS30_heli
2Rnd_12Gauge_Buck
2Rnd_12Gauge_Slug
2Rnd_Igla
30Rnd_545x39_AK
30Rnd_545x39_AKSD
30Rnd_556x45_G36
30Rnd_556x45_G36SD
30Rnd_556x45_Stanag
30Rnd_556x45_StanagSD
30Rnd_762x39_AK47
30Rnd_762x39_SA58
30Rnd_9x19_MP5
30Rnd_9x19_MP5SD
30Rnd_9x19_UZI
30Rnd_9x19_UZI_SD
32Rnd_40mm_GMG
350Rnd_BB_Magazine
3Rnd_GyroGrenade
3rnd_Anzio_20x102mm
400Rnd_30mm_AGS17
48Rnd_40mm_MK19
50Rnd_127x107_DSHKM
50Rnd_127x108_KORD
50Rnd_762x54_UK59
5Rnd_127x108_KSVK
5Rnd_127x99_as50
5Rnd_127x99_as50_CP
5Rnd_17HMR
5Rnd_762x51_M24
5Rnd_762x54_Mosin
5Rnd_86x70_L115A1
5x_22_LR_17_HMR
60Rnd_762x54_DT
64Rnd_9x19_Bizon
64Rnd_9x19_SD_Bizon
6Rnd_45ACP
6Rnd_FlareGreen_M203
6Rnd_FlareRed_M203
6Rnd_FlareWhite_M203
6Rnd_FlareYellow_M203
6Rnd_HE_M203
6Rnd_HE_M203_heli
6Rnd_SmokeGreen_M203
6Rnd_SmokeRed_M203
6Rnd_SmokeYellow_M203
6Rnd_Smoke_M203
75Rnd_545x39_RPK
75Rnd_762x39_RPK
7Rnd_45ACP_1911
8Rnd_12Gauge_Buck
8Rnd_12Gauge_Slug
8Rnd_9x18_Makarov
8Rnd_9x18_MakarovSD
8Rnd_B_Beneli_74Slug
8Rnd_B_Beneli_Pellets
8Rnd_B_Saiga12_74Slug
8Rnd_B_Saiga12_Pellets
AT13
Attachment_ACOG
Attachment_BELT
Attachment_CCO
Attachment_FL
Attachment_FL_Pist
Attachment_GP25
Attachment_Ghillie
Attachment_Holo
Attachment_Kobra
Attachment_M203
Attachment_MFL
Attachment_MFL_Pist
Attachment_PSO1
Attachment_SA58RIS
Attachment_SCOPED
Attachment_Sup545
Attachment_Sup556
Attachment_Sup9
Attachment_SupBizon
Attachment_SupMakarov
BAF_L109A1_HE
BAF_ied_v1
BAF_ied_v2
BAF_ied_v3
BAF_ied_v4
BagFenceRound_DZ_kit
CSGAS
CinderBlocks
Dragon_EP1
FishCookedSeaBass
FishCookedTrout
FishCookedTuna
FishRawSeaBass
FishRawTrout
FishRawTuna
FlareGreen_GP25
FlareGreen_M203
FlareRed_GP25
FlareRed_M203
FlareWhite_GP25
FlareWhite_M203
FlareYellow_GP25
FlareYellow_M203
FoodBaconCooked
FoodBaconRaw
FoodBeefCooked
FoodBeefRaw
FoodBioMeat
FoodCakeCremeCakeClean
FoodCanBadguy
FoodCanBakedBeans
FoodCanBeef
FoodCanBoneboy
FoodCanCorn
FoodCanCurgon
FoodCanDemon
FoodCanDerpy
FoodCanFraggleos
FoodCanFrankBeans
FoodCanGriff
FoodCanHerpy
FoodCanOrlok
FoodCanPasta
FoodCanPotatoes
FoodCanPowell
FoodCanRusCorn
FoodCanRusMilk
FoodCanRusPeas
FoodCanRusPork
FoodCanRusStew
FoodCanRusUnlabeled
FoodCanSardines
FoodCanTylers
FoodCanUnlabeled
FoodCandyAnders
FoodCandyChubby
FoodCandyLegacys
FoodCandyMintception
FoodChickenCooked
FoodChickenRaw
FoodChipsChocolate
FoodChipsChocolateEmpty
FoodChipsMysticales
FoodChipsMysticalesEmpty
FoodChipsSulahoops
FoodChipsSulahoopsEmpty
FoodDogCooked
FoodDogRaw
FoodGoatCooked
FoodGoatRaw
FoodMRE
FoodMuttonCooked
FoodMuttonRaw
FoodNutmix
FoodPistachio
FoodPumpkin
FoodRabbitCooked
FoodRabbitRaw
FoodSunFlowerSeed
HandChemBlue
HandChemGreen
HandChemRed
HandGrenade
HandGrenade_East
HandGrenade_Stone
HandGrenade_West
HandRoadFlare
IRStrobe
IR_Strobe_Marker
IR_Strobe_Target
Igla
ItemARM
ItemAVE
ItemAluminumBar
ItemAluminumBar10oz
ItemAmethyst
ItemAntibacterialWipe
ItemAntibiotic
ItemAntibioticEmpty
ItemBandage
ItemBloodbag
ItemBook1
ItemBook2
ItemBook3
ItemBook4
ItemBookBible
ItemBriefcase100oz
ItemBriefcaseEmpty
ItemBriefcaseS100oz
ItemBronzeBar
ItemBurlap
ItemC4Charge
ItemCanvas
ItemCarBomb
ItemCards
ItemCitrine
ItemComboLock
ItemConcreteBlock
ItemCopperBar
ItemCopperBar10oz
ItemCorrugated
ItemDesertTent
ItemDocument
ItemDocumentRamp
ItemDomeTent
ItemEmerald
ItemEpinephrine
ItemFertilizer
ItemFireBarrel_kit
ItemFuelBarrel
ItemFuelBarrelEmpty
ItemFuelcan
ItemFuelcanEmpty
ItemGenerator
ItemGoldBar
ItemGunRackKit
ItemHeatPack
ItemHempPlant
ItemHempSeed
ItemHotwireKit
ItemJerryMixed
ItemJerryMixed1
ItemJerryMixed2
ItemJerryMixed3
ItemJerryMixed4
ItemJerrycan
ItemJerrycanEmpty
ItemKiloBlackTea
ItemKiloHemp
ItemKiloTobacco
ItemKosmosSmokes
ItemKosmosSmokesOpen
ItemLRK
ItemLetter
ItemLightBulb
ItemLockbox
ItemLog
ItemMetalSheet
ItemMethylaminBarrel
ItemMethylaminBarrelEmpty
ItemMixOil
ItemMorphine
ItemNewspaper
ItemORP
ItemObsidian
ItemOilBarrel
ItemOilBarrelEmpty
ItemPadlock
ItemPainkiller
ItemPlank
ItemPlotDeed
ItemPole
ItemPumpkinPlant
ItemPumpkinSeed
ItemRSJ
ItemRuby
ItemSandbag
ItemSandbagExLarge
ItemSandbagExLarge5x
ItemSandbagLarge
ItemSapphire
ItemScaffoldingKit
ItemScrews
ItemSepsisBandage
ItemSherbet
ItemSledgeHandle
ItemSledgeHead
ItemSodaClays
ItemSodaCoke
ItemSodaDrwaste
ItemSodaEmpty
ItemSodaFranka
ItemSodaGrapeDrink
ItemSodaLemonade
ItemSodaLirik
ItemSodaLvg
ItemSodaMdew
ItemSodaMtngreen
ItemSodaMzly
ItemSodaOrangeSherbet
ItemSodaPeppsy
ItemSodaPepsi
ItemSodaR4z0r
ItemSodaRabbit
ItemSodaRbull
ItemSodaRocketFuel
ItemSodaSacrite
ItemSodaSmasht
ItemStone
ItemTNK
ItemTankTrap
ItemTent
ItemTinBar
ItemTinBar10oz
ItemTobaccoLeafs
ItemTopaz
ItemTrapBearTrapFlare
ItemTrapBearTrapSmoke
ItemTrapTripwireCans
ItemTrapTripwireFlare
ItemTrapTripwireGrenade
ItemTrapTripwireSmoke
ItemTrashPaper
ItemTrashPaperMusic
ItemTrashRazor
ItemTrashToiletpaper
ItemVault
ItemWaterBottle
ItemWaterBottleDmg
ItemWaterBottleUnfilled
ItemWire
ItemWoodCrateKit
ItemWoodFloor
ItemWoodFloorHalf
ItemWoodFloorQuarter
ItemWoodLadder
ItemWoodStairs
ItemWoodStairsSupport
ItemWoodWall
ItemWoodWallDoor
ItemWoodWallDoorLg
ItemWoodWallGarageDoor
ItemWoodWallGarageDoorLocked
ItemWoodWallLg
ItemWoodWallThird
ItemWoodWallWindow
ItemWoodWallWindowLg
ItemWoodWallWithDoor
ItemWoodWallWithDoorLg
ItemWoodWallWithDoorLgLocked
ItemWoodWallWithDoorLocked
ItemWorkBench
ItemZombieParts
Item_Connector_I
Item_Connector_L
Item_Connector_T
Javelin
Laserbatteries
M136
MAAWS_HEAT
MAAWS_HEDP
Mine
MineE
MortarBucket
NLAW
NLAW_Big
OG7
OG9_HE
PG7V
PG7VL
PG7VR
PG9_AT
PMC_ied_v1
PMC_ied_v2
PMC_ied_v3
PMC_ied_v4
PartEngine
PartFueltank
PartGeneric
PartGlass
PartOre
PartOreGold
PartOreSilver
PartPlankPack
PartPlywoodPack
PartVRotor
PartWheel
PartWoodLumber
PartWoodPile
PartWoodPlywood
PipeBomb
RPG18
SMAW_HEAA
SMAW_HEAA_Big
SMAW_HEDP
SMAW_HEDP_Big
Skin_Assistant_DZ
Skin_BAF_Soldier_N_MTP_DZ
Skin_BAF_Soldier_Officer_MTP_DZ
Skin_Bandit1_DZ
Skin_Bandit2_DZ
Skin_BanditW1_DZ
Skin_BanditW2_DZ
Skin_CDF_Soldier_DZ
Skin_CZ_Soldier_SL_DES_EP1_DZ
Skin_CZ_Soldier_Sniper_EP1_DZ
Skin_CZ_Special_Forces_GL_DES_EP1_DZ
Skin_Camo1_DZ
Skin_Doctor_DZ
Skin_Drake_Light_DZ
Skin_FR_Assault_R_DZ
Skin_FR_Marksman_DZ
Skin_FR_OHara_DZ
Skin_FR_R_DZ
Skin_FR_Rodriguez_DZ
Skin_FR_Sapper_DZ
Skin_FR_TL_DZ
Skin_Functionary1_EP1_DZ
Skin_GER_Soldier_TL_EP1_DZ
Skin_GUE_Commander_DZ
Skin_GUE_Soldier_2_DZ
Skin_GUE_Soldier_CO_DZ
Skin_GUE_Soldier_Crew_DZ
Skin_GUE_Soldier_MG_DZ
Skin_GUE_Soldier_Sniper_DZ
Skin_Graves_Light_DZ
Skin_Haris_Press_EP1_DZ
Skin_INS_Bardak_DZ
Skin_INS_Lopotev_DZ
Skin_INS_Soldier_AR_DZ
Skin_INS_Soldier_CO_DZ
Skin_INS_Worker2_DZ
Skin_Ins_Commander_DZ
Skin_Ins_Soldier_2_DZ
Skin_Ins_Soldier_Crew_DZ
Skin_Ins_Soldier_GL_DZ
Skin_MVD_Soldier_DZ
Skin_Pilot_EP1_DZ
Skin_Priest_DZ
Skin_RUS_Commander_DZ
Skin_RUS_Soldier1_DZ
Skin_RU_Policeman_DZ
Skin_RU_Soldier_Crew_DZ
Skin_RU_Soldier_DZ
Skin_RU_Soldier_Officer_DZ
Skin_Rocker1_DZ
Skin_Rocker2_DZ
Skin_Rocker3_DZ
Skin_Rocker4_DZ
Skin_Rocket_DZ
Skin_Sniper1_DZ
Skin_Soldier1_DZ
Skin_Soldier_Bodyguard_AA12_PMC_DZ
Skin_Soldier_Sniper_PMC_DZ
Skin_Soldier_TL_PMC_DZ
Skin_Survivor2_DZ
Skin_SurvivorW2_DZ
Skin_SurvivorW3_DZ
Skin_SurvivorWcombat_DZ
Skin_SurvivorWdesert_DZ
Skin_SurvivorWpink_DZ
Skin_SurvivorWurban_DZ
Skin_TK_CIV_Takistani01_EP1_DZ
Skin_TK_CIV_Takistani03_EP1_DZ
Skin_TK_CIV_Takistani04_EP1_DZ
Skin_TK_CIV_Takistani06_EP1_DZ
Skin_TK_Commander_EP1_DZ
Skin_TK_GUE_Soldier_EP1_DZ
Skin_TK_INS_Soldier_AR_EP1_DZ
Skin_TK_INS_Soldier_EP1_DZ
Skin_TK_INS_Warlord_EP1_DZ
Skin_TK_Soldier_Sniper_EP1_DZ
Skin_TK_Special_Forces_MG_EP1_DZ
Skin_UN_CDF_Soldier_EP1_DZ
Skin_UN_CDF_Soldier_Guard_EP1_DZ
Skin_USMC_Soldier_MG_DZ
Skin_USMC_Soldier_Officer_DZ
Skin_USMC_Soldier_Pilot_DZ
Skin_US_Soldier_EP1_DZ
Skin_Worker1_DZ
Skin_Worker3_DZ
Skin_Worker4_DZ
SmokeShell
SmokeShellBlue
SmokeShellGreen
SmokeShellOrange
SmokeShellPurple
SmokeShellRed
SmokeShellYellow
Stinger
Strela
TrapBear
TrashJackDaniels
TrashTinCan
bloodBagABNEG
bloodBagABPOS
bloodBagANEG
bloodBagAPOS
bloodBagBNEG
bloodBagBPOS
bloodBagONEG
bloodBagOPOS
bloodTester
bulk
bulk_15Rnd_9x19_M9SD
bulk_17Rnd_9x19_glock17
bulk_30Rnd_556x45_StanagSD
bulk_30Rnd_9x19_MP5SD
bulk_FoodbaconCooked
bulk_FoodbaconCookedFull
bulk_ItemSandbag
bulk_ItemSodaCoke
bulk_ItemSodaCokeFull
bulk_ItemSodaPepsi
bulk_ItemSodaPepsiFull
bulk_ItemTankTrap
bulk_ItemTankTrapHalf
bulk_ItemWire
bulk_ItemWireHalf
bulk_PartGeneric
bulk_PartGenericHalf
bulk_empty
cinder_door_kit
cinder_garage_kit
deer_stand_kit
desert_large_net_kit
desert_net_kit
emptyBloodBag
equip_1inch_metal_pipe
equip_2inch_metal_pipe
equip_Crossbow_Kit
equip_aa_battery
equip_brick
equip_cable_tie
equip_comfreyleafs
equip_crate
equip_crossbow_stock
equip_d_battery
equip_duct_tape
equip_empty_barrel
equip_feathers
equip_floppywire
equip_garlic_bulb
equip_gauze
equip_gauzepackaged
equip_herb_box
equip_hobo_fishing_kit
equip_hose
equip_hose_clamp
equip_laser
equip_lever
equip_metal_sheet
equip_metal_sheet_rusted
equip_nails
equip_needle
equip_note
equip_paint
equip_pvc_box
equip_rag
equip_rail_screws
equip_rope
equip_scrapelectronics
equip_slugsinacan
equip_string
equip_tent_poles
equip_tin_powder
equip_weapon_rails
equip_wood_pallet
equip_woodensplint
forest_large_net_kit
forest_net_kit
fuel_pump_kit
full_cinder_wall_kit
half_cinder_wall_kit
light_pole_kit
m240_nest_kit
metal_floor_kit
metal_panel_kit
outhouse_kit
park_bench_kit
plot_pole_kit
pook_12Rnd_Grenade_Camel
pook_1300Rnd_762x51_M60
pook_250Rnd_762x51
rusty_gate_kit
sandbag_nest_kit
stick_fence_kit
storage_shed_kit
sun_shade_kit
transfusionKit
wholeBloodBagABNEG
wholeBloodBagABPOS
wholeBloodBagANEG
wholeBloodBagAPOS
wholeBloodBagBNEG
wholeBloodBagBPOS
wholeBloodBagONEG
wholeBloodBagOPOS
wood_ramp_kit
wood_shack_kit
wooden_shed_kit
workbench_kit

View File

@@ -0,0 +1,118 @@
New Zombies 1.0.6.3
z_soldier_usmc_soldier
z_soldier_usmc_soldier_heavy
z_soldier_usmc_mg
z_soldier_usmc_pilot
z_soldier_usmc_crew
z_soldier_usmc_officer
z_soldier_usmc_crewman_white
z_soldier_usmc_crewman_blue
z_soldier_usmc_crewman_yellow
z_soldier_usmc_crewman_red
z_soldier_usmc_crewman_purple
z_soldier_usmc_crewman_green
z_soldier_usmc_ghillie
z_soldier_fr_tl
z_soldier_fr_commander
z_soldier_fr_r
z_soldier_fr_marksman
z_soldier_fr_sapper
z_soldier_fr_ac
z_soldier_fr_assault
z_soldier_cdf_officer
z_soldier_cdf_commander
z_soldier_cdf_pilot
z_soldier_cdf_crew
z_soldier_ru_soldier
z_soldier_ru_soldier_heavy
z_soldier_ru_officer
z_soldier_ru_ghillie
z_soldier_ru_pilot
z_soldier_ru_crewman
z_soldier_ru_specnaz
z_soldier_ru_commander
z_soldier_ru_specialforces
z_soldier_gue_soldier1
z_soldier_gue_soldier2
z_soldier_gue_soldier3
z_soldier_gue_soldier4
z_soldier_gue_commander
z_soldier_gue_ghillie
z_soldier_ins_soldier1
z_soldier_ins_soldier2
z_soldier_ins_soldier3
z_soldier_ins_officer
z_soldier_ins_bardak
z_soldier_ins_lopotev
z_citizen1
z_citizen2
z_citizen3
z_citizen4
z_lumberjack1
z_lumberjack2
z_lumberjack3
z_lumberjack4
z_profiteer1
z_profiteer2
z_profiteer3
z_profiteer4
z_rocker1
z_rocker2
z_rocker3
z_rocker4
z_hunter2
z_hunter3
z_hunter4
z_assistant
z_pilot
z_takistani1
z_takistani2
z_takistani3
z_takistani4
z_takistani5
z_takistani6
z_soldier_tk_soldier1
z_soldier_tk_soldier2
z_soldier_tk_soldier3
z_soldier_tk_soldier4
z_soldier_cz_soldier_heavy
z_soldier_cz_officer
z_soldier_cz_pilot
z_soldier_cz_ghillie
z_soldier_cz_spec
z_soldier_un_soldier_heavy
z_soldier_ger_soldier
z_soldier_ger_soldier_light
z_soldier_baf_w_soldier_heavy
z_soldier_baf_d_soldier_heavy
z_soldier_baf_w_soldier_w_heavy
z_soldier_baf_w_soldier
z_soldier_baf_d_soldier
z_soldier_baf_w_soldier_w
z_soldier_pmc_soldier
z_soldier_pmc_engineer
z_soldier_pmc_bodyguard
Loot Groups
ZombieCrewman
ZombieOfficer
ZombieGhillie
ZombieSpecialForces
ZombieRebels
ZombieLumberJack
ZombieRocker
ZombieBodyguard
Stringtable Names
STR_ZNAME_CREWMAN
STR_ZNAME_OFFICER
STR_ZNAME_GHILLIE
STR_ZNAME_SPECIALFORCES
STR_ZNAME_REBELS
STR_ZNAME_LUMERJACK
STR_ZNAME_ROCKER
STR_ZNAME_ASSISTANT
STR_ZNAME_BODYGUARD

View File

@@ -7,13 +7,14 @@ http://dayzepoch.com
Based on DayZ Mod Community edition
https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md
https://github.com/DayZMod/DayZ/blob/1.8.8/Documentation/Credits.md
http://dayzmod.com
--------------------------
Included Custom Addons
--------------------------
* DayZero Enterable Buildings - https://zombies.nu/
* AutoGyro - by CSJ http://www.armaholic.com/page.php?id=2359
* Taxi by [GLT]Myke http://www.armaholic.com/page.php?id=12289
* Blackhawk and Seahawk Wrecks by [GLT]Myke http://www.armaholic.com/page.php?id=10670
@@ -27,7 +28,8 @@ Included Custom Addons
* gdtmod_grass 1.00 by HeinBloed - http://www.gdt-server.net/
* Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
* USEC CH53 by Rocket - http://dayz.com
* More enterable buildings - Dayzero - https://zombies.nu/
* Anzio 20mm Rifle by WillRobinson - http://www.armaholic.com/page.php?id=30175
* RedRyder BB Gun by WillRobinson - https://github.com/arma2WillRobinson/Red-Ryder
--------------------------
Included Custom Islands
@@ -59,8 +61,10 @@ GitHub Collaborators (In order of most commits)
* dayz10k - https://github.com/dayz10k
* Skaronator - https://github.com/Skaronator
* icomrade - https://github.com/icomrade
* ebayShopper - https://github.com/ebayShopper
* Axles - https://github.com/Axles
* Armifer - https://github.com/Armifer
* Zupa - https://github.com/Windmolders
--------------------------
GitHub Contributors (In order of most commits)
@@ -74,12 +78,19 @@ GitHub Contributors (In order of most commits)
* zabn - https://github.com/zabn
* eltexonline - https://github.com/eltexonline
* icomrade - https://github.com/icomrade
* ebayShopper - https://github.com/ebayShopper
* Namindu - https://github.com/Namindu
* raginruffalo - https://github.com/raginruffalo
* Markokil321 - https://github.com/Markokil321
* Mikeeeyy - https://github.com/Mikeeeyy
* Adaptivity - https://github.com/Adaptivity
* RimBlock - https://github.com/RimBlock
* raymix - https://github.com/raymix
* arma2WillRobinson - https://github.com/arma2WillRobinson
* facoptere - https://github.com/facoptere
* ctcDNightmare - https://github.com/ctcDNightmare
* SGanthony - https://github.com/SGanthony
* githubmil - https://github.com/githubmil
* Geodar - https://github.com/Geodar
* Sandbird - https://github.com/Sandbird
* krazey - https://github.com/krazey
@@ -96,16 +107,25 @@ GitHub Contributors (In order of most commits)
* nahkiss - https://github.com/nahkiss
* BlackLA - https://github.com/BlackLA
* Hogscraper - https://github.com/hogscraper
* Bruce-LXXVI - https://github.com/Bruce-LXXVI
* oiad - https://github.com/oiad
* AirwavesMan - https://github.com/AirwavesMan
* Raziel23x - https://github.com/Raziel23x
* strikerforce - https://github.com/strikerforce
* dreamforceinc - https://github.com/dreamforceinc
* F507DMT - https://github.com/F507DMT
* ndavalos - https://github.com/ndavalos
* SmokeyBR - https://github.com/SmokeyBR
--------------------------
Special thanks
--------------------------
* BIS for a incredible and versatile game and engine. http://www.bistudio.com/
* Rocket - DAYZ! http://dayzmod.com | http://dayzgame.com
* Rajkosto - DayZ Hive DLL - https://github.com/rajkosto/hive
* DayZ Community Developers - https://github.com/DayZMod
* ziellos2k - Tag Friendly code. https://github.com/ziellos2k
* Dayz Hive DLL - https://github.com/rajkosto/hive
* Tansien and Zac - for providing and creating DayZero Enterable Buildings https://zombies.nu/
* Munchiefest - Beta Tester, Wiki Editor, Ideas - http://www.twitch.tv/munchiefest
* Chelsey - Beta Tester, New female textures.
* OrangeSherbet - Beta Tester - http://www.twitch.tv/orangesherbet

View File

@@ -9,7 +9,7 @@ class CfgWeapons {
class RifleCore;
class FakeWeapon: RifleCore
{
scope = protected;
scope = 1;
stopThis = true;
type = 0;
cursor = "";
@@ -36,8 +36,11 @@ class CfgWeapons {
//class M24: FakeWeapon {};
//class M40A3: FakeWeapon {};
//class M240: FakeWeapon {};
class M240_Small: FakeWeapon {};
//class Mk_48: FakeWeapon {};
class Mk_48_Small: FakeWeapon {};
//class M249: FakeWeapon {};
class M249_Small: FakeWeapon {};
//class M4A1: FakeWeapon {};
//class M4A1_Aim: FakeWeapon {};
//class M4A1_Aim_camo: FakeWeapon {};
@@ -50,12 +53,14 @@ class CfgWeapons {
//class MP5SD: FakeWeapon {};
//class MP5A5: FakeWeapon {};
//class PK: FakeWeapon {};
class PK_Small: FakeWeapon {};
class Pecheneg: FakeWeapon {};
//class SVD: FakeWeapon {};
//class SVD_CAMO: FakeWeapon {};
//class Launcher: FakeWeapon {};
class ksvk: FakeWeapon {};
class ksvk_Small: FakeWeapon {};
class M136: FakeWeapon {};
class Javelin: FakeWeapon {};
class Stinger: FakeWeapon {};
@@ -208,12 +213,14 @@ class CfgWeapons {
//class AKS_74_U: FakeWeapon {};
//class AKS_74_UN_kobra: FakeWeapon {};
//class RPK_74: FakeWeapon {};
class RPK_74_Large: FakeWeapon {};
//class bizon: FakeWeapon {};
//class bizon_silenced: FakeWeapon {};
//class Colt1911: FakeWeapon {};
//class DMR: FakeWeapon {};
//class M1014: FakeWeapon {};
class m107: FakeWeapon {}; //old .50cal
class m107_Small: FakeWeapon {};
class M252: FakeWeapon {};
class 2B14: FakeWeapon {};
class Saiga12K: FakeWeapon {};
@@ -225,6 +232,7 @@ class CfgWeapons {
class m8_compact: FakeWeapon {};
class m8_sharpshooter: FakeWeapon {};
class m8_SAW: FakeWeapon {};
class m8_SAW_Large: FakeWeapon {};
//class huntingrifle: FakeWeapon {};
class RPG18: FakeWeapon {};
class SMAW: FakeWeapon {};
@@ -246,6 +254,7 @@ class CfgWeapons {
class CRV7_FAT: FakeWeapon {};
class M621: FakeWeapon {};
class BAF_AS50_scoped: FakeWeapon {}; //old .50cal
class BAF_AS50_scoped_Large: FakeWeapon {};
class BAF_AS50_TWS: FakeWeapon {};
class BAF_LRR_scoped: FakeWeapon {};
class BAF_LRR_scoped_W: FakeWeapon {};
@@ -262,6 +271,7 @@ class CfgWeapons {
class BAF_L86A2_ACOG: FakeWeapon {};
class BAF_L110A1: FakeWeapon {};
//class BAF_L110A1_Aim: FakeWeapon {};
class BAF_L110A1_Aim_Small: FakeWeapon {};
class BAF_L7A2_GPMG: FakeWeapon {};
class BAF_ied_v1: FakeWeapon {};
class BAF_ied_v2: FakeWeapon {};
@@ -287,10 +297,15 @@ class CfgWeapons {
class revolver_gold_EP1: FakeWeapon {};
//class glock17_EP1: FakeWeapon {};
//class M60A4_EP1: FakeWeapon {};
class M60A4_EP1_Small: FakeWeapon {};
//class Mk_48_DES_EP1: FakeWeapon {};
class Mk_48_DES_EP1_Small: FakeWeapon {};
//class M249_EP1: FakeWeapon {};
class M249_EP1_Small: FakeWeapon {};
class M249_TWS_EP1: FakeWeapon {};
class M249_TWS_EP1_Small: FakeWeapon {};
class M249_m145_EP1: FakeWeapon {};
class M249_m145_EP1_Small: FakeWeapon {};
//class M24_des_EP1: FakeWeapon {};
//class SVD_des_EP1: FakeWeapon {};
//class SVD_NSPU_EP1: FakeWeapon {};
@@ -318,6 +333,7 @@ class CfgWeapons {
class G36K: FakeWeapon {};
class MG36: FakeWeapon {};
class MG36_camo: FakeWeapon {};
class MG36_camo_Large: FakeWeapon {};
class GrenadeLauncher_EP1: FakeWeapon {};
class M32_EP1: FakeWeapon {};
class M79_EP1: FakeWeapon {};
@@ -328,6 +344,7 @@ class CfgWeapons {
class M110_NVG_EP1: FakeWeapon {};
//class M14_EP1: FakeWeapon {};
//class m240_scoped_EP1: FakeWeapon {};
class m240_scoped_EP1_Small: FakeWeapon {};
class M47Launcher_EP1: FakeWeapon {};
class MAAWS: FakeWeapon {};
class SCAR_Base: FakeWeapon {};
@@ -353,7 +370,9 @@ class CfgWeapons {
class M32_heli: FakeWeapon {};
class AA12_PMC: FakeWeapon {};
class PMC_AS50_scoped: FakeWeapon {};
class PMC_AS50_scoped_Large: FakeWeapon {};
class PMC_AS50_TWS: FakeWeapon {};
class PMC_AS50_TWS_Large: FakeWeapon {};
class m8_carbine_pmc: FakeWeapon {};
class m8_compact_pmc: FakeWeapon {};
class m8_holo_sd: FakeWeapon {};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -20,12 +20,13 @@ class CfgActions {
class PutBag : None { show = 0; };
class DropBag : None { show = 0; };
class AddBag : None { show = 0; };
//class TakeMine : None { show = 0; };
class TakeMine : None { show = 0; };
class DropWeapon : None { show = 0; };
class PutWeapon : None { show = 0; };
class DropMagazine : None { show = 0; };
class PutMagazine : None { show = 0; };
class DeactivateMine : None { show = 0; };
class RepairVehicle: None { show = 0; };
/*
"None"
"GetInCommander"
@@ -265,6 +266,171 @@ class CfgInGameUI
};
};
};
// Hide group hotbar
class CommandBar {
left = "-0.032 + SafeZoneX";
top = "(SafeZoneH + SafeZoneY) - (1 - 0.851)";
width = 0;
height = 0;
imageDefaultWeapons = "ca\ui\data\clear_empty.paa";
imageNoWeapons = "ca\ui\data\clear_empty.paa";
imageCommander = "ca\ui\data\clear_empty.paa";
imageDriver = "ca\ui\data\clear_empty.paa";
imageGunner = "ca\ui\data\clear_empty.paa";
imageCargo = "ca\ui\data\clear_empty.paa";
dimm = 0.3;
colorRedTeam[] = {0,0,0,0};
colorBlueTeam[] = {0,0,0,0};
colorGreenTeam[] = {0,0,0,0};
colorYellowTeam[] = {0,0,0,0};
colorWhiteTeam[] = {0,0,0,0};
class prevPage {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class nextPage {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class UnitInfo {
class GroupIcon {
x = 0;
y = 0;
w = 0;
h = 0;
};
class HcGroupText {
x = 0;
y = 0;
w = 0;
h = 0;
font = "Zeppelin32";
SizeEx = 0;
};
class UnitBackground {
x = 0;
y = 0;
w = 0;
h = 0;
textureNormal = "ca\ui\data\clear_empty.paa";
textureSelected = "ca\ui\data\clear_empty.paa";
texturePlayer = "ca\ui\data\clear_empty.paa";
textureFocus = "ca\ui\data\clear_empty.paa";
};
class UnitFocus {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class UnitIcon {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
colorPlayer[] = {0,0,0,0};
colorNoAmmo[] = {0,0,0,0};
colorWounded[] = {0,0,0,0};
colorWoundedFade[] = {0,0,0,0};
colorNoFuel[] = {0,0,0,0};
};
class Semaphore {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class CommandBackground {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class CommandText {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
font = "Zeppelin32";
SizeEx = 0;
};
class UnitSpecialRole {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
};
class VehicleNumberBackground {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class VehicleNumberText {
x = 0;
y = 0;
w = 0;
h = 0;
colorText[] = {0,0,0,0};
font = "Zeppelin32";
SizeEx = 0;
};
class UnitRole {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
};
class UnitNumberBackground {
x = 0;
y = 0;
w = 0;
h = 0;
color[] = {0,0,0,0};
texture = "ca\ui\data\clear_empty.paa";
};
class UnitNumberText {
x = 0;
y = 0;
w = 0;
h = 0;
colorText[] = {0,0,0,0};
font = "Zeppelin32";
SizeEx = 0;
};
class CombatMode {
x = 0;
y = 0;
w = 0;
h = 0;
textureMCareless = "ca\ui\data\clear_empty.paa";
textureMSafe = "ca\ui\data\clear_empty.paa";
textureMAware = "ca\ui\data\clear_empty.paa";
textureMCombat = "ca\ui\data\clear_empty.paa";
textureMStealth = "ca\ui\data\clear_empty.paa";
};
};
};
};
class CfgVoice {
@@ -280,15 +446,7 @@ class CfgIdentities {
class PZombie1
{
name = "PZombie";
face = "PZombie1";
glasses = "None";
speaker = "NoVoice";
pitch = 1;
};
class PZombie2
{
name = "PZombie";
face = "PZombie2";
face = "PZombieFace1";
glasses = "None";
speaker = "NoVoice";
pitch = 1;
@@ -376,11 +534,10 @@ class CfgSurvival {
rawfoodtype = "FoodchickenRaw";
};
class Cock: Hen {};
class DZ_Fin: Default {
yield = 0;
class Fin: Default {
rawfoodtype = "FoodDogRaw";
};
class DZ_Pastor: DZ_Fin {};
class Pastor: Fin {};
class Rabbit: Default {
yield = 2;
rawfoodtype = "FoodrabbitRaw";
@@ -613,5 +770,146 @@ class CfgSurvival {
sex = "male";
playerModel = "INS_Worker2_DZ";
};
//new Epoch 1.06
class Skin_USMC_Soldier_Officer_DZ: Default {
sex = "male";
playerModel = "USMC_Soldier_Officer_DZ";
};
class Skin_USMC_Soldier_MG_DZ: Default {
sex = "male";
playerModel = "USMC_Soldier_MG_DZ";
};
class Skin_USMC_Soldier_Pilot_DZ: Default {
sex = "male";
playerModel = "USMC_Soldier_Pilot_DZ";
};
class Skin_FR_TL_DZ: Default {
sex = "male";
playerModel = "FR_TL_DZ";
};
class Skin_FR_R_DZ: Default {
sex = "male";
playerModel = "FR_R_DZ";
};
class Skin_FR_Marksman_DZ: Default {
sex = "male";
playerModel = "FR_Marksman_DZ";
};
class Skin_FR_Assault_R_DZ: Default {
sex = "male";
playerModel = "FR_Assault_R_DZ";
};
class Skin_RU_Soldier_DZ: Default {
sex = "male";
playerModel = "RU_Soldier_DZ";
};
class Skin_RU_Soldier_Officer_DZ: Default {
sex = "male";
playerModel = "RU_Soldier_Officer_DZ";
};
class Skin_RUS_Soldier1_DZ: Default {
sex = "male";
playerModel = "RUS_Soldier1_DZ";
};
class Skin_RUS_Commander_DZ: Default {
sex = "male";
playerModel = "RUS_Commander_DZ";
};
class Skin_MVD_Soldier_DZ: Default {
sex = "male";
playerModel = "MVD_Soldier_DZ";
};
class Skin_Ins_Soldier_2_DZ: Default {
sex = "male";
playerModel = "Ins_Soldier_2_DZ";
};
class Skin_Ins_Commander_DZ: Default {
sex = "male";
playerModel = "Ins_Commander_DZ";
};
class Skin_Ins_Soldier_Crew_DZ: Default {
sex = "male";
playerModel = "Ins_Soldier_Crew_DZ";
};
class Skin_CDF_Soldier_DZ: Default {
sex = "male";
playerModel = "CDF_Soldier_DZ";
};
class Skin_Doctor_DZ: Default {
sex = "male";
playerModel = "Doctor_DZ";
};
class Skin_Assistant_DZ: Default {
sex = "male";
playerModel = "Assistant_DZ";
};
class Skin_Worker1_DZ: Default {
sex = "male";
playerModel = "Worker1_DZ";
};
class Skin_Worker3_DZ: Default {
sex = "male";
playerModel = "Worker3_DZ";
};
class Skin_Worker4_DZ: Default {
sex = "male";
playerModel = "Worker4_DZ";
};
class Skin_TK_CIV_Takistani01_EP1_DZ: Default {
sex = "male";
playerModel = "TK_CIV_Takistani01_EP1_DZ";
};
class Skin_TK_CIV_Takistani03_EP1_DZ: Default {
sex = "male";
playerModel = "TK_CIV_Takistani03_EP1_DZ";
};
class Skin_TK_CIV_Takistani04_EP1_DZ: Default {
sex = "male";
playerModel = "TK_CIV_Takistani04_EP1_DZ";
};
class Skin_TK_CIV_Takistani06_EP1_DZ: Default {
sex = "male";
playerModel = "TK_CIV_Takistani06_EP1_DZ";
};
class Skin_TK_INS_Soldier_AR_EP1_DZ: Default {
sex = "male";
playerModel = "TK_INS_Soldier_AR_EP1_DZ";
};
class Skin_TK_GUE_Soldier_EP1_DZ: Default {
sex = "male";
playerModel = "TK_GUE_Soldier_EP1_DZ";
};
class Skin_CZ_Soldier_SL_DES_EP1_DZ: Default {
sex = "male";
playerModel = "CZ_Soldier_SL_DES_EP1_DZ";
};
class Skin_US_Soldier_EP1_DZ: Default {
sex = "male";
playerModel = "US_Soldier_EP1_DZ";
};
class Skin_UN_CDF_Soldier_Guard_EP1_DZ: Default {
sex = "male";
playerModel = "UN_CDF_Soldier_Guard_EP1_DZ";
};
class Skin_UN_CDF_Soldier_EP1_DZ: Default {
sex = "male";
playerModel = "UN_CDF_Soldier_EP1_DZ";
};
class Skin_GER_Soldier_TL_EP1_DZ: Default {
sex = "male";
playerModel = "GER_Soldier_TL_EP1_DZ";
};
class Skin_BAF_Soldier_Officer_MTP_DZ: Default {
sex = "male";
playerModel = "BAF_Soldier_Officer_MTP_DZ";
};
class Skin_BAF_Soldier_N_MTP_DZ: Default {
sex = "male";
playerModel = "BAF_Soldier_N_MTP_DZ";
};
class Skin_FR_Sapper_DZ: Default {
sex = "male";
playerModel = "FR_Sapper_DZ";
};
};
};

View File

@@ -12,20 +12,6 @@ class CfgCrafting {
#include "Recipes\Weapons\BaseBallBatBarbed.hpp"
#include "Recipes\Weapons\Crossbow.hpp"
//Not Ready
/*
#include "Recipes\Weapons\M9SD.hpp"
#include "Recipes\Weapons\M4A1_AIM.hpp"
#include "Recipes\Weapons\MAKAROVSD.hpp"
#include "Recipes\Weapons\bizonSD.hpp"
#include "Recipes\Weapons\SVD_CAMO.hpp"
#include "Recipes\Weapons\M4A1_Aim_CAMO.hpp"
#include "Recipes\Weapons\M4A1_HWS_GL_CAMO.hpp"
#include "Recipes\Weapons\G36C_camo.hpp"
#include "Recipes\Weapons\G36A_camo.hpp"
#include "Recipes\Weapons\G36K_camo.hpp"
*/
//Medical
#include "Recipes\Medical\Bandage.hpp"
#include "Recipes\Medical\sepsisBandage.hpp"

View File

@@ -7,7 +7,7 @@ class Wooden_Arrow : Recipe {
};
output[] =
{
{"WoodenArrow","CfgMagazines",4}
{"1Rnd_Arrow_Wood","CfgMagazines",4}
};
required[] =
{

View File

@@ -2,12 +2,13 @@ class Blueprint_woodensplint : Recipe {
displayName = $STR_ITEM_NAME_WOODENSPLINT;
input[] =
{
{"PartWoodPile","CfgMagazines",2},
{"equip_string","CfgMagazines",1}
{"ItemPlank","CfgMagazines",1},
{"equip_string","CfgMagazines",1},
{"equip_duct_tape","CfgMagazines",1}
};
output[] =
{
{"equip_woodensplint","CfgMagazines",2}
{"equip_woodensplint","CfgMagazines",1} // Only need one splint to fix legs
};
required[] =
{

View File

@@ -6,7 +6,7 @@ class Blueprint_nails : Recipe {
};
output[] =
{
{"equip_nails","CfgMagazines",10}
{"equip_nails","CfgMagazines",4}
};
required[] =
{

View File

@@ -1,17 +0,0 @@
class Blueprint_G36A_camo : Recipe {
displayName = $STR_CRAFT_NAME_G36A_CAMO;
descriptionShort = $STR_CRAFT_DESC_G36A_CAMO;
input[] =
{
{"G36A","CfgWeapons",1},
{"Attachment_CAMO","CfgMagazines",1}
};
output[] =
{
{"G36A_CAMO","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_G36C_camo : Recipe {
displayName = $STR_CRAFT_NAME_G36C_CAMO;
descriptionShort = $STR_CRAFT_DESC_G36C_CAMO;
input[] =
{
{"G36C","CfgWeapons",1},
{"Attachment_CAMO","CfgMagazines",1}
};
output[] =
{
{"G36C_CAMO","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_G36K_camo : Recipe {
displayName = $STR_CRAFT_NAME_G36K_CAMO;
descriptionShort = $STR_CRAFT_DESC_G36K_CAMO;
input[] =
{
{"G36K","CfgWeapons",1},
{"Attachment_CAMO","CfgMagazines",1}
};
output[] =
{
{"G36K_CAMO","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,19 +0,0 @@
class Blueprint_M4A1_AIM : Recipe {
displayName = $STR_CRAFT_NAME_M4A1_AIM;
descriptionShort = $STR_CRAFT_DESC_M4A1_AIM;
input[] =
{
{"M4A1","CfgWeapons",1},
{"Attachment_AIM","CfgMagazines",1},
{"equip_rail_screws","CfgMagazines",2},
{"equip_weapon_rails","CfgMagazines",1}
};
output[] =
{
{"M4A1_AIM","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_M4A1_Aim_CAMO : Recipe {
displayName = $STR_CRAFT_NAME_M4A1_Aim_CAMO;
descriptionShort = $STR_CRAFT_DESC_M4A1_Aim_CAMO;
input[] =
{
{"M4A1_Aim","CfgWeapons",1},
{"Attachment_CAMO","CfgMagazines",1}
};
output[] =
{
{"M4A1_Aim_CAMO","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_M4A1_HWS_GL_CAMO : Recipe {
displayName = $STR_CRAFT_NAME_M4A1_HWS_GL_CAMO;
descriptionShort = $STR_CRAFT_DESC_M4A1_HWS_GL_CAMO;
input[] =
{
{"M4A1_HWS_GL","CfgWeapons",1},
{"Attachment_CAMO","CfgMagazines",1}
};
output[] =
{
{"M4A1_HWS_GL_CAMO","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_M9SD : Recipe {
displayName = $STR_CRAFT_NAME_M9SD;
descriptionShort = $STR_CRAFT_DESC_M9SD;
input[] =
{
{"M9","CfgWeapons",1},
{"Attachment_Silencer","CfgMagazines",1}
};
output[] =
{
{"M9SD","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_MAKAROVSD : Recipe {
displayName = $STR_CRAFT_NAME_MAKAROVSD;
descriptionShort = $STR_CRAFT_DESC_MAKAROVSD;
input[] =
{
{"Makarov","CfgWeapons",1},
{"Attachment_Silencer","CfgMagazines",1}
};
output[] =
{
{"MakarovSD","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,18 +0,0 @@
class Blueprint_SVD_CAMO : Recipe {
displayName = $STR_CRAFT_NAME_SVD_CAMO;
descriptionShort = $STR_CRAFT_DESC_SVD_CAMO;
input[] =
{
{"SVD_DZ","CfgWeapons",1},
{"Skin_Sniper1_DZ","CfgMagazines",1},
{"Attachment_CAMO","CfgMagazines",1}
};
output[] =
{
{"SVD_CAMO_DZ","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -1,17 +0,0 @@
class Blueprint_bizonSD : Recipe {
displayName = $STR_CRAFT_NAME_bizonSD;
descriptionShort = $STR_CRAFT_DESC_bizonSD;
input[] =
{
{"bizon","CfgWeapons",1},
{"Attachment_Silencer","CfgMagazines",1}
};
output[] =
{
{"bizon_silenced","CfgWeapons",1}
};
required[] =
{
{"ItemToolbox","CfgWeapons",1}
};
};

View File

@@ -2,7 +2,6 @@
Created by Raymix
*/
class SnapBuilding {
//Barriers whitelist
class Barrier {
@@ -12,11 +11,14 @@ class SnapBuilding {
"Land_HBarrier1_DZ",
"Sandbag1_DZ",
"BagFenceRound_DZ",
"Fort_RazorWire"
"Fort_RazorWire",
"WoodFloorQuarter_DZ",
"WoodFloorHalf_DZ",
"WoodFloor_DZ",
"MetalFloor_DZ"
};
radius = 5;
};
//snap points
class Land_HBarrier5Preview: Barrier{ //fix for broken offsets in ghost
points[] = {
{0,0,0,"Pivot"},
@@ -170,8 +172,8 @@ class SnapBuilding {
{0,0,0,"Pivot"},
{0,-2.33,0.130,"Back"},
{0,2.33,0.130,"Front"},
{-2.45,0,0.130,"Left"},
{2.45,0,0.130,"Right"}
{-2.495,0,0.130,"Left"},
{2.495,0,0.130,"Right"}
};
radius = 10;
};
@@ -242,24 +244,40 @@ class SnapBuilding {
class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors
points[] = {
{0,0,0,"Pivot"},
{-2.752, 0, 1.5,"Left"},
{2.752, 0, 1.5,"Right"},
{-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.685,"Right"},
{0, 0, 3.37042,"Top"}
};
radius = 10;
};
class CinderWall_Preview_DZ: Cinder_DZE {};
class CinderWall_Preview_DZ: Cinder_DZE {
points[] = {
{0,0,0,"Pivot"},
{-2.64, 0, -0.009,"Left"},
{2.64, 0, -0.009,"Right"},
{0, 0, 1.685,"Top"},
{0,0,-1.685,"Bottom"}
};
};
class CinderWallDoorway_Preview_DZ: Cinder_DZE {};
class CinderWallSmallDoorway_Preview_DZ: Cinder_DZE {};
class CinderWallHalf_Preview_DZ: Cinder_DZE {
points[] = {
{0,0,0,"Pivot"},
{-2.752, 0, 1.5,"Left"},
{2.752, 0, 1.5,"Right"},
{-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.685,"Right"},
{0, 0, 1.5,"Top"}
};
};
class CinderWall_DZ: Cinder_DZE {};
class CinderWall_DZ: Cinder_DZE {
points[] = {
{0,0,0,"Pivot"},
{-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.685,"Right"},
{0, 0, 3.37042,"Top"},
{0,0,-1.685,"Bottom"}
};
};
class CinderWallDoorway_DZ: Cinder_DZE {};
class CinderWallDoorLocked_DZ: Cinder_DZE {};
class CinderWallDoor_DZ: Cinder_DZE {};
@@ -268,35 +286,34 @@ class SnapBuilding {
class CinderWallHalf_DZ: Cinder_DZE {
points[] = {
{0,0,0,"Pivot"},
{-2.752, 0, 1.5,"Left"},
{2.752, 0, 1.5,"Right"},
{0, 0, 1.5,"Top"}
{-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.685,"Right"},
{0, 0, 1.685,"Top"}
};
};
class CinderWallDoorSmall_DZ: Cinder_DZE {};
class MetalFloor_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost
class MetalFloor_Preview_DZ: FloorsWallsStairs {
points[] = {
{0,0,0.011,"Pivot"},
{0, -2.64, 0.009,"Back"},
{0, 2.64, 0.009,"Front"},
{-2.64, 0, 0.009,"Left"},
{2.64, 0, 0.009,"Right"}
{0, -2.64, 0.025,"Back"},
{0, 2.64, 0.025,"Front"},
{-2.64, 0, 0.025,"Left"},
{2.64, 0, 0.025,"Right"}
};
radius = 12;
};
class MetalFloor_DZ: FloorsWallsStairs{
points[] = {
{0,0,0,"Pivot"},
{0, -2.64, 0.15,"Back"},
{0, 2.64, 0.15,"Front"},
{-2.64, 0, 0.15,"Left"},
{2.64, 0, 0.15,"Right"}
{0, -2.64, 0.166,"Back"},
{0, 2.64, 0.166,"Front"},
{-2.64, 0, 0.166,"Left"},
{2.64, 0, 0.166,"Right"}
};
radius = 12;
};
//Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap
class WoodCrate_DZ {
snapTo[] = {

View File

@@ -2,7 +2,11 @@ class Land_Nav_Boathouse : Default
{
lootChance = 0.2;
zedPos[] = {{-2.92236,9.2002,3.6665},{7.09473,7.79883,3.6665},{7.18164,-2.03223,3.66864},{1.68994,7.5166,3.67276},{5.49609,0.106445,3.67358},{-5.63037,-1.27246,3.67407},{5.27588,5.51953,3.69006},{-5.03564,6.19141,3.6907},{-6.98779,5.52539,3.69113}};
lootPos[] = {{5.28,5.52,3.73},{5.5,0.11,3.71},{1.69,7.52,3.71},{-5.04,6.19,3.71},{-5.63,-1.27,3.69},{-6.99,5.53,3.71},{-2.92,9.2,3.67},{7.09,7.8,3.69},{7.18,-2.03,3.69},{2.8,7.37,6.33},{-2.81,7.41,6.32}};
lootPos[] = {
//{5.28,5.52,3.73},{5.5,0.11,3.71},{1.69,7.52,3.71},{-5.04,6.19,3.71},{-5.63,-1.27,3.69},{-6.99,5.53,3.71},{-2.92,9.2,3.67},{7.09,7.8,3.69},{7.18,-2.03,3.69},{2.8,7.37,6.33},{-2.81,7.41,6.32},
{-5.24414,-2.32715,3.67999},{-5.43994,7.17676,3.67548},{6.13232,0.615234,3.6694},{-1.00439,6.89355,3.68311}
};
lootPosSmall[] = {{5.2002,7.64746,6.30902},{-1.88623,7.55762,6.30902},{4.75781,-2.49121,3.67984},{-0.398438,4.61914,3.61755},{2.91797,8.50293,3.67038}};
lootGroup = Boat;
};
@@ -14,4 +18,11 @@ class Land_BoatSmall_2b : Default
lootChance = 0.1;
lootPos[] = {{0.00390625,-0.250977,-0.348389}};
lootGroup = Boat;
};
};
// ALT-MAP
class land_molo : Default
{
lootChance = 0.3;
lootPos[] = {{-0.94043,2.16602,3.30015}};
lootGroup = Boat;
};

View File

@@ -7,18 +7,21 @@ class Castle : Default
class Land_A_Castle_Bergfrit: Castle {
zedPos[] = {{1.19141,-1.43848,-2.81638},{0.0595703,2.04785,-2.79636},{-2.19482,4.12305,-0.63858},{2.36133,3.86816,1.83972},{2.64746,-3.5459,3.85541},{-2.09473,-3.44922,6.29901},{-0.540039,-2.35254,8.76691},{-1.15918,3.13867,8.76691},{1.74707,1.26855,8.76691},{-1.62207,-4.28027,13.4801},{1.67578,-0.825195,16.8505},{-2.23047,4.82422,16.856}};
lootPos[] = {{0.0595703,2.04785,-2.79636},{1.19141,-1.43848,-2.81638},{-2.19482,4.12305,-0.63858},{2.36133,3.86816,1.83972},{2.64746,-3.5459,3.85541},{-2.09473,-3.44922,6.29901},{-1.15918,3.13867,8.76691},{1.74707,1.26855,8.76691},{-0.540039,-2.35254,8.76691},{-1.62207,-4.28027,13.4801},{-2.23047,4.82422,16.856},{1.67578,-0.825195,16.8505}};
//lootPos[] = {{0.0595703,2.04785,-2.79636},{1.19141,-1.43848,-2.81638},{-2.19482,4.12305,-0.63858},{2.36133,3.86816,1.83972},{2.64746,-3.5459,3.85541},{-2.09473,-3.44922,6.29901},{-1.15918,3.13867,8.76691},{1.74707,1.26855,8.76691},{-0.540039,-2.35254,8.76691},{-1.62207,-4.28027,13.4801},{-2.23047,4.82422,16.856},{1.67578,-0.825195,16.8505}};
lootPos[] = {{0.0185547,1.91602,-2.8364},{1.19141,-1.43848,-2.8364},{-2.36816,3.32275,-0.628571},{2.36133,3.86768,1.83972},{2.48438,-3.20557,3.85541},{-2.09473,-3.44873,6.31903},{-1.15918,3.13867,8.76691},{1.74707,1.26807,8.76691},{-0.540039,-2.35254,8.76691},{-1.62207,-4.27979,13.4801},{-2.23047,4.82471,16.856},{1.67578,-0.825195,16.8505}};
};
class Land_A_Castle_Stairs_A: Castle {
zedPos[] = {{0.693604,-1.79297,0.703918},{8.42188,0.878906,0.889343},{8.11035,1.47949,7.01178}};
lootPos[] = {{0.693604,-1.79297,0.703918},{8.42188,0.878906,0.889343},{8.11035,1.47949,7.01178}};
//lootPos[] = {{0.693604,-1.79297,0.703918},{8.42188,0.878906,0.889343},{8.11035,1.47949,7.01178}};
lootPos[] = {{0.697998,-1.79395,0.726929},{8.3938,0.890625,0.875122},{8.17261,1.48926,7.02588}};
};
class Land_A_Castle_Gate: Castle {
zedPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
lootChance = 0.7;
lootPos[] = {{0.24,-4.49,-3.14},{-1.25,2.99,-3.07},{4.51,-3.31,-2.95},{4.71,2.71,-2.95},{7.76,0.51,-2.91}};
//lootPos[] = {{0.24,-4.49,-3.14},{-1.25,2.99,-3.07},{4.51,-3.31,-2.95},{4.71,2.71,-2.95},{7.76,0.51,-2.91}};
lootPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
};
class Land_A_Castle_Wall2_End_2: Castle {

View File

@@ -17,10 +17,16 @@ class Land_Church_01 : Church
};
lootPos[] =
{
/*
{-6.92,-0.38,-4.21},
{-6.87,-0.44,-6.47}
{-6.87,-0.44,-6.47},
*/
{-6.92822,0.516602,-4.2191}
};
lootPosSmall[] =
{
{-7.27332,-1.16895,-4.22726}
};
lootPosSmall[] = {{-7.27332,-1.16895,-4.22726}};
};
class Land_Church_03 : Church
@@ -42,6 +48,7 @@ class Land_Church_03 : Church
};
lootPos[] =
{
/*
{5.15332,-6.96875,-14.3021},
{-1.7915,-7.67969,-14.302},
{-0.0263672,-2.98438,-14.3021},
@@ -53,9 +60,25 @@ class Land_Church_03 : Church
{-7.64111,4.81348,-14.3019},
{-6.56641,-4.58887,-14.3021},
{9.55225,2.22461,-13.7487},
{9.93262,-3.85156,-13.7587}
{9.93262,-3.85156,-13.7587},
*/
{-0.665527,-3.02832,-14.3021},
{2.90771,3.07422,-14.3021},
{9.75342,0.0117188,-13.7588},
{4.74609,8.1582,-14.3021},
{-2.41943,1.72168,-14.3049}
};
lootPosSmall[] =
{
{-0.791992,2.21191,-13.7321},
{2.93945,-1.59766,-13.7349},
{6.21191,3.48535,-13.7321},
{6.56787,-3.55176,-14.3021},
{-0.741211,-8.75684,-14.3021},
{-0.126465,5.94434,-14.3021},
{-1.14893,-3.6416,-14.3021},
{-2.71484,-1.56055,-13.7349}
};
lootPosSmall[] = {{-0.791992,2.21191,-13.7321},{2.93945,-1.59766,-13.7349},{6.21191,3.48535,-13.7321},{6.56787,-3.55176,-14.3021},{-0.741211,-8.75684,-14.3021},{-0.126465,5.94434,-14.3021},{-1.14893,-3.6416,-14.3021},{-2.71484,-1.56055,-13.7349}};
hangPos[] = {{1.72168,-8.39771,-0.172569},{2.08838,-14.4236,-0.27536},{-13.7158,-10.4808,-0.795174},{-12.9072,-16.4105,-0.895065}};
};
@@ -116,11 +139,20 @@ class Land_Church_05R : Church
{-4.85,8.19,-8}
};
};
//DZE ADDED BELOW
class land_kostelik_final_2122: Church {
//ALT-MAP suport
class land_kostelik_final_2122: Church //nm whitewashed wooden slats
{
lootPos[] = {{5.41992,-3.45703,-5.57918},{-0.963379,4.74414,-5.57919},{1.09082,-2.79297,-5.57919},{-1.39063,-5.18555,-5.57918}};
};
class Land_A_Mosque_small_2_EP1: Church // tak
{
lootPos[] = { { 1.33496,-0.726074,-2.48535 }, { -0.794922,-1.74414,-2.48538 } };
};
class Land_A_Minaret_EP1 : Church // tak
{
lootPos[] = { {0.158691,0.131836,5.13947}, {1.86914,-2.97461,5.1394} };
};
//DZE ADDED BELOW
class Land_A_Mosque_big_hq_EP1: Church {
lootPos[] = {{4.06592,-6.90674,-9.31999},{5.25195,4.07666,-9.31999},{5.70264,7.5376,-4.04752},{-4.78857,-7.00684,-4.04753},{3.93262,9.41846,0.567287},{0.882324,-0.134766,-9.31999}};
};
@@ -139,10 +171,3 @@ class Land_A_Mosque_small_1_EP1: Church
{ 6.66406,4.11719,-1.9437 },
{ 0.49707,-1.33301,-1.69603 }};
};
class Land_A_Mosque_small_2_EP1: Church
{
lootPos[] = {
{ 1.33496,-0.726074,-2.48535 },
{ -0.794922,-1.74414,-2.48538 }};
};

View File

@@ -6,7 +6,15 @@ class CrashSite : Default
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
};
class CrashSite_RU : CrashSite {};
class CrashSite_US : CrashSite {};
class CrashSite_EU : CrashSite {};
class CrashSite_UN : CrashSite {};
class CrashSite_RU : CrashSite {
zombieClass[] = {"z_soldier_ru_pilot","z_soldier_ru_crewman","z_soldier_ru_pilot","z_soldier_ru_crewman","z_soldier_ru_specialforces","z_soldier_ru_soldier","z_soldier_ru_soldier_heavy"};
};
class CrashSite_US : CrashSite {
zombieClass[] = {"z_soldier_usmc_pilot","z_soldier_usmc_crew","z_soldier_usmc_mg","z_soldier_usmc_soldier_heavy","z_soldier_usmc_soldier"};
};
class CrashSite_EU : CrashSite {
zombieClass[] = {"z_soldier_cz_pilot","z_soldier_cz_soldier_heavy","z_soldier_cz_spec"};
};
class CrashSite_UN : CrashSite {
zombieClass[] = {"z_soldier_cdf_crew","z_soldier_pilot","z_soldier_cdf_pilot","z_soldier_un_soldier_heavy","z_soldier_heavy"};
};

View File

@@ -2,55 +2,70 @@ class Farm : Default
{
zombieChance = 0.3;
maxRoaming = 3;
zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3","z_new_villager2","z_new_villager3","z_new_villager4"};
zombieClass[] = {"zZombie_Base","z_hunter","z_hunter2","z_hunter3","z_hunter4","z_villager1","z_villager2","z_villager3","z_new_villager2","z_new_villager3","z_new_villager4"};
lootChance = 0.5;
lootGroup = Farm;
};
class Land_stodola_old_open: Farm {
zedPos[] = {{-2.58887,-5.9209,-5.08057},{-3.06787,8.63086,-5.08057},{2.52539,10.5234,-5.08044},{4.11035,-10.9307,-5.07043},{-2.62793,-6.55762,-0.99585},{-2.79443,10.2344,-0.993469},{4.62646,10.498,-0.993408},{4.76807,5.00781,-0.993408},{0.749023,-10.5703,2.96448},{1.09131,10.6787,2.96448}};
lootPos[] = {{-3.06787,8.63086,-5.08057},{2.52539,10.5234,-5.08044},{4.76807,5.00781,-0.993408},{-2.79443,10.2344,-0.993469},{4.62646,10.498,-0.993408},{1.09131,10.6787,2.96448},{-2.58887,-5.9209,-5.08057},{4.11035,-10.9307,-5.07043},{-2.62793,-6.55762,-0.99585},{0.749023,-10.5703,2.96448}};
lootPos[] = {
//{-3.07,8.63,-5.08},{2.53,10.52,-5.08},{4.77,5.01,-0.99},{-2.79,10.23,-0.99},{4.63,10.5,-0.99},{1.09,10.68,2.96},{-2.59,-5.92,-5.08},{4.11,-10.93,-5.07},{-2.63,-6.56,-1},{0.75,-10.57,2.96},{2.16,-3.54,-5.08},{-2.74,-10.6,-5.08},{2.88,3.69,-5.08},{3.77,-5.79,-0.03},{4.4,-10.93,-1},
{2.5437,-10.6599,2.96444},{-0.4021,-10.6228,2.96444},{-2.56641,-10.8538,-0.995487},{4.6665,3.45386,-5.08055},{-2.24414,10.396,-5.08055},{3.08691,9.24976,-5.08055},{-1.12744,10.5359,-0.993513},{-1.27563,10.6184,2.96444},{2.99268,10.7668,2.96444},{4.35425,-10.5923,-5.08055},{-2.47363,-5.49194,-5.08055}
};
lootPosSmall[] = {{2.7832,-9.15698,-4.13055},{-1.83765,7.05908,-4.13055},{3.73218,-5.77075,-0.0403633},{0.913818,-11.1099,2.96444},{5.14795,-10.01,-0.997503},{-2.89819,7.21069,-5.08055},{1.79053,8.75171,-5.08055},{5.07788,9.51514,-0.993513},{3.65845,10.1985,2.96444},{0.85498,-3.37793,-4.13055}};
hangPos[] = {{-1.50537,5.34473,-5.08813},{0.494141,9.42725,-5.09016},{2.59473,-6.21191,-5.08055},{-1.74854,-2.39844,-1.14301}};
};
class Land_Farm_Cowshed_a: Farm {
zedPos[] = {{7.87988,2.94141,-3.08789},{9.74023,-2.48633,-3.08771},{-1.06836,-5.92188,-3.08765},{-1.32764,5.61426,-3.08765},{2.88428,-2.34473,-3.08765},{4.81982,5.72852,-3.08765},{8.83936,-5.60254,-3.06757}};
lootPos[] = {{-1.06836,-5.92188,-3.08765},{8.83936,-5.60254,-3.06757},{9.74023,-2.48633,-3.08771},{2.88428,-2.34473,-3.08765},{7.87988,2.94141,-3.08789},{4.81982,5.72852,-3.08765},{-1.32764,5.61426,-3.08765}};
lootPos[] = {
//{-1.06836,-5.92188,-3.08765},{8.83936,-5.60254,-3.06757},{9.74023,-2.48633,-3.08771},{2.88428,-2.34473,-3.08765},{7.87988,2.94141,-3.08789},{4.81982,5.72852,-3.08765},{-1.32764,5.61426,-3.08765},
{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}
};
lootPosSmall[] = {{-6.74829,-2.98145,-3.03766},{1.34399,3.79199,-3.03766}};
};
class Land_stodola_open: Farm {
zedPos[] = {{-2.58228,-0.526367,-4.17346},{-0.0480957,-4.88965,-4.13593},{-2.60376,5.31641,-4.12805},{0.98291,6.20508,-4.11121}};
lootPos[] = {{-2.60376,5.31641,-4.12805},{-2.58228,-0.526367,-4.17346},{-0.0480957,-4.88965,-4.13593},{0.98291,6.20508,-4.11121}};
lootPos[] = {
//{-2.60376,5.31641,-4.12805},{-2.58228,-0.526367,-4.17346},{-0.0480957,-4.88965,-4.13593},{0.98291,6.20508,-4.11121},
{-3.77881,6.2478,-4.11348},{1.59106,6.31494,-4.10928},{-3.94727,-1.95605,-4.15359},{-0.440918,-3.91187,-4.1938}
};
lootPosSmall[] = {{-4.22217,-6.12866,-3.32453}};
hangPos[] = {{-0.932617,-3.35962,-4.16446},{-2.01563,-0.115112,-4.19492}};
};
class Land_Barn_W_01: Farm {
zedPos[] = {{5.78711,18.9463,-2.62683},{-4.4646,16.665,-2.61633},{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-2.99072,-4.16992,-2.58276},{3.95435,4.88379,-2.57434}};
lootPos[] = {{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-4.4646,16.665,-2.61633},{5.78711,18.9463,-2.62683},{3.95435,4.88379,-2.57434},{-2.99072,-4.16992,-2.58276}};
lootPos[] = {
//{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-4.4646,16.665,-2.61633},{5.78711,18.9463,-2.62683},{3.95435,4.88379,-2.57434},{-2.99072,-4.16992,-2.58276},
{-4.45776,14.2153,-2.71607},{4.34277,-6.15088,-2.57279}
};
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}};
//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}};
lootPos[] = {{3.16504,5.56543,-2.31409},{3.35938,-0.152344,-2.31305},{2.53613,-5.89453,-2.30957},{-2.94629,-5.01367,-2.31006},{-2.84375,0.212891,-2.31183},{-5.63281,4.8291,-2.31363}};
};
class Land_Farm_Cowshed_c: Farm {
zedPos[] = {{-2.41504,2.98633,-3.12582}};
lootPos[] = {{-2.41504,2.98633,-3.12582}};
lootPos[] = {
//{-2.41504,2.98633,-3.12582},
{0.625,-2.61133,-3.06583}
};
lootPosSmall[] = {{-2.82446,3.18457,-3.11581}};
};
class Land_Farm_Cowshed_b: Farm {
zedPos[] = {{0.0620117,0.0517578,-3.11111},{-4.77441,-2.4834,-3.05106},{4.68506,2.18945,-3.04105}};
lootPos[] = {{4.68506,2.18945,-3.04105},{0.0620117,0.0517578,-3.11111},{-4.77441,-2.4834,-3.05106}};
lootPos[] = {
//{4.68506,2.18945,-3.04105},{0.0620117,0.0517578,-3.11111},{-4.77441,-2.4834,-3.05106},
{-3.26782,2.71875,-3.0311},{5.41699,-2.57813,-3.04111}
};
lootPosSmall[] = {{3.46802,3.36621,-3.05112},{-9.98511,-3.2793,-3.09109}};
};
@@ -59,20 +74,60 @@ class Land_Shed_W02: Farm {
zedPos[] = {{0.688232,1.88281,-0.00292969}};
lootPos[] = {{0.688232,1.88281,-0.00292969}};
};
//DZE ADDED BELOW
class land_jzd_kr2: Farm {
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 {
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 {
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_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 {
// 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[] = {{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[] = {{-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}};
};
//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
class land_jzd_stodola1: Farm // nm
{
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}};
};
//land_plynom in Residential.hpp
class land_zd_2: Farm // nm shed
{
zedPos[] = {{-0.195313,0.174805,-1.82467}};
lootPos[] = {{0.630859,0.280273,-1.82467}, {-1.48145,1.44141,-1.82466}};
};
//land_zd_1 in Residential.hpp
//land_marsh1 in Residential.hpp
//DZE ADDED BELOW
class land_shed_m01: Farm {
zedPos[] = {{0.218262,-1.78369,-0.347349}};
};

View File

@@ -10,16 +10,21 @@ class Hospital : Default
class Land_A_Hospital : Hospital
{
lootPos[] = {{0.79834,-1.16895,-7.33966},{-7.2334,-2.63574,-7.33966},{-16.3687,-2.4043,-7.33966},{-12.2847,-3.19434,-7.33966},{4.24268,-3.59375,-7.33966},{-3.2666,-0.925781,-7.33966},{6.85693,-2.75098,-7.33966},{11.0151,-3.9541,-7.33966},{16.8198,-4.71094,-7.33966},{-1.6875,5.47168,-7.4494},{12.7476,0.144531,3.29184},{10.2661,-1.21582,3.29184}};
zedPos[] = {{-1.6875,5.47168,-7.4494},{0.79834,-1.16895,-7.33966},{11.0151,-3.9541,-7.33966},{-12.2847,-3.19434,-7.33966},{-16.3687,-2.4043,-7.33966},{16.8198,-4.71094,-7.33966},{-3.2666,-0.925781,-7.33966},{4.24268,-3.59375,-7.33966},{6.85693,-2.75098,-7.33966},{-7.2334,-2.63574,-7.33966},{10.2661,-1.21582,3.29184},{12.7476,0.144531,3.29184}};
//lootChance = 0.2;
lootPos[] = {
//{0.79834,-1.16895,-7.33966},{-7.2334,-2.63574,-7.33966},{-16.3687,-2.4043,-7.33966},{-12.2847,-3.19434,-7.33966},{4.24268,-3.59375,-7.33966},{-3.2666,-0.925781,-7.33966},{6.85693,-2.75098,-7.33966},{11.0151,-3.9541,-7.33966},{16.8198,-4.71094,-7.33966},{-1.6875,5.47168,-7.4494},{12.7476,0.144531,3.29184},{10.2661,-1.21582,3.29184},
{17.665,-4.67188,-7.2566},{-20.7139,-1.48047,-7.2566},{-15.6924,8.60889,-7.2566},{-15.6064,1.95557,-6.8266},{-16.2139,2.27051,-7.2566},{-8.68652,4.19189,-3.7576},{14.2441,-3.98535,-3.7576},{21.5693,5.16455,1.19051},{18.3779,2.40869,6.2524},{-15.3359,-1.25439,3.40458},{-20.3252,0.410156,-3.82761}
};
lootPosSmall[] = {{9.97754,-0.814453,-7.2566},{-19.6143,1.83887,-7.1666},{-19.6055,1.6084,-6.7866},{-19.583,4.91748,-6.7866},{-19.5576,4.7417,-6.0266},{-22.1982,9.59033,-7.2566},{-12.3379,9.53857,-6.8266},{-3.23438,6.01758,-6.8266},{-13.626,3.04248,-6.0466},{2.86426,-1.68604,-6.6466},{-5.58594,1.38232,-3.7576},{-4.05762,-2.48584,-3.7576},{-11.8428,5.15576,-2.5976},{-5.57129,-3.17236,-2.5976},{-5.65332,5.01416,-2.5976},{-12.5439,-2.33838,-3.6876},{-12.5801,-1.32617,-3.3076},{-12.5928,-1.56299,-2.9276},{-12.6162,-2.24805,-2.1676},{-12.5654,2.4126,-2.5476},{14.8721,3.96875,3.66054},{16.9033,-1.33838,4.01669},{21.3174,4.88916,6.2524},{-4.00488,7.89893,-3.82761}};
zedPos[] = {{-1.6875,5.47168,-7.4494},{0.79834,-1.16895,-7.33966},{11.0151,-3.9541,-7.33966},{-12.2847,-3.19434,-7.33966},{-16.3687,-2.4043,-7.33966},{16.8198,-4.71094,-7.33966},{-3.2666,-0.925781,-7.33966},{4.24268,-3.59375,-7.33966},{6.85693,-2.75098,-7.33966},{-7.2334,-2.63574,-7.33966},{10.2661,-1.21582,3.29184},{12.7476,0.144531,3.29184}};
};
class MASH : Hospital
{
maxRoaming = 1;
zombieClass[] = {"z_soldier","z_soldier_heavy","z_doctor","z_doctor","z_doctor"};
lootPos[] = {{1.18213,-1.64844,-1.11786},{0.24707,0.798828,-1.11798}};
//lootPos[] = {{1.18213,-1.64844,-1.11786},{0.24707,0.798828,-1.11798}};
lootPos[] = {{1.18213,-1.65039,-1.17793},{0.24707,0.799316,-1.17803}};
zedPos[] = {{0.24707,0.798828,-1.11798},{1.18213,-1.64844,-1.11786}};
};
@@ -31,7 +36,8 @@ class USMC_WarfareBFieldhHospital : MASH
{
minRoaming = 1;
maxRoaming = 3;
lootPos[] = {{-3.52246,-5.03906,1.20731},{2.36621,-4.52246,1.20792},{1.39209,-0.420898,1.20752},{1.14258,5.01172,1.20786},{3.7124,1.89746,1.19794}};
//lootPos[] = {{-3.52246,-5.03906,1.20731},{2.36621,-4.52246,1.20792},{1.39209,-0.420898,1.20752},{1.14258,5.01172,1.20786},{3.7124,1.89746,1.19794}};
lootPos[] = {{-3.52246,-5.03931,1.14726},{2.36621,-4.52295,1.14786},{1.39063,-0.423096,1.14746},{1.14258,5.00952,1.1478},{3.7124,1.89795,1.14788}};
zedPos[] = {{3.7124,1.89746,1.19794},{-3.52246,-5.03906,1.20731},{1.39209,-0.420898,1.20752},{1.14258,5.01172,1.20786},{2.36621,-4.52246,1.20792}};
};

View File

@@ -1,18 +1,19 @@
class Hunting : Default
{
zombieChance = 0.6;
minRoaming = 1;
maxRoaming = 3;
zombieClass[] = {"z_hunter","z_hunter","z_hunter"};
lootChance = 0.8;
lootGroup = Hunting;
};
class Land_Misc_deerstand: Hunting
{
zombieChance = 0.3;
maxRoaming = 3;
zedPos[] = {{0.419922,-0.234375,0.985291},{-0.836914,-0.929688,0.985291}};
lootChance = 0.5;
lootPos[] = {{-0.836914,-0.929688,0.985291},{0.419922,-0.234375,0.985291}};
class Hunting : Default
{
zombieChance = 0.6;
minRoaming = 1;
maxRoaming = 3;
zombieClass[] = {"z_hunter","z_hunter","z_hunter","z_hunter2","z_hunter2","z_hunter3","z_hunter3","z_hunter4","z_hunter4"};
lootChance = 0.8;
lootGroup = Hunting;
};
class Land_Misc_deerstand: Hunting
{
zombieChance = 0.3;
maxRoaming = 3;
zedPos[] = {{0.419922,-0.234375,0.985291},{-0.836914,-0.929688,0.985291}};
lootChance = 0.5;
//lootPos[] = {{-0.836914,-0.929688,0.985291},{0.419922,-0.234375,0.985291}};
lootPos[] = {{-0.923828,-0.808594,1.08539},{0.419922,-0.237305,1.08539}};
};

View File

@@ -25,11 +25,21 @@ class Land_Ind_Workshop01_01 : Industrial
};
lootPos[] =
{
/*
{0.59668,-2.43066,-1.29449},
{1.24536,0.464844,-1.29498},
{-0.661621,-0.498047,-1.29883}
{-0.661621,-0.498047,-1.29883},
*/
{1.31201,-2.71387,-1.29234},
{-0.819336,0.449219,-1.29946}
};
lootPosSmall[] =
{
{1.81372,-3.33643,-0.714019},
{1.92627,-1.69531,-1.29493},
{-1.19482,2.00977,-0.22825},
{-0.82251,1.2583,-0.836819}
};
lootPosSmall[] = {{1.81372,-3.33643,-0.714019},{1.92627,-1.69531,-1.29493},{-1.19482,2.00977,-0.22825},{-0.82251,1.2583,-0.836819}};
};
class Land_Ind_Garage01 : Industrial
@@ -43,12 +53,23 @@ class Land_Ind_Garage01 : Industrial
};
lootPos[] =
{
/*
{-0.580322,-1.49609,-1.23523},
{-0.834229,2.75684,-1.22571},
{2.47778,-1.12793,-1.23743},
{1.32104,1.63184,-1.23218}
{1.32104,1.63184,-1.23218},
*/
{1.73755,2.71973,-1.24332},
{-0.880371,-1.9082,-1.23318},
{0.607178,3.2373,-1.23157}
};
lootPosSmall[] =
{
{2.9375,2.47754,-1.12036},
{2.8606,3.33398,-1.12131},
{1.35205,3.58398,-0.0119934},
{1.76196,3.62207,-0.772003}
};
lootPosSmall[] = {{2.9375,2.47754,-1.12036},{2.8606,3.33398,-1.12131},{1.35205,3.58398,-0.0119934},{1.76196,3.62207,-0.772003}};
};
class Land_Ind_Workshop01_02 : Industrial
@@ -61,11 +82,19 @@ class Land_Ind_Workshop01_02 : Industrial
};
lootPos[] =
{
/*
{1.15479,-0.554688,-1.42944},
{-1.18579,-0.178711,-1.42859},
{-0.661377,1.10352,-1.42688}
{-0.661377,1.10352,-1.42688},
*/
{1.47144,-0.825195,-1.42987},
{-1.29663,-0.373047,-1.42896}
};
lootPosSmall[] =
{
{1.65283,1.66846,-1.42742},
{-1.75757,-1.08887,-1.43804}
};
lootPosSmall[] = {{1.65283,1.66846,-1.42742},{-1.75757,-1.08887,-1.43804}};
};
class Land_Ind_Workshop01_04 : Industrial
@@ -82,16 +111,29 @@ class Land_Ind_Workshop01_04 : Industrial
};
lootPos[] =
{
/*
{-1.37415,4.18896,-1.53123},
{0.695435,4.24561,-1.52934},
{-1.06677,2.69531,-1.53062},
{0.79248,-4.60742,-1.49341},
{-1.84424,-6.1709,-1.44427},
{-1.05566,-4.08398,-1.51927},
{1.43774,-6.59424,-1.41742}
{1.43774,-6.59424,-1.41742},
*/
{-1.62207,-6.37305,-1.52724},
{-0.118408,-3.88281,-1.52788},
{-1.01611,2.13428,-1.53099}
};
lootPosSmall[] =
{
{-1.3833,-3.02734,-0.298156},
{-1.9519,-3.37891,-1.52803},
{1.60425,4.75244,-1.52979},
{-0.324219,1.91504,-0.680825},
{-0.302734,2.08545,0.0790772},
{-1.61523,-3.03809,0.0718207}
};
hangPos[] = {{-0.541748,4.01221,-2.03068}};
lootPosSmall[] = {{-1.3833,-3.02734,-0.298156},{-1.9519,-3.37891,-1.52803},{1.60425,4.75244,-1.52979},{-0.324219,1.91504,-0.680825},{-0.302734,2.08545,0.0790772},{-1.61523,-3.03809,0.0718207}};
};
class Land_Ind_Workshop01_L : Industrial
@@ -108,15 +150,27 @@ class Land_Ind_Workshop01_L : Industrial
};
lootPos[] =
{
/*
{-3.21143,4.7793,-1.30246},
{-0.813477,3.56348,-1.30765},
{-2.38379,2.36133,-1.30405},
{3.81299,-4.27051,-1.31345},
{0.903809,-2.58984,-1.31418},
{2.54688,-2.17773,-1.31482},
{1.72021,-3.75586,-1.31332}
{1.72021,-3.75586,-1.31332},
*/
{3.89063,-4.09888,-1.31299},
{1.80273,-1.88599,-1.31412},
{-0.928223,4.50635,-1.31364}
};
lootPosSmall[] =
{
{0.62793,-1.49097,-1.23395},
{0.805664,-1.45605,-0.0939465},
{4.56055,-5.29443,-1.31279},
{0.0273438,5.04443,-0.47565},
{0.25,5.00342,0.284006}
};
lootPosSmall[] = {{0.62793,-1.49097,-1.23395},{0.805664,-1.45605,-0.0939465},{4.56055,-5.29443,-1.31279},{0.0273438,5.04443,-0.47565},{0.25,5.00342,0.284006}};
};
class Land_Hangar_2 : Industrial
@@ -133,15 +187,31 @@ class Land_Hangar_2 : Industrial
};
lootPos[] =
{
/*
{10.1245,-6.48926,-2.56311},
{11.9399,7.90918,-2.56323},
{1.79614,7.12695,-2.56329},
{-11.8945,10.541,-2.56311},
{-8.96973,-4.34961,-2.56323},
{-0.560791,-7.5957,-2.56317},
{5.98828,-2.6123,-2.56323}
{5.98828,-2.6123,-2.56323},
*/
{-13.1816,10.4204,-2.56318},
{-0.127441,-2.88794,-2.56318},
{0.291992,3.94775,-2.56318},
{8.94482,6.87793,-2.56318},
{-13.688,-4.67871,-2.56318},
{3.4248,-8.1499,-2.56318}
};
lootPosSmall[] =
{
{-14.3721,11.1743,-2.56319},
{-0.0571289,5.94385,-2.56319},
{11.751,11.3525,-2.56319},
{-0.458008,-9.68652,-2.56319},
{-14.3472,-6.29736,-2.56319},
{14.4277,-4.83154,-2.56319}
};
lootPosSmall[] = {{-14.3721,11.1743,-2.56319},{-0.0571289,5.94385,-2.56319},{11.751,11.3525,-2.56319},{-0.458008,-9.68652,-2.56319},{-14.3472,-6.29736,-2.56319},{14.4277,-4.83154,-2.56319}};
};
class Land_A_FuelStation_Build : Industrial
@@ -157,12 +227,19 @@ class Land_A_FuelStation_Build : Industrial
};
lootPos[] =
{
/*
{-1.31885,-0.655273,-1.57446},
{1.82349,0.769531,-1.57458},
{1.67871,-0.918945,-1.57458},
{-1.23218,1.26758,-1.57458}
{-1.23218,1.26758,-1.57458},
*/
{1.88281,-0.879639,-1.57458}
};
lootPosSmall[] =
{
{-1.92578,0.237061,-0.604466},
{-1.38672,0.592651,-1.09459}
};
lootPosSmall[] = {{-1.92578,0.237061,-0.604466},{-1.38672,0.592651,-1.09459}};
};
class Land_Shed_Ind02 : Industrial
@@ -177,13 +254,33 @@ class Land_Shed_Ind02 : Industrial
};
lootPos[] =
{
{-2.28149,-5.67188,-4.65601},
{4.44653,9.67578,-4.66602},
{4.41162,2.65137,-1.27954},
{-0.437988,11.6953,-1.2764},
{-3.44482,12.2129,-1.27704}
/*
{-2.28,-5.67,-4.66},
{4.45,9.68,-4.67},
{4.41,2.65,-1.28},
{-0.44,11.7,-1.28},
{-3.44,12.21,-1.28},
{-2.77,5.85,-4.63},
{3.42,1.62,-4.63},
{4.69,-9.2,-1.28},
{-3.93,-2.17,-1.29},
{-3.94,-8.55,-1.29},
{-5.57,9.01,-4.13},
{-5.53,-8.73,-4.09},
*/
{3.39893,9.21875,-4.67596},
{1.29541,0.227539,-4.67596},
{-0.458984,11.6934,-1.28638},
{-4.00879,-8.42773,-1.29721}
};
lootPosSmall[] =
{
{-3.66064,-0.253906,-4.66599},
{4.44873,9.92578,-4.66599},
{-0.209961,-0.124023,-4.66599},
{4.89307,-0.166992,-1.29736},
{-3.74805,12.123,-1.28674}
};
lootPosSmall[] = {{-3.66064,-0.253906,-4.66599},{4.44873,9.92578,-4.66599},{-0.209961,-0.124023,-4.66599},{4.89307,-0.166992,-1.29736},{-3.74805,12.123,-1.28674}};
};
class Land_Misc_PowerStation : Industrial
@@ -195,24 +292,43 @@ class Land_Misc_PowerStation : Industrial
};
lootPos[] =
{
/*
{4.09863,4.89746,-1.25742},
{4.22803,-1.19922,-1.28812}
{4.22803,-1.19922,-1.28812},
*/
{2.98767,-5.02051,1.54777},
{3.67371,5.62207,-2.04407}
};
lootPosSmall[] =
{
{4.92017,6.24707,-1.26179},
{1.62573,-6.4541,-1.13445},
{1.33667,-6.37207,-0.374413},
{-3.20825,-6.50195,0.315748},
{-3.84949,-6.2627,-1.16402},
{-1.35608,-6.3877,-0.374122},
{-0.895142,-6.39453,-0.37413},
{2.30383,2.21387,-2.04394},
{0.0808105,-0.0566406,-1.204},
{1.98657,3.49121,-0.623982}
};
lootPosSmall[] = {{4.92017,6.24707,-1.26179},{1.62573,-6.4541,-1.13445},{1.33667,-6.37207,-0.374413},{-3.20825,-6.50195,0.315748},{-3.84949,-6.2627,-1.16402},{-1.35608,-6.3877,-0.374122},{-0.895142,-6.39453,-0.37413},{2.30383,2.21387,-2.04394},{0.0808105,-0.0566406,-1.204},{1.98657,3.49121,-0.623982}};
};
class Land_Shed_W01 : Industrial
{
zedPos[] =
{
{-1.52832,-0.249023,-1.41138}
};
lootPos[] =
{
{-1.52832,-0.249023,-1.41138}
{-1.46289,-0.12207,-1.41129}
};
};
class Land_Shed_W4 : Industrial
{
maxRoaming = 3;
zedPos[] = {};
lootPos[] = {{-1.8,2.3,-1.32},{-2.1,-1.85,-1.32},{1.85,2.83,-1.32},{0.85,-0.56,-1.32}};
};
class Land_Tovarna2 : Industrial
{
zedPos[] =
@@ -243,6 +359,7 @@ class Land_Tovarna2 : Industrial
};
lootPos[] =
{
/*
{-11.63,7.2,-5.56},
{-12.07,2.57,-5.63},
{-4.9,6.63,-5.56},
@@ -276,9 +393,49 @@ class Land_Tovarna2 : Industrial
{-10.16,7.67,6.56},
{-2.09,-7.35,6.57},
{0.91,1.59,6.56},
{-1.2,6.85,6.58}
{-1.2,6.85,6.58},
*/
{-2.02222,7.87256,-5.62933},
{-12.2107,-8.15527,-5.62469},
{-12.2112,7.7998,-5.62933},
{-8.99805,7.72168,-2.31135},
{-6.54077,8.80469,-2.31156},
{-12.6907,8.04932,1.58661},
{-9.06421,8.10645,1.58661},
{-5.39453,9.02783,1.56174},
{-8.26465,-0.520508,0.37684},
{-3.83984,4.99121,-2.31156},
{-6.6416,8.03174,-5.62933},
{-3.31763,-1.80762,-5.59492},
{-6.66382,7.57861,1.56174},
{-12.8,4.30664,1.58661},
{-12.8074,-0.535156,0.374299},
{-12.4324,5.15918,-2.31135},
{-12.8635,1.78174,-5.61933},
{-3.19507,-8.49707,-5.63091},
{6.43872,-3.48145,-4.62884},
{9.97998,-2.35059,-4.62604}
};
lootPosSmall[] =
{
{-3.22974,9.69678,1.56174},
{-10.2683,8.87354,1.58661},
{-13.2981,7.09912,-2.31135},
{-7.51001,9.64307,-2.31156},
{-8.13623,5.60693,-5.62933},
{-13.2112,0.257813,-5.62933},
{2.41431,-2.05469,-5.62689},
{1.64185,8.75879,0.374298},
{-13.2427,-8.98438,3.3743},
{-4.927,0.368164,0.372077},
{-3.88208,-3.81641,6.62795},
{-7.47241,4.50391,1.56174},
{-8.28833,4.20068,1.58661},
{-13.2944,-9.01514,0.374299},
{-7.38672,4.53418,-2.31156},
{-5.28125,2.875,-5.62933},
{2.42627,-8.75684,-5.62154}
};
lootPosSmall[] = {{-3.22974,9.69678,1.56174},{-10.2683,8.87354,1.58661},{-13.2981,7.09912,-2.31135},{-7.51001,9.64307,-2.31156},{-8.13623,5.60693,-5.62933},{-13.2112,0.257813,-5.62933},{2.41431,-2.05469,-5.62689},{1.64185,8.75879,0.374298},{-13.2427,-8.98438,3.3743},{-4.927,0.368164,0.372077},{-3.88208,-3.81641,6.62795},{-7.47241,4.50391,1.56174},{-8.28833,4.20068,1.58661},{-13.2944,-9.01514,0.374299},{-7.38672,4.53418,-2.31156},{-5.28125,2.875,-5.62933},{2.42627,-8.75684,-5.62154}};
};
class Land_Ind_Vysypka : Industrial
@@ -297,6 +454,7 @@ class Land_Ind_Vysypka : Industrial
};
lootPos[] =
{
/*
{0.487793,4.9541,-4.9686},
{1.08203,-0.407227,-4.96802},
{-0.0336914,-10.8203,-4.96686},
@@ -305,9 +463,19 @@ class Land_Ind_Vysypka : Industrial
{-6.26709,26.7344,-4.9772},
{1.64697,23.4033,-4.97098},
{7.146,3.9248,-4.96973},
{4.63623,-12.1621,-4.9697}
{4.63623,-12.1621,-4.9697},
*/
{1.50195,-15.9287,-4.9663},
{1.88208,6.03809,-4.97856},
{-8.42188,10.0103,-4.97909},
{1.21948,13.2168,-4.97966},
{-7.09595,26.0376,-4.99675}
};
lootPosSmall[] =
{
{2.5459,-16.5952,-4.97639},
{-8.72485,-22.1318,-4.97806}
};
lootPosSmall[] = {{2.5459,-16.5952,-4.97639},{-8.72485,-22.1318,-4.97806}};
};
class Land_A_BuildingWIP : Industrial
@@ -347,37 +515,96 @@ class Land_A_BuildingWIP : Industrial
lootChance = 0.5;
lootPos[] =
{
{-4.62646,4.52344,-6.45264},
{-12.6382,0.492188,-6.53247},
{-14.5049,-8.13086,-6.49951},
{-16.0015,-9.80957,-6.50415},
{-15.563,-5.17871,-6.50513},
{0.944824,-2.30176,-6.43042},
{7.28076,3.20898,-6.4104},
{9.75732,10.1123,-6.4082},
{14.771,7.2959,-6.47754},
{15.4502,-0.316406,-6.52979},
{20.4893,2.31836,-4.52576},
{17.3125,-3.09961,-2.53271},
{10.7061,-6.51563,-2.53259},
{2.22461,-9.21582,-2.53406},
{-8.92041,-7.18848,-2.53308},
{-16.3184,-8.35645,-2.53357},
{-21.3066,-6.79297,-2.53174},
{-21.6021,-1.79297,-2.53174},
{-17.8853,6.63281,-2.53186},
{-23.1982,8.44629,-2.53186},
{-17.1982,9.58594,-2.53174},
{-4.99121,9.80957,-2.53174},
{14.0864,7.43945,-2.52686},
{10.5786,-6.84863,1.4812},
{-3.19141,-2.49414,1.49414},
{-13.8184,3.99023,1.47827},
{-15.9497,-6.17578,1.48804},
{-20.6992,-16.9766,1.48291},
{-15.415,-13.3896,5.4668}
/*
{0.16,11.99,-6.49},
{-7.62,-9.06,-6.47},
{-4.94,-6.01,-6.46},
{-11.87,-9.73,-6.49},
{-8.89,9.19,-6.48},
{-4.24,10.81,-6.51},
{-21.71,4.84,-6.41},
{-23.5,11.51,-6.46},
{-23.95,-1.07,-6.45},
{-21.7,-9.83,-6.52},
{-14.56,-13.11,-6.5},
{-17.56,-15.55,-6.52},
{-14.35,-16.07,-4.52},
{-0.67,-14.4,-2.54},
{15.23,-15.17,-2.54},
{5.96,-12.56,-2.54},
{-23.95,3.74,-2.53},
{-22.82,8.38,1.48},
{-11.27,10.63,1.5},
{8.1,7.48,1.49},
{17.76,2.55,1.43},
{-7.71,-13.39,-6.87},
{0.02,-13.18,-6.87},
{8.24,-13.4,-6.87},
{7.84,-7.36,-6.51},
{0.9,4.92,-6.38},
{-5.73,-1.68,-6.41},
{-15.84,0.39,-6.48},
{-11.72,15.21,-6.47},
{-15.68,9.71,-6.44},
*/
{-15.4871,-9.755,-6.53698},
{-10.4043,-9.76697,-6.53213},
{-12.0098,-5.50208,-6.53936},
{-21.5681,-9.69409,-6.54067},
{-23.7563,8.18347,-6.45811},
{2.82544,11.3822,-6.47826},
{-7.49634,-9.24609,-6.52115},
{6.21216,7.7356,-6.41615},
{-9.29541,0.683716,-6.53778},
{16.8376,2.03186,-2.54291},
{4.77661,-9.35681,-1.50389},
{-20.3762,-2.86389,-2.53182},
{-14.3564,-9.68604,-2.5341},
{-24.1724,7.65405,-2.53182},
{1.15796,8.03552,-2.53182},
{-24.0901,11.4227,1.47364},
{-22.1218,11.8442,1.47786},
{-22.7849,10.4189,1.47402},
{-8.66797,5.81238,1.47396},
{-11.4856,-2.29419,2.50674},
{-15.6948,-13.5236,5.46682},
{-8.00171,-1.07678,5.31147},
{8.66626,-8.14514,5.344},
{11.5269,2.50977,-6.52237},
{-15.926,-17.5713,-6.53193},
{-23.8391,0.109863,-6.47638},
{-24.2957,2.29199,-2.53182},
{-7.6853,11.9902,-2.53182},
{-17.7314,1.81299,-2.53182},
{2.94116,6.97754,1.47579},
{-9.39014,-9.62451,1.47428},
{-24.1311,9.47656,5.46242}
};
lootPosSmall[] =
{
{-10.4377,-8.03418,-6.54007},
{-15.9675,-6.70959,-6.54014},
{-15.8289,7.37451,-6.46946},
{-6.89136,-5.30615,-6.52994},
{-7.37231,0.36084,-5.627},
{-20.3455,-4.8197,-2.24182},
{-13.9419,-5.02502,-2.53268},
{-6.2439,11.7518,-1.50182},
{-23.1213,12.5128,1.47477},
{-24.5806,9.80115,1.47403},
{4.63794,-0.358765,2.17724},
{-5.92505,11.8485,2.50079},
{-11.2415,4.78796,6.37765},
{-24.7756,-10.0265,5.46264},
{5.75464,-9.76001,1.47425},
{-23.0313,2.87158,-5.43137},
{-0.398193,7.37256,-6.52535},
{13.678,1.89307,-6.54251},
{-7.79321,-9.53564,-2.53376},
{15.3154,11.478,-2.54182},
{-19.8633,12.3149,-2.54182},
{-21.0286,-11.563,5.46691}
};
lootPosSmall[] = {{-10.4377,-8.03418,-6.54007},{-15.9675,-6.70959,-6.54014},{-15.8289,7.37451,-6.46946},{-6.89136,-5.30615,-6.52994},{-7.37231,0.36084,-5.627},{-20.3455,-4.8197,-2.24182},{-13.9419,-5.02502,-2.53268},{-6.2439,11.7518,-1.50182},{-23.1213,12.5128,1.47477},{-24.5806,9.80115,1.47403},{4.63794,-0.358765,2.17724},{-5.92505,11.8485,2.50079},{-11.2415,4.78796,6.37765},{-24.7756,-10.0265,5.46264},{5.75464,-9.76001,1.47425},{-23.0313,2.87158,-5.43137},{-0.398193,7.37256,-6.52535},{13.678,1.89307,-6.54251},{-7.79321,-9.53564,-2.53376},{15.3154,11.478,-2.54182},{-19.8633,12.3149,-2.54182},{-21.0286,-11.563,5.46691}};
};
class Land_Misc_Cargo1Ao : Industrial
@@ -438,11 +665,17 @@ class Land_Rail_House_01 : Industrial
};
lootPos[] =
{
/*
{2.81152,3.61426,-1.28265},
{-1.82178,3.10938,-1.28265},
{0.487793,3.38867,-1.28265}
{0.487793,3.38867,-1.28265},
*/
{-2.35864,3.04199,-1.28266}
};
lootPosSmall[] =
{
{3.13745,3.62549,-1.28266}
};
lootPosSmall[] = {{3.13745,3.62549,-1.28266}};
};
class Land_Barn_Metal : Industrial
@@ -461,6 +694,7 @@ class Land_Barn_Metal : Industrial
};
lootPos[] =
{
/*
{-2.00244,-3.19043,5.40768},
{-9.37109,-22.1816,5.57785},
{10.2598,22.709,5.57785},
@@ -469,9 +703,20 @@ class Land_Barn_Metal : Industrial
{-4.52295,-18.5713,-5.44214},
{-8.45898,-8.43848,-5.44214},
{1.78223,7.49902,-5.44214},
{-3.16846,14.9141,-5.44214}
{-3.16846,14.9141,-5.44214},
*/
{-8.18506,19.9023,-5.44214},
{4.70117,17.2849,-5.44214},
{1.31738,-7.94946,-5.44214},
{-7.74316,-20.5955,-5.44214}
};
lootPosSmall[] =
{
{10.5313,22.6777,5.58788},
{-9.65137,1.55225,5.58788},
{-9.48535,-25.0022,5.58788},
{2.83203,-25.1704,5.58788}
};
lootPosSmall[] = {{10.5313,22.6777,5.58788},{-9.65137,1.55225,5.58788},{-9.48535,-25.0022,5.58788},{2.83203,-25.1704,5.58788}};
};
class Land_Ind_Expedice_1 : Industrial
@@ -489,15 +734,31 @@ class Land_Ind_Expedice_1 : Industrial
};
lootPos[] =
{
/*
{-6.87695,-18.2285,-3.48672},
{-0.315918,13.1416,-3.48672},
{-0.5625,13.8926,9.71017},
{5.66846,-18.3174,-5.75726},
{1.67725,2.15137,-5.6839},
{-11.7915,-13.8818,-3.48672},
{0.120605,13.0664,-5.6839}
{0.120605,13.0664,-5.6839},
*/
{5.56104,-18.4136,-5.75725},
{-10.0732,-18.7891,-3.48673},
{-6.21045,-7.65479,-3.48673},
{0.0634766,-0.0908203,-5.68389},
{-2.59351,18.4795,-5.68389},
{-1.85474,13.1089,-3.48673}
};
lootPosSmall[] =
{
{6.71289,-18.1563,-5.75725},
{-9.12036,-17.6846,-3.48673},
{-7.7959,-8.31201,-3.48673},
{-1.51221,0.0673828,-5.68389},
{-2.6748,11.6543,-5.6839},
{-2.34814,11.9219,-3.48673}
};
lootPosSmall[] = {{6.71289,-18.1563,-5.75725},{-9.12036,-17.6846,-3.48673},{-7.7959,-8.31201,-3.48673},{-1.51221,0.0673828,-5.68389},{-2.6748,11.6543,-5.6839},{-2.34814,11.9219,-3.48673}};
};
class Land_A_CraneCon : Industrial
@@ -625,10 +886,7 @@ class Land_Shed_M02 : Industrial
{-0.0136719,-1.44629,-1.54199}
};
lootChance = 0.2;
lootPos[] =
{
{-0.0136719,-1.44629,-1.54199}
};
//lootPos[] = {{-0.0136719,-1.44629,-1.54199}};
lootPosSmall[] = {{1.00586,0.0698242,-1.01666},{-0.931641,0.0825195,-1.01755}};
};
@@ -755,15 +1013,24 @@ class Land_sara_hasic_zbroj : Industrial
lootChance = 0.4;
lootPos[] =
{
/*
{5.67,1.09,-2.65},
{4.97,-1.94,-2.65},
{2.69,-2.12,-2.65},
{1.86,-0.47,-2.65},
{0.14,1.76,-2.65},
{-3.02,-1.3,-2.65},
{-0.94,-0.97,-2.65}
{-0.94,-0.97,-2.65},
*/
{5.92285,1.35645,-2.66287},
{0.00878906,-1.37549,-2.66287},
{-1.82715,1.93066,-2.66287}
};
lootPosSmall[] =
{
{6.81348,-2.16846,-2.66287},
{-3.30176,-2.49121,-2.67287}
};
lootPosSmall[] = {{6.81348,-2.16846,-2.66287},{-3.30176,-2.49121,-2.67287}};
};
class Land_Ind_Quarry : Industrial
@@ -776,55 +1043,191 @@ class Land_Ind_Quarry : Industrial
{6.38,9.22,-7.48},
{-7.11,3.25,-7.48}
};
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}
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
class Land_Ind_Oil_Pump_EP1: Industrial // tak oil pump
{
lootPos[] = {{ 1.49048,-1.99609,-2.08473 }};
};
class land_provoz1: Industrial // nm brick garage
{
zedPos[] = {{-0.134766,2.26465,-2.30756},{3.37305,1.97266,-2.30756},{-4.29297,-1.39258,-2.30756},{4.35107,-1.93945,-2.30756}};
lootPos[] = {{1.60449,1.63086,-2.30756},{-2.98193,2.74121,-2.30756},{-1.59277,-2.30273,-2.30756},{1.97852,-2.03613,-2.30756}};
};
class land_b_small1: Industrial // nm cinder blocks
{
lootPos[] = {{-3.14185,1.36816,-1.50033},{-0.0275879,-1.74707,-1.50033},{-3.59619,-3.18945,-1.50033},{-0.729004,-4.95996,-1.50033}};
};
class land_seb_nasypka: Industrial // nm cement + metal
{
zedPos[] = {{7.96338,0.114258,-6.50023}};
lootPos[] = {{-0.00878906,8.66797,-6.59387},{-0.1875,4.55859,-6.59387},{10.5996,4.24609,-6.52272},{10.7554,1.3623,-6.52408},{9.08057,-6.9873,-0.134289},{2.66699,-7.53906,-0.134289}};
};
class land_kontejner_des: Industrial // nm dumpster
{
lootPos[] = {{-2.17334,-0.0615234,-0.729944}};
};
class land_f_b2: Industrial { // nm
lootPos[] = {{1.58398,0.899414,-4.24147},{-1.33301,-0.991211,-4.24147},{1.91113,-1.68262,-4.24147}};
};
class land_bud2: Industrial { // nm
lootPos[] = {{-2.32031,-1.25,-1.76814},{-1.58008,-2.3125,-1.77484}};
};
class land_seb_mine_main_opt: Industrial { // nm
lootPos[] = {{0.590332,4.68115,-0.991421},{-1.86768,4.13525,-0.992432},{0.14209,2.53271,-0.995407},{-3.43457,2.68115,-0.995136},{-3.01416,2.59521,-5.08478},{0.776855,-2.89209,-5.11486},{-6.06885,3.33838,7.8684},{-6.38086,-2.05469,7.8684},{-1.7251,-3.09668,7.8684},{-5.64111,-0.92334,14.6913},{-6.23584,2.76465,14.6913}};
};
class land_seb_mine_near: Industrial { // nm
lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
};
//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}};
};
class land_x_skladiste_low_tex: Industrial {
class land_x_skladiste_low_tex: Industrial { // concrete, arc roof, broken doors
zedPos[] = {{12.5835,2.05273,-2.73836},{-10.9365,2.72217,-2.85032}};
//lootPos[] = {{12.5835,2.05273,-2.73836},{-2.45117,8.69385,-1.62253},{-10.9365,2.72217,-2.85032},{-9.50781,-9.54053,-2.85108},{-12.1572,-6.07861,-2.8506}};
lootPos[] = {{-8.12354,-0.32373,-2.85032},{-2.31592,-4.27539,-2.5975},{8.15527,-6.89307,-2.5975},{0.398926,4.80029,-2.82628},{-6.0249,-7.64355,-2.85032}};
};
class land_b_small1: Industrial {
lootPos[] = {{-3.14185,1.36816,-1.50033},{-0.0275879,-1.74707,-1.50033},{-3.59619,-3.18945,-1.50033},{-0.729004,-4.95996,-1.50033}};
};
class land_cast1: Industrial {
lootPos[] = {{-5.39551,6.56055,-4.38392},{-5.68555,9.04297,-4.38393},{-5.57251,9.08203,-4.38393},{-3.05396,14.5527,-4.38392},{2.97681,13.9014,-4.38392},{-0.227783,11.8418,-4.38393},{1.44995,3.27246,-3.50372},{2.53198,-5.45508,-3.5118},{-4.85596,-2.20898,-3.4266},{1.04224,0.729492,-1.06585}};
};
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}};
};
class land_f_b2: Industrial {
lootPos[] = {{1.58398,0.899414,-4.24147},{-1.33301,-0.991211,-4.24147},{1.91113,-1.68262,-4.24147}};
};
class land_bud2: Industrial {
lootPos[] = {{-2.32031,-1.25,-1.76814},{-1.58008,-2.3125,-1.77484}};
};
class land_seb_mine_main_opt: Industrial {
lootPos[] = {{0.590332,4.68115,-0.991421},{-1.86768,4.13525,-0.992432},{0.14209,2.53271,-0.995407},{-3.43457,2.68115,-0.995136},{-3.01416,2.59521,-5.08478},{0.776855,-2.89209,-5.11486},{-6.06885,3.33838,7.8684},{-6.38086,-2.05469,7.8684},{-1.7251,-3.09668,7.8684},{-5.64111,-0.92334,14.6913},{-6.23584,2.76465,14.6913}};
};
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 {
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}};
lootPos[] = {{-4.45996,-2.84619,-2.21533},{-1.81152,-5.01123,-2.21533},{-5.32227,-5.21875,-2.21533}};
};
@@ -840,9 +1243,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
{
@@ -850,13 +1250,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[] = {
@@ -878,53 +1271,19 @@ 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}};
zedPos[] = {{-5.14404,-2.02295,-1.71924},{4.92676,-2.67383,-1.71924}};
lootPosSmall[] = {{-1.36499,-0.579102,3.42651}};
};
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[] = {{1.65088,2.49048,-1.23114}};
zedPos[] = {{0.125488,0.557861,-0.357141},{1.11084,-1.33643,-0.36116}};
lootPosSmall[] = {{2.89014,2.49634,-1.12063},{2.84814,3.43677,-1.12102},{1.39063,3.59766,-0.391855},{1.57227,3.61353,0.368147},{1.7251,3.61353,-1.15185}};
};
class land_mbg_garage_single_b: Industrial {
lootPos[] = {{2.54492,3.97607,-1.03899},{4.13672,-0.0625,-1.03899}};
zedPos[] = {{2.96094,6.3374,-0.133815}};
lootPosSmall[] = {{4.50586,2.56982,-1.03899}};
};
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}};
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}};
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_Ind_Oil_Pump_EP1: Industrial
{
lootPos[] = {
{ 1.49048,-1.99609,-2.08473 }};
{1.65088,2.49048,-1.23114}
};
lootPosSmall[] = {
{2.89014,2.49634,-1.12063},
{2.84814,3.43677,-1.12102},
{1.39063,3.59766,-0.391855},
{1.57227,3.61353,0.368147},
{1.7251,3.61353,-1.15185}
};
zedPos[] = {{0.125488,0.557861,-0.357141},{1.11084,-1.33643,-0.36116}};
};
class Land_IndPipe2_bigL_L_EP1: Industrial
{
@@ -945,9 +1304,13 @@ class Land_Ind_PowerStation_EP1: Industrial {
lootPos[] = {{4.04248,-3.4917,-1.26547},{3.8645,3.5249,-1.28112}};
};
class land_repair_center: Industrial {
lootPos[] = {{0.327148,1.65479,-2.37888},{-2.35547,-0.163574,-1.71927},{-2.41016,4.45654,-1.71927}};
lootPos[] = {
{0.327148,1.65479,-2.37888},{-2.35547,-0.163574,-1.71927},{-2.41016,4.45654,-1.71927}
};
lootPosSmall[] = {
{1.80469,2.01709,-1.6489},{1.60352,4.57178,-0.862885},{0.771484,4.55713,-0.48288},{1.56348,4.50439,-1.24289}
};
zedPos[] = {{0.982422,-0.634277,-1.51389}};
lootPosSmall[] = {{1.80469,2.01709,-1.6489},{1.60352,4.57178,-0.862885},{0.771484,4.55713,-0.48288},{1.56348,4.50439,-1.24289}};
};
class Land_Ind_TankBig: Industrial
@@ -965,12 +1328,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"};
@@ -979,13 +1336,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 }};
};
};

View File

@@ -5,11 +5,19 @@ class Military : Default
zombieClass[] =
{
"z_soldier",
"z_soldier_heavy",
"z_soldier",
"z_soldier",
"z_policeman",
"z_new_worker2",
"z_new_worker3",
"z_new_worker4"
"z_soldier_heavy",
"z_soldier_heavy",
"z_soldier_usmc_ghillie",
"z_soldier_cdf_officer",
"z_soldier_cdf_commander",
"z_soldier_ru_specnaz",
"z_soldier_ru_commander",
"z_soldier_ru_specialforces",
"z_soldier_ru_soldier",
"z_soldier_ru_soldier_heavy"
};
lootChance = 0.4;
lootGroup = Military;
@@ -22,88 +30,168 @@ class MilitarySpecial : Military
zombieClass[] =
{
"z_soldier_heavy",
"z_new_worker2",
"z_new_worker3",
"z_new_worker4"
"z_soldier_heavy",
"z_soldier_heavy",
"z_soldier",
"z_soldier_usmc_ghillie",
"z_soldier_cdf_officer",
"z_soldier_cdf_commander",
"z_soldier_ru_specnaz",
"z_soldier_ru_commander",
"z_soldier_ru_specialforces",
"z_soldier_ru_soldier",
"z_soldier_ru_soldier_heavy"
};
lootChance = 0.4;
lootGroup = MilitarySpecial;
};
class MilitaryIndustrial: Military {
class MilitaryIndustrial: Military
{
zombieChance = 0.3;
maxRoaming = 6;
zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"};
lootChance = 0.4;
zombieClass[] =
{
"z_soldier",
"z_soldier_heavy",
"z_soldier",
"z_worker1",
"z_worker2",
"z_worker3"
};
lootChance = 0.5;
lootGroup = MilitaryIndustrial;
};
class Land_a_stationhouse : Military
{
zedPos[] = {{-0.892578,-5.7168,-9.47058},{1.5127,1.96484,-9.47058},{18.9063,-4.06738,-9.47058},{-2.69922,-7.57422,-9.46057},{-1.35645,-8.3623,-4.6489},{-3.24219,-6.61914,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39453,-7.88281,-0.0437927},{-1.37891,-5.79102,4.41141},{-1.39648,-7.79883,4.41141}};
lootChance = 0.3;
lootPos[] = {{-2.7,-7.57,-9.46},{-0.89,-5.72,-9.47},{-3.24,-6.62,-4.65},{-1.36,-8.36,-4.65},{-1.71,-7.85,-0.04},{-3.39,-7.88,-0.04},{-1.4,-7.8,4.41},{-1.38,-5.79,4.41},{1.51,1.96,-9.47},{18.91,-4.07,-9.47},{-14.4,3.29,-0.51},{1.33,0.89,-0.51},{-2.4,-6.64,8.49}};
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}};
lootChance = 0.5;
lootPos[] = {
//{-2.7,-7.57,-9.46},{-0.89,-5.72,-9.47},{-3.24,-6.62,-4.65},{-1.36,-8.36,-4.65},{-1.71,-7.85,-0.04},{-3.39,-7.88,-0.04},{-1.4,-7.8,4.41},{-1.38,-5.79,4.41},{1.51,1.96,-9.47},{18.91,-4.07,-9.47},{-14.4,3.29,-0.51},{1.33,0.89,-0.51},{-2.37,-8.4,8.49},{12.44,2.54,-9.47},{-14.83,-7.58,-0.51},{-1.8,8.87,-0.51},{6.83,0.89,-0.51},{3.65,-6.54,-4.51},{16.29,-6.57,-4.51},{18.39,2.37,-4.51},{9.28,-1.25,-4.51},{-2.08,-4.74,8.49},
{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},{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}
};
};
class Land_Mil_ControlTower: Military
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman",
"z_soldier_ru_officer"
};
zedPos[] = {{10.0703,3.76367,-9.62869},{1.75195,5.68164,-5.51373},{3.85254,3.53516,-5.50372},{6.66113,-0.625488,-1.0787},{6.72266,3.23389,-1.0787},{2.63965,-0.191406,-1.0687}};
lootChance = 0.4;
lootPos[] = {{10.0703,3.76367,-9.62869},{3.85254,3.53516,-5.50372},{1.75195,5.68164,-5.51373},{6.66113,-0.625488,-1.0787},{2.63965,-0.191406,-1.0687},{6.72266,3.23389,-1.0787}};
lootPosSmall[] = {{7.32324,-1.55957,2.98267},{5.49023,-1.72949,-0.378693},{4.7334,-1.66064,-0.378693},{7.44922,2.03809,-0.378693},{5.86035,3.98438,-0.248688},{6.21289,4.02539,-1.0087},{4.96875,-1.39941,-0.638702},{1.08008,3.98389,-5.51367},{10.0879,3.5459,-9.64868}};
lootPos[] = {{3.41,-3.29,-5.5},{9.5,-3.63,-5.5},{8.25,-2.09,-9.64},{2.12,-3.94,-9.64},{-0.01,1.93,-9.64},{-1.96,-3.36,-9.64},{-8.37,-3.53,-9.64},{-6.19,-0.04,-8.83},{-5.49,-3.16,-8.83},{-1.92,0.06,-10.19},{-1.92,0.06,-10.19},{-2.12,-0.01,-9.64},{9.35,6.05,-9.65},{2.6,3.76,-5.5},{7.58,2.04,-0.38},{2.22,-0.87,-1.07},{5.15,-1.88,-0.39}};
lootPosSmall[] = {{9.83,4.49,-7.38},{5.56,4.05,-5.51},{6.06,4.1,-0.63},{2.51,-1.96,0.79},{0.35,-3.75,-9.52},{-3.36,-3.44,-9.64},{-6.2,0.03,-9.64},{-10.23,0.02,-8.81},{-7.6,-3.87,-9.64},{5.26,-0.93,-7.57},{0.01,6.07,-9.65},{8.2,-0.53,-4.69},{6.53,-0.91,-4.98},{3.22,-1.21,-5.5}};
};
class Land_SS_hangar: Military
{
zombieClass[] =
{
"z_soldier_pilot",
"z_soldier_heavy",
"z_soldier_pilot",
"z_soldier_heavy",
"z_worker1",
"z_worker2",
"z_worker3",
"z_soldier_ru_pilot",
"z_soldier_ru_crewman"
};
maxRoaming = 3;
zedPos[] = {{-11.7158,-18.9541,-5.87253},{11.7344,-17.165,-5.87253},{-14.2461,23.0439,-5.87253}};
lootChance = 0.4;
lootPos[] = {{11.73,-17.17,-5.87},{-11.72,-18.95,-5.87},{-14.25,23.04,-5.87},{8.38,-5.33,-5.87},{-6,5.89,-5.87},{10.18,19.62,-5.87},{-6.43,-7.66,-5.87}};
lootPosSmall[] = {{-14.1362,12.6729,-5.87253},{14.4819,-7.80371,-5.87253}};
lootPos[] = {
//{11.73,-17.17,-5.87},{-11.72,-18.95,-5.87},{-14.25,23.04,-5.87},{8.38,-5.33,-5.87},{-6,5.89,-5.87},{10.18,19.62,-5.87},{-6.43,-7.66,-5.87},
{-13.0562,-17.6318,-5.87253},{-12.9907,20.873,-5.87253},{12.7217,22.6377,-5.87253},{1.80469,3.94238,-5.87253},{13.1997,-18.3457,-5.87253}
};
lootPosSmall[] = {
{-14.1362,12.6729,-5.87253},{14.4819,-7.80371,-5.87253}
};
lootGroup = Hangar;
};
class Land_A_TVTower_Base: Military
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman"
};
zedPos[] = {{-0.95166,1.48047,-2.31586},{-2.01782,-4.24121,-2.30939},{-0.982422,-1.92383,-2.25586}};
lootPos[] = {{-0.982422,-1.92383,-2.25586},{-2.01782,-4.24121,-2.30939},{-0.95166,1.48047,-2.31586}};
lootPos[] = {{-2.68,-5.79,-22.67},{-2.58,1.46,-22.67},{1.4,-5.85,-22.67},{-1.22,2.99,-20.71},{2.12,2.16,-14.76},{-3.99,-3.58,-14.36},{-4.13,2.92,-10.61},{1.22,1.67,-6.03},{-3.95,-3.39,-6.4},{-4.45,0.97,-2.31},{-4.52,0.61,2.78},{0.82,-0.5,7.21},{-1.82,3.73,2.78}};
lootPosSmall[] = {{-1.01,-5.33,-22.67},{-1.56,2.79,-21.65},{-0.7,-4.81,-14.76},{-1.25,3.07,-12.37},{2.57,-0.52,-6.39},{-4.24,-1.23,3.96},{0.68,2.37,2.78},{-1.67,0.13,7.11}};
};
class Land_Mil_House: Military
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman",
"z_soldier_ru_ghillie",
"z_soldier_ru_specnaz",
"z_soldier_ru_commander",
"z_soldier_ru_specialforces",
"z_soldier_ru_soldier",
"z_soldier_ru_soldier_heavy"
};
zedPos[] = {{11.1638,4.70117,-5.67465},{12.4565,1.42383,-5.67465},{13.6672,4.42383,-5.67465}};
lootPos[] = {{12.4565,1.42383,-5.67465},{11.1638,4.70117,-5.67465},{13.6672,4.42383,-5.67465}};
lootPosSmall[] = {{-10.4692,4.4082,-4.94623},{-10.3696,1.2627,-4.46622},{-6.47998,4.92871,-4.98621},{-13.3208,-0.803711,-4.98621},{-13.791,-6.27832,-0.88623},{-13.2046,-5.36426,-0.196228},{-9.45166,-6.02832,-0.88623},{-0.253418,-4.12402,-0.88623},{-4.75635,-0.0224609,-0.88623},{-6.02002,-0.0410156,-0.426239},{-2.28857,0.575195,-0.876221}};
lootPos[] = {{8.02,4.33,-5.07},{5,2.6,-5.07},{10.72,-1.85,-5.57},{2.59,-5.69,-5.07},{0.71,-6.8,-5.07},{-7.48,-7.23,-4.24},{-10.11,-4.59,-5.07},{-12.21,-2.28,-5.07},{-7.87,4.44,-0.09},{-13.76,-6.49,-0.94},{-13.96,3.4,-0.94},{-1.71,-6.68,-0.94},{-1.38,-1.7,-0.94},{-12.84,2.75,3.25},{-6.69,-6.36,3.3},{-13.78,6.93,-0.69},{-5.78,6.62,-3.7},{12.91,3.06,-5.68},{14.4,1.51,-5.68},{3.92,2.42,-5.07},{10.82,-0.49,-5.57},{-1.9,-7.37,-5.07},{-1.71,3.84,-5.07},{-1.17,1.31,-5.07}};
lootPosSmall[] = {{9.8,1.45,-4.97},{9.74,2.38,-3.8},{9.74,2.35,-4.96},{9.77,3.22,-4.93},{9,4.78,-5.07},{9.73,-0.19,-4.95},{3.47,1,-5.07},{4.15,-5.17,-4.97},{1.95,-5.85,-4.95},{1.96,-5.01,-4.57},{-2.92,-3.78,-5.07},{-4.83,-6.98,-5.07},{-3.2,-7.07,-5.07},{-8.16,-6.95,-5.07},{-4.08,1.73,-0.81},{-4.08,2.51,-0.82},{-7.22,4.41,-0.94},{-7.15,1.57,-0.94},{-8.26,-4.42,-0.94},{-7.24,-4.68,-0.94},{-1,-3.76,-0.94},{-14.76,-0.43,-2.85},{-14.74,-1.45,-2.85}};
};
class Land_Mil_Barracks_i: MilitarySpecial
{
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}};
lootPosSmall[] = {{3.88037,-0.905273,-0.358246},{6.48242,-2.51367,-0.978241},{3.03662,-1.78418,-0.698242},{-0.179199,0.488281,-1.10825},{-3.20703,-0.101563,-1.11823},{-3.37061,-1.08887,0.0917664},{-6.79297,-2.63086,-1.09824},{-9.29541,-0.212891,-1.09824}};
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},
{4.56494,-2.67383,-1.14822},{0.312988,1.54492,-1.09824},{-2.95361,1.49414,-1.11823},{-3.39111,-1.99023,-0.708221},{-6.68604,-1,0.0917664},{-8.94238,-2.52441,-1.09824},{-0.59668,-1.49609,-1.10825},{3.03467,-1.00586,0.0917664},{-0.214355,-2.19531,0.0917664},{-8.93018,1.53906,-1.09824}
};
lootPosSmall[] = {
{3.88037,-0.905273,-0.358246},{6.48242,-2.51367,-0.978241},{3.03662,-1.78418,-0.698242},{-0.179199,0.488281,-1.10825},{-3.20703,-0.101563,-1.11823},{-3.37061,-1.08887,0.0917664},{-6.79297,-2.63086,-1.09824},{-9.29541,-0.212891,-1.09824}
};
};
class Land_Mil_Barracks: Military { //DZE added, was just {};
lootPos[] = {{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}};
lootPos[] = {
{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}
};
lootPosSmall[] = {
{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}
};
zedPos[] = {{-2.15845,-3.12793,-1.06134},{2.13281,3.24316,-1.06134},{-6.20679,-0.125,-1.06134},{2.09521,-3.36719,-1.06134}};
lootPosSmall[] = {{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}};
};
class Camp: Military {
maxRoaming = 1;
zedPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
lootPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
//lootPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
lootPos[] = {{0.833252,-1.52246,-1.09949},{0.38501,0.963867,-1.08948}};
};
class Land_stan: Camp {};
class CampEast: Military {
maxRoaming = 1;
zedPos[] = {{0.627441,1.83594,-1.31049},{-1.05713,-1.80762,-1.31049}};
lootPos[] = {{-1.05713,-1.80762,-1.31049},{0.627441,1.83594,-1.31049}};
//lootPos[] = {{-1.05713,-1.80762,-1.31049},{0.627441,1.83594,-1.31049}};
lootPos[] = {{-1.05713,-1.80762,-1.31049},{0.627441,1.83398,-1.31049}};
};
class CampEast_EP1: Military {
maxRoaming = 1;
zedPos[] = {{-0.670898,0.955078,-1.31049},{1.68408,-2.43359,-1.31049},{-1.76318,-1.625,-1.31049}};
lootPos[] = {{-0.670898,0.955078,-1.31049},{1.68408,-2.43359,-1.31049},{-1.76318,-1.625,-1.31049}};
//lootPos[] = {{-0.670898,0.955078,-1.31049},{1.68408,-2.43359,-1.31049},{-1.76318,-1.625,-1.31049}};
lootPos[] = {{-0.670898,0.95459,-1.31049},{1.68506,-2.43384,-1.31049},{-1.76318,-1.62646,-1.31049}};
};
class Land_tent_east: Military {
@@ -121,6 +209,7 @@ class Land_Dam_ConcP_20: Military {
};
class C130J_wreck_EP1: Military {
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
zedPos[] = {{0.37,0.61,-5.44},{-0.84,2.92,-5.44},{-2.16,-6.32,-5.42},{1.26,-20.49,-5.39},{1.88,-3.67,-5.36},{-0.2,-12.76,-4.78},{-0.36,-7.87,-4.6},{-1.32,-14.56,-4.59}};
lootPos[] = {{-0.36,-7.87,-4.6},{-0.2,-12.76,-4.78},{-1.32,-14.56,-4.59},{-2.16,-6.32,-5.42},{-0.84,2.92,-5.44},{0.37,0.61,-5.44},{1.88,-3.67,-5.36},{1.26,-20.49,-5.39}};
};
@@ -130,6 +219,7 @@ class Barrack2: Military {
};
class Mi8Wreck: Military {
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
lootPos[]={{0,-5.79,-1.71}};
};
@@ -147,61 +237,263 @@ class Land_Mil_Barracks_L: Military {
zedPos[] = {{4,-5.22,-2.21},{7.3,-4.04,-2.21},{-0.82,-4.72,-2.2}};
lootPos[] = {{-0.82,-4.72,-2.2},{4,-5.22,-2.21},{7.3,-4.04,-2.21}};
};
//DZE ADDED BELOW
class land_pozorovatelna: Military {
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}};
// 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_AII_last_floor: MilitarySpecial {
lootPos[] = {{-1.73975,-7.99756,11.6976},{-1.73975,-7.99756,11.6976},{-1.20801,5.45605,4.6129},{-3.82813,2.81494,5.46183}};
class Land_kostel_trosky: MilitarySpecial // church ruins
{
zedPos[] = {{-0.388672,10.0176,-5.37072},{-2.97852,-0.816406,-5.55207}};
lootPos[] = {{0.386719,13.5918,-5.54349},{3.81055,2.98828,-5.30816}};
};
class land_AII_middle_floor: MilitarySpecial {
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_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}};
};
class Land_budova4_winter: MilitarySpecial {
//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}};
};
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}};
};
//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
class Land_Mil_hangar_EP1: MilitaryIndustrial // tak hangar
{
zombieClass[] =
{
"z_soldier_pilot",
"z_soldier_heavy",
"z_soldier_pilot",
"z_soldier_heavy",
"z_worker1",
"z_worker2",
"z_worker3"
};
maxRoaming = 3;
lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
};
class Land_Mil_ControlTower_EP1: Military // tak atc
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman"
};
lootChance = 0.4;
lootPos[] = {
{ 5.53369,3.64355,-5.46368 },
{ 7.67236,3.68115,-1.0687 },
{ 7.53271,-1.70068,-1.0687 },
{ 4.55225,1.64111,2.92148 },
{ 10.1292,3.6958,-9.62869 },
{ 0.491943,6.1543,-9.62869},
{ 7.54956,1.74512,-0.378696},
{5.40234,-1.71289,-0.378696}};
};
class Land_Mil_Barracks_i_EP1: MilitarySpecial // tak barracks
{
lootChance = 0.2;
maxRoaming = 2;
lootPos[] = {
{5.15625,-2.30371,-1.09824},
{1.05664,-2.45508,-1.09824},
{-0.841797,-2.36133,-1.09824},
{-4.03516,-2.31836,-1.09824},
{-8.49609,-2.33838,-1.09824}};
};
class Land_Mil_House_EP1: Military // tak
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman"
};
vehPos[] = {
{ 13.439,3.25244,-5.71244,84 }};
lootPos[] = {
{11.7949,4.3147,-5.81439}
};
lootPosSmall[] = {
{-1.54785,5.46997,-5.00406},
{-2.61816,5.46362,-5.0097}
};
zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
};
class land_st_vez: MilitarySpecial // nm tower
{
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}};
};
class Land_mi8_crashed: Military // nm wreck
{
lootPos[] = {{0.238281, -2.89746, -1.65002}, {0.0, -4.06982, -1.7}, {-0.245117, -6.06982, -1.74091}};
};
class land_AII_last_floor: MilitarySpecial
{
zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
lootChance = 0.5;
maxRoaming = 3;
lootPos[] = {{-1.73975,-7.99756,11.6976},{-1.73975,-7.99756,11.6976},{-1.20801,5.45605,4.6129},{-3.82813,2.81494,5.46183}};
};
class land_AII_middle_floor: MilitarySpecial
{
zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
lootChance = 0.5;
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_AII_upper_part: Military
{
lootPos[] = {{-0.616211, -3.80762, -2.31434}, {-2.62158, -1.05127, -2.32196}, {-2.30322, 2.0415, -2.32196}};
};
class Land_Mil_Guardhouse_EP1: Military //Not enterable, Takistan version
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman"
};
lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
};
class Land_Mil_Guardhouse: Military //Enterable zero_building
{
zombieClass[] =
{
"z_soldier",
"z_soldier",
"z_policeman"
};
lootChance = 0.5;
maxRoaming = 3;
zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
lootPos[] = {
//{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}
{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}
};
lootPosSmall[] = {
{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}
};
};
//DZE ADDED BELOW
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}};
zedPos[] = {{-0.18457,-3.13574,-2.25991}};
lootPosSmall[] = {{1.06201,-0.864258,3.77092},{-1.04688,-0.759766,3.77092}};
};
class land_smd_army_hut2: Military {
lootPos[] = {{0.447266,-4.6543,-1.33328}};
zedPos[] = {{0.552734,6.06836,-0.515976},{-3.86816,-5.6875,-1.13228}};
lootPosSmall[] = {{-0.257813,-5.02539,-0.623276},{3.02832,-6.1582,-1.33328}};
};
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}};
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}
};
lootPosSmall[] = {
{14.3984,12.2852,-5.87254},{0.289063,-0.197266,-5.87254},{-14.8389,-20.6475,-5.87254},{14.8574,-20.5088,-5.87254}
};
zedPos[] = {{0.128906,-25.0273,-5.42465},{-16.7891,1.98145,-5.42465},{0.0742188,26.5654,-5.42465},{16.6631,-7.1084,-5.42465}};
lootPosSmall[] = {{14.3984,12.2852,-5.87254},{0.289063,-0.197266,-5.87254},{-14.8389,-20.6475,-5.87254},{14.8574,-20.5088,-5.87254}};
};
class land_budova5: Military {
lootPos[] = {{-2.04004,2.89844,-1.98059}};
lootPos[] = {
{-2.04004,2.89844,-1.98059}
};
lootPosSmall[] = {
{-1.96191,-0.314453,-1.98059}
};
zedPos[] = {{-3.04492,2.0332,-1.40211}};
lootPosSmall[] = {{-1.96191,-0.314453,-1.98059}};
};
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}};
zedPos[] = {{-3.35352,-2.65332,-0.407364},{0.475586,3.37402,-0.350555}};
lootPosSmall[] = {{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}};
};
class land_smd_strazni_vez: Military {
lootPos[] = {{-1.68066,-1.30273,2.00299}};
lootPos[] = {
{-1.68066,-1.30273,2.00299}
};
lootPosSmall[] = {
{-0.902344,-1.29395,1.41299},
{-1.92578,1.28613,1.41299}
};
zedPos[] = {{-1.14844,0.125977,2.28799},{1.04102,2.45898,-1.76974}};
lootPosSmall[] = {{-0.902344,-1.29395,1.41299},{-1.92578,1.28613,1.41299}};
};
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}};
zedPos[] = {{3.37598,0.145508,-0.938461},{-4.52734,0.833984,-1.2229}};
lootPosSmall[] = {{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}};
};
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}};
};
class Land_A_Stationhouse_ep1: Land_a_stationhouse{};
@@ -214,52 +506,24 @@ class land_ibr_hangar: MilitaryIndustrial
};
class land_ind_pec_03: MilitaryIndustrial
{
lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}};
lootPos[] = {
{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}
};
lootPosSmall[] = {
{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}
};
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}};
lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}};
};
class land_ind_pec_03a: MilitaryIndustrial
{
lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}};
lootPos[] = {
{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}
};
lootPosSmall[] = {
{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}
};
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}};
lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}};
};
class Land_budova4_in: Military
{
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[] = {};
@@ -275,40 +539,6 @@ class Land_vez: Military
lootPos[] = {{-0.0585938,1.51367,1.36331}};
zedPos[] = {{-0.116699,-0.801758,-2.81857}};
};
class Land_Mil_ControlTower_EP1: Military
{
lootChance = 0.4;
lootPos[] = {
{ 5.53369,3.64355,-5.46368 },
{ 7.67236,3.68115,-1.0687 },
{ 7.53271,-1.70068,-1.0687 },
{ 4.55225,1.64111,2.92148 },
{ 10.1292,3.6958,-9.62869 },
{ 0.491943,6.1543,-9.62869},
{ 7.54956,1.74512,-0.378696},
{5.40234,-1.71289,-0.378696}};
};
class Land_Mil_hangar_EP1: MilitaryIndustrial
{
maxRoaming = 3;
lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
};
class Land_Mil_Guardhouse_EP1: Military
{
lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
};
class Land_Mil_Barracks_i_EP1: MilitarySpecial
{
lootChance = 0.2;
maxRoaming = 2;
lootPos[] = {
{5.15625,-2.30371,-1.09824},
{1.05664,-2.45508,-1.09824},
{-0.841797,-2.36133,-1.09824},
{-4.03516,-2.31836,-1.09824},
{-8.49609,-2.33838,-1.09824}};
};
class Land_fortified_nest_big_EP1: Military
{
lootPos[] = {
@@ -317,15 +547,6 @@ class Land_fortified_nest_big_EP1: Military
{-0.991211,1.11621,-0.740341},
{-2.87109,-3.94238,-0.740341}};
};
class Land_Mil_House_EP1: Military
{
vehPos[] = {
{ 13.439,3.25244,-5.71244,84 }};
lootPos[] = {{11.7949,4.3147,-5.81439}};
zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
lootPosSmall[] = {{-1.54785,5.46997,-5.00406},{-2.61816,5.46362,-5.0097}};
};
class datsun02Wreck: Military
{
zombieClass[] = {"zZombie_Base","z_hunter"};
@@ -337,40 +558,13 @@ class datsun02Wreck: Military
};
class HMMWVWreck: Military
{
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
zombieClass[] = {"z_soldier","z_soldier_heavy"};
zombieChance = 0.3;
lootChance = 0;
minRoaming = 1;
maxRoaming = 2;
lootPos[] = {};
};
class Land_Mil_Guardhouse : Military //MOVED FROM RESIDENTIAL
{
maxRoaming = 3;
zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
lootPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
lootPosSmall[] = {{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}};
};
class UH1Wreck_DZ: Military {
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
zombieChance = 0.3;
lootChance = 0.6;
minRoaming = 4;
maxRoaming = 8;
lootPos[] = {};
};
class UH60Wreck_DZ: Military {
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
zombieChance = 0.3;
lootChance = 0.6;
minRoaming = 4;
maxRoaming = 8;
lootPos[] = {};
};
class UH60_NAVY_Wreck_DZ: Military {
zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
zombieChance = 0.3;
@@ -405,4 +599,4 @@ class UH60_ARMY_Wreck_burned_DZ: Military {
minRoaming = 4;
maxRoaming = 8;
lootPos[] = {};
};
};

View File

@@ -9,45 +9,151 @@ class Office : Residential
class Land_HouseB_Tenement : Office
{
//lootPos[] = {{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{-12.0771,0.645508,-20.7845},{-0.924805,5.26563,-20.7845}};
lootPos[] = {{5.41,9.89,-20.78},{5.99,14.17,-20.78},{12.96,14.07,-20.78},{14.61,8.92,-20.78},{-12.08,0.65,-20.78},{-0.92,5.27,-20.78},{1.27,-0.62,-20.78},{-2.28,2.08,-20.78},{-10.07,4.64,-20.78},{5.35,3.42,-20.78},{13.35,3.37,-20.78},{2.53,-5.75,-20.78}};
lootPos[] = {
//{5.41,9.89,-20.78},{5.99,14.17,-20.78},{12.96,14.07,-20.78},{14.61,8.92,-20.78},{-12.08,0.65,-20.78},{-0.92,5.27,-20.78},{1.27,-0.62,-20.78},{-2.28,2.08,-20.78},{-10.07,4.64,-20.78},{5.35,3.42,-20.78},{13.35,3.37,-20.78},{2.53,-5.75,-20.78},
{8.22,6.3,-20.67},{-3.17,0.92,-20.67},{-10.87,-0.99,-20.18},{11.08,11.29,-20.66},{7.27734,11.5957,-20.8045},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}
};
lootPosSmall[] = {
{-4.57,4.42,-19.59},{-1.08,4.15,-19.67},{13.53,2.95,-20.66},{-0.94,4.73,-20.66},{-11.28,4.61,-20.66},{4.33,4.15,-20.67},{13.41,11.21,-20.22},{6.7251,11.6895,-20.3445},{3.9,-0.99,-20.66},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}
};
zedPos[] = {{-0.924805,5.26563,-20.7845},{-12.0771,0.645508,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845}};
lootPosSmall[] = {{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}};
};
class Land_Panelak : Office
{
lootPos[] = {{-2.76855,-6.26563,0.0714111},{-2.93848,-1.3916,0.0714111},{-5.4209,-3.13184,0.0814209},{-6.81152,-6.15527,0.0714111},{-4.00879,2.53027,0.0714111},{-0.730469,-3.20117,2.77145},{3.97852,-7.08936,2.77145},{2.49609,2.93701,2.77145},{6.78906,1.55273,2.77145},{6.38477,-2.3916,2.77145},{6.80566,-5.77295,2.77145},{4.59863,-1.36328,2.77145},{-0.824219,1.86914,1.32864}};
lootPos[] = {
//{-2.76855,-6.26563,0.0714111},{-2.93848,-1.3916,0.0714111},{-5.4209,-3.13184,0.0814209},{-6.81152,-6.15527,0.0714111},{-4.00879,2.53027,0.0714111},{-0.730469,-3.20117,2.77145},{3.97852,-7.08936,2.77145},{2.49609,2.93701,2.77145},{6.78906,1.55273,2.77145},{6.38477,-2.3916,2.77145},{6.80566,-5.77295,2.77145},{4.59863,-1.36328,2.77145},{-0.824219,1.86914,1.32864},
{-3.76709,-5.5791,0.0714226},{-6,-5.1709,0.0714226},{-4.86719,-3.30518,0.0714226},{-5.75098,1.51172,0.0714226},{3.95483,-4.83008,2.77144},{4.8728,1.51855,2.77144},{6.07324,-5.4668,2.77144}
};
lootPosSmall[] = {
{-4.05713,-4.55469,1.21142},{-4.03857,-4.71094,0.0714211},{-5.52002,-6.45508,0.0714211},{-3.9873,-3.06934,0.761421},{-3.99072,-3.84375,1.29142},{-4.09497,-2.15625,0.0714211},{-5.01172,1.91406,0.0714211},{-4.146,1.42871,0.391421},{1.37354,-5.00684,2.77144},{4.1167,-7.4834,2.77144},{4.2417,-3.69287,3.00144},{5.16602,-3.7334,3.40144},{4.15137,1.27051,2.77144},{4.66846,1.74414,3.43144},{5.69775,-6.44727,2.77144}
};
zedPos[] = {{-2.76855,-6.26563,0.0714111},{-2.93848,-1.3916,0.0714111},{-4.00879,2.53027,0.0714111},{-6.81152,-6.15527,0.0714111},{-5.4209,-3.13184,0.0814209},{-0.824219,1.86914,1.32864},{-0.730469,-3.20117,2.77145},{2.49609,2.93701,2.77145},{3.97852,-7.08936,2.77145},{4.59863,-1.36328,2.77145},{6.38477,-2.3916,2.77145},{6.78906,1.55273,2.77145},{6.80566,-5.77295,2.77145}};
lootPosSmall[] = {{-4.05713,-4.55469,1.21142},{-4.03857,-4.71094,0.0714211},{-5.52002,-6.45508,0.0714211},{-3.9873,-3.06934,0.761421},{-3.99072,-3.84375,1.29142},{-4.09497,-2.15625,0.0714211},{-5.01172,1.91406,0.0714211},{-4.146,1.42871,0.391421},{1.37354,-5.00684,2.77144},{4.1167,-7.4834,2.77144},{4.2417,-3.69287,3.00144},{5.16602,-3.7334,3.40144},{4.15137,1.27051,2.77144},{4.66846,1.74414,3.43144},{5.69775,-6.44727,2.77144}};
};
class Land_Panelak2 : Office
{
lootPos[] = {{-0.729492,-3.00684,-2.62872},{-0.763672,1.36133,-1.3714},{-0.30127,3.64941,1.32861},{0.736328,-3.22266,2.76105},{-0.630859,1.84668,4.05231},{3.68896,-7.33789,5.46661},{2.26807,2.94043,5.46661},{6.70068,2.69043,5.46655},{6.87842,-1.45996,5.47675},{6.39795,-6.02734,5.47662},{4.55371,-1.76758,5.46667},{2.76416,0.446289,5.46661}};
lootPos[] = {
//{-0.729492,-3.00684,-2.62872},{-0.763672,1.36133,-1.3714},{-0.30127,3.64941,1.32861},{0.736328,-3.22266,2.76105},{-0.630859,1.84668,4.05231},{3.68896,-7.33789,5.46661},{2.26807,2.94043,5.46661},{6.70068,2.69043,5.46655},{6.87842,-1.45996,5.47675},{6.39795,-6.02734,5.47662},{4.55371,-1.76758,5.46667},{2.76416,0.446289,5.46661},
{0.53833,2.0498,-1.29137},{4.87939,1.90234,5.46665},{4.71045,-3.02197,5.46665},{6.01514,-5.86133,5.46665},{3.8833,-4.72314,5.46665}
};
lootPosSmall[] = {
{4.85205,-3.7041,6.69665},{4.38281,-3.68848,6.09665},{5.229,1.64063,6.24665},{4.62354,1.4082,6.24665},{5.41382,-5.54199,5.79665},{1.20215,-4.93652,5.47665}
};
zedPos[] = {{-0.729492,-3.00684,-2.62872},{-0.763672,1.36133,-1.3714},{-0.30127,3.64941,1.32861},{0.736328,-3.22266,2.76105},{-0.630859,1.84668,4.05231},{6.70068,2.69043,5.46655},{2.26807,2.94043,5.46661},{2.76416,0.446289,5.46661},{3.68896,-7.33789,5.46661},{4.55371,-1.76758,5.46667},{6.39795,-6.02734,5.47662},{6.87842,-1.45996,5.47675}};
lootPosSmall[] = {{4.85205,-3.7041,6.69665},{4.38281,-3.68848,6.09665},{5.229,1.64063,6.24665},{4.62354,1.4082,6.24665},{5.41382,-5.54199,5.79665},{1.20215,-4.93652,5.47665}};
};
class Land_rail_station_big : Office
{
lootPos[] = {{-4.96924,4.56348,-4.99451},{0.461426,4.86621,-4.9848},{2.46631,2.22656,-4.97443},{-1.31689,-2.5918,-4.98444},{-3.29102,-0.121094,-4.98444},{-1.07373,2.37305,-4.98462},{7.46338,-3.40723,-5.04431},{8.93652,3.12695,-5.04443},{-8.16357,-5.12109,-5.03442}};
lootPos[] = {
//{-4.96924,4.56348,-4.99451},{0.461426,4.86621,-4.9848},{2.46631,2.22656,-4.97443},{-1.31689,-2.5918,-4.98444},{-3.29102,-0.121094,-4.98444},{-1.07373,2.37305,-4.98462},{7.46338,-3.40723,-5.04431},{8.93652,3.12695,-5.04443},{-8.16357,-5.12109,-5.03442},
{2.11914,-0.13208,-4.98439},{0.712402,0.718994,-4.98439},{2.45654,3.80566,-4.98439},{7.45947,1.49683,-5.04438}
};
lootPosSmall[] = {
{1.81641,0.77417,-4.05439},{2.74609,0.869385,-4.05438},{-5.16943,-3.43555,-4.98439},{9.25,0.421631,-5.04438},{-6.54004,-4.09692,-5.04439}
};
zedPos[] = {{8.93652,3.12695,-5.04443},{7.46338,-3.40723,-5.04431},{-8.16357,-5.12109,-5.03442},{-4.96924,4.56348,-4.99451},{0.461426,4.86621,-4.9848},{-1.07373,2.37305,-4.98462},{-1.31689,-2.5918,-4.98444},{-3.29102,-0.121094,-4.98444},{2.46631,2.22656,-4.97443}};
lootPosSmall[] = {{1.81641,0.77417,-4.05439},{2.74609,0.869385,-4.05438},{-5.16943,-3.43555,-4.98439},{9.25,0.421631,-5.04438},{-6.54004,-4.09692,-5.04439}};
};
class Land_A_Office01 : Office
{
lootPos[] = {{-2.50391,-2.46875,-4.52798},{4.11279,-0.686523,-4.52798},{4.11133,6.11328,-4.52798},{0.242188,6.06348,-4.52798},{4.31641,3.74121,-4.52798},{5.08887,0.219727,-4.52798},{11.8037,-1.77832,-4.52798},{14.5811,-4.1123,-4.52798},{13.8174,-0.731445,-4.52798},{-7.76221,5.59082,-4.52798},{1.81152,0.994141,-2.02802},{4.93164,4.32031,-2.02802},{1.18945,6.07129,-2.02802},{2.23145,3.76563,-2.02802},{-4.89111,-2.54785,-1.99799},{-14.5596,-3.40625,-1.98798},{-15.2705,5.92871,-1.94794},{-10.9063,6.04199,0.451996},{-6.30762,3.30078,0.482025},{7.6416,6.3877,0.472015},{13.6729,6.59668,0.451965},{13.1924,-2.58594,0.492004},{3.09229,2.4375,6.2049},{-1.45654,-2.2832,6.19489},{-2.12988,4.5166,0.472015},{4.7666,-4.55859,-2.02487},{8.3457,-1.10645,-2.02802},{9.94727,-3.74023,-2.008},{7.13867,-2.50684,-2.02802},{12.8701,4.70996,-2.02802},{15.3721,3.42383,-2.02802}};
lootPos[] = {
//{-2.5,-2.47,-4.53},{4.11,-0.69,-4.53},{4.11,6.11,-4.53},{0.24,6.06,-4.53},{4.32,3.74,-4.53},{5.09,0.22,-4.53},{11.8,-1.78,-4.53},{14.58,-4.11,-4.53},{13.82,-0.73,-4.53},{-7.76,5.59,-4.53},{1.81,1,-2.03},{4.93,4.32,-2.03},{0.52,6.76,-2.03},{2.23,3.76,-2.03},{-4.89,-2.55,-2},{-14.56,-3.41,-1.99},{-15.27,5.93,-1.95},{-10.91,6.04,0.45},{-6.31,3.3,0.48},{7.64,6.39,0.47},{13.67,6.6,0.45},{13.19,-2.59,0.49},{3.09,2.44,6.2},{-1.46,-2.28,6.19},{-2.29,4.54,0.47},{4.77,-4.56,-2.02},{8.35,-1.11,-2.03},{9.95,-3.74,-2.01},{7.14,-2.51,-2.03},{12.87,4.71,-2.03},{15.37,3.42,-2.03},{-0.74,3.17,-4.53},{15.57,1.33,-2.03},{-0.07,-6.44,-2},{-7.93,3.18,-2.03},{-6.05,6.27,-2.03},{-13.11,1.06,-2.03},{-3.3,4.18,6.2},
{-7.84912,6.3855,-4.528},{3.84424,3.27051,-4.528},{-0.0383301,3.51733,-4.528},{5.37695,5.63379,-4.528},{15.5393,-1.90015,-4.528},{13.8057,-2.3811,-4.528},{10.114,3.44849,-4.528},{10.3008,6.32495,-4.528},{1.71021,1.66675,-4.528},{1.58032,5.87671,-2.028},{-0.599854,7.08984,-2.028},{3.87769,6.84229,-2.028},{-7.6709,6.72485,-2.038},{-4.729,4.19556,-2.028},{-7.93091,3.2041,-2.038},{10.2354,-1.9187,-2.018},{6.9812,-4.30933,-2.038},{15.4075,6.03198,-2.038},{13.9285,3.40649,-2.038},{0.163086,3.43286,0.472002},{7.13892,3.64844,0.471998},{1.71973,-1.40967,6.72491},{-0.443359,0.61499,-2.028},{-5.22144,-3.69971,-2.028}
};
lootPosSmall[] = {
{3.50342,5.28027,-3.668},{5.68286,4.95898,-4.048},{0.895508,4.98511,-3.288},{2.42017,4.98291,-2.908},{15.8838,-2.62256,-2.908},{4.74072,6.75391,-0.938002},{7.69507,-0.465332,-1.618},{10.7341,-1.90918,-1.158},{6.34229,-2.73242,-0.398003},{-4.86572,7.16187,-0.988003},{-4.27173,4.2207,-0.778002},{-4.56543,5.48193,-1.348},{-8.21387,2.04932,-2.028},{12.6631,2.83398,-1.918},{12.8892,2.82178,-0.778002},{11.5281,7.08887,-1.338},{11.3428,5.02344,-1.158},{11.636,6.34937,-1.338},{-3.802,4.13525,1.71201},{0.720947,3.55957,0.952003},{-3.78076,4.44727,0.952003},{10.7363,3.28833,-3.668},{6.46191,5.13013,-2.908},{7.03906,6.25537,-4.098},{6.68823,5.81177,-3.818},{10.7056,4.13135,-3.288},{2.86792,-0.489014,6.72491}
};
zedPos[] = {{0.242188,6.06348,-4.52798},{11.8037,-1.77832,-4.52798},{13.8174,-0.731445,-4.52798},{14.5811,-4.1123,-4.52798},{-2.50391,-2.46875,-4.52798},{4.11133,6.11328,-4.52798},{4.11279,-0.686523,-4.52798},{4.31641,3.74121,-4.52798},{5.08887,0.219727,-4.52798},{-7.76221,5.59082,-4.52798},{1.18945,6.07129,-2.02802},{12.8701,4.70996,-2.02802},{15.3721,3.42383,-2.02802},{1.81152,0.994141,-2.02802},{2.23145,3.76563,-2.02802},{4.93164,4.32031,-2.02802},{7.13867,-2.50684,-2.02802},{8.3457,-1.10645,-2.02802},{4.7666,-4.55859,-2.02487},{9.94727,-3.74023,-2.008},{-4.89111,-2.54785,-1.99799},{-14.5596,-3.40625,-1.98798},{-15.2705,5.92871,-1.94794},{13.6729,6.59668,0.451965},{-10.9063,6.04199,0.451996},{-2.12988,4.5166,0.472015},{7.6416,6.3877,0.472015},{-6.30762,3.30078,0.482025},{13.1924,-2.58594,0.492004},{-1.45654,-2.2832,6.19489},{3.09229,2.4375,6.2049}};
lootPosSmall[] = {{3.50342,5.28027,-3.668},{5.68286,4.95898,-4.048},{0.895508,4.98511,-3.288},{2.42017,4.98291,-2.908},{15.8838,-2.62256,-2.908},{4.74072,6.75391,-0.938002},{7.69507,-0.465332,-1.618},{10.7341,-1.90918,-1.158},{6.34229,-2.73242,-0.398003},{-4.86572,7.16187,-0.988003},{-4.27173,4.2207,-0.778002},{-4.56543,5.48193,-1.348},{-8.21387,2.04932,-2.028},{12.6631,2.83398,-1.918},{12.8892,2.82178,-0.778002},{11.5281,7.08887,-1.338},{11.3428,5.02344,-1.158},{11.636,6.34937,-1.338},{-3.802,4.13525,1.71201},{0.720947,3.55957,0.952003},{-3.78076,4.44727,0.952003},{10.7363,3.28833,-3.668},{6.46191,5.13013,-2.908},{7.03906,6.25537,-4.098},{6.68823,5.81177,-3.818},{10.7056,4.13135,-3.288},{2.86792,-0.489014,6.72491}};
};
//land_vysoky1 in Residential.hpp
//land_dlouhy2 in Residential.hpp
//land_hotel_p2 in Residential.hpp
//land_hotel_p1 in Residential.hpp
class Land_A_Office02 : Office
{
lootPos[] = {{19.8076,3.26123,5.38394},{0.27002,0.0458984,5.38394},{5.0415,-4.854,-8.17109},{-0.263184,-5.15259,-8.17105}};
lootPos[] = {
//{4.72266,-5.74219,-8.15109},{0.961426,-5.16992,-8.15076},
{19.8076,3.26123,5.38394},{0.27002,0.0458984,5.38394},{5.0415,-4.854,-8.17109},{-0.263184,-5.15259,-8.17105}
};
lootPosSmall[] = {
{-0.112305,-4.35254,-8.17073},{-0.813965,-4.14355,-7.79043},{4.104,-7.27051,-8.1711},{10.7427,2.16992,5.38394},{21.5991,2.56104,5.42394},{-4.02783,2.4668,5.38394},{-17.3232,1.29028,8.71684},{-18.0732,3.38623,8.71684}
};
zedPos[] = {{4.72266,-5.74219,-8.15109},{0.961426,-5.16992,-8.15076}};
lootPosSmall[] = {{-0.112305,-4.35254,-8.17073},{-0.813965,-4.14355,-7.79043},{4.104,-7.27051,-8.1711},{10.7427,2.16992,5.38394},{21.5991,2.56104,5.42394},{-4.02783,2.4668,5.38394},{-17.3232,1.29028,8.71684},{-18.0732,3.38623,8.71684}};
};
// ALT-MAP Support
class Land_aif_hotel : Office //multi-story hotel with balconies
{
lootPos[] = {{14.0938,-4.38281,6.24485},{4.53711,12.8853,6.24484},{-20.623,-7.3584,2.74056},{-20.9375,-15.0547,-0.759435},{-20.4102,-4.95166,-4.25943},{20.8555,6.60156,-4.25943}};
};
class Land_aif_hotel_bio : Office // multi-story hotel with balconies
{
zedPos[] = {{-18.5781,4.20801,-8.5215},{-17.8848,-6.33398,-8.52153}};
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}};
};
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
{
@@ -66,20 +172,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[] = {
@@ -96,8 +188,10 @@ class Land_ibr_terminal: Office
{ -2.83545,10.9009,-0.949741 },
{ -2.27686,-16.4238,3.68157 }};
};
class Land_A_Villa_EP1: Office
class Land_A_Villa_EP1: Office // takistani villa 2 story multi-wing
{
zedPos[] = {{5.5332,2.70361,-5.06721},{13.2578,-14.3623,-5.06719}};
//lootPos[] = {{-15.002,9.06104,1.97169},{10.3047,10.7178,1.97146},{17.4824,-15.3862,1.99229},{10.1855,-0.722656,-1.4844},{-2.54688,14.5698,-1.4844},{-14.8945,12.7236,-1.4844},{-8.51953,14.1064,-1.4844}};
lootPos[] = {
{ -23.3442,1.71484,-3.65929 },
{ 14.5498,-5.69775,-5.06722 },
@@ -178,13 +272,14 @@ class Land_MBG_Police_Station: Office
{ -2.3125,6.18774,1.68834 }};
};
class land_mbg_apartments_big_04: Office {
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}};
zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
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}};
};
class land_mbg_ger_estate_2: Office {
lootPos[] = {{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}};
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[] = {
{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}
};
lootPosSmall[] = {
{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}
};
//zedPos[] = {{2.38281,-1.03418,-2.13187}};
zedPos[] = {{2.12695,-8.60791,-1.5208},{1.33984,9.18945,-1.25071}};
lootPosSmall[] = {{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}};
};

File diff suppressed because it is too large Load Diff

View File

@@ -44,6 +44,26 @@ class MAP_sara_domek_vilka_ruins: ResidentialRuins {
};
class Land_ruin_01: ResidentialRuins {
lootPos[] = {{-4.26,-0.18,-1.46},{3.41,0.27,-1.71},{3,3.43,-1.5},{0.62,-1.74,-1.36},{4.55,-2.17,-1.73},{-5.05,3.07,-1.73}};
//lootPos[] = {{-4.26,-0.18,-1.46},{3.41,0.27,-1.71},{3,3.43,-1.5},{0.62,-1.74,-1.36},{4.55,-2.17,-1.73},{-5.05,3.07,-1.73}};
lootPos[] = {{-4.31934,-0.115234,-1.45578},{3.41309,0.270508,-1.71365},{3.00293,3.42773,-1.55765},{0.62207,-1.73779,-1.49048}};
zedPos[] = {{3.41309,0.271484,-1.71381},{3.00293,3.42773,-1.49768},{-4.25708,-0.181641,-1.45575},{0.622559,-1.73828,-1.36047}};
};
};
// ALT-MAP Support
class Land_afbarabizna: ResidentialRuins {
lootPos[] = {{-1.29395,-2.97461,-4.22117}};
zedPos[] = {{-4.08594,2.62402,-4.22117},{4.95557,6.03857,-4.22117},{4.60156,5.50098,-0.168262},{-0.87793,-3.41406,-0.168266},{-0.065918,-1.86523,-0.512926}};
};
class Land_dum_zboreny: ResidentialRuins { //ruins
lootPos[] = {{3.74902,4.38379,-2.37675}};
zedPos[] = {{3.74902,4.38379,-2.37675},{-3.16797,3.21484,-2.37675},{-3.31787,3.25781,1.40384},{-5.35791,-1.67676,1.41383}};
};
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}};
};
//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

View File

@@ -14,9 +14,13 @@ class Land_Shed_W03 : HouseRoaming {};
class Land_HouseV_2T1 : HouseRoaming {};
class Land_HouseV_3I2 : HouseRoaming {};
class land_housev_3i3: HouseRoaming {
lootPos[] = {{-4.2334,0.291992,-1.47064},{1.10059,-2.99854,-0.790649},{3.53027,-2.34033,-1.74265}};
lootPos[] = {
{-4.2334,0.291992,-1.47064},{1.10059,-2.99854,-0.790649},{3.53027,-2.34033,-1.74265}
};
lootPosSmall[] = {
{-4.85645,0.550293,-0.340637},{2.21289,0.783691,-0.160645},{-0.833008,0.554199,-0.620636},{1.79785,-2.99902,-1.09064},{5.06055,-2.68164,-1.56265}
};
zedPos[] = {{-4.18457,-1.68164,-0.525635},{0.419922,-1.00781,-0.525635},{4.35059,-1.37939,-0.98764}};
lootPosSmall[] = {{-4.85645,0.550293,-0.340637},{2.21289,0.783691,-0.160645},{-0.833008,0.554199,-0.620636},{1.79785,-2.99902,-1.09064},{5.06055,-2.68164,-1.56265}};
};
class Land_HouseBlock_A1_2 : HouseRoaming {};
class Land_HouseBlock_A2 : HouseRoaming {};

View File

@@ -8,12 +8,29 @@ class Supermarket : Default
{
"zZombie_Base",
"zZombie_Base",
"z_hunter",
"z_teacher",
"z_suit1",
"z_suit2",
"z_new_villager2",
"z_new_villager3",
"z_new_villager4"
"z_villager1",
"z_villager2",
"z_villager3",
"z_citizen1",
"z_citizen2",
"z_citizen3",
"z_citizen4",
"z_lumberjack1",
"z_lumberjack2",
"z_lumberjack3",
"z_lumberjack4",
"z_profiteer1",
"z_profiteer2",
"z_profiteer3",
"z_profiteer4",
"z_rocker1",
"z_rocker2",
"z_rocker3",
"z_rocker4",
"z_assistant",
"z_pilot"
};
lootGroup = Supermarket;
};
@@ -21,15 +38,25 @@ class Supermarket : Default
class Land_A_GeneralStore_01a : Supermarket
{
zedPos[] = {{0.902344,-4.36133,-1.20178},{13.9651,-4.50293,-1.20172},{-3.41382,-4.39063,-1.20172},{7.36304,3.00781,-1.20172},{7.53394,-2.70117,-1.20172},{10.2612,0.111328,-1.2016},{1.93018,2.17285,-1.2016},{-2.90942,1.32031,-1.2016},{3.27588,-3.48242,-1.2016},{3.5752,0.0361328,-1.2016},{3.72729,8.36133,-1.2016},{-3.82788,5.33203,-1.2016},{-6.93237,1.07617,-1.2016},{7.84424,-0.136719,-1.2016},{-0.370605,5.17871,-1.20154},{10.5864,-3.84277,-1.20148},{4.77783,5.57617,-1.20148},{-7.29565,-2.68164,-1.20148},{9.84009,8.33984,-1.20148},{-1.28857,-2.57715,-1.20135},{13.0864,4.35645,-1.19165},{12.9934,6.31836,-1.19153},{-7.55054,8.54199,-1.19141},{-4.42407,8.9668,-1.19135}};
lootPos[] = {{-6.93237,1.07617,-1.2016},{-7.29565,-2.68164,-1.20148},{-3.41382,-4.39063,-1.20172},{-1.28857,-2.57715,-1.20135},{0.902344,-4.36133,-1.20178},{3.27588,-3.48242,-1.2016},{7.53394,-2.70117,-1.20172},{13.9651,-4.50293,-1.20172},{10.2612,0.111328,-1.2016},{10.5864,-3.84277,-1.20148},{7.84424,-0.136719,-1.2016},{3.5752,0.0361328,-1.2016},{-0.370605,5.17871,-1.20154},{4.77783,5.57617,-1.20148},{13.0864,4.35645,-1.19165},{12.9934,6.31836,-1.19153},{7.36304,3.00781,-1.20172},{1.93018,2.17285,-1.2016},{-3.82788,5.33203,-1.2016},{-7.55054,8.54199,-1.19141},{-4.42407,8.9668,-1.19135},{3.72729,8.36133,-1.2016},{9.84009,8.33984,-1.20148},{-2.90942,1.32031,-1.2016}};
lootPosSmall[] = {{12.4678,4.51172,-1.20155},{12.2119,6.25098,-0.301548},{12.1895,3.68262,0.0484505},{11.8174,6.31689,-0.65155},{-8.67676,-2.41064,-1.13155},{-4.2002,-3.14355,-0.351551},{-0.165039,-1.3457,-0.351551},{14.6006,-1.38281,-0.351551},{3.03809,-5.03418,-0.351551},{0.512695,3.40527,-0.31155},{4.77637,6.76172,-0.301548},{7.27539,0.938477,-0.621552},{3.96777,1.00488,-0.621552},{0.389648,0.95459,-0.621552},{5.04004,3.44287,-0.65155},{1.85254,6.4248,-0.65155},{-3.65723,6.61133,-0.20155},{-4.39746,4.46191,-0.691551},{6.9248,6.38574,-1.01155},{2.77637,3.38477,-1.01155},{-0.217773,6.68066,-1.01155},{4.49707,-4.98828,0.408451},{-2.33203,-1.35205,0.408451},{2.0127,-1.36572,0.408451},{6.39746,-3.04395,0.408451},{14.6045,-0.722168,0.408451},{-2.43164,-3.73682,0.02845},{-4.77539,-1.35986,0.02845},{-0.436523,-3.04297,0.02845},{14.6104,-2.17139,0.02845},{12.6592,0.830078,0.34845},{4.00684,-3.15039,-0.351551},{2.7334,-3.0415,-0.731548},{-2.67676,-1.36133,-0.731548},{-1.00488,-5.00537,-0.731548},{8.34863,-1.43018,-0.731548},{1.8291,3.77197,-0.661549}};
lootPos[] = {
//{-6.93237,1.07617,-1.2016},{-7.29565,-2.68164,-1.20148},{-3.41382,-4.39063,-1.20172},{-1.28857,-2.57715,-1.20135},{0.902344,-4.36133,-1.20178},{3.27588,-3.48242,-1.2016},{7.53394,-2.70117,-1.20172},{13.9651,-4.50293,-1.20172},{10.2612,0.111328,-1.2016},{10.5864,-3.84277,-1.20148},{7.84424,-0.136719,-1.2016},{3.5752,0.0361328,-1.2016},{-0.370605,5.17871,-1.20154},{4.77783,5.57617,-1.20148},{13.0864,4.35645,-1.19165},{12.9934,6.31836,-1.19153},{7.36304,3.00781,-1.20172},{1.93018,2.17285,-1.2016},{-3.82788,5.33203,-1.2016},{-7.55054,8.54199,-1.19141},{-4.42407,8.9668,-1.19135},{3.72729,8.36133,-1.2016},{9.84009,8.33984,-1.20148},{-2.90942,1.32031,-1.2016},
{13.2969,4.94678,-1.20155},{2.97559,7.32373,-1.20155},{-8.35352,-0.0244141,-1.20155},{7.78223,4.45801,-1.20155},{6.59863,-0.292969,-1.20155},{-6.92285,-1.6709,-1.20155},{11.9189,-2.81885,-1.20155},{-1.85547,-2.16162,-1.20155}
};
lootPosSmall[] = {
{12.4678,4.51172,-1.20155},{12.2119,6.25098,-0.301548},{12.1895,3.68262,0.0484505},{11.8174,6.31689,-0.65155},{-8.67676,-2.41064,-1.13155},{-4.2002,-3.14355,-0.351551},{-0.165039,-1.3457,-0.351551},{14.6006,-1.38281,-0.351551},{3.03809,-5.03418,-0.351551},{0.512695,3.40527,-0.31155},{4.77637,6.76172,-0.301548},{7.27539,0.938477,-0.621552},{3.96777,1.00488,-0.621552},{0.389648,0.95459,-0.621552},{5.04004,3.44287,-0.65155},{1.85254,6.4248,-0.65155},{-3.65723,6.61133,-0.20155},{-4.39746,4.46191,-0.691551},{6.9248,6.38574,-1.01155},{2.77637,3.38477,-1.01155},{-0.217773,6.68066,-1.01155},{4.49707,-4.98828,0.408451},{-2.33203,-1.35205,0.408451},{2.0127,-1.36572,0.408451},{6.39746,-3.04395,0.408451},{14.6045,-0.722168,0.408451},{-2.43164,-3.73682,0.02845},{-4.77539,-1.35986,0.02845},{-0.436523,-3.04297,0.02845},{14.6104,-2.17139,0.02845},{12.6592,0.830078,0.34845},{4.00684,-3.15039,-0.351551},{2.7334,-3.0415,-0.731548},{-2.67676,-1.36133,-0.731548},{-1.00488,-5.00537,-0.731548},{8.34863,-1.43018,-0.731548},{1.8291,3.77197,-0.661549}
};
};
class Land_A_GeneralStore_01 : Supermarket
{
zedPos[] = {{0.105713,-9.60449,-1.21088},{10.5925,-9.94238,-1.21088},{-4.85986,-10.4199,-1.21082},{13.3127,-7.64941,-1.2016},{-3.57446,4.46777,-1.2016},{11.1685,-3.7334,-1.20154},{13.3013,-1.77441,-1.20154},{-3.33813,0.615234,-1.20154},{-7.97754,-5.78418,-1.20154},{1.12256,-1.58691,-1.20148},{-6.80884,-1.23926,-1.20148},{-8.2251,-7.32227,-1.20148},{1.31885,1.4668,-1.20142},{1.6499,5.14746,-1.20142},{-2.02612,-7.64844,-1.20142},{3.78979,-5.69238,-1.20142},{8.89404,-8.37207,-1.20142},{-9.38428,4.46094,-1.20142},{-9.38843,-3.30176,-1.20142},{9.81201,1.43066,-1.20142},{-3.77539,-3.86621,-1.20135},{0.753906,-3.69336,-1.20129},{9.01367,3.84961,-1.20129}};
lootPos[] = {{-9.38843,-3.30176,-1.20142},{-3.77539,-3.86621,-1.20135},{1.31885,1.4668,-1.20142},{9.01367,3.84961,-1.20129},{13.3013,-1.77441,-1.20154},{9.81201,1.43066,-1.20142},{1.6499,5.14746,-1.20142},{0.753906,-3.69336,-1.20129},{13.3127,-7.64941,-1.2016},{11.1685,-3.7334,-1.20154},{8.89404,-8.37207,-1.20142},{-2.02612,-7.64844,-1.20142},{-7.97754,-5.78418,-1.20154},{-8.2251,-7.32227,-1.20148},{3.78979,-5.69238,-1.20142},{-9.38428,4.46094,-1.20142},{-3.57446,4.46777,-1.2016},{-3.33813,0.615234,-1.20154},{10.5925,-9.94238,-1.21088},{0.105713,-9.60449,-1.21088},{-4.85986,-10.4199,-1.21082},{-6.80884,-1.23926,-1.20148},{1.12256,-1.58691,-1.20148}};
lootPosSmall[] = {{11.0537,-0.321289,-0.661549},{11.0303,2.8833,0.0484514},{10.6646,1.86377,-0.651548},{6.66162,-2.69971,-0.611548},{6.02979,-2.6416,-0.611548},{2.16553,-2.68262,-0.611548},{-1.36963,-2.75684,-0.611548},{-0.919434,-0.283936,-0.301549},{0.583008,-0.308594,-1.01155},{0.804199,3.0752,-0.311549},{4.90234,3.04053,0.0484514},{-5.73779,0.694824,-0.20155},{0.796875,0.0898438,-0.301549},{2.73145,2.66406,-0.301549},{0.523926,2.81567,-1.01155},{-4.8208,2.87158,-0.701549},{-3.87061,-5.0415,-0.731549},{-4.73096,-5.00537,0.408451},{-2.1792,-5.02222,-0.351549},{-3.39795,-6.95508,-0.731549},{-3.58203,-7.24365,-0.731549},{-3.49756,-7.12695,0.408451},{-9.95215,-6.05859,0.348451},{13.4136,-5.93457,0.408451},{13.4463,-4.45898,0.028451},{13.4424,-6.20215,-0.351549},{2.93018,-8.67773,-0.351549},{1.53516,-6.79199,-0.351549},{7.16211,-5.12427,-0.351549},{6.79346,-5.11816,-0.73155},{2.87158,-6.91943,-0.73155},{0.0541992,-5.03271,-0.73155},{-1.979,-8.6875,-0.73155},{-5.84424,-5.04883,-0.73155},{-6.99268,-5.06836,-1.11155},{5.23535,-6.8335,-1.11155},{0.290039,-8.68701,-1.11155},{-0.649414,-8.68115,0.40845},{-0.983398,-9.56299,-1.21082}};
lootPos[] = {
//{-9.38843,-3.30176,-1.20142},{-3.77539,-3.86621,-1.20135},{1.31885,1.4668,-1.20142},{9.01367,3.84961,-1.20129},{13.3013,-1.77441,-1.20154},{9.81201,1.43066,-1.20142},{1.6499,5.14746,-1.20142},{0.753906,-3.69336,-1.20129},{13.3127,-7.64941,-1.2016},{11.1685,-3.7334,-1.20154},{8.89404,-8.37207,-1.20142},{-2.02612,-7.64844,-1.20142},{-7.97754,-5.78418,-1.20154},{-8.2251,-7.32227,-1.20148},{3.78979,-5.69238,-1.20142},{-9.38428,4.46094,-1.20142},{-3.57446,4.46777,-1.2016},{-3.33813,0.615234,-1.20154},{10.5925,-9.94238,-1.21088},{0.105713,-9.60449,-1.21088},{-4.85986,-10.4199,-1.21082},{-6.80884,-1.23926,-1.20148},{1.12256,-1.58691,-1.20148},
{11.8149,1.27979,-1.20155},{5.10449,1.61377,-1.20155},{1.70215,3.4292,-1.20155},{-0.771973,2.04102,-1.20155},{-3.59473,-6.04688,-1.20155},{-2.38428,-5.82202,-1.20155},{10.5171,-6.46729,-1.20155},{12.8472,-4.97754,-1.20155},{8.63623,-3.65381,-1.20155},{-3.22852,-10.0454,-1.21081}
};
lootPosSmall[] = {
{11.0537,-0.321289,-0.661549},{11.0303,2.8833,0.0484514},{10.6646,1.86377,-0.651548},{6.66162,-2.69971,-0.611548},{6.02979,-2.6416,-0.611548},{2.16553,-2.68262,-0.611548},{-1.36963,-2.75684,-0.611548},{-0.919434,-0.283936,-0.301549},{0.583008,-0.308594,-1.01155},{0.804199,3.0752,-0.311549},{4.90234,3.04053,0.0484514},{-5.73779,0.694824,-0.20155},{0.796875,0.0898438,-0.301549},{2.73145,2.66406,-0.301549},{0.523926,2.81567,-1.01155},{-4.8208,2.87158,-0.701549},{-3.87061,-5.0415,-0.731549},{-4.73096,-5.00537,0.408451},{-2.1792,-5.02222,-0.351549},{-3.39795,-6.95508,-0.731549},{-3.58203,-7.24365,-0.731549},{-3.49756,-7.12695,0.408451},{-9.95215,-6.05859,0.348451},{13.4136,-5.93457,0.408451},{13.4463,-4.45898,0.028451},{13.4424,-6.20215,-0.351549},{2.93018,-8.67773,-0.351549},{1.53516,-6.79199,-0.351549},{7.16211,-5.12427,-0.351549},{6.79346,-5.11816,-0.73155},{2.87158,-6.91943,-0.73155},{0.0541992,-5.03271,-0.73155},{-1.979,-8.6875,-0.73155},{-5.84424,-5.04883,-0.73155},{-6.99268,-5.06836,-1.11155},{5.23535,-6.8335,-1.11155},{0.290039,-8.68701,-1.11155},{-0.649414,-8.68115,0.40845},{-0.983398,-9.56299,-1.21082}
};
};
//DZE ADDED BELOW

View File

@@ -8,7 +8,7 @@
#include "Groups\Buildings\Industrial.hpp"
#include "Groups\Buildings\Military.hpp"
#include "Groups\Buildings\Office.hpp"
#include "Groups\Buildings\Powerlines.hpp"
//#include "Groups\Buildings\Powerlines.hpp"
#include "Groups\Buildings\Residential.hpp"
#include "Groups\Buildings\ResidentialRuins.hpp"
#include "Groups\Buildings\Supermarket.hpp"

View File

@@ -11,7 +11,7 @@
#include "Buildings\InfectedCamp.hpp"
#include "Buildings\Military.hpp"
#include "Buildings\Office.hpp"
#include "Buildings\Powerlines.hpp"
//#include "Buildings\Powerlines.hpp"
#include "Buildings\ResidentialRuins.hpp"
#include "Buildings\Supermarket.hpp"
#include "Buildings\Toilet.hpp"

View File

@@ -1,113 +1,129 @@
#include "LootDefines.hpp"
class CfgLoot
{
class Groups
{
//Not renamed yet
#define DZ_BP_VestPouch DZ_Czech_Vest_Puch
#define DZ_BP_Patrol DZ_Patrol_Pack_EP1
#define DZ_BP_Assault DZ_Assault_Pack_EP1
#define DZ_BP_Survival DZ_TK_Assault_Pack_EP1
#define DZ_BP_Alice DZ_ALICE_Pack_EP1
#define DZ_BP_British DZ_British_ACU
#define DZ_BP_Czech DZ_CivilBackpack_EP1
#define DZ_BP_Coyote DZ_Backpack_EP1
#define ItemBloodbagAPos bloodBagAPos
#define ItemBloodbagANeg bloodBagANeg
#define ItemBloodbagBPos bloodBagBPos
#define ItemBloodbagBNeg bloodBagBNeg
#define ItemBloodbagABPos bloodBagABPos
#define ItemBloodbagABNeg bloodBagABNeg
#define ItemBloodbagOPos bloodBagOPos
#define ItemBloodbagONeg bloodBagONeg
#define ItemBloodTester bloodTester
#define ItemTransfusionKit transfusionKit
#define ItemBloodbagEmpty emptyBloodBag
// General groups
#include "Groups\Ammo.hpp"
#include "Groups\AmmoBox.hpp"
#include "Groups\Attachments.hpp"
#include "Groups\Medical.hpp"
#include "Groups\Generic.hpp"
#include "Groups\Trash.hpp"
#include "Groups\Consumable.hpp"
#include "Groups\ConsumableItems.hpp"
#include "Groups\Parts.hpp"
//DZE
#include "Groups\Weapons.hpp"
#include "Groups\Clothes.hpp"
#include "Groups\Backpacks.hpp"
// Points of interest
#include "Groups\CrashSite.hpp"
#include "Groups\CarePackage.hpp"
#include "Groups\InfectedCamp.hpp"
// Buildings
#include "CfgBuildingLoot.hpp"
// Zombies
#include "Groups\Zombies\Civilian.hpp"
#include "Groups\Zombies\Hunter.hpp"
#include "Groups\Zombies\Police.hpp"
#include "Groups\Zombies\Military.hpp"
#include "Groups\Zombies\Worker.hpp" //DZE
#undef DZ_BP_VestPouch
#undef DZ_BP_Patrol
#undef DZ_BP_Assault
#undef DZ_BP_Survival
#undef DZ_BP_Alice
#undef DZ_BP_British
#undef DZ_BP_Czech
#undef DZ_BP_Coyote
#undef ItemBloodbagAPos
#undef ItemBloodbagANeg
#undef ItemBloodbagBPos
#undef ItemBloodbagBNeg
#undef ItemBloodbagABPos
#undef ItemBloodbagABNeg
#undef ItemBloodbagOPos
#undef ItemBloodbagONeg
#undef ItemBloodTester
#undef ItemTransfusionKit
#undef ItemBloodbagEmpty
};
class Buildings
{
class Default
{
zombieChance = 0.2;
minRoaming = 0;
maxRoaming = 2;
zombieClass[] =
{
// "zZombie_Base",
"z_hunter",
"z_teacher",
"z_suit1",
"z_suit2",
"z_worker1",
"z_worker2",
"z_worker3",
"z_villager1",
"z_villager2",
"z_villager3"
};
lootChance = 0;
lootGroup = "";
lootPos[] = {};
};
// Buildings
#include "CfgBuildingPos.hpp"
};
#include "LootDefines.hpp"
class CfgLoot
{
class Groups
{
//Not renamed yet
#define DZ_BP_VestPouch DZ_Czech_Vest_Pouch
#define DZ_BP_Patrol DZ_Patrol_Pack_EP1
#define DZ_BP_Assault DZ_Assault_Pack_EP1
#define DZ_BP_Survival DZ_TK_Assault_Pack_EP1
#define DZ_BP_Alice DZ_ALICE_Pack_EP1
#define DZ_BP_British DZ_British_ACU
#define DZ_BP_Czech DZ_CivilBackpack_EP1
#define DZ_BP_Coyote DZ_Backpack_EP1
#define ItemBloodbagAPos bloodBagAPOS
#define ItemBloodbagANeg bloodBagANEG
#define ItemBloodbagBPos bloodBagBPOS
#define ItemBloodbagBNeg bloodBagBNEG
#define ItemBloodbagABPos bloodBagABPOS
#define ItemBloodbagABNeg bloodBagABNEG
#define ItemBloodbagOPos bloodBagOPOS
#define ItemBloodbagONeg bloodBagONEG
#define ItemBloodTester bloodTester
#define ItemTransfusionKit transfusionKit
#define ItemBloodbagEmpty emptyBloodBag
// General groups
#include "Groups\Ammo.hpp"
#include "Groups\AmmoBox.hpp"
#include "Groups\Attachments.hpp"
#include "Groups\Medical.hpp"
#include "Groups\Generic.hpp"
#include "Groups\Trash.hpp"
#include "Groups\Consumable.hpp"
#include "Groups\ConsumableItems.hpp"
#include "Groups\Fuel.hpp"
#include "Groups\Parts.hpp"
//DZE
#include "Groups\Weapons.hpp"
#include "Groups\Clothes.hpp"
#include "Groups\Backpacks.hpp"
#include "Groups\Wrecks.hpp"
// Points of interest
#include "Groups\CrashSite.hpp"
#include "Groups\CarePackage.hpp"
#include "Groups\InfectedCamp.hpp"
// Buildings
#include "CfgBuildingLoot.hpp"
// Zombies
#include "Groups\Zombies\Civilian.hpp"
#include "Groups\Zombies\Hunter.hpp"
#include "Groups\Zombies\Police.hpp"
#include "Groups\Zombies\Military.hpp"
#include "Groups\Zombies\Worker.hpp" //DZE
#include "Groups\Zombies\Suit.hpp" //DZE
#include "Groups\Zombies\Doctor.hpp" //DZE
#include "Groups\Zombies\Pilot.hpp" //DZE
//New 1.0.6.3
#include "Groups\Zombies\Bodyguard.hpp" //DZE
#include "Groups\Zombies\Crewman.hpp" //DZE
#include "Groups\Zombies\Ghillie.hpp" //DZE
#include "Groups\Zombies\Lumberjack.hpp" //DZE
#include "Groups\Zombies\Officer.hpp" //DZE
#include "Groups\Zombies\Rebels.hpp" //DZE
#include "Groups\Zombies\Rocker.hpp" //DZE
#include "Groups\Zombies\SpecialForces.hpp" //DZE
#undef DZ_BP_VestPouch
#undef DZ_BP_Patrol
#undef DZ_BP_Assault
#undef DZ_BP_Survival
#undef DZ_BP_Alice
#undef DZ_BP_British
#undef DZ_BP_Czech
#undef DZ_BP_Coyote
#undef ItemBloodbagAPos
#undef ItemBloodbagANeg
#undef ItemBloodbagBPos
#undef ItemBloodbagBNeg
#undef ItemBloodbagABPos
#undef ItemBloodbagABNeg
#undef ItemBloodbagOPos
#undef ItemBloodbagONeg
#undef ItemBloodTester
#undef ItemTransfusionKit
#undef ItemBloodbagEmpty
};
class Buildings
{
class Default
{
zombieChance = 0.2;
minRoaming = 0;
maxRoaming = 2;
zombieClass[] =
{
// "zZombie_Base",
"z_hunter",
"z_teacher",
"z_suit1",
"z_suit2",
"z_worker1",
"z_worker2",
"z_worker3",
"z_villager1",
"z_villager2",
"z_villager3"
};
lootChance = 0;
lootRefreshTimer = 900;
lootGroup = "";
lootPos[] = {};
};
// Buildings
#include "CfgBuildingPos.hpp"
};
};

View File

@@ -90,6 +90,10 @@ AmmoMilitaryLow[] =
{Loot_MAGAZINE, 3, 20Rnd_B_765x17_Ball},
{Loot_MAGAZINE, 4, 20Rnd_762x51_DMR},
{Loot_MAGAZINE, 4, 20Rnd_762x51_FNFAL},
{Loot_MAGAZINE, 3, 20Rnd_762x51_B_SCAR},
{Loot_MAGAZINE, 4, 20Rnd_B_AA12_Pellets},
{Loot_MAGAZINE, 4, 20Rnd_B_AA12_74Slug},
// {Loot_MAGAZINE, 3, 20Rnd_B_AA12_HE},
//Handgrenades
{Loot_MAGAZINE, 5, SmokeShell},
@@ -105,6 +109,10 @@ AmmoMilitaryHigh[] =
{Loot_MAGAZINE, 10, 30Rnd_556x45_Stanag},
{Loot_MAGAZINE, 5, 30Rnd_556x45_G36},
{Loot_MAGAZINE, 5, 100Rnd_556x45_BetaCMag},
{Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR},
{Loot_MAGAZINE, 5, 20Rnd_B_AA12_Pellets},
{Loot_MAGAZINE, 5, 20Rnd_B_AA12_74Slug},
// {Loot_MAGAZINE, 5, 20Rnd_B_AA12_HE},
//Battle rifles
{Loot_MAGAZINE, 5, 20Rnd_762x51_DMR},
@@ -234,6 +242,7 @@ AmmoEU[] =
//Battle rifles
{Loot_MAGAZINE, 4, 20Rnd_762x51_FNFAL},
{Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR},
//Machine guns
{Loot_MAGAZINE, 2, 100Rnd_556x45_M249},
@@ -318,7 +327,8 @@ assaultrifleammo[] = {
{Loot_MAGAZINE, 8, 30Rnd_556x45_Stanag},
{Loot_MAGAZINE, 10, 30Rnd_545x39_AK},
{Loot_MAGAZINE, 5, 30Rnd_556x45_StanagSD},
{Loot_MAGAZINE, 8, 20Rnd_762x51_FNFAL}
{Loot_MAGAZINE, 8, 20Rnd_762x51_FNFAL},
{Loot_MAGAZINE, 6, 20Rnd_762x51_B_SCAR}
};
machinegunammo[] = {
{Loot_MAGAZINE, 4, 100Rnd_556x45_BetaCMag},
@@ -337,4 +347,4 @@ machinegunammoexpl[] = {
{Loot_MAGAZINE, 4, 200Rnd_556x45_M249},
{Loot_MAGAZINE, 1, MAAWS_HEAT},
{Loot_MAGAZINE, 2, PipeBomb}
};
};

View File

@@ -49,7 +49,9 @@ AmmoBoxEU1[] =
AmmoBoxEU2[] =
{
{Loot_MAGAZINE, 9, 20Rnd_762x51_FNFAL},
{Loot_MAGAZINE, 1, 100Rnd_762x51_M240}
{Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR},
{Loot_MAGAZINE, 1, 100Rnd_762x51_M240},
{Loot_MAGAZINE, 4, 5Rnd_86x70_L115A1}
};
//7.62x39mm

View File

@@ -10,8 +10,7 @@ AttachmentsEast[] =
{
{Loot_MAGAZINE, 2, Attachment_Kobra},
{Loot_MAGAZINE, 1, Attachment_PSO1},
{Loot_MAGAZINE, 3, Attachment_SupMakarov},
{Loot_MAGAZINE, 2, Attachment_SupBizon},
{Loot_MAGAZINE, 3, Attachment_Sup9},
{Loot_MAGAZINE, 1, Attachment_Sup545},
{Loot_MAGAZINE, 2, Attachment_GP25},
{Loot_MAGAZINE, 2, Attachment_Ghillie},
@@ -27,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}
};

View File

@@ -2,4 +2,10 @@ Boat[] =
{
{Loot_WEAPON, 1, ItemFishingPole},
{Loot_GROUP, 9, Generic}
};
BoatSmall[] =
{
{Loot_GROUP, 5, GenericSmall},
{Loot_GROUP, 4, Consumable}
};

View File

@@ -19,12 +19,12 @@ 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, 1, ItemPadlock},
{Loot_MAGAZINE, 2, ItemComboLock},
{Loot_MAGAZINE, 1, ItemTent},
{Loot_MAGAZINE, 1, ItemCamoNet},
{Loot_MAGAZINE, 1, forest_net_kit},
//Groups
{Loot_GROUP, 5, AmmoCivilian},

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},
@@ -22,4 +22,17 @@ Church[] =
{Loot_GROUP, 4, Generic},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Consumable}
};
ChurchSmall[] =
{
//Tools
{Loot_WEAPON, 3, ItemCompass},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 3, pistols},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 5, AmmoCivilian},
{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 4, GenericSmall},
{Loot_GROUP, 8, Consumable}
};

View File

@@ -1,13 +1,14 @@
Construction[] =
{
{Loot_MAGAZINE, 9, ItemLog},
{Loot_MAGAZINE, 9, ItemLog}, // Used for crafting and vanilla buildables
{Loot_MAGAZINE, 9, ItemPlank},
{Loot_MAGAZINE, 5, ItemStone},
{Loot_MAGAZINE, 8, equip_nails},
{Loot_MAGAZINE, 9, equip_metal_sheet_rusted},
{Loot_MAGAZINE, 5, ItemStone}, // Used for crafting and vanilla buildables
{Loot_MAGAZINE, 4, equip_nails},
// {Loot_MAGAZINE, 4, ItemScrews},
// {Loot_MAGAZINE, 9, equip_metal_sheet_rusted},
{Loot_MAGAZINE, 9, equip_metal_sheet},
{Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, ItemPadlock},
{Loot_MAGAZINE, 1, ItemComboLock},
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
@@ -19,19 +20,16 @@ Construction[] =
//Items
{Loot_MAGAZINE, 6, ItemSandbag},
{Loot_MAGAZINE, 4, ItemJerryCan},
{Loot_MAGAZINE, 1, ItemWire},
{Loot_MAGAZINE, 4, ItemTankTrap},
{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, 1, equip_scrapelectronics},
{Loot_MAGAZINE, 2, equip_1inch_metal_pipe},
{Loot_MAGAZINE, 2, equip_2inch_metal_pipe},
{Loot_MAGAZINE, 1, MortarBucket},
{Loot_MAGAZINE, 2, CinderBlocks},
{Loot_MAGAZINE, 3, ItemFuelBarrelEmpty},
{Loot_MAGAZINE, 3, ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit},
@@ -41,5 +39,7 @@ Construction[] =
{Loot_PILE, 4, Consumable, 1, 2},
{Loot_GROUP, 10, Trash},
//{Loot_GROUP, 6, Parts},
{Loot_GROUP, 4, JerryCan},
{Loot_GROUP, 3, FuelBarrel},
{Loot_GROUP, 3, Generic}
};

View File

@@ -11,7 +11,7 @@ DynamicDebris[] =
{Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 5, ItemCompass},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},
{Loot_GROUP, 7, JerryCan},
{Loot_GROUP, 15, Parts}
};
@@ -30,7 +30,7 @@ DynamicDebrisMilitary[] =
{Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 5, ItemCompass},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},
{Loot_GROUP, 7, JerryCan},
{Loot_MAGAZINE, 7, ItemSandbag},
{Loot_GROUP, 8, Military},
{Loot_GROUP, 15, Parts}
@@ -38,7 +38,7 @@ DynamicDebrisMilitary[] =
SupplyDrop[] = {
{Loot_WEAPON, 5, ItemSledge},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},
{Loot_GROUP, 7, JerryCan},
{Loot_MAGAZINE, 7, bulk_ItemTankTrap},
{Loot_MAGAZINE, 7, PartPlywoodPack},
{Loot_MAGAZINE, 7, PartPlankPack},

View File

@@ -12,17 +12,14 @@ Farm[] =
//Items
{Loot_MAGAZINE, 4, ItemSandbag},
{Loot_MAGAZINE, 3, ItemJerryCan},
{Loot_MAGAZINE, 4, ItemFuelCan},
{Loot_MAGAZINE, 1, TrapBear},
{Loot_MAGAZINE, 8, PartWoodPile},
{Loot_MAGAZINE, 3, equip_rope},
{Loot_MAGAZINE, 3, equip_duct_tape},
{Loot_MAGAZINE, 6, equip_nails},
{Loot_MAGAZINE, 3, equip_nails},
{Loot_MAGAZINE, 4, equip_string},
{Loot_MAGAZINE, 2, equip_lever},
{Loot_MAGAZINE, 2, PartPlankPack},
{Loot_MAGAZINE, 2, ItemFuelBarrelEmpty},
{Loot_MAGAZINE, 1, ItemLightBulb},
{Loot_MAGAZINE, 1, ItemSledgeHead},
{Loot_MAGAZINE, 1.5, ItemSledgeHandle},
@@ -33,5 +30,23 @@ Farm[] =
{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 8, Consumable},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 3, JerryCan},
{Loot_GROUP, 4, FuelCan},
{Loot_GROUP, 2, FuelBarrel},
{Loot_GROUP, 8, Generic}
};
FarmSmall[] =
{
{Loot_GROUP, 10, pistols},
{Loot_WEAPON, 5, ItemKnife},
{Loot_MAGAZINE, 3, equip_duct_tape},
{Loot_MAGAZINE, 6, equip_nails},
{Loot_MAGAZINE, 4, equip_string},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 15, AmmoCivilian},
{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 8, Consumable},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, GenericSmall}
};

View File

@@ -1,18 +1,45 @@
Hangar[] =
{
{Loot_GROUP, 10, MilitarySpecial},
{Loot_GROUP, 8, MilitarySpecial},
//Tools
{Loot_WEAPON, 2, ItemEtool},
{Loot_WEAPON, 4, ItemEtool},
//Items
{Loot_MAGAZINE, 2, PartVRotor},
{Loot_MAGAZINE, 2, ItemSandbag},
{Loot_MAGAZINE, 2, ItemWire},
{Loot_MAGAZINE, 2, ItemTankTrap},
{Loot_MAGAZINE, 1, PartEngine},
{Loot_MAGAZINE, 4, PartGeneric},
{Loot_MAGAZINE, 3, PartGlass},
{Loot_MAGAZINE, 3, ItemSandbag},
{Loot_MAGAZINE, 3, ItemWire},
{Loot_MAGAZINE, 3, ItemTankTrap},
//Groups
{Loot_GROUP, 20, Trash},
{Loot_GROUP, 20, Consumable},
{Loot_GROUP, 10, Generic},
{Loot_GROUP, 5, AttachmentsGeneric}
};
{Loot_PILE, 6, Trash, 1, 2},
{Loot_PILE, 3, Consumable, 1, 2},
{Loot_GROUP, 6, Generic},
{Loot_GROUP, 3, AttachmentsGeneric}
};
HangarSmall[] =
{
{Loot_TOOL, 2, Binocular},
{Loot_WEAPON, 2, NVGoggles},
{Loot_GROUP, 8, pistols},
{Loot_TOOL, 2, Binocular_Vector},
{Loot_TOOL, 3, ItemKnife},
{Loot_TOOL, 1.3, ItemGPS},
{Loot_TOOL, 3, ItemMap},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
{Loot_MAGAZINE, 0.5, PipeBomb},
{Loot_MAGAZINE, 0.5, MAAWS_HEAT},
{Loot_MAGAZINE, 2, 100Rnd_762x54_PK},
{Loot_GROUP, 8, AmmoMilitaryLow},
{Loot_GROUP, 8, AmmoMilitaryHigh},
{Loot_GROUP, 8, AttachmentsEast},
{Loot_GROUP, 6, AttachmentsWest},
{Loot_GROUP, 8, MedicalLow},
{Loot_GROUP, 8, Trash},
{Loot_GROUP, 8, Consumable},
{Loot_GROUP, 8, GenericSmall}
};

View File

@@ -9,4 +9,20 @@ Hospital[] =
{Loot_CONTAINER, 1, DZ_MedBox, MedicalBox, 8, 16},
{Loot_PILE, 10, Trash, 1, 2}
};
HospitalSmall[] =
{
{Loot_MAGAZINE, 2, equip_gauze},
{Loot_MAGAZINE, 2, equip_gauzepackaged},
{Loot_MAGAZINE, 8, ItemBandage},
{Loot_MAGAZINE, 5, ItemPainkiller},
{Loot_MAGAZINE, 4, ItemMorphine},
{Loot_MAGAZINE, 3, ItemEpinephrine},
{Loot_MAGAZINE, 4, ItemAntibacterialWipe},
{Loot_MAGAZINE, 4, ItemHeatPack},
{Loot_MAGAZINE, 3, ItemBloodTester},
{Loot_MAGAZINE, 2, ItemBloodbagEmpty},
{Loot_GROUP, 2, Antibiotics},
{Loot_GROUP, 6, Bloodbags}
};

View File

@@ -20,8 +20,8 @@ Hunting[] =
{Loot_MAGAZINE, 2, FoodNutmix},
{Loot_MAGAZINE, 1, ItemDocument},
{Loot_MAGAZINE, 1, ItemMixOil},
//{Loot_WEAPON, 1, RedRyder},
//{Loot_MAGAZINE, 1, 350Rnd_BB_Magazine},
{Loot_WEAPON, 1, RedRyder},
{Loot_MAGAZINE, 1, 350Rnd_BB_Magazine},
//Backpacks
{Loot_GROUP, 5, backpacks},
@@ -32,8 +32,8 @@ Hunting[] =
{Loot_MAGAZINE, 2, ItemBandage},
{Loot_MAGAZINE, 1, ItemDomeTent},
{Loot_MAGAZINE, 3, TrapBear},
{Loot_MAGAZINE, 1, 12Rnd_Quiver_Wood},
{Loot_MAGAZINE, 1, 1Rnd_Bolt_Tranquilizer},
{Loot_MAGAZINE, 3, 12Rnd_Quiver_Wood},
{Loot_MAGAZINE, 2, 1Rnd_Bolt_Tranquilizer},
{Loot_MAGAZINE, 1, 1Rnd_Bolt_Explosive},
{Loot_PILE, 10, AmmoCivilian, 1, 3},

View File

@@ -3,7 +3,6 @@ Industrial[] =
//Tools
{Loot_WEAPON, 3, ItemKnife},
{Loot_WEAPON, 6, ItemToolbox},
{Loot_WEAPON, 2, ItemFlashlight},
// {Loot_WEAPON, 8, ItemCrowbar},
{Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar},
// {Loot_WEAPON, 5, ItemHatchet},
@@ -16,30 +15,40 @@ Industrial[] =
{Loot_WEAPON, 1, ItemKeyKit},
//Items
{Loot_MAGAZINE, 6, ItemSandbag},
{Loot_MAGAZINE, 4, ItemJerryCan},
{Loot_MAGAZINE, 1, ItemWire},
{Loot_MAGAZINE, 4, ItemTankTrap},
// {Loot_MAGAZINE, 6, ItemSandbag},
// {Loot_MAGAZINE, 1, ItemWire},
// {Loot_MAGAZINE, 4, ItemTankTrap},
{Loot_MAGAZINE, 1, equip_brick},
{Loot_MAGAZINE, 3, equip_duct_tape},
{Loot_MAGAZINE, 2, equip_hose},
{Loot_MAGAZINE, 6, equip_nails},
{Loot_MAGAZINE, 3, equip_nails},
// {Loot_MAGAZINE, 3, ItemScrews},
{Loot_MAGAZINE, 1, equip_scrapelectronics},
// {Loot_MAGAZINE, 1, equip_scrapelectronics},
{Loot_MAGAZINE, 2, equip_metal_sheet},
{Loot_MAGAZINE, 2, equip_1inch_metal_pipe},
{Loot_MAGAZINE, 2, equip_2inch_metal_pipe},
{Loot_MAGAZINE, 12, ItemPlank},
{Loot_MAGAZINE, 1, MortarBucket},
{Loot_MAGAZINE, 2, CinderBlocks},
{Loot_MAGAZINE, 3, ItemFuelBarrelEmpty},
{Loot_MAGAZINE, 8, ItemPlank},
{Loot_MAGAZINE, 2, MortarBucket},
{Loot_MAGAZINE, 3, CinderBlocks},
{Loot_MAGAZINE, 3, ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit},
//Other
{Loot_GROUP, 15, Parts},
{Loot_GROUP, 7, Military},
{Loot_PILE, 10, Trash, 1, 3},
{Loot_PILE, 4, Consumable, 1, 2},
{Loot_GROUP, 8, Generic}
};
{Loot_PILE, 3, Consumable, 1, 2},
{Loot_GROUP, 4, JerryCan},
{Loot_GROUP, 3, FuelBarrel},
{Loot_GROUP, 5, Generic}
};
IndustrialSmall[] =
{
{Loot_WEAPON, 3, ItemKnife},
{Loot_WEAPON, 1, ItemKeyKit},
{Loot_MAGAZINE, 2, equip_duct_tape},
{Loot_MAGAZINE, 6, equip_nails},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 3, Consumable},
{Loot_GROUP, 5, GenericSmall}
};

View File

@@ -11,12 +11,12 @@ Military[] =
{Loot_GROUP, 4, machineguns},
//Tools
{Loot_TOOL, 3, Binocular},
{Loot_TOOL, 4, ItemFlashlightRed},
{Loot_TOOL, 4, ItemKnife},
{Loot_TOOL, 0.5, ItemGPS},
{Loot_TOOL, 3, ItemMap},
{Loot_TOOL, 3, ItemEtool},
{Loot_TOOL, 3, Binocular},
{Loot_TOOL, 4, ItemFlashlightRed},
{Loot_TOOL, 3.5, ItemKnife},
{Loot_TOOL, 0.5, ItemGPS},
{Loot_TOOL, 3, ItemMap},
{Loot_TOOL, 3, ItemEtool},
//Backpacks
{Loot_GROUP, 6, backpacks},
@@ -28,26 +28,45 @@ Military[] =
{Loot_GROUP, 1, specialclothes},
//Containers
{Loot_CONTAINER, 2.3, DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20}, //545x39 AK74, RPK74
{Loot_CONTAINER, 1.7, DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20}, //762x39 AK47
{Loot_CONTAINER, 1, DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10}, //762x54r SVD, PKM
{Loot_CONTAINER, 3, DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20}, //556x45 G36, M249
{Loot_CONTAINER, 2, DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10}, //762x51 FAL, M240
{Loot_CONTAINER, 3, DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20}, //556x45 STANAG, M249
{Loot_CONTAINER, 2, DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10}, //762x51 DMR, M240
{Loot_CONTAINER, 3, DZ_MedBox, MedicalBox, 10, 20},
{Loot_CONTAINER, 1.1, DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20}, //545x39 AK74, RPK74
{Loot_CONTAINER, 0.5, DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20}, //762x39 AK47
{Loot_CONTAINER, 0.2, DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10}, //762x54r SVD, PKM
{Loot_CONTAINER, 1.2, DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20}, //556x45 G36, M249
{Loot_CONTAINER, 0.8, DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10}, //762x51 FAL, M240
{Loot_CONTAINER, 1.2, DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20}, //556x45 STANAG, M249
{Loot_CONTAINER, 0.8, DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10}, //762x51 DMR, M240
// {Loot_CONTAINER, 2, DZ_MedBox, MedicalBox, 10, 20},
//Other
{Loot_MAGAZINE, 5, FoodMRE},
{Loot_MAGAZINE, 5, ItemSandbag},
// {Loot_MAGAZINE, 4, ItemSandbag},
{Loot_PILE, 15, AmmoMilitaryLow, 1, 3},
{Loot_GROUP, 4, AmmoMilitaryHigh},
{Loot_GROUP, 4, AttachmentsGeneric},
{Loot_GROUP, 8, AttachmentsEast},
{Loot_PILE, 10, MedicalLow, 1, 2},
{Loot_PILE, 15, Trash, 1, 2},
{Loot_PILE, 10, Consumable, 1, 2},
{Loot_GROUP, 10, Generic}
{Loot_PILE, 10, Consumable, 1, 2}
// {Loot_GROUP, 10, Generic}
};
MilitarySmall[] =
{
{Loot_GROUP, 10, pistols},
{Loot_TOOL, 2, Binocular},
{Loot_TOOL, 0.5, ItemGPS},
{Loot_TOOL, 3, ItemMap},
{Loot_TOOL, 3, ItemKnife},
{Loot_GROUP, 2, militaryclothes},
{Loot_GROUP, 2, specialclothes},
{Loot_GROUP, 15, AmmoMilitaryLow},
{Loot_GROUP, 4, AmmoMilitaryHigh},
{Loot_GROUP, 4, AttachmentsGeneric},
{Loot_GROUP, 8, AttachmentsEast},
{Loot_GROUP, 10, MedicalLow},
{Loot_GROUP, 15, Trash},
{Loot_GROUP, 10, Consumable}
// {Loot_GROUP, 10, GenericSmall}
};
MilitarySpecial[] =
@@ -59,14 +78,15 @@ MilitarySpecial[] =
{Loot_GROUP, 12, submachinegun},
{Loot_GROUP, 13, assaultrifles},
{Loot_GROUP, 9, machineguns},
//Tools
{Loot_TOOL, 4, Binocular},
{Loot_TOOL, 2, Binocular_Vector},
{Loot_TOOL, 3, ItemFlashlightRed},
{Loot_TOOL, 5, ItemKnife},
{Loot_TOOL, 1.3, ItemGPS},
{Loot_TOOL, 4, ItemMap},
{Loot_TOOL, 2, ItemEtool},
{Loot_TOOL, 3, Binocular},
{Loot_TOOL, 2, Binocular_Vector},
{Loot_TOOL, 3, ItemFlashlightRed},
{Loot_TOOL, 4, ItemKnife},
{Loot_TOOL, 1.3, ItemGPS},
{Loot_TOOL, 4, ItemMap},
{Loot_TOOL, 2, ItemEtool},
//Backpacks
{Loot_GROUP, 9, militarybackpacks},
@@ -77,17 +97,17 @@ MilitarySpecial[] =
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 3, DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20}, //5.45x39
{Loot_CONTAINER, 2, DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14}, //5.56x45
{Loot_CONTAINER, 2, DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14}, //7.62x39
{Loot_CONTAINER, 1, DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5}, //7.62x54R
// {Loot_CONTAINER, 0.5, DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7}, //7.62x54R
{Loot_CONTAINER, 0.5, DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15}, //GP-25
{Loot_CONTAINER, 0.5, DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7}, //Grenades
{Loot_CONTAINER, 2.2, DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20}, //5.45x39
{Loot_CONTAINER, 1.8, DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14}, //5.56x45
{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_ExplosiveBoxRU, AmmoBoxRU4, 5, 15}, //GP-25
{Loot_CONTAINER, 0.2, DZ_ExplosiveBoxRU, AmmoBoxRU5, 3, 7}, //Grenades
//Other
{Loot_MAGAZINE, 3, FoodMRE},
{Loot_MAGAZINE, 2, ItemSandbag},
// {Loot_MAGAZINE, 2, ItemSandbag},
{Loot_MAGAZINE, 0.5, PipeBomb},
{Loot_MAGAZINE, 0.5, MAAWS_HEAT},
{Loot_MAGAZINE, 2, 100Rnd_762x54_PK},
@@ -98,15 +118,50 @@ MilitarySpecial[] =
{Loot_GROUP, 6, AttachmentsWest},
{Loot_PILE, 10, MedicalLow, 1, 2},
{Loot_PILE, 10, Trash, 1, 2},
{Loot_PILE, 10, Consumable, 1, 2},
{Loot_GROUP, 8, Generic}
{Loot_PILE, 10, Consumable, 1, 2}
// {Loot_GROUP, 8, Generic}
};
MilitarySpecialSmall[] =
{
{Loot_WEAPON, 2, NVGoggles},
{Loot_GROUP, 10, pistols},
{Loot_TOOL, 3, Binocular},
{Loot_TOOL, 2, Binocular_Vector},
{Loot_TOOL, 3, ItemKnife},
{Loot_TOOL, 1.3, ItemGPS},
{Loot_TOOL, 3, ItemMap},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
{Loot_MAGAZINE, 0.5, PipeBomb},
{Loot_MAGAZINE, 0.5, MAAWS_HEAT},
{Loot_MAGAZINE, 2, 100Rnd_762x54_PK},
{Loot_GROUP, 15, AmmoMilitaryLow},
{Loot_GROUP, 10, AmmoMilitaryHigh},
{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 8, AttachmentsEast},
{Loot_GROUP, 6, AttachmentsWest},
{Loot_GROUP, 10, MedicalLow},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 10, Consumable}
// {Loot_GROUP, 8, GenericSmall}
};
MilitaryIndustrial[] = {//DZE ADDED
{Loot_GROUP, 15, Parts},
{Loot_MAGAZINE, 5, FoodMRE},
{Loot_MAGAZINE, 3, ItemFuelBarrelEmpty},
{Loot_MAGAZINE, 2, ItemGenerator},
{Loot_MAGAZINE, 2, fuel_pump_kit},
{Loot_GROUP, 15, Military}
};
{Loot_GROUP, 15, Parts},
{Loot_MAGAZINE, 5, FoodMRE},
{Loot_GROUP, 3, FuelBarrel},
{Loot_MAGAZINE, 2, ItemGenerator},
{Loot_MAGAZINE, 2, fuel_pump_kit},
{Loot_MAGAZINE, 3, ItemWire},
{Loot_MAGAZINE, 3, ItemTankTrap},
{Loot_MAGAZINE, 6, ItemSandbag},
{Loot_MAGAZINE, 1, PartEngine},
{Loot_GROUP, 15, Military},
{Loot_GROUP, 4, Generic}
};
MilitaryIndustrialSmall[] = {
{Loot_GROUP, 15, MilitarySmall},
{Loot_GROUP, 8, GenericSmall}
};

View File

@@ -40,4 +40,25 @@ Office[] =
{Loot_GROUP, 8, Generic},
{Loot_GROUP, 10, AmmoCivilian},
{Loot_GROUP, 5, AttachmentsGeneric}
};
OfficeSmall[] =
{
{Loot_WEAPON, 3, ItemWatch},
{Loot_WEAPON, 6, ItemMap},
{Loot_WEAPON, 6, ItemCompass},
{Loot_WEAPON, 6, ItemKnife},
{Loot_WEAPON, 4, ItemMatchbox},
{Loot_WEAPON, 4, Binocular},
{Loot_GROUP, 10, pistols},
{Loot_GROUP, 4, MilitarySmall},
{Loot_GROUP, 3, clothes},
{Loot_GROUP, 2, specialclothes},
{Loot_MAGAZINE, 5, ItemAntibacterialWipe},
{Loot_MAGAZINE, 5, ItemPainkiller},
{Loot_GROUP, 8, Consumable},
{Loot_GROUP, 6, Trash},
{Loot_GROUP, 8, GenericSmall},
{Loot_GROUP, 10, AmmoCivilian},
{Loot_GROUP, 5, AttachmentsGeneric}
};

View File

@@ -4,7 +4,7 @@ Residential[] =
{Loot_WEAPON, 6, MeleeBaseBallBat},
//Weapon Groups
{Loot_GROUP, 3, Military},
// {Loot_GROUP, 3, Military},
{Loot_GROUP, 8, pistols},
{Loot_GROUP, 6, shotgunsingleshot},
@@ -15,17 +15,14 @@ Residential[] =
{Loot_WEAPON, 6, ItemFlashlight},
{Loot_WEAPON, 5, ItemKnife},
// {Loot_WEAPON, 3, ItemShovel},
{Loot_WEAPON, 1, ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
{Loot_WEAPON, 1, ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
// {Loot_WEAPON, 1, ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
// {Loot_WEAPON, 1, ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
{Loot_WEAPON, 1, Binocular},
//Backpacks
{Loot_GROUP, 4, backpacks},
//Other
{Loot_MAGAZINE, 0.5, ItemPadlock},
{Loot_MAGAZINE, 1, PartPlywoodPack},
{Loot_PILE, 6, AmmoCivilian, 1, 2},
{Loot_PILE, 10, Trash, 1, 3},
{Loot_PILE, 10, Consumable, 1, 2},
@@ -35,4 +32,23 @@ Residential[] =
{Loot_GROUP, 3, tents},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Generic}
};
};
ResidentialSmall[] =
{
{Loot_GROUP, 8, pistols},
{Loot_WEAPON, 3, ItemMap},
{Loot_WEAPON, 5, ItemWatch},
{Loot_WEAPON, 5, ItemCompass},
{Loot_WEAPON, 5, ItemKnife},
{Loot_WEAPON, 1, Binocular},
{Loot_MAGAZINE, 0.5, ItemComboLock},
{Loot_GROUP, 6, AmmoCivilian},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 10, Consumable},
{Loot_GROUP, 4, AttachmentsGeneric},
{Loot_GROUP, 5, clothes},
{Loot_GROUP, 3, specialclothes},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, GenericSmall}
};

View File

@@ -1,8 +1,8 @@
ResidentialRuins[] =
{
{Loot_MAGAZINE, 10, ItemLog},
{Loot_MAGAZINE, 10, ItemStone},
{Loot_MAGAZINE, 7, equip_metal_sheet_rusted},
{Loot_MAGAZINE, 10, ItemLog}, // Used for crafting and vanilla buildables
{Loot_MAGAZINE, 10, ItemStone}, // Used for crafting and vanilla buildables
// {Loot_MAGAZINE, 7, equip_metal_sheet_rusted},
{Loot_GROUP, 4, Trash},
{Loot_GROUP, 3, AttachmentsGeneric}
};

View File

@@ -7,8 +7,8 @@ Supermarket[] =
{Loot_WEAPON, 5, ItemFlashlight},
{Loot_WEAPON, 2, ItemKnife},
{Loot_WEAPON, 3, Binocular},
{Loot_WEAPON, 2, ItemDIY_wood},
{Loot_WEAPON, 1, ItemDIY_Gate},
// {Loot_WEAPON, 2, ItemDIY_wood},
// {Loot_WEAPON, 1, ItemDIY_Gate},
//Pistols
{Loot_GROUP, 10, pistols},
@@ -28,12 +28,12 @@ Supermarket[] =
{Loot_MAGAZINE, 1, ItemMixOil},
{Loot_MAGAZINE, 1, PartPlywoodPack},
//{Loot_MAGAZINE, 0.5, ItemDomeTent}, //IN TENTS GROUP
{Loot_MAGAZINE, 1, ItemCamoNet},
{Loot_MAGAZINE, 0.5, ItemPadlock},
{Loot_MAGAZINE, 1, forest_net_kit},
{Loot_MAGAZINE, 0.1, ItemComboLock},
{Loot_MAGAZINE, 3, ItemBandage},
{Loot_MAGAZINE, 2, ItemPainkiller},
{Loot_MAGAZINE, 2, ItemAntibacterialWipe},
{Loot_MAGAZINE, 5, equip_nails},
{Loot_MAGAZINE, 1, equip_nails},
//Groups
{Loot_GROUP, 40, Consumable},
@@ -44,4 +44,27 @@ Supermarket[] =
{Loot_WEAPON, 3, ItemMatchbox},
// {Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, Trash}
};
SupermarketSmall[] =
{
{Loot_WEAPON, 5, ItemWatch},
{Loot_WEAPON, 1, ItemCompass},
{Loot_WEAPON, 6, ItemMap},
{Loot_WEAPON, 2, ItemKnife},
{Loot_WEAPON, 3, Binocular},
{Loot_GROUP, 10, pistols},
{Loot_MAGAZINE, 1, ItemMixOil},
{Loot_MAGAZINE, 0.1, ItemComboLock},
{Loot_MAGAZINE, 3, ItemBandage},
{Loot_MAGAZINE, 2, ItemPainkiller},
{Loot_MAGAZINE, 2, ItemAntibacterialWipe},
{Loot_MAGAZINE, 5, equip_nails},
{Loot_GROUP, 40, Consumable},
{Loot_GROUP, 20, GenericSmall},
{Loot_GROUP, 10, AmmoCivilian},
{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 3, MedicalLow}
};

View File

@@ -11,7 +11,17 @@ clothes[] = {
{Loot_MAGAZINE, 2, Skin_SurvivorWpink_DZ},
{Loot_MAGAZINE, 2, Skin_SurvivorWurban_DZ},
{Loot_MAGAZINE, 1, Skin_INS_Bardak_DZ},
{Loot_MAGAZINE, 1, Skin_INS_Worker2_DZ}
{Loot_MAGAZINE, 1, Skin_INS_Worker2_DZ},
{Loot_MAGAZINE, 2, Skin_INS_Lopotev_DZ},
{Loot_MAGAZINE, 2, Skin_Doctor_DZ},
{Loot_MAGAZINE, 2, Skin_Assistant_DZ},
{Loot_MAGAZINE, 2, Skin_Worker1_DZ},
{Loot_MAGAZINE, 2, Skin_Worker3_DZ},
{Loot_MAGAZINE, 2, Skin_Worker4_DZ},
{Loot_MAGAZINE, 2, Skin_TK_CIV_Takistani01_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_TK_CIV_Takistani03_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_TK_CIV_Takistani04_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_TK_CIV_Takistani06_EP1_DZ}
};
militaryclothes[] = {
{Loot_MAGAZINE, 3, Skin_Camo1_DZ},
@@ -28,7 +38,21 @@ militaryclothes[] = {
{Loot_MAGAZINE, 1, Skin_CZ_Soldier_Sniper_EP1_DZ},
{Loot_MAGAZINE, 3, Skin_Graves_Light_DZ},
{Loot_MAGAZINE, 2, Skin_INS_Soldier_AR_DZ},
{Loot_MAGAZINE, 2, Skin_INS_Soldier_CO_DZ}
{Loot_MAGAZINE, 2, Skin_INS_Soldier_CO_DZ},
{Loot_MAGAZINE, 2, Skin_USMC_Soldier_Officer_DZ},
{Loot_MAGAZINE, 2, Skin_USMC_Soldier_MG_DZ},
{Loot_MAGAZINE, 2, Skin_USMC_Soldier_Pilot_DZ},
{Loot_MAGAZINE, 2, Skin_FR_TL_DZ},
{Loot_MAGAZINE, 2, Skin_FR_R_DZ},
{Loot_MAGAZINE, 2, Skin_FR_Sapper_DZ},
{Loot_MAGAZINE, 2, Skin_FR_Marksman_DZ},
{Loot_MAGAZINE, 2, Skin_FR_Assault_R_DZ},
{Loot_MAGAZINE, 2, Skin_US_Soldier_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_UN_CDF_Soldier_Guard_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_UN_CDF_Soldier_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_GER_Soldier_TL_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_BAF_Soldier_Officer_MTP_DZ},
{Loot_MAGAZINE, 2, Skin_BAF_Soldier_N_MTP_DZ}
};
specialclothes[] = {
{Loot_MAGAZINE, 3, Skin_Ins_Soldier_GL_DZ},
@@ -48,7 +72,18 @@ specialclothes[] = {
{Loot_MAGAZINE, 2, Skin_GUE_Soldier_2_DZ},
{Loot_MAGAZINE, 1, Skin_TK_Special_Forces_MG_EP1_DZ},
{Loot_MAGAZINE, 1, Skin_TK_Soldier_Sniper_EP1_DZ},
{Loot_MAGAZINE, 1, Skin_TK_Commander_EP1_DZ},
{Loot_MAGAZINE, 1, Skin_RU_Soldier_Crew_DZ},
{Loot_MAGAZINE, 1, Skin_INS_Lopotev_DZ}
{Loot_MAGAZINE, 2, Skin_TK_Commander_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_RU_Soldier_Crew_DZ},
{Loot_MAGAZINE, 2, Skin_TK_INS_Soldier_AR_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_TK_GUE_Soldier_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_CZ_Soldier_SL_DES_EP1_DZ},
{Loot_MAGAZINE, 2, Skin_RU_Soldier_DZ},
{Loot_MAGAZINE, 2, Skin_RU_Soldier_Officer_DZ},
{Loot_MAGAZINE, 2, Skin_RUS_Soldier1_DZ},
{Loot_MAGAZINE, 2, Skin_RUS_Commander_DZ},
{Loot_MAGAZINE, 2, Skin_MVD_Soldier_DZ},
{Loot_MAGAZINE, 2, Skin_Ins_Soldier_2_DZ},
{Loot_MAGAZINE, 2, Skin_Ins_Commander_DZ},
{Loot_MAGAZINE, 2, Skin_Ins_Soldier_Crew_DZ},
{Loot_MAGAZINE, 2, Skin_CDF_Soldier_DZ}
};

View File

@@ -1,11 +1,6 @@
Consumable[] =
{
/* {Loot_MAGAZINE, 8, ItemBandage},
{Loot_MAGAZINE, 4, ItemHeatPack},
{Loot_MAGAZINE, 3, ItemPainkiller},
{Loot_MAGAZINE, 3, ItemAntibacterialWipe},*/
{Loot_MAGAZINE, 3, ItemWaterBottleUnfilled},
{Loot_MAGAZINE, 3, ItemWaterBottleUnfilled}, //TODO: replace with canteen to better fit Epoch lootPosSmall
{Loot_MAGAZINE, 3, ItemWaterBottleSafe},
{Loot_MAGAZINE, 3, ItemWaterBottle},
{Loot_MAGAZINE, 3, ItemHeatPack},

View File

@@ -34,14 +34,14 @@ CrashSiteRU[] =
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 3, DZ_MedBox, MedicalBox, 10, 20},
{Loot_CONTAINER, 1, DZ_MedBox, MedicalBox, 10, 20},
//{Loot_CONTAINER, 2.3, DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20}, //545x39 AK74, RPK74
//{Loot_CONTAINER, 1.7, DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20}, //762x39 AK47
//{Loot_CONTAINER, 1, DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10}, //762x54r SVD, PKM
//Other
{Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 2, ItemCamonet},
{Loot_MAGAZINE, 2, forest_large_net_kit},
{Loot_GROUP, 7, AttachmentsEast},
{Loot_GROUP, 3, AttachmentsWest},
@@ -100,7 +100,7 @@ CrashSiteUS[] =
//Other
{Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 2, ItemCamonet},
{Loot_MAGAZINE, 2, forest_large_net_kit},
{Loot_GROUP, 10, AttachmentsWest},
//Piles
@@ -158,7 +158,7 @@ CrashSiteEU[] =
//Other
{Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 2, ItemCamonet},
{Loot_MAGAZINE, 2, desert_net_kit},
{Loot_GROUP, 10, AttachmentsWest},
//Piles
@@ -217,7 +217,7 @@ CrashSiteUN[] =
//Other
{Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 2, ItemCamonet},
{Loot_MAGAZINE, 2, desert_large_net_kit},
{Loot_GROUP, 3, AttachmentsEast},
{Loot_GROUP, 3, AttachmentsWest},

View File

@@ -0,0 +1,17 @@
JerryCan[] =
{
{Loot_MAGAZINE, 1, ItemJerryCan},
{Loot_MAGAZINE, 1, ItemJerryCanEmpty}
};
FuelCan[] =
{
{Loot_MAGAZINE, 1, ItemFuelcan},
{Loot_MAGAZINE, 1, ItemFuelcanEmpty}
};
FuelBarrel[] =
{
{Loot_MAGAZINE, 1, ItemFuelBarrel},
{Loot_MAGAZINE, 1, ItemFuelBarrelEmpty}
};

View File

@@ -10,6 +10,11 @@ Generic[] =
//DZE
{Loot_MAGAZINE, 1, 5Rnd_17HMR},
{Loot_MAGAZINE, 2, 10Rnd_303British},
{Loot_MAGAZINE, 2, 15Rnd_W1866_Slug},
{Loot_MAGAZINE, 2, 5Rnd_762x54_Mosin},
{Loot_MAGAZINE, 2, 8Rnd_9x18_Makarov},
{Loot_MAGAZINE, 2, 7Rnd_45ACP_1911},
{Loot_MAGAZINE, 2, 6Rnd_45ACP},
// {Loot_MAGAZINE, 1, ItemBookBible},
@@ -18,16 +23,36 @@ Generic[] =
{Loot_MAGAZINE, 1, equip_duct_tape},
{Loot_MAGAZINE, 1, equip_rope},
{Loot_MAGAZINE, 1, equip_herb_box},
{Loot_MAGAZINE, 1, equip_pvc_box},
// {Loot_MAGAZINE, 1, equip_pvc_box},
{Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, equip_rag},
{Loot_MAGAZINE, 1, equip_nails},
{Loot_MAGAZINE, 1, ItemFuelCan},
{Loot_MAGAZINE, 1, PartWoodPile}
{Loot_MAGAZINE, 0.3, equip_nails},
{Loot_MAGAZINE, 1, PartWoodPile},
{Loot_GROUP, 1, FuelCan}
};
tents[] = {
{Loot_MAGAZINE, 0.5, ItemDomeTent},
{Loot_MAGAZINE, 1, ItemTent},
{Loot_MAGAZINE, 0.5, ItemDesertTent} //EPOCH ADDITION
};
};
GenericSmall[] =
{
{Loot_MAGAZINE, 1, HandRoadFlare},
{Loot_MAGAZINE, 1, HandChemGreen},
{Loot_MAGAZINE, 1, HandChemBlue},
{Loot_MAGAZINE, 1, HandChemRed},
{Loot_MAGAZINE, 1, 5Rnd_17HMR},
{Loot_MAGAZINE, 2, 10Rnd_303British},
{Loot_MAGAZINE, 2, 15Rnd_W1866_Slug},
{Loot_MAGAZINE, 1, 5Rnd_762x54_Mosin},
{Loot_MAGAZINE, 2, 8Rnd_9x18_Makarov},
{Loot_MAGAZINE, 2, 7Rnd_45ACP_1911},
{Loot_MAGAZINE, 1, 6Rnd_45ACP},
{Loot_MAGAZINE, 1, equip_string},
{Loot_MAGAZINE, 1, equip_duct_tape},
{Loot_MAGAZINE, 1, equip_rope},
{Loot_MAGAZINE, 1, equip_nails}
};

View File

@@ -52,6 +52,6 @@ Bloodbags[] =
{Loot_MAGAZINE, 2, ItemBloodbagABPos},
{Loot_MAGAZINE, 2, ItemBloodbagABNeg},
{Loot_MAGAZINE, 3, ItemBloodbagOPos},
{Loot_MAGAZINE, 2, ItemBloodbagONeg}
{Loot_MAGAZINE, 2, ItemBloodbagOPos},
{Loot_MAGAZINE, 1, ItemBloodbagONeg}
};

View File

@@ -22,7 +22,7 @@ shotgunsingleshot[] = {
{Loot_WEAPON, 1, Saiga12K},
{Loot_WEAPON, 1, Remington870_DZ}, //Remington870_lamp
{Loot_WEAPON, 1, Crossbow_DZ},
//{Loot_WEAPON, 1, RedRyder},
{Loot_WEAPON, 1, RedRyder},
{Loot_WEAPON, 1, M1014_DZ} //M1014
};
Chainsaws[] = {
@@ -36,26 +36,28 @@ farmweapons[] = {
{Loot_GROUP, 5, shotgunsingleshot},
{Loot_WEAPON, 2, CZ550_DZ}, //huntingrifle
{Loot_GROUP, 0.3, Chainsaws},
//{Loot_WEAPON, 2, RedRyder},
{Loot_WEAPON, 2, RedRyder},
{Loot_WEAPON, 3, Mosin_DZ}
};
sniperrifles[] = {
{Loot_WEAPON, 1, AK_107_PSO},
{Loot_WEAPON, 0.9, M4SPR},
{Loot_WEAPON, 0.9, M40A3_DZ}, //M40A3
{Loot_WEAPON, 0.7, SVD_Gh_DZ}, //SVD_CAMO
{Loot_WEAPON, 0.7, SVD_des_EP1},
{Loot_WEAPON, 0.7, SVD_DZ}, //SVD
{Loot_WEAPON, 0.7, SVD_PSO1_Gh_DZ},
{Loot_WEAPON, 0.7, SVD_PSO1_DZ},
{Loot_WEAPON, 1, CZ550_DZ}, //huntingrifle
{Loot_WEAPON, 0.8, M24_des_EP1},
{Loot_WEAPON, 0.8, M24_DZ}, //M24
{Loot_WEAPON, 0.7, BAF_LRR_scoped},
{Loot_WEAPON, 0.6, BAF_LRR_scoped},
{Loot_WEAPON, 0.6, BAF_LRR_scoped_W},
{Loot_WEAPON, 0.5, M107_DZ},
{Loot_WEAPON, 0.5, KSVK_DZE},
{Loot_WEAPON, 0.5, VSS_vintorez},
{Loot_WEAPON, 0.6, SCAR_H_LNG_Sniper_SD},
{Loot_WEAPON, 1, M14_DZ}, //M14_EP1
{Loot_WEAPON, 1, DMR_DZ} //DMR
{Loot_WEAPON, 0.7, DMR_DZ}, //DMR
{Loot_WEAPON, 0.8, SCAR_H_LNG_Sniper}, //Mk17 Sniper
{Loot_WEAPON, 0.6, M110_NVG_EP1} //M110 NVG
};
submachinegun[] = {
{Loot_WEAPON, 2, PDW_DZ}, //UZI_EP1
@@ -76,30 +78,41 @@ assaultrifles[] = {
{Loot_WEAPON, 0.1, FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable
{Loot_WEAPON, 0.5, G36A_Camo_DZ}, //G36A_camo
{Loot_WEAPON, 0.5, G36C_DZ}, //G36C
{Loot_WEAPON, 0.5, G36C_camo},
{Loot_WEAPON, 0.4, G36C_camo},
{Loot_WEAPON, 0.5, G36K_Camo_DZ}, //G36K_camo
{Loot_WEAPON, 0.3, G36_C_SD_camo},
{Loot_WEAPON, 0.2, G36_C_SD_camo},
{Loot_WEAPON, 0.5, M16A2_DZ}, //M16A2
{Loot_WEAPON, 0.2, M16A2_GL_DZ}, //M16A2GL
//{Loot_WEAPON, 0.2, M16A2_GL_DZ}, //M16A2GL //added to attachments system
{Loot_WEAPON, 0.1, M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope)
{Loot_WEAPON, 0.5, M4A1_DZ}, //M4A1
{Loot_WEAPON, 0.4, M4A1_CCO_DZ}, //M4A1_Aim
{Loot_WEAPON, 0.1, M4A1_AIM_SD_camo},
{Loot_WEAPON, 0.1, M4A1_HWS_GL_camo},
{Loot_WEAPON, 0.4, M4A3_CCO_EP1},
{Loot_WEAPON, 0.3, M4A3_CCO_EP1},
{Loot_WEAPON, 0.4, SA58_DZ}, //Sa58P_EP1 (identical), Sa58V_EP1 (different stock)
{Loot_WEAPON, 0.3, SA58_CCO_DZ}, //No camo, no grip handle
{Loot_WEAPON, 0.3, Sa58V_CCO_EP1}, //Camo with grip handle
{Loot_WEAPON, 0.2, Sa58V_CCO_EP1}, //Camo with grip handle
{Loot_WEAPON, 0.3, SA58_ACOG_DZ}, //No camo, no grip handle
{Loot_WEAPON, 0.3, Sa58V_RCO_EP1}, // Camo with grip handle
{Loot_WEAPON, 0.2, Sa58V_RCO_EP1}, // Camo with grip handle
{Loot_WEAPON, 0.3, SA58_RIS_DZ}, //SA58_DZ with different rail
{Loot_WEAPON, 0.4, m8_compact},
{Loot_WEAPON, 0.3, m8_sharpshooter},
{Loot_WEAPON, 0.5, m8_holo_sd},
{Loot_WEAPON, 0.5, m8_carbine},
{Loot_WEAPON, 0.2, BAF_L85A2_RIS_SUSAT},
{Loot_WEAPON, 0.1, L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
{Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo}
{Loot_WEAPON, 0.3, m8_compact},
{Loot_WEAPON, 0.2, m8_sharpshooter},
{Loot_WEAPON, 0.2, m8_holo_sd},
{Loot_WEAPON, 0.3, m8_carbine},
{Loot_WEAPON, 0.5, L85A2_DZ},
{Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo},
//Mk16
{Loot_WEAPON, 0.2, SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD
{Loot_WEAPON, 0.3, SCAR_L_CQC}, //Mk16 CQC
{Loot_WEAPON, 0.3, SCAR_L_CQC_Holo}, //Mk16 CQC EOTech
{Loot_WEAPON, 0.2, SCAR_L_CQC_EGLM_Holo}, //Mk16 EGLM EOTech,(40mm)
{Loot_WEAPON, 0.2, SCAR_L_STD_EGLM_RCO}, //Mk16 EGLM RCO,(40mm)
{Loot_WEAPON, 0.3, SCAR_L_STD_HOLO}, //Mk16 EOTech
{Loot_WEAPON, 0.3, SCAR_L_STD_Mk4CQT}, //Mk16 Mk4CQ/T
//Mk17
{Loot_WEAPON, 0.1, SCAR_H_CQC_CCO}, //Mk17 Aimpoint
{Loot_WEAPON, 0.1, SCAR_H_CQC_CCO_SD}, //Mk17 Aimpoint SD
{Loot_WEAPON, 0.1, SCAR_H_STD_EGLM_Spect} //Mk17 EGLM ACOG,(40mm)
};
machineguns[] = {
{Loot_WEAPON, 1.1, RPK74_DZ}, //RPK_74
@@ -107,17 +120,19 @@ machineguns[] = {
{Loot_WEAPON, 1, Pecheneg_DZ},
{Loot_WEAPON, 1, PKM_DZ}, //PK_DZ
{Loot_WEAPON, 0.9, L110A1_DZ}, //BAF_L110A1_Aim_DZE scope is slightly different from L110A1_CCO_DZ, otherwise identical
{Loot_WEAPON, 1, MG36_camo},
{Loot_WEAPON, 0.9, MG36_camo},
{Loot_WEAPON, 1, M60A4_EP1_DZE},
{Loot_WEAPON, 1, MG36},
{Loot_WEAPON, 1, M249_m145_EP1_DZE},
{Loot_WEAPON, 1, m240_scoped_EP1_DZE},
{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)
{Loot_WEAPON, 0.5, Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
{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
};
{Loot_WEAPON, 2, M1014_DZ}, //M1014
{Loot_WEAPON, 1, AA12_PMC} //AA12 Shotgun
};

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}
};

View File

@@ -0,0 +1,15 @@
ZombieBodyguard[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombieBodyguardViral[] =
{
{Loot_GROUP, 10, ZombieBodyguard},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,15 @@
ZombieCrewman[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombieCrewmanViral[] =
{
{Loot_GROUP, 10, ZombieCrewman},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,16 @@
ZombieDoctor[] =
{
{Loot_MAGAZINE, 5, ItemMorphine},
{Loot_MAGAZINE, 3, ItemBloodTester},
{Loot_MAGAZINE, 5, ItemHeatPack},
{Loot_MAGAZINE, 2, ItemBloodbagEmpty},
{Loot_GROUP, 2, Antibiotics},
{Loot_GROUP, 6, Bloodbags},
{Loot_GROUP, 7, MedicalLow}
};
ZombieDoctorViral[] =
{
{Loot_GROUP, 10, ZombieDoctor},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,15 @@
ZombieGhillie[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombieGhillieViral[] =
{
{Loot_GROUP, 10, ZombieGhillie},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,19 @@
ZombieLumberJack[] =
{
{Loot_GROUP, 10, Consumable},
{Loot_GROUP, 2, AmmoCivilian},
{Loot_MAGAZINE, 3, ItemBandage},
{Loot_MAGAZINE, 2, ItemPainkiller},
{Loot_MAGAZINE, 2, ItemAntibacterialWipe},
{Loot_MAGAZINE, 2, ItemDocument},
{Loot_MAGAZINE, 2, ItemWire},
{Loot_MAGAZINE, 3, ItemTankTrap},
{Loot_MAGAZINE, 2, ItemComboLock},
{Loot_MAGAZINE, 2, ItemSledgeHead}
};
ZombieLumberJackViral[] =
{
{Loot_GROUP, 10, ZombieLumberJack},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -1,7 +1,7 @@
ZombieMilitary[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 2, ItemHotwireKit},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
@@ -12,4 +12,4 @@ ZombieMilitaryViral[] =
{
{Loot_GROUP, 10, ZombieMilitary},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};
};

View File

@@ -0,0 +1,15 @@
ZombieOfficer[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombieOfficerViral[] =
{
{Loot_GROUP, 10, ZombieOfficer},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,15 @@
ZombiePilot[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombiePilotViral[] =
{
{Loot_GROUP, 10, ZombiePilot},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -1,12 +1,10 @@
ZombiePolice[] =
{
{Loot_GROUP, 2, Consumable},
{Loot_MAGAZINE, 2, 7Rnd_45ACP_1911},
{Loot_GROUP, 3, AmmoCivilian},
{Loot_MAGAZINE, 2, ItemDocument},
{Loot_MAGAZINE, 3, 6Rnd_45ACP},
{Loot_MAGAZINE, 1, 8Rnd_12Gauge_Buck},
{Loot_MAGAZINE, 1, ItemHotwireKit},
{Loot_MAGAZINE, 2, ItemComboLock},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_MAGAZINE, 1, ItemComboLock},
{Loot_MAGAZINE, 3, HandRoadFlare}
};
@@ -14,4 +12,4 @@ ZombiePoliceViral[] =
{
{Loot_GROUP, 10, ZombiePolice},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};
};

View File

@@ -0,0 +1,15 @@
ZombieRebels[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombieRebelsViral[] =
{
{Loot_GROUP, 10, ZombieRebels},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,15 @@
ZombieRocker[] =
{
{Loot_GROUP, 6, Consumable},
{Loot_GROUP, 1, AmmoCivilian},
{Loot_MAGAZINE, 3, ItemBandage},
{Loot_MAGAZINE, 2, ItemPainkiller},
{Loot_MAGAZINE, 2, ItemAntibacterialWipe},
{Loot_MAGAZINE, 3, ItemDocument}
};
ZombieRockerViral[] =
{
{Loot_GROUP, 10, ZombieRocker},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,15 @@
ZombieSpecialForces[] =
{
{Loot_MAGAZINE, 1, FoodMRE},
{Loot_MAGAZINE, 0.5, ItemHotwireKit},
{Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, AmmoMilitaryLow},
{Loot_GROUP, 2, AmmoMilitaryHigh},
{Loot_GROUP, 2, Consumable}
};
ZombieSpecialForcesViral[] =
{
{Loot_GROUP, 10, ZombieSpecialForces},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -0,0 +1,15 @@
ZombieSuit[] =
{
{Loot_GROUP, 6, Consumable},
{Loot_GROUP, 1, AmmoCivilian},
{Loot_MAGAZINE, 3, ItemBandage},
{Loot_MAGAZINE, 2, ItemPainkiller},
{Loot_MAGAZINE, 2, ItemAntibacterialWipe},
{Loot_MAGAZINE, 3, ItemDocument}
};
ZombieSuitViral[] =
{
{Loot_GROUP, 10, ZombieSuit},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};

View File

@@ -8,12 +8,12 @@ ZombieWorker[] =
{Loot_MAGAZINE, 2, ItemDocument},
{Loot_MAGAZINE, 2, ItemWire},
{Loot_MAGAZINE, 3, ItemTankTrap},
{Loot_MAGAZINE, 3, ItemComboLock},
{Loot_MAGAZINE, 2, ItemComboLock},
{Loot_MAGAZINE, 2, ItemSledgeHead}
};
ZombieWorkerViral[] =
{
{Loot_GROUP, 10, ZombieCivilian},
{Loot_GROUP, 10, ZombieWorker},
{Loot_MAGAZINE, 1, ItemAntibiotic1}
};
};

View File

@@ -1,6 +1,8 @@
To use DZE_MissionLootTable = true; copy this CfgLoot folder to your mission.
To customize the loot tables copy this CfgLoot folder to your mission.
Then in description.ext add at the top:
Then in description.ext replace this line:
#include "\z\addons\dayz_code\Configs\CfgLoot\CfgLoot.hpp"
with this:
#include "CfgLoot\CfgLoot.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"

View File

@@ -8,7 +8,7 @@ class Attachment_GP25 : CA_Magazine
picture = "\z\addons\dayz_communityweapons\attachments\gp25\data\m_gp25_ca.paa";
displayName = $STR_DZ_ATT_GP25_NAME;
descriptionShort = $STR_DZ_ATT_GP25_NAME;
descriptionShort = $STR_DZ_ATT_GP25_DESC;
class ItemActions
{
@@ -18,4 +18,4 @@ class Attachment_GP25 : CA_Magazine
script = "; [_id,1] call player_attachAttachment";
};
};
};
};

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";
};
};
};

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";
};
};
};

View File

@@ -7,8 +7,8 @@ class Attachment_SupBizon : CA_Magazine
model = "z\addons\dayz_communityassets\models\surpressor.p3d";
picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa";
displayName = $STR_ATTACHMENT_NAME_SILENCER_BIZON;
descriptionShort = $STR_ATTACHMENT_DESC_SILENCER_BIZON;
displayName = $STR_DZ_ATT_SUP9BIZON_NAME;
descriptionShort = $STR_DZ_ATT_SUP9BIZON_DESC;
class ItemActions
{

View File

@@ -7,8 +7,8 @@ class Attachment_SupMakarov : CA_Magazine
model = "z\addons\dayz_communityassets\models\surpressor.p3d";
picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa";
displayName = $STR_ATTACHMENT_NAME_SILENCER_MAKAROV;
descriptionShort = $STR_ATTACHMENT_DESC_SILENCER_MAKAROV;
displayName = $STR_DZ_ATT_SUP9PM_NAME;
descriptionShort = $STR_DZ_ATT_SUP9PM_DESC;
class ItemActions
{

View File

@@ -3,7 +3,8 @@ class CfgMagazines
//External references
class CA_Magazine;
class HandGrenade;
class TimeBomb;
class CA_LauncherMagazine;
//Weapon magazines
@@ -35,7 +36,18 @@ class CfgMagazines
//Consumables: food, drinks etc.
#include "Consumables\Consumables.hpp"
/*class 5Rnd_86x70_L115A1: CA_Magazine //.338 Lapua Magnum
{
scope = 2;
displayName = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10;
descriptionShort = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10_0;
ammo=B_86x70_Ball_noTracer;
count=5;
initSpeed = 936; //TODO
picture="\CA\weapons_BAF\data\UI\M_lrr_CA.paa";
// descriptionShort = $STR_DSS_10RND_M107; TODO
};*/
//EPOCH ADDITIONS

View File

@@ -21,7 +21,7 @@ class SkinBase : CA_Magazine
class tearClothes
{
text = "Tear Clothes";
text = $STR_TEAR_CLOTHES;
script = "spawn player_tearClothes;";
};
class Crafting {

View File

@@ -1,122 +1,122 @@
class Skin_Rocket_DZ: SkinBase {
scope = public;
displayName = "Officer Suit";
descriptionShort = "Officer Suit";
displayName = $STR_EPOCH_SKINS_OFFICERSUIT;
descriptionShort = $STR_EPOCH_SKINS_OFFICERSUIT;
};
class Skin_RU_Policeman_DZ: SkinBase {
scope = public;
displayName = "Sergei";
descriptionShort = "Police Officer Uniform";
displayName = $STR_EPOCH_SKINS_SERGEI;
descriptionShort = $STR_EPOCH_SKINS_SERGEI_DESC;
};
class Skin_Pilot_EP1_DZ: SkinBase {
scope = public;
displayName = "Ethan";
descriptionShort = "Pilot Uniform";
displayName = $STR_EPOCH_SKINS_ETHAN;
descriptionShort = $STR_EPOCH_SKINS_ETHAN_DESC;
};
class Skin_Haris_Press_EP1_DZ: SkinBase {
scope = public;
displayName = "Harry";
descriptionShort = "Press Uniform";
displayName = $STR_EPOCH_SKINS_HARRY;
descriptionShort = $STR_EPOCH_SKINS_HARRY_DESC;
};
class Skin_Ins_Soldier_GL_DZ: SkinBase {
scope = public;
displayName = "Terrorist Uniform";
descriptionShort = "Terrorist Uniform";
displayName = $STR_EPOCH_SKINS_TERRORISTUNIFORM;
descriptionShort = $STR_EPOCH_SKINS_TERRORISTUNIFORM;
};
class Skin_GUE_Commander_DZ: SkinBase {
scope = public;
displayName = "Rebel Uniform";
descriptionShort = "Rebel Uniform";
displayName = $STR_EPOCH_SKINS_REBELUNIFORM;
descriptionShort = $STR_EPOCH_SKINS_REBELUNIFORM;
};
class Skin_Functionary1_EP1_DZ: SkinBase {
scope = public;
displayName = "Donald";
descriptionShort = "Business Suit";
displayName = $STR_EPOCH_SKINS_DONALD;
descriptionShort = $STR_EPOCH_SKINS_DONALD_DESC;
};
class Skin_Priest_DZ: SkinBase {
scope = public;
displayName = "James";
descriptionShort = "Priest Outfit";
displayName = $STR_EPOCH_SKINS_JAMES;
descriptionShort = $STR_EPOCH_SKINS_JAMES_DESC;
};
class Skin_Rocker1_DZ: SkinBase {
scope = public;
displayName = "Duane";
descriptionShort = "Rocker (black)";
displayName = $STR_EPOCH_SKINS_DUANE;
descriptionShort = $STR_EPOCH_SKINS_DUANE_DESC;
};
class Skin_Rocker2_DZ: SkinBase {
scope = public;
displayName = "Rod";
descriptionShort = "Rocker (brown)";
displayName = $STR_EPOCH_SKINS_ROD;
descriptionShort = $STR_EPOCH_SKINS_ROD_DESC;
};
class Skin_Rocker3_DZ: SkinBase {
scope = public;
displayName = "Van";
descriptionShort = "Rocker (blue)";
displayName = $STR_EPOCH_SKINS_VAN;
descriptionShort = $STR_EPOCH_SKINS_VAN_DESC;
};
class Skin_Rocker4_DZ: SkinBase {
scope = public;
displayName = "Bruce";
descriptionShort = "Rocker (green)";
displayName = $STR_EPOCH_SKINS_BRUCE;
descriptionShort = $STR_EPOCH_SKINS_BRUCE_DESC;
};
class Skin_Bandit1_DZ: SkinBase {
scope = public;
displayName = "Bandit Outfit";
descriptionShort = "Bandit Outfit";
displayName = $STR_EPOCH_SKINS_BANDITOUTFIT;
descriptionShort = $STR_EPOCH_SKINS_BANDITOUTFIT;
};
class Skin_Bandit2_DZ: SkinBase {
scope = public;
displayName = "Bandit Camo";
descriptionShort = "Bandit Camo Outfit";
displayName = $STR_EPOCH_SKINS_BANDITCAMO;
descriptionShort = $STR_EPOCH_SKINS_BANDITCAMO_DESC;
};
class Skin_GUE_Soldier_MG_DZ: SkinBase {
scope = public;
displayName = "Bandit Gunner";
descriptionShort = "Bandit Gunner Outfit";
displayName = $STR_EPOCH_SKINS_BANDITGUNNER;
descriptionShort = $STR_EPOCH_SKINS_BANDITGUNNER_DESC;
};
class Skin_GUE_Soldier_Sniper_DZ: SkinBase {
scope = public;
displayName = "Bandit Sniper";
descriptionShort = "Bandit Sniper Outfit";
displayName = $STR_EPOCH_SKINS_BANDITSNIPER;
descriptionShort = $STR_EPOCH_SKINS_BANDITSNIPER_DESC;
};
class Skin_GUE_Soldier_Crew_DZ: SkinBase {
scope = public;
displayName = "Bandit Baklava";
descriptionShort = "Bandit Baklava Outfit";
displayName = $STR_EPOCH_SKINS_BANDITBAKLAVA;
descriptionShort = $STR_EPOCH_SKINS_BANDITBAKLAVA_DESC;
};
class Skin_GUE_Soldier_CO_DZ: SkinBase {
scope = public;
displayName = "Bandit Mask";
descriptionShort = "Bandit Mask Outfit";
displayName = $STR_EPOCH_SKINS_BANDITMASK;
descriptionShort = $STR_EPOCH_SKINS_BANDITMASK_DESC;
};
class Skin_GUE_Soldier_2_DZ: SkinBase {
scope = public;
displayName = "Bandit Hat";
descriptionShort = "Bandit Hat with Baklava";
displayName = $STR_EPOCH_SKINS_BANDITHAT;
descriptionShort = $STR_EPOCH_SKINS_BANDITHAT_DESC;
};
class Skin_BanditW1_DZ: SkinBase {
scope = public;
displayName = "Bandit Annie";
descriptionShort = "Bandit wrap blue top with brown pants.";
displayName = $STR_EPOCH_SKINS_BANDITANNIE;
descriptionShort = $STR_EPOCH_SKINS_BANDITANNIE_DESC;
};
class Skin_BanditW2_DZ: SkinBase {
scope = public;
displayName = "Bandit Jane";
descriptionShort = "Bandit wrap grey top with brown camo pants.";
displayName = $STR_EPOCH_SKINS_BANDITJANE;
descriptionShort = $STR_EPOCH_SKINS_BANDITJANE_DESC;
};
class Skin_SurvivorW3_DZ: SkinBase {
scope = public;
displayName = "Jane";
descriptionShort = "Grey top with brown camo pants.";
displayName = $STR_EPOCH_SKINS_JANE;
descriptionShort = $STR_EPOCH_SKINS_JANE_DESC;
};
class Skin_SurvivorW2_DZ: SkinBase {
scope = public;
displayName = "Annie";
descriptionShort = "Civilian (female)";
displayName = $STR_EPOCH_SKINS_ANNIE;
descriptionShort = $STR_EPOCH_SKINS_ANNIE_DESC;
};
class Skin_SurvivorWpink_DZ: SkinBase {
scope = public;
displayName = "Melly (female)";
descriptionShort = "Purple top with blue pants.";
displayName = $STR_EPOCH_SKINS_MELLY;
descriptionShort = $STR_EPOCH_SKINS_MELLY_DESC;
};
/*
class Skin_SurvivorWsequisha_DZ: SkinBase {
@@ -132,117 +132,293 @@ class Skin_SurvivorWsequishaD_DZ: SkinBase {
*/
class Skin_SurvivorWcombat_DZ: SkinBase {
scope = public;
displayName = "Alejandria";
descriptionShort = "Blue camo top with brown camo pants.";
displayName = $STR_EPOCH_SKINS_ALEJANDRIA;
descriptionShort = $STR_EPOCH_SKINS_ALEJANDRIA_DESC;
};
class Skin_SurvivorWdesert_DZ: SkinBase {
scope = public;
displayName = "Savannah";
descriptionShort = "White top with brown pants.";
displayName = $STR_EPOCH_SKINS_SAVANNAH;
descriptionShort = $STR_EPOCH_SKINS_SAVANNAH_DESC;
};
class Skin_SurvivorWurban_DZ: SkinBase {
scope = public;
displayName = "Sophia";
descriptionShort = "Maroon top with grey pants.";
displayName = $STR_EPOCH_SKINS_SOPHIA;
descriptionShort = $STR_EPOCH_SKINS_SOPHIA_DESC;
};
class Skin_TK_INS_Warlord_EP1_DZ: SkinBase {
scope = public;
displayName = "Takistani Warlord";
descriptionShort = "Takistani Warlord";
displayName = $STR_EPOCH_SKINS_TAKISTANIWARLORD;
descriptionShort = $STR_EPOCH_SKINS_TAKISTANIWARLORD;
};
class Skin_TK_INS_Soldier_EP1_DZ: SkinBase {
scope = public;
displayName = "Takistani Soldier";
descriptionShort = "Takistani Soldier";
displayName = $STR_EPOCH_SKINS_TAKISTANISOLDIER;
descriptionShort = $STR_EPOCH_SKINS_TAKISTANISOLDIER;
};
class Skin_CZ_Special_Forces_GL_DES_EP1_DZ: SkinBase {
scope = public;
displayName = "Special Forces";
descriptionShort = "Special Forces";
displayName = $STR_EPOCH_SKINS_SPECIALFORCES;
descriptionShort = $STR_EPOCH_SKINS_SPECIALFORCES;
};
class Skin_Drake_Light_DZ: SkinBase {
scope = public;
displayName = "Desert Camo";
descriptionShort = "Desert Camo";
displayName = $STR_EPOCH_SKINS_DESERTCAMO;
descriptionShort = $STR_EPOCH_SKINS_DESERTCAMO;
};
class Skin_Soldier_Bodyguard_AA12_PMC_DZ: SkinBase {
scope = public;
displayName = "Bodyguard";
descriptionShort = "Bodyguard";
displayName = $STR_EPOCH_SKINS_BODYGUARD;
descriptionShort = $STR_EPOCH_SKINS_BODYGUARD;
};
class Skin_FR_OHara_DZ: SkinBase {
scope = public;
displayName = "Jungle Camo";
descriptionShort = "Jungle Camo";
displayName = $STR_EPOCH_SKINS_JUNGLECAMO;
descriptionShort = $STR_EPOCH_SKINS_JUNGLECAMO;
};
class Skin_FR_Rodriguez_DZ: SkinBase {
scope = public;
displayName = "Gunner Outfit";
descriptionShort = "Gunner Outfit";
displayName = $STR_EPOCH_SKINS_GUNNEROUTFIT;
descriptionShort = $STR_EPOCH_SKINS_GUNNEROUTFIT;
};
class Skin_CZ_Soldier_Sniper_EP1_DZ: SkinBase {
scope = public;
displayName = "Desert Ghillie";
descriptionShort = "Desert Ghillie";
displayName = $STR_EPOCH_SKINS_DESERTGHILLIE;
descriptionShort = $STR_EPOCH_SKINS_DESERTGHILLIE;
};
class Skin_Graves_Light_DZ: SkinBase {
scope = public;
displayName = "Urban Camo";
descriptionShort = "Urban Camo";
displayName = $STR_EPOCH_SKINS_URBANCAMO;
descriptionShort = $STR_EPOCH_SKINS_URBANCAMO;
};
class Skin_Soldier_Sniper_PMC_DZ: SkinBase {
scope = public;
displayName = "Marksman";
descriptionShort = "Marksman";
displayName = $STR_EPOCH_SKINS_MARKSMAN;
descriptionShort = $STR_EPOCH_SKINS_MARKSMAN;
};
class Skin_Soldier_TL_PMC_DZ: SkinBase {
scope = public;
displayName = "Team Leader";
descriptionShort = "Team Leader";
displayName = $STR_EPOCH_SKINS_TEAMLEADER;
descriptionShort = $STR_EPOCH_SKINS_TEAMLEADER;
};
// new
class Skin_TK_Special_Forces_MG_EP1_DZ: SkinBase {
scope = public;
displayName = "Smuggler";
descriptionShort = "Smuggler";
displayName = $STR_EPOCH_SKINS_SMUGGLER;
descriptionShort = $STR_EPOCH_SKINS_SMUGGLER;
};
class Skin_TK_Soldier_Sniper_EP1_DZ: SkinBase {
scope = public;
displayName = "Desert Sniper";
descriptionShort = "Desert Sniper";
displayName = $STR_EPOCH_SKINS_DESERTSNIPER;
descriptionShort = $STR_EPOCH_SKINS_DESERTSNIPER;
};
class Skin_TK_Commander_EP1_DZ: SkinBase {
scope = public;
displayName = "General";
descriptionShort = "General";
displayName = $STR_GENERAL;
descriptionShort = $STR_GENERAL;
};
class Skin_RU_Soldier_Crew_DZ: SkinBase {
scope = public;
displayName = "Crewman";
descriptionShort = "Crewman";
displayName = $STR_EPOCH_SKINS_CREWMAN;
descriptionShort = $STR_EPOCH_SKINS_CREWMAN;
};
class Skin_INS_Lopotev_DZ: SkinBase {
scope = public;
displayName = "Boss";
descriptionShort = "Team Leader";
displayName = $STR_EPOCH_SKINS_BOSS;
descriptionShort = $STR_EPOCH_SKINS_BOSS_DESC;
};
class Skin_INS_Soldier_AR_DZ: SkinBase {
scope = public;
displayName = "Cooper";
descriptionShort = "Cooper";
displayName = $STR_EPOCH_SKINS_COOPER;
descriptionShort = $STR_EPOCH_SKINS_COOPER;
};
class Skin_INS_Soldier_CO_DZ: SkinBase {
scope = public;
displayName = "Travis";
descriptionShort = "Travis";
displayName = $STR_EPOCH_SKINS_TRAVIS;
descriptionShort = $STR_EPOCH_SKINS_TRAVIS;
};
class Skin_INS_Bardak_DZ: SkinBase {
scope = public;
displayName = "Paulo";
descriptionShort = "Paulo";
displayName = $STR_EPOCH_SKINS_PAULO;
descriptionShort = $STR_EPOCH_SKINS_PAULO;
};
class Skin_INS_Worker2_DZ: SkinBase {
scope = public;
displayName = "Steve";
descriptionShort = "Steve";
};
displayName = $STR_EPOCH_SKINS_STEVE;
descriptionShort = $STR_EPOCH_SKINS_STEVE;
};
//new Epoch 1.06
class Skin_USMC_Soldier_Officer_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_USMCOFFICER;
descriptionShort = $STR_EPOCH_SKINS_USMCOFFICER;
};
class Skin_USMC_Soldier_MG_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_USMCSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_USMCSOLDIER;
};
class Skin_USMC_Soldier_Pilot_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_USMCPILOT;
descriptionShort = $STR_EPOCH_SKINS_USMCPILOT;
};
class Skin_FR_TL_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_CAMOTEAMLEADER;
descriptionShort = $STR_EPOCH_SKINS_CAMOTEAMLEADER;
};
class Skin_FR_R_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_CAMORECON;
descriptionShort = $STR_EPOCH_SKINS_CAMORECON;
};
class Skin_FR_Marksman_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_CAMOMARKSMAN;
descriptionShort = $STR_EPOCH_SKINS_CAMOMARKSMAN;
};
class Skin_FR_Assault_R_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_CAMOASSAULT;
descriptionShort = $STR_EPOCH_SKINS_CAMOASSAULT;
};
class Skin_RU_Soldier_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_RUSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_RUSOLDIER;
};
class Skin_RU_Soldier_Officer_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_RUOFFICER;
descriptionShort = $STR_EPOCH_SKINS_RUOFFICER;
};
class Skin_RUS_Soldier1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_RUCAMO;
descriptionShort = $STR_EPOCH_SKINS_RUCAMO;
};
class Skin_RUS_Commander_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_RUCOMMANDER;
descriptionShort = $STR_EPOCH_SKINS_RUCOMMANDER;
};
class Skin_MVD_Soldier_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_MVDSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_MVDSOLDIER;
};
class Skin_Ins_Soldier_2_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TERRORISTCAMO;
descriptionShort = $STR_EPOCH_SKINS_TERRORISTCAMO;
};
class Skin_Ins_Commander_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_INSCOMMANDER;
descriptionShort = $STR_EPOCH_SKINS_INSCOMMANDER;
};
class Skin_Ins_Soldier_Crew_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_INSCREWMAN;
descriptionShort = $STR_EPOCH_SKINS_INSCREWMAN;
};
class Skin_CDF_Soldier_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_CDFSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_CDFSOLDIER;
};
class Skin_Assistant_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_ASSISTANT;
descriptionShort = $STR_EPOCH_SKINS_ASSISTANT;
};
class Skin_Doctor_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_DOCTOR;
descriptionShort = $STR_EPOCH_SKINS_DOCTOR;
};
class Skin_Worker1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_WORKER1;
descriptionShort = $STR_EPOCH_SKINS_WORKER1;
};
class Skin_Worker3_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_WORKER2;
descriptionShort = $STR_EPOCH_SKINS_WORKER2;
};
class Skin_Worker4_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_WORKER3;
descriptionShort = $STR_EPOCH_SKINS_WORKER3;
};
class Skin_TK_CIV_Takistani01_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TKCITIZEN1;
descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN1;
};
class Skin_TK_CIV_Takistani03_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TKCITIZEN2;
descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN2;
};
class Skin_TK_CIV_Takistani04_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TKCITIZEN3;
descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN3;
};
class Skin_TK_CIV_Takistani06_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TKCITIZEN4;
descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN4;
};
class Skin_TK_INS_Soldier_AR_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TKSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_TKSOLDIER;
};
class Skin_TK_GUE_Soldier_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_TKGUESOLDIER;
descriptionShort = $STR_EPOCH_SKINS_TKGUESOLDIER;
};
class Skin_CZ_Soldier_SL_DES_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_CZSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_CZSOLDIER;
};
class Skin_US_Soldier_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_USSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_USSOLDIER;
};
class Skin_UN_CDF_Soldier_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_UNSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_UNSOLDIER;
};
class Skin_UN_CDF_Soldier_Guard_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_UNCOMMANDER;
descriptionShort = $STR_EPOCH_SKINS_UNCOMMANDER;
};
class Skin_GER_Soldier_TL_EP1_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_GERRECON;
descriptionShort = $STR_EPOCH_SKINS_GERRECON;
};
class Skin_BAF_Soldier_Officer_MTP_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_BAFOFFICER;
descriptionShort = $STR_EPOCH_SKINS_BAFOFFICER;
};
class Skin_BAF_Soldier_N_MTP_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_BAFSOLDIER;
descriptionShort = $STR_EPOCH_SKINS_BAFSOLDIER;
};
class Skin_FR_Sapper_DZ: SkinBase {
scope = public;
displayName = $STR_EPOCH_SKINS_FRSAPPER;
descriptionShort = $STR_EPOCH_SKINS_FRSAPPER;
};

View File

@@ -23,7 +23,7 @@ class ItemCanteen : FoodDrink
class Empty
{
text = "Empty";//TODO: move to stringtable
text = $STR_ITEM_CANTEEN_EMPTY;
script = "spawn player_emptyContainer";
};
};

View File

@@ -29,7 +29,7 @@ class ConsumableBase : CA_Magazine
{
class Consume
{
text = "Consume";
text = $STR_EAT_FOOD;
script = "spawn player_consume";
};
};

View File

@@ -40,8 +40,8 @@ class ItemSodaMtngreen : ItemSoda
model = "z\addons\dayz_communityassets\models\soda_mtngreen_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_soda_mtngreen_clean_full_ca.paa";
displayName = $STR_EQUIP_NAME_37;
descriptionShort = $STR_EQUIP_NAME_37;
displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_0;
descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_0;
Nutrition[] = {90,0,500,0};
@@ -250,8 +250,8 @@ class ItemSherbet : ItemSoda
model = "z\addons\dayz_communityassets\models\soda_sherbet_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sherbet_clean_full_ca.paa";
displayName = "Sherbet";//TODO: move to stringtable
descriptionShort = "Sherbet";
displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15;
descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_15;
Nutrition[] = {90,0,500,0};

View File

@@ -2,8 +2,8 @@ class ItemWaterBottle : FoodDrink
{
scope = public;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
picture = "\z\addons\dayz_communityassets\textures\waterbottle.paa";
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
displayName = $STR_EQUIP_NAME_12;
descriptionShort = $STR_EQUIP_DESC_12;
@@ -23,7 +23,7 @@ class ItemWaterBottle : FoodDrink
class Empty
{
text = "Empty";//TODO: move to stringtable
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
};

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