Commit Graph

3917 Commits

Author SHA1 Message Date
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