Oprava spawnování monster, optimalizace v CommandProcessor a EventProcessor. Přesunutí některých tříd do vlastních namespaců, pročištění kódu, úpravy formátování, odstranění nepoužívaných souborů a zakomentovaného kódu
This commit is contained in:
parent
e5d746d597
commit
243f071a43
62 changed files with 873 additions and 1217 deletions
|
|
@ -8,11 +8,14 @@ using Microsoft.Xna.Framework.Input;
|
|||
using MonoGameLibrary;
|
||||
using MonoGameLibrary.Graphics;
|
||||
using MonoGameLibrary.Input;
|
||||
using ONDClient.Enemies;
|
||||
using ONDClient.Map;
|
||||
using ONDClient.Net;
|
||||
using ONDClient.Sound;
|
||||
|
||||
namespace ONDClient.GUI;
|
||||
|
||||
public class UIManager {
|
||||
public static class UIManager {
|
||||
|
||||
public static class ScreenTypes {
|
||||
public const string OFFICE = "office";
|
||||
|
|
@ -24,35 +27,31 @@ public class UIManager {
|
|||
public const string LOADING = "loading";
|
||||
}
|
||||
|
||||
private static Screen officeScreen = new(ScreenTypes.OFFICE);
|
||||
private static Screen monitorScreen = new(ScreenTypes.CAMERAS);
|
||||
private static Screen overlayScreen = new(ScreenTypes.OVERLAY);
|
||||
private static Screen winScreen = new(ScreenTypes.WIN);
|
||||
private static Screen loseScreen = new(ScreenTypes.LOSE);
|
||||
private static Screen menuScreen = new(ScreenTypes.MENU);
|
||||
private static Screen loadingScreen = new(ScreenTypes.LOADING);
|
||||
private static readonly Screen officeScreen = new(ScreenTypes.OFFICE);
|
||||
private static readonly Screen monitorScreen = new(ScreenTypes.CAMERAS);
|
||||
private static readonly Screen overlayScreen = new(ScreenTypes.OVERLAY);
|
||||
private static readonly Screen winScreen = new(ScreenTypes.WIN);
|
||||
private static readonly Screen loseScreen = new(ScreenTypes.LOSE);
|
||||
private static readonly Screen menuScreen = new(ScreenTypes.MENU);
|
||||
private static readonly Screen loadingScreen = new(ScreenTypes.LOADING);
|
||||
|
||||
private static TextureAtlas testAtlas;
|
||||
// private static TextureAtlas testAtlas;
|
||||
public static TextureAtlas OfficeAtlas{ get; private set; }
|
||||
public static TextureAtlas MonitorAtlas{ get; private set; }
|
||||
public static TextureAtlas EnemyAtlas{ get; private set; }
|
||||
public static TextureAtlas RoomAtlas{ get; private set; }
|
||||
public static SpriteFont PixelMonoFont{ get; private set; }
|
||||
|
||||
public static int GlobalPixelMultiplier{ get; private set; }
|
||||
|
||||
|
||||
// private Dictionary<(int, int), UIElement> doorElements = new();
|
||||
private static Dictionary<int, UIElement> enemyElements = new();
|
||||
private static TimerUIElement timerElement;
|
||||
private static UIElement cameraView;
|
||||
private static Dictionary<int, UIElement> lightIndicators = new();
|
||||
|
||||
private static InputListenerHook monitorSwitchHook;
|
||||
|
||||
private static bool fullBright = false; // Debug
|
||||
|
||||
public static void LoadAssets() {
|
||||
testAtlas = TextureAtlas.FromFile(Core.content, "images/testBlocks-definition.xml");
|
||||
// testAtlas = TextureAtlas.FromFile(Core.content, "images/testBlocks-definition.xml");
|
||||
OfficeAtlas = TextureAtlas.FromFile(Core.content, "images/office-definition.xml");
|
||||
MonitorAtlas = TextureAtlas.FromFile(Core.content, "images/monitor-definition.xml");
|
||||
EnemyAtlas = TextureAtlas.FromFile(Core.content, "images/enemies-definition.xml");
|
||||
|
|
@ -61,21 +60,16 @@ public class UIManager {
|
|||
}
|
||||
|
||||
public static void InitUI() {
|
||||
GlobalPixelMultiplier = Core.graphicsDevice.Viewport.Height / 360;
|
||||
UIElement.GlobalPixelMultiplier = Core.graphicsDevice.Viewport.Height / 360;
|
||||
|
||||
Screen.AddScreens([officeScreen, monitorScreen, overlayScreen, winScreen, loseScreen, menuScreen, loadingScreen]);
|
||||
// Screen.SetScreen(ScreenTypes.OFFICE);
|
||||
// Screen.SetOverlayScreen(ScreenTypes.OVERLAY);
|
||||
|
||||
// office
|
||||
officeScreen.AddElement("office_left", new UIElement([OfficeAtlas["left-open"], OfficeAtlas["left-closed"]], Point.Zero));
|
||||
officeScreen.AddElement("office_centre", new UIElement([OfficeAtlas["centre-open"], OfficeAtlas["centre-closed"]], new Point(200, 0)));
|
||||
officeScreen.AddElement("office_right", new UIElement([OfficeAtlas["right-open"], OfficeAtlas["right-closed"]], new Point(440, 0)));
|
||||
|
||||
// officeScreen.AddElement("test",
|
||||
// new UIElement(testAtlas[0], Point.Zero)
|
||||
// {Pressable = true, OnMousePress = () => Console.WriteLine("Pressed!")}
|
||||
// );
|
||||
|
||||
// monitor
|
||||
monitorScreen.AddElement("screen", new UIElement(MonitorAtlas["screen"], Point.Zero));
|
||||
monitorScreen.AddElement("view-frame", new UIElement(MonitorAtlas["view-frame"], new Point(62, 55)));
|
||||
monitorScreen.AddElement("map-frame", new UIElement(MonitorAtlas["map-frame"], new Point(334, 135)));
|
||||
|
|
@ -94,13 +88,11 @@ public class UIManager {
|
|||
monitorScreen.AddElement("p2-office-door-right", new UIElement([MonitorAtlas["door-office-p2-right-open"], MonitorAtlas["door-office-p2-right-closed"]], new Point(400, 144)));
|
||||
monitorScreen.AddElement("p2-office-door-centre", new UIElement([MonitorAtlas["door-office-p2-centre-open"], MonitorAtlas["door-office-p2-centre-closed"]], new Point(400, 144)));
|
||||
monitorScreen.AddElement("p2-office-door-left", new UIElement([MonitorAtlas["door-office-p2-left-open"], MonitorAtlas["door-office-p2-left-closed"]], new Point(400, 144)));
|
||||
|
||||
|
||||
// main menu
|
||||
// timer and power
|
||||
timerElement = new(new(0, 0), PixelMonoFont);
|
||||
overlayScreen.AddElement("timer", timerElement);
|
||||
officeScreen.AddElement("power-p1-office", new PowerIndicator(new(timerElement.Bounds.Item1.X, timerElement.Bounds.Item2.Y + 5), PixelMonoFont, Client.Player, "POWER: "));
|
||||
|
||||
|
||||
TextUIElement powerLabel = (TextUIElement)
|
||||
monitorScreen.AddElement("power-label", new TextUIElement(new(510, 150), PixelMonoFont){Text = "POWER:"});
|
||||
|
|
@ -108,6 +100,7 @@ public class UIManager {
|
|||
monitorScreen.AddElement("power-p2", new PowerIndicator(new(powerLabel.Bounds.Item1.X + 10, powerLabel.Bounds.Item2.Y + 10), PixelMonoFont, Client.Opponent, ""){Color = new Color(220, 10, 10, 255)});
|
||||
monitorScreen.AddElement("power-p1", new PowerIndicator( new (powerP1.Bounds.Item1.X, powerP1.Bounds.Item2.Y + 5), PixelMonoFont, Client.Player, ""){Color = new Color(15, 190, 247, 255)});
|
||||
|
||||
// loading
|
||||
ReturnToMenuElement returnToMenuElement = new ReturnToMenuElement(new(320, 290), PixelMonoFont);
|
||||
winScreen.AddElement("win-text", new TextUIElement(new(320, 180), PixelMonoFont, TextUIElement.Alignment.CENTER){Text = "YOU WIN", Color = Color.Green});
|
||||
loseScreen.AddElement("lose-text", new TextUIElement(new(320, 180), PixelMonoFont, TextUIElement.Alignment.CENTER){Text = "YOU LOSE", Color = Color.Red});
|
||||
|
|
@ -115,6 +108,7 @@ public class UIManager {
|
|||
loseScreen.AddElement("press-space", returnToMenuElement);
|
||||
loadingScreen.AddElement("press-space", returnToMenuElement);
|
||||
|
||||
// main menu
|
||||
MenuInputField usernameField = (MenuInputField)menuScreen.AddElement("username-field", new MenuInputField(PixelMonoFont, new(20, 20), "USERNAME: "));
|
||||
MenuInputField field = (MenuInputField)menuScreen.AddElement("server-ip-field", new MenuInputField(PixelMonoFont, new(usernameField.Bounds.Item1.X, usernameField.Bounds.Item2.Y + 20), "SERVER IP: ", "127.0.0.1"));
|
||||
UIElement connectButton = menuScreen.AddElement("server-ip-submit", new TextUIElement(new Point(field.Bounds.Item1.X, field.Bounds.Item2.Y), PixelMonoFont)
|
||||
|
|
@ -123,7 +117,7 @@ public class UIManager {
|
|||
Pressable = true,
|
||||
OnMousePress = () => {
|
||||
|
||||
Client.Player.username = usernameField.Text;
|
||||
Client.Player.Username = usernameField.Text;
|
||||
Client.Connect(field.Text, 9012);
|
||||
Screen.SetScreen(ScreenTypes.LOADING);
|
||||
}
|
||||
|
|
@ -132,7 +126,7 @@ public class UIManager {
|
|||
new TextUIElement(new(connectButton.Bounds.Item1.X, connectButton.Bounds.Item2.Y + 30), PixelMonoFont) {Text = "HOST", Pressable = true,
|
||||
OnMousePress = () => {
|
||||
Client.StartServer();
|
||||
Client.Player.username = usernameField.Text;
|
||||
Client.Player.Username = usernameField.Text;
|
||||
Client.Connect("127.0.0.1", 9012);
|
||||
Screen.SetScreen(ScreenTypes.LOADING);
|
||||
|
||||
|
|
@ -146,17 +140,14 @@ public class UIManager {
|
|||
ResetUI();
|
||||
Screen.SetScreen(ScreenTypes.MENU);
|
||||
CommandManager.AllowGameControls(false);
|
||||
// if(Client.Player.username != null)
|
||||
// ((MenuInputField)menuScreen["username-field"]).Text = Client.Player.username;
|
||||
}
|
||||
|
||||
public static void SpawnMapElements(TileConnectorProjection[] doors) {
|
||||
|
||||
|
||||
for (int i = 0; i < 5; i++){ // NOTE: this loop does y in reverse, y labels are inverted to match server
|
||||
for (int j = 0; j < 5; j++){
|
||||
int id = ClientMapManager.CoordsToId(i, 4 - j);
|
||||
if (Client.Player.state.officeTileId == id || Client.Opponent.state.officeTileId == id) continue; // TODO: remove the other check for office
|
||||
if (Client.Player.State.OfficeTileId == id || Client.Opponent.State.OfficeTileId == id) continue;
|
||||
Point point1 = new Point(336 + (32 * i), 144 + (32 * j));
|
||||
Point point2 = new Point(367 + (32 * i), 175 + (32 * j));
|
||||
monitorScreen.AddElement(
|
||||
|
|
@ -168,16 +159,11 @@ public class UIManager {
|
|||
$"light{id}", new UIElement(MonitorAtlas["map-light-indicator"], point1)
|
||||
{Visible = false},
|
||||
true));
|
||||
|
||||
//
|
||||
// if (doorPositions.ContainsKey((i, j))){
|
||||
// monitorScreen.AddElement("door"+doorPositions[(i, j)], new UIElement([monitorAtlas[5], monitorAtlas[6]], point1));
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
monitorScreen.AddElement("eye-player", new UIElement(MonitorAtlas["eye-small-player"], monitorScreen["room"+Client.Player.state.camera].Bounds.Item1), true);
|
||||
monitorScreen.AddElement("eye-opponent", new UIElement([MonitorAtlas["eye-small-opponent-closed"], MonitorAtlas["eye-small-opponent-open"]], monitorScreen["room"+Client.Opponent.state.camera].Bounds.Item1), true);
|
||||
monitorScreen.AddElement("eye-player", new UIElement(MonitorAtlas["eye-small-player"], monitorScreen["room"+Client.Player.State.Camera].Bounds.Item1), true);
|
||||
monitorScreen.AddElement("eye-opponent", new UIElement([MonitorAtlas["eye-small-opponent-closed"], MonitorAtlas["eye-small-opponent-open"]], monitorScreen["room"+Client.Opponent.State.Camera].Bounds.Item1), true);
|
||||
|
||||
foreach (var door in doors){
|
||||
if(door.Type != ConnectorType.DOOR_REMOTE) continue;
|
||||
|
|
@ -198,8 +184,8 @@ public class UIManager {
|
|||
Screen.SetOverlayScreen(ScreenTypes.OVERLAY);
|
||||
|
||||
CommandManager.AllowGameControls(true);
|
||||
UpdateCameras([Client.Player.state.camera]); // in case there is an enemy on the default camera
|
||||
cameraView.SetTexture(Client.Player.state.camera);
|
||||
UpdateCameras([Client.Player.State.Camera]); // in case there is an enemy on the default camera
|
||||
cameraView.SetTexture(Client.Player.State.Camera);
|
||||
}
|
||||
public static void StartTimer() {
|
||||
timerElement.Start();
|
||||
|
|
@ -236,17 +222,17 @@ public class UIManager {
|
|||
}
|
||||
}
|
||||
|
||||
public static void ChangeDoorStateOpponent(Direction dir, bool state) { // TODO: overload to avoid excessive casting
|
||||
public static void ChangeDoorStateOpponent(Direction dir, bool state) {
|
||||
int stateInt = state ? 1 : 0;
|
||||
|
||||
switch ((int)dir){
|
||||
case 0:
|
||||
switch (dir){
|
||||
case Direction.EAST:
|
||||
monitorScreen["p2-office-door-left"].SetTexture(stateInt);
|
||||
break;
|
||||
case 1:
|
||||
case Direction.NORTH:
|
||||
monitorScreen["p2-office-door-centre"].SetTexture(stateInt);
|
||||
break;
|
||||
case 2:
|
||||
case Direction.WEST:
|
||||
monitorScreen["p2-office-door-right"].SetTexture(stateInt);
|
||||
break;
|
||||
}
|
||||
|
|
@ -258,7 +244,7 @@ public class UIManager {
|
|||
|
||||
public static void ChangeMonitorState(bool state) {
|
||||
Screen.SetScreen(state ? ScreenTypes.CAMERAS : ScreenTypes.OFFICE);
|
||||
UpdateCameras([Client.Player.state.camera]);
|
||||
UpdateCameras([Client.Player.State.Camera]);
|
||||
}
|
||||
|
||||
public static void ChangeMonitorStateOpponent(bool state) {
|
||||
|
|
@ -274,15 +260,15 @@ public class UIManager {
|
|||
public static void UpdateCameras(int[] camIds) {
|
||||
foreach (var id in camIds){
|
||||
MapTileProjection tile = ClientMapManager.Get(id);
|
||||
if(tile.Owner == null || tile.Id == Client.Player.state.officeTileId || tile.Id == Client.Opponent.state.officeTileId) continue;
|
||||
if(tile.Owner == null || tile.Id == Client.Player.State.OfficeTileId || tile.Id == Client.Opponent.State.OfficeTileId) continue;
|
||||
lightIndicators[id].Visible = tile.Lit;
|
||||
}
|
||||
|
||||
if (camIds.Contains(Client.Player.state.camera)){
|
||||
bool lit = ClientMapManager.Get(Client.Player.state.camera).Lit || fullBright;
|
||||
if (camIds.Contains(Client.Player.State.Camera)){
|
||||
bool lit = ClientMapManager.Get(Client.Player.State.Camera).Lit || fullBright;
|
||||
cameraView.Visible = lit;
|
||||
enemyElements.Values.Where(e => e.Visible).ToList().ForEach(e => e.Visible = false);
|
||||
ClientEnemy[] enemies = ClientEnemyManager.GetByLocation(ClientMapManager.Get(Client.Player.state.camera));
|
||||
ClientEnemy[] enemies = ClientEnemyManager.GetByLocation(ClientMapManager.Get(Client.Player.State.Camera));
|
||||
foreach (var enemy in enemies){
|
||||
enemyElements.TryGetValue(enemy.Id, out var element);
|
||||
if (element == null) continue;
|
||||
|
|
@ -291,7 +277,7 @@ public class UIManager {
|
|||
enemyElement.SetTexture(lit);
|
||||
}
|
||||
|
||||
if (!lit && Client.Player.state.monitorUp && enemies.Any(e => e.TypeId == (int)EnemyType.NEKO)){
|
||||
if (!lit && Client.Player.State.MonitorUp && enemies.Any(e => e.Type == EnemyType.NEKO)){
|
||||
SoundManager.StartNekoPurr();
|
||||
}
|
||||
else{
|
||||
|
|
@ -302,7 +288,6 @@ public class UIManager {
|
|||
|
||||
public static void ChangeCameraOpponent(int id) {
|
||||
monitorScreen["eye-opponent"].SetPosition(monitorScreen["room"+id].Bounds.Item1);
|
||||
|
||||
}
|
||||
|
||||
public static void Jumpscare(ClientEnemy enemy) {
|
||||
|
|
@ -310,10 +295,6 @@ public class UIManager {
|
|||
enemy.JumpscareSprite.Play();
|
||||
timerElement.Stop();
|
||||
CommandManager.AllowGameControls(false);
|
||||
// UIElement jumpscareElement = enemy.Sprite.Clone();
|
||||
// jumpscareElement.ScaleMultiplier = 2;
|
||||
// jumpscareElement.SetPosition(new Point(0, 0));
|
||||
// officeScreen.AddElement("jumpscare", jumpscareElement);
|
||||
}
|
||||
|
||||
public static void ShowVictoryScreen() {
|
||||
|
|
@ -322,7 +303,6 @@ public class UIManager {
|
|||
CommandManager.AllowGameControls(false);
|
||||
SoundManager.StopAmbience();
|
||||
SoundManager.StopNekoPurr();
|
||||
// InputManager.AddListener(Keys.Space, DisplayMainMenu, InputTiming.PRESS, new InputListenerHook(true, true));
|
||||
}
|
||||
|
||||
public static void ShowDeathScreen() {
|
||||
|
|
@ -331,11 +311,10 @@ public class UIManager {
|
|||
CommandManager.AllowGameControls(false);
|
||||
SoundManager.StopAmbience();
|
||||
SoundManager.StopNekoPurr();
|
||||
// InputManager.AddListener(Keys.Space, DisplayMainMenu, InputTiming.PRESS, new InputListenerHook(true, true));
|
||||
}
|
||||
|
||||
public static void ResetUI() {
|
||||
foreach (Screen screen in Screen.Screens.Values){
|
||||
foreach (Screen screen in Screen.GetAllScreens()){
|
||||
screen.RemoveTemporary();
|
||||
}
|
||||
lightIndicators.Clear();
|
||||
|
|
@ -343,13 +322,4 @@ public class UIManager {
|
|||
|
||||
timerElement.Stop();
|
||||
}
|
||||
|
||||
// private static Point GetRoomUIPos((int x, int y) pos) {
|
||||
// return new Point(336 + (32 * pos.x), 144 + (32 * pos.y));
|
||||
// }
|
||||
|
||||
public static void SetLoadingScreenMessage(string text) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue