Browse Source

Fixes+C Type + Player snowflake backpack + Odin snowflake NVG

Erliens 4 năm trước cách đây
mục cha
commit
44638d03ab

+ 38 - 1
addons - Copy/RD501_Helmets/config.cpp

@@ -415,7 +415,44 @@ class CfgWeapons
 				};
 			};
 		};
-	};			
+	};	
+	class macro_new_helmet(infantry,jlts_odin) : H_HelmetB
+	{
+		scope = 2;
+		scopeArsenal = 2;
+		author = "RD501";
+		weaponPoolAvailable = 1;       
+		subItems[] = {"G_B_Diving","ItemcTabHCam"};
+		ace_hearing_protection = 0.85; 		
+		ace_hearing_lowerVolume = 0;   
+		RD501_isNV = 1;
+		displayName = "[501st] INF HELM ('Odin')";
+		picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
+		model="\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
+		hiddenSelections[] = {"Camo1"};
+		hiddenSelectionsTextures[] = {"\RD501_Helmets\_textures\Infantry\Odin.paa"};
+		hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\clone_helmet_p2.rvmat"};
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformmodel = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
+			modelSides[] = {6};
+			hiddenSelections[] = {"Camo1"};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+	};		
 	class macro_new_helmet(airborne,jlts_trooper): H_HelmetB
 	{
 		author = "RD501";

+ 1 - 2
addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -32,7 +32,6 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_Inf_Helm_JLTS(Hosed,Hosed,Hosed.paa)
 	NEW_501_Inf_Helm_JLTS(Kestrel,Kestrel,Kestrel.paa)
-	NEW_501_Inf_Helm_JLTS(Odin,Odin,Odin.paa)
 	NEW_501_Inf_Helm_JLTS(Player,Player,Player.paa)
 	NEW_501_Inf_Helm_JLTS(Roster,Roster,Roster.paa)
 	NEW_501_Inf_Helm_JLTS(Scanlon,Scanlon,Scanlon.paa)
@@ -151,7 +150,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Garviel,Garviel,Garviel.paa)
 	NEW_501_Inf_Helm_JLTS(Genesis,Genesis,Genesis.paa)
 	NEW_501_Inf_Helm_JLTS(Cherokee,Cherokee,Cherokee.paa)
-	NEW_501_Inf_Helm_JLTS(Rayne,Rayne,Rayne.paa)
+	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_Inf_Helm_JLTS(Anta,Anta,Anta.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_ARC_Helm_JLTS(Jink,Jink,Jink.paa)

+ 13 - 0
addons - Copy/RD501_Units/_backpacks/legacy_backpacks.hpp

@@ -12,6 +12,12 @@ class RD501_JLTS_Clone_backpack_s: JLTS_Clone_backpack_s
 	maximumload=700;
 	Displayname="[501st] Combat Pack (Straps)"
 };
+class RD501_JLTS_Clone_backpack_invisible: JLTS_Clone_backpack_s
+{
+	maximumload=700;
+	Displayname="[501st] Combat Invisible Backpack"
+	model="RD501_Units\nothing.p3d";
+};
 class RD501_JLTS_Clone_backpack_medic: JLTS_Clone_backpack_medic
 {
 	maximumload=700;
@@ -63,6 +69,13 @@ class RD501_JLTS_Clone_LR_attachment: JLTS_Clone_LR_attachment
 	tf_range=35000;
 	Displayname="[501st] Radio Pack (Attachment)"
 };
+class RD501_JLTS_Clone__invis_LR_attachment: JLTS_Clone_LR_attachment
+{
+	maximumload=700;
+	tf_range=35000;
+	Displayname="[501st] Command Invisible Pack"
+	model="RD501_Units\nothing.p3d";
+};
 class RD501_JLTS_Clone_ARC_backpack: JLTS_Clone_ARC_backpack
 {
 	maximumload=700;

+ 12 - 0
addons - Copy/RD501_Units/blufor/clones/_headwear.hpp

@@ -87,6 +87,18 @@ class rd501_JLTS_CloneNVGRange: JLTS_CloneNVGRange
         "TI"
     };
 };
