Commit Graph

4372 Commits

Author SHA1 Message Date
ebaydayz
0394c61183 Match Adv Trade blue color for compatible highlight
Matches blue used in advancedTrading.hpp, slightly lighter and easier to
see on dark grey background. @oiad 42ebfb5
2016-08-18 13:27:00 -04:00
ebaydayz
5d372d3351 Add UH60M_MEV #1743
Added to traders in #1743
2016-08-18 13:01:08 -04:00
ebaydayz
0475e0fcb2 Merge pull request #1744 from oiad/master
Advanced trading buyable list changes
2016-08-18 12:11:48 -04:00
oiad
42ebfb54d7 Advanced trading buyable list changes
Further changes Advanced trading buyable list to show the item as blue
if it's compatible attachment wise and ammo wise.

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

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

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

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

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

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

Adding 
Mk17
M17 SD
M107
KSVK
L115
VSS

* Adding missing magazines and re-combine option

Mk17
Mk17 SD

* Adding missing magazines and re-combine option

M107
KSVK
L115
VSS

* Update stringtable.xml

Moved new strings to epoch package

* Update 762x51.hpp

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

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

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

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

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

Moving Mixed Oil to building supplies.

* Update FriendlyBuildingSupplies.hpp

Adding Mixed Oil.

* Update FriendlyToolbeltItems.hpp

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

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

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

* Plot Management tidyness

Fixing tidy issues

* Plot management changes

Fix maintenance variables as per @ebaydayz

* Plot management

Missed one

* Plot management fixes and default maintain_area fixes.

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

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

Adding some magazines

* Update Police.hpp

Adding Loot Group AmmoCivilian and removing magazines

* Update Industrial.hpp

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

* Update Hangar.hpp

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

* Update Military.hpp

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

* Update Military.hpp

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

837a2623b0
2016-08-13 20:22:57 -04:00
icomrade
9d6c17d706 Update server pbo 2016-08-13 18:10:14 -04:00
icomrade
56d7ac8d4f Fix disableuserinput in unconcious 2016-08-13 16:50:26 -04:00
icomrade
341d45f440 Remove excessive anim on recover unconcious 2016-08-13 16:12:50 -04:00
ebaydayz
cb3be8b547 Add minor improvement to safe diag_log 2016-08-13 13:20:36 -04:00
icomrade
18643fec95 Move disableUSerInput in unconcious code 2016-08-13 11:52:05 -04:00
icomrade
8dde92b377 Fix unconcious warping
Also comment out the part where vehicles have their engine turned off or
the player is ejected, since this behavior makes no sense.
2016-08-13 10:32:28 -04:00
icomrade
92cb4f4493 Should fix #1733 2016-08-12 23:40:46 -04:00
icomrade
cbf87cb1e4 Revert "Should fix #1733"
This reverts commit b6ffa37c1b.
2016-08-12 23:39:17 -04:00
icomrade
fd3475a617 Should fix switching clothes 2016-08-12 23:07:01 -04:00
icomrade
e8cd89a194 Switch to call compile
Should be much faster
2016-08-12 22:32:48 -04:00
icomrade
b6ffa37c1b Should fix #1733 2016-08-12 22:14:52 -04:00