Merge branch 'master' into averrous/feat/cutscene

Assets/Scripts/Boss/ElementalHealth.cs

 using UnityEngine;
 
-public class ElementalHealth : MonoBehaviour
+public class ElementalHealth : MonoBehaviour, IEnemyHealthHandler
 {
     public int startingHealth = 500;
     public int currentHealth;

Assets/Scripts/Enemy/EnemyHealth.cs

 using UnityEngine;
 
-public class EnemyHealth : MonoBehaviour
+public class EnemyHealth : MonoBehaviour, IEnemyHealthHandler
 {
     public int startingHealth = 100;
     public int currentHealth;
@@ -9,6 +9,8 @@ public class EnemyHealth : MonoBehaviour
     public AudioClip deathClip;
     public EnemyType enemyType;
 
+    GameObject pet;
+    PetHealth petHealth;
     PetType petType;
     Animator anim;
     AudioSource enemyAudio;
@@ -28,6 +30,12 @@ public class EnemyHealth : MonoBehaviour
 
         currentHealth = startingHealth;
         questTemple = FindObjectOfType<Temple>();
+        pet = GameObject.FindGameObjectWithTag("Pet");
+        if (pet != null)
+        {
+            petHealth = pet.GetComponent<PetHealth>();
+            petType = petHealth.GetPetType();
+        }
     }
 
 

Assets/Scripts/GameOver/GameOverCanvas.cs

@@ -30,6 +30,7 @@ public class GameOverCanvas : MonoBehaviour
 
     public void OnClickLatestSave()
     {
+        GlobalManager.Instance.IsFirstLoad = true;
         SceneManager.LoadScene("Quest");
         IsSet = true;
     }

Assets/Scripts/Interfaces/IEnemyHealthHandler.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public interface IEnemyHealthHandler
+{
+    public void TakeDamage(int amount, Vector3 hitPoint);
+
+    public Transform transform { get; }
+}

Assets/Scripts/Interfaces/IEnemyHealthHandler.cs.meta

+fileFormatVersion: 2
+guid: e83f67c5f57e60d42bd9a210c6144486
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Managers/EnemyManager.cs

@@ -21,7 +21,7 @@ public class EnemyManager : MonoBehaviour
 
     void Start()
     {
-
+        isBoss = GlobalStateManager.Instance.IdxQuest == 3;
     }
 
 

Assets/Scripts/Managers/GlobalManager.cs

@@ -12,7 +12,7 @@ public class GlobalManager : MonoBehaviour
     private string defaultName = "PLAYER";
     private string playerName;
     private double totalTime;
-    private int volume = 60;
+    private float volume = 60;
 
     public bool isFromEnding = false;
     public string PlayerName
@@ -35,7 +35,7 @@ public class GlobalManager : MonoBehaviour
             totalTime = value;
         }
     }
-    public int Volume
+    public float Volume
     {
         get => volume;
         set

Assets/Scripts/Managers/SettingManager.cs

@@ -21,7 +21,10 @@ public class SettingManager : MonoBehaviour
     void Update()
     {
         GlobalManager.Instance.PlayerName = nameInput.text;
-        GlobalManager.Instance.Volume = (int) (volumeInput.GetComponent<Slider>()).value;  
+        var volume = (volumeInput.GetComponent<Slider>()).value * 0.1f;
+        GlobalManager.Instance.Volume = volume;
+        AudioListener.volume = volume;
+
         Debug.Log("PLAYER NAME: " + GlobalManager.Instance.PlayerName);
         Debug.Log("VOLUME: " + GlobalManager.Instance.Volume);
         if (Input.GetKeyDown(KeyCode.Escape))

Assets/Scripts/Pet/AnglerAttack.cs

@@ -47,7 +47,10 @@ public class AnglerAttack : MonoBehaviour
         shootRay.direction = transform.forward;
         if (timer >= timeBetweenBullets && !GameControl.control.cantShoot && Physics.Raycast(shootRay, out shootHit, range, shootableMask))
         {
-            Shoot();
+            if (!shootHit.collider.CompareTag("Player"))
+            {
+                Shoot();
+            }
         }
 
         if (timer >= timeBetweenBullets * effectsDisplayTime)

Assets/Scripts/Pet/PetMovement.cs

@@ -51,6 +51,13 @@ public class PetMovement : MonoBehaviour
                 if (enemyHealth.currentHealth > 0)
                 {
                     nav.SetDestination (enemyPosition.position);
+                    var damping = 2;
+                    var target = enemy.transform;
+
+                    var lookPos = target.position - transform.position;
+                    lookPos.y = 0;
+                    var rotation = Quaternion.LookRotation(lookPos);
+                    transform.rotation = Quaternion.Slerp(transform.rotation, rotation, Time.deltaTime * damping);
                 }
             }
             else

Assets/Scripts/Player/PlayerHealth.cs

@@ -70,6 +70,8 @@ public class PlayerHealth : MonoBehaviour
 
         damaged = false;
         frozen = false;
+
+        healthSlider.value = currentHealth;
     }
 
     public void TakeDamage(int amount)

Assets/Scripts/Player/PlayerShotGunning.cs

@@ -7,7 +7,7 @@ public class PlayerShotGunning : MonoBehaviour, WeaponHandler
     [SerializeField]
     private float damagePerShot = 30f;
     [SerializeField]
-    private float timeBetweenBullets = 0.15f;
+    private float timeBetweenBullets = 1f;
     [SerializeField]
     private float range = 100f;
     public GameObject prefabEffect;
@@ -22,7 +22,7 @@ public class PlayerShotGunning : MonoBehaviour, WeaponHandler
     Light gunLight;
     readonly float effectsDisplayTime = 0.2f;
 