+class rd501_JLTS_ShockTrooperNVGRange: JLTS_CloneNVGRange
+{
+    displayname = "[501st] Shock Trooper Viewfinder Antenna (Toggle)";
+    modelOptics="";
+    hiddenSelectionsTextures[] = {"RD501_Units\textures\Republic\clones\clone_rangefinder.paa"};
+	RD501_isNV=1;
+    visionMode[]=
+    {
+        "Normal",
+        "TI"
+    };
+};
 class rd501_JLTS_CloneNVGRange_arc: JLTS_CloneNVGRange
 {
     displayname = "[501st] ARC Viewfinder Antenna (Toggle)";

+ 0 - 84
addons - Copy/RD501_Vehicle_Weapons/land/static/config.cpp.old

@@ -1,84 +0,0 @@
-
-#include "../../../RD501_main/config_macros.hpp"
-#include "../../_common/common.hpp"
-
-
-class CfgPatches
-{
-	class macro_patch_name(staticweapons)
-	{
-		author=DANKAUTHORS;
-		addonRootClass= macro_patch_name(vehicle_weapons)
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicle_weapons)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_weapon(stat,eweb),
-			macro_new_weapon(stat,ragl40),
-			macro_new_weapon(stat,aap4)
-		};
-	};
-};
-
-class CfgWeapons
-{
-	class 3AS_HeavyRepeater;
-	class 3AS_BlasterTurret_Repeater:3AS_HeavyRepeater
-	{
-		class manual;
-	}
-	class macro_new_weapon(stat,eweb):3AS_BlasterTurret_Repeater
-	{
-		class manual: manual
-		{
-			dispersion=0.011;
-			reloadTime=0.05;
-		};
-		magazines[]=
-		{
-			macro_new_mag(eweb,600)
-		};
-	};
-	class macro_new_weapon(stat,ragl40):3AS_BlasterTurret_Repeater
-	{
-		magazines[]=
-		{
-			macro_new_mag(ragl40he,40)
-		};
-	};
-	class ace_javelin_Titan_Static;
-	class macro_new_weapon(stat,aap4):ace_javelin_Titan_Static
-	{
-		/*magazines[]=
-		{
-			macro_new_mag(aap,4)
-		};*/
-	};
-};
-class CfgMagazines
-{
-	class 3AS_500_Rnd_BlasterTurret_mag;
-	class 40Rnd_20mm_G_belt;
-	class 1Rnd_GAT_missiles;
-	class macro_new_mag(eweb,600): 3AS_500_Rnd_BlasterTurret_mag
-	{
-		count=600;
-		ammo=macro_new_ammo(z1000)
-	};
-	class macro_new_mag(ragl40he,40): 40Rnd_20mm_G_belt
-	{
-		count=40;
-		ammo=macro_new_ammo(UGL_HE)
-	};
-	class macro_new_mag(aap,4): 1Rnd_GAT_missiles
-	{
-		count=4;
-	};
-};
-class CfgAmmo
-{
-	
-};

+ 1 - 1
addons - Copy/RD501_Vehicle_Weapons/land/tank_cannons/config.cpp

@@ -81,7 +81,7 @@ class CfgWeapons
 		};
 	};
 
-	class macro_new_weapon(aat_cannon,king) : Cannon_TurboLaser
+	class macro_new_weapon(aat_cannon,king) : 3AS_GATCannon
 	{
 		
 		displayName = "King Heavy Laser Cannon";

+ 23 - 0
addons - Copy/RD501_Vehicles/air/LAAT/initTD.sqf

@@ -0,0 +1,23 @@
+
+_vehic = _this;
+_vehic setvariable ["impulsorStatus",false,true];
+
+
+_titlehintimpulsor  = "<t color='#E57300' size='2' shadow='1' shadowColor='#000000' align='center'>IMPULSOR</t>";
+_texthintimpulsor   = "<br /><t color='#CE0000' size='1.4' shadow='1' shadowColor='#000000' align='center'>OFF</t>";
+hint parseText (_titlehintimpulsor+_texthintimpulsor);
+
+
+while {(!(_vehic getvariable ["impulsorStatus",false]) AND (speed _vehic > 100))} do
+{
+_vel = velocity _vehic;
+_dir = direction _vehic;
+_speed = -10;
+_vehic setVelocity [
+(_vel select 0) + (sin _dir * _speed), 
+(_vel select 1) + (cos _dir * _speed), 
+(_vel select 2)
+];
+sleep 0.5;
+};
+

+ 24 - 0
addons - Copy/RD501_Vehicles/air/LAAT/initTE.sqf

@@ -0,0 +1,24 @@
+
+
+_vehic = _this;
+_vehic setvariable ["impulsorStatus",true,true];
+
+_titlehintimpulsor  = "<t color='#E57300' size='2' shadow='1' shadowColor='#000000' align='center'>IMPULSOR</t>";
+_texthintimpulsor   = "<br /><t color='#00ff00' size='1.4' shadow='1' shadowColor='#000000' align='center'>ON</t>";
+hint parseText (_titlehintimpulsor+_texthintimpulsor);
+[_vehic, "LAATstart_repulsor"] remoteExec ["say3D", 0, false];
+
+while {((_vehic getvariable ["impulsorStatus",false]) AND (alive _vehic))} do
+{
+if (speed _vehic <= 600) then {
+_vel = velocity _vehic;
+_dir = direction _vehic;
+_speed = 10;
+_vehic setVelocity [
+(_vel select 0) + (sin _dir * _speed), 
+(_vel select 1) + (cos _dir * _speed), 
+(_vel select 2)
+];
+};
+sleep 0.5;
+};

+ 4 - 4
addons - Copy/RD501_Vehicles/air/LAAT/user_action.hpp

@@ -9,7 +9,7 @@
 		priority = 21;
 		onlyForPlayer = 1;
 		condition = "(!(this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this) AND (speed this >10) )";
-		statement = "this execVM ""\LAAT\initTE.sqf""";
+		statement = "this execVM ""\RD501_Vehicles\air\LAAT\initTE.sqf""";
 	};
 
 	class ThrusterDisngage: ThrusterEngage
