Skip to content

Commit 467b263

Browse files
committed
Fix Platformer game's camera enter/exit room events
1 parent db7a855 commit 467b263

File tree

8 files changed

+32
-6
lines changed

8 files changed

+32
-6
lines changed

Assets/PlatformGameAssets/Scenes/PlatformMain.unity

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/PlatformGameAssets/Scenes/TestRoom.unity

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/Game/DataCollection/DungeonData.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,8 @@ public void OnRoomEnter(RoomData roomData)
411411

412412
public void OnRoomExit()
413413
{
414+
var test = _currentRoom;
415+
var test2 = _currentRoom;
414416
_currentRoom.ExitRoom();
415417
}
416418

Assets/Scripts/Game/EnemyGenerator/EnemyGeneratorManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public List<EnemySO> GetEnemyList(DifficultyLevels difficultyLevels)
4747
SetGeneticAlgorithmSettings(difficultyLevels);
4848
EvolveEnemies();
4949
EnemySOFactory enemyFactory = new EnemySOFactory(_searchSpaceConfig.MovementSet, _searchSpaceConfig.WeaponSet);
50+
var test = _generator.Solution.ToList();
5051
return enemyFactory.GetEnemiesSOFromSolution(_generator.Solution.ToList());
5152
}
5253

Assets/Scripts/Game/Events/EnterRoomEvent.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
using UnityEngine;
66
using Util;
77
using Game.GameManager.Player;
8+
using Game.GameManager;
9+
using PlatformGame.Player;
10+
using System.Collections;
11+
using Overlord.ProfileAnalyst;
812

913
namespace Game.Events
1014
{
@@ -17,8 +21,16 @@ public class EnterRoomEventArgs : EventArgs
1721

1822
public EnterRoomEventArgs(Coordinates roomCoordinates, Dimensions roomDimensions, EnemyByAmountDictionary enemiesInRoom, Vector3 roomPosition)
1923
{
24+
var gameType = GameManagerSingleton.Instance.GameType;
2025
PositionInScene = roomPosition;
21-
PlayerHealthWhenEntering = DungeonPlayer.Instance.GetComponent<PlayerController>().GetHealth();
26+
27+
if (gameType == Enums.GameType.TopDown)
28+
PlayerHealthWhenEntering = DungeonPlayer.Instance.GetComponent<Game.GameManager.Player.PlayerController>().GetHealth();
29+
else if (gameType == Enums.GameType.Platformer)
30+
{
31+
PlayerHealthWhenEntering = GameObject.FindWithTag("Player").GetComponent<PlatformGame.Player.PlayerHealth>().GetHealth();
32+
}
33+
2234
var enterTime = Time.realtimeSinceStartup;
2335
RoomData = ScriptableObject.CreateInstance<RoomData>();
2436
RoomData.Init(roomCoordinates, roomDimensions, enemiesInRoom, enterTime);

Assets/Scripts/Game/GameManager/GameManagerSingleton.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
using UnityEngine.Analytics;
88
using UnityEngine.SceneManagement;
99
using Game.Events;
10+
using Util;
1011

1112
namespace Game.GameManager
1213
{
1314
public class GameManagerSingleton : MonoBehaviour, ISoundEmitter
1415
{
1516
// TODO: Replace type code with class
1617
public bool IsInPortuguese = false;
18+
public Enums.GameType GameType;
1719
public static GameManagerSingleton Instance { get; private set; }
1820
[field: SerializeField] public ProjectileTypeSO playerProjectile { get; set; }
1921

Assets/Scripts/Game/LevelManager/DungeonLoader/DungeonSceneManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void Start()
4444
PlayBackgroundMusic();
4545
SetGameOverCurrentLevel();
4646
LoadSecondaryScenes();
47-
48-
4947
StartCoroutine(_dungeonLoader.OnStartMap(_currentDungeonSo.BiomeName));
5048
}
5149

Assets/Scripts/Game/PlatformGame/Gameplay/HealthController.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ protected virtual void InitializeHealth()
2727
Health = maxHealth;
2828
}
2929

30+
public int GetHealth()
31+
{
32+
return Health;
33+
}
34+
3035
public virtual void TakeDamage(int damage)
3136
{
3237
if (!_canTakeDamage) return;

0 commit comments

Comments
 (0)