Merge pull request #9 from EpochModTeam/master

update fork
This commit is contained in:
W0LF
2021-01-27 15:34:11 +03:00
committed by GitHub
8 changed files with 109 additions and 16 deletions

View File

@@ -192,10 +192,10 @@ class SnapBuilding {
class WoodFloorQuarter_Preview_DZ: FloorsWallsStairs {
points[] = {
{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
{0,-1.2,0.130,$STR_EPOCH_ACTION_SNAP_BACK},
{0,1.11,0.130,$STR_EPOCH_ACTION_SNAP_FRONT},
{-1.2,0,0.130,$STR_EPOCH_ACTION_SNAP_LEFT},
{1.3,0,0.130,$STR_EPOCH_ACTION_SNAP_RIGHT}
{0,-1.2,0.107,$STR_EPOCH_ACTION_SNAP_BACK},
{0,1.11,0.107,$STR_EPOCH_ACTION_SNAP_FRONT},
{-1.2,0,0.107,$STR_EPOCH_ACTION_SNAP_LEFT},
{1.3,0,0.107,$STR_EPOCH_ACTION_SNAP_RIGHT}
};
};
class WoodFloorQuarter_DZ: WoodFloorQuarter_Preview_DZ {};
@@ -203,10 +203,10 @@ class SnapBuilding {
class WoodFloorHalf_Preview_DZ: FloorsWallsStairs {
points[] = {
{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
{0,-2.33,0.130,$STR_EPOCH_ACTION_SNAP_BACK},
{0,2.33,0.130,$STR_EPOCH_ACTION_SNAP_FRONT},
{-1.18,0,0.130,$STR_EPOCH_ACTION_SNAP_LEFT},
{1.32,0,0.130,$STR_EPOCH_ACTION_SNAP_RIGHT}
{0,-2.33,0.107,$STR_EPOCH_ACTION_SNAP_BACK},
{0,2.33,0.107,$STR_EPOCH_ACTION_SNAP_FRONT},
{-1.18,0,0.107,$STR_EPOCH_ACTION_SNAP_LEFT},
{1.32,0,0.107,$STR_EPOCH_ACTION_SNAP_RIGHT}
};
};
class WoodFloorHalf_DZ: WoodFloorHalf_Preview_DZ {};
@@ -226,10 +226,10 @@ class SnapBuilding {
class WoodTriangleFloor_DZ: FloorsWallsStairs {
points[] = {
{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
{0,-1.3,0.130,$STR_EPOCH_ACTION_SNAP_BACK},
{0,1.3,0.130,$STR_EPOCH_ACTION_SNAP_FRONT},
{-1.258,0.027,0.130,$STR_EPOCH_ACTION_SNAP_LEFT},
{1.258,0.027,0.130,$STR_EPOCH_ACTION_SNAP_RIGHT}
{0,-1.3,0.092,$STR_EPOCH_ACTION_SNAP_BACK},
{0,1.3,0.092,$STR_EPOCH_ACTION_SNAP_FRONT},
{-1.258,0.027,0.092,$STR_EPOCH_ACTION_SNAP_LEFT},
{1.258,0.027,0.092,$STR_EPOCH_ACTION_SNAP_RIGHT}
};
radius = 10;
};

View File

@@ -2,12 +2,14 @@ class AKS_Gold_DZ: AKM_DZ {
displayName = $STR_DZ_WPN_AKS_GOLD_NAME;
model = "\RH_aks\RH_aks47g.p3d";
picture = "\RH_aks\inv\aks47g.paa";
class Attachments {};
};
class AKS_Silver_DZ: AKM_DZ {
displayName = $STR_DZ_WPN_AKS_SILVER_NAME;
model = "\RH_aks\RH_aks47s.p3d";
picture = "\RH_aks\inv\aks47s.paa";
class Attachments {};
};
class AK_47_S;

View File

@@ -517,6 +517,8 @@ class HK417_Sniper_DZ: HK417_DZ
discreteDistanceInitIndex = 2;
};
};
class Attachments {};
};
class HK417_Sniper_SD_DZ: HK417_SD_DZ
@@ -549,6 +551,7 @@ class HK417_Sniper_SD_DZ: HK417_SD_DZ
};
};
class ItemActions {};
class Attachments {};
};
#undef HK417_M203

