Commit Graph

7400 Commits

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

https://github.com/EpochModTeam/DayZ-Epoch/commit/15763f4f2a5bbadc22fc137deae5fcff5844bc60
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:

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

* Added one new skin

* Added one new skin and class RepairVehicle

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

* Added one new skin

* Added one new skin

* Update EpochSkins.hpp

* Added one new skin

* Added one new skin

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

https://github.com/DayZMod/DayZ/commit/6e0fd6203bd2ec2b6f07d3e44835c3f9c7fa5e7e

https://github.com/DayZMod/Battleye-Filters/commit/78ed0665fafc7eb286485f479c4b7d77442ba942
2016-08-12 17:23:49 -04:00
ebaydayz ed47a63313 Make log more accurate in server_playerSync
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/45ac48b5955c73b0b12fdccaed6573910170f3a7

https://github.com/DayZMod/DayZ/commit/ca23681a7d022d3ffeadfd9bf91b1942526b54ee
2016-08-12 16:41:45 -04:00
A Man bbb8c803b6 Adding many new skins (#1732)
* New Skins

Added all new skins to the loot table.

* Added new skins

* New skins for trading

* New skins for trading

* New skins for trading

* Added new skins

* Added new skins

* Strings for new skins

* Added new skins to player classes

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

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

https://github.com/DayZMod/DayZ/commit/20f992fcb74f9a8b6823ea466ea3aadb5eafd1b0
2016-08-11 20:01:53 -04:00
ebaydayz d60600a825 Fixed missing tags.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/ed4ba17a1c3c02fee6d6fa32fa23d053c830c093
2016-08-11 19:50:03 -04:00
ebaydayz 9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/707a591765c8a568429fd243a0f3d6f38793d8dc

https://github.com/DayZMod/DayZ/commit/c453cdedd2568ab365788415e6dcfbecc5c6cfd4

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

https://github.com/DayZMod/DayZ/commit/fac691a6145c0efb1406cca51d5523d74b691b55
2016-08-11 16:01:16 -04:00
ebaydayz 7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

https://github.com/DayZMod/DayZ/commit/3db0fe8e7a3df0c2ab9e0f6bb220acf84e450da3

https://github.com/DayZMod/DayZ/commit/73a63898f11501c4aad83ead106c90b3e49461ac

https://github.com/DayZMod/DayZ/commit/08e18d5b526f8f8ee570fed1a3640d217f7fa83b

https://github.com/DayZMod/DayZ/commit/126da2dcd38a03d5583627607a78d37ad7f64091

https://github.com/DayZMod/DayZ/commit/d5fa3238656c06f8a8c1996d748130002ab2a7f6

https://github.com/DayZMod/DayZ/commit/d37526fcc62a3291fe3b7135bacb4fb172184989

https://github.com/DayZMod/DayZ/commit/5fcca134f05ddf3e4b9458cf9fe54154a9575616

https://github.com/DayZMod/DayZ/commit/c9c1fc934d449b33a9ef3bf14a82b5a40d93874b
2016-08-11 15:16:53 -04:00
icomrade 4019d0c351 Should stop vehicles from falling through buildables 2016-08-11 13:19:24 -04:00
ebaydayz 2fdc87a86c Clarify comment 2016-08-11 11:15:51 -04:00
icomrade a885c8c147 Should fix Dynamic Vehicle Issues 2016-08-10 20:50:33 -04:00
ebaydayz 72656ed001 Greatly optimize safe gear handling
- Safe inventory arrays are no longer sent over network to all machines
on server startup and on each lock/unlock
- Disabled user input then closed gear dialog during safe
lock/unlock/pack to block various duping methods.
- Moved safe creation, deletion and gear handling to server. This cuts
down on add[Magazine/Weapon/Backpack]Cargo, createVehicle and
deleteVehicle BE logs.
2016-08-10 20:34:54 -04:00
icomrade f186e256cb Tree chopping changes
Allow player to get more than 1 item out of a single tree. Using ItemLog
would allow the player to get too much wood if using a hatchet so I
changed it back to PartWoodPile.
2016-08-10 13:06:20 -04:00