@@ -19,7 +19,7 @@
 		displayNameDefault = "<t color='#FF9933'>[RepulsorBrake On]</t>";
 		textToolTip = "<t color='#FF9933'>[RepulsorBrake On]</t>";
 		condition = "((this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this))";
-		statement = "this execVM ""\LAAT\initTD.sqf""";
+		statement = "this execVM ""\RD501_Vehicles\air\LAAT\initTD.sqf""";
 	};
 
 	class ThrusterEngage_spam: ThrusterEngage
@@ -32,7 +32,7 @@
 		priority = 0;
 		onlyForPlayer = 1;
 		condition = "((player == driver this) AND (alive this) AND (speed this >10) )";
-		statement = "this execVM ""\LAAT\initTE.sqf""";
+		statement = "this execVM ""\RD501_Vehicles\air\LAAT\initTE.sqf""";
 		shortcut="User19"
 	};
 
@@ -44,7 +44,7 @@
 		displayNameDefault = "";
 		textToolTip = "";
 		condition = "((player == driver this) AND (alive this))";
-		statement = "this execVM ""\LAAT\initTD.sqf""";
+		statement = "this execVM ""\RD501_Vehicles\air\LAAT\initTD.sqf""";
 		shortcut="User20"
 	};
 

+ 3 - 3
addons - Copy/RD501_Vehicles/land/Mynock/config.cpp

@@ -98,7 +98,7 @@ class CfgVehicles
 		scope=2;
 		armor = 1000;
 		displayName = "Republic RX200 Rocket Artillery"
-		crew = "SWOP_Clonetrooper_P1";
+		crew = "JLTS_Clone_P2_Rex_501";
         side = 1;
         faction = macro_republic_faction
         editorSubcategory = macro_editor_cat(arty)
@@ -146,7 +146,7 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		displayName="Republic Longbow AA"
-		crew = "SWOP_Clonetrooper_P1";
+		crew = "JLTS_Clone_P2_Rex_501";
 		author="RD501"
 		faction = macro_republic_faction
         editorSubcategory = macro_editor_cat(aa)
@@ -185,7 +185,7 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		displayName="Republic AV7"
-		crew = "SWOP_Clonetrooper_P1";
+		crew = "JLTS_Clone_P2_Rex_501";
 		author="RD501"
 		faction = macro_republic_faction
         editorSubcategory = macro_editor_cat(arty)

+ 1 - 1
addons - Copy/RD501_Vehicles/land/Warden/config.cpp

@@ -70,7 +70,7 @@ class CfgVehicles
 		
 		transportSoldier=8;
 		LESH_canTow = 1;
-		crew = "SWOP_Clonetrooper_P1";
+		crew = "JLTS_Clone_P2_Rex_501";
 		LESH_AxisOffsetTower[] = {0,-6,1};
 		driverCanSee = 31;
 		gunnerCanSee = 31;

+ 1 - 1
addons - Copy/RD501_Vehicles/static/config.cpp

@@ -335,7 +335,7 @@ class CfgWeapons
         modelOptics = "\z\ace\addons\javelin\data\reticle_titan.p3d";  // Optics model
         canLock = 0;  // Disable vanilla locking (0-disabled, 1-enabled)
         lockingTargetSound[] = {"", 0, 1};  // Locking sound
