Commit Graph

477 Commits

Author SHA1 Message Date
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
icomrade
92cbd8a7a9 only sleep if Hive call in loop fails
should improve vehicle spawning time slightly
2016-07-18 21:51:37 -04:00
icomrade
c702d92231 Remove SQF Based Duplicate UID Fix
Use the new DLL
2016-07-17 10:52:40 -04:00
oiad
801145d664 Advanced trading fixes/modifications (#1698)
* 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 rework

Fixes all problems @ebaydayz
2016-06-21 20:18:41 -04:00
Bruce-LXXVI
5e53a71e88 Pullrequest/door management (#1694)
* Added doorManagement

* Rename FNC_check_owner --> FNC_check_owner_friends

* Fixed typo

* Fixed bug in FNC_check_owner_friends which allowed every user to manage
every plot and door.

* Removed unused DZE_doorManagementHarderPenalty from configVariables.sqf

* Now checking if _playerUID is in _friendlies for both cases.

* DZE_plotforLife should be DZE_permanentPlot

* Fixed case where DZE_permanentPlot is false.

* Forgot to add STR_EPOCH_CANCEL

* Changed translations to suggested string by ebaydayz.

* Renamed EyeScanner to DoorAccess.

* Reworked access rights for door management.

* DZE_doorManagementMustBeClose = true; //Players must be within 10m of
door to be added as a door friend.

* Fixed copy-paste error.

* Replace count with if

* Remove redundant test.

* Also replaced count in door management admins check.

* Change plotManagement and doorManagement to be consistent to
DayZ_UseSteamID (get UID from FNC_GetPlayerUID).

* Use _playerUID and _characterID more consistent.

* Added german translation to
STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST.
2016-06-15 18:22:01 -04:00
ebaydayz
835d750c0c Use single config variable for Plot for Life and Plot Management
Plot for Life and Plot Management work best together. They essentially
provide the same functionality. Both let you keep your plot after death
by using UID instead of CharacterID. Plot Management doesn't even have
an option to save characterID, so by default it is always keeping all
friends and the owner permanently until they are removed. The only major
difference between them is Plot For Life also adds permanent ownership
of built items on the plot, which is behavior most people expect. It
doesn't make sense to keep ownership of the plot after death but not the
other objects built on it. The other functionality it adds (take
ownership) can be toggled with a config variable.

It is rare that someone would want Plot For Life enabled, but Plot
Management disabled or vice versa. If they really want that they can
still do it manually, but consolidating them to a single config option
greatly simplifies things for everyone else.

I removed links to mod githubs because many changes have been made to
the 1.0.6 versions, so outdated information there will likely confuse
people. Authors are already credited in the README and change log.

In variables.sqf "DZ_storage_base" is now the parent class which
includes all tents and stashes. DZE_checkNearbyRadius variable is not
used (identical to DZE_PlotPole select 0).
2016-06-12 12:54:46 -04:00
ebaydayz
914b37a413 Pass cursorTarget to maintain_area.sqf
CursorTarget should always be passed from fn_selfActions, not reacquired
in action scripts. This is to ensure the same object is referenced. Plot
Management maintain_area is called from the dialog button, not
fn_selfactions.
2016-05-19 13:10:20 -04:00
ebaydayz
65233757e8 Correct duplicate object UID check
I forgot numbers greater than 1 million are truncated when converted to
string:

http://killzonekid.com/arma-scripting-tutorials-float-to-string-position-to-string/

KeyStartNumber exceeded 6 digits which is why it was being truncated to
"1e+011" and getting stuck on loop (as that string was already in
currentObjectUIDs) as mentioned in 2df7279.

Starting at 10, there should never be more than a couple duplicates
generated, so keyStartNumber will never exceed about 100 max.  Added an
exit just for a fail safe.
2016-05-16 11:52:45 -04:00
icomrade
116caaa788 Revert "Remove dayz_objectUID2 from object loading"
This reverts commit 2df7279f1a.
2016-05-15 21:48:24 -04:00
icomrade
08c16788ae update changelog + fix god exclusion check 2016-05-15 18:57:14 -04:00
icomrade
dc2b97beb6 Revert setPos change from a previous commit 2016-05-15 18:53:40 -04:00
icomrade
2df7279f1a Remove dayz_objectUID2 from object loading
DB with ~4000 vehicles fails to load since this code runs on nearly
every vehicle for some reason. The code should only be called upon
vehicle purchase to increase load time and simply calling
dayz_objectUID2 has no effect.
2016-05-15 18:53:40 -04:00
icomrade
eda3e1c202 Fix vector objects loading in with angle compensation
With the code removed from line 266-271 the server would reset the slope
of the placed object to match the slope of the ground. Do not re-add the
code unless configs are updated with corresponding canbevertical option.
2016-05-15 18:53:40 -04:00
icomrade
e2a14de977 Add exclusions for god mode built objects 2016-05-15 18:53:40 -04:00
icomrade
6c24aaeb3b Add Vector Building 2016-05-12 22:52:04 -04:00
ebaydayz
6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -04:00
ebaydayz
1fe8a7abf5 Fix typo from 26e6727 2016-05-07 13:14:22 -04:00
ebaydayz
26e67270cb Update Precise Base Building to v1.0.5 by @Mikeeeyy
Note @icomrade : 1.0.6 test servers need to empty object_data or run the
SQL query linked below before applying this update.

http://epochmod.com/forum/topic/15813-release-v105-precise-base-building-persistent-bases-after-restart-updated-220915/#comment-118663
2016-05-07 13:06:20 -04:00
icomrade
eddcf02ab3 Precise Base Building fix 2016-05-02 21:06:44 -04:00
icomrade
5f054393e5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
2016-05-02 20:44:50 -04:00
icomrade
575682b7c8 Add A Plot For Life modification by RimBlock
A Plot For Life also includes Precise Base Building by Mikeeeyy. Precise
base building has no variable to switch it on or off, I don't think it
should.

Seems to work well enough, this may conflict with the duplicate object
uid fix, it appears to spam my server rpt.
2016-05-02 20:42:37 -04:00
ebaydayz
c4ed93959e Better combat log detection method on server
"noatlf4" variable is set on server through PV from damage handler. No
need to worry about diag_tickTime difference between clients and server.
2016-05-02 15:12:43 -04:00
ebaydayz
c951680ffd Added new Login Processing check for Ghost mode.
Players who alt f4 while in ghost mode should no longer lose position
updates.

Vanilla development commit:

24194861aa
2016-05-02 14:48:15 -04:00
ebaydayz
dfe68c7824 Removed Achievements from sync.
Vanilla development commit:

09313b2376
2016-05-02 14:26:35 -04:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
ebaydayz
56ea7d1382 Use PVEH instead of MPF for death messages
This way no exception needs to be added in REsec for rSpawn and
dayz_rollingMessages can be used instead of rTitleText.
2016-04-25 16:10:52 -04:00
ebaydayz
23b6ad2455 Add systemChat death message option 2016-04-21 13:27:05 -04:00
ebaydayz
7da7b9e5dd Correct PVDZ_plr_Save for player zombies 2016-04-20 17:00:38 -04:00
ebaydayz
14dacf269c Add back player zombie faces
Also moved player zombie attack from 'v' key to an addaction with
localized string.
2016-04-20 14:50:12 -04:00
ebaydayz
9d4bd9221a Add exception in REsec for death messages 2016-04-20 11:53:30 -04:00
ebaydayz
2f45d46d05 Remove legacy stream_location functions
These are no longer used for anything.
2016-04-17 21:23:25 -04:00
ebaydayz
f38c6ff72e Fix server FPS logging
No need to have a config variable for this, admin can easily change it
in server pbo.
2016-04-17 17:11:49 -04:00
ebaydayz
59a4459809 Fix spawn marker count for non-cherno maps 2016-04-17 15:32:47 -04:00
ebaydayz
577892c40e Roll back to old dayz_objectUID2
1.8.7 dayz_objectUID2 seems to generate keys that are too long for the
Epoch hive. So, we will keep the old method for now.
2016-04-13 18:41:36 -04:00
ebaydayz
652ca51c2c Update combattimeout from time to diag_tickTime
Also organized change log
2016-04-12 21:04:17 -04:00
ebaydayz
27d57283a0 Fix server position sync after knockout
All DayZ Mod Development commits since 1.8.7 release (Jan. 24) have now
been applied.
2016-04-12 14:51:22 -04:00
ebaydayz
d229d10b6a Cleanup config variables 2016-04-09 16:47:51 -04:00
ebaydayz
0f4aa05753 Disable lit fires when townGenerator is off
If townGenerator is enabled lit fires will be created everywhere except
blacklisted areas.
2016-04-06 20:08:28 -04:00
ebaydayz
6a42ef40d3 Disable TownGenerator and plant spawner by default
Junk and plant spawning is disabled by default. It can be enabled via
dayz_townGenerator config variable and positions blacklist (for trader
cities, etc.).

The trader objects spawn code was consolidated to functions.
2016-04-06 19:44:00 -04:00
ebaydayz
37277613c1 Fix blank remove attachment text M4, M240, L110
Some attachments were using incorrect string names.
2016-04-03 20:16:34 -04:00
ebaydayz
d07d31983b Remove legacy ammo boxes
AmmoBoxSmall_556 and AmmoBoxSmall_762 no longer exist and were causing
loot spawning errors.
2016-04-02 19:15:29 -04:00
ebaydayz
4ce54fbb62 Update server_publishObject
The hive call in server_publishObject is the same between vanilla and
Epoch. The only difference is vanilla uses the _inventory area for
owner, lock code, etc. variables where as modular Epoch items just store
an empty array there.

The object classname does not need to be sent in the PV because it can
be obtained on the server.

PVDZE_veh_Publish was not used.
2016-04-02 15:24:20 -04:00
ebaydayz
ec4eb5418d Update server spawn_vehicles
Updated loot spawning code for vehicle cargo.

Also it is faster and more efficient to call spawn_vehicles repeatedly
in one thread rather than spawn it hundreds of times (opening hundreds
of simultaneous script threads).
2016-04-01 16:45:08 -04:00
ebaydayz
3f6cd7de42 Fix some errors 2016-03-31 14:45:13 -04:00
ebaydayz
c54a52a103 Merge selfbloodbag and self_transfuse 2016-03-30 20:50:06 -04:00
ebaydayz
30b29c541e Update intro heli crash name 2016-03-29 20:53:57 -04:00
ebaydayz
71b975b05e Actions cleanup 2016-03-29 14:47:28 -04:00
ebaydayz
23caf14dc9 Update mission
It should no longer be necessary to load dayz_vehicles in the
mission.sqm addons. It was taken out of mission.sqm in vanilla around
1.8.

The dayz_logo_ca.paa file was identical to loadingscreen.paa
2016-03-27 15:18:28 -04:00
ebaydayz
8f2ff5cb3e Update spawnCrashSite 2016-03-26 22:02:28 -04:00
ebaydayz
cfff2454aa Update server_monitor 2016-03-26 20:46:42 -04:00