Commit Graph

683 Commits

Author SHA1 Message Date
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
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
A Man
ad1e54af58 Updating for more wood
Updating for more wood from trees like in 1051.
2016-08-16 00:38:59 +02:00
ebaydayz
b37445a4d5 Fix mistake from 15763f4
#1735

15763f4f2a
2016-08-15 17:21:13 -04:00
ebaydayz
15763f4f2a Consolidate maintain scripts
Thanks to @oiad for making this easy #1735
2016-08-15 16:33:00 -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
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
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
fd3475a617 Should fix switching clothes 2016-08-12 23:07:01 -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
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:

6e0fd6203b

78ed0665fa
2016-08-12 17:23:49 -04:00
ebaydayz
36196661ea Update arrow and quiver classnames
Vanilla development commit:

1561c3cfd8
2016-08-12 14:00:32 -04:00
ebaydayz
d60600a825 Fixed missing tags.
Vanilla development commit:

ed4ba17a1c
2016-08-11 19:50:03 -04:00
ebaydayz
9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

707a591765

c453cdedd2

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
7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

3db0fe8e7a

73a63898f1

08e18d5b52

126da2dcd3

d5fa323865

d37526fcc6

5fcca134f0

c9c1fc934d
2016-08-11 15:16:53 -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
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
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
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
8589b9d46d Fix fn_collisions in wrong folder
My mistake from
657830291b
2016-07-30 11:07:04 -04:00
ebaydayz
fd2eb14c5e Give inTraderCity a default value
There is no point in setting inTraderCity = "Any"; since you can use the
isInTraderCity variable to check if a player is in any trader city. Also
"Any" will return false for isNil, so the only time "Unknown Trader
City" was being used was when the player had not entered any city yet.
If they left a known trader and went to an unknown one the RPT message
would say "bought x at Any". Now it will correctly say "Unknown Trader"
anytime a purchase is made without inTraderCity being set.
2016-07-29 15:48:51 -04:00
icomrade
2cdf9b5806 Small fix, revert 1 frame uisleep to regular sleep
I wasn't getting errors without if (gear_done) then {}; surrounding the
uiSleeps, so I don't quite trust the engine was executing them, I also
question the ability of uisleep to handle single frame precision (but I
haven't tested anything regarding this yet).
2016-07-28 14:54:50 -04:00
icomrade
82e2500cac Re-add magazine refill fix when changing clothes
This is the code from 1.0.5.2 before it became 1.0.6, it contains the
fix for backpack wipes in 1.0.5.1. I lightly tested it with 1.0.6 but it
will need more testing before release.
2016-07-28 13:27:30 -04:00
icomrade
e446603ea2 Fix combat logging
In the initialize section of the fsm r_player_unconscious and
r_player_timeout return their default values (false and 0). Also, the
Vanilla server-side combat check doesn't appear to work, or it doesn't
work with the antihack disabled (I haven't tested with it enabled).

New variable inCombat is set more quickly than the combatTimeout
variable
2016-07-26 20:51:10 -04:00
icomrade
23a5584b52 Fix up combat icon + update changelog 2016-07-26 12:52:28 -04:00
icomrade
705057bedb Sync combattimeout on change clothes 2016-07-25 23:22:50 -04:00
icomrade
fbc7754750 Add combat icon + toggle for Vanilla UI 2016-07-25 20:55:36 -04:00
icomrade
b2289e35c5 Fix ear and eye not displaying in Epoch UI 2016-07-25 14:26:43 -04:00
ebaydayz
03c57f3b77 Fix for Confirmed Kills system on change clothes.
Vanilla development commit:

d499246e2e
2016-07-25 12:19:45 -04:00
ebaydayz
55df36741b Diag_log Cleanup.
Vanilla development commits:

1dbef192bb

10cb0249f0
2016-07-25 12:06:53 -04:00
icomrade
51287651f2 Add logging for non-existent loot group small
This can probably be removed for release but for now I noticed
HangarSmall doesn't exist, perhaps others as well.
2016-07-24 13:15:37 -04:00
ebaydayz
f2687345cd Testing Confirmed Kills System.
Vanilla development commit:
4881e00ecf

New - Journal Kills will only update during the session on confirmed
Kills (study dead body).
2016-07-21 11:31:47 -04:00
ebaydayz
1fb1dc9d89 Prevent toggleSoundMute at gender selection screen 2016-07-20 19:21:54 -04:00
ebaydayz
2f844060ec Add handling of other fadeSound events in player_toggleMuteSound
Fixes icon staying up after fadeSound to 1 by unconscious and low blood
events.
2016-07-20 17:36:40 -04:00
ebaydayz
f314a39e43 Add better sound muted status UI icon and background
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
2016-07-20 15:24:31 -04:00
ebaydayz
2911bffced Fix can't reload partial mag with flares in inventory
Vanilla development commits:

7f7d3e02e7

094f1f18d2

a078e84f11

805b9def10

Also reverted:
51be8aa8a5
since it was not the cause.

See https://github.com/DayZMod/DayZ/issues/641 for the details.
2016-07-18 21:43:08 -04:00
ebaydayz
3a5fc91329 Fix missing string typo
My mistake from
7751914428
2016-07-17 16:00:12 -04:00
ebaydayz
7751914428 Rename vanilla strings from #1708
When localizing vanilla strings please do not put "EPOCH" in their name
or include them in the dayz_epoch package of the stringtable. This
creates more work to backport common translation updates and vice versa.
2016-07-17 14:02:04 -04:00
oiad
3d75c67574 Localization updates
Some localization updates and some code optimization.
2016-07-17 22:23:25 +12:00
ebaydayz
4ff088c80c Remove redundant access checks for upgrade and downgrade
Access control for upgrade and downgrade is now included in
fn_selfActions as per #1706

I moved _upgrade down in fn_selfActions so it is only checked it if the
right conditions are met.
2016-07-09 14:34:38 -04:00
oiad
06c8fef001 Various changes (snappoints, dooraccess and fn_selfactions) (#1706)
* Changes to snappoints.hpp fixes issues with metal floors snapping to a cinder wall. Cinder to cinder will create small gaps and then metal floors won't properly line up unless you start with a metal floor then snap cinders. By making both the same snap size, this fixes this issue.

Changes to doorAccess.hpp makes it possible to unlock doors and downgrade them again. It was setting dze_lock_door to the players UID instead of the door code as it should so the conditions would not be met in fn_selfActions to give you additional access.

Changes to fn_selfActions refine access to certain points more accurately (the way they should be IMO)

1) Adds a check to see if the building item can be upgraded anymore before presenting the menu, this stops you receiving the "upgrade item" action even when the item is fully upgraded
2) Adds access checks to the maintain individual item menu action so only item owner, plot owner and plot friends will see it, same with the above upgrade item menu action, this will also stop you receiving this when you are on someone elses plot that you may not have access to (I.e it's useless)
3) Changes modular building access to be item owner, plot owner and plot friend to remove modular items.
4) Changes plot managment action menu so item owner, plot owner and plot friend can access it. I thought there could be a situation where item owner != plot owner. This can be reverted if that is never possible.
5) Changes downgrading so only item owner, plot owner and plot friends can access it. If someone has the door code that doesn't mean they should be able to remove the combo (IMO)

* typo.
2016-07-09 12:28:39 -04:00
oiad
e30f18190f This will fix an obvious typo for the variable s_player_upgradeStorage (#1705)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading fixes (again)

* Advanced trading rework

Fixes all problems @ebaydayz

* Rename typo'd variable "s_player_upgradestorage"

This renames an obviously typo'd variable to what it should be.

* fixes derp string.

* asdf (#3)

asdf
2016-07-05 21:40:31 -04:00