Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ MonoBehaviour:
- RespawnSpaceship
- OnHit
- Turbo
- FireAirStrike
- FireMissile
DisableAutoOpenWizard: 1
ShowSettings: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/Resources/Tank.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -10636,6 +10636,8 @@ MonoBehaviour:
minLaunchForce: 15
maxLaunchForce: 30
maxChargeTime: 0.75
airStrikePrefab: {fileID: 2991024517168967846, guid: e4b7615eab6f72d4ca3240068173613a,
type: 3}
homingMissileInstantiateOffset: 4
--- !u!114 &-6562457786973999149
MonoBehaviour:
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Gameplay/Shell/ShellExplosion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private void OnTriggerEnter(Collider other)
PhotonNetwork.Destroy(photonView);
}
else
Destroy(gameObject);
Destroy(transform.parent == null ? gameObject : transform.parent.gameObject);
}

public void PlayExplosionEffect()
Expand Down
21 changes: 21 additions & 0 deletions Assets/Scripts/Gameplay/Tank/TankShooting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class TankShooting : MonoBehaviour
{
private const string FIRE_BUTTON = "Fire1";
private const string HOMING_MISSILE_BUTTON = "Fire2";
private const string AIR_STRIKE_BUTTON = "Fire3";

public Rigidbody shell;
public Transform fireTransform;
Expand All @@ -19,6 +20,8 @@ public class TankShooting : MonoBehaviour
public float maxLaunchForce = 30f;
public float maxChargeTime = 0.75f;

public GameObject airStrikePrefab;

public float homingMissileInstantiateOffset = 4;

private PhotonView photonView;
Expand All @@ -45,6 +48,7 @@ private void Update()

TryFireMissile();
TryFireHomingMissile();
TryFireAirStrike();
}

private void TryFireHomingMissile()
Expand Down Expand Up @@ -84,6 +88,14 @@ private bool GetClickPosition(out Vector3 clickPos)
return gotHit;
}

private void TryFireAirStrike()
{
if (!Input.GetButtonDown(AIR_STRIKE_BUTTON)) return;
if (!GetClickPosition(out var clickPos)) return;

photonView.RPC("FireAirStrike", RpcTarget.All, clickPos + Vector3.up * .001f);
}

private void TryFireMissile()
{
aimSlider.value = minLaunchForce;
Expand Down Expand Up @@ -136,5 +148,14 @@ private void FireMissile(Vector3 position, Quaternion rotation, Vector3 velocity
shootingAudio.clip = fireClip;
shootingAudio.Play();
}

[PunRPC]
private void FireAirStrike(Vector3 position)
{
Instantiate(airStrikePrefab, position, Quaternion.identity);

shootingAudio.clip = fireClip;
shootingAudio.Play();
}
}
}