Commit Graph

4111 Commits

Author SHA1 Message Date
ebaydayz
3c76f3c800 Add some new vanilla items to R3F weight
@AirwavesMan - For future reference, if you notice any more new stuff we
forgot to add to the traders we probably forgot to add them to R3F
weight too.
2016-06-21 21:17:22 -04:00
ebaydayz
19285d677a Merge pull request #1704 from AirwavesMan/master
Some more Changes
2016-06-21 20:58:13 -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
A Man
a7bd47054e Add crafting full cinder wall kit
Add crafting full cinder wall kit.
2016-06-21 23:12:14 +02:00
A Man
999f5fd5c2 Added another string
Added another string for full cinder wall kit.
2016-06-21 23:09:32 +02:00
A Man
6f13f8a36e Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame.
2016-06-21 22:27:41 +02:00
A Man
b8f95b7f75 Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame. I tried to correct it but I saw that the string was too long when you click right on a full cinder wall kit to build it. I renamed both kits so that both kits stand by each other.
2016-06-21 22:25:02 +02:00
A Man
25fbaf5757 Small Loot Tweaks
Increased the chance for MortarBucket and CinderBlocks to spawm. Removed the flashlight from spawn in industrial loot.
2016-06-21 21:58:06 +02:00
A Man
4848c3ef5c Changed Prices for balance
Changed prices for balance.
2016-06-21 21:55:01 +02:00
A Man
6d3a76704c Items Added/ Combo Lock Price Changed
I've added a few vanilla items and changed the price of the Combo Lock.
2016-06-21 21:53:48 +02:00
A Man
f47c4e0f2a Reordered Attachments
Reordered the attachments. Similar items should be next to each other
2016-06-21 21:52:20 +02:00
ebaydayz
63d6cfa87b Update test build 2016-06-20 22:02:28 -04:00
A Man
220fe3696c Backpack prices changed (#1699)
Backpack prices were wrong. It does not make sense to buy a smaller backpack for a higher prices than a bigger backpack.
2016-06-20 21:56:18 -04:00
A Man
2f613226ea Changed more Zombies Typs (#1700)
It does not feel right, when you enter a military area and see only Worker Zombies. I changed the Zombie Typs of the buildings to look more like a military area.
2016-06-20 21:48:45 -04:00
A Man
8b6725f77d Fixed CopperBar Display Text (#1701)
The Display text to craft  1x 10oz copper bar was not visible
2016-06-20 21:43:34 -04:00
A Man
ee6bf997b4 Increased weight of full_cinder_wall_kit (#1702)
The full_cinder_wall_kit had the same weight as the half. I just increased the weight by almost the double amout.
2016-06-20 21:41:12 -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
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