From f5af6512fd97e1913f6cb503bceb8e3d8fea8749 Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 30 Jan 2013 14:22:18 -0600 Subject: [PATCH] 0.82 fix out of stock msg. Add display name to supply crates and tweak model. --- dayz_code/actions/buy_db.sqf | 1 - dayz_code/config.cpp | 2 +- dayz_code/rscTitles.hpp | 2 +- dayz_equip/config.cpp | 4 +++- dayz_equip/models/supply_crate.p3d | Bin 2840 -> 2840 bytes 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dayz_code/actions/buy_db.sqf b/dayz_code/actions/buy_db.sqf index 8096e6acf..3681e884d 100644 --- a/dayz_code/actions/buy_db.sqf +++ b/dayz_code/actions/buy_db.sqf @@ -94,7 +94,6 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult]; if(_qty <= 0) then { _Display = format["Buy %1 (Out of Stock: %2)", _textPart, _qty]; _part = player addAction [_Display, "\z\addons\dayz_code\actions\trade_cancel.sqf",[], 0, true, false, "",""]; - _part = player addAction [_Display, _File,[_name,_bname,_out,_in,"buy",_textCurrency,_textPart,_header], _order, true, true, "",""]; } else { _Display = format["Buy %1 (%2) for %3 %4 (Available: %5)", _textPart, _name, _in, _textCurrency, _qty]; _part = player addAction [_Display, _File,[_name,_bname,_out,_in,"buy",_textCurrency,_textPart,_header], _order, true, true, "",""]; diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 52cbf34bb..e83c53fcb 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -33,7 +33,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayepoch.com"; - version = "0.81"; + version = "0.82"; hiveVersion = 0.96; //0.93 }; }; diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index d98f0f52d..c3277a634 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 0.81 (1.7.5.M1D25)"; + text = "DayZ Epoch 0.82 (1.7.5.M1D25)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; class CA_TitleMainMenu; diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index 710740e06..454b4c3eb 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1483,6 +1483,7 @@ class CfgMagazines scope = 2; count = 12; type = "(256 * 6)"; + displayName = "Supply Crate"; model = "\dayz_equip\models\supply_crate.p3d"; picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; descriptionShort = "12 x NV Goggles"; @@ -1492,9 +1493,10 @@ class CfgMagazines scope = 2; count = 12; type = "(256 * 6)"; + displayName = "Supply Crate"; model = "\dayz_equip\models\supply_crate.p3d"; picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; - descriptionShort = "12 x 30Rnd_9x19_MP5SD rounds"; + descriptionShort = "12 x 30Rnd_9x19_MP5SD"; }; class ItemGenerator: CA_Magazine { diff --git a/dayz_equip/models/supply_crate.p3d b/dayz_equip/models/supply_crate.p3d index 794360905517e9c128974f2013577956e3745be6..c4dd919ba1d8002a11f79012e66d3c0aa718f83f 100644 GIT binary patch delta 368 zcmZ8bI|{-;6x>K4q_l|;73{Q9&@L>lf`z3A5WIpXNVaslK$@H&2S`daDYfuSS?6V4 z2nLqSyf>eh2YHY#lEaio&zG#zi^~~4Z^cC2$AsPSz*RZXp&w`-n9m?>V+ArFCJ!