Commit Graph
100 Commits
Author SHA1 Message Date
ebaydayz 63d6cfa87b Update test build 2016-06-20 22:02:28 -04:00
ebaydayz bf3d03ba13 Only spawn small loot in lootPosSmall positions
I did not realize lootPosSmall positions can only fit small objects like
soda cans etc., so it is not okay to merge them with the main lootPos
arrays. This separates them back out.

This solution will work like 1.0.5.1 CfgLootSmall. <GroupName>Small is
used to spawn additional loot if the building type has lootPosSmall
positions available. It is not necessary to add a <GroupName>Small for
types that do not have lootPosSmall positions.

Some of these objects may still be too big or too small (knife,
binoculars, matchbox, etc.) for the positions and look out of place. If
that is the case please submit a pull with any problematic ones removed
from the <GroupName>Small groups (check if they aren't in 1051
CfgLootSmall first). Balance and rates may need adjustment as I just
took the normal groups and removed large objects from them while trying
to keep similar items to 1.0.5.1 CfgLootSmall.
2016-06-20 21:39:21 -04:00
ebaydayz c6ddcbdc3e Update test build 2016-06-18 20:10:12 -04:00
ebaydayz 58d2443e77 Add back Epoch custom lootPos and lootPosSmall
Epoch has custom loot positions for many buildings. Most lootPos have
not changed in vanilla since pre 1.7.x.

The vanilla lootPos are now commented out and  custom Epoch ones are
added back. LootPosSmall positions are now included in lootPos and
marked with //DZE EXTRA

LootPosSmall are included and used by default in 1051, so it is simpler
to add them to the main lootPos lists instead of having a separate loop
in buildingSpawnLoot.sqf for them.
2016-06-18 19:58:58 -04:00
ebaydayz 5b7ef99569 Fix _distance in dze_buildChecks
Passing false as the second parameter to fnc_find_plots always returns
DZE_PlotPole select 0. In dze_buildchecks we want to use DZE_PlotPole
select 1 if the classname is a plot pole.

_distance is already defined as DZE_PlotPole select 0 in the other three
files, so it is redundant to redefine it as the return value.

In player_upgrade.sqf the check for DZE_permanentPlot is not necessary,
because FNC_check_access handles both cases.
2016-06-16 20:15:51 -04:00
ebaydayz d74130b477 Rename _playerUID to _id in fn_selfActions
Since this variable can also equal dayz_characterID if DZE_permanentPlot
= false; it makes more sense to name it _id.
2016-06-16 17:01:16 -04:00
ebaydayz e08ccaea1b Fix change log typo 2016-06-15 22:03:18 -04:00
ebaydayz 1f4c73bd12 Update change log
It is unnecessary to specify default values in configVariables.sqf
comments. All values in this file will be defaults at release. It can't
be edited by admins directly. They need to copy the variables to their
mission to change them, so they will always be able to reference it for
the defaults.
2016-06-15 21:14:06 -04:00
ebaydayz 01d8197d12 Remove redundant function fn_check_owner_friends
Fn_check_access provides the same functionality and more.

Removed folders that only contained a single file to clean things up.

Also added epoch tag friendly code to vanilla player_updateGui for now.
2016-06-15 20:09:04 -04:00
ebaydayz fcca975708 Add Bruce-LXXVI to contributors 2016-06-15 18:33:49 -04:00
ebaydayz 035a94646b Add createvehicle.txt exception for player zombies 2016-06-12 14:54:33 -04:00
ebaydayz 20066de673 Rename FNC_check_owner --> FNC_check_owner_friends
Use a more descriptive name for what it actually does now.
2016-06-12 13:30:49 -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 16c1e9d205 Don't spawn POI objects on non-Chernarus maps
Object coordinates are only provided for Chernarus.
2016-06-10 18:42:18 -04:00
ebaydayz a7045140a0 Remove some unused legacy code 2016-06-07 16:26:29 -04:00
ebaydayz 0534e95ccc stringtable fixes
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/1452ef25379028167c23c3885734fcf7868ae81d
2016-06-06 21:51:47 -04:00
ebaydayz 2ea627f332 Preliminary BE filters update
The big list of removals in setvariableval.txt and publicvariableval.txt
were duplicates. Other removals are covered by the new regex filter.