-        lockedTargetSound[] = {"", 0, 1};  // Target acquired sound*/
+        lockedTargetSound[] = {"", 0, 1};  // Target acquired sound
 		hiddenSelectionsTextures[]=
 		{
 			"RD501_Vehicles\textures\static\warthog_addons_grey_co.paa"

+ 5 - 7
addons - Copy/RD501_Weapons/Droid_weapons/DGL/config.cpp

@@ -26,14 +26,12 @@ class Mode_FullAuto;
 class cfgWeapons 
 {
 	
-	class Rifle_Base_F;
-	class arifle_MX_Base_F: Rifle_Base_F
-	{	};
-	class JLTS_SBB3: arifle_MX_Base_F
+	class arifle_MX_Base_F;
+	class JLTS_SBB3;/*: arifle_MX_Base_F
 	{
 		class Single: Mode_SemiAuto
 		{};
-	};
+	};*/
 	class macro_new_weapon(cis,dgl): JLTS_SBB3
 	{
 		scope=2;
@@ -48,9 +46,9 @@ class cfgWeapons
 			macro_new_mag(UGL_HE,6),
 			macro_new_mag(UGL_AP,6)
 		};
-		class Single : Single
+		/*class Single : Single
 		{
 			reloadTime=0.5;
-		};
+		};*/
 	};
 };

+ 5 - 1
addons - Copy/RD501_Weapons/Grenades/config.cpp

@@ -98,7 +98,7 @@ class CfgWeapons
 	};
 	class Throw: GrenadeLauncher
 	{
-		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle","Squad_Shield_Muzzle"};
+		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle","Squad_Shield_Muzzle","Throwable_C_Type_Muzzle"};
 		class Shadow_Muzzle: ThrowMuzzle
 		{
 			magazines[] = {"RD501_BlueShadow_Grenade"};
@@ -115,5 +115,9 @@ class CfgWeapons
 		{
 			magazines[] = {macro_new_mag(squad_shield_sigma,1)};
 		};
+		class Throwable_C_Type_Muzzle: ThrowMuzzle
+		{
+			magazines[] = {macro_new_mag(throwable_c_type,1)};
+		};
 	};
 };

+ 17 - 4
addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -264,6 +264,19 @@ class CfgAmmo
 		indirectHitRange=2;
 		simulation="shotShell";
 	}
+	class macro_new_ammo(throwable_c_type) : 3AS_CoreDetonator_1RND
+	{
+		hit=1500;
+		indirectHit=1500;
+		indirectHitRange=10;
+		typicalspeed=40;
+		explosionTime=15;
+		timeToLive=20;
+		model="\A3\Weapons_F\Explosives\satchel";
+		simulation="shotShell";
+		ExplosionEffects="MineNondirectionalExplosion";
+		CraterEffects="MineNondirectionalCrater";
+	}
 	class macro_new_ammo(thermaldet) : 3AS_Detonator_1RND
 	{
 		hit=18;
@@ -395,7 +408,7 @@ class CfgAmmo
 	class ACE_Javelin_FGM148_static;
 	class R_PG32V_F;
 	class Mo_cluster_AP;
-	class macro_new_ammo(striker):ACE_Javelin_FGM148_static
+	/*class macro_new_ammo(striker):ACE_Javelin_FGM148_static
 	{
 		hit=1650;
 		effectsMissileInit="RocketBackEffectsStaticRPG";
@@ -403,7 +416,7 @@ class CfgAmmo
 		irLock = 1;
         laserLock = 0;
         airLock = 0;
-		/*class ace_missileguidance {
+		class ace_missileguidance {
             enabled = 1;
 
             minDeflection = 0.00005;      // Minium flap deflection for guidance
@@ -431,8 +444,8 @@ class CfgAmmo
             defaultAttackProfile = "JAV_TOP";
             attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
             useModeForAttackProfile = 1;
-        };*/
-	};
+        };
+	};*/
 	class macro_new_ammo(rps4heat):R_PG32V_F
 	{
 		hit=150;

+ 11 - 0
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -329,6 +329,17 @@ class CfgMagazines
 		ammo = macro_new_ammo(imploder)
 		descriptionShort = "Republic Thermal Imploder";
 	};