-    private readonly float maxDist = 8f;
+    private readonly float maxDist = 10f;
 
     int numBullet = 3;
     List<GameObject> effects = new List<GameObject>();
@@ -36,6 +36,13 @@ public class PlayerShotGunning : MonoBehaviour, WeaponHandler
         }
         set
         {
+            var diff = value - level;
+            for (int i = 0; i < diff; i++)
+            {
+                AddBullet();
+                numBullet++;
+            }
+
             level = value;
         }
     }
@@ -116,14 +123,16 @@ public class PlayerShotGunning : MonoBehaviour, WeaponHandler
 
             if (Physics.Raycast(shootRay, out shootHit, range, shootableMask))
             {
-                EnemyHealth enemyHealth = shootHit.collider.GetComponent<EnemyHealth>();
+                IEnemyHealthHandler enemyHealth = shootHit.collider.GetComponent<ElementalHealth>();
+                enemyHealth ??= shootHit.collider.GetComponent< EnemyHealth>(); 
+
                 if (enemyHealth != null)
                 {
                     var dist = Vector3.Distance(shootHit.transform.position, transform.position);
                     if (dist <= maxDist)
                     {
                         Debug.Log("Enemy is On Distance");
-                        int finalDamage = (int)(damagePerShot / Math.Sqrt(range));
+                        int finalDamage = (int)(damagePerShot / Math.Sqrt(dist));
                         enemyHealth.TakeDamage(finalDamage, shootHit.point);
                     }
                     else

Assets/Scripts/Player/Weapons/PlayerArrow.cs

@@ -35,18 +35,17 @@ public class PlayerArrow : MonoBehaviour
         if (didHit) return;
 
         didHit = true;
-        if (other.gameObject.TryGetComponent<EnemyHealth>(out var enemyHealth))
+
+        IEnemyHealthHandler enemyHealth = other.gameObject.GetComponent<ElementalHealth>();
+        enemyHealth ??= other.gameObject.GetComponent<EnemyHealth>();
+
+        if (enemyHealth != null)
         {
             var energy = 0.5 * rb.mass * rb.velocity.magnitude * rb.velocity.magnitude;
             var damage = energy * damageMultiplier;
             Debug.Log("damage: "+ damage);
             enemyHealth.TakeDamage((int)damage, enemyHealth.transform.position);
         }
-
-        /*        rb.velocity = Vector3.zero;
-                rb.angularVelocity = Vector3.zero;
-                rb.isKinematic = true;
-                transform.parent = other.transform;*/
         Destroy(gameObject);
     }
 }

Assets/Scripts/Player/Weapons/PlayerSword.cs

@@ -28,7 +28,10 @@ public class PlayerSword : MonoBehaviour, WeaponHandler
 
     void OnTriggerEnter(Collider other)
     {
-        if (other.gameObject.TryGetComponent<EnemyHealth>(out var enemyHealth))
+        IEnemyHealthHandler enemyHealth = other.gameObject.GetComponent<ElementalHealth>();
+        enemyHealth ??= other.gameObject.GetComponent<EnemyHealth>();
+
+        if (enemyHealth != null)
         {
             if (this.animator.GetCurrentAnimatorStateInfo(0).IsName("SwordSwing"))
             {

Assets/Scripts/Quest/Temple/Temple.cs

@@ -111,7 +111,10 @@ public class Temple : MonoBehaviour
         GlobalManager.Instance.TotalTime += questTime;
         ToastManager.Instance.ShowToastQueue(System.TimeSpan.FromSeconds(GlobalManager.Instance.TotalTime).ToString("mm':'ss"), 1);
 
-        StartCoroutine(saveDialogHandler());
+        if (idxCurrentQuest != 4)
+        {
+            StartCoroutine(saveDialogHandler());
+        }
     }
 
     private void OnTriggerEnter(Collider other)
@@ -163,7 +166,7 @@ public class Temple : MonoBehaviour
         if (questNumberEnemy.IsEmpty())
         {
             ExitingQuest();
-            if (idxCurrentQuest == 1)
+            if (idxCurrentQuest == 4)
             {
                 ToastManager.Instance.ShowToast("YOU WIN", 1);
                 StartCoroutine(winHandler());

Assets/Scripts/SaveLoad/SaveLoadManager.cs

@@ -76,6 +76,7 @@ public class SaveLoadManager : MonoBehaviour
     public void LoadState(int Id)
     {
         var state = GetSavedStateFromFile(Id);
+        state.playerStateSave.playerName = GlobalManager.Instance.PlayerName;
         if (state != null)
         {
             Debug.Log("Load State " + Id);

Assets/Scripts/SaveLoad/SavePlace.cs

@@ -24,11 +24,6 @@ public class SavePlace : MonoBehaviour
             }
             SaveLoadManager.Instance.ShowUI();
         }
-
-        if (onArea && Input.GetKeyDown(KeyCode.N))
-        {
-            SaveLoadManager.Instance.LoadState(2);
-        }
     }
 
     private void OnTriggerEnter(Collider other)

README.md

@@ -131,7 +131,7 @@ All the specifications were implemented.
 | 2. | Angelica Winasta Sinisuka | Shopkeeper, Cheat, Enemy | 000
 | 3. | Averrous Saloom | Main Menu, Game Over, HUD, Story Mode | 000
 | 4. | Malik Akbar Hashemi Rafsanjani | Weapon, Story Mode | 000
-| 5. | Nelsen Putra | Initialitazion, Local Scoreboard, ReadMe | 000
+| 5. | Nelsen Putra | Initialization, Local Scoreboard, README | 000
 
 
 ## Contact