Still needs work. If you encounter kicks please post the restriction
type and number along with the log line in the 1.0.6 testing issue.
2016-06-05 17:29:10 -04:00
ebaydayz 98c805e8db Update test build 2016-06-05 11:56:01 -04:00
ebaydayz d4f6f07093 Fix gut zombie missing knife text
Shows "Missing Hunting Knife to do this" instead of "Missing knife to
gut animal"
2016-06-04 16:38:41 -04:00
ebaydayz b7a104113f Various stringtable fixes & amendments
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/fb397c95ee9cad407c6024308ef321dc4232206d
2016-06-04 15:23:31 -04:00
ebaydayz 3f96b70d80 Fix Unsupported language English in stringtable RPT error
Vanilla development commit:

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

Fixes RPT error "Unsupported language English (or whatever language you
selected) in stringtable" on load.

We do not have <Original> tags on any other strings in the table, so
there is no reason to use them here. They are not needed. If the game is
set to use a language that does not have an entry it uses the first
available entry for that string (which is English for every string in
the table). Keys should not contain only <Original> tags with no other
languages, as it will cause this error.
2016-06-04 14:00:32 -04:00
ebaydayz e5bfb01189 Fix typo in 1.0.6_Updates.sql 2016-06-02 17:43:46 -04:00
ebaydayz 3cee9cec55 Fix trader weapon swaps in 106 SQL updates
Type 1 is magazine, type 3 is weapon.

Also quantity is normalized to 10 for items and 2 for vehicles now as
per:
https://github.com/EpochModTeam/DayZ-Epoch/commit/bf75e56858fdb09fa43190d26ff807e3d3b5b300#diff-3a9fcf2e8bd4ce1706bc216f4e9de063L57
2016-05-31 17:03:26 -04:00
ebaydayz bf75e56858 Remove 1.0.5_Updates.sql
Updates that were in the 1.0.5.1 release are now included in the main
epoch.sql file, since all servers should have applied them by now.

All new updates since 1.0.5.1 release are now in 1.0.6_Updates.sql.
2016-05-31 16:29:11 -04:00
ebaydayz 8028efbb69 Allow admin customization of player_onPause #1340
Also disable abort and respawn immediately in pause menu onLoad. New
function fn_pauseMenuChecks allows admins to run unscheduled code in
pause menu onLoad.
2016-05-22 12:26:57 -04:00
ebaydayz fe8c5e7950 Fix infinite antibiotics when given to another player
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/4e6ea245771d1e926f757a7438362dea0cc6ad4d
2016-05-21 15:08:57 -04:00
ebaydayz 9dafa9d657 Always eject player when vehicle explodes
If the player is in a safezone we still want to eject them, just not
kill them.
2016-05-20 19:54:26 -04:00
ebaydayz 75e3ee58c2 Reduce ItemBloodbag loot chance slightly for classic system
Since typed bags spawn in bulk (usually 2x 4 different bag types) this
reduces bloodbag output slightly when classic system is enabled.