+	class macro_new_mag(throwable_c_type,1):3AS_BaridumCore
+	{
+		author="RD501";
+		scope=2;
+		displayName = "Republic Throwable C-Type";
+		displayNameShort = "Throwable C-Type";
+		count=1;
+		initSpeed=12;
+		ammo = macro_new_ammo(throwable_c_type)
+		descriptionShort = "Republic Throwable C-Type";
+	};
 	class macro_new_mag(thermaldet,1):3AS_ThermalDetonator
 	{
 		author="RD501";

+ 0 - 70
addons - Copy/RD501_Weapons/_scopes/DC_15A_2-6x_acog.hpp

@@ -1,70 +0,0 @@
-class macro_new_weapon(scope,dc_r15a_acog): itemCore
-{
-    scope = 2;
-    author = "SWOP";
-    inertia = 0.1;
-    displayName = "DC-15A ACOG (2-6x)";
-    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
-    model = "Scope\holoscopedc15A.p3d";
-    descriptionShort = "DC-15 ACOG (2-6x) ";
-    weaponInfoType = "RscOptics_nightstalkerbluenorange";
-    class ItemInfo: InventoryOpticsItem_Base_F
-    {
-        opticType = 2;
-        mass = 4;
-        RMBhint = "DC-15A Scope (x4)";
-        optics = 1;
-        weaponInfoType = "RscOptics_nightstalkerbluenorange";
-        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
-        modelOptics = "Scope\4x_xm8.p3d";
-        class OpticsModes
-        {
-            /*class Iron
-            {
-                opticsID = 2;
-                opticsDisplayName = "";
-                useModelOptics = 0;
-                opticsPPEffects[] = {"", ""};
-                opticsFlare = 0;
-                opticsDisablePeripherialVision = 0;
-                opticsZoomMin =  scope_magnification(.53);
-                opticsZoomMax = 1.25;
-                opticsZoomInit = 0.75;
-                memoryPointCamera = "opticView";
-                visionMode[] = {};
-                //discretefov[] = {scope_magnification(.53)};
-                discreteDistance[] = {200};
-                discreteDistanceInitIndex = 0;
-                distanceZoomMin = 200;
-                distanceZoomMax = 200;
-                discreteInitIndex = 0;
-                modelOptics = "\A3\Weapons_F\empty";
-                //modelOptics = "Scope\DC17MSniperZoom.p3d";
-            };*/
-            class Snip
-            {
-                opticsID = 1;
-                opticsDisplayName = "WFOV";
-                useModelOptics = 1;
-                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-                opticsZoomMin = scope_magnification(6);
-                opticsZoomMax = scope_magnification(2);
-                opticsZoomInit = scope_magnification(2);
-                discreteinitIndex = 0;
-                discretefov[] = {scope_magnification(2),scope_magnification(6)};
-                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000};
-                discreteDistanceInitIndex = 1;
-                distanceZoomMin = 100;
-                distanceZoomMax = 1000;
-                visionMode[] = {"Normal", "NVG"};
-                thermalMode[] = {1, 2};
-                memoryPointCamera = "opticView";
-                modelOptics = "Scope\4x_xm8.p3d";
-                weaponInfoType = "RscOptics_nightstalkerbluenorange";
-                opticsFlare = 1;
-                opticsDisablePeripherialVision = 0;//1;
-                cameraDir = "";
-            };
-        };
-    };
-};

+ 0 - 138
addons - Copy/RD501_Weapons/_scopes/DC_15A_LE_x4_x8.hpp

