173 Commits

Author SHA1 Message Date
Zupa
7deb504253 [Core] #1662 Initiate beta branch from master 2015-07-01 21:57:17 +02:00
vbawol
f0782d9c89 Merge pull request #1648 from seb3sec/patch-5
Correct output for deconstruction round bagfence
2015-04-03 22:58:28 -05:00
vbawol
5790d1e129 Merge pull request #1633 from seb3sec/patch-3
Add BAF_L110A1_Aim_DZE
2015-04-03 22:58:18 -05:00
vbawol
386ce924a2 Merge pull request #1627 from SplenectomY/patch-2
Add female coughing sounds
2015-04-03 22:53:51 -05:00
vbawol
3156e02b3f Merge pull request #1641 from Mikeeeyy/patch-17
Update server_updateObject.sqf
2015-04-03 22:53:17 -05:00
vbawol
01536b7515 Merge pull request #1647 from Markokil321/patch-7
Remove useless setting
2015-04-03 22:50:12 -05:00
vbawol
c343541bb4 Merge pull request #1638 from seb3sec/patch-4
Remove hiddenSelections restrictions
2015-04-03 22:49:54 -05:00
vbawol
8d3239ad93 Merge pull request #1636 from Mikeeeyy/patch-15
Update Ammo.hpp
2015-04-03 22:49:25 -05:00
vbawol
444fd125d0 Merge pull request #1632 from seb3sec/patch-2
Fix for compile error "Item listed twice..."
2015-04-03 22:14:27 -05:00
vbawol
31c9f589af Merge pull request #1631 from seb3sec/patch-1
Fix for "Undefined base class" with FN FAL
2015-04-03 22:14:18 -05:00
seb3sec
d2bacf367e Correct output for deconstruction round bagfence 2015-03-18 12:32:08 +01:00
Marko
94601f3139 Update config.cfg 2015-03-13 18:07:46 +01:00
Marko
16639d9741 Update config.cfg 2015-03-13 18:07:30 +01:00
Marko
6e5beb409d Update config.cfg 2015-03-13 18:07:15 +01:00
Marko
e1d6f38ab5 Update config.cfg 2015-03-13 18:06:59 +01:00
Marko
04c933b318 Update config.cfg 2015-03-13 18:06:38 +01:00
Marko
db97941418 Update config.cfg 2015-03-13 18:06:21 +01:00
Marko
86b83a1843 Update config.cfg 2015-03-13 18:06:06 +01:00
Marko
26407165ac Update config.cfg 2015-03-13 18:05:46 +01:00
Marko
f734cb078f Update config.cfg 2015-03-13 18:05:25 +01:00
Marko
011c88d076 Update config.cfg 2015-03-13 18:05:04 +01:00
Marko
492caf6390 Update config.cfg 2015-03-13 18:04:49 +01:00
Marko
fa4bbc9f00 Update config.cfg 2015-03-13 18:04:34 +01:00
Marko
c398a419db Update config.cfg 2015-03-13 18:04:22 +01:00
Marko
be260bf4ea Update config.cfg 2015-03-13 18:03:52 +01:00
Marko
93f8b61f58 Update config.cfg 2015-03-13 18:03:29 +01:00
Marko
2938f08723 Update config.cfg 2015-03-13 18:03:12 +01:00
Marko
69ffe8f31c Update config.cfg 2015-03-13 18:02:58 +01:00
Marko
d41ee6b5de Update config.cfg 2015-03-13 18:02:30 +01:00
Marko
33b9fcffdb Update config.cfg
This option is deprecated and useless since OA STEAM update.

[10:10:19 | Edited 10:10:49] David Foltyn: secureID was deprecated and replaced with STEAMid, so imho that setting is now void
2015-03-13 18:01:39 +01:00
vbawol
ff77466cbf Merge pull request #1640 from deannreid/patch-2
Edited change-log to add loading fix
2015-03-04 16:52:24 -06:00
[VB]AWOL
342072177c push test build of redryder pbo 2015-03-04 09:17:23 -06:00
vbawol
ccd98e3a4c Merge pull request #1643 from arma2WillRobinson/rrpatch2
RedRyder post-server testing fixes
2015-03-04 08:55:52 -06:00
armaWillRobinson
10003f4ebf update 2015-03-03 19:43:17 -08:00
armaWillRobinson
5d36d84cb2 prefix change 2015-03-02 18:19:13 -08:00
armaWillRobinson
c8ded9b38d patch 2015-03-02 18:07:17 -08:00
arma2WillRobinson
8e5ad427b8 Merge pull request #2 from vbawol/master
updating my git
2015-03-02 17:56:44 -08:00
arma2WillRobinson
ade7d3f36d Merge pull request #1 from arma2WillRobinson/patch5
Patch5
2015-03-02 17:15:18 -08:00
armaWillRobinson
b165cade29 update 2015-03-02 17:12:32 -08:00
Mikeeeyy
fea1013a1c Update server_updateObject.sqf 2015-03-01 04:08:04 +00:00
Mikeeeyy
4814c4fd04 Update server_updateObject.sqf
Better formatting and some fixes, one major fix involving the saving of inventory. It was using format which has a limit. That could be a problem with a vehicle that can hold a lot of cargo with a ton of unique mags/weapons in it.
2015-02-28 01:30:09 +00:00
Dean Reid
3451892dab Edited change-log to add loading fix
#1610
2015-02-23 16:34:18 +00:00
vbawol
420df74924 Merge pull request #1639 from arma2WillRobinson/patch4
RedRyder added missing files
2015-02-22 14:44:04 -06:00
armaWillRobinson
96c3471d11 updated 2015-02-21 12:28:53 -08:00
seb3sec
e8430a49c5 removed hiddenSelections definition 2015-02-21 02:56:25 +01:00
seb3sec
70f232e0ff remove hiddenSelection definition 2015-02-21 02:55:25 +01:00
seb3sec
49d702b6b8 Keep hiddenSelections for armed Mi17
hiddenSelections = {}; removes the option to use custom textures on the armed version. The civilian one has these hiddenSelections.
2015-02-21 02:33:05 +01:00
Mikeeeyy
2e8fb3bd17 Update Ammo.hpp 2015-02-19 21:16:34 +00:00
seb3sec
3e62064a06 Rename BAF_L110A1_Aim to BAF_L110A1_Aim.hpp 2015-02-19 13:37:28 +01:00
seb3sec
4d141b17b1 Add variant which does not drop the backpack 2015-02-19 13:36:24 +01:00
seb3sec
ede660d09b Added include for BAF_L110A1_Aim.hpp 2015-02-19 13:33:51 +01:00
seb3sec
4ed8769e93 Fix for compile error "Item listed twice..."
The type attribute was defined twice for ItemHempPlant
2015-02-19 13:16:44 +01:00
seb3sec
5850efb0c6 Fix for "Undefined base class" with FN FAL 2015-02-19 12:21:52 +01:00
SplenectomY
192f255257 Add cough sound effects 2015-02-09 14:14:57 -05:00
SplenectomY
1dd9e0cb91 Update CfgSounds.hpp 2015-02-09 13:57:48 -05:00
SplenectomY
700ab86781 Update object_speak.sqf 2015-02-09 13:56:33 -05:00
SplenectomY
4c4b7133be Update object_speak.sqf 2015-02-09 11:21:08 -05:00
SplenectomY
9dc196d8bd Update CfgSounds.hpp 2015-02-09 11:17:28 -05:00
vbawol
86551302de Merge pull request #1626 from Mikeeeyy/patch-12
Fix rare occasion of gear not updating
2015-02-08 08:26:13 -06:00
Mikeeeyy
9623809d5b Update player_gearSync.sqf 2015-02-08 05:46:42 +00:00
vbawol
7fcb7ff657 Merge pull request #1610 from deannreid/patch-1
Fixed Black Screen on Loading
2015-02-06 09:31:05 -06:00
vbawol
d472450062 Merge pull request #1621 from ebaydayz/patch-7
[FIXED] Trader menu expected array error
2015-02-05 10:15:03 -06:00
vbawol
1c87cac11a Merge pull request #1620 from ebaydayz/patch-6
Fix trader menu expected array error
2015-02-05 10:14:55 -06:00
vbawol
0efa8ea37b Merge pull request #1619 from ebaydayz/patch-5
Fix trader menu expected array error
2015-02-05 10:14:48 -06:00
vbawol
cdb0399f19 Merge pull request #1618 from ebaydayz/patch-4
Fix trader menu expected array error
2015-02-05 10:14:37 -06:00
vbawol
a664da7b3e Merge pull request #1611 from Mikeeeyy/patch-9
Update server_updateObject.sqf
2015-02-05 10:12:02 -06:00
vbawol
172b9e21c7 Merge pull request #1615 from ebaydayz/patch-2
Update CHANGE LOG 1.0.5.2.txt
2015-02-05 10:10:27 -06:00
vbawol
23791fc1d8 Merge pull request #1614 from ebaydayz/patch-1
Compact mission.sqm port from DayZ Mod 1.8.3
2015-02-05 10:09:59 -06:00
ebaydayz
5b2949c33d [FIXED] Trader menu expected array error
[FIXED] Trader menu expected array error #1618-1620 @ebaydayz
2015-02-04 14:16:50 -05:00
ebaydayz
7151f6859f Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all the stary and base traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:13:08 -05:00
ebaydayz
3623b68112 Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all the stary and base traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:11:47 -05:00
ebaydayz
de4f50dad0 Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all Stary and Bash traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:09:16 -05:00
ebaydayz
13578d07ad Update CHANGE LOG 1.0.5.2.txt 2015-01-29 13:39:25 -05:00
ebaydayz
fd2eaaaa56 Update mission.sqm 2015-01-29 13:19:45 -05:00
ebaydayz
e3d57adbae Update mission.sqm 2015-01-29 13:19:21 -05:00
ebaydayz
720f50f443 Update mission.sqm 2015-01-29 13:18:54 -05:00
ebaydayz
ed575c818b Update mission.sqm 2015-01-29 13:18:16 -05:00
ebaydayz
dfb99cc867 Update mission.sqm 2015-01-29 13:17:40 -05:00
ebaydayz
737fd45f26 Update mission.sqm 2015-01-29 13:16:59 -05:00
ebaydayz
a1ae300b92 Update mission.sqm 2015-01-29 13:16:30 -05:00
ebaydayz
909ca991cd Update mission.sqm 2015-01-29 13:16:01 -05:00
ebaydayz
5d0b141b60 Update mission.sqm 2015-01-29 13:15:30 -05:00
ebaydayz
9ac6611ceb Update mission.sqm 2015-01-29 13:14:31 -05:00
ebaydayz
362fa9bbed Update mission.sqm 2015-01-29 13:14:02 -05:00
ebaydayz
d183859167 Update mission.sqm 2015-01-29 13:13:19 -05:00
ebaydayz
b204a23af6 Update mission.sqm 2015-01-29 13:12:50 -05:00
ebaydayz
282348c189 Update mission.sqm 2015-01-29 13:12:19 -05:00
ebaydayz
479cd0354a Update mission.sqm 2015-01-29 13:11:42 -05:00
ebaydayz
c13deff6aa Update mission.sqm 2015-01-29 13:10:58 -05:00
ebaydayz
3f04dbd243 Update mission.sqm 2015-01-29 13:10:25 -05:00
ebaydayz
4853b8db65 Update mission.sqm 2015-01-29 13:09:50 -05:00
ebaydayz
19a2e98d01 Update mission.sqm 2015-01-29 13:09:15 -05:00
ebaydayz
3683b72527 Update mission.sqm 2015-01-29 13:08:45 -05:00
ebaydayz
2df849403e Update mission.sqm 2015-01-29 13:08:01 -05:00
ebaydayz
a69bae2126 Update mission.sqm 2015-01-29 13:07:34 -05:00
ebaydayz
009a6c1c25 Update mission.sqm 2015-01-29 13:06:36 -05:00
ebaydayz
32096ce3a8 Update mission.sqm 2015-01-29 13:05:46 -05:00
ebaydayz
260c22af71 Update mission.sqm 2015-01-29 13:05:17 -05:00
ebaydayz
fc62f1076b Compact mission.sqm port from DayZ Mod 1.8.3 2015-01-29 13:03:21 -05:00
Mikeeeyy
5c88e790f4 Update server_updateObject.sqf 2015-01-21 20:15:10 +00:00
Dean Reid
547ba0018f Fixed Black Screen on Loading
which made users able to walk around but not see anything but DayZ Image
2015-01-21 14:23:02 +00:00
vbawol
26f51ad9f9 Merge pull request #1609 from Namindu/patch-32
Update CHANGE LOG 1.0.5.2.txt
2015-01-18 16:26:04 -06:00
Namindu
8ccc1e723b Update CHANGE LOG 1.0.5.2.txt 2015-01-18 14:25:27 -08:00
vbawol
9f17fe3f18 Merge pull request #1608 from deadeye2/patch-4
Update CHANGE LOG 1.0.5.2.txt
2015-01-18 12:56:40 -06:00
deadeye2
e0294796bc Update CHANGE LOG 1.0.5.2.txt 2015-01-18 12:04:14 -05:00
vbawol
ed0234139e Merge pull request #1457 from Namindu/patch-8
Added RedRyder BB Gun Ammo to Loot Table
2015-01-18 00:44:18 -06:00
vbawol
9c70f0f2d4 Merge pull request #1456 from Namindu/patch-7
Added RedRyder BB Gun to Loot Table
2015-01-18 00:44:11 -06:00
vbawol
dc772e7384 Merge pull request #1581 from Jamie-Booth/master
Add the _ to the Land and escape the character
2015-01-18 00:42:16 -06:00
[VB]AWOL
b21afc8d0a red ryder model path changes 2015-01-18 00:45:00 -06:00
vbawol
196a8b2e94 Merge pull request #1600 from BangL/master
custom CfgVehicles? i dont think so
2015-01-18 00:37:17 -06:00
vbawol
32bcb8515b Merge pull request #1592 from raginruffalo/patch-1
Fixed a sound error and organized file more
2015-01-18 00:36:31 -06:00
vbawol
010c164d22 Merge pull request #1589 from Markokil321/patch-5
Update HiveExt.ini
2015-01-18 00:36:17 -06:00
vbawol
665de9d917 Merge pull request #1580 from deadeye2/patch-3
DZE_MissionLootTable fix
2015-01-18 00:35:02 -06:00
vbawol
4c62c1a55e Merge pull request #1582 from Geodar/master
Another batch of czech
2015-01-18 00:34:38 -06:00
vbawol
54f4cc5024 Merge pull request #1561 from ebaydayz/patch-1
Delete old group after changing clothes
2015-01-18 00:33:57 -06:00
vbawol
21098f9b73 Merge pull request #1556 from raginruffalo/patch-3
Should fix #1555
2015-01-18 00:33:10 -06:00
vbawol
211a74a645 Merge pull request #1540 from deadeye2/patch-2
Update player_drink.sqf
2015-01-18 00:32:38 -06:00
vbawol
a5e8aae13b Merge pull request #1539 from deadeye2/patch-1
undefined variable _itemtodrop     fixes #1535
2015-01-18 00:31:54 -06:00
vbawol
1187207dcf Merge pull request #1606 from Mikeeeyy/patch-8
Update server_updateObject.sqf
2015-01-18 00:26:58 -06:00
Mikeeeyy
4ad1a72db2 Update server_updateObject.sqf 2015-01-18 04:28:04 +00:00
BangL
d0a1463425 custom CfgVehicles? i dont think so 2014-12-12 13:19:37 +01:00
Wargog
d8105936e5 Added RedRyder to loot 2014-11-25 09:08:13 -05:00
Wargog
92a14789ae Create $PBOPREFIX$ 2014-11-25 09:02:26 -05:00
Wargog
6af912a200 Fixed a sound error and organized file more 2014-11-25 09:00:13 -05:00
Skaronator.com
2f196bb146 Include FN_FAL_ANPVS4 #1587 2014-11-22 22:40:54 +01:00
Skaronator.com
aedaf4a558 Fix Typo 2014-11-22 22:40:18 +01:00
Marko
f5e80520bb Update HiveExt.ini
Small clarification. Pretty sure i was having issues with cleanups caused by this a long time ago, and have spoken to someone else who was also confused by this.