Medboxes were spawning with 3-8 blood bags, this reduces it to about 1-6
which should be similar to 1051 values IIRC. Feel free to adjust this up
or down if needed.
2016-05-20 17:20:10 -04:00
ebaydayz ec27cfd29c Update dog actions in fn_selfActions
When PlotForLife was added these were not updated to reflect the
_ownerID change:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/compile/fn_selfActions.sqf#L253
2016-05-20 13:45:52 -04:00
ebaydayz edd53597b0 Don't pass DZE_plotManagement to fn_check_owner
The whole point of a global variable is you do not need to pass it.
DZE_plotManagement and DZE_plotmanagementAdmins are always defined and
do not change, so there is no need to pass them as parameters.
2016-05-20 12:14:48 -04:00
ebaydayz 1a5d26f26d Remove unnecessary else in fn_selfActions
FNC_check_owner returns true for (_isowner select 0) if characterID
matches and plotforLife is disabled. So there is no need for the else
here.
2016-05-20 11:55:52 -04:00
ebaydayz 8beb6e9666 Allow filling generator and destroying tent with barrel and 5L 2016-05-19 20:44:34 -04:00
ebaydayz d01446414c Move Zupa dialog includes to config.cpp
@icomrade - configFile and missionConfigFile are in different scopes.
Admins can overwrite any dialog in RscDisplay with their own version
included in the mission without getting "class already defined" errors.
I tested to make sure it is possible. So there is no benefit to having
these includes in description.ext.
2016-05-19 18:43:23 -04:00
ebaydayz 301c4348e9 Remove vanilla generator fill actions 2016-05-19 18:35:11 -04:00
ebaydayz 62700f37e4 Add note about splint and broken legs
Since R4z0r doesn't want it changed in vanilla.
2016-05-19 16:29:35 -04:00
ebaydayz a54e58c60c Localize remaining player_build text
Also added config variables for MaxMove and MaxHeight distance when
building.

_reason was defined twice at the top of player_build.sqf.
2016-05-19 16:15:27 -04:00
ebaydayz cbca23ddce Remove duplicate ZSCdefines.hpp include
@Bruce-LXXVI it was already included from the mission description.ext
2016-05-19 13:39:38 -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 1a238d1719 Fix wrong buildables count displayed in plot management 2016-05-18 20:20:20 -04:00
ebaydayz d0c4ccca15 Fix wooden splint recipe output
It was outputting two when it should only be one.
2016-05-18 17:10:46 -04:00
ebaydayz 0544ac37fa Fix broken legs icon flashing indefinitely
This keeps the icon solid when your legs are broken instead of flashing
it constantly.
2016-05-18 17:04:44 -04:00
ebaydayz 9d51fb2736 Fix plot management buttons color and text alignment
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
2016-05-17 22:02:21 -04:00
ebaydayz f61c6d8dac Add plotManagementMustBeClose config option
Setting false allows adding any online player to plot friends regardless
of their distance from the pole.
2016-05-17 20:09:37 -04:00
ebaydayz edb64c4e05 Fix plot manage array add errors from 1e65f7a
@icomrade - when you use set to add an element to an array you do not
need to wrap it in brackets [ ] like you do with +.

This was making it a nested array which was not intended in the
original.
2016-05-17 19:30:21 -04:00
ebaydayz dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -04:00
ebaydayz a466e43645 Move plotManagement compiles to compiles.sqf
This was needlessly recompiling every time the addAction was clicked.

DisableSerialization is only needed if a display element is stored in a
variable within the current script. The called functions already have
it.
2016-05-17 16:54:58 -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
ebaydayz 7e1fe6fca1 Update test build 2016-05-15 11:32:53 -04:00
ebaydayz 914162c698 Update messing variable in pz_feed.sqf
Messing now has a third parameter for dayz_nutrition.
2016-05-13 17:02:44 -04:00
ebaydayz 8b0e03545f Remove legacy config trader menu
Advanced trading now does everything the legacy config menu did and
more.
2016-05-12 16:41:40 -04:00
ebaydayz 3be1d4e6bf Update outhouse and plot pole descriptions
Outhouse no longer includes toilet paper.