@@ -1,138 +0,0 @@
-class macro_new_weapon(scope,dc_15a_x4_x8): itemCore
-{
-    scope = 2;
-    author = "SWOP";
-    inertia = 0.1;
-    displayName = "DC-15A LE Scope x4-x8 scope";
-    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
-    model = "SW_CloneWarsWeapons\DCrifles\dc15azoomscopeX10range.p3d";
-    descriptionShort = "DC-15A Scope (x10+Range)";
-    weaponInfoType = "RscOptics_nightstalkerblue";
-    class ItemInfo: InventoryOpticsItem_Base_F
-    {
-        opticType = 2;
-        mass = 4;
-        RMBhint = "DC-15A Scope x4-x8 scope";
-        optics = 1;
-        weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
-        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
-        modelOptics = "Scope\a180.p3d";
-        class OpticsModes
-        {
-            class Snip
-            {
-                modelOptics = "Scope\a180.p3d";
-                opticsID = 1;
-                opticsDisplayName = "WFOV";
-                useModelOptics = 1;
-                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-                opticsZoomMin = scope_magnification(8);
-                opticsZoomMax = scope_magnification(1);
-                opticsZoomInit = scope_magnification(1);
-                discretefov[] = {scope_magnification(1),scope_magnification(4),scope_magnification(8)};
-                discreteinitIndex = 0;
-                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,4000};
-                discreteDistanceInitIndex = 1;
-                distanceZoomMin = 100;
-                distanceZoomMax = 4000;
-                visionMode[] = {"Normal", "NVG","TI"};
-                thermalMode[] = {1,8};
-                memoryPointCamera = "opticView";
-                weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
-                opticsFlare = 1;
-                opticsDisablePeripherialVision = 1;
-                cameraDir = "";
-            };
-            class Iron
-            {
-                opticsID = 2;
-                opticsDisplayName = "";
-                useModelOptics = 0;
-                opticsPPEffects[] = {"", ""};
-                opticsFlare = 0;
-                opticsDisablePeripherialVision = 0;
-                opticsZoomMin = 0.25;
-                opticsZoomMax = 1.25;
-                opticsZoomInit = 0.75;
-                memoryPointCamera = "eye";
-                visionMode[] = {};
-                discretefov[] = {};
-                discreteDistance[] = {200};
-                discreteDistanceInitIndex = 0;
-                distanceZoomMin = 200;
-                distanceZoomMax = 200;
-                discreteInitIndex = 0;
-                modelOptics = "\A3\Weapons_F\empty";
-            };
-        };
-    };
-};
-class macro_new_weapon(scope,valken_6_12x): itemCore
-{
-    scope = 2;
-    author = "SWOP";
-    inertia = 0.1;
-    displayName = "DC-15A LE Scope (6-12x)";
-    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
-    model = "SW_CloneWarsWeapons\DCrifles\dc15azoomscopeX10range.p3d";
-    descriptionShort = "DC-15A Scope (x10+Range)";
-    weaponInfoType = "RscOptics_nightstalkerblue";
-    class ItemInfo: InventoryOpticsItem_Base_F
-    {
-        opticType = 2;
-        mass = 4;
-        RMBhint = "Valken 38X Scope (6-12x)";
-        optics = 1;
-        weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
-        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
-        modelOptics = "Scope\a180.p3d";
-        class OpticsModes
-        {
-            class Snip
-            {
-                modelOptics = "Scope\a180.p3d";
-                opticsID = 1;
-                opticsDisplayName = "WFOV";
-                useModelOptics = 1;
-                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-                opticsZoomMin = scope_magnification(12);
-                opticsZoomMax = scope_magnification(1);
-                opticsZoomInit = scope_magnification(1);
-                discretefov[] = {scope_magnification(6),scope_magnification(12)};
-                discreteinitIndex = 0;
-                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,4000};
-                discreteDistanceInitIndex = 1;
-                distanceZoomMin = 100;
-                distanceZoomMax = 4000;
-                visionMode[] = {"Normal", "NVG","TI"};
-                thermalMode[] = {1,8};
-                memoryPointCamera = "opticView";
-                weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
-                opticsFlare = 1;
-                opticsDisablePeripherialVision = 1;
-                cameraDir = "";
-            };
-            class Iron
-            {
-                opticsID = 2;
-                opticsDisplayName = "";
-                useModelOptics = 0;
-                opticsPPEffects[] = {"", ""};
-                opticsFlare = 0;
-                opticsDisablePeripherialVision = 0;
-                opticsZoomMin = 0.25;
-                opticsZoomMax = 1.25;
-                opticsZoomInit = 0.75;
-                memoryPointCamera = "eye";
-                visionMode[] = {};
-                discretefov[] = {};
-                discreteDistance[] = {200};
-                discreteDistanceInitIndex = 0;
-                distanceZoomMin = 200;
-                distanceZoomMax = 200;
-                discreteInitIndex = 0;
-                modelOptics = "\A3\Weapons_F\empty";
-            };
-        };
-    };
-};

+ 0 - 71
addons - Copy/RD501_Weapons/_scopes/DC_15A_modeled_x4.hpp

