+ fixed crafting of tin and aluminum bars from trash
+ fixed color coding on weapons and vehicle sellers
+ removed radar from mi-17 civilian
+ added 10oz versions of silver and copper.
+ added basic 3d preview support to build-ables.
This commit is contained in:
vbawol
2013-02-16 11:56:39 -06:00
parent 4bb6b117d8
commit 35f587048d
21 changed files with 271 additions and 76 deletions

View File

@@ -1,6 +1,8 @@
private["_location","_isOk","_dir","_classname","_item"]; private["_location","_isOk","_dir","_classname","_item"];
_location = player modeltoworld [0,1,0]; _location = player modeltoworld [0,1,0];
_location set [2,0]; _location set [2,0];
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_isWater = (surfaceIsWater _location) or dayz_isSwimming; _isWater = (surfaceIsWater _location) or dayz_isSwimming;
@@ -17,23 +19,86 @@ _hasbuilditem = _this in magazines player;
if (!_hasbuilditem) exitWith {cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]}; if (!_hasbuilditem) exitWith {cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]};
// Get inital direction of player
_dir = getDir player; _dir = getDir player;
player removeMagazine _item;
player playActionNow "Medic"; _offset_x = 0;
sleep 1; _offset_y = 1.5;
[player,"repair",0,false] call dayz_zombieSpeak; _offset_z = 0;
_id = [player,50,true,(getPosATL player)] spawn player_alertZombies; _offset_z_attach = 0.5;
sleep 5;
// Start Preview loop
_tmpbuilt = createVehicle ["_classname", _location, [], 0, "CAN_COLLIDE"];
_tmpbuilt setdir _dir;
_tmpbuilt attachTo [player,[_offset_x,_offset_y,_offset_z_attach]];
_cancel = false;
_counter = 0;
_isOk = true;
while {_isOk} do {
player allowDamage false; if(_counter == 0) then {
_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; cutText ["Planning consruction stand still 5 seconds to build.", "PLAIN DOWN"];
_object setDir _dir; sleep 5;
player reveal _object; _location1 = getPosATL player;
sleep 5;
_location2 = getPosATL player;
if(_location1 distance _location2 < 0.1) exitWith {
cutText ["Started consruction move within 5 seconds to cancel.", "PLAIN DOWN"];
_location3 = getPosATL player;
sleep 5;
_location4 = getPosATL player;
cutText [format[localize "str_build_01",_text], "PLAIN DOWN"]; if(_location3 distance _location4 > 0.1) exitWith {
_isOk = false;
_cancel = true;
};
["dayzPublishObj",[dayz_characterID,_object,[_dir,_location],_classname]] call callRpcProcedure; _isOk = false;
};
};
if(_counter >= 1) exitWith {
_isOk = false;
_cancel = true;
};
_counter = _counter + 1;
};
sleep 2; detach _tmpbuilt;
player allowDamage true;
// Get location of detached tmp built
_built_location = (getPosATL _tmpbuilt);
// force to ground
_built_location set [2,0];
if(!_cancel) then {
_dir = getDir player;
player removeMagazine _item;
player playActionNow "Medic";
sleep 1;
[player,"repair",0,false] call dayz_zombieSpeak;
_id = [player,50,true,(getPosATL player)] spawn player_alertZombies;
sleep 5;
player allowDamage false;
_object = createVehicle [_classname, _built_location, [], 0, "CAN_COLLIDE"];
_object setDir _dir;
player reveal _object;
cutText [format[localize "str_build_01",_text], "PLAIN DOWN"];
["dayzPublishObj",[dayz_characterID,_object,[_dir,_location],_classname]] call callRpcProcedure;
sleep 2;
player allowDamage true;
} else {
cutText [format["Canceled construction of %1.",_text], "PLAIN DOWN"];
};

View File

