Commit Graph

210 Commits

Author SHA1 Message Date
ebaydayz
e62c882127 Remove duplicate ObjectUID fix variables
No longer needed as per:

51be8aa8a5

8e87448fe7
2016-07-17 17:17:38 -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
ebaydayz
452ce57618 Temperature badges + heatpack changes + some translation fixes
Vanilla development commit:

e89176d565
2016-07-03 12:01:32 -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
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
00e2f34734 Forgot variables 2016-05-12 23:47:53 -04:00
icomrade
6e430bdb84 Change self transfuse timeout to 2 min default
Also properly handle the infection chance
2016-05-06 11:52:36 -04:00
icomrade
fcb6d1ab26 Fix some items missing removal option #1135 2016-05-03 15:41:33 -04:00
icomrade
ea8c14c5fb Fix #1187
keypadCancel returns false when a combo/keypad dialog is not open and
when reset by calling the code keyPadReset = {uiSleep 2; keypadCancel =
false;};

There is a 2 second delay which makes brute forcing very very time
consuming. Note there must be a delay when resetting the variable since
fn_selfactions will update so quickly it will display the
unlock/lock/remove option before onUnload is executed.
2016-05-03 01:19:36 -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
icomrade
9e2728af07 Merge pull request #1686 from Bruce-LXXVI/pullrequest/plotManagement
Pullrequest/plot management
2016-05-01 11:05:54 -04:00
ebaydayz
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
ebaydayz
f44901db1b Prevent spamming change clothes
Vanilla development commit:

98733d37ab
2016-04-30 16:48:05 -04:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
icomrade
8158245b83 Possible fix for #1645 2016-04-29 16:48:14 -04:00
ebaydayz
2696869dc2 Fix wrong dayz_minpos and maxpos for Chernarus
Fixes radiation effect when out of map
2016-04-26 21:02:59 -04:00
ebaydayz
bf9140f1b5 Fix dayz_nutrition RPT error on login
Looks like the error was:
r_player_Nutrition = [_NutritionLoss];
It should have used the set command, since the array was already defined
in variables.sqf. But there is no need to use an array for a single
value anyway.

Fixes RPT error on login:
Error in expression <hyd"] spawn player_death;
};
};

if (dayz_nutrition > 0) then {
_Nutrition = >
Error position: <dayz_nutrition > 0) then {
_Nutrition = >
Error Undefined variable in expression: dayz_nutrition
File z\addons\dayz_code\system\player_spawn_2.sqf, line 182
2016-04-26 18:46:36 -04:00
ebaydayz
1879fb8707 Fix siphon fuel
ItemJerrycanEmpty no longer inherits from ItemJerrycan
2016-04-22 17:39:52 -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
f0c46a0764 Use Epoch player_harvest instead of player_chopWood 2016-04-19 16:51:20 -04:00
ebaydayz
58d54a8ce0 Add A and D keys to interrupt 2016-04-19 13:05:59 -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
110befba7f Swap bloodbags in traders and loot for classic system 2016-04-15 16:11:17 -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
268d2fe018 Make default BuildingLimit 150 again 2016-04-09 18:40:52 -04:00
ebaydayz
09f01083fc Formatting cleanup 2016-04-09 16:52:00 -04:00
ebaydayz
d229d10b6a Cleanup config variables 2016-04-09 16:47:51 -04:00
ebaydayz
666ace6d54 Cleanup duplicate and unused strings
Cargo count is shown at the top of the gear menu now
2016-04-04 16:58:59 -04:00
ebaydayz
eda82156be Move CfgServerTrader to dayz_code\configs folder
Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.
2016-04-04 13:10:01 -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
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
0088b27708 Update weapon classnames 2016-03-31 22:45:59 -04:00
ebaydayz
8de50c4619 New variable for match stick counting 2016-03-31 16:23:09 -04:00
ebaydayz
d926a81038 Remove Hatchet_DZE
The two items are 100% identical now. There is no need to have a
separate class for it anymore.
2016-03-31 15:44:23 -04:00
ebaydayz
c54a52a103 Merge selfbloodbag and self_transfuse 2016-03-30 20:50:06 -04:00
ebaydayz
77e760fe73 Update private tags
From
e69f8d5306

Moved dog files to the \dog\ folder and pzombie files to the \pzombie\
folder. Also removed some legacy files that are no longer used.

The actions\ and compile\ folders are fully up to date now
2016-03-30 14:55:45 -04:00
ebaydayz
91f9b3e33b Make UI toggleable between three options
Admin can choose vanilla, classic epoch or classic epoch dark.

dayz_hungerThirst was replaced with dayz_NutritionSystem
2016-03-29 19:54:19 -04:00
ebaydayz
71b975b05e Actions cleanup 2016-03-29 14:47:28 -04:00
ebaydayz
e1a0bfebc1 Update inits 2016-03-27 23:47:30 -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
ebaydayz
e435d41f6c Update server_functions
The protective box is not needed on Chernarus.

If other maps need it we are better off spawning a permanent box around
the debug area once, instead of constantly creating new boxes every time
a player logs in.
2016-03-25 21:24:43 -04:00
ebaydayz
ee13f4caf7 Remove friendlySaving for now
Achievements are saved in the state field, so we don't have room to save
friendlies there anymore. DZE_FriendlySaving is removed for now. I will
add it back later with a save to player profile instead.

The dayz_players variable is not used for anything. There were several
other unused variables in server_playerLogin.sqf.
2016-03-24 17:04:17 -04:00
ebaydayz
3ed4a95c14 Rework death messages
MPHit does not always fire when a player is killed:
https://community.bistudio.com/wiki/ArmA_2:_Event_Handlers#MPHit

Using either MPHit or MPKilled is not a good idea here. There is already
a local 'killed' event handler which fires on player death
(player_death.sqf). That script sends a PV (priority message) to the
server which triggers server_playerDied. That means fnc_plyrHit needed
to finish sending its data to the server via public setVariables
(non-priority messages) before server_playerDied executed. Triggering
both these scripts at the same time was a bad idea.

Instead of sending the data to the server via setVariable I just
included it in PVDZ_plr_Death. This also lets us pass extra information
from the damage handler like ammo type, cause of death, etc. Still need
to test, but it should be more reliable and performant than
fnc_playerHit called from MPHit or MPKilled.
2016-03-23 19:52:04 -04:00
ebaydayz
e2e6e79394 Minor formatting cleanup 2016-03-21 17:58:23 -04:00
ebaydayz
ef873c2340 Fix player_monitor errors
DayzGearSave is no longer used. I will submit a pull to remove it from
vanilla too.

Player_dumpBackpack is not a good solution to stifle duping. Players can
not see friends backpacks dropped on the ground. That is a problem when
they want to trade backpacks. They don't understand why their friend
can't see it. Also players can still get the "gear" scroll action if
they look where the hidden backpack is.

If it is still a problem after all the updates to current dayz code then
we should submit a pull request with a better solution to vanilla.
2016-03-20 16:09:57 -04:00
ebaydayz
15a38afd82 Remove some unused files 2016-03-20 13:28:49 -04:00
ebaydayz
9ce5a20417 Cleanup variables.sqf
Epoch variables are grouped together now for easy comparison with
vanilla.
2016-03-19 19:58:37 -04:00