@@ -1,71 +0,0 @@
-//Modeled x4 scope
-class SWOP_DC15A_zoomscope:ItemCore
-{
-	class ItemInfo;
-};
-
-class macro_new_weapon(scope,dc_15a_base1):SWOP_DC15A_zoomscope
-{
-	scope=0;
-	class ItemInfo:ItemInfo
-	{
-		class OpticsModes;
-	};
-};
-
-class macro_new_weapon(scope,dc_15a_base2):macro_new_weapon(scope,dc_15a_base1)
-{
-	scope=0;
-	class ItemInfo:ItemInfo
-	{
-		class OpticsModes:OpticsModes
-		{
-			class Snip;
-		};
-	};
-};
-
-class macro_new_weapon(scope,dc_15a_x4):macro_new_weapon(scope,dc_15a_base2)
-{
-	scope=2;
-	displayName="DC-15A LSW x4 Scope";
-	class ItemInfo:ItemInfo
-	{
-		class OpticsModes:OpticsModes
-		{
-			class Snip:Snip
-			{
-				opticsZoomMin = scope_magnification(4);
-				opticsZoomMax = scope_magnification(1);
-				opticsZoomInit = scope_magnification(1);
-				discreteinitIndex = 0;
-				discretefov[] = {scope_magnification(1),scope_magnification(2),scope_magnification(4)};
-				modelOptics = "Scope\4x_xm8.p3d";
-				opticsDisablePeripherialVision = 1;
-			};
-			class Iron
-			{
-				opticsID = 2;
-				opticsDisplayName = "";
-				useModelOptics = 0;
-				opticsPPEffects[] = {"",""};
-				opticsFlare = 0;
-				opticsDisablePeripherialVision = 0;
-				opticsZoomMin = 0.25;
-				opticsZoomMax = 1.25;
-				opticsZoomInit = 0.75;
-				memoryPointCamera = "eye";
-				visionMode[] = {};
-				discretefov[] = {};
-				discreteDistance[] = {200};
-				discreteDistanceInitIndex = 0;
-				distanceZoomMin = 200;
-				distanceZoomMax = 200;
-				discreteInitIndex = 0;
-				//modelOptics = "\A3\Weapons_F\empty";
-				modelOptics = "Scope\4x_xm8.p3d";
-			};
-			
-		};
-	};
-};

+ 0 - 141
addons - Copy/RD501_Weapons/_scopes/DC_15A_x4_acog.hpp