Please correct me if i'm wrong otherwise i could also do this for all other config examples?
2014-11-14 00:41:41 +01:00
Skaronator.com
62b711ecd8 Fix typo 2014-11-09 18:00:33 +01:00
Geodar
666b0fd7b2 Another batch of Czech
Fix not showing Bought vehicles in Czech language
2014-11-06 13:40:12 +01:00
Geodar
348e102ef0 Another batch of czech for latest commits 2014-11-01 20:55:20 +01:00
Geodar
af8382a5e6 Czech for latest commits 2014-11-01 20:19:10 +01:00
Jamie Booth
6902efa63a Add the _ to the Land and escape the character
LandRover vehicles are being ignored with this script.  If you escape the '_' with '\' it will only look for the '_' character used with all build able land objects.  Currently LandRover vehicles will not be unlocked or deleted, as they are ignored with the current 'Land%' match.
2014-10-30 17:33:26 +11:00
deadeye2
7345f46fed DZE_MissionLootTable fix
Fixes a zombie loot error when using loot tables in mission file.
2014-10-22 10:20:42 -04:00
vbawol
e8c0f6da6a Merge pull request #1574 from RimBlock/master
Minor DB dump batch file change.
2014-10-12 18:31:01 -05:00
vbawol
4bac499c74 Merge pull request #1578 from Markokil321/patch-5
Update add_recommended_mysql_events.sql
2014-10-12 18:30:42 -05:00
Marko
03e0087f54 Update add_recommended_mysql_events.sql
Added 2 objects which were forgotten to this array. Would result in CharacterID 0 being set for these objects, which is not the point.
2014-10-13 01:16:35 +02:00
RimBlock
4976e7965f Added DB dump batch file options to dump events and triggers as well as doing a quick (row level streaming) dump. 2014-10-06 10:06:27 +08:00
vbawol
d8dd028c5f Merge pull request #1572 from MadHatter05/patch-1
OCD update to init.sqf - 11.chernarus
2014-10-01 16:43:24 -05:00
vbawol
76000d59f9 Merge pull request #1573 from MadHatter05/patch-2
OCD update to description.ext - 11.chernarus
2014-10-01 16:43:14 -05:00
MadHatter05
8f37e9c106 OCD update to description.ext 2014-10-01 17:30:59 -04:00
MadHatter05
d4028afa65 OCD update to init.sqf - 11.chernarus 2014-10-01 17:28:40 -04:00
vbawol
b0ae579875 Update spawn_loot_small.sqf 2014-09-22 13:23:56 -05:00
ebaydayz
77d9951f23 Delete old group after changing clothes
The deleteGroup command requires the group to be local to the machine executing it:
https://community.bistudio.com/wiki/deleteGroup

When a player changes clothes a new group is created. The player is switched into a new unit in the new group, and then his old group is left empty. Because the old group is local to the player, it will not be deleted by server_cleanupGroups until he disconnects and it is transferred to the server. 

We should delete the old group immediately rather than wait for the player to disconnect. This will prevent the excessive accumulation of empty groups when players change clothes a lot. It will help with the seagull spawn issue which happens when there are more than 144 groups on side WEST:
https://community.bistudio.com/wiki/createGroup
2014-09-05 14:12:04 -04:00
Wargog
0c3173826e Done, pull please. 2014-09-03 09:40:36 -04:00
Skaronator.com
f7144334ea Merge pull request #1557 from raymix/master
rare bug with snap
2014-08-31 04:40:24 +02:00
Wargog
1c2511bc55 Maybe? 2014-08-30 12:24:02 -04:00
Wargog
5a54f26c4d I didn't do that 2014-08-30 12:20:54 -04:00
raymix
d59c5b8278 rare bug 2014-08-30 12:55:58 +01:00
Wargog
6bddf7513e Fixed AWOL's pointer 2014-08-28 14:17:43 -04:00
Wargog
064d50778a Should fix #1555 2014-08-28 13:59:22 -04:00
vbawol
b7e2462188 Merge pull request #1552 from raginruffalo/patch-3
Fixed a ton of errors
2014-08-28 11:03:10 -05:00
vbawol
1e8f146860 Merge pull request #1553 from ADK-DAYZMOD-EPOCH/master
UPDATED rotate_logs.bat
2014-08-28 11:02:50 -05:00
raziel23x
420f832210 added missing echo info 2014-08-28 11:45:00 -04:00
raziel23x
5c1833fc99 Removed extra variable used in debug testing 2014-08-28 10:04:43 -04:00
raziel23x
37234e5209 UPDATED rotate_logs.bat
Tweaked rotate_logs.bat to incorporate the day of the week for better
organization
2014-08-28 10:01:30 -04:00
vbawol
d52eb620e6 Merge pull request #1541 from raymix/master
code optimization, bugs, improvements
2014-08-28 00:28:20 -05:00
vbawol
9762dad8ee Merge pull request #1543 from Beefheart/master
Update player_onPause.sqf
2014-08-28 00:28:09 -05:00
Wargog
1c839f47fd Fixed a ton of errors
Made it look nicer as well, separated some lines and vars and values.
2014-08-27 14:48:54 -04:00
vbawol
6f58a882aa Merge pull request #1544 from arma2WillRobinson/master
Corrected all Red Ryder paths
2014-08-27 11:04:58 -05:00
vbawol
727a2d211a Merge pull request #1551 from Uro1/master
Update CfgServerTrader to match #1508
2014-08-27 11:01:36 -05:00
Uro1
b3246ec80d Update CfgServerTraders to match #1508
Updated the CfgServerTrader to match my changes in dynamic_vehicles &
SQL changes.
2014-08-27 16:40:33 +01:00
Beefheart
f3c0b582b4 Update player_onPause.sqf 2014-08-26 10:22:47 +02:00
raymix
efca644b46 fix for db ATL limitation 2014-08-23 19:02:49 +01:00
Uro1
9984923462 Merge pull request #13 from vbawol/master
merge
2014-08-22 20:56:27 +01:00
arma2WillRobinson
e35e5e326b Update config.cpp 2014-08-22 10:34:51 -07:00
Beefheart
9cdae44069 Update player_onPause.sqf
fixes players logging out in selfmade no-building-zones
2014-08-22 08:31:33 +02:00
raymix
903f5d8572 code optimization, bugs, improvements 2014-08-21 06:23:42 +01:00
deadeye2
5b4d53d3b9 Update player_drink.sqf
eliminate redundant declaring of _itemtodrop and change to match player_eat.sqf
2014-08-20 19:58:43 -04:00
deadeye2
e4982dc313 fixes #1535
After eating in a vehicle that should drop an empty can, client RPT would show:

Error Undefined variable in expression: _itemtodrop
2014-08-20 19:41:06 -04:00
Uro1
dccbb19131 Merge pull request #12 from vbawol/master
merge
2014-08-15 22:51:54 +01:00
Uro1
d1b40385a9 Merge pull request #11 from vbawol/master
pull from epoch master
2014-08-11 14:32:19 +01:00
Namindu
cb6ed37846 Added RedRyder BB Gun Ammo to Loot Table
Forgot to add the ammo.

Added ammo to "hunter", "generic" and "office". Chance of spawn is 0.05

Classname: "350Rnd_BB_Magazine"
2014-07-25 14:55:12 -07:00
Namindu
1693b33d42 Added RedRyder BB Gun to Loot Table
Available as "farmweapons" and "shotgunsingleshot". Chance of spawn is 0.06.
2014-07-25 14:48:35 -07:00
104 changed files with 3488 additions and 28121 deletions

View File

@@ -5,10 +5,12 @@
[NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
[NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix
[NEW] Modular/Function based player_build for addon makers and modders. @raymix (more info and concepts - http://epochmod.com/forum/index.php?/topic/14628-modular-function-based-player-buildsqf/ )
[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
[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
[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
[FIXED] CH53 gear when locked #1364 @icomrade
@@ -23,11 +25,16 @@
[FIXED] Some counts reverted to forEach - count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
[FIXED] Safes empty when opening after restart #1467 @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
[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 with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
[UPDATED] Epoch.sql, 1.0.5_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
[UPDATED] mission.sqm to compact format from DayZ Mod 1.8.3 @ebaydayz
[INFO] (EXTREMELY IMPORTANT) Server owners MUST update their required build and beta to 125548
[INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing.

View File

@@ -1,6 +1,8 @@
**DayZ Epoch**
================
## This is the experimental beta branch
Experimental DayZ mod
http://dayzepoch.com

View File

@@ -26,6 +26,8 @@ class CfgLoot {
,{"FoodBioMeat",0.01}
,{"8Rnd_9x18_MakarovSD",0.01}
,{"ItemDocument",0.03}
,{"RedRyder",0.06}
,{"350Rnd_BB_Magazine",0.07}
};
office2[] = {
{"FoodCanUnlabeled",0.07}
@@ -47,6 +49,7 @@ class CfgLoot {
,{"8Rnd_9x18_MakarovSD",0.01}
,{"ItemBriefcaseEmpty",0.01}
,{"ItemDocument",0.02}
,{"350Rnd_BB_Magazine",0.09}
};
food[] = {
{"TrashTinCan",0.09}
@@ -84,6 +87,7 @@ class CfgLoot {
,{"8Rnd_9x18_Makarov",0.08}
,{"15Rnd_W1866_Slug",0.02}
,{"WoodenArrow",0.04}
,{"350Rnd_BB_Magazine",0.05}
,{"HandRoadFlare",0.07}
,{"ItemPainkiller",0.02}
,{"HandChemGreen",0.01}
@@ -115,12 +119,14 @@ class CfgLoot {
,{"8Rnd_9x18_Makarov",0.09}
,{"15Rnd_W1866_Slug",0.02}
,{"WoodenArrow",0.04}
,{"350Rnd_BB_Magazine",0.05}
,{"HandRoadFlare",0.07}
,{"ItemPainkiller",0.02}
,{"HandChemGreen",0.01}
,{"HandChemBlue",0.03}
,{"HandChemRed",0.03}
,{"ItemHeatPack",0.04}
,{"350Rnd_BB_Magazine",0.09}
};
medical[] = {
{"ItemBandage",0.4}
@@ -247,11 +253,14 @@ class CfgLoot {
,{"10x_303",0.1}
,{"ItemWaterbottleUnfilled",0.05}
,{"WoodenArrow",0.2}
,{"350Rnd_BB_Magazine",0.05}
,{"ItemHeatPack",0.02}
,{"FoodMRE",0.01}
,{"FoodNutmix",0.02}
,{"ItemDocument",0.01}
,{"ItemMixOil",0.01}
,{"RedRyder",0.06}
,{"350Rnd_BB_Magazine",0.09}
};
worker[] = {
{"FoodCanUnlabeled",0.09}
@@ -369,6 +378,7 @@ class CfgLoot {
,{"Saiga12K",0.13}
,{"Remington870_lamp",0.1}
,{"Crossbow_DZ",0.07}
,{"RedRyder",0.06}
,{"M1014",0.05}
};
farmweapons[] = {
@@ -378,8 +388,10 @@ class CfgLoot {
,{"Saiga12K",0.13}
,{"Remington870_lamp",0.1}
,{"Crossbow_DZ",0.07}
,{"RedRyder",0.06}
,{"huntingrifle",0.05}
,{"Chainsaw",0.01}
,{"RedRyder",0.06}
};
sniperrifles[] = {
{"AK_107_PSO",0.1}

View File

@@ -28,7 +28,9 @@ class 100Rnd_762x51_M240 : CA_Magazine {
model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\100Rnd_762x51_M240.p3d";
};
class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
displayName = "200Rnd. M240";
count = 200;
descriptionShort = "Caliber: 7.62x51mm NATO <br/>Rounds: 200 <br/>Used in: M240, Mk 48 Mod 0";
};
class 200Rnd_556x45_M249 : CA_Magazine {
scope = 2;
@@ -153,4 +155,4 @@ class WoodenArrow : CA_Magazine {
output[] = {"Quiver"};
};
};
};
};

View File

@@ -75,7 +75,6 @@ class ItemHempSeed: CA_Magazine {
class ItemHempPlant: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "A Hemp Plant";
descriptionShort = "A Hemp Plant";
weight = 0.1;
@@ -90,4 +89,4 @@ class ItemHempPlant: CA_Magazine {
create = "MAP_c_fern"; // TODO: model for Hemp Stage 1
};
};
};
};

View File

@@ -8,7 +8,6 @@ class AN2_DZ: An2_Base_EP1
side = 2;
crew = "";
typicalCargo[] = {};
hiddenSelections[] = {};
class TransportMagazines{};
class TransportWeapons{};
weapons[] = {};

View File

@@ -17,7 +17,6 @@ class Mi17_DZ: Mi17_base {
side = 2;
crew = "";
typicalCargo[] = {};
hiddenSelections[] = {};
class TransportMagazines{};
class TransportWeapons{};
commanderCanSee = 2+16+32;

View File

@@ -17,7 +17,6 @@ class UH1Y_DZ: UH1_Base {
side = 2;
crew = "";
typicalCargo[] = {};
hiddenSelections[] = {};
class TransportMagazines{};
class TransportWeapons{};
commanderCanSee = 2+16+32;
@@ -65,7 +64,6 @@ class UH1H_DZ: UH1H_base {
side = 2;
crew = "";
typicalCargo[] = {};
hiddenSelections[] = {};
class TransportMagazines{};
class TransportWeapons{};
commanderCanSee = 2+16+32;

View File

@@ -279,5 +279,6 @@ class CfgWeapons {
#include "CfgWeapons\Weapon\LMG\M249_EP1.hpp"
#include "CfgWeapons\Weapon\LMG\M249_m145_EP1.hpp"
#include "CfgWeapons\Weapon\LMG\M60A4.hpp"
// #include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
#include "CfgWeapons\Weapon\LMG\BAF_L110A1_Aim.hpp"
#include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
};

View File

@@ -0,0 +1,4 @@
class BAF_L110A1_Aim;
class BAF_L110A1_Aim_DZE:BAF_L110A1_Aim {
type = "1";
};

View File

@@ -1,3 +1,4 @@
class FN_FAL_ANPVS4;
class FN_FAL_ANPVS4_DZE:FN_FAL_ANPVS4 {
visionMode[] = {"Normal", NVG};
visionMode[] = {"Normal", "NVG"};
};

View File

@@ -840,7 +840,7 @@ class CfgVehicles {
displayName = "Bag fence (Round)";
vehicleClass = "Fortifications";
constructioncount = 3;
removeoutput[] = {{"ItemSandbag",1}};
removeoutput[] = {{"BagFenceRound_DZ_kit",1}};
nounderground = 0;
};

View File

@@ -33,7 +33,7 @@ DZE_buildItem = _this; //This is a magazine! It's global to allow access to it f
//Check illegal player states. Returns [_isFine] string
[] call player_build_states;
//check for nearby requirements (campfire, workshop, fueltank). Returns [_reason] string
//check for nearby requirements (campfire, workshop, fueltank).
[] call player_build_needNearby;
//check config files and gather info about item (if using custom buildables, make your own similar function instead).
@@ -71,10 +71,9 @@ _hasrequireditem = _hasRequired select 0; //bool
//define items collected from function
_location1 = _buildObject select 0; //array
_object = _buildObject select 1; //Obj
_position = _buildObject select 2; // array
_objectHelper = _buildObject select 3; //Obj
_objectHelper = _buildObject select 2; //Obj
_controls = [_object, _isAllowedUnderGround, _location1, _position, _objectHelper] call player_build_controls;
_controls = [_object, _isAllowedUnderGround, _location1, _objectHelper] call player_build_controls;
//define items collected from function
_cancel = _controls select 0; //bool

View File

@@ -3,8 +3,7 @@ private ["_canDo","_passArray","_objHDiff","_isOk","_zheightchanged","_zheightdi
_object = _this select 0;
_isAllowedUnderGround = _this select 1;
_location1 = _this select 2;
_position = _this select 3;
_objectHelper = _this select 4;
_objectHelper = _this select 3;
_passArray = [];
@@ -15,6 +14,7 @@ _reason = "";
_dir = getDir player; //required to pass direction when building
helperDetach = false;
_canDo = (!r_drag_sqf and !r_player_unconscious);
_position = [_objectHelper] call FNC_GetPos;
while {_isOk} do {
@@ -55,35 +55,26 @@ while {_isOk} do {
if (DZE_4) then {
_rotate = true;
DZE_4 = false;
if (helperDetach) then {
_dir = -45;
} else {
_dir = 180;
};
_dir = -45;
};
if (DZE_6) then {
_rotate = true;
DZE_6 = false;
if (helperDetach) then {
_dir = 45;
} else {
_dir = 0;
};
_dir = 45;
};
if (DZE_F and _canDo) then {
if (helperDetach) then {
_objectHelperDir = getDir _objectHelper;
_objectHelper attachTo [player];
_objectHelper setDir _objectHelperDir-(getDir player);
helperDetach = false;
if (helperDetach) then {
_objectHelperDir = getDir _objectHelper;
_objectHelper attachTo [player];
_objectHelper setDir _objectHelperDir-(getDir player);
helperDetach = false;
} else {
_objectHelperPos = getPosATL _objectHelper;
detach _objectHelper;
_objectHelper setPosATL _objectHelperPos;
_objectHelperDir = getDir _objectHelper;
_objectHelper setVelocity [0,0,0]; //fix sliding glitch
helperDetach = true;
_objectHelperDir = getDir _objectHelper;
detach _objectHelper;
[_objectHelper] call FNC_GetSetPos;
_objectHelper setVelocity [0,0,0]; //fix sliding glitch
helperDetach = true;
};
DZE_F = false;
};
@@ -91,21 +82,26 @@ while {_isOk} do {
if(_rotate) then {
if (helperDetach) then {
_objectHelperDir = getDir _objectHelper;
_objectHelperPos = getPosATL _objectHelper;
_objectHelper setDir _objectHelperDir+_dir;
_objectHelper setPosATL _objectHelperPos;
[_objectHelper] call FNC_GetSetPos;
} else {
_objectHelper setDir _dir;
_objectHelper setPosATL _position;
detach _objectHelper;
_objectHelperDir = getDir _objectHelper;
_objectHelper setDir _objectHelperDir+_dir;
[_objectHelper] call FNC_GetSetPos;
_objectHelperDir = getDir _objectHelper;
_objectHelper attachTo [player];
_objectHelper setDir _objectHelperDir-(getDir player);
};
};
if(_zheightchanged) then {
if (!helperDetach) then {
detach _objectHelper;
_objectHelperDir = getDir _objectHelper;
};
_position = getPosATL _objectHelper;
_position = [_objectHelper] call FNC_GetPos;
if(_zheightdirection == "up") then {
_position set [2,((_position select 2)+0.1)];
@@ -134,30 +130,32 @@ while {_isOk} do {
_objHDiff = _objHDiff - 0.01;
};
_objectHelper setDir (getDir _objectHelper);
if((_isAllowedUnderGround == 0) && ((_position select 2) < 0)) then {
_position set [2,0];
};
_objectHelper setPosATL _position;
if (surfaceIsWater _position) then {
_objectHelper setPosASL _position;
} else {
_objectHelper setPosATL _position;
};
if (!helperDetach) then {
_objectHelper attachTo [player];
_objectHelper setDir _objectHelperDir-(getDir player);
};
};
sleep 0.5;
_location2 = getPosATL player;
_objectHelperPos = getPosATL _objectHelper;
_location2 = [player] call FNC_GetPos;
_objectHelperPos = [_objectHelper] call FNC_GetPos;
if(DZE_5) exitWith {
_isOk = false;
_position = [_object] call FNC_GetPos;
detach _object;
_position = getPosATL _object;
_dir = getDir _object;
deleteVehicle _object;
detach _objectHelper;
deleteVehicle _objectHelper;

View File

@@ -1,10 +1,10 @@
// disallow building if too many objects are found within 30m (by default)
private ["_cnt"];
private ["_cnt","_pos"];
_cnt = count ((getPosATL player) nearObjects ["All",DZE_checkNearbyRadius]);
_pos = [player] call FNC_GetPos;
_cnt = count (_pos nearObjects ["All",DZE_checkNearbyRadius]);
if (_cnt >= DZE_BuildingLimit) exitWith { //end script if too many objects nearby
DZE_ActionInProgress = false;
cutText [(localize "str_epoch_player_41"), "PLAIN DOWN"];
};
_cnt //returns amount of total objects found nearby

View File

@@ -1,5 +1,5 @@
//create an object for default build system style
private ["_passArray","_classname","_enableGhost","_ghost","_location","_location1","_dir","_object","_position","_objectHelper","_helperColor"];
private ["_passArray","_classname","_enableGhost","_ghost","_location1","_dir","_object","_objectHelper","_helperColor"];
_classname = _this select 0;
_ghost = _this select 1;
@@ -7,11 +7,10 @@ _offset = _this select 2;
_enableGhost = _this select 3; //pass false trough args if not using ghost preview
_passArray = [];
_location = [0,0,0]; //create object in debug zone first
_objectHelper = objNull;
// get inital players position
_location1 = getPosATL player;
_location1 = [player] call FNC_GetPos;
// if enabled, use ghost preview where available
if (_enableGhost) then {
@@ -20,19 +19,19 @@ if (_enableGhost) then {
};
};
_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; //object preview, not an actual object that will be built
_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; //object preview, not an actual object that will be built
_objectHelper = "Sign_sphere10cm_EP1" createVehicle _location;
_objectHelper = "Sign_sphere10cm_EP1" createVehicle [0,0,0];
_helperColor = "#(argb,8,8,3)color(0,0,0,0,ca)";
_objectHelper setobjecttexture [0,_helperColor];
_objectHelper attachTo [player,_offset];
_object attachTo [_objectHelper,[0,0,0]];
_position = getPosATL _objectHelper;
if (isClass (configFile >> "SnapBuilding" >> _classname)) then {
["","","",["Init",_object,_classname,_objectHelper]] spawn snap_build;
};
_passArray = [_location1,_object,_position,_objectHelper];
_passArray = [_location1,_object,_objectHelper];
_passArray //[array,obj,array]

View File

@@ -1,17 +1,17 @@
if(!DZE_ActionInProgress) exitWith {};
//disallow building if required items (defined in config) are not found nearby
private ["_abort","_reason","_distance","_needNear","_isNear"];
private ["_abort","_reason","_distance","_needNear","_isNear","_pos"];
_abort = false; //do not abort by default
_reason = ""; // define to avoid RPT errors
_needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActions" >> "Build" >> "neednearby");
_pos = [player] call FNC_GetPos;
{
switch(_x) do{
case "fire":
{
_distance = 3;
_isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
_isNear = {inflamed _x} count (_pos nearObjects _distance);
if(_isNear == 0) then {
_abort = true;
_reason = "fire";
@@ -20,7 +20,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi
case "workshop":
{
_distance = 3;
_isNear = count (nearestObjects [player, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
_isNear = count (nearestObjects [_pos, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
if(_isNear == 0) then {
_abort = true;
_reason = "workshop";
@@ -29,7 +29,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi
case "fueltank":
{
_distance = 30;
_isNear = count (nearestObjects [player, dayz_fuelsources, _distance]);
_isNear = count (nearestObjects [_pos, dayz_fuelsources, _distance]);
if(_isNear == 0) then {
_abort = true;
_reason = "fuel tank";
@@ -41,4 +41,4 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi
if (_abort) exitWith {
cutText [format[(localize "str_epoch_player_135"),_reason,_distance], "PLAIN DOWN"];
DZE_ActionInProgress = false;
};
};

View File

@@ -48,8 +48,12 @@ if(!_cancel) then {
_location set [2,0]; //reset Z axis to zero (above terrain)
};
_tmpbuilt setPosATL _location; //update position passed from args or previous if statement
if (surfaceIsWater _location) then {
_tmpbuilt setPosASL _location;
_location = ASLtoATL _location; //Database uses ATL
} else {
_tmpbuilt setPosATL _location;
};
cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"];

View File

@@ -48,31 +48,26 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then {
[player,_dis,true,(getPosATL player)] spawn player_alertZombies;
};
if (_hasoutput) then{
_itemtodrop = drink_output select(drink_with_output find _itemorignal);
if (_hasoutput) then {
// Selecting output
_itemtodrop = drink_output select (drink_with_output find _itemorignal);
if (!_invehicle) then {
// Selecting output
_itemtodrop = drink_output select (drink_with_output find _itemorignal);
sleep 3;
_nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
if (count _nearByPile ==0) then {
_nearByPile = nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
if (count _nearByPile == 0) then {
_iPos = getPosATL player;
_radius = 0.0;
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
_item setposATL _iPos;
_item setPosATL _iPos;
} else {
_item = _nearByPile select 0;
};
_item addMagazineCargoGlobal [_itemtodrop,1];
};
if (_invehicle) then {
} else {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
};
};
//add infection chance for "ItemWaterbottle",

View File

@@ -48,26 +48,26 @@ if (dayz_lastMeal < 3600) then {
};
};
if (_hasoutput && !_invehicle) then {
// Selecting output
_itemtodrop = food_output select (food_with_output find _itemorignal);
if (_hasoutput) then {
// Selecting output
_itemtodrop = food_output select (food_with_output find _itemorignal);
sleep 3;
_nearByPile= nearestObjects [(getposATL player), ["WeaponHolder","WeaponHolderBase"],2];
if (count _nearByPile ==0) then {
_iPos = getPosATL player;
_radius = 0.0;
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
_item setposATL _iPos;
} else {
_item = _nearByPile select 0;
};
_item addMagazineCargoGlobal [_itemtodrop,1];
};
if (_hasoutput && _invehicle) then {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
if (!_invehicle) then {
sleep 3;
_nearByPile = nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
if (count _nearByPile == 0) then {
_iPos = getPosATL player;
_radius = 0.0;
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
_item setPosATL _iPos;
} else {
_item = _nearByPile select 0;
};
_item addMagazineCargoGlobal [_itemtodrop,1];
} else {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
};
};
if (_rawfood && !_rawexceptions && (random 15 < 1)) then {

View File

@@ -11,7 +11,7 @@ lbClear TraderDialogCatList;
lbClear TraderDialogItemList;
TraderCurrentCatIndex = -1;
TraderItemList = -1;
TraderItemList = [];
TraderCatList = [];
{
@@ -21,4 +21,4 @@ TraderCatList = [];
} count _trader_data;
waitUntil { !dialog };
TraderCurrentCatIndex = -1;
TraderCatList = -1;
TraderCatList = [];

View File

@@ -57,26 +57,23 @@ fnc_initSnapPoints = {
};
fnc_initSnapPointsNearby = {
_pos = getPosATL _object;
_findWhitelisted = []; _pointsNearby = []; _waterBase = 0;
_onWater = surfaceIsWater position player;
if (_onWater) then { _waterBase = (getPosATL player select 2);};
_findWhitelisted = nearestObjects [_pos,_whitelist,(_radius + DZE_snapExtraRange + _waterBase)]-[_object];
_pos = [_object] call FNC_GetPos;
_findWhitelisted = []; _pointsNearby = [];
_findWhitelisted = nearestObjects [_pos,_whitelist,(_radius + DZE_snapExtraRange)]-[_object];
snapGizmosNearby = [];
{
_nearbyObject = _x;
_pointsNearby = getArray (configFile >> "SnapBuilding" >> (typeOf _x) >> "points");
{
_onWater = surfaceIsWater position _nearbyObject;
_objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicleLocal [0,0,0];
_objectSnapGizmo setobjecttexture [0,_objColorInactive];
_objectSnapGizmo setDir (getDir _nearbyObject);
_posNearby = _nearbyObject modelToWorld [_x select 0,_x select 1,_x select 2];
if (_onWater) then {
if (surfaceIsWater _posNearby) then {
_objectSnapGizmo setPosASL [(_posNearby) select 0,(_posNearby) select 1,(getPosASL _nearbyObject select 2) + (_x select 2)];
} else {
_objectSnapGizmo setPosATL _posNearby;
};
_objectSnapGizmo setDir (getDir _nearbyObject);
snapGizmosNearby set [count snapGizmosNearby,_objectSnapGizmo];
} count _pointsNearby;
} forEach _findWhitelisted;
@@ -84,7 +81,7 @@ fnc_initSnapPointsNearby = {
fnc_initSnapPointsCleanup = {
{detach _x;deleteVehicle _x;}count snapGizmos;snapGizmos=[];
{deleteVehicle _x;}count snapGizmosNearby;snapGizmosNearby=[];
{detach _x;deleteVehicle _x;}count snapGizmosNearby;snapGizmosNearby=[];
snapActionState = "OFF";
};
@@ -94,12 +91,7 @@ fnc_snapDistanceCheck = {
_distClosestPointFound = objNull; _distCheck = 0; _distClosest = 10; _distClosestPoint = objNull; _testXPos = []; _distClosestPointFoundPos =[]; _distClosestPointFoundDir = 0;
{
if (_x !=_distClosestPointFound) then {_x setobjecttexture [0,_objColorInactive];};
_onWater = surfaceIsWater position _x;
if (_onWater) then {
_testXPos = [(getPosASL _x select 0),(getPosASL _x select 1),(getPosASL _x select 2)];
} else {
_testXPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
};
_testXPos = [_x] call FNC_GetPos;
_distCheck = _objectHelper distance _testXPos;
_distClosestPoint = _x;
if (_distCheck < _distClosest) then {
@@ -121,7 +113,7 @@ fnc_snapDistanceCheck = {
} else {
_distClosestPointFoundPos = getPosATL _distClosestPointFound;
_objectHelper setPosATL _distClosestPointFoundPos;
};
};
_objectHelper setDir _distClosestPointFoundDir;
waitUntil {sleep 0.1; !helperDetach};
};
@@ -129,12 +121,7 @@ fnc_snapDistanceCheck = {
_distClosestAttached = objNull; _distCheckAttached = 0; _distClosest = 10; _distClosestAttachedFoundPos = [];
{
if (_x !=_distClosestAttached) then {_x setobjecttexture [0,_objColorInactive];};
_onWater = surfaceIsWater position _x;
if (_onWater) then {
_testXPos = [(getPosASL _x select 0),(getPosASL _x select 1),(getPosASL _x select 2)];
} else {
_testXPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
};
_testXPos = [_x] call FNC_GetPos;
_distCheckAttached = _distClosestPointFound distance _testXPos;
_distClosestPoint = _x;
if (_distCheckAttached < _distClosest) then {
@@ -285,10 +272,11 @@ switch (snapActionState) do {
_newPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
detach _object;
detach _objectHelper;
_objectHelper setDir (getDir _object);
_objectHelper setPosATL _newPos;
_object attachTo [_objectHelper];
_x setobjecttexture [0,_objColorActive];
if (!helperDetach) then {_objectHelper attachTo [player];};
if (!helperDetach) then {_objectHelper attachTo [player]; _objectHelper setDir ((getDir _objectHelper)-(getDir player));};
};
_cnt = _cnt+1;
}count snapGizmos;

View File

@@ -13,7 +13,7 @@ _isOk = false;
_isOk = _cTarget isKindOf _x;
};
} count ["LandVehicle","Air", "Ship"];
_Dis = if (_cTarget isKindOf "USEC_ch53_E") then {25;} else {12;};
_Dis = if (_cTarget isKindOf "USEC_ch53_E" || _cTarget isKindOf "MV22") then {25} else {12};
if((locked _cTarget) && _isOk && (((vehicle player) distance _cTarget) < _Dis)) then {
cutText [(localize "str_epoch_player_7") , "PLAIN DOWN"];
_display closeDisplay 1;

View File

@@ -39,11 +39,10 @@ if (count _this > 4) then {
};
_isWoman = getText(configFile >> "cfgVehicles" >> (typeOf _unit) >> "TextPlural") == "Women";
if (_isWoman && (_type in ["scream","panic"])) then {
if (_isWoman && (_type in ["scream","panic","cough"])) then {
_type = _type + "_w";
};
if ((round(random _chance) == _chance) || (_chance == 0)) then {
_rnd =(round(random _num));
_sound = "z_" + _type + "_" + str(_rnd);
@@ -52,4 +51,4 @@ if ((round(random _chance) == _chance) || (_chance == 0)) then {
} else {
[nil,_unit,rSAY,[_sound, _dis]] call RE;
};
};
};

View File

@@ -1,5 +1,5 @@
private ["_objects"];
_objects = nearestObjects [getPosATL player, dayz_updateObjects, 10];
_objects = nearestObjects [player, dayz_updateObjects, 10];
{
//["PVDZE_veh_Update",[_x,"gear"]] call callRpcProcedure;
PVDZE_veh_Update = [_x,"gear"];

View File

@@ -31,7 +31,7 @@ while {!isNull _display} do {
cutText [localize "str_abort_playerclose", "PLAIN DOWN"];
_sleep = 1;
};
case (!r_player_dead && !canbuild) : {
case (!r_player_dead && isInTraderCity) : {
_btnAbort ctrlEnable false;
cutText [(localize "str_epoch_player_12"), "PLAIN DOWN"];
_sleep = 1;

View File

@@ -1,4 +1,4 @@
private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_tagSetting","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_playerObjName","_wpnType","_ismelee"];
private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_tagSetting","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_playerObjName","_wpnType","_ismelee","_oldGroup"];
if (gear_done) then {disableUserInput true;};
_class = _this;
_position = getPosATL player;
@@ -43,6 +43,7 @@ player setPosATL dayz_spawnPos;
//BackUp Player Object
_oldUnit = player;
_oldGroup = group player;
/**********************************/
//DONT USE player AFTER THIS POINT//
@@ -110,6 +111,7 @@ _switchUnit = {
removeAllWeapons _oldUnit;
{_oldUnit removeMagazine _x;} count magazines _oldUnit;
deleteVehicle _oldUnit;
if (count units _oldGroup < 1) then {deleteGroup _oldGroup;};
if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
};
//Add && Fill BackPack

View File

@@ -8,12 +8,12 @@ TraderDialogSellBtn = 12005;
TraderDialogCurrency = 12006;
TraderCurrentCatIndex = -1;
TraderCatList = -1;
TraderItemList = -1;
TraderCatList = [];
TraderItemList = [];
TraderDialogLoadItemList = {
private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"];
TraderItemList = -1;
TraderItemList = [];
_index = _this select 0;
if (_index < 0) exitWith {};
@@ -210,7 +210,7 @@ TraderDialogBuy = {
_item = TraderItemList select _index;
_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
[0, player, '', _data] execVM (_item select 9);
TraderItemList = -1;
TraderItemList = [];
};
TraderDialogSell = {
@@ -222,5 +222,5 @@ TraderDialogSell = {
_item = TraderItemList select _index;
_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
[0, player, '', _data] execVM (_item select 9);
TraderItemList = -1;
TraderItemList = [];
};

View File

@@ -8,12 +8,12 @@ TraderDialogSellBtn = 12005;
TraderDialogCurrency = 12006;
TraderCurrentCatIndex = -1;
TraderCatList = -1;
TraderItemList = -1;
TraderCatList = [];
TraderItemList = [];
TraderDialogLoadItemList = {
private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"];
TraderItemList = -1;
TraderItemList = [];
_index = _this select 0;
if (_index < 0 || TraderCurrentCatIndex == _index) exitWith {};
@@ -198,7 +198,7 @@ TraderDialogBuy = {
_item = TraderItemList select _index;
_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
[0, player, '', _data] execVM (_item select 9);
TraderItemList = -1;
TraderItemList = [];
};
TraderDialogSell = {
@@ -210,5 +210,5 @@ TraderDialogSell = {
_item = TraderItemList select _index;
_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
[0, player, '', _data] execVM (_item select 9);
TraderItemList = -1;
TraderItemList = [];
};

View File

@@ -64,7 +64,6 @@ switch (_iClass) do
case "cfglootweapon":
{
//Item is sigle, add 1 item from cfgloot
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
_itemTypes = [];
if (DZE_MissionLootTable) then{
@@ -122,4 +121,4 @@ if (!isNull(_item)) then{
};
};
_item
_item

View File

@@ -50,11 +50,8 @@ _agent setVariable ["newDest",_newDest];
//Add some loot
_rnd = random 1;
if (_rnd > 0.3) then {
if (DZE_MissionLootTable) then {
_lootType = getText (missionConfigFile >> "CfgVehicles" >> _type >> "zombieLoot");
} else {
_lootType = getText (configFile >> "CfgVehicles" >> _type >> "zombieLoot");
};
_lootType = getText (configFile >> "CfgVehicles" >> _type >> "zombieLoot");
if (DZE_MissionLootTable) then {
_lootTypeCfg = getArray (missionConfigFile >> "CfgLoot" >> _lootType);

View File

@@ -89,9 +89,15 @@ if ((dayz_spawnZombies < _maxControlledZombies) && (dayz_CurrentNearByZombies <
_lootType = configFile >> "CfgVehicles" >> _type >> "zombieLoot";
if (isText _lootType) then {
_array = [];
{
_array set [count _array, _x select 0]
} forEach getArray (configFile >> "cfgLoot" >> getText(_lootType));
if (DZE_MissionLootTable) then {
{
_array set [count _array, _x select 0]
} forEach getArray (missionConfigFile >> "cfgLoot" >> getText(_lootType));
} else {
{
_array set [count _array, _x select 0]
} forEach getArray (configFile >> "cfgLoot" >> getText(_lootType));
};
if (count _array > 0) then {
_index = dayz_CLBase find getText(_lootType);
_weights = dayz_CLChances select _index;

View File

@@ -450,7 +450,10 @@ if (!isDedicated) then {
// 120 sec timeout (12000 * 0.01)
while { _timeOut < 12000 } do {
if (dayz_clientPreload && dayz_authed) exitWith { diag_log "PLOGIN: Login loop completed!"; };
if (dayz_clientPreload && dayz_authed) exitWith {
diag_log "PLOGIN: Login loop completed!";
endLoadingScreen;
};
if (!isNil "_display") then {
if ( isNull _display ) then {
waitUntil { !dialog; };

View File

@@ -75,7 +75,7 @@ while {1 == 1} do {
_distance = _lastpos distance _curpos;
_curtime = diag_ticktime;
_difftime = _curtime - _lasttime;
_acceptableDistance = if (_lastVehicle isKindOf "Plane") then { 15; } else { 10; };
_acceptableDistance = if (_lastVehicle isKindOf "Plane") then [{15},{10}];
if ((_distance > _acceptableDistance) || {(_difftime > 1)}) then {
_curheight = (ATLtoASL _curpos) select 2;

View File

@@ -1,30 +1,30 @@
class Category_495 {
class hilux1_civil_3_open_EP1 {
class hilux1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_3_open {
class datsun1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_1_open {
class hilux1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_2_covered {
class datsun1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_1_open {
class datsun1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_2_covered {
class hilux1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};

View File

@@ -1,30 +1,30 @@
class Category_535 {
class hilux1_civil_3_open_EP1 {
class hilux1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_3_open {
class datsun1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_1_open {
class hilux1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_2_covered {
class datsun1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_1_open {
class datsun1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_2_covered {
class hilux1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};

View File

@@ -1,62 +1,62 @@
class Category_659 {
class hilux1_civil_3_open_EP1 {
class hilux1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_3_open {
class datsun1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_1_open {
class hilux1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_2_covered {
class datsun1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_1_open {
class datsun1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_2_covered {
class hilux1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
};
class Category_590 {
class hilux1_civil_3_open_EP1 {
class hilux1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_3_open {
class datsun1_civil_3_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_1_open {
class hilux1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_2_covered {
class datsun1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class datsun1_civil_1_open {
class datsun1_civil_1_open_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class hilux1_civil_2_covered {
class hilux1_civil_2_covered_DZE {
type = "trade_any_vehicle";
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};

View File

@@ -4804,7 +4804,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 1 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 1 10oz zlata</Czech> -->
<Czech>Přidat 1 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_198">
<Original>Add 10 10oz Silver</Original>
@@ -4814,7 +4814,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 10 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 10 10oz zlata</Czech> -->
<Czech>Přidat 10 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_199">
<Original>Add 9 10oz Silver</Original>
@@ -4824,7 +4824,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 9 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 9 10oz zlata</Czech> -->
<Czech>Přidat 9 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_200">
<Original>Remove 1 10oz Silver</Original>
@@ -4834,7 +4834,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Verwijder 1 10oz Goud</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Odebráno 1 10oz zlato</Czech> -->
<Czech>Odebráno 1 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_202">
<Original>Add 8 10oz Silver</Original>
@@ -4844,7 +4844,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 8 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 8 10oz zlata</Czech> -->
<Czech>Přidat 8 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_203">
<Original>Add 7 10oz Silver</Original>
@@ -4854,7 +4854,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 7 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 7 10oz zlata</Czech> -->
<Czech>Přidat 7 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_204">
<Original>Add 6 10oz Silver</Original>
@@ -4864,7 +4864,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 6 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 6 10oz zlata</Czech> -->
<Czech>Přidat 6 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_205">
<Original>Add 5 10oz Silver</Original>
@@ -4874,7 +4874,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 5 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 5 10oz zlata</Czech> -->
<Czech>Přidat 5 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_206">
<Original>Add 4 10oz Silver</Original>
@@ -4884,7 +4884,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 4 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidat 4 10oz zlata</Czech> -->
<Czech>Přidat 4 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_207">
<Original>Add 3 10oz Silver</Original>
@@ -4894,7 +4894,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 3 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Prodat 3 10oz zlata</Czech> -->
<Czech>Přidat 3 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_208">
<Original>Add 2 10oz Silver</Original>
@@ -4904,7 +4904,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 2 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidat 2 10oz zlata</Czech> -->
<Czech>Přidat 2 10oz stříbra</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_209">
<Original>Open %1</Original>
@@ -5244,7 +5244,7 @@
<!-- <Spanish></Spanish> -->
<Dutch>Creëer houten vloer 1/2</Dutch>
<!-- <French></French> -->
<Czech>Vytvořit Poloviční dřevěnou podlahu</Czech>
<Czech>Vytvořit 1/2 dřevěné podlahy</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_233">
<Original>Craft Stair Supports</Original>
@@ -5444,7 +5444,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<Czech>Vytvořit Poloviční zeď</Czech>
<Czech>Vytvořit 1/2 zdi</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_253">
<Original>Craft Garage Doorway</Original>
@@ -5994,7 +5994,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Skombinovat cihly</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_307">
<Original>Combined all bars in your inventory to highest denomination.</Original>
@@ -6004,7 +6004,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Skombinovány cihly ve vašem inventáři na maximum.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_308">
<Original>To driver's seat</Original>
@@ -6064,7 +6064,7 @@
<!-- <Spanish></Spanish> -->
<Dutch>\n\nVissen is niet mogelijk tijdens een conflictsituatie.</Dutch>
<French>\n\nVous ne pouvez pas pêcher pendant les combats.</French>
<Czech>Nemůžete ryby, když v boji.</Czech>
<Czech>\n\nNemůžete rybařit, když jste v boji.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_REPAIRV">
<Original>Repair Vehicle</Original>
@@ -6224,7 +6224,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Vylepšení zbraně na vozidle</Czech>
</Key>
<Key ID="STR_EPOCH_VEHUP_ARM_DESC">
<Original>Weapon install guide.</Original>
@@ -6234,7 +6234,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Návod na instalaci zbraně na vozidlo.</Czech>
</Key>
<Key ID="STR_EPOCH_VEHUP_SUCCESS">
<Original>Vehicle Upgrade Successful.</Original>
@@ -6774,7 +6774,7 @@
<!-- <Spanish></Spanish> -->
<Dutch></Dutch>
<French>Vous avez acheté %3 pour %1 %2, la clé a été ajoutée à votre ceinture.</French>
<Czech>Koupeno %3 za 1% 2%, klíč byl přidán do opasku na nářadí.</Czech>
<Czech>Koupeno %3 za %1 %2, klíč byl přidán do opasku na nářadí.</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_12">
<Original>Missing %1 more of %2</Original>
@@ -6884,7 +6884,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Bedna zásob</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC">
<Original>12 x Random Item</Original>
@@ -6894,7 +6894,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x Náhodných předmětů</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_EMPTY">
<Original>Empty Supply Crate</Original>
@@ -6904,7 +6904,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Prázdná bedna</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_SODACOKE_HALF">
<Original>6 x ItemSodaCoke</Original>
@@ -6914,7 +6914,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>6x Soda s kolovou příchutí</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_SODACOKE_FULL">
<Original>12 x ItemSodaCoke</Original>
@@ -6924,7 +6924,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x Soda s kolovou příchutí</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_SODAPEPSI_HALF">
<Original>6 x ItemSodaPepsi</Original>
@@ -6934,7 +6934,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>6x Pepsi</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_SODAPEPSI_FULL">
<Original>12 x ItemSodaPepsi</Original>
@@ -6944,7 +6944,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x Pepsi</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_BACON_HALF">
<Original>6 x FoodbaconCooked</Original>
@@ -6954,7 +6954,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>6x Vepřové</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_BACON_FULL">
<Original>12 x FoodbaconCooked</Original>
@@ -6964,7 +6964,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x Vepřové</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_G17">
<Original>12 x 17Rnd_9x19_glock17</Original>
@@ -6974,7 +6974,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x 17Rnd_9x19_glock17</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_M9SD">
<Original>12 x 15Rnd_9x19_M9SD</Original>
@@ -6984,7 +6984,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x 15Rnd_9x19_M9SD</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_MP5SD">
<Original>12 x 30Rnd_9x19_MP5SD</Original>
@@ -6994,7 +6994,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x 30Rnd_9x19_MP5SD</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_SANDBAG">
<Original>12 x SandBag</Original>
@@ -7004,7 +7004,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12 Pytlů s pískem</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_TANKTRAP_HALF">
<Original>6 x Tank Trap</Original>
@@ -7014,7 +7014,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>6 Zátaras</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_TANKTRAP_FULL">
<Original>12 x Tank Trap</Original>
@@ -7024,7 +7024,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12 Zátaras</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_WIREKIT_HALF">
<Original>6 x Wire Kit</Original>
@@ -7034,7 +7034,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>6 Drátů</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_WIREKIT_FULL">
<Original>12 x Wire Kit</Original>
@@ -7044,7 +7044,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12 Drátů</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_GENERIC_HALF">
<Original>6 x Scrap Metal</Original>
@@ -7054,7 +7054,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>6x Železný šrot</Czech>
</Key>
<Key ID="STR_EPOCH_BULK_DESC_GENERIC_FULL">
<Original>12 x Scrap Metal</Original>
@@ -7064,7 +7064,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>12x Železný šrot</Czech>
</Key>
<Key ID="STR_EPOCH_TRADER_ENTER">
<Original>Now entering %1</Original>
@@ -7074,7 +7074,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Vstoupili jste do %1</Czech>
</Key>
<Key ID="STR_EPOCH_TRADER_LEAVE">
<Original>Now leaving %1</Original>
@@ -7084,7 +7084,7 @@
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
<Czech>Opustili jste %1</Czech>
</Key>
<Key ID="R3F_VERSION_WEIGHTED">
<Original>1.04</Original>

View File

@@ -1,16 +1,18 @@
/*
[_object,_type] spawn server_updateObject;
USAGE:
[_object, _type] spawn server_updateObject;
*/
private ["_object","_type","_objectID","_uid","_lastUpdate","_needUpdate","_object_position","_object_inventory","_object_damage","_isNotOk","_parachuteWest","_firstTime","_object_killed","_object_repair","_isbuildable"];
_object = _this select 0;
_object = _this select 0;
if(isNull(_object)) exitWith {
diag_log format["Skipping Null Object: %1", _object];
if (isNull _object) exitWith {
diag_log format ["Skipping Null Object: %1", _object];
};
_type = _this select 1;
_parachuteWest = ((typeOf _object == "ParachuteWest") || (typeOf _object == "ParachuteC"));
_type = _this select 1;
_parachuteWest = (typeOf _object) in ["ParachuteWest","ParachuteC"];
_isbuildable = (typeOf _object) in dayz_allowedObjects;
_isNotOk = false;
_firstTime = false;
@@ -18,173 +20,163 @@ _firstTime = false;
_objectID = _object getVariable ["ObjectID","0"];
_uid = _object getVariable ["ObjectUID","0"];
if ((typeName _objectID != "string") || (typeName _uid != "string")) then
{
diag_log(format["Non-string Object: ID %1 UID %2", _objectID, _uid]);
//force fail
if (typeName _objectID != "STRING" || typeName _uid != "STRING") then {
diag_log format ["Non-string Object: ID %1 UID %2", _objectID, _uid];
_objectID = "0";
_uid = "0";
};
if (!_parachuteWest && !(locked _object)) then {
if (_objectID == "0" && _uid == "0") then
{
if (!_parachuteWest && !locked _object) then {
if (_objectID == "0" && _uid == "0") then {
_object_position = getPosATL _object;
_isNotOk = true;
_isNotOk = true;
};
};
// do not update if buildable && not ok
if (_isNotOk && _isbuildable) exitWith { };
if (_isNotOk && _isbuildable) exitWith {};
if (_isNotOk) exitWith {
deleteVehicle _object;
diag_log format ["Deleting object %1 with invalid ID at pos [%2,%3,%4]", typeOf _object, _object_position select 0, _object_position select 1, _object_position select 2];
};
// delete if still not ok
if (_isNotOk) exitWith { deleteVehicle _object; diag_log(format["Deleting object %1 with invalid ID at pos [%2,%3,%4]",typeOf _object,_object_position select 0,_object_position select 1, _object_position select 2]); };
_lastUpdate = _object getVariable ["lastUpdate",time];
_lastUpdate = _object getVariable ["lastUpdate", time];
_needUpdate = _object in needUpdate_objects;
// TODO ----------------------
_object_position = {
private["_position","_worldspace","_fuel","_key"];
_position = getPosATL _object;
_worldspace = [
round(direction _object),
_position
];
_fuel = 0;
if (_object isKindOf "AllVehicles") then {
_fuel = fuel _object;
};
_key = format["CHILD:305:%1:%2:%3:",_objectID,_worldspace,_fuel];
//diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite;
private ["_position","_worldspace","_fuel","_key"];
_position = getPosATL _object;
_worldspace = [
round (getDir _object),
_position
];
_fuel = if (_object isKindOf "AllVehicles") then { fuel _object } else { 0 };
_key = format ["CHILD:305:%1:%2:%3:", _objectID, _worldspace, _fuel];
_key call server_hiveWrite;
};
_object_inventory = {
private["_inventory","_previous","_key"];
_inventory = [
getWeaponCargo _object,
getMagazineCargo _object,
getBackpackCargo _object
];
_previous = str(_object getVariable["lastInventory",[]]);
if (str(_inventory) != _previous) then {
_object setVariable["lastInventory",_inventory];
if (_objectID == "0") then {
_key = format["CHILD:309:%1:%2:",_uid,_inventory];
} else {
_key = format["CHILD:303:%1:%2:",_objectID,_inventory];
};
//diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite;
};
_inventory = [
getWeaponCargo _object,
getMagazineCargo _object,
getBackpackCargo _object
];
_previous = str (_object getVariable ["lastInventory", []]);
if (str _inventory != _previous) then {
_object setVariable ["lastInventory", _inventory];
_key = if (_objectID == "0") then { format ["CHILD:309:%1:", _uid] + str _inventory + ":" } else { format ["CHILD:303:%1:", _objectID] + str _inventory + ":" };
_key call server_hiveWrite;
};
};
_object_damage = {
private["_hitpoints","_array","_hit","_selection","_key","_damage"];
_hitpoints = _object call vehicle_getHitpoints;
_damage = damage _object;
_array = [];
{
_hit = [_object,_x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
_object setHit ["_selection", _hit];
} count _hitpoints;
_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
//diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite;
_object setVariable ["needUpdate",false,true];
};
_object_killed = {
private["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
private ["_hitpoints","_array","_hit","_selection","_key","_damage"];
_hitpoints = _object call vehicle_getHitpoints;
//_damage = damage _object;
_damage = 1;
_damage = damage _object;
_array = [];
{
_hit = [_object,_x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
_hit = 1;
_object setHit ["_selection", _hit];
_hit = [_object, _x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> typeOf _object >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {
_array set [count _array, [_selection,_hit]];
};
_object setHit [_selection, _hit];
} count _hitpoints;
if (_objectID == "0") then {
_key = format["CHILD:306:%1:%2:%3:",_uid,_array,_damage];
} else {
_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
};
//diag_log ("HIVE: WRITE: "+ str(_key));
_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
_key call server_hiveWrite;
_object setVariable ["needUpdate",false,true];
if ((count _this) > 2) then {
_object setVariable ["needUpdate", false, true];
};
_object_killed = {
private ["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
_hitpoints = _object call vehicle_getHitpoints;
_damage = 1;
_array = [];
{
_hit = [_object, _x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> typeOf _object >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {
_array set [count _array, [_selection, _hit]];
};
_object setHit [_selection, 1];
} count _hitpoints;
_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
_key call server_hiveWrite;
_object setVariable ["needUpdate", false, true];
if (count _this > 2) then {
_killer = _this select 2;
_charID = _object getVariable ['CharacterID','0'];
_objID = _object getVariable['ObjectID','0'];
_objUID = _object getVariable['ObjectUID','0'];
_charID = _object getVariable ["CharacterID", "0"];
_objID = _object getVariable ["ObjectID", "0"];
_objUID = _object getVariable ["ObjectUID", "0"];
_worldSpace = getPosATL _object;
_PUID = [_killer] call FNC_GetPlayerUID;
if (_PUID != "") then {
_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace, _name, _PUID];
_name = if (alive _killer) then { name _killer } else { format["OBJECT %1", _killer] };
diag_log format ["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, typeOf _object, _charID, _objID, _objUID, _worldSpace, _name, _PUID];
} else {
diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace];
diag_log format ["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, typeOf _object, _charID, _objID, _objUID, _worldSpace];
};
};
};
_object_repair = {
private["_hitpoints","_array","_hit","_selection","_key","_damage"];
private ["_hitpoints","_array","_hit","_selection","_key","_damage"];
_hitpoints = _object call vehicle_getHitpoints;
_damage = damage _object;
_array = [];
{
_hit = [_object,_x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
_object setHit ["_selection", _hit];
} count _hitpoints;
_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
//diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite;
_object setVariable ["needUpdate",false,true];
};
// TODO ----------------------
_object setVariable ["lastUpdate",time,true];
switch (_type) do {
case "all": {
call _object_position;
call _object_inventory;
call _object_damage;
if (_hit > 0) then {
_array set [count _array, [_selection, _hit]];
};
case "position": {
if (!(_object in needUpdate_objects)) then {
//diag_log format["DEBUG Position: Added to NeedUpdate=%1",_object];
_object setHit [_selection, _hit];
} count _hitpoints;
_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
_key call server_hiveWrite;
_object setVariable ["needUpdate", false, true];
};
_object setVariable ["lastUpdate", time, true];
if (_type == "all") exitWith {
call _object_position;
call _object_inventory;
call _object_damage;
};
if (_type == "position") exitWith {
if !(_object in needUpdate_objects) then {
needUpdate_objects set [count needUpdate_objects, _object];
};
};
if (_type == "gear") exitWith {
call _object_inventory;
};
if (_type == "damage") exitWith {
if (time - _lastUpdate > 5) then {
call _object_damage;
} else {
if !(_object in needUpdate_objects) then {
needUpdate_objects set [count needUpdate_objects, _object];
};
};
case "gear": {
call _object_inventory;
};
case "damage": {
if ( (time - _lastUpdate) > 5) then {
call _object_damage;
} else {
if (!(_object in needUpdate_objects)) then {
//diag_log format["DEBUG Damage: Added to NeedUpdate=%1",_object];
needUpdate_objects set [count needUpdate_objects, _object];
};
};
};
case "killed": {
call _object_killed;
};
case "repair": {
call _object_damage;
};
};
if (_type == "killed") exitWith {
call _object_killed;
};
if (_type == "repair") exitWith {
call _object_damage;
};

View File

@@ -145,6 +145,21 @@ class CfgSounds {
sound[] = {"\dayz_sfx\effects\cough_2.ogg",0.3,1,40};
titles[] = {};
};
class z_cough_w_0 {
name = "";
sound[] = {"\dayz_sfx\effects\cough_w_0.ogg",0.5,1.5,40};
titles[] = {};
};
class z_cough_w_1 {
name = "";
sound[] = {"\dayz_sfx\effects\cough_w_1.ogg",0.4,1.5,40};
titles[] = {};
};
class z_cough_w_2 {
name = "";
sound[] = {"\dayz_sfx\effects\cough_w_2.ogg",0.3,1.5,40};
titles[] = {};
};
class z_bandage_0 {
name = "";
sound[] = {"\dayz_sfx\effects\bandage_0.ogg",0.3,1,40};

Binary file not shown.

Binary file not shown.

Binary file not shown.

1
SQF/redryder/$PBOPREFIX$ Normal file
View File

@@ -0,0 +1 @@
z\addons\redryder

BIN
SQF/redryder/M9SD_S1.wss Normal file

Binary file not shown.

View File

@@ -17,30 +17,31 @@ class CfgPatches
class RedRyder
{
units[] = {};
weapons[] = {RedRyder};
weapons[] = {"RedRyder"};
requiredVersion = 1.00000;
};
};
class CfgModels
{
class Default{};
class Weapon: Default{};
class Default {};
class Weapon : Default {};
class RedRyder : Weapon{};
};
class CfgAmmo
{
class BulletBase;
class 177_BB: BulletBase {
model= \addons\redryder\models\BB_Round.p3d; //will need to be changed
simulation=shotShell;
soundHit[]={,0,1};
hit=3.7;indirectHit=0;indirectHitRange=0;
visibleFire=10;
audibleFire=10;
visibleFireTime=3;
deflecting=5;
class 177_BB : BulletBase {
model = "\z\addons\redryder\models\BB_Round.p3d";
simulation = shotShell;
soundHit[] = {0, 1};
hit = 4.5;
indirectHit = 0;
indirectHitRange = 0;
visibleFire = 10;
audibleFire = 0.5;
visibleFireTime = 3;
deflecting = 5;
airFriction = -0.001064;
fuseDistance = 0;
CraterEffects = "";
@@ -52,39 +53,45 @@ class CfgAmmo
class CfgMagazines
{
class CA_Magazine;
class 350Rnd_BB_Magazine: CA_Magazine {
class 350Rnd_BB_Magazine : CA_Magazine
{
scope = 2;
model= \addons\redryder\models\bb_magazine.p3d; //will need to be changed
picture="\addons\redryder\textures\bb_magazine_picture.paa"; //will need to be changed
displayName = 350 Count 177 Cal. BBs;
count=350;
model = "\z\addons\redryder\models\bb_magazine.p3d";
picture = "\z\addons\redryder\textures\bb_magazine_picture.paa";
displayName = "350 Count .177 BBs";
count = 350;
ammo = 177_BB;
initSpeed = 175;
sound[]={"\addons\redryder\M9SD_S1", db8, 1,60}; //will need to be changed
reloadMagazineSound[]={"Ca\sounds\Weapons\rifles\M1014-reload",db-40,1,20};
descriptionShort = 350 Zink Coated .177, 4.5mm BBs;
};
sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1,60};
reloadMagazineSound[] = {"Ca\sounds\Weapons\rifles\M1014-reload", db - 40, 1, 20};
descriptionShort = "350 Zinc Coated .177, 4.5mm BBs";
weight = 0.2;
};
};
class CfgWeapons
{
class Default {};
class Rifle: Default {};
class RedRyder: Rifle {
class Rifle : Default {};
class RedRyder : Rifle {
scope = 2;
model="\addons\redryder\models\RedRyder.p3d"; //will need to be changed
model = "z\addons\redryder\models\RedRyder.p3d";
displayName = "RedRyder BB Gun";
displayNameMagazine="BB";
magazines[]={"350Rnd_BB_Magazine"};
displayNameMagazine = "BB";
magazines[] = {"350Rnd_BB_Magazine"};
recoil = "recoil_single_pistol_2outof3";
recoilProne = "recoil_single_pistol_prone_2outof3";
reloadTime=0.45;
sound[]={"\addons\redryder\RedRyder\M9SD_S1", db8, 1,60}; //will need to be changed
dispersion=0.00045;
minRange=0;minRangeProbab=0.30;
midRange=39;midRangeProbab=0.7;
maxRange=75;maxRangeProbab=0.05;
picture="\addons\redryder\textures\redryder_picture.paa"; //will need to be changed
handAnim[]={"OFP2_ManSkeleton","\Ca\weapons\data\Anim\M24.rtm"};
reloadTime = 0.45;
sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1, 60};
autoFire = 0;
dexterity = 0.4;
dispersion = 0.00045;
minRange = 0;
minRangeProbab = 0.30;
midRange = 39;
midRangeProbab = 0.7;
maxRange = 75;
maxRangeProbab = 0.05;
picture = "\z\addons\redryder\textures\redryder_picture.paa";
handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons\data\Anim\M24.rtm"};
};
};

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
VertexShaderID="NormalMap";
class Stage1
{
texture="addons\redryder\textures\bb_NOHQ.paa"; //will need to be changed
texture="z\addons\redryder\textures\bb_NOHQ.paa";
uvSource="tex";
class uvTransform
{
@@ -20,7 +20,7 @@ class Stage1
};
class Stage2
{
texture="addons\redryder\textures\bb_SMDI.paa"; //will need to be changed
texture="z\addons\redryder\textures\bb_SMDI.paa";
uvSource="tex";
class uvTransform
{

View File

@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
VertexShaderID="NormalMap";
class Stage1
{
texture="addons\redryder\textures\redmap_NOHQ.paa"; //will need to be changed
texture="z\addons\redryder\textures\redmap_NOHQ.paa";
uvSource="tex";
class uvTransform
{
@@ -20,7 +20,7 @@ class Stage1
};
class Stage2
{
texture="addons\redryder\textures\redmap1sd2_SMDI.paa"; //will need to be changed
texture="z\addons\redryder\textures\redmap1sd2_SMDI.paa";
uvSource="tex";
class uvTransform
{

Binary file not shown.

View File

@@ -57,6 +57,7 @@ Password = 123456
;Negative values will disable this feature
;0 means that ALL empty placed items will be deleted every server restart
;A positive number is how old (in days) a placed empty item must be, in order for it to be deleted
;Leaving CleanupPlacedAfterDays below commented (with a ; in front) will NOT disable the cleanup, but will make the objects get cleaned up after the default 6 days.
;CleanupPlacedAfterDays = 6
;Flag indicating whether hiveext should detect vehicles out of map boundaries (X < 0, or Y > 15360) and reset their position to []
@@ -76,4 +77,4 @@ Password = 123456
;Port = 3306
;Database = dayz
;Username = root
;Password =
;Password =

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,7 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

View File

@@ -29,8 +29,6 @@ onDifferentData = "";
regularCheck = "";
requiredBuild = 125548;
requiredSecureId = 2;
class Missions
{

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2,10 +2,10 @@ respawn = "BASE";
respawndelay = 5;
onLoadMission= "DayZ Epoch Chernarus";
OnLoadIntro = "Welcome to DayZ Epoch Chernarus";
OnLoadIntroTime = False;
OnLoadMissionTime = False;
OnLoadIntroTime = false;
OnLoadMissionTime = false;
disabledAI = true;
disableChannels[]={0,2,6};
disableChannels[]= {0,2,6};
enableItemsDropping = 0;
briefing = 0;
@@ -18,7 +18,7 @@ class Header
{
gameType = COOP; //DM, Team, Coop, ...
minPlayers = 1; //min # of players the mission supports
maxPlayers = 100; //Max # of players the mission supports
maxPlayers = 100; //Max # of players the mission supports
};
aiKills = 1;

View File

@@ -7,91 +7,146 @@ cutText ["","BLACK OUT"];
enableSaving [false, false];
//REALLY IMPORTANT VALUES
dayZ_instance = 11; //The instance
dayZ_instance = 11; //The instance
dayzHiveRequest = [];
initialized = false;
dayz_previousID = 0;
//disable greeting menu
//Disable Greeting Menu
player setVariable ["BIS_noCoreConversations", true];
//disable radio messages to be heard and shown in the left lower corner of the screen
//Disable radio messages to be heard and shown in the left lower corner of the screen
enableRadio false;
// May prevent "how are you civillian?" messages from NPC
//May prevent "how are you civillian?" messages from NPC
enableSentences false;
// DayZ Epoch config
spawnShoremode = 1; // Default = 1 (on shore)
spawnArea= 1500; // Default = 1500
//--------------------------------------------------------------------//
//------------------------DayZ Epoch Config---------------------------//
//--------------------------------------------------------------------//
MaxVehicleLimit = 300; // Default = 50
MaxDynamicDebris = 500; // Default = 100
dayz_MapArea = 14000; // Default = 10000
dayz_maxLocalZombies = 30; // Default = 30
//Map & Player Spawn Variables
spawnShoremode = 1; // Default: 1 (on shore)
spawnArea= 1500; // Default: 1500
dayz_paraSpawn = false; // Default: false
dayz_fullMoonNights = true; // Default: false
dayz_MapArea = 14000; // Default: 10000
dayz_paraSpawn = false;
//Do Not Edit - Chernarus Specific
dayz_minpos = -1; // Do Not Edit - Chernarus Specific
dayz_maxpos = 16000; // Do Not Edit - Chernarus Specific
dayz_minpos = -1;
dayz_maxpos = 16000;
//Item Spawn Variables
MaxHeliCrashes= 5; // Default: 5
MaxVehicleLimit = 300; // Default: 50
MaxDynamicDebris = 500; // Default: 100
MaxMineVeins = 50; // Default: 50
MaxAmmoBoxes = 3; // Default: 3
dayz_sellDistance_vehicle = 10;
dayz_sellDistance_boat = 30;
dayz_sellDistance_air = 40;
//Zombie Variables
dayz_maxZeds = 500; // Default: 500
dayz_maxLocalZombies = 30; // Default: 15
dayz_maxGlobalZombiesInit = 15; // Default: 15
dayz_maxGlobalZombiesIncrease = 5; // Default: 5
dayz_zedsAttackVehicles = true; // Default: true
dayz_maxAnimals = 5; // Default: 8
dayz_tameDogs = true;
DynamicVehicleDamageLow = 0; // Default: 0
DynamicVehicleDamageHigh = 100; // Default: 100
//Animal Variables
dayz_maxAnimals = 8; // Default: 8
dayz_tameDogs = false; // Default: false
DZE_BuildOnRoads = false; // Default: False
//Trader Variables
dayz_sellDistance_vehicle = 10; // Default: 10
dayz_sellDistance_boat = 30; // Default: 30
dayz_sellDistance_air = 40; // Default: 40
EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]];
dayz_fullMoonNights = true;
//Player Variables
DZE_R3F_WEIGHT = true; // Default: true
DZE_FriendlySaving = true; // Default: true
DZE_PlayerZed = true; // Default: true
DZE_BackpackGuard = true; // Default: true
DZE_SelfTransfuse = false; // Default: false
DZE_selfTransfuse_Values = [3000, 15, 300]; // Default: [12000, 15, 300]; = [blood amount, infection chance, cool-down (seconds)]
//Load in compiled functions
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early)
//Name Tags
DZE_ForceNameTags = false; // Default: false
DZE_ForceNameTagsOff = false; // Default: false
DZE_ForceNameTagsInTrader = false; // Default: false
DZE_HumanityTargetDistance = 25; // Default: 25
//Death Messages
DZE_DeathMsgGlobal = false; // Default: false
DZE_DeathMsgSide = false; // Default: false
DZE_DeathMsgTitleText = false; // Default: false
//Vehicles Variables
DZE_AllowForceSave = false; // Default: false
DZE_AllowCargoCheck = false; // Default: false
DZE_HeliLift = true; // Default: true
DZE_HaloJump = true; // Default: true
DZE_AntiWallLimit = 3; // Default: 3
DynamicVehicleDamageLow = 0; // Default: 0
DynamicVehicleDamageHigh = 100; // Default: 100
//Build Variables
DZE_GodModeBase = false; // Default: false
DZE_BuildingLimit = 200; // Default: 150
DZE_requireplot = 1; // Default: 1
DZE_PlotPole = [30,45]; // Default: [30,45] = [x,y]
DZE_BuildOnRoads = false; // Default: false
//--------------------------------------------------------------------//
//--------------------------------------------------------------------//
//--------------------------------------------------------------------//
//Server Events
EpochEvents = [
["any","any","any","any",30,"crash_spawner"],
["any","any","any","any",0,"crash_spawner"],
["any","any","any","any",15,"supply_drop"]
];
//Load In Compiled Functions
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early)
progressLoadingScreen 0.1;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; //Initilize the publicVariable event handlers
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; //Initilize the publicVariable event handlers
progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; //Functions used by CLIENT for medical
progressLoadingScreen 0.4;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; //Compile regular functions
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; //Compile regular functions
progressLoadingScreen 0.5;
call compile preprocessFileLineNumbers "server_traders.sqf"; //Compile trader configs
call compile preprocessFileLineNumbers "server_traders.sqf"; //Compile trader configs
progressLoadingScreen 1.0;
"filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic";
if (isServer) then {
//Compile Vehicle Configs
call compile preprocessFileLineNumbers "\z\addons\dayz_server\missions\DayZ_Epoch_11.Chernarus\dynamic_vehicle.sqf";
//Compile vehicle configs
// Add trader citys
//Add Trader Citys
_nil = [] execVM "\z\addons\dayz_server\missions\DayZ_Epoch_11.Chernarus\mission.sqf";
_serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
_serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
};
if (!isDedicated) then {
//Conduct map operations
//Conduct Map Operations
0 fadeSound 0;
waitUntil {!isNil "dayz_loadScreenMsg"};
dayz_loadScreenMsg = (localize "STR_AUTHENTICATING");
//Run the player monitor
//Run The Player Monitor
_id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}];
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";
//anti Hack
//Anti-Hack
[] execVM "\z\addons\dayz_code\system\antihack.sqf";
//Lights
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
};
#include "\z\addons\dayz_code\system\REsec.sqf"
//Start Dynamic Weather
execVM "\z\addons\dayz_code\external\DynamicWeatherEffects.sqf";
#include "\z\addons\dayz_code\system\REsec.sqf"
#include "\z\addons\dayz_code\system\BIS_Effects\init.sqf"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

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