W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Land_houseV_2T2 interior

Browse Source 
Vanilla commits:

4607ceaff0

b1eba5c54b

7711839323

8f74d2bb24

Also applied corrections mentioned in #1996
This commit is contained in:
ebayShopper
2017-11-26 18:29:13 -05:00
parent c2dd9016cb
commit 7fd8c750d2
7 changed files with 194 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQF/dayz_code/Configs/CfgLoot/Buildings/Residential.hpp
View File

@@ -218,15 +218,8 @@ class Land_HouseV_1I3 : Residential
class Land_houseV_2T2 : Residential class Land_houseV_2T2 : Residential
{ {
zedPos[] = {{-4.24951,0.988281,-4.0574}}; zedPos[] = {{-4.22,0.21,-4.06},{-2.01,2.4,-4.04},{7.07,2.15,-1.28},{0.06,-0.81,-4.04},{4.43,-4.06,-4.04},{-0.85,-4.45,-4.04},{7.24,-2.59,-4.04},{6.99,1.27,-4.04},{7.25,-0.97,-1.28},{0.49,-2.85,-1.28},{3.4,0.63,-1.28},{-2.03,2.09,-1.28},{-3.05,-1.7,-1.28}};
lootPos[] = { lootPos[] = {{-4.22,0.21,-4.06},{-2.01,2.4,-4.04},{7.07,2.15,-1.28},{0.06,-0.81,-4.04},{4.43,-4.06,-4.04},{-0.85,-4.45,-4.04},{7.24,-2.59,-4.04},{6.99,1.27,-4.04},{7.25,-0.97,-1.28},{0.49,-2.85,-1.28},{3.4,0.63,-1.28},{-2.03,2.09,-1.28},{-3.05,-1.7,-1.28},{3.94,-5.13,-1.32},{0.48,-5.15,-1.32}};
//{-4.24951,0.988281,-4.0574},
{-3.49072,1.01782,-4.03519}
};
lootPosSmall[] = {
{2.8606,4.33081,-4.65974},
{-0.222778,4.34985,-4.65713}
};
}; };
class Land_HouseBlock_A1 : Residential class Land_HouseBlock_A1 : Residential

11
SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp
View File