Plot pole may cover an arbitrary radius and ownership may not be lost
after death depending on server settings.
2016-05-12 15:10:20 -04:00
ebaydayz bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
ebaydayz e60175b30c Fix wrong price when adding multiples of same item to buy list
Modifying _temp was also modifying Z_BuyableArray. An independent copy
of the array was needed.
2016-05-11 15:07:58 -04:00
ebaydayz 5ad1697308 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-11 12:42:51 -04:00
ebaydayz 6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -04:00
ebaydayz 5ca182dffe Fix can't sell satchels with Adv. Trade
Some items (like PipeBomb) are a class in both CfgMagazines and
CfgWeapons. BIS_fnc_invRemove uses weapon first, so that is why the
magazine was not being removed. Using config instead of string avoids
this problem.
2016-05-09 14:10:20 -04:00
ebaydayz c0cb702534 Add swap for classicBloodBagSystem in Adv. Trade 2016-05-08 17:31:23 -04:00
ebaydayz 5120d8a488 Fix incorrect backpack space calculation
Fixes not being able to purchase into a half full backpack and free slot
counts text incorrect when buying into backpack.
2016-05-08 16:21:24 -04:00
ebaydayz 84e64be47e Don't show debug message when paying with exact amount 2016-05-08 13:30:26 -04:00
ebaydayz c477304571 Forbid buying duplicate tools into gear 2016-05-08 11:59:25 -04:00
ebaydayz 41e653136f Add attachments compatibility list to trader
Also reduced item info size a bit to better fit normal and large
interface sizes.
2016-05-07 19:29:00 -04:00
ebaydayz 3d4d6f6544 Add SQL query for Precise Base Building 1.0.5
You only need to run this if v1.0.4 was installed on your server
2016-05-07 13:24:27 -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
ebaydayz 03e3293795 Add extra vehicle info in Adv. Trading
Translations are from Arma2OA languagecore.pbo
2016-05-06 18:57:53 -04:00
ebaydayz b0ffc1421e Prevent errors if zombie is deleted suddenly 2016-05-05 20:03:41 -04:00
ebaydayz 00cb76a496 Fix Adv. Trading pistol detection
The secondaryWeapon command does not detect pistols. It returns the
unit's launcher.
https://community.bistudio.com/wiki/secondaryWeapon

This fixes the menu always showing your pistol slot as open, even when
you already have one.
2016-05-05 17:25:47 -04:00
ebaydayz 7bc5d7f7f5 Fix full toolbelt showing -2 tool slots in Adv. Trade
Correctly shows zero available tool slots when toolbelt, binocular and
NVG slots are full now.
2016-05-05 16:50:09 -04:00
ebaydayz fe54b78bdb Add backpack selling to Advanced Trading
It was not possible to sell a backpack from your gear or vehicle.

Added option to sell from gear. Sell backpack from vehicle is still not
possible currently due to Arma limitations.
2016-05-05 14:55:50 -04:00
ebaydayz 2c6ef2ced3 Don't show selected vehicleX message on Adv Trade startup
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
2016-05-05 12:37:10 -04:00
ebaydayz f900ee4520 Add isInTraderCity to BackpackAntiTheft check 2016-05-05 11:39:18 -04:00
ebaydayz af14d673f5 Make LMG magazines only take up one slot
All ammo in Configs\CfgMagazines\Magazines\ is back to taking one gear
slot now, same as 1.0.5.1.
2016-05-05 11:14:08 -04:00
ebaydayz ef2c910bfc Fix open gear backpack slots always showing zero
IsNil returns true as long as the variable is defined. In this case it
is defined as objNull when you have no backpack.
2016-05-04 19:09:10 -04:00
ebaydayz cb381c5ce3 Fix another transportMaxBackpacks typo
This was responsible for vehicles showing zero and negative numbers of
available backpack slots.
2016-05-04 18:42:20 -04:00
ebaydayz ed9253671e Always open Advanced Trading in buy mode
Fixes the unintended behavior of swapping between buy and sell each time
the menu is opened.
2016-05-04 16:50:46 -04:00
ebaydayz 349e0a103d Fix trade title showing "Buying in vehicleX" when in sell mode
Tested and confirmed working as intended now.
2016-05-04 16:46:35 -04:00
ebaydayz 85869b32f1 Fix Adv. Trade secondary vehicle check
Forgot this one. See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/f503e530976a34c4ffb3ff136881423feb0c5cdb
2016-05-04 15:53:25 -04:00
ebaydayz f503e53097 Fix Adv. Trade nearby vehicle check detecting animals
Was getting "Buying in Rabbit" when one was nearby.

