janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 20:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Grenades

Browse Source 
[+] added
+ grenade.cs script
+ grenades can be thrown
+ grenades "explode" and spawn "explosion" (currently only a 50% transparent cube)

- NEEDS TO BE TESTED => BUG FIXED
This commit is contained in:
Noah4ever
2021-12-08 15:31:13 +01:00
parent 95f94d062d
commit 56f5aec9cc
14 changed files with 735 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Scripts/Weapons/WeaponManager.cs
View File

@@ -29,20 +29,20 @@ public class WeaponManager : NetworkBehaviour
lastWeaponIndex = currentWeaponIndex;
activeWeapons[currentWeaponIndex].SetActive(false);
switchWeapon(-1);
activeWeapons[currentWeaponIndex].SetActive(true);
}
else if (Input.GetAxis("Mouse ScrollWheel") < 0f) { // Scroll down
lastWeaponIndex = currentWeaponIndex;
activeWeapons[currentWeaponIndex].SetActive(false);
switchWeapon(1);
activeWeapons[currentWeaponIndex].SetActive(true);
}
activeWeapons[currentWeaponIndex].SetActive(true);
if (Input.GetButtonDown("Interact")) { // e
PickupWeapon();
}else if (Input.GetButtonDown("Drop")) { // q Droping weapon
if (activeWeapons[currentWeaponIndex] != null) {
dropWeapon(); // Throws weapon away
switchWeapon(1);
dropWeapon(activeWeapons[currentWeaponIndex].GetComponent<Weapon>().DropForce); // Throws weapon away
activeWeapons[currentWeaponIndex].SetActive(true);
}
}
@@ -118,7 +118,7 @@ public class WeaponManager : NetworkBehaviour
private bool putWeaponInArray(int index, RaycastHit hit) {
if (activeWeapons[currentWeaponIndex] != null) {
dropWeapon(); // Throws weapon away
dropWeapon(activeWeapons[currentWeaponIndex].GetComponent<Weapon>().DropForce); // Throws weapon away
}
activeWeapons[index] = hit.transform.gameObject;
activeWeapons[index].SetActive(true);
@@ -131,7 +131,7 @@ public class WeaponManager : NetworkBehaviour
return true;
}
private bool dropWeapon() {
public bool dropWeapon(float dropForce) {
if(currentWeaponIndex != 2) {
GameObject currentWeapon = activeWeapons[currentWeaponIndex];
currentWeapon.SetActive(true);
@@ -142,7 +142,7 @@ public class WeaponManager : NetworkBehaviour
currentWeapon.GetComponent<BoxCollider>().enabled = true;
currentWeapon.gameObject.transform.SetParent(null);
activeWeapons[currentWeaponIndex] = null;
switchWeapon(1);
return true;
}
else {