View File

@@ -183,6 +183,7 @@ class M1A_SC16_BL_Sniper_DZ: M1A_SC16_BL_DZ
distanceZoomMin = 329;
distanceZoomMax = 329;
optics = 1;
class Attachments {};
};
class M1A_SC16_TAN_DZ: M14_EP1
@@ -334,6 +335,7 @@ class M1A_SC16_TAN_Sniper_DZ: M1A_SC16_TAN_DZ
distanceZoomMin = 329;
distanceZoomMax = 329;
optics = 1;
class Attachments {};
};
class M1A_SC2_BL_DZ: M14_EP1
@@ -483,6 +485,7 @@ class M1A_SC2_BL_Sniper_DZ: M1A_SC2_BL_DZ
distanceZoomMin = 329;
distanceZoomMax = 329;
optics = 1;
class Attachments {};
};
#undef M1A_ACOG

View File

@@ -92,6 +92,8 @@ class MK43_Holo_DZ: Mk43_DZ
irLaserPos = "laser pos";
irLaserEnd = "laser dir";
class Attachments {};
class ItemActions
{
class RemoveHolo
@@ -149,6 +151,8 @@ class MK43_ACOG_DZ: Mk43_DZ
};
};
class Attachments {};
class ItemActions
{
class RemoveACOG

View File

@@ -62,6 +62,7 @@ class SCAR_H_AK_CCO_DZ: SCAR_H_AK_DZ
irDistance = 150;
dexterity = "3.75/(3.6+ 0.2+ (0.4)*1.2+ 0.1) + 0.5 + 0.1*(1)";
weaponInfoType = "RscWeaponEmpty";
class Attachments {};
class ItemActions
{

View File

@@ -121,6 +121,14 @@ class SteyrAug_A3_ACOG_Green_DZ: SteyrAug_A3_Green_DZ {
{
Attachment_M203 = "SteyrAug_A3_ACOG_GL_Green_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SteyrAug_A3_Green_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_ACOG_Black_DZ: SteyrAug_A3_ACOG_Green_DZ {
@@ -131,6 +139,14 @@ class SteyrAug_A3_ACOG_Black_DZ: SteyrAug_A3_ACOG_Green_DZ {
{
Attachment_M203 = "SteyrAug_A3_ACOG_GL_Black_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SteyrAug_A3_Black_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_ACOG_Blue_DZ: SteyrAug_A3_ACOG_Green_DZ {
model = "\MIDF_Weapons\Aug_a3\Aug_a3_acog_blue.p3d";
@@ -140,6 +156,14 @@ class SteyrAug_A3_ACOG_Blue_DZ: SteyrAug_A3_ACOG_Green_DZ {
{
Attachment_M203 = "SteyrAug_A3_ACOG_GL_Blue_DZ";
};
class ItemActions
{
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SteyrAug_A3_Blue_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_Holo_Green_DZ: SteyrAug_A3_base {
@@ -152,6 +176,14 @@ class SteyrAug_A3_Holo_Green_DZ: SteyrAug_A3_base {
{
Attachment_M203 = "SteyrAug_A3_Holo_GL_Green_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SteyrAug_A3_Green_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_Holo_Black_DZ: SteyrAug_A3_Holo_Green_DZ {
model = "\MIDF_Weapons\Aug_a3\Aug_a3_eotech_black.p3d";
@@ -161,6 +193,14 @@ class SteyrAug_A3_Holo_Black_DZ: SteyrAug_A3_Holo_Green_DZ {
{
Attachment_M203 = "SteyrAug_A3_Holo_GL_Black_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SteyrAug_A3_Black_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_Holo_Blue_DZ: SteyrAug_A3_Holo_Green_DZ {
model = "\MIDF_Weapons\Aug_a3\Aug_a3_eotech_blue.p3d";
@@ -170,6 +210,14 @@ class SteyrAug_A3_Holo_Blue_DZ: SteyrAug_A3_Holo_Green_DZ {
{
Attachment_M203 = "SteyrAug_A3_Holo_GL_Blue_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SteyrAug_A3_Blue_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_GL_Green_DZ: SteyrAug_A3_Green_DZ {
@@ -234,6 +282,11 @@ class SteyrAug_A3_ACOG_GL_Green_DZ: SteyrAug_A3_ACOG_Green_DZ {
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'SteyrAug_A3_ACOG_Green_DZ'] call player_removeAttachment";
};
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SteyrAug_A3_GL_Green_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_ACOG_GL_Black_DZ: SteyrAug_A3_ACOG_GL_Green_DZ {
@@ -247,6 +300,11 @@ class SteyrAug_A3_ACOG_GL_Black_DZ: SteyrAug_A3_ACOG_GL_Green_DZ {
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'SteyrAug_A3_ACOG_Black_DZ'] call player_removeAttachment";
};
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SteyrAug_A3_GL_Black_DZ'] call player_removeAttachment";
};
};
};
class SteyrAug_A3_ACOG_GL_Blue_DZ: SteyrAug_A3_ACOG_GL_Green_DZ {
@@ -260,6 +318,11 @@ class SteyrAug_A3_ACOG_GL_Blue_DZ: SteyrAug_A3_ACOG_GL_Green_DZ {
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'SteyrAug_A3_ACOG_Blue_DZ'] call player_removeAttachment";
};
class RemoveACOG
{
text = $STR_DZ_ATT_ACOG_RMVE;
script = "; ['Attachment_ACOG',_id,'SteyrAug_A3_GL_Blue_DZ'] call player_removeAttachment";
};
};
};
@@ -270,6 +333,7 @@ class SteyrAug_A3_Holo_GL_Green_DZ: SteyrAug_A3_base {
model = "\MIDF_Weapons\Aug_a3\aug_a3_eotech_gl.p3d";
muzzles[] = {this, M203Muzzle};
handAnim[] = {"OFP2_ManSkeleton","\MIDF_Weapons\data\anim\A3_GL.rtm"};
class Attachments {};
class ItemActions
{
@@ -278,9 +342,14 @@ class SteyrAug_A3_Holo_GL_Green_DZ: SteyrAug_A3_base {
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'SteyrAug_A3_Holo_Green_DZ'] call player_removeAttachment";
};
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SteyrAug_A3_GL_Green_DZ'] call player_removeAttachment";
};
};
class SteyrAug_A3_Holo_GL_Black_DZ: SteyrAug_A3_Holo_Green_DZ {
};
class SteyrAug_A3_Holo_GL_Black_DZ: SteyrAug_A3_Holo_GL_Green_DZ {
picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_eotech_gl_black.paa";
model = "\MIDF_Weapons\Aug_a3\aug_a3_eotech_gl_black.p3d";
@@ -291,9 +360,14 @@ class SteyrAug_A3_Holo_GL_Black_DZ: SteyrAug_A3_Holo_Green_DZ {
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'SteyrAug_A3_Holo_Black_DZ'] call player_removeAttachment";
};
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SteyrAug_A3_GL_Black_DZ'] call player_removeAttachment";
};
};
class SteyrAug_A3_Holo_GL_Blue_DZ: SteyrAug_A3_Holo_Green_DZ {
};
class SteyrAug_A3_Holo_GL_Blue_DZ: SteyrAug_A3_Holo_GL_Green_DZ {
picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_eotech_gl_blue.paa";
model = "\MIDF_Weapons\Aug_a3\aug_a3_eotech_gl_blue.p3d";
@@ -304,6 +378,11 @@ class SteyrAug_A3_Holo_GL_Blue_DZ: SteyrAug_A3_Holo_Green_DZ {
text = $STR_DZ_ATT_M203_RMVE;
script = "; ['Attachment_M203',_id,'SteyrAug_A3_Holo_Blue_DZ'] call player_removeAttachment";
};
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'SteyrAug_A3_GL_Blue_DZ'] call player_removeAttachment";
};
};
};

View File

@@ -88,6 +88,7 @@ class VAL_PSO1_DZ: VAL_DZ
opticsZoomMax = 0.071945;
distanceZoomMin = 110;
distanceZoomMax = 110;
class Attachments {};
class ItemActions
{