@@ -479,7 +479,6 @@ class Category_485 {
buy[] = {8,"ItemGoldBar"}; buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"};
}; };
//New L85 models by Streatman
class L85A2_DZ { class L85A2_DZ {
type = "trade_weapons"; type = "trade_weapons";
buy[] = {4,"ItemGoldBar"}; buy[] = {4,"ItemGoldBar"};
@@ -600,16 +599,6 @@ class Category_485 {
buy[] = {-1,"ItemGoldBar"}; //Sell only buy[] = {-1,"ItemGoldBar"}; //Sell only
sell[] = {12,"ItemGoldBar"}; sell[] = {12,"ItemGoldBar"};
}; };
class BAF_L85A2_RIS_SUSAT { //Not sure if this should be kept in 1.0.6.2.
type = "trade_weapons";
buy[] = {6,"ItemGoldBar"};
sell[] = {3,"ItemGoldBar"};
};
class BAF_L85A2_RIS_ACOG { //Streatman's model L85A2_ACOG_DZ should replace this.
type = "trade_weapons";
buy[] = {1,"ItemGoldBar10oz"};
sell[] = {5,"ItemGoldBar"};
};
class SA58_DZ { class SA58_DZ {
type = "trade_weapons"; type = "trade_weapons";
buy[] = {2,"ItemGoldBar"}; buy[] = {2,"ItemGoldBar"};

172
SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_houseV_2T2.hpp Normal file
View File

@@ -0,0 +1,172 @@
class Land_houseV_2T2 : Land_HouseV_1I2
{
model="z\addons\dayz_buildings\a2_HouseV_2t2\d_HouseV_2t2.p3d";
class AnimationSources
{
class dvere_1_source
{
source="user";
initPhase=0;
animPeriod=1;
};
class dvere_2_source : dvere_1_source {};
class dvere_3_source : dvere_1_source {};
class dvere_4_source : dvere_1_source {};
class dvere_5_source : dvere_1_source {};
class dvere_6_source : dvere_1_source {};
class dvere_7_source : dvere_1_source {};
class dvere_8_source : dvere_1_source {};
class dvere_9_source : dvere_1_source {};
class dvere_10_source: dvere_1_source {};
};
class UserActions
{
class OpenDoors1
{
displayName=$STR_DN_OUT_o_DOOR;
position=akce_dvere1;
radius=1.5;
onlyForPlayer=false;
condition="this animationPhase ""dvere1"" < 0.5";
statement="this animate [""dvere1"", 1]";
};
class CloseDoors1
{
displayName=$STR_DN_OUT_C_DOOR;
position=akce_dvere1;
radius=1.5;
onlyForPlayer=false;
condition="this animationPhase ""dvere1"" >= 0.5";
statement="this animate [""dvere1"", 0]";
};
class OpenDoors2 : OpenDoors1
{
position=akce_dvere2;
condition="this animationPhase ""dvere2"" < 0.5";
statement="this animate [""dvere2"", 1]";
};
class CloseDoors2 : CloseDoors1
{
position=akce_dvere2;
condition="this animationPhase ""dvere2"" >= 0.5";
statement="this animate [""dvere2"", 0]";
};
class OpenDoors3 : OpenDoors1
{
position=akce_dvere3;
condition="this animationPhase ""dvere3"" < 0.5";
statement="this animate [""dvere3"", 1]";
};
class CloseDoors3 : CloseDoors1
{
position=akce_dvere3;
condition="this animationPhase ""dvere3"" >= 0.5";
statement="this animate [""dvere3"", 0]";
};
class OpenDoors4 : OpenDoors1
{
position=akce_dvere4;
condition="this animationPhase ""dvere4"" < 0.5";
statement="this animate [""dvere4"", 1]";
};
class CloseDoors4 : CloseDoors1
{
position=akce_dvere4;
condition="this animationPhase ""dvere4"" >= 0.5";
statement="this animate [""dvere4"", 0]";
};
class OpenDoors5 : OpenDoors1
{
position=akce_dvere5;
condition="this animationPhase ""dvere5"" < 0.5";
statement="this animate [""dvere5"", 1]";
};
class CloseDoors5 : CloseDoors1
{
position=akce_dvere5;
condition="this animationPhase ""dvere5"" >= 0.5";
statement="this animate [""dvere5"", 0]";
};
class OpenDoors6 : OpenDoors1
{
position=akce_dvere6;
condition="this animationPhase ""dvere6"" < 0.5";
statement="this animate [""dvere6"", 1]";
};
class CloseDoors6 : CloseDoors1
{
position=akce_dvere6;
condition="this animationPhase ""dvere6"" >= 0.5";
statement="this animate [""dvere6"", 0]";
};
class OpenDoors7 : OpenDoors1
{
position=akce_dvere7;
condition="this animationPhase ""dvere7"" < 0.5";
statement="this animate [""dvere7"", 1]";
};
class CloseDoors7 : CloseDoors1
{
position=akce_dvere7;
condition="this animationPhase ""dvere7"" >= 0.5";
statement="this animate [""dvere7"", 0]";
};
class OpenDoors8 : OpenDoors1
{
position=akce_dvere8;
condition="this animationPhase ""dvere8"" < 0.5";
statement="this animate [""dvere8"", 1]";
};
class CloseDoors8 : CloseDoors1
{
position=akce_dvere8;
condition="this animationPhase ""dvere8"" >= 0.5";
statement="this animate [""dvere8"", 0]";
};
class OpenDoors9 : OpenDoors1
{
position=akce_dvere910;
condition="this animationPhase ""dvere9"" < 0.5 or this animationPhase ""dvere10"" < 0.5";
statement="this animate [""dvere9"", 1];this animate [""dvere10"", 1]";
};
class CloseDoors9 : CloseDoors1
{
position=akce_dvere910;
condition="this animationPhase ""dvere9"" >= 0.5 or this animationPhase ""dvere10"" >= 0.5";
statement="this animate [""dvere9"", 0];this animate [""dvere10"", 0]";
};
/* class OpenDoors10 : OpenDoors1
{
position=akce_dvere910;
condition="this animationPhase ""dvere10"" < 0.5";
statement="this animate [""dvere10"", 1]";
};
class CloseDoors10 : CloseDoors1
{
position=akce_dvere910;
condition="this animationPhase ""dvere10"" >= 0.5";
statement="this animate [""dvere10"", 0]";
};
*/
};
actionBegin1 = "OpenDoors1";
actionEnd1 = "OpenDoors1";
actionBegin2 = "OpenDoors2";
actionEnd2 = "OpenDoors2";
actionBegin3 = "OpenDoors3";
actionEnd3 = "OpenDoors3";
actionBegin4 = "OpenDoors4";
actionEnd4 = "OpenDoors4";
actionBegin5 = "OpenDoors5";
actionEnd5 = "OpenDoors5";
actionBegin6 = "OpenDoors6";
actionEnd6 = "OpenDoors6";
actionBegin7 = "OpenDoors7";
actionEnd7 = "OpenDoors7";
actionBegin8 = "OpenDoors8";
actionEnd8 = "OpenDoors8";
actionBegin9 = "OpenDoors9";
actionEnd9 = "OpenDoors9";
// actionBegin10= "OpenDoors10";
// actionEnd10 = "OpenDoors10";
};

2
SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
View File

@@ -358,6 +358,7 @@ class CfgVehicles
class DestructionEffects; class DestructionEffects;
}; };
class House_EP1; class House_EP1;
class Land_HouseV_1I2;
class SpawnableWreck : House {}; class SpawnableWreck : House {};
class Strategic; class Strategic;
class NonStrategic; class NonStrategic;
@@ -496,6 +497,7 @@ class CfgVehicles
#include "Buildings\Land_VASICore.hpp" #include "Buildings\Land_VASICore.hpp"
#include "Buildings\Land_Vysilac_FM.hpp" #include "Buildings\Land_Vysilac_FM.hpp"
#include "Buildings\WaterSources.hpp" #include "Buildings\WaterSources.hpp"
#include "Buildings\Land_houseV_2T2.hpp"
//Duplicates of Epoch items in DZE\Prop_Defs.hpp //Duplicates of Epoch items in DZE\Prop_Defs.hpp
//#include "CamoNetting.hpp" //#include "CamoNetting.hpp"

4
SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp vendored
View File

@@ -199,10 +199,6 @@ class L85A2_CCO_SD_MFL_DZ
{ {
weight = 5.6; weight = 5.6;
}; };
class L85_Holo_DZ
{
weight = 5.2;
};
class L85A2_Holo_FL_DZ class L85A2_Holo_FL_DZ
{ {
weight = 5.4; weight = 5.4;

8
SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp vendored
View File

@@ -36,6 +36,14 @@ class BAF_LRR_scoped_W
{ {
weight = 5.6; weight = 5.6;
}; };
class L115A3_DZ
{
weight = 5.6;
};
class L115A3_2_DZ
{
weight = 5.6;
};
class Anzio_20 class Anzio_20
{ {
weight = 14; weight = 14;

10
Server Files/SQL/1.0.6.2_Updates.sql
View File

@@ -13,6 +13,16 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, '"L85_Holo_DZ"', '"L85A2_
UPDATE character_data SET Inventory = REPLACE(Inventory, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"L85_Holo_DZ"') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"L85_Holo_DZ"') > 0;
UPDATE object_data SET Inventory = REPLACE(Inventory, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"L85_Holo_DZ"') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"L85_Holo_DZ"') > 0;
UPDATE `Traders_DATA` SET `item` = '["L85A2_ACOG_DZ",3]' WHERE `item` = '["BAF_L85A2_RIS_ACOG",3]';
UPDATE character_data SET Backpack = REPLACE(Backpack, '"BAF_L85A2_RIS_ACOG"', '"L85A2_ACOG_DZ"') WHERE INSTR(Backpack, '"BAF_L85A2_RIS_ACOG"') > 0;
UPDATE character_data SET Inventory = REPLACE(Inventory, '"BAF_L85A2_RIS_ACOG"', '"L85A2_ACOG_DZ"') WHERE INSTR(Inventory, '"BAF_L85A2_RIS_ACOG"') > 0;
UPDATE object_data SET Inventory = REPLACE(Inventory, '"BAF_L85A2_RIS_ACOG"', '"L85A2_ACOG_DZ"') WHERE INSTR(Inventory, '"BAF_L85A2_RIS_ACOG"') > 0;
UPDATE `Traders_DATA` SET `item` = '["L85A2_DZ",3]' WHERE `item` = '["BAF_L85A2_RIS_SUSAT",3]';
UPDATE character_data SET Backpack = REPLACE(Backpack, '"BAF_L85A2_RIS_SUSAT"', '"L85A2_DZ"') WHERE INSTR(Backpack, '"BAF_L85A2_RIS_SUSAT"') > 0;
UPDATE character_data SET Inventory = REPLACE(Inventory, '"BAF_L85A2_RIS_SUSAT"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"BAF_L85A2_RIS_SUSAT"') > 0;
UPDATE object_data SET Inventory = REPLACE(Inventory, '"BAF_L85A2_RIS_SUSAT"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"BAF_L85A2_RIS_SUSAT"') > 0;
UPDATE `Traders_DATA` SET `item` = '["SVD_PSO1_DZ",3]' WHERE `item` = '["SVD_DZ",3]'; UPDATE `Traders_DATA` SET `item` = '["SVD_PSO1_DZ",3]' WHERE `item` = '["SVD_DZ",3]';
UPDATE character_data SET Backpack = REPLACE(Backpack, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Backpack, '"SVD_DZ"') > 0; UPDATE character_data SET Backpack = REPLACE(Backpack, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Backpack, '"SVD_DZ"') > 0;
UPDATE character_data SET Inventory = REPLACE(Inventory, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Inventory, '"SVD_DZ"') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Inventory, '"SVD_DZ"') > 0;