Implement projectile scale

hackerspace-ntnu · Jul 3, 2024 · bcf61af · bcf61af
1 parent c4a447f
commit bcf61af
Show file tree

Hide file tree

Showing 11 changed files with 2,045 additions and 83 deletions.
diff --git a/Assets/LazurController.cs b/Assets/LazurController.cs
@@ -79,7 +79,7 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction)
             direction = direction,
             maxDistance = MaxDistance,
             initializationTime = Time.fixedTime,
-            size = stats.ProjectileSize
+            size = stats.ProjectileSize * stats.ProjectileScale
         };
         projectile.additionalProperties.Clear();
 
@@ -105,14 +105,16 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction)
                 lastCollider = collider;
                 HitboxController hitbox = collider.GetComponent<HitboxController>();
 
-                projectile.position = rayCasts[0].point;
+                projectile.position += projectile.direction * rayCasts[0].distance;
+
                 OnRicochet?.Invoke(rayCasts[0], ref projectile);
                 if (hitbox != null)
                     OnHitboxCollision?.Invoke(hitbox, ref projectile);
                 OnColliderHit?.Invoke(rayCasts[0], ref projectile);
 
-                projectile.distanceTraveled += rayCasts[0].distance;
+                projectile.direction = Vector3.Reflect(projectile.direction, rayCasts[0].normal);
 
+                projectile.distanceTraveled += rayCasts[0].distance;
             }
             else
             {
@@ -136,12 +138,15 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction)
 
     protected override void OnInitialize(GunStats gunstats)
     {
+        Vfx.SetFloat("Size", gunstats.ProjectileScale);
         animator.OnInitialize(gunstats);
     }
+
     protected override void OnReload(GunStats stats)
     {
         animator.OnReload(stats);
     }
+
     public override void InitializeProjectile(GunStats stats, uint shotID)
     {
         currentShotID = shotID;

diff --git a/Assets/Prefabs/GunParts/EnlargerExtension.prefab b/Assets/Prefabs/GunParts/EnlargerExtension.prefab
@@ -72,7 +72,6 @@ GameObject:
   m_Component:
   - component: {fileID: 8196151136836888530}
   - component: {fileID: 7575752308601990708}
-  - component: {fileID: -1314935375335004500}
   m_Layer: 0
   m_Name: EnlargerExtension
   m_TagString: Untagged
@@ -118,23 +117,26 @@ MonoBehaviour:
     addition: 0.5
     multiplier: 0
     exponential: 1
+  - name: ProjectileScale
+    addition: 0
+    multiplier: 0
+    exponential: 3
+  - name: ProjectileDamage
+    addition: 0
+    multiplier: 1
+    exponential: 1
+  - name: ProjectileSpeed
+    addition: 0
+    multiplier: 0
+    exponential: 0.5
+  - name: FireRate
+    addition: 0
+    multiplier: 0
+    exponential: 0.7
   outputs:
   - {fileID: 932626616956480431}
   midpoint: {fileID: 5729402012261899082}
   model: {fileID: 993201347869452232}
---- !u!114 &-1314935375335004500
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8350213044137146345}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 586f8df323151294a9220b1f0d464466, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  multiplier: 10
 --- !u!1001 &74844362063714969
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/GunParts/LazurBarrel.prefab b/Assets/Prefabs/GunParts/LazurBarrel.prefab
@@ -510,7 +510,6 @@ GameObject:
   m_Component:
   - component: {fileID: 6030259934304341444}
   - component: {fileID: 5695477544615188222}
-  - component: {fileID: 2680724073785080762}
   - component: {fileID: 8865490531545464824}
   - component: {fileID: 4273715955371138616}
   - component: {fileID: 4536155953706137537}
@@ -583,18 +582,6 @@ MonoBehaviour:
   attachmentPoints:
   - {fileID: 2021858193588301184}
   muzzleFlash: {fileID: 1933672864586849248}
---- !u!114 &2680724073785080762
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1569365569997936042}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c2bb47b3ca3e5854f9029b0888d83a3e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &8865490531545464824
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 785370674}
-  m_IndirectSpecularColor: {r: 0.062317036, g: 0.21927114, b: 0.4949812, a: 1}
+  m_IndirectSpecularColor: {r: 0.062406372, g: 0.21927595, b: 0.49484292, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

diff --git a/Assets/Scripts/Augment/AugmentImplementations/Hat/MeshProjectileController.cs b/Assets/Scripts/Augment/AugmentImplementations/Hat/MeshProjectileController.cs
@@ -66,8 +66,6 @@ protected override void Awake()
         positionActiveBuffer.Initialize(maxProjectiles);
         vfx.SetGraphicsBuffer("Positions", positionActiveBuffer.Buffer);
         vfx.SetInt("MaxParticleCount", maxProjectiles);
-        vfx.SetFloat("Size", visualSize);
-        vfx.SendEvent(VisualEffectAsset.PlayEventID);
 
         if (!gunController || !gunController.Player)
             return;
@@ -76,6 +74,8 @@ protected override void Awake()
 
     protected override void OnInitialize(GunStats gunstats)
     {
+        vfx.SetFloat("Size", visualSize * gunstats.ProjectileScale);
+        vfx.SendEvent(VisualEffectAsset.PlayEventID);
         animator.OnInitialize(gunstats);
     }
 
@@ -126,7 +126,7 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction, Quaternion rot
                 loadedProjectile.position = output;
                 loadedProjectile.direction = direction;
                 loadedProjectile.rotation = rotation;
-                loadedProjectile.size = size;
+                loadedProjectile.size = size * stats.ProjectileScale;
                 loadedProjectile.additionalProperties["lastCollider"] = null;
 
                 projectiles[currentStateIndex] = loadedProjectile;

diff --git a/Assets/Scripts/Augment/BulletModifiers/ExplosionModifier.cs b/Assets/Scripts/Augment/BulletModifiers/ExplosionModifier.cs
@@ -26,7 +26,9 @@ public void Detach(ProjectileController projectile)
     private void Explode(RaycastHit other, ref ProjectileState state)
     {
         var instance = Instantiate(explosion, state.position, Quaternion.identity);
+        instance.Radius *= projectile.stats.ProjectileScale;
         instance.Init();
+
         var targets = instance.Explode(player);
 
         // Trigger on hit, excluding this effect and using the scaled damage from the explosion

diff --git a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs
diff --git a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta
diff --git a/Assets/Scripts/ExplosionController.cs b/Assets/Scripts/ExplosionController.cs
@@ -10,7 +10,14 @@ public class ExplosionController : MonoBehaviour
     [SerializeField] private AnimationCurve damageCurve;
 
     [SerializeField] private float radius;
-    public float Radius => radius;
+    public float Radius
+    {
+        get => radius;
+        set
+        {
+            radius = value;
+        }
+    }
 
     [SerializeField] private float knockbackForce = 2000;
 
@@ -35,6 +42,7 @@ private void Start()
     public void Init()
     {
         visualEffect = GetComponent<VisualEffect>();
+        visualEffect.SetFloat("Size", radius / 6f);
         visualEffect.enabled = false;
         audioSource = GetComponent<AudioSource>();
     }