Commit Graph

2355 Commits

Author SHA1 Message Date
icomrade
a70501cf59 Use GetOut
Doesn't create a parachute with air vehicles
2016-08-22 19:28:50 -04:00
ebaydayz
bc7bef857f Fix r_action_count not reset in player_buildVanilla exit 2016-08-22 16:54:14 -04:00
oiad
89a43cb2d8 Advanced trading fix
This fixes the issue that @ndavalos found:
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-241289082
2016-08-22 21:10:46 +12:00
oiad
6bdc3956fb Plot / door management userlist sorting (#1747)
* Plot / door management userlist sorting

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

* Door/plot management fixes

As per @ebaydayz
2016-08-21 17:19:52 -04:00
ebaydayz
8ef349e2bb Make minor adjustment to push stuck plane action 2016-08-21 17:03:47 -04:00
ebaydayz
745e287202 Add option to push stuck planes
Also changed flip vehicle back to 1051 default which allowed players to
flip non-ATVs with help.
2016-08-21 16:45:32 -04:00
icomrade
9aa1784f23 Globally remove wrecked objects
using PVEH PVDZE_obj_Remove. Wrecks only exist for the players currently
in the server when the parent object is destroyed. Passing the object
through the PVEH does not work.
2016-08-21 15:46:33 -04:00
ebaydayz
df67a35bc7 Add new AN2 skins to trader 2016-08-21 13:48:23 -04:00
ebaydayz
da2faeb6d0 Add back fall damage block for local explosion cheats
Vanilla commit:

a02294421c
2016-08-21 13:06:02 -04:00
ebaydayz
289b1307ff Fix speed typo in damage handler and vehicle getOut
Vanilla commit:

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

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

a2193626a0

deb7207672

2de1d90edd

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

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

* Adding 6 new Mi17 variants to config

Armed:
Mi17_TK_EP1
Mi17_UN_CDF_EP1
Mi17_CDF

Unarmed:
Mi17_medevac_CDF
Mi17_medevac_Ins
Mi17_medevac_RU

* Adding new line for Cessna.hpp

* Adding Cessna to the configs

That removes the radar function from the cessans.

* Adding 1 new An2 version to the config

* Adding 2 more HMMWVs to the config

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

New classes:

HMMWV_Armored
HMMWV_M2

* Adding BRDM2 to configs

* Adding line for BRDM2_DZ.hpp

* Update after comments

* Update again

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update HMMWV.hpp

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

* Update HMMWV.hpp

* Update HMMWV.hpp

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update CHANGE LOG 1.0.6.txt

* Update UH60.hpp

* Update Cessna_DZ.hpp

* Update Cessna_DZ.hpp

* Update NeutralAirplanes.hpp

* Update MI17.hpp

* Update AN2_DZ.hpp
2016-08-21 09:19:34 -04:00
ebaydayz
38e30d2565 Remove duplicate drink string
Vanilla development commit:

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

This still follows the original trading convention, the vehicle base
needs to be in the trader category, i.e you cant sell an armored SUV at
stary vehicle trader.
2016-08-19 22:15:47 +12:00
ebaydayz
bfca19bf80 Remove some unused legacy code 2016-08-18 17:00:08 -04:00
ebaydayz
509c2b17d6 Fix typo from 5d372d3
5d372d3
2016-08-18 13:30:19 -04:00
ebaydayz
0394c61183 Match Adv Trade blue color for compatible highlight
Matches blue used in advancedTrading.hpp, slightly lighter and easier to
see on dark grey background. @oiad 42ebfb5
2016-08-18 13:27:00 -04:00
ebaydayz
5d372d3351 Add UH60M_MEV #1743
Added to traders in #1743
2016-08-18 13:01:08 -04:00
oiad
42ebfb54d7 Advanced trading buyable list changes
Further changes Advanced trading buyable list to show the item as blue
if it's compatible attachment wise and ammo wise.

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

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

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

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

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

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

Adding 
Mk17
M17 SD
M107
KSVK
L115
VSS

* Adding missing magazines and re-combine option

Mk17
Mk17 SD

* Adding missing magazines and re-combine option

M107
KSVK
L115
VSS

* Update stringtable.xml

Moved new strings to epoch package

* Update 762x51.hpp

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

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

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

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

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

Moving Mixed Oil to building supplies.

* Update FriendlyBuildingSupplies.hpp

Adding Mixed Oil.

* Update FriendlyToolbeltItems.hpp

Removing GPS, Range Finder and Night Vision from buylist. These items should be rare items and harder to find than other items.
2016-08-16 13:41:17 -04:00
ebaydayz
c66bd67f01 Remove duplicate translations again
Missed a few @oiad  ;)
2016-08-15 20:07:34 -04:00
ebaydayz
da2143336a Remove duplicate translations from stringtable
Submitted by @oiad
2016-08-15 19:58:52 -04:00
A Man
ad1e54af58 Updating for more wood
Updating for more wood from trees like in 1051.
2016-08-16 00:38:59 +02:00
A Man
14e4e0ac5a Updating for old magazines 2016-08-16 00:35:13 +02:00
ebaydayz
ae8329e55b Further simplify maintain_area.sqf again 2016-08-15 18:05:42 -04:00
ebaydayz
72c9c9eb38 Further simplify maintain_area.sqf 2016-08-15 17:54:16 -04:00
ebaydayz
b37445a4d5 Fix mistake from 15763f4
#1735

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

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

* Plot Management tidyness

Fixing tidy issues

* Plot management changes

Fix maintenance variables as per @ebaydayz

* Plot management

Missed one

* Plot management fixes and default maintain_area fixes.

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

Changed _range to use DZE_maintainRange (DZE_plotPole select 0 + 20)
2016-08-15 14:49:56 -04:00