Расширение карты спальник, новые объекты в библиотеке (#444)

Relicta-Team · Jul 19, 2024 · f90a36c · f90a36c
2 parents 9533500 + 811aa52
commit f90a36c
Show file tree

Hide file tree

Showing 13 changed files with 30,828 additions and 15,408 deletions.
diff --git a/Src/Editor/Bin/Maps/Dorm.cpp b/Src/Editor/Bin/Maps/Dorm.cpp
diff --git a/Src/client/ProxyItems/Exported.h b/Src/client/ProxyItems/Exported.h
@@ -61,4 +61,6 @@ model("\relicta_models2\tools\s_sledgehammer\s_sledgehammer.p3d") [[INV_BACKPACK
 model("\relicta_models2\tools\s_sledgehammer1\s_sledgehammer1.p3d") [[INV_HAND_L,[[0,0.018,0.026],[0,12,144]]],[INV_BELT,[[0.209,0.051,-0.224],[84,90,0]]],[INV_HAND_R,[[-0.057,-0.007,0.026],[0,12,63]]]]
 model("\relicta_models2\tools\s_pickaxe\s_pickaxe.p3d") [[INV_BACKPACK,[[-0.157,-0.107,-0.074],[132,84,-9]]],[INV_BACK,[[0,-0.165,-0.24],[0,75,3]]],[INV_HAND_L,[[-0.032,0.051,-0.041],[-30,3,111]]],[INV_BELT,[[0.192,0.101,-0.24],[0,87,87]]],[INV_HAND_R,[[-0.024,0,-0.032],[9,-12,63]]]]
 model("\relicta_models2\tools\s_fire_extinguisher\s_fire_extinguisher.p3d") [[INV_HAND_L,[[-0.107,0.068,-0.232],[141,-3,-15]]],[INV_HAND_R,[[0.109,0.068,-0.174],[195,-6,33]]]]
-model("\relicta_models2\debris\s_metal_debris\s_metal_debris.p3d") [[INV_HAND_L,[[-0.149,0,-0.215],[-21,42,-51]]],[INV_HAND_R,[[0.176,-0.082,-0.232],[0,9,48]]]]
+model("\relicta_models2\debris\s_metal_debris\s_metal_debris.p3d") [[INV_HAND_L,[[-0.149,0,-0.215],[-21,42,-51]]],[INV_HAND_R,[[0.176,-0.082,-0.232],[0,9,48]]]]
+model("\relicta_models2\debris\s_wooden_debris5\s_wooden_debris5.p3d") [[INV_HAND_L,[[-0.075,0.274,0.042],[-21,0,9]]],[INV_HAND_R,[[-0.074,0.259,0.051],proxIt_vec]]]
+model("\relicta_models2\debris\s_wooden_debris6\s_wooden_debris6.p3d") [[INV_HAND_L,[[-0.082,0.274,0.034],[-21,0,9]]],[INV_HAND_R,[[-0.066,0.184,0.026],proxIt_vec]]]
diff --git a/Src/host/GameObjects/Decors/BigWalls.sqf b/Src/host/GameObjects/Decors/BigWalls.sqf
@@ -33,6 +33,11 @@ class(BigStoneWall) extends(BigWall)
 	var(model,"ca\structures\castle\a_castle_wall1_20.p3d");
 	var(desc, "Огромная каменная стена" pcomma " покрытая мхом");
 endclass
+
+editor_attribute("EditorGenerated")
+class(BigStoneWall2) extends(BigStoneWall)
+	var(model,"ca\structures\castle\a_castle_wall1_corner_2.p3d");
+endclass
 editor_attribute("EditorGenerated")
 class(BigStoneWall1) extends(BigStoneWall)
 	var(model,"ca\structures\castle\a_castle_wall1_end_2.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/DirtPiles.sqf b/Src/host/GameObjects/Structures/Constructions/DirtPiles.sqf
@@ -18,6 +18,11 @@ class(SmallDirtPile) extends(Constructions)
 	var(dr,1);
 endclass
 
+editor_attribute("EditorGenerated")
+class(MediumStonePile) extends(SmallDirtPile)
+	var(model,"ca\structures\ruins\rubble_rocks_01.p3d");
+endclass
+
 editor_attribute("EditorGenerated")
 class(SmallDirtLight) extends(SmallDirtPile)
 	var(model,"ml_shabut\nvprops\gryazyuka3.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/Fences.sqf b/Src/host/GameObjects/Structures/Constructions/Fences.sqf
@@ -61,6 +61,11 @@ class(WoodenSmallFence3) extends(WoodenSmallFence)
 	var(model,"metro_ob\model\tunnels_props_wood_tupik_small_02.p3d");
 endclass
 
+editor_attribute("EditorGenerated")
+class(WoodenSmallFence4) extends(WoodenSmallFence3)
+	var(model,"a3\props_f_enoch\infrastructure\traffic\woodenwindbreak_01_f.p3d");
+endclass
+
 editor_attribute("EditorGenerated")
 class(WoodenSmallFence2) extends(WoodenSmallFence)
 	var(model,"ml\ml_object_new\model_24\ykritie.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/Garbages.sqf b/Src/host/GameObjects/Structures/Constructions/Garbages.sqf
@@ -18,6 +18,29 @@ class(SmallGarbage) extends(Constructions)
 	var(dr,1);
 endclass
 
+editor_attribute("EditorGenerated")
+class(ConcreteGarbage) extends(SmallGarbage)
+	var(model,"ca\structures\ruins\rubble_concrete_03.p3d");
+	var(material,"MatBeton");
+endclass
+
+editor_attribute("EditorGenerated")
+class(SheetMetalGarbage) extends(SmallGarbage)
+	var(model,"ca\structures\ruins\rubble_metal_plates_04.p3d");
+	var(material,"MatMetal");
+endclass
+
+editor_attribute("EditorGenerated")
+class(SheetMetalGarbage1) extends(SheetMetalGarbage)
+	var(model,"ca\structures\ruins\rubble_metal_plates_03.p3d");
+endclass
+
+editor_attribute("EditorGenerated")
+class(WoodenPlanksGarbage) extends(SmallGarbage)
+	var(model,"ca\structures\ruins\rubble_wood_02.p3d");
+	var(material,"MatWood");
+endclass
+
 editor_attribute("EditorGenerated")
 class(MediumBarrelGarbage) extends(SmallGarbage)
 	var(model,"ml_exodusnew\gryazooka_bochki.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/MetalConstruction.sqf b/Src/host/GameObjects/Structures/Constructions/MetalConstruction.sqf
@@ -18,6 +18,24 @@ class(MetalConstruction) extends(Constructions)
 	var(dr,3);
 endclass
 
+editor_attribute("EditorGenerated")
+class(SteamBarrel) extends(MetalConstruction)
+	var(model,"ml_shabut\exodus\baloonexo.p3d");
+	var(name,"Паровик");
+endclass
+
+editor_attribute("EditorGenerated")
+class(ElectricalEngineDevice) extends(MetalConstruction)
+	var(model,"ml\ml_germogate\l_02_alex_vorota_pult.p3d");
+	var(name,"Оборудование");
+endclass
+
+editor_attribute("EditorGenerated")
+class(ElectricalTransformer) extends(ElectricalEngineDevice)
+	var(model,"a3\structures_f_exp\industrial\dieselpowerplant_01\dpp_01_transformer_f.p3d");
+	var(name,"Трансформатор");
+endclass
+
 editor_attribute("EditorGenerated")
 class(SmallRadiator) extends(MetalConstruction)
 	var(model,"ml\ml_object_new\model_24\batareya.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/Pipes.sqf b/Src/host/GameObjects/Structures/Constructions/Pipes.sqf
@@ -53,6 +53,11 @@ class(SmallDestroyedCornerPipe) extends(BasicPipe)
 	var(name,"Разрушенная труба");
 endclass
 
+editor_attribute("EditorGenerated")
+class(SmallDestoyedCornerPipe1) extends(SmallDestroyedCornerPipe)
+	var(model,"a3\structures_f\ind\pipes\indpipe1_90degr_f.p3d");
+endclass
+
 editor_attribute("EditorGenerated")
 class(MediumRuinedPipe) extends(BasicPipe)
 	var(model,"ca\buildings2\ind_pipeline\indpipe1\indpipe1_valve.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/Poles.sqf b/Src/host/GameObjects/Structures/Constructions/Poles.sqf
@@ -26,6 +26,11 @@ class(WoodPole) extends(SmallPole)
 	var(material,"MatWood");
 endclass
 
+editor_attribute("EditorGenerated")
+class(WoodPole1) extends(WoodPole)
+	var(model,"a3\structures_f_exp\walls\polewalls\polewall_01_pole_f.p3d");
+endclass
+
 editor_attribute("EditorGenerated")
 class(WoodCross) extends(SmallPole)
 	var(name,"Крест");
@@ -70,10 +75,17 @@ class(SmallGrayPillar) extends(SmallPole)
 	var(model,"a3\structures_f_exp\walls\wired\wiredfence_01_pole_45_f.p3d");
 	var(name,"Маленький столб");
 endclass
+
 editor_attribute("EditorGenerated")
 class(ConcreteLongPole) extends(SmallPole)
 	var(model,"csa_constr\csa_obj\stolb_6m.p3d");
 endclass
+
+editor_attribute("EditorGenerated")
+class(ConcretePole) extends(ConcreteLongPole)
+	var(model,"ca\structures\wall\wall_indcnc_pole.p3d");
+endclass
+
 editor_attribute("EditorGenerated")
 class(MediumLightConcretePole) extends(ConcreteLongPole)
 	var(model,"a3\structures_f_argo\walls\city\wallcity_01_pillar_grey_f.p3d");

diff --git a/Src/host/GameObjects/Structures/Constructions/StepsLadders.sqf b/Src/host/GameObjects/Structures/Constructions/StepsLadders.sqf
@@ -18,6 +18,12 @@ class(StepsLadder) extends(Constructions)
 	var(dr,3);
 endclass
 
+editor_attribute("EditorGenerated")
+class(LongWoodenLadder) extends(StepsLadder)
+	var(model,"ca\structures\nav_boathouse\nav_boathouse_pierl.p3d");
+	var(material,"MatWood");
+endclass
+
 editor_attribute("EditorGenerated")
 class(SmallSteelRustyStairs) extends(StepsLadder)
 	var(model,"ml\ml_object_new\ml_object_2\l01_props\stair01.p3d");

diff --git a/Src/host/GameObjects/Structures/Furniture/Shelfs.sqf b/Src/host/GameObjects/Structures/Furniture/Shelfs.sqf
@@ -74,6 +74,13 @@ class(Sink) extends(ShelfBase)
 	};
 endclass
 
+editor_attribute("EditorGenerated")
+class(Shower) extends(Sink)
+	var(model,"ml\ml_object_new\model_05\dysh.p3d");
+	var(name,"Мытьё");
+	var(desc,"Так сделано" pcomma " что сверху течёт струя прямо на голову.");
+endclass
+
 
 class(Umivalnik) extends(Sink)
 	var(model,"metro_ob\model\umivalnik1.p3d");

diff --git a/Src/host/GameObjects/Structures/Interiors/SmallDecorations.sqf b/Src/host/GameObjects/Structures/Interiors/SmallDecorations.sqf
@@ -123,6 +123,11 @@ class(RedCarpet) extends(Carpet)
 	var(model,"ml_shabut\carpet\carpet.p3d");
 endclass
 
+editor_attribute("EditorGenerated")
+class(RedCarpet1) extends(RedCarpet)
+	var(model,"ca\structures_e\misc\misc_interier\carpet_2_ep1.p3d");
+endclass
+
 editor_attribute("EditorGenerated")
 class(OrangeCapet) extends(Carpet)
 	var(model,"ml_shabut\kovrik\kovernew.p3d");