Commit Graph

4093 Commits

Author SHA1 Message Date
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
A Man
df6c34cfe9 Loot/Traders update (#1696)
* Update Weapons.hpp

* Update Military.hpp

* Update Industrial.hpp

* Update Industrial.hpp

* Update Military.hpp

* Update Residential.hpp

* Update Military.hpp

* Update Military.hpp

* Update BanditClothing.hpp

* Update BanditAmmunition.hpp

* Update BanditHelicopterArmed.hpp

* Update BanditMilitaryArmed.hpp

* Update BanditTrucksArmed.hpp

* Update BanditWeapons.hpp

* Update FriendlyAssaultRifle.hpp

* Update FriendlyBackpacks.hpp

* Update FriendlyBuildingSupplies.hpp

* Update FriendlyCargoTrucks.hpp

* Update FriendlyChemlitesFlares.hpp

* Update FriendlyFuelTrucks.hpp

* Update FriendlyLightMachineGunAmmo.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyPackagedFood.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyPistols.hpp

* Update FriendlyShotgunsandSingleshot.hpp

* Update FriendlyShotgunsandSingleshotAmmo.hpp

* Update FriendlySmokeGrenades.hpp

* Update FriendlySniperRifle.hpp

* Update FriendlySniperRifleAmmo.hpp

* Update FriendlySubmachineGunAmmo.hpp

* Update FriendlySubmachineGuns.hpp

* Update FriendlyToolbeltItems.hpp

* Update FriendlyVehicleParts.hpp

* Update HeroHelicopterArmed.hpp

* Update NeutralAirplanes.hpp

* Update NeutralBlackMarketAmmo.hpp

* Update NeutralBlackMarketWeapons.hpp

* Update NeutralExplosives.hpp

* Update NeutralHelicopterUnarmed.hpp

* Update FriendlyDrinks.hpp

* Update FriendlyLightMachineGun.hpp

* Update NeutralAirplanes.hpp

* Update BanditAmmunition.hpp

* Update FriendlyVehicleParts.hpp

* Update NeutralWholesale.hpp
2016-06-18 12:10:05 -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
A Man
72ea372acf Update Military.hpp (#1695)
I just changed the spawing zombie typ for the military special loot. I noticed that there are only "z_new_worker2-4" zombies in the baracks and got a bit confused. So now we have the military zombies back.
2016-06-16 16:22:12 -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
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
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:

1452ef2537
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:

fb397c95ee
2016-06-04 15:23:31 -04:00
ebaydayz
3f96b70d80 Fix Unsupported language English in stringtable RPT error
Vanilla development commit:

b038a1762b

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:
bf75e56858 (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
Nexux
746a4a2d57 1.0.6 update SQL fix attachments (#1693) 2016-05-31 12:43:05 -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:

4e6ea24577
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
icomrade
2889d8f010 Should fix building issues with player sliding
The change in module_build will only fix items that d ono have an offset
set in the config.

BoundingBox can be a bit generous but the player should be able to work
with any overestimation in size.
2016-05-18 11:01:38 -04:00
icomrade
8fd4c8eb8b Re-add plot check
Accidentally removed this when merging plot for life
2016-05-18 10:13:29 -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
icomrade
113dd0618a Add Little Bird killed EH 2016-05-17 20:45:54 -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