Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
toberge committed Jul 2, 2024
1 parent c4a447f commit 05e0f76
Show file tree
Hide file tree
Showing 7 changed files with 262 additions and 59 deletions.
5 changes: 4 additions & 1 deletion Assets/LazurController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -136,12 +136,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;
Expand Down
30 changes: 16 additions & 14 deletions Assets/Prefabs/GunParts/EnlargerExtension.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scenes/Menu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -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.06261758, g: 0.21950229, b: 0.49507776, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down
26 changes: 0 additions & 26 deletions Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta

This file was deleted.

Loading

0 comments on commit 05e0f76

Please sign in to comment.