Merge branch 'base_arch' of...

Merge branch 'base_arch' of https://gitlab.informatika.org/MuhamadAjiW/if3210-2024-unity-pip into base_arch

Assets/_Scripts/Core/Entities/Mobs/EnemyEntity.cs

@@ -2,14 +2,14 @@ public abstract class EnemyEntity : CombatantEntity
 {
     // Set-Getters
     public new string AttackLayerCode => EnvironmentConfig.LAYER_ENEMY_ATTACK;
-    public new float AttackMultiplier => GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.instance.difficulty].enemyDamageMultiplier;
+    public new float AttackMultiplier => GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.Instance.difficulty].enemyDamageMultiplier;
 
     // Functions
     new protected void Start()
     {
         base.Start();
-        Health *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.instance.difficulty].enemyHealthMultiplier;
-        BaseDamage *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.instance.difficulty].enemyDamageMultiplier;
+        Health *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.Instance.difficulty].enemyHealthMultiplier;
+        BaseDamage *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.Instance.difficulty].enemyDamageMultiplier;
         tag = EnvironmentConfig.TAG_ENEMY;
     }
 }

Assets/_Scripts/Core/Game/Data/Currency.meta

+fileFormatVersion: 2
+guid: 2d89e4cfae934aa09979fad32e262ec0
+timeCreated: 1713883261
\ No newline at end of file

Assets/_Scripts/Core/Game/Data/Currency/CurrencyData.cs

+namespace _Scripts.Core.Game.Data.Currency
+{
+    public class CurrencyData
+    {
+        public int Balance = 0; 
+        
+        // public List<Transaction> = TransactionHistory;
+    }
+}
\ No newline at end of file

Assets/_Scripts/Core/Game/Data/Currency/CurrencyData.cs.meta

+fileFormatVersion: 2
+guid: 6f7fc6eb0c604902b0d77772174f81f6
+timeCreated: 1713883267
\ No newline at end of file

Assets/_Scripts/Core/Game/Data/GameSaveData.cs

@@ -6,15 +6,18 @@ using UnityEngine;
 public class GameSaveData : MonoBehaviour 
 {
     // Static Instance
-    public static GameSaveData instance;
+    public static GameSaveData Instance;
 
     // Attributes
     public DifficultyType difficulty = DifficultyType.NORMAL;
+    // Save the currency of the player
+    // Save the story state of the player
+    // Save the position and the level of the player
 
     // Constructor
     private void Awake()
     {
-        instance = this;
+        Instance = this;
         DontDestroyOnLoad(gameObject);
     }
 }

Assets/_Scripts/Core/Game/Data/Story.meta

+fileFormatVersion: 2
+guid: d393217bbba240fd88861627c361af13
+timeCreated: 1713883216
\ No newline at end of file

Assets/_Scripts/Core/Game/Data/Story/StoryData.cs

+using System.Collections.Generic;
+
+namespace _Scripts.Core.Game.Data.Story
+{
+    public class StoryData
+    {
+        public List<int> List;
+    }
+}
\ No newline at end of file

Assets/_Scripts/Core/Game/Data/Story/StoryData.cs.meta

+fileFormatVersion: 2
+guid: a7ed274c9f82410da38727bb237a37e9
+timeCreated: 1713883231
\ No newline at end of file

Assets/_Scripts/Core/Objects/Interactables/Shopkeeper.cs

+namespace _Scripts.Core.Objects.Interactables
+{
+    public class Shopkeeper : InteractableObject
+    {
+        public override void Interact()
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
\ No newline at end of file

Assets/_Scripts/Core/Objects/Interactables/Shopkeeper.cs.meta

+fileFormatVersion: 2
+guid: 5d0fb461d43c42cdbc522e94a22511eb
+timeCreated: 1713885806
\ No newline at end of file

Assets/_Scripts/Core/Player/Player.cs

@@ -17,14 +17,14 @@ public class Player : PlayerEntity
 
     // Set-Getters
     public new string AttackLayerCode => EnvironmentConfig.LAYER_PLAYER;
-    public new float AttackMultiplier => GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.instance.difficulty].playerDamageMultiplier;
+    public new float AttackMultiplier => GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.Instance.difficulty].playerDamageMultiplier;
 
     // Constructor
     new void Start()
     {
         base.Start();
         SetIdPrefix(ObjectIdPrefix);
-        Health *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.instance.difficulty].playerHealthMultiplier;
+        Health *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.Instance.difficulty].playerHealthMultiplier;
         stats = new PlayerStats(this);
         stateController = new PlayerStateController(this);
         inputController = new PlayerInputController(this);