Commit Graph

4304 Commits

Author SHA1 Message Date
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
icomrade
f9fdb1f3f7 Re-add humanity gain on zombie kill
For some reason this was removed in
77e760fe73
@ebaydayz
2016-08-10 12:13:11 -04:00
icomrade
4fc2a3b7d6 r_action_count needed for combine mags 2016-08-09 22:05:57 -04:00
ebaydayz
c62e3147c8 Do not send purchased vehicle marker arrow over network
Only the player buying the vehicle needs to see the arrow.

Also fixed CfgMagazines error from:
2c4c75c67c (diff-fcf3df9a25b3d05402ab4e4809673194R6)
@icomrade
2016-08-09 14:52:15 -04:00
ebaydayz
1ed78cc085 Remove unused file object_updatePosition.sqf 2016-08-09 11:06:57 -04:00
ebaydayz
bc7c1879a3 Store plot and door friends names as array
Avoids setVariable value restrictions for players with special
characters in their name.

Also avoids issues with storing non-ASCII characters from player names
in DB inventory field.
2016-08-09 10:48:31 -04:00
ebaydayz
d5ec0d9728 Remove duplicate PVDZ_obj_Fire exception
407134e1a2
2016-08-08 19:55:11 -04:00
icomrade
5c383c82dd More efficent evaluation for object spawning
We shouldn't need to check typenames since many of the DB columns don't
accept anything but appropriate values and the hive will check if some
fields are corrupt already.
2016-08-07 20:41:43 -04:00
icomrade
1f19147165 Update DLL 2016-08-07 14:51:41 -04:00
icomrade
a9926bc073 Remove damage check from dayz_server
Moved to HiveEXT MySQL query. Thanks for the suggestion @ndavalos
2016-08-07 14:38:44 -04:00
icomrade
2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
ebaydayz
0491b32c66 Fix 106 SQL updates find and replace
Thanks @ndavalos

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-238063917
2016-08-07 10:57:11 -04:00
ebaydayz
a6d280995a Merge pull request #1728 from oiad/master
Cinder block text changes
2016-08-06 19:52:30 -04:00
oiad
aa6dd4fa4d Cinder block text changes
This makes Block doorways and block garage door ways Cinder doorways and
Cinder garage door ways so they will be alphabetized properly.

It was always annoying having block doorways not near cinder stuff.
2016-08-07 11:28:26 +12:00
ebaydayz
2980d849bf Formatting cleanup
- Removed random spaces
- Added back comments so it is easier to compare
- Removed redundant } else {
2016-08-06 14:47:10 -04:00
ebaydayz
73bcb6b856 Update test build 2016-08-06 12:04:42 -04:00
ebaydayz
950ef04855 Properly separate allowed toolbelt and binocular count
It should no longer be possible to overflow your toolbelt or binocular
slots now.
2016-08-06 11:08:01 -04:00
ebaydayz
875b34417e Add missing HangarSmall loot group 2016-08-05 19:17:16 -04:00
ebaydayz
7a4775beea Fix needing to click lock/unlock twice from inside vehicle to take effect
No reason to use spawn here. Spawn can have a delay. Since
fn_selfActions runs faster it can register the vehicle as still locked
or unlocked after you clicked the action.
2016-08-05 14:38:12 -04:00
ebaydayz
c51fd11511 Use better method to find player's vehicle in Advanced Trading #1725 2016-08-05 13:43:58 -04:00
ebaydayz
f6e10dd71c Add gear icons to trader menu vehicle cargo space display
- Added gear icons to vehicle cargo space display instead of
Weps/Mags/Bags text

- Decreased info text to 0.7 all around. Can be reverted to 0.8 if
preferred, but 0.7 or smaller is needed for vehicle info class, display
name and weapons list to avoid cutting off the dialog on normal and
larger interface sizes.

#1724
2016-08-04 20:36:36 -04:00
ebaydayz
60e6b85c4d Don't show fuelCapactiy for bicycles in Advanced Trading 2016-08-04 17:37:53 -04:00
ebaydayz
c52187220c Fix message when buying multiple backpacks into empty gear 2016-08-04 16:16:13 -04:00
ebaydayz
c47adbbdb0 Remove CZ_VestPouch_EP1 from traders
This backpack is pointless, since it is the same model as
DZ_Czech_Vest_Puch with half the slots. The traders already have
DZ_Czech_Vest_Puch.
2016-08-04 15:44:58 -04:00
ebaydayz
d91bde9e53 Fix return change overflow check
Thanks @oiad

- Added compensation for money which will be removed from gear and
backpack
- Improved readability
2016-08-04 14:22:33 -04:00
icomrade
1b685581e3 Add condition 2016-08-03 22:18:42 -04:00
icomrade
b10e73b1b8 Update SQL 2016-08-03 22:14:42 -04:00
icomrade
b8c3aec4e0 New DLL + Test Build 2016-08-03 20:12:46 -04:00
icomrade
aacd3b78f7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-03 19:58:53 -04:00
icomrade
657fe60f26 Better maintain
Intensive commands are processed on the client only, as opposed to
twice. an array of objects, their corresponding UID and ID are sent to
the server. Sending the objects as an array, despite the size the array
can reach, should be better than the way this was set up before.

Needs testing on a full server however.
2016-08-03 19:54:06 -04:00
ebaydayz
5a55bcb9b0 Forbid buying >1 of any tool into gear
Previous duplicate check only checked player's current tools and the
buying array types for >1 of the same tool (not buying array amounts).

Also added prevention of binocular slot overflow.
2016-08-03 18:56:42 -04:00
icomrade
b2eacfbe73 Fix private array 2016-08-03 18:34:49 -04:00
icomrade
ae78fde067 Add coin support to dayz_Server and login
New variables: DZE_groupManagement = false; //Enable or disable group
management. Enabled by default
DZE_MoneyStorageClasses = []; // If using a Single currency system
(Z_SingleCurrency = true;), this is an array of object classes players
can store coins in

if Z_SingleCurrency = true; the hive is now set up to handle coin
updates on players, characters, and objects.
if DZE_groupManagement = true; the hive is now set up to save groups

group and coin variables are set in player_monitor.fsm, for
vehicles/objects it's set in the server_monitor.sqf file for objects in
the DZE_MoneyStorageClasses array

Also, this commit includes a change to the way the hive spawns in
vehicles. vehicles are now created at [0,0,0] and moved using setPosATL
to their saved position. Thanks for the tip @ndavalos  @eraser1
2016-08-03 18:01:22 -04:00
ebaydayz
de9d3feb0f Updated Some loot Locations.
Vanilla development commit:

db96d1c8c5

Note: does not affect buildings with Epoch loot positions. Vanilla
positions are commented out on those buildings.
2016-08-03 14:28:23 -04:00
ebaydayz
47e6366985 Updated Vanilla Buildables collision Checks.
Vanilla development commit:

8e2953ab67
2016-08-03 13:55:43 -04:00
ebaydayz
376befd613 Minor Advanced Trading string semantics changes
#1724
2016-08-03 13:38:09 -04:00
ebaydayz
382f3bc451 Add buying to and selling from dayz_onBack
Also:
- Fixed typo Z_fill(e)TradeTitle
- Fixed "not enough slots to accept change" message shows when "not
enough money" should show instead
2016-08-02 14:19:59 -04:00
ebaydayz
a95925aac5 Make free slots display for gear more logical
- Don't show tool slots as available weapon slots in gear. Player is
informed of tool slots count in systemChat.
- Don't show pistol mag slots as available item slots in gear. Player is
informed of pistol mag slots count in systemChat. Only pistol ammo and
bandages can be purchased into them.
- Removed "Stand still to complete trade" message since the medic
animation loop is no longer used
- Added back backpack mags count message and avoided redundant "Backpack
space exceeded message" @oiad
ee3eb845a3 (commitcomment-18483149)
2016-08-02 11:55:50 -04:00
A Man
f3c80934b4 Small loot tweaks for balance (#1719)
* Small loot tweak

Lowered the spawn chance of duct tape a bit.

* Small loot tweaks

Smaller spawn chance of binoculars, Knife and maps
2016-08-01 18:13:05 -04:00
ebaydayz
ee3eb845a3 Remove selling backpacks from vehicles
I don't think we should allow selling backpacks from vehicles because we
can not get backpack contents.

We can only remove all backpacks with clearBackpackCargo and then add
back new empty backpacks for ones that weren't sold.

This means players may unintentionally wipe all contents of all other
backpacks in their vehicle when they only want to sell one.

Thanks @AirwavesMan for catching this.

Also made changes discussed in #1718 @oiad
2016-08-01 17:14:42 -04:00
ebaydayz
3bf9c4452e Update test build
Since some mission file paths changed
2016-08-01 10:10:00 -04:00
ebaydayz
d2bf8b30eb Update config trader from 34f9f97
Forgot to update m16a2_dz (supports GL now).

34f9f97aa3
2016-07-31 20:32:53 -04:00
ebaydayz
287a80c417 Add extra note about changed item classnames
Since a lot of people are missing this.
2016-07-31 20:17:08 -04:00
ebaydayz
a5be49c546 Add handling of magazine overflow in AdvTrade and free slot icons
- Added proper handling of pistol mags and regular mags in gear to
prevent magazine overflow
- Added pre-check if return change will overflow gear + backpack free
space. If change will not fit in gear + backpack free space then buy is
prevented with a message notifying the player. In the case of a sale it
proceeds anyway, but notifies player if overflow occurs (see comments in
returnChange)
- Consolidated duplicate code for calculating free space and returning
cargo of an object into new calcFreeSpace
- Old calculateFreeSpace renamed to displayFreeSpace
- Added Weps/Mags/Bags icons to free slot numbers display
2016-07-31 18:38:53 -04:00
ebaydayz
d7cb2b446e Merge pull request #1717 from oiad/master
Backpack sound fix
2016-07-30 18:42:29 -04:00
oiad
6a5d03f143 Backpack sound fix
Fix backpack sound error, re: @ndavalos
2016-07-31 10:26:31 +12:00
icomrade
24f6a0ab9a Correct build text 2016-07-30 17:06:46 -04:00