@@ -22,26 +22,91 @@ if (!_hasbuilditem) exitWith {cutText [format[(localize "str_player_31"),_text,"
if (_text == "TrapBear") then { _bypass = true; }; if (_text == "TrapBear") then { _bypass = true; };
if (_hasrequireditem or _bypass) then { if (_hasrequireditem or _bypass) then {
_dir = getDir player; _dir = getDir player;
player removeMagazine _item;
player playActionNow "Medic"; _offset_x = 0;
sleep 1; _offset_y = 1.5;
[player,"repair",0,false] call dayz_zombieSpeak; _offset_z = 0;
_id = [player,50,true,(getPosATL player)] spawn player_alertZombies; _offset_z_attach = 0.5;
sleep 5;
// Start Preview loop
_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
_tmpbuilt setdir _dir;
_tmpbuilt attachTo [player,[_offset_x,_offset_y,_offset_z_attach]];
_cancel = false;
_counter = 0;
_isOk = true;
while {_isOk} do {
if(_counter == 0) then {
cutText ["Planning consruction stand still 5 seconds to build.", "PLAIN DOWN"];
sleep 5;
_location1 = getPosATL player;
sleep 5;
_location2 = getPosATL player;
if(_location1 distance _location2 < 0.1) exitWith {
cutText ["Started consruction move within 5 seconds to cancel.", "PLAIN DOWN"];
_location3 = getPosATL player;
sleep 5;
_location4 = getPosATL player;
if(_location3 distance _location4 > 0.1) exitWith {
_isOk = false;
_cancel = true;
};
_isOk = false;
};
};
if(_counter >= 1) exitWith {
_isOk = false;
_cancel = true;
};
_counter = _counter + 1;
};
detach _tmpbuilt;
// Get location of detached tmp built
_built_location = (getPosATL _tmpbuilt);
deleteVehicle _tmpbuilt;
if(!_cancel) then {
_dir = getDir player;
player removeMagazine _item;
player playActionNow "Medic";
sleep 1;
[player,"repair",0,false] call dayz_zombieSpeak;
_id = [player,50,true,(getPosATL player)] spawn player_alertZombies;
sleep 5;
player allowDamage false; player allowDamage false;
_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; _object = createVehicle [_classname, _built_location, [], 0, "CAN_COLLIDE"];
_object setDir _dir; _object setDir _dir;
player reveal _object; player reveal _object;
cutText [format[localize "str_build_01",_text], "PLAIN DOWN"]; cutText [format[localize "str_build_01",_text], "PLAIN DOWN"];
["dayzPublishObj",[dayz_characterID,_object,[_dir,_location],_classname]] call callRpcProcedure; ["dayzPublishObj",[dayz_characterID,_object,[_dir,_location],_classname]] call callRpcProcedure;
sleep 2;
player allowDamage true;
} else {
cutText [format["Canceled construction of %1.",_text], "PLAIN DOWN"];
};
sleep 2;
player allowDamage true;
} else { } else {
cutText [format[localize "str_build_failed_01",_text], "PLAIN DOWN"]; cutText [format[localize "str_build_failed_01",_text], "PLAIN DOWN"];
}; };

View File

@@ -100,26 +100,6 @@ if (inflamed cursorTarget and _canDo) then {
[ ["ItemCopperBar10oz",1] ] [ ["ItemCopperBar10oz",1] ]
]; ];
_recipe_ItemTinBar10oz = [
[ ["ItemTinBar10oz",1] ],
[ ["ItemTinBar",10] ]
];
_recipe_ItemTinBar = [
[ ["ItemTinBar",10] ],
[ ["ItemTinBar10oz",1] ]
];
_recipe_ItemAluminumBar10oz = [
[ ["ItemAluminumBar10oz",1] ],
[ ["ItemAluminumBar",10] ]
];
_recipe_ItemAluminumBar = [
[ ["ItemAluminumBar",10] ],
[ ["ItemAluminumBar10oz",1] ]
];

View File

@@ -90,13 +90,13 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
_in = 1; _in = 1;
_count = 0; _count = 0;
if(_stype == "CfgVehicles") then { if(_type == "CfgVehicles") then {
_count = count (position player nearObjects [_name,10]); _count = count (position player nearObjects [_name,10]);
}; };
if(_stype == "CfgMagazines") then { if(_type == "CfgMagazines") then {
_count = {_x == _name} count magazines player; _count = {_x == _name} count magazines player;
}; };
if(_stype == "CfgWeapons") then { if(_type == "CfgWeapons") then {
_count = {_x == _name} count weapons player; _count = {_x == _name} count weapons player;
}; };

View File

@@ -33,7 +33,7 @@ if (!_hastentitem) exitWith {cutText [format[(localize "str_player_31"),_text,"p
//diag_log ("Pitch Tent: " + str(_isok) ); //diag_log ("Pitch Tent: " + str(_isok) );
// Start Preview loop // Start Preview loop
_tmpvault = createVehicle ["VaultStorageLocked", _location, [], 0, "NONE"]; _tmpvault = createVehicle ["VaultStorageLocked", _location, [], 0, "CAN_COLLIDE"];
_tmpvault setdir _dir; _tmpvault setdir _dir;
_tmpvault attachTo [player,[_offset_x,_offset_y,_offset_z_attach]]; _tmpvault attachTo [player,[_offset_x,_offset_y,_offset_z_attach]];

View File

@@ -145,7 +145,7 @@ class Citizen1; // External class reference
class Mi17_DZ: Mi17_base class Mi17_DZ: Mi17_base
{ {
displayname = "Mi-8M"; displayname = "Mi-17";
displaynameshort = "Mi17_DZ"; displaynameshort = "Mi17_DZ";
scope = 2; scope = 2;
side = 2; side = 2;
@@ -173,7 +173,26 @@ class Citizen1; // External class reference
}; };
}; };
}; };
class Mi17_Civilian;
class Mi17_Civilian_DZ: Mi17_Civilian
{
displayname = "Mi-17 Civilian";
displaynameshort = "Mi17_Civilian_DZ";
scope = 2;
side = 2;
crew = "";
typicalCargo[] = {};
hiddenSelections[] = {};
class TransportMagazines{};
class TransportWeapons{};
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
transportMaxWeapons = 10;
transportMaxMagazines = 50;
transportmaxbackpacks = 10;
};
class UH1H_base: Helicopter class UH1H_base: Helicopter
{ {
class Turrets: Turrets class Turrets: Turrets

View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "0.95"; version = "0.96";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

View File

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 0.95 (1.7.5.1)"; text = "DayZ Epoch 0.96 (1.7.5.1)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
class CA_TitleMainMenu; class CA_TitleMainMenu;

View File

@@ -1433,7 +1433,7 @@ class CfgMagazines
count = 1; count = 1;
type = 256; type = 256;
displayName = "10oz Silver"; displayName = "10oz Silver";
model = "\dayz_equip\models\silver_bar.p3d"; model = "\dayz_equip\models\silver_bar_10oz.p3d";
picture = "\dayz_equip\textures\equip_bar_silver_CA.paa"; picture = "\dayz_equip\textures\equip_bar_silver_CA.paa";
descriptionShort = "10oz Silver Bar"; descriptionShort = "10oz Silver Bar";
class ItemActions class ItemActions
@@ -1472,7 +1472,7 @@ class CfgMagazines
count = 1; count = 1;
type = 256; type = 256;
displayName = "10oz Copper"; displayName = "10oz Copper";
model = "\dayz_equip\models\copper_bar.p3d"; model = "\dayz_equip\models\copper_bar_10oz.p3d";
picture = "\dayz_equip\textures\equip_bar_copper_CA.paa"; picture = "\dayz_equip\textures\equip_bar_copper_CA.paa";
descriptionShort = "10oz Copper Bar"; descriptionShort = "10oz Copper Bar";
class ItemActions class ItemActions
@@ -1505,15 +1505,7 @@ class CfgMagazines
model = "\dayz_equip\models\aluminum_bar.p3d"; model = "\dayz_equip\models\aluminum_bar.p3d";
picture = "\dayz_equip\textures\equip_bar_aluminum_CA.paa"; picture = "\dayz_equip\textures\equip_bar_aluminum_CA.paa";
descriptionShort = "Aluminum Bar"; descriptionShort = "Aluminum Bar";
class ItemActions
{
class Crafting
{
text = "Smelt 10oz bar";
script = "spawn player_craftItem;";
output[] = {"ItemAluminumBar10oz"};
};
};
}; };
class ItemAluminumBar10oz: CA_Magazine class ItemAluminumBar10oz: CA_Magazine
{ {
@@ -1543,15 +1535,7 @@ class CfgMagazines
model = "\dayz_equip\models\tin_bar.p3d"; model = "\dayz_equip\models\tin_bar.p3d";
picture = "\dayz_equip\textures\equip_bar_tin_CA.paa"; picture = "\dayz_equip\textures\equip_bar_tin_CA.paa";
descriptionShort = "Tin Bar"; descriptionShort = "Tin Bar";
class ItemActions
{
class Crafting
{
text = "Smelt 10oz bar";
script = "spawn player_craftItem;";
output[] = {"ItemTinBar10oz"};
};
};
}; };
class ItemTinBar10oz: CA_Magazine class ItemTinBar10oz: CA_Magazine
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,41 @@
////////////////////////////////////////////////////////////////////
//DeRap: Produced from mikero's Dos Tools Dll version 3.97
//http://dev-heaven.net/projects/list_files/mikero-pbodll
////////////////////////////////////////////////////////////////////
#define _ARMA_
//Class dayz_equip : textures\copperbar10oz.rvmat{
ambient[] = {1.0,1.0,1.0,1.0};
diffuse[] = {1.0,1.0,1.0,1.0};
forcedDiffuse[] = {0.0,0.0,0.0,1.0};
emmisive[] = {0.0,0.0,0.0,1.0};
specular[] = {0.99498,0.99498,0.99498,1.0};
specularPower = 100.799995;
PixelShaderID = "NormalMapSpecularMap";
VertexShaderID = "NormalMap";
class Stage1
{
texture = "dayz_equip\textures\copperbar10oz_NOHQ.paa";
uvSource = "tex";
class uvTransform
{
aside[] = {1.0,0.0,0.0};
up[] = {0.0,1.0,0.0};
dir[] = {0.0,0.0,0.0};
pos[] = {0,0,0};
};
};
class Stage2
{
texture = "dayz_equip\textures\copperbar10oz_SMDI.paa";
uvSource = "tex";
class uvTransform
{
aside[] = {1.0,0.0,0.0};
up[] = {0.0,1.0,0.0};
dir[] = {0.0,0.0,0.0};
pos[] = {0,0,0};
};
};
//};

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,41 @@
////////////////////////////////////////////////////////////////////
//DeRap: Produced from mikero's Dos Tools Dll version 3.97
//http://dev-heaven.net/projects/list_files/mikero-pbodll
////////////////////////////////////////////////////////////////////
#define _ARMA_
//Class dayz_equip : textures\silverbar10oz.rvmat{
ambient[] = {1.0,1.0,1.0,1.0};
diffuse[] = {1.0,1.0,1.0,1.0};
forcedDiffuse[] = {0.0,0.0,0.0,1.0};
emmisive[] = {0.0,0.0,0.0,1.0};
specular[] = {0.99498,0.99498,0.99498,1.0};
specularPower = 100.799995;
PixelShaderID = "NormalMapSpecularMap";
VertexShaderID = "NormalMap";
class Stage1
{
texture = "dayz_equip\textures\silverbar10oz_NOHQ.paa";
uvSource = "tex";
class uvTransform
{
aside[] = {1.0,0.0,0.0};
up[] = {0.0,1.0,0.0};
dir[] = {0.0,0.0,0.0};
pos[] = {0,0,0};
};
};
class Stage2
{
texture = "dayz_equip\textures\silverbar10oz_SMDI.paa";
uvSource = "tex";
class uvTransform
{
aside[] = {1.0,0.0,0.0};
up[] = {0.0,1.0,0.0};
dir[] = {0.0,0.0,0.0};
pos[] = {0,0,0};
};
};
//};

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.