@@ -1,141 +0,0 @@
-class macro_new_weapon(scope,dc_15a_acog): itemCore
-{
-    scope = 2;
-    author = "SWOP";
-    inertia = 0.1;
-    displayName = "DC-15 Holo (x4)";
-    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
-    model = "Scope\holoscopedc15A.p3d";
-    descriptionShort = "DC-15 Holo (x3) Eotech";
-    weaponInfoType = "RscOptics_nightstalkerbluenorange";
-    class ItemInfo: InventoryOpticsItem_Base_F
-    {
-        opticType = 2;
-        mass = 4;
-        RMBhint = "DC-15A Scope (x4)";
-        optics = 1;
-        weaponInfoType = "RscOptics_nightstalkerbluenorange";
-        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
-        modelOptics = "Scope\4x_xm8.p3d";
-        class OpticsModes
-        {
-            class Iron
-            {
-                opticsID = 2;
-                opticsDisplayName = "";
-                useModelOptics = 0;
-                opticsPPEffects[] = {"", ""};
-                opticsFlare = 0;
-                opticsDisablePeripherialVision = 0;
-                opticsZoomMin =  scope_magnification(.53);
-                opticsZoomMax = 1.25;
-                opticsZoomInit = 0.75;
-                memoryPointCamera = "eye";
-                visionMode[] = {};
-                //discretefov[] = {scope_magnification(.53)};
-                discreteDistance[] = {200};
-                discreteDistanceInitIndex = 0;
-                distanceZoomMin = 200;
-                distanceZoomMax = 200;
-                discreteInitIndex = 0;
-                modelOptics = "\A3\Weapons_F\empty";
-                //modelOptics = "Scope\DC17MSniperZoom.p3d";
-            };
-            class Snip
-            {
-                opticsID = 1;
-                opticsDisplayName = "WFOV";
-                useModelOptics = 1;
-                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-                opticsZoomMin = scope_magnification(4);
-                opticsZoomMax = scope_magnification(1);
-                opticsZoomInit = scope_magnification(4);
-                discreteinitIndex = 0;
-                discretefov[] = {scope_magnification(1.25),scope_magnification(4)};
-                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000};
-                discreteDistanceInitIndex = 1;
-                distanceZoomMin = 100;
-                distanceZoomMax = 1000;
-                visionMode[] = {"Normal", "NVG"};
-                thermalMode[] = {1, 2};
-                memoryPointCamera = "opticView";
-                modelOptics = "Scope\4x_xm8.p3d";
-                weaponInfoType = "RscOptics_nightstalkerbluenorange";
-                opticsFlare = 1;
-                opticsDisablePeripherialVision = 0;//1;
-                cameraDir = "";
-            };
-        };
-    };
-};
-class macro_new_weapon(scope,dc_15a_acogtcw): itemCore
-{
-    scope = 2;
-    author = "SWOP";
-    inertia = 0.1;
-    displayName = "DC-15C Holo (x4)";
-    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
-    model = "Scope\holoscopedc15A.p3d";
-    descriptionShort = "DC-15 Holo (x3)";
-    weaponInfoType = "RscOptics_nightstalkerbluenorange";
-    class ItemInfo: InventoryOpticsItem_Base_F
-    {
-        opticType = 2;
-        mass = 4;
-        RMBhint = "DC-15A Scope (x4)";
-        optics = 1;
-        weaponInfoType = "RscOptics_nightstalkerbluenorange";
-        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
-        modelOptics = "Scope\4x_xm8.p3d";
-        class OpticsModes
-        {
-           /* class Iron
-            {
-                opticsID = 2;
-                opticsDisplayName = "";
-                useModelOptics = 0;
-                opticsPPEffects[] = {"", ""};
-                opticsFlare = 0;
-                opticsDisablePeripherialVision = 0;
-                opticsZoomMin =  scope_magnification(.53);
-                opticsZoomMax = 1.25;
-                opticsZoomInit = 0.75;
-                memoryPointCamera = "opticView";
-                visionMode[] = {};
-                //discretefov[] = {scope_magnification(.53)};
-                discreteDistance[] = {200};
-                discreteDistanceInitIndex = 0;
-                distanceZoomMin = 200;
-                distanceZoomMax = 200;
-                discreteInitIndex = 0;
-                modelOptics = "\A3\Weapons_F\empty";
-                //modelOptics = "Scope\DC17MSniperZoom.p3d";
-            };*/
-            class Snip
-            {
-                opticsID = 1;
-                opticsDisplayName = "WFOV";
-                useModelOptics = 1;
-                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-                opticsZoomMin = scope_magnification(4);
-                opticsZoomMax = scope_magnification(1);
-                opticsZoomInit = scope_magnification(4);
-                discreteinitIndex = 0;
-                discretefov[] = {scope_magnification(1.25),scope_magnification(4)};
-                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000};
-                discreteDistanceInitIndex = 1;
-                distanceZoomMin = 100;
-                distanceZoomMax = 1000;
-                visionMode[] = {"Normal", "NVG"};
-                thermalMode[] = {1, 2};
-                memoryPointCamera = "opticView";
-                modelOptics = "Scope\4x_xm8.p3d";
-                weaponInfoType = "RscOptics_nightstalkerbluenorange";
-                opticsFlare = 1;
-                opticsDisablePeripherialVision = 0;//1;
-                cameraDir = "";
-            };
-        };
-    };
-};
-

+ 2 - 16
addons - Copy/RD501_Weapons/config.cpp

@@ -24,20 +24,6 @@ class CfgPatches
 //scopes
 class CfgWeapons
 {
-	class Mode_SemiAuto;
-	class ItemCore;
-	class InventoryItem_Base_F;
-	class InventoryOpticsItem_Base_F;
-
-	#include "_scopes/DC_15A_modeled_x4.hpp"
-
-	#include "_scopes/DC_15A_x4_acog.hpp"
-
-	#include "_scopes/DC_15A_LE_x4_x8.hpp"
-	
-	#include "_scopes/DC_15A_2-6x_acog.hpp"
-	
-	class GrenadeLauncher;
 	class JLTS_stun_muzzle;
 	class RD501_stun_muzzle: JLTS_stun_muzzle
 	{
@@ -259,7 +245,7 @@ class CfgMagazines
 		mass = 100;
 	};
 
-	class SWOP_b2rocket_Mag: CA_Magazine
+	/*class SWOP_b2rocket_Mag: CA_Magazine
 	{
 		scope = 2;
 		displayName = "5Rnd B2 Wrist Rockets";
@@ -274,7 +260,7 @@ class CfgMagazines
 		initSpeed = 100;
 		soundFly[] = {"A3\Sounds_F\weapons\Rockets\rocket_fly_2", 0.501187, 1.3, 400};
 		nameSound = "missiles";
-	};
+	};*/
 
 	class SW_iondisruptor_BlasterRifle_Mag;
 	class macro_new_mag(RAMER,6):SW_iondisruptor_BlasterRifle_Mag