diff --git a/.gitignore b/.gitignore
index add57be..646b59c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ bin/
obj/
/packages/
riderModule.iml
-/_ReSharper.Caches/
\ No newline at end of file
+/_ReSharper.Caches/
+OneNightDuel
\ No newline at end of file
diff --git a/.idea/.idea.FNAF_Clone/.idea/workspace.xml b/.idea/.idea.FNAF_Clone/.idea/workspace.xml
new file mode 100644
index 0000000..b8aee22
--- /dev/null
+++ b/.idea/.idea.FNAF_Clone/.idea/workspace.xml
@@ -0,0 +1,733 @@
+
+
+
+ FNAF_Clone/FNAF_Clone.csproj
+ FNAF_Server/FNAF_Server.csproj
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 1
+}
+
+
+
+
+
+ {
+ "keyToString": {
+ ".NET Project.FNAF_Clone.executor": "Run",
+ ".NET Project.FNAF_Server.executor": "Debug",
+ "ModuleVcsDetector.initialDetectionPerformed": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "SHELLCHECK.PATH": "/home/perry/.local/share/JetBrains/Rider2025.1/Shell Script/shellcheck",
+ "git-widget-placeholder": "master",
+ "last_opened_file_path": "/home/perry/RiderProjects/FNAF_Clone/MonoGameLibrary/MonoGameLibrary/bin/Debug/net8.0/MonoGameLibrary.dll",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "CodeLensConfigurable",
+ "vue.rearranger.settings.migration": "true"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1762153333646
+
+
+ 1762153333646
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/FNAF_Server/Enemies/SpotEnemy.cs
+ 59
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/FNAF_Server/Enemies/RoamingPathfinder.cs
+ 26
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/ONDClient/GUI/LoadingUIElement.cs
+ 19
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/ONDClient/GUI/Screen.cs
+ 145
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/FNAF_Server/CommandProcessor.cs
+ 39
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/ONDClient/GUI/UIElement.cs
+ 69
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/FNAF_Server/Enemies/RoamingPathfinder.cs
+ 47
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/FNAF_Server/Enemies/RoamingPathfinder.cs
+ 79
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/ONDClient/EventProcessor.cs
+ 83
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/ONDClient/GUI/JumpscareUIElement.cs
+ 44
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.FNAF_Clone/.idea/.gitignore b/.idea/.idea.OneNightDuel/.idea/.gitignore
similarity index 100%
rename from .idea/.idea.FNAF_Clone/.idea/.gitignore
rename to .idea/.idea.OneNightDuel/.idea/.gitignore
diff --git a/.idea/.idea.OneNightDuel/.idea/.name b/.idea/.idea.OneNightDuel/.idea/.name
new file mode 100644
index 0000000..b7384fd
--- /dev/null
+++ b/.idea/.idea.OneNightDuel/.idea/.name
@@ -0,0 +1 @@
+OneNightDuel
\ No newline at end of file
diff --git a/.idea/.idea.FNAF_Clone/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.OneNightDuel/.idea/codeStyles/codeStyleConfig.xml
similarity index 100%
rename from .idea/.idea.FNAF_Clone/.idea/codeStyles/codeStyleConfig.xml
rename to .idea/.idea.OneNightDuel/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/.idea.FNAF_Clone/.idea/encodings.xml b/.idea/.idea.OneNightDuel/.idea/encodings.xml
similarity index 100%
rename from .idea/.idea.FNAF_Clone/.idea/encodings.xml
rename to .idea/.idea.OneNightDuel/.idea/encodings.xml
diff --git a/.idea/.idea.FNAF_Clone/.idea/indexLayout.xml b/.idea/.idea.OneNightDuel/.idea/indexLayout.xml
similarity index 75%
rename from .idea/.idea.FNAF_Clone/.idea/indexLayout.xml
rename to .idea/.idea.OneNightDuel/.idea/indexLayout.xml
index e52aba0..90e24b4 100644
--- a/.idea/.idea.FNAF_Clone/.idea/indexLayout.xml
+++ b/.idea/.idea.OneNightDuel/.idea/indexLayout.xml
@@ -4,6 +4,8 @@
FNAF_Server
+ build-linux.sh
+ launch-server.sh
diff --git a/.idea/.idea.FNAF_Clone/.idea/vcs.xml b/.idea/.idea.OneNightDuel/.idea/vcs.xml
similarity index 100%
rename from .idea/.idea.FNAF_Clone/.idea/vcs.xml
rename to .idea/.idea.OneNightDuel/.idea/vcs.xml
diff --git a/FNAF_Clone/Input/InputListenerHook.cs b/FNAF_Clone/Input/InputListenerHook.cs
deleted file mode 100644
index 552e75a..0000000
--- a/FNAF_Clone/Input/InputListenerHook.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace FNAF_Clone.Input;
-
-public class InputListenerHook(bool enabled, bool oneTimeOnly = false) {
- public bool Enabled { get; set; } = enabled;
- public bool RemoveOnNextTrigger { get; set; } = oneTimeOnly;
-}
\ No newline at end of file
diff --git a/FNAF_Clone/Input/InputManager.cs b/FNAF_Clone/Input/InputManager.cs
deleted file mode 100644
index 95bd117..0000000
--- a/FNAF_Clone/Input/InputManager.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Xna.Framework.Input;
-
-namespace FNAF_Clone.Input;
-
-
-public static class InputManager {
- private static Dictionary> keyPressListeners = new();
- private static Dictionary> keyHoldListeners = new(); // The bool is for enabling/disabling that method
- private static Dictionary> keyReleaseListeners = new();
-
- private static KeyboardState oldState = Keyboard.GetState();
- private static KeyboardState newState;
-
- // public static ConcurrentQueue inputEventQueue = new();
-
- public delegate void KeypressHandler(KeyboardState state);
-
-
-
- // public static void StartListening() {
- // processInputThread.Start();
- // Console.WriteLine("Started listening for input");
- // }
-
- public static void NextInputCycle() {
- Queue inputEventQueue = new();
-
- // Read
-
- newState = Keyboard.GetState();
- Keys[] pressed = newState.GetPressedKeys();
- Keys[] pressedLastFrame = oldState.GetPressedKeys();
-
- Array.ForEach(pressed, key => {
- if (oldState.IsKeyUp(key)){
- if (keyPressListeners.TryGetValue(key, out var pressHandlers)){
- pressHandlers.ForEach(t => {
- if (t.Item2.Enabled){
- inputEventQueue.Enqueue(t.Item1);
- }
- if (t.Item2.RemoveOnNextTrigger){
- pressHandlers.Remove(t);
- }
- });
- }
- }
-
- if (keyHoldListeners.TryGetValue(key, out var holdHandlers)){
- holdHandlers.ForEach(t => {
- if (t.Item2.Enabled){
- inputEventQueue.Enqueue(t.Item1);
- }
- if (t.Item2.RemoveOnNextTrigger){
- holdHandlers.Remove(t);
- }
- });
- }
- });
-
- Array.ForEach(pressedLastFrame, key => {
- if (!keyReleaseListeners.ContainsKey(key)){
- return;
- }
-
- if (newState.IsKeyUp(key)){
- if (keyReleaseListeners.TryGetValue(key, out var releaseHandlers))
- releaseHandlers.ForEach(t => {
- if (t.Item2.Enabled){
- inputEventQueue.Enqueue(t.Item1);
- }
- if (t.Item2.RemoveOnNextTrigger){
- releaseHandlers.Remove(t);
- }
- });
- }
- });
- oldState = newState;
-
- // Execute
-
- foreach (KeypressHandler handler in inputEventQueue){
- handler(newState);
- }
-}
-
- // private static Thread processInputThread = new(() => {
- //
- // });
-
- public static void AddListener(Keys key, KeypressHandler action, InputTiming timing, InputListenerHook hook) {
- Dictionary> workingDict;
-
- switch (timing){
- case InputTiming.PRESS:
- workingDict = keyPressListeners;
- break;
- case InputTiming.HOLD:
- workingDict = keyHoldListeners;
- break;
- case InputTiming.RELEASE:
- workingDict = keyReleaseListeners;
- break;
- default:
- throw new ArgumentOutOfRangeException(nameof(timing), timing, null);
- }
-
- if (!workingDict.ContainsKey(key)){
- workingDict.Add(key, new());
- }
-
- workingDict[key].Add((action, hook));
- }
-}
\ No newline at end of file
diff --git a/FNAF_Clone/Input/InputTiming.cs b/FNAF_Clone/Input/InputTiming.cs
deleted file mode 100644
index 413a161..0000000
--- a/FNAF_Clone/Input/InputTiming.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace FNAF_Clone.Input;
-
-public enum InputTiming {
- PRESS,
- HOLD,
- RELEASE
-}
\ No newline at end of file
diff --git a/MultiFNAF.sln.DotSettings.user b/MultiFNAF.sln.DotSettings.user
new file mode 100644
index 0000000..38de4dd
--- /dev/null
+++ b/MultiFNAF.sln.DotSettings.user
@@ -0,0 +1,28 @@
+
+ True
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ <AssemblyExplorer>
+ <Assembly Path="/home/perry/RiderProjects/FNAF_Clone/FNAF_Clone/link/MonoGameLibrary.dll" />
+</AssemblyExplorer>
\ No newline at end of file
diff --git a/FNAF_Clone/.config/dotnet-tools.json b/ONDClient/.config/dotnet-tools.json
similarity index 100%
rename from FNAF_Clone/.config/dotnet-tools.json
rename to ONDClient/.config/dotnet-tools.json
diff --git a/FNAF_Clone/.vscode/launch.json b/ONDClient/.vscode/launch.json
similarity index 100%
rename from FNAF_Clone/.vscode/launch.json
rename to ONDClient/.vscode/launch.json
diff --git a/FNAF_Clone/CameraSystem.cs b/ONDClient/CameraSystem.cs
similarity index 92%
rename from FNAF_Clone/CameraSystem.cs
rename to ONDClient/CameraSystem.cs
index c480601..5d7bb9a 100644
--- a/FNAF_Clone/CameraSystem.cs
+++ b/ONDClient/CameraSystem.cs
@@ -1,4 +1,4 @@
-namespace FNAF_Clone;
+namespace ONDClient;
public class CameraSystem {
public bool Enabled { get; private set; }
diff --git a/FNAF_Clone/Client.cs b/ONDClient/Client.cs
similarity index 97%
rename from FNAF_Clone/Client.cs
rename to ONDClient/Client.cs
index 85efab3..847f600 100644
--- a/FNAF_Clone/Client.cs
+++ b/ONDClient/Client.cs
@@ -4,14 +4,14 @@ using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Threading;
-using FNAF_Clone.GUI;
-using FNAF_Clone.Map;
+using ONDClient.GUI;
using GlobalClassLib;
using LiteNetLib;
using LiteNetLib.Utils;
+using ONDClient.Map;
using PacketLib;
-namespace FNAF_Clone;
+namespace ONDClient;
public class Client {
public enum ConnectionState {
@@ -122,7 +122,7 @@ public class Client {
}
public static void StartServer() {
- Process.Start("FNAF_Server");
+ Process.Start("ONDServer");
// new Thread(() => Server.Start(9012)).Start();
}
diff --git a/FNAF_Clone/ClientEnemy.cs b/ONDClient/ClientEnemy.cs
similarity index 91%
rename from FNAF_Clone/ClientEnemy.cs
rename to ONDClient/ClientEnemy.cs
index ca7fee0..e222c8b 100644
--- a/FNAF_Clone/ClientEnemy.cs
+++ b/ONDClient/ClientEnemy.cs
@@ -1,9 +1,9 @@
-using FNAF_Clone.GUI;
-using FNAF_Clone.Map;
using GlobalClassLib;
using MonoGameLibrary.Graphics;
+using ONDClient.GUI;
+using ONDClient.Map;
-namespace FNAF_Clone;
+namespace ONDClient;
public class ClientEnemy : GlobalEnemy {
public ClientEnemy(int typeId, string name, int id, EnemyUIElement sprite, int difficulty, MapTileProjection location, JumpscareUIElement jumpscareSprite) : base(id) {
diff --git a/FNAF_Clone/ClientEnemyManager.cs b/ONDClient/ClientEnemyManager.cs
similarity index 98%
rename from FNAF_Clone/ClientEnemyManager.cs
rename to ONDClient/ClientEnemyManager.cs
index 74551b4..9b11152 100644
--- a/FNAF_Clone/ClientEnemyManager.cs
+++ b/ONDClient/ClientEnemyManager.cs
@@ -2,13 +2,13 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using FNAF_Clone.GUI;
-using FNAF_Clone.Map;
using GlobalClassLib;
using Microsoft.Xna.Framework;
using MonoGameLibrary.Graphics;
+using ONDClient.GUI;
+using ONDClient.Map;
-namespace FNAF_Clone;
+namespace ONDClient;
public static class ClientEnemyManager {
private static Dictionary enemies = new();
diff --git a/FNAF_Clone/ClientPlayer.cs b/ONDClient/ClientPlayer.cs
similarity index 82%
rename from FNAF_Clone/ClientPlayer.cs
rename to ONDClient/ClientPlayer.cs
index 4f6efb4..49dd4ab 100644
--- a/FNAF_Clone/ClientPlayer.cs
+++ b/ONDClient/ClientPlayer.cs
@@ -1,6 +1,6 @@
using PacketLib;
-namespace FNAF_Clone;
+namespace ONDClient;
public class ClientPlayer {
public PlayerState state;
diff --git a/FNAF_Clone/CommandManager.cs b/ONDClient/CommandManager.cs
similarity index 98%
rename from FNAF_Clone/CommandManager.cs
rename to ONDClient/CommandManager.cs
index 8c77e92..c46d1ae 100644
--- a/FNAF_Clone/CommandManager.cs
+++ b/ONDClient/CommandManager.cs
@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using FNAF_Clone.GUI;
-using FNAF_Clone.Map;
using GlobalClassLib;
using Microsoft.Xna.Framework.Input;
using MonoGameLibrary.Input;
+using ONDClient.GUI;
+using ONDClient.Map;
using PacketLib;
-namespace FNAF_Clone;
+namespace ONDClient;
public class CommandManager {
private static (string label, Keys key, Action action)[] keybinds = [
diff --git a/FNAF_Clone/Content/Content.mgcb b/ONDClient/Content/Content.mgcb
similarity index 100%
rename from FNAF_Clone/Content/Content.mgcb
rename to ONDClient/Content/Content.mgcb
diff --git a/FNAF_Clone/Content/images/SpriteSheet_enemies.png b/ONDClient/Content/images/SpriteSheet_enemies.png
similarity index 100%
rename from FNAF_Clone/Content/images/SpriteSheet_enemies.png
rename to ONDClient/Content/images/SpriteSheet_enemies.png
diff --git a/FNAF_Clone/Content/images/SpriteSheet_monitor.png b/ONDClient/Content/images/SpriteSheet_monitor.png
similarity index 100%
rename from FNAF_Clone/Content/images/SpriteSheet_monitor.png
rename to ONDClient/Content/images/SpriteSheet_monitor.png
diff --git a/FNAF_Clone/Content/images/SpriteSheet_office.png b/ONDClient/Content/images/SpriteSheet_office.png
similarity index 100%
rename from FNAF_Clone/Content/images/SpriteSheet_office.png
rename to ONDClient/Content/images/SpriteSheet_office.png
diff --git a/FNAF_Clone/Content/images/SpriteSheet_rooms.png b/ONDClient/Content/images/SpriteSheet_rooms.png
similarity index 100%
rename from FNAF_Clone/Content/images/SpriteSheet_rooms.png
rename to ONDClient/Content/images/SpriteSheet_rooms.png
diff --git a/FNAF_Clone/Content/images/SpriteSheet_testBlocks.png b/ONDClient/Content/images/SpriteSheet_testBlocks.png
similarity index 100%
rename from FNAF_Clone/Content/images/SpriteSheet_testBlocks.png
rename to ONDClient/Content/images/SpriteSheet_testBlocks.png
diff --git a/FNAF_Clone/Content/images/enemies-definition.xml b/ONDClient/Content/images/enemies-definition.xml
similarity index 100%
rename from FNAF_Clone/Content/images/enemies-definition.xml
rename to ONDClient/Content/images/enemies-definition.xml
diff --git a/FNAF_Clone/Content/images/monitor-definition.xml b/ONDClient/Content/images/monitor-definition.xml
similarity index 100%
rename from FNAF_Clone/Content/images/monitor-definition.xml
rename to ONDClient/Content/images/monitor-definition.xml
diff --git a/FNAF_Clone/Content/images/office-definition.xml b/ONDClient/Content/images/office-definition.xml
similarity index 100%
rename from FNAF_Clone/Content/images/office-definition.xml
rename to ONDClient/Content/images/office-definition.xml
diff --git a/FNAF_Clone/Content/images/rooms-definition.xml b/ONDClient/Content/images/rooms-definition.xml
similarity index 100%
rename from FNAF_Clone/Content/images/rooms-definition.xml
rename to ONDClient/Content/images/rooms-definition.xml
diff --git a/FNAF_Clone/Content/images/testBlocks-definition.xml b/ONDClient/Content/images/testBlocks-definition.xml
similarity index 100%
rename from FNAF_Clone/Content/images/testBlocks-definition.xml
rename to ONDClient/Content/images/testBlocks-definition.xml
diff --git a/FNAF_Clone/Content/ponde___.ttf b/ONDClient/Content/ponde___.ttf
similarity index 100%
rename from FNAF_Clone/Content/ponde___.ttf
rename to ONDClient/Content/ponde___.ttf
diff --git a/FNAF_Clone/Content/ponderosa.spritefont b/ONDClient/Content/ponderosa.spritefont
similarity index 100%
rename from FNAF_Clone/Content/ponderosa.spritefont
rename to ONDClient/Content/ponderosa.spritefont
diff --git a/FNAF_Clone/Content/sounds/ambience.wav b/ONDClient/Content/sounds/ambience.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/ambience.wav
rename to ONDClient/Content/sounds/ambience.wav
diff --git a/FNAF_Clone/Content/sounds/bell.wav b/ONDClient/Content/sounds/bell.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/bell.wav
rename to ONDClient/Content/sounds/bell.wav
diff --git a/FNAF_Clone/Content/sounds/camera-switch.wav b/ONDClient/Content/sounds/camera-switch.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/camera-switch.wav
rename to ONDClient/Content/sounds/camera-switch.wav
diff --git a/FNAF_Clone/Content/sounds/dash-move.wav b/ONDClient/Content/sounds/dash-move.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/dash-move.wav
rename to ONDClient/Content/sounds/dash-move.wav
diff --git a/FNAF_Clone/Content/sounds/dash-sounds-raw.wav b/ONDClient/Content/sounds/dash-sounds-raw.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/dash-sounds-raw.wav
rename to ONDClient/Content/sounds/dash-sounds-raw.wav
diff --git a/FNAF_Clone/Content/sounds/door-close-remote.wav b/ONDClient/Content/sounds/door-close-remote.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/door-close-remote.wav
rename to ONDClient/Content/sounds/door-close-remote.wav
diff --git a/FNAF_Clone/Content/sounds/door-close.wav b/ONDClient/Content/sounds/door-close.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/door-close.wav
rename to ONDClient/Content/sounds/door-close.wav
diff --git a/FNAF_Clone/Content/sounds/door-open-remote.wav b/ONDClient/Content/sounds/door-open-remote.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/door-open-remote.wav
rename to ONDClient/Content/sounds/door-open-remote.wav
diff --git a/FNAF_Clone/Content/sounds/door-open.wav b/ONDClient/Content/sounds/door-open.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/door-open.wav
rename to ONDClient/Content/sounds/door-open.wav
diff --git a/FNAF_Clone/Content/sounds/jumpscare.wav b/ONDClient/Content/sounds/jumpscare.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/jumpscare.wav
rename to ONDClient/Content/sounds/jumpscare.wav
diff --git a/FNAF_Clone/Content/sounds/light-off.wav b/ONDClient/Content/sounds/light-off.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/light-off.wav
rename to ONDClient/Content/sounds/light-off.wav
diff --git a/FNAF_Clone/Content/sounds/light-on.wav b/ONDClient/Content/sounds/light-on.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/light-on.wav
rename to ONDClient/Content/sounds/light-on.wav
diff --git a/FNAF_Clone/Content/sounds/mare-move.wav b/ONDClient/Content/sounds/mare-move.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/mare-move.wav
rename to ONDClient/Content/sounds/mare-move.wav
diff --git a/FNAF_Clone/Content/sounds/monitor-flip.wav b/ONDClient/Content/sounds/monitor-flip.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/monitor-flip.wav
rename to ONDClient/Content/sounds/monitor-flip.wav
diff --git a/FNAF_Clone/Content/sounds/neko-angry.wav b/ONDClient/Content/sounds/neko-angry.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/neko-angry.wav
rename to ONDClient/Content/sounds/neko-angry.wav
diff --git a/FNAF_Clone/Content/sounds/neko-move1.wav b/ONDClient/Content/sounds/neko-move1.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/neko-move1.wav
rename to ONDClient/Content/sounds/neko-move1.wav
diff --git a/FNAF_Clone/Content/sounds/neko-purr.wav b/ONDClient/Content/sounds/neko-purr.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/neko-purr.wav
rename to ONDClient/Content/sounds/neko-purr.wav
diff --git a/FNAF_Clone/Content/sounds/powerout.wav b/ONDClient/Content/sounds/powerout.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/powerout.wav
rename to ONDClient/Content/sounds/powerout.wav
diff --git a/FNAF_Clone/Content/sounds/spot-activate.wav b/ONDClient/Content/sounds/spot-activate.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/spot-activate.wav
rename to ONDClient/Content/sounds/spot-activate.wav
diff --git a/FNAF_Clone/Content/sounds/spot-move.wav b/ONDClient/Content/sounds/spot-move.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/spot-move.wav
rename to ONDClient/Content/sounds/spot-move.wav
diff --git a/FNAF_Clone/Content/sounds/vent-walk.wav b/ONDClient/Content/sounds/vent-walk.wav
similarity index 100%
rename from FNAF_Clone/Content/sounds/vent-walk.wav
rename to ONDClient/Content/sounds/vent-walk.wav
diff --git a/FNAF_Clone/Content/whitrabt.ttf b/ONDClient/Content/whitrabt.ttf
similarity index 100%
rename from FNAF_Clone/Content/whitrabt.ttf
rename to ONDClient/Content/whitrabt.ttf
diff --git a/FNAF_Clone/EventProcessor.cs b/ONDClient/EventProcessor.cs
similarity index 99%
rename from FNAF_Clone/EventProcessor.cs
rename to ONDClient/EventProcessor.cs
index a3f0114..37aaa40 100644
--- a/FNAF_Clone/EventProcessor.cs
+++ b/ONDClient/EventProcessor.cs
@@ -1,12 +1,12 @@
using System;
using System.Linq;
-using FNAF_Clone.GUI;
-using FNAF_Clone.Map;
using GlobalClassLib;
using MonoGameLibrary.Input;
+using ONDClient.GUI;
+using ONDClient.Map;
using PacketLib;
-namespace FNAF_Clone;
+namespace ONDClient;
public class EventProcessor {
public static void Evaluate(GameEvent[] events) {
diff --git a/FNAF_Clone/GUI/EnemyUIElement.cs b/ONDClient/GUI/EnemyUIElement.cs
similarity index 97%
rename from FNAF_Clone/GUI/EnemyUIElement.cs
rename to ONDClient/GUI/EnemyUIElement.cs
index bd3471a..447e973 100644
--- a/FNAF_Clone/GUI/EnemyUIElement.cs
+++ b/ONDClient/GUI/EnemyUIElement.cs
@@ -2,7 +2,7 @@ using System.Linq;
using Microsoft.Xna.Framework;
using MonoGameLibrary.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class EnemyUIElement : UIElement {
private int unlitTexturesId;
diff --git a/FNAF_Clone/GUI/JumpscareUIElement.cs b/ONDClient/GUI/JumpscareUIElement.cs
similarity index 98%
rename from FNAF_Clone/GUI/JumpscareUIElement.cs
rename to ONDClient/GUI/JumpscareUIElement.cs
index 6c030cd..71146b1 100644
--- a/FNAF_Clone/GUI/JumpscareUIElement.cs
+++ b/ONDClient/GUI/JumpscareUIElement.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
using Microsoft.Xna.Framework;
using MonoGameLibrary.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class JumpscareUIElement : UIElement {
private int twitchHorizontal;
diff --git a/FNAF_Clone/GUI/LoadingUIElement.cs b/ONDClient/GUI/LoadingUIElement.cs
similarity index 98%
rename from FNAF_Clone/GUI/LoadingUIElement.cs
rename to ONDClient/GUI/LoadingUIElement.cs
index 7a09a05..fddf542 100644
--- a/FNAF_Clone/GUI/LoadingUIElement.cs
+++ b/ONDClient/GUI/LoadingUIElement.cs
@@ -1,7 +1,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class LoadingUIElement : TextUIElement {
private string expectedEndpoint;
diff --git a/FNAF_Clone/GUI/MenuInputField.cs b/ONDClient/GUI/MenuInputField.cs
similarity index 98%
rename from FNAF_Clone/GUI/MenuInputField.cs
rename to ONDClient/GUI/MenuInputField.cs
index 01af72e..924f777 100644
--- a/FNAF_Clone/GUI/MenuInputField.cs
+++ b/ONDClient/GUI/MenuInputField.cs
@@ -2,7 +2,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MonoGameLibrary.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class MenuInputField : UIElement {
private TextUIElement labelElement;
diff --git a/FNAF_Clone/GUI/PointExtensions.cs b/ONDClient/GUI/PointExtensions.cs
similarity index 92%
rename from FNAF_Clone/GUI/PointExtensions.cs
rename to ONDClient/GUI/PointExtensions.cs
index 577b538..dad3082 100644
--- a/FNAF_Clone/GUI/PointExtensions.cs
+++ b/ONDClient/GUI/PointExtensions.cs
@@ -1,6 +1,6 @@
using Microsoft.Xna.Framework;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public static class PointExtensions {
public static Point MultiplyByScalar(this Point point, int scalar) => new(point.X * scalar, point.Y * scalar);
diff --git a/FNAF_Clone/GUI/PowerIndicator.cs b/ONDClient/GUI/PowerIndicator.cs
similarity index 96%
rename from FNAF_Clone/GUI/PowerIndicator.cs
rename to ONDClient/GUI/PowerIndicator.cs
index 3555002..1030ea4 100644
--- a/FNAF_Clone/GUI/PowerIndicator.cs
+++ b/ONDClient/GUI/PowerIndicator.cs
@@ -2,7 +2,7 @@ using GlobalClassLib;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class PowerIndicator : TextUIElement {
private string label;
diff --git a/FNAF_Clone/GUI/Screen.cs b/ONDClient/GUI/Screen.cs
similarity index 99%
rename from FNAF_Clone/GUI/Screen.cs
rename to ONDClient/GUI/Screen.cs
index f24e523..4d6f96b 100644
--- a/FNAF_Clone/GUI/Screen.cs
+++ b/ONDClient/GUI/Screen.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using MonoGameLibrary.Input;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class Screen {
diff --git a/FNAF_Clone/GUI/TextBoxUIElement.cs b/ONDClient/GUI/TextBoxUIElement.cs
similarity index 97%
rename from FNAF_Clone/GUI/TextBoxUIElement.cs
rename to ONDClient/GUI/TextBoxUIElement.cs
index 7c38c52..54027cb 100644
--- a/FNAF_Clone/GUI/TextBoxUIElement.cs
+++ b/ONDClient/GUI/TextBoxUIElement.cs
@@ -5,7 +5,7 @@ using MonoGameLibrary;
using MonoGameLibrary.Graphics;
using MonoGameLibrary.Input;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class TextBoxUIElement : TextUIElement {
public bool Focused{ get; set; } = false;
diff --git a/FNAF_Clone/GUI/TextUIElement.cs b/ONDClient/GUI/TextUIElement.cs
similarity index 99%
rename from FNAF_Clone/GUI/TextUIElement.cs
rename to ONDClient/GUI/TextUIElement.cs
index 0ef9269..ca4869e 100644
--- a/FNAF_Clone/GUI/TextUIElement.cs
+++ b/ONDClient/GUI/TextUIElement.cs
@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MonoGameLibrary.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class TextUIElement : UIElement {
public SpriteFont Font { get; set; }
diff --git a/FNAF_Clone/GUI/TimerUIElement.cs b/ONDClient/GUI/TimerUIElement.cs
similarity index 96%
rename from FNAF_Clone/GUI/TimerUIElement.cs
rename to ONDClient/GUI/TimerUIElement.cs
index 8116f81..eb2a6f4 100644
--- a/FNAF_Clone/GUI/TimerUIElement.cs
+++ b/ONDClient/GUI/TimerUIElement.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class TimerUIElement : TextUIElement{
private Stopwatch stopwatch = new();
diff --git a/FNAF_Clone/GUI/UIElement.cs b/ONDClient/GUI/UIElement.cs
similarity index 99%
rename from FNAF_Clone/GUI/UIElement.cs
rename to ONDClient/GUI/UIElement.cs
index c0f29be..465da50 100644
--- a/FNAF_Clone/GUI/UIElement.cs
+++ b/ONDClient/GUI/UIElement.cs
@@ -6,7 +6,7 @@ using MonoGameLibrary;
using MonoGameLibrary.Graphics;
using MonoGameLibrary.Input;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class UIElement {
diff --git a/FNAF_Clone/GUI/UIManager.cs b/ONDClient/GUI/UIManager.cs
similarity index 99%
rename from FNAF_Clone/GUI/UIManager.cs
rename to ONDClient/GUI/UIManager.cs
index 297c1a4..f0f0887 100644
--- a/FNAF_Clone/GUI/UIManager.cs
+++ b/ONDClient/GUI/UIManager.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using FNAF_Clone.Map;
using GlobalClassLib;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
@@ -9,8 +8,9 @@ using Microsoft.Xna.Framework.Input;
using MonoGameLibrary;
using MonoGameLibrary.Graphics;
using MonoGameLibrary.Input;
+using ONDClient.Map;
-namespace FNAF_Clone.GUI;
+namespace ONDClient.GUI;
public class UIManager {
@@ -327,6 +327,7 @@ public class UIManager {
Screen.DisableOverlay();
CommandManager.AllowGameControls(false);
SoundManager.StopAmbience();
+
InputManager.AddListener(Keys.Space, DisplayMainMenu, InputTiming.PRESS, new InputListenerHook(true, true));
}
diff --git a/FNAF_Clone/GameMain.cs b/ONDClient/GameMain.cs
similarity index 97%
rename from FNAF_Clone/GameMain.cs
rename to ONDClient/GameMain.cs
index fea64ab..116124d 100644
--- a/FNAF_Clone/GameMain.cs
+++ b/ONDClient/GameMain.cs
@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
-using FNAF_Clone.GUI;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using MonoGameLibrary;
using MonoGameLibrary.Graphics;
using MonoGameLibrary.Input;
+using ONDClient.GUI;
-namespace FNAF_Clone;
+namespace ONDClient;
public class GameMain() : Core("fnafkooo", 1280, 720, false) {
// private GraphicsDeviceManager _graphics;
diff --git a/FNAF_Clone/Icon.bmp b/ONDClient/Icon.bmp
similarity index 100%
rename from FNAF_Clone/Icon.bmp
rename to ONDClient/Icon.bmp
diff --git a/FNAF_Clone/Icon.ico b/ONDClient/Icon.ico
similarity index 100%
rename from FNAF_Clone/Icon.ico
rename to ONDClient/Icon.ico
diff --git a/FNAF_Clone/Map/ClientMapManager.cs b/ONDClient/Map/ClientMapManager.cs
similarity index 98%
rename from FNAF_Clone/Map/ClientMapManager.cs
rename to ONDClient/Map/ClientMapManager.cs
index d4f8aac..ca1eb0f 100644
--- a/FNAF_Clone/Map/ClientMapManager.cs
+++ b/ONDClient/Map/ClientMapManager.cs
@@ -3,11 +3,11 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices.JavaScript;
-using FNAF_Clone.GUI;
using GlobalClassLib;
+using ONDClient.GUI;
using PacketLib;
-namespace FNAF_Clone.Map;
+namespace ONDClient.Map;
public class ClientMapManager {
private static MapTileProjection[,] map = new MapTileProjection[5, 5];
diff --git a/FNAF_Clone/Map/MapTileProjection.cs b/ONDClient/Map/MapTileProjection.cs
similarity index 91%
rename from FNAF_Clone/Map/MapTileProjection.cs
rename to ONDClient/Map/MapTileProjection.cs
index 551565a..2167f01 100644
--- a/FNAF_Clone/Map/MapTileProjection.cs
+++ b/ONDClient/Map/MapTileProjection.cs
@@ -1,6 +1,6 @@
using GlobalClassLib;
-namespace FNAF_Clone.Map;
+namespace ONDClient.Map;
public class MapTileProjection : GlobalMapTile {
public ClientPlayer? Owner { get; set; }
diff --git a/FNAF_Clone/Map/TileConnectorProjection.cs b/ONDClient/Map/TileConnectorProjection.cs
similarity index 95%
rename from FNAF_Clone/Map/TileConnectorProjection.cs
rename to ONDClient/Map/TileConnectorProjection.cs
index e4154b5..bdd38b8 100644
--- a/FNAF_Clone/Map/TileConnectorProjection.cs
+++ b/ONDClient/Map/TileConnectorProjection.cs
@@ -1,6 +1,6 @@
using GlobalClassLib;
-namespace FNAF_Clone.Map;
+namespace ONDClient.Map;
public class TileConnectorProjection : GlobalTileConnector {
public ClientPlayer? Owner { get; set; }
diff --git a/FNAF_Clone/FNAF_Clone.csproj b/ONDClient/ONDClient.csproj
similarity index 100%
rename from FNAF_Clone/FNAF_Clone.csproj
rename to ONDClient/ONDClient.csproj
diff --git a/FNAF_Clone/Program.cs b/ONDClient/Program.cs
similarity index 61%
rename from FNAF_Clone/Program.cs
rename to ONDClient/Program.cs
index 5b0bb57..265a1de 100644
--- a/FNAF_Clone/Program.cs
+++ b/ONDClient/Program.cs
@@ -1,5 +1,5 @@
using System;
-using var game = new FNAF_Clone.GameMain();
+using var game = new ONDClient.GameMain();
Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory;
game.Run();
\ No newline at end of file
diff --git a/FNAF_Clone/SoundManager.cs b/ONDClient/SoundManager.cs
similarity index 99%
rename from FNAF_Clone/SoundManager.cs
rename to ONDClient/SoundManager.cs
index 7ff21ea..a5996e2 100644
--- a/FNAF_Clone/SoundManager.cs
+++ b/ONDClient/SoundManager.cs
@@ -3,7 +3,7 @@ using GlobalClassLib;
using Microsoft.Xna.Framework.Audio;
using MonoGameLibrary;
-namespace FNAF_Clone;
+namespace ONDClient;
public static class SoundManager {
private static SoundEffect ambience;
diff --git a/FNAF_Clone/app.manifest b/ONDClient/app.manifest
similarity index 100%
rename from FNAF_Clone/app.manifest
rename to ONDClient/app.manifest
diff --git a/FNAF_Clone/link/MonoGameLibrary.dll b/ONDClient/link/MonoGameLibrary.dll
similarity index 100%
rename from FNAF_Clone/link/MonoGameLibrary.dll
rename to ONDClient/link/MonoGameLibrary.dll
diff --git a/FNAF_Server/CommandProcessor.cs b/ONDServer/CommandProcessor.cs
similarity index 98%
rename from FNAF_Server/CommandProcessor.cs
rename to ONDServer/CommandProcessor.cs
index 43f5d17..fc2b645 100644
--- a/FNAF_Server/CommandProcessor.cs
+++ b/ONDServer/CommandProcessor.cs
@@ -1,7 +1,7 @@
-using FNAF_Server.Map;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server;
+namespace ONDServer;
public class CommandProcessor {
public static void Evaluate(PlayerCommand[] commands, int pid) {
diff --git a/FNAF_Server/Enemies/DashEnemy.cs b/ONDServer/Enemies/DashEnemy.cs
similarity index 97%
rename from FNAF_Server/Enemies/DashEnemy.cs
rename to ONDServer/Enemies/DashEnemy.cs
index 4e00279..e87b482 100644
--- a/FNAF_Server/Enemies/DashEnemy.cs
+++ b/ONDServer/Enemies/DashEnemy.cs
@@ -1,9 +1,9 @@
using System.Net.Mime;
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class DashEnemy : Enemy {
public DashEnemy(int difficulty) : base(difficulty) {
diff --git a/FNAF_Server/Enemies/Enemy.cs b/ONDServer/Enemies/Enemy.cs
similarity index 94%
rename from FNAF_Server/Enemies/Enemy.cs
rename to ONDServer/Enemies/Enemy.cs
index ea360f0..d5df9ae 100644
--- a/FNAF_Server/Enemies/Enemy.cs
+++ b/ONDServer/Enemies/Enemy.cs
@@ -1,8 +1,8 @@
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public abstract class Enemy : GlobalEnemy {
public int Difficulty { get; protected set; }
diff --git a/FNAF_Server/Enemies/EnemyManager.cs b/ONDServer/Enemies/EnemyManager.cs
similarity index 93%
rename from FNAF_Server/Enemies/EnemyManager.cs
rename to ONDServer/Enemies/EnemyManager.cs
index 6c9a31f..8e76ebe 100644
--- a/FNAF_Server/Enemies/EnemyManager.cs
+++ b/ONDServer/Enemies/EnemyManager.cs
@@ -1,6 +1,6 @@
-using FNAF_Server.Map;
+using ONDServer.Map;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class EnemyManager {
private static Dictionary enemies = new();
diff --git a/FNAF_Server/Enemies/ITargetingEnemy.cs b/ONDServer/Enemies/ITargetingEnemy.cs
similarity index 69%
rename from FNAF_Server/Enemies/ITargetingEnemy.cs
rename to ONDServer/Enemies/ITargetingEnemy.cs
index 07be438..78bbdd8 100644
--- a/FNAF_Server/Enemies/ITargetingEnemy.cs
+++ b/ONDServer/Enemies/ITargetingEnemy.cs
@@ -1,4 +1,4 @@
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public interface ITargetingEnemy {
ServerPlayer Target { get; set; }
diff --git a/FNAF_Server/Enemies/LurkEnemy.cs b/ONDServer/Enemies/LurkEnemy.cs
similarity index 98%
rename from FNAF_Server/Enemies/LurkEnemy.cs
rename to ONDServer/Enemies/LurkEnemy.cs
index 8fb8922..4772045 100644
--- a/FNAF_Server/Enemies/LurkEnemy.cs
+++ b/ONDServer/Enemies/LurkEnemy.cs
@@ -1,10 +1,10 @@
using System.Diagnostics;
using System.Reflection;
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class LurkEnemy : Enemy {
public override string Name{ get; } = "Lurk";
diff --git a/FNAF_Server/Enemies/MareEnemy.cs b/ONDServer/Enemies/MareEnemy.cs
similarity index 98%
rename from FNAF_Server/Enemies/MareEnemy.cs
rename to ONDServer/Enemies/MareEnemy.cs
index 6069fd5..bad38bf 100644
--- a/FNAF_Server/Enemies/MareEnemy.cs
+++ b/ONDServer/Enemies/MareEnemy.cs
@@ -1,8 +1,8 @@
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class MareEnemy : Enemy {
diff --git a/FNAF_Server/Enemies/MovementOpportunity.cs b/ONDServer/Enemies/MovementOpportunity.cs
similarity index 97%
rename from FNAF_Server/Enemies/MovementOpportunity.cs
rename to ONDServer/Enemies/MovementOpportunity.cs
index 794b988..1a6bc26 100644
--- a/FNAF_Server/Enemies/MovementOpportunity.cs
+++ b/ONDServer/Enemies/MovementOpportunity.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class MovementOpportunity {
public int Interval{ get; set; }
diff --git a/FNAF_Server/Enemies/NekoEnemy.cs b/ONDServer/Enemies/NekoEnemy.cs
similarity index 99%
rename from FNAF_Server/Enemies/NekoEnemy.cs
rename to ONDServer/Enemies/NekoEnemy.cs
index c8e80f5..605b5cd 100644
--- a/FNAF_Server/Enemies/NekoEnemy.cs
+++ b/ONDServer/Enemies/NekoEnemy.cs
@@ -1,8 +1,8 @@
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class NekoEnemy : Enemy {
private MovementOpportunity movementOpportunity;
diff --git a/FNAF_Server/Enemies/Pathfinder.cs b/ONDServer/Enemies/Pathfinder.cs
similarity index 95%
rename from FNAF_Server/Enemies/Pathfinder.cs
rename to ONDServer/Enemies/Pathfinder.cs
index 6c658c8..67d0cc7 100644
--- a/FNAF_Server/Enemies/Pathfinder.cs
+++ b/ONDServer/Enemies/Pathfinder.cs
@@ -1,6 +1,6 @@
-using FNAF_Server.Map;
+using ONDServer.Map;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public abstract class Pathfinder {
public Enemy Enemy;
diff --git a/FNAF_Server/Enemies/RoamingPathfinder.cs b/ONDServer/Enemies/RoamingPathfinder.cs
similarity index 98%
rename from FNAF_Server/Enemies/RoamingPathfinder.cs
rename to ONDServer/Enemies/RoamingPathfinder.cs
index 185c765..0db1ff9 100644
--- a/FNAF_Server/Enemies/RoamingPathfinder.cs
+++ b/ONDServer/Enemies/RoamingPathfinder.cs
@@ -1,7 +1,7 @@
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class RoamingPathfinder : Pathfinder {
diff --git a/FNAF_Server/Enemies/SpotEnemy.cs b/ONDServer/Enemies/SpotEnemy.cs
similarity index 98%
rename from FNAF_Server/Enemies/SpotEnemy.cs
rename to ONDServer/Enemies/SpotEnemy.cs
index 7ea50ae..2d225dd 100644
--- a/FNAF_Server/Enemies/SpotEnemy.cs
+++ b/ONDServer/Enemies/SpotEnemy.cs
@@ -1,8 +1,8 @@
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server.Enemies;
+namespace ONDServer.Enemies;
public class SpotEnemy : Enemy {
public SpotEnemy(int difficulty) : base(difficulty) {
diff --git a/FNAF_Server/GameLogic.cs b/ONDServer/GameLogic.cs
similarity index 98%
rename from FNAF_Server/GameLogic.cs
rename to ONDServer/GameLogic.cs
index d6ee6ff..8557a01 100644
--- a/FNAF_Server/GameLogic.cs
+++ b/ONDServer/GameLogic.cs
@@ -1,10 +1,10 @@
using System.Diagnostics;
-using FNAF_Server.Enemies;
-using FNAF_Server.Map;
using GlobalClassLib;
+using ONDServer.Enemies;
+using ONDServer.Map;
using PacketLib;
-namespace FNAF_Server;
+namespace ONDServer;
public class GameLogic {
@@ -84,7 +84,7 @@ public class GameLogic {
// EnemyManager.AddEnemy(new MareEnemy(10)).Spawn(MapManager.Get(22));
EnemyManager.AddEnemy(new LurkEnemy(4)).Spawn(MapManager.Get(2));
- EnemyManager.AddEnemy(new NekoEnemy(4)).Spawn(MapManager.Get(0));
+ EnemyManager.AddEnemy(new NekoEnemy(4)).Spawn(MapManager.Get(22));
}
public static void Update() {
diff --git a/FNAF_Server/Map/MapManager.cs b/ONDServer/Map/MapManager.cs
similarity index 99%
rename from FNAF_Server/Map/MapManager.cs
rename to ONDServer/Map/MapManager.cs
index 7c43ab1..0c4b6f8 100644
--- a/FNAF_Server/Map/MapManager.cs
+++ b/ONDServer/Map/MapManager.cs
@@ -1,6 +1,6 @@
using GlobalClassLib;
-namespace FNAF_Server.Map;
+namespace ONDServer.Map;
public static class MapManager {
private static MapTile[,] map = new MapTile[5, 5];
diff --git a/FNAF_Server/Map/MapTile.cs b/ONDServer/Map/MapTile.cs
similarity index 98%
rename from FNAF_Server/Map/MapTile.cs
rename to ONDServer/Map/MapTile.cs
index 9f36a63..7b0cbf3 100644
--- a/FNAF_Server/Map/MapTile.cs
+++ b/ONDServer/Map/MapTile.cs
@@ -1,7 +1,7 @@
using System.Net.Security;
using GlobalClassLib;
-namespace FNAF_Server.Map;
+namespace ONDServer.Map;
public class MapTile : GlobalMapTile {
public ServerPlayer? Owner{ get; set; }
diff --git a/FNAF_Server/Map/TileConnector.cs b/ONDServer/Map/TileConnector.cs
similarity index 98%
rename from FNAF_Server/Map/TileConnector.cs
rename to ONDServer/Map/TileConnector.cs
index ffe09dc..10b938d 100644
--- a/FNAF_Server/Map/TileConnector.cs
+++ b/ONDServer/Map/TileConnector.cs
@@ -1,6 +1,6 @@
using GlobalClassLib;
-namespace FNAF_Server.Map;
+namespace ONDServer.Map;
public class TileConnector : GlobalTileConnector {
public int Value{ get; set; }
diff --git a/FNAF_Server/FNAF_Server.csproj b/ONDServer/ONDServer.csproj
similarity index 100%
rename from FNAF_Server/FNAF_Server.csproj
rename to ONDServer/ONDServer.csproj
diff --git a/FNAF_Server/Program.cs b/ONDServer/Program.cs
similarity index 95%
rename from FNAF_Server/Program.cs
rename to ONDServer/Program.cs
index e1c6274..29c8758 100644
--- a/FNAF_Server/Program.cs
+++ b/ONDServer/Program.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
-namespace FNAF_Server;
+namespace ONDServer;
public class Program {
public static void Main(string[] args) {
diff --git a/FNAF_Server/Server.cs b/ONDServer/Server.cs
similarity index 99%
rename from FNAF_Server/Server.cs
rename to ONDServer/Server.cs
index 56a9f6e..b21a9fa 100644
--- a/FNAF_Server/Server.cs
+++ b/ONDServer/Server.cs
@@ -2,13 +2,13 @@ using System;
using System.Collections;
using System.Diagnostics;
using System.Threading;
-using FNAF_Server.Map;
+using ONDServer.Map;
using GlobalClassLib;
using LiteNetLib;
using LiteNetLib.Utils;
using PacketLib;
-namespace FNAF_Server;
+namespace ONDServer;
public class Server {
public static ServerPlayer P1;
diff --git a/FNAF_Server/ServerPlayer.cs b/ONDServer/ServerPlayer.cs
similarity index 86%
rename from FNAF_Server/ServerPlayer.cs
rename to ONDServer/ServerPlayer.cs
index 2afafdd..39f7d50 100644
--- a/FNAF_Server/ServerPlayer.cs
+++ b/ONDServer/ServerPlayer.cs
@@ -1,7 +1,7 @@
using LiteNetLib;
using PacketLib;
-namespace FNAF_Server;
+namespace ONDServer;
public class ServerPlayer {
public NetPeer peer;
diff --git a/FNAF_Clone.sln b/OneNightDuel.sln
similarity index 87%
rename from FNAF_Clone.sln
rename to OneNightDuel.sln
index 1450be2..5a9abc2 100644
--- a/FNAF_Clone.sln
+++ b/OneNightDuel.sln
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNAF_Clone", "FNAF_Clone\FNAF_Clone.csproj", "{069FFFDB-7D61-4AC5-9195-D3664F0B05A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ONDClient", "ONDClient\ONDClient.csproj", "{069FFFDB-7D61-4AC5-9195-D3664F0B05A0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNAF_Server", "FNAF_Server\FNAF_Server.csproj", "{5E19BD54-CFE0-453A-9CDB-BDB67A4ECB20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ONDServer", "ONDServer\ONDServer.csproj", "{5E19BD54-CFE0-453A-9CDB-BDB67A4ECB20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PacketLib", "PacketLib\PacketLib.csproj", "{EDC8B98F-D2F7-4BDB-8E3B-E3120A743023}"
EndProject
diff --git a/OneNightDuel.sln.DotSettings.user b/OneNightDuel.sln.DotSettings.user
new file mode 100644
index 0000000..38de4dd
--- /dev/null
+++ b/OneNightDuel.sln.DotSettings.user
@@ -0,0 +1,28 @@
+
+ True
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ ForceIncluded
+ <AssemblyExplorer>
+ <Assembly Path="/home/perry/RiderProjects/FNAF_Clone/FNAF_Clone/link/MonoGameLibrary.dll" />
+</AssemblyExplorer>
\ No newline at end of file
diff --git a/build-linux.sh b/build-linux.sh
index 367310e..c914d13 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -1,7 +1,7 @@
dotnet publish MonoGameLibrary
-ln -sfrv MonoGameLibrary/MonoGameLibrary/bin/Release/net9.0/publish/MonoGameLibrary.dll FNAF_Clone/link/MonoGameLibrary.dll
+ln -sfrv MonoGameLibrary/MonoGameLibrary/bin/Release/net9.0/publish/MonoGameLibrary.dll ONDClient/link/MonoGameLibrary.dll
dotnet publish
-ln -sfrv bin/Server/net9.0/publish/FNAF_Server bin/Client/net9.0/publish/FNAF_Server
-ln -sfrv bin/Client/net9.0/publish/FNAF_Clone outexe
+ln -sfrv bin/Server/net9.0/publish/ONDServer bin/Client/net9.0/publish/ONDServer
+ln -sfrv bin/Client/net9.0/publish/ONDClient OneNightDuel
diff --git a/launch-server.sh b/launch-server.sh
index 57437a8..24ccc3c 100755
--- a/launch-server.sh
+++ b/launch-server.sh
@@ -1,5 +1,5 @@
while :
do
- bin/Server/net9.0/publish/FNAF_Server
+ bin/Server/net9.0/publish/ONDServer
echo "Restarting server..."
done
\ No newline at end of file
diff --git a/outexe b/outexe
deleted file mode 120000
index 33e90b5..0000000
--- a/outexe
+++ /dev/null
@@ -1 +0,0 @@
-bin/Client/net9.0/publish/FNAF_Clone
\ No newline at end of file