From df846f469c2af76f9153df29ab8382cb704d8ff9 Mon Sep 17 00:00:00 2001 From: Julius <juliusfe@stud.ntnu.no> Date: Mon, 28 Nov 2022 16:54:37 +0100 Subject: [PATCH] Fixed xp drop --- MrBigsock/Assets/Code/PlayerController.cs | 18 +++++++++++------- .../Resources/Prefabs/Enemy_Slime.prefab | 2 +- .../Resources/Prefabs/enemy_orc_range.prefab | 2 +- .../Resources/Prefabs/enemy_orc_warrior.prefab | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs index 1da5c97e..8a5b37fd 100644 --- a/MrBigsock/Assets/Code/PlayerController.cs +++ b/MrBigsock/Assets/Code/PlayerController.cs @@ -17,7 +17,7 @@ namespace BigSock { { public const int SKILL_POINTS_PR_LVL = 3; // Skill points to gain pr level up. - public const int SKILL_POINTS_START = 5; // Skill points to start with. + public const int SKILL_POINTS_START = 0; // Skill points to start with. public const float XP_SCALE_RATE = 3.0f; // Multiplier for xp gain, helps test system while game is tiny. @@ -61,14 +61,14 @@ namespace BigSock { { base.Start(); - - utilBar?.WithXP((int)xp, (int)maxXp) + + utilBar?.WithXP((int)xp, (int)maxXp) ?.WithHealth(Convert.ToInt32(HP), Convert.ToInt32(MaxHP)); animator = GetComponent<Animator>(); spriteRenderer = GetComponent<SpriteRenderer>(); - + //!! DEBUG: Add item to player at start to test if it works. @@ -81,10 +81,14 @@ namespace BigSock { //var tmp = PrefabService.SINGLETON; //var tmp = SpriteService.SINGLETON; - _testAttack = (IAttack) AbilityService.SINGLETON.Get(104); - _testAttack2 = (IAttack) AbilityService.SINGLETON.Get(102); - _testAttack3 = (IAttack) AbilityService.SINGLETON.Get(101); + _testAttack = (IAttack)AbilityService.SINGLETON.Get(104); + _testAttack2 = (IAttack)AbilityService.SINGLETON.Get(102); + _testAttack3 = (IAttack)AbilityService.SINGLETON.Get(101); _dodge = AbilityService.SINGLETON.Get(201); + + _ = AudioService.SINGLETON; + _ = SpriteService.SINGLETON; + _ = PrefabService.SINGLETON; } diff --git a/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab index 65c081ce..bcb42954 100644 --- a/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab +++ b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab @@ -178,7 +178,7 @@ MonoBehaviour: knockbackForce: 3 baseHP: 20 baseMaxHP: 20 - dropXP: 0 + dropXP: 20 xp: 0 maxXp: 0 level: 0 diff --git a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab index 07f46cc1..16f16233 100644 --- a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab +++ b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab @@ -178,7 +178,7 @@ MonoBehaviour: knockbackForce: 2 baseHP: 10 baseMaxHP: 10 - dropXP: 0 + dropXP: 20 xp: 0 maxXp: 0 level: 0 diff --git a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab index 2e365bb6..ea2aa534 100644 --- a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab +++ b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab @@ -151,7 +151,7 @@ MonoBehaviour: knockbackForce: 3 baseHP: 10 baseMaxHP: 10 - dropXP: 0 + dropXP: 20 xp: 0 maxXp: 0 level: 0 -- GitLab