No need to check "AllVehicles", this is faster and will get all drivable
vehicle types.
2016-05-04 15:47:47 -04:00
ebaydayz c4d3f01f38 Don't show enter/leave text when changing clothes in trader 2016-05-04 15:08:19 -04:00
ebaydayz e6c5930415 Fix unit icon in Advanced Trading selling from gear box
Adds a nice icon of the unit in the top right below "Gear" text.
2016-05-04 14:39:40 -04:00
ebaydayz 800182f7e2 Fix can't buy backpack into vehicle with Advanced Trading
The typo here was causing all vehicles to return 0 for
transportMaxBackpacks.
2016-05-04 14:20:23 -04:00
ebaydayz 5043fafae4 Fix default currency display in Adv. Trading bag item info
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
2016-05-04 12:54:36 -04:00
ebaydayz 085b6d32f9 Enable R3F weight by default
Since we are keeping "everything takes up one gear slot" weight should
be enabled by default. Moved to init.sqf so admins can easily change it.

Also added RedRyder and Anzio_20 weight.
2016-05-04 11:23:50 -04:00
ebaydayz ee70dd49d3 Prevent rags duping
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/31167114e79b7fbde063d543e3f225dc493261f7
2016-05-03 17:28:33 -04:00
ebaydayz 1eeaa3e792 Add epoch_generateKey function 2016-05-03 13:35:50 -04:00
ebaydayz 2f98fc0451 Prevent MeleeMagazines being counted by BIS_fnc_inv 2016-05-03 13:35:50 -04:00
ebaydayz d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz 8d82693c1b More Advanced Trading localization
Russian translations provided by Epoch forums user koms:
http://epochmod.com/forum/profile/33066-koms/
2016-05-02 17:32:27 -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:

https://github.com/DayZMod/DayZ/commit/24194861aa34e57a4ae6096c85db8aae02587314
2016-05-02 14:48:15 -04:00
ebaydayz 99cd64c73b Removed Logging from Temperature system.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/166ae0219cc415be56ee145020468cd047d40fe2
2016-05-02 14:28:58 -04:00
ebaydayz dfe68c7824 Removed Achievements from sync.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/09313b23769b056c5a7f3d34f37583b2e2c599b5
2016-05-02 14:26:35 -04:00
ebaydayz 4df9a1e00b Fix wrong translations from #1689 @Adaptivity
@Adaptivity
2016-05-02 14:15:06 -04:00
ebaydayz adff6440ed Fix errors from #1689 localization
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
2016-05-02 14:03:41 -04:00
ebaydayz 765b035764 Add note about PVDZ_plr_Save 2016-05-02 11:23:50 -04:00
ebaydayz 51308c5b32 Fix typo from #1688
Also remove a duplicate string
2016-05-01 21:14:38 -04:00
ebaydayz f848305b50 Update Advanced Trading with category reuse support
Tested and working ok.
Updating with change from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/03b8c38c6a9a8473d75addcfec113193f7b2ec6c
2016-05-01 19:02:29 -04:00
ebaydayz db62ed2019 Only check isPlayer if isMan in fn_selfActions
Better method than:

https://github.com/EpochModTeam/DayZ-Epoch/commit/66408ded24c81df771d9f3eb55bb7dda4294dbc5
2016-05-01 17:24:21 -04:00
ebaydayz 66408ded24 Prevent trader menu action showing on players
Fixes bug where player wearing a skin in serverTraders would show trader
menu action on him.
2016-05-01 17:08:55 -04:00
ebaydayz 2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00