mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00

Go to file

ebayShopper e1b6125761 Fix Javelin selling and _HasKey check again

@oiad Add the Javelin magazine as trade_items to a trader which only
sells magazines (like FriendlyAssaultRifleAmmo) and the Javelin weapon
as trade_weapons to a trader which only sells weapons (like
FriendlyAssaultRifle), then test your changes from f8a230e with both in
your gear. You will see it allows you to sell all the magazines and the
weapon at both traders. This is because the only condition to add the
item to the sellable array is that it exists as an entry in the
category. It never checks the entry type. This commit will check to make
sure the type matches in the config and the player's inventory.

I changed your static "trade_any_vehicle" to find the type in the
config, because it could also be "trade_any_boat/bicycle/vehicle_free".
Boats are handled differently for the hitpoints check in sellItems.sqf.

Also I noticed that both the _HasKey check and your new _y == _myVehType
check were not working for upgraded vehicles _DZE[1-4] because they had
been swapped out to  _baseVehicle. I forgot to account for that when I
added that feature.

This should resolve both problems. I tested both and everything looks
good. It can do with some more thorough testing though. Note
DZE_SaleRequiresKey is false by default.

2017-11-07 16:53:33 -05:00

Documents

1.0.6.1 hotfix A

2017-03-10 13:50:33 -05:00

Server Files

Update version numbers

2017-11-04 16:14:16 -04:00

SQF

Fix Javelin selling and _HasKey check again

2017-11-07 16:53:33 -05:00

Tools

typo

2014-07-27 23:17:00 -05:00

TraderCitySources

Add old files to TraderCitySources for reference

2016-03-01 01:08:23 -05:00

.gitattributes

0.1

2012-11-04 20:28:50 -06:00

.gitignore

Push

2014-02-11 20:46:39 +01:00

CHANGE LOG 1.0.6.2.txt

Fix Javelin selling and _HasKey check again

2017-11-07 16:53:33 -05:00

README.md

update changelog and credits

2017-04-21 13:04:36 -04:00

README.md

DayZ Epoch

Experimental DayZ mod

http://dayzepoch.com

Based on DayZ Mod Community edition

https://github.com/DayZMod/DayZ/blob/1.8.8/Documentation/Credits.md http://dayzmod.com

Included Custom Addons

DayZero Enterable Buildings - https://zombies.nu/
AutoGyro - by CSJ http://www.armaholic.com/page.php?id=2359
Taxi by [GLT]Myke http://www.armaholic.com/page.php?id=12289
Blackhawk and Seahawk Wrecks by [GLT]Myke http://www.armaholic.com/page.php?id=10670
SUV Colors by Python.au http://www.armaholic.com/page.php?id=17176
R3F Realism by http://www.team-r3f.org/
ASC EU Lights Mod http://www.armaholic.com/page.php?id=12076
MAP Editorupgrade (EU) http://www.armaholic.com/page.php?id=6194
st_movement by ShackTac https://dev-heaven.net/projects/shacktac/files
st_bunnyhop by ShackTac https://dev-heaven.net/projects/shacktac/files
Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr and Sahbazz http://www.armaholic.com/page.php?id=13053
gdtmod_grass 1.00 by HeinBloed - http://www.gdt-server.net/
Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
USEC CH53 by Rocket - http://dayz.com
Anzio 20mm Rifle by WillRobinson - http://www.armaholic.com/page.php?id=30175
RedRyder BB Gun by WillRobinson - https://github.com/arma2WillRobinson/Red-Ryder

Included Custom Islands

Sauerland by Falconsan - http://www.s6computer.de/
Napf Island by #momo# - http://forums.bistudio.com/showthread.php?136469-Napf-Island-beta
| MBG Killhouses http://www.armaholic.com/page.php?id=15180
| MBG Buildings 3 - European Theatre http://www.armaholic.com/page.php?id=14828
| MBG Generic African Buildings http://www.armaholic.com/page.php?id=17817
| German Town - and waysigns http://www.armaholic.com/page.php?id=9658

Initial Developers

[VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol
Axle - Tester, Trader City Designer - http://www.twitch.tv/axles
Paul Tomany - Models, Textures - ptomany@gmail.com - http://www.twitch.tv/sequisha
[VB]GREEN - Graphics - http://www.twitch.tv/vbgreen

GitHub Collaborators (In order of most commits)

vbawol - https://github.com/vbawol
eltexonline - https://github.com/eltexonline
zabn - https://github.com/zabn
Sequisha - https://github.com/Sequisha
andgregor - https://github.com/andgregor
facoptere - https://github.com/facoptere
dayz10k - https://github.com/dayz10k
Skaronator - https://github.com/Skaronator
icomrade - https://github.com/icomrade
ebayShopper - https://github.com/ebayShopper
Axles - https://github.com/Axles
Armifer - https://github.com/Armifer
Zupa - https://github.com/Windmolders

GitHub Contributors (In order of most commits)

vbawol - https://github.com/vbawol
dayz10k - https://github.com/dayz10k
Skaronator - https://github.com/Skaronator
Fank - https://github.com/Fank
andgregor - https://github.com/andgregor
Axles - https://github.com/Axles
zabn - https://github.com/zabn
eltexonline - https://github.com/eltexonline
icomrade - https://github.com/icomrade
ebayShopper - https://github.com/ebayShopper
Namindu - https://github.com/Namindu
raginruffalo - https://github.com/raginruffalo
Markokil321 - https://github.com/Markokil321
Mikeeeyy - https://github.com/Mikeeeyy
Adaptivity - https://github.com/Adaptivity
RimBlock - https://github.com/RimBlock
raymix - https://github.com/raymix
arma2WillRobinson - https://github.com/arma2WillRobinson
facoptere - https://github.com/facoptere
ctcDNightmare - https://github.com/ctcDNightmare
SGanthony - https://github.com/SGanthony
githubmil - https://github.com/githubmil
Geodar - https://github.com/Geodar
Sandbird - https://github.com/Sandbird
krazey - https://github.com/krazey
jostster - https://github.com/jostster
SilvDev - https://github.com/SilvDev
AVendettaForYou - https://github.com/AVendettaForYou
Sequisha - https://github.com/Sequisha
Armifer - https://github.com/Armifer
infiSTAR - https://github.com/infiSTAR
Cornyfisch - https://github.com/Cornyfisch
JoSchaap - https://github.com/JoSchaap
maca134 - https://github.com/maca134
Schmoopiie - https://github.com/Schmoopiie
nahkiss - https://github.com/nahkiss
BlackLA - https://github.com/BlackLA
Hogscraper - https://github.com/hogscraper
Bruce-LXXVI - https://github.com/Bruce-LXXVI
oiad - https://github.com/oiad
AirwavesMan - https://github.com/AirwavesMan
Raziel23x - https://github.com/Raziel23x
strikerforce - https://github.com/strikerforce
dreamforceinc - https://github.com/dreamforceinc
F507DMT - https://github.com/F507DMT
ndavalos - https://github.com/ndavalos
SmokeyBR - https://github.com/SmokeyBR

Special thanks

BIS for a incredible and versatile game and engine. http://www.bistudio.com/
Rocket - DAYZ! http://dayzmod.com | http://dayzgame.com
Rajkosto - DayZ Hive DLL - https://github.com/rajkosto/hive
DayZ Community Developers - https://github.com/DayZMod
ziellos2k - Tag Friendly code. https://github.com/ziellos2k
Tansien and Zac - for providing and creating DayZero Enterable Buildings https://zombies.nu/
Munchiefest - Beta Tester, Wiki Editor, Ideas - http://www.twitch.tv/munchiefest
Chelsey - Beta Tester, New female textures.
OrangeSherbet - Beta Tester - http://www.twitch.tv/orangesherbet
QMGSaint - Beta Tester - http://www.twitch.tv/qmgsaint
Twitch.tv Streamers - http://www.twitch.tv/directory/game/DayZ
Thanks to all the other beta testers, you know who you are!