Css weapons now using improved models

timmybo5 · Sep 14, 2021 · 4dee4b8 · 4dee4b8
1 parent afba584
commit 4dee4b8
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 77 deletions.
diff --git a/code/swb_css/AWP.cs b/code/swb_css/AWP.cs
@@ -8,8 +8,8 @@ public class AWP : WeaponBaseSniper
     {
         public override int Bucket => 5;
         public override HoldType HoldType => HoldType.Rifle;
-        public override string ViewModelPath => "weapons/css_awp/css_v_awp.vmdl";
-        public override string WorldModelPath => "weapons/css_awp/css_w_awp.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/awp/css_v_awp.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/awp/css_w_awp.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_awp.png";
         public override int FOV => 75;
         public override int ZoomFOV => 75;

diff --git a/code/swb_css/Deagle.cs b/code/swb_css/Deagle.cs
@@ -8,8 +8,8 @@ public class Deagle : WeaponBase
     {
         public override int Bucket => 1;
         public override HoldType HoldType => HoldType.Pistol;
-        public override string ViewModelPath => "weapons/css_deagle/css_v_pist_deagle.vmdl";
-        public override string WorldModelPath => "weapons/css_deagle/css_w_pist_deagle.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/deagle/css_v_pist_deagle.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/deagle/css_w_pist_deagle.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_deagle.png";
         public override int FOV => 75;
         public override int ZoomFOV => 60;

diff --git a/code/swb_css/GrenadeHE.cs b/code/swb_css/GrenadeHE.cs
@@ -10,15 +10,15 @@ public class GrenadeHE : WeaponBaseEntity
     {
         public override int Bucket => 0;
         public override HoldType HoldType => HoldType.Pistol;
-        public override string ViewModelPath => "weapons/css_grenade_he/css_v_grenade_he.vmdl";
-        public override string WorldModelPath => "weapons/css_grenade_he/css_w_grenade_he.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/grenade_he/css_v_grenade_he.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/grenade_he/css_w_grenade_he.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_grenade.png";
         public override int FOV => 75;
         public override bool DrawCrosshair => true;
         public override bool DrawCrosshairLines => false;
 
         public override Func<ClipInfo, bool, FiredEntity> CreateEntity => CreateGrenadeEntity;
-        public override string EntityModel => "weapons/css_grenade_he/css_w_grenade_he_thrown.vmdl";
+        public override string EntityModel => "weapons/swb/css/grenade_he/css_w_grenade_he_thrown.vmdl";
         public override Vector3 EntityVelocity => new Vector3(0, 25, 50);
         public override Angles EntityAngles => new Angles(0, 0, -45);
         public override bool IsSticky => true;
@@ -53,7 +53,7 @@ private FiredEntity CreateGrenadeEntity(ClipInfo clipInfo, bool isPrimary)
             {
                 "css_grenade_he.explode"
             };
-            grenade.ExplosionEffect = "weapons/css_grenade_he/particles/grenade_he_explosion.vpcf";
+            grenade.ExplosionEffect = "weapons/swb/css/grenade_he/particles/grenade_he_explosion.vpcf";
             grenade.ExplosionShake = new ScreenShake
             {
                 Length = 1f,

diff --git a/code/swb_css/Knife.cs b/code/swb_css/Knife.cs
@@ -8,8 +8,8 @@ public class Knife : WeaponBaseMelee
     {
         public override int Bucket => 0;
         public override HoldType HoldType => HoldType.Pistol;
-        public override string ViewModelPath => "weapons/css_knife/css_v_knife.vmdl";
-        public override string WorldModelPath => "weapons/css_knife/css_w_knife.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/knife/css_v_knife.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/knife/css_w_knife.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_knife.png";
         public override int FOV => 75;
         public override bool DrawCrosshair => true;

diff --git a/code/swb_css/M249.cs b/code/swb_css/M249.cs
@@ -8,8 +8,8 @@ public class M249 : WeaponBase
     {
         public override int Bucket => 4;
         public override HoldType HoldType => HoldType.Rifle;
-        public override string ViewModelPath => "weapons/css_m249/css_v_mach_m249para.vmdl";
-        public override string WorldModelPath => "weapons/css_m249/css_w_mach_m249para.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/m249/css_v_mach_m249para.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/m249/css_w_mach_m249para.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_m249.png";
         public override int FOV => 75;
         public override int ZoomFOV => 40;

diff --git a/code/swb_css/M249HE.cs b/code/swb_css/M249HE.cs
@@ -10,16 +10,16 @@ public class M249HE : WeaponBaseEntity
     {
         public override int Bucket => 4;
         public override HoldType HoldType => HoldType.Rifle;
-        public override string ViewModelPath => "weapons/css_m249/css_v_mach_m249para.vmdl";
-        public override string WorldModelPath => "weapons/css_m249/css_w_mach_m249para.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/m249/css_v_mach_m249para.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/m249/css_w_mach_m249para.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_m249he.png";
         public override int FOV => 75;
         public override int ZoomFOV => 40;
         public override float WalkAnimationSpeedMod => 0.7f;
         public override bool PlayHitmarkerSound => false;
 
         public override Func<ClipInfo, bool, FiredEntity> CreateEntity => CreateGrenadeEntity;
-        public override string EntityModel => "weapons/css_grenade_he/css_w_grenade_he_thrown.vmdl";
+        public override string EntityModel => "weapons/swb/css/grenade_he/css_w_grenade_he_thrown.vmdl";
         public override Vector3 EntityVelocity => new Vector3(0, 0, 100);
         public override Vector3 EntitySpawnOffset => new Vector3(10, 10, 10);
         public override float PrimaryEntitySpeed => 17;
@@ -83,7 +83,7 @@ private FiredEntity CreateGrenadeEntity(ClipInfo clipInfo, bool isPrimary)
             {
                 "css_grenade_he.explode"
             };
-            grenade.ExplosionEffect = "weapons/css_grenade_he/particles/grenade_he_explosion.vpcf";
+            grenade.ExplosionEffect = "weapons/swb/css/grenade_he/particles/grenade_he_explosion.vpcf";
             grenade.ExplosionShake = new ScreenShake
             {
                 Length = 1f,

diff --git a/code/swb_css/M4A1.cs b/code/swb_css/M4A1.cs
@@ -9,8 +9,8 @@ public class M4A1 : WeaponBase
     {
         public override int Bucket => 3;
         public override HoldType HoldType => HoldType.Rifle;
-        public override string ViewModelPath => "weapons/css_m4a1/css_v_m4a1.vmdl";
-        public override string WorldModelPath => "weapons/css_m4a1/css_w_m4a1.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/m4a1/css_v_m4a1.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/m4a1/css_w_m4a1.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_m4a1.png";
         public override int FOV => 60;
         public override int ZoomFOV => 35;
@@ -63,7 +63,7 @@ public M4A1()
                     OffAnimation = "remove_silencer",
                     OffAnimationDuration = 2f,
                     AnimationStatus = "silenced",
-                    NewWorldModel = "weapons/css_m4a1/css_w_m4a1_silencer.vmdl",
+                    NewWorldModel = "weapons/swb/css/m4a1/css_w_m4a1_silencer.vmdl",
                     NewShootSound = "css_m4a1.fire_silenced"
                 }
             };

diff --git a/code/swb_css/Super90.cs b/code/swb_css/Super90.cs
@@ -8,8 +8,8 @@ public class Super90 : WeaponBaseShotty
     {
         public override int Bucket => 2;
         public override HoldType HoldType => HoldType.Shotgun;
-        public override string ViewModelPath => "weapons/css_super90/css_v_shot_m3super90.vmdl";
-        public override string WorldModelPath => "weapons/css_super90/css_w_shot_m3super90.vmdl";
+        public override string ViewModelPath => "weapons/swb/css/super90/css_v_shot_m3super90.vmdl";
+        public override string WorldModelPath => "weapons/swb/css/super90/css_w_shot_m3super90.vmdl";
         public override string Icon => "/swb_css/textures/ui/css_icon_super90.png";
         public override int FOV => 75;
         public override int ZoomFOV => 45;

diff --git a/code/swb_explosives/RPG-7-Hotdog.cs b/code/swb_explosives/RPG-7-Hotdog.cs
diff --git a/code/swb_explosives/RPG-7.cs b/code/swb_explosives/RPG-7.cs
@@ -1,7 +1,7 @@
-using Sandbox;
-using SWB_Base;
-using System;
+using System;
 using System.Collections.Generic;
+using Sandbox;
+using SWB_Base;
 
 namespace SWB_EXPLOSIVES
 {
@@ -86,7 +86,7 @@ private FiredEntity CreateRocketEntity(ClipInfo clipInfo, bool isPrimary)
                 "swb_explosion_4",
                 "swb_explosion_5"
             };
-            rocket.ExplosionEffect = "weapons/css_grenade_he/particles/grenade_he_explosion.vpcf";
+            rocket.ExplosionEffect = "weapons/swb/css/grenade_he/particles/grenade_he_explosion.vpcf";
             rocket.RocketSound = "swb_explosives_rpg7.rocketloop";
             rocket.RocketEffects = new List<string>
             {