diff --git a/.dockerignore b/.dockerignore
index 46a4c453..3ef4974b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -23,4 +23,4 @@
**/values.dev.yaml
LICENSE
README.md
-Maple2.File.Ingest\Resources
\ No newline at end of file
+Maple2.File.Ingest/Resources
diff --git a/Maple2.Server.Game/Dockerfile b/Maple2.Server.Game/Dockerfile
index c7ee0b46..7c4e678b 100644
--- a/Maple2.Server.Game/Dockerfile
+++ b/Maple2.Server.Game/Dockerfile
@@ -12,16 +12,17 @@ COPY ["Maple2.Tools/Maple2.Tools.csproj", "Maple2.Tools/"]
COPY ["Maple2.Model/Maple2.Model.csproj", "Maple2.Model/"]
COPY ["Maple2.Database/Maple2.Database.csproj", "Maple2.Database/"]
COPY ["Maple2.Server.Core/Maple2.Server.Core.csproj", "Maple2.Server.Core/"]
-RUN dotnet restore -r win-x64 "Maple2.Server.Game/Maple2.Server.Game.csproj"
+RUN dotnet restore "Maple2.Server.Game/Maple2.Server.Game.csproj"
COPY . .
WORKDIR "/src/Maple2.Server.Game"
FROM build AS publish
-RUN dotnet publish -r win-x64 "Maple2.Server.Game.csproj" -c Debug
+RUN dotnet publish "Maple2.Server.Game.csproj" -c Debug /p:IsDockerBuild=true
FROM base AS final
WORKDIR /app
-COPY --from=publish /src/Maple2.Server.Game/bin/Debug/net8.0/win-x64/publish .
-COPY --from=build /src/Maple2.File.Ingest/Navmeshes /Maple2.File.Ingest/Navmeshes
+COPY --from=publish /src/Maple2.Server.Game/bin/Debug/net8.0/publish .
+COPY --from=build /src/Maple2.Server.Game/Scripting/Scripts /app/Scripts
+COPY --from=build /src/Maple2.Server.Game/Navmeshes /app/Navmeshes
ENTRYPOINT ["dotnet", "Maple2.Server.Game.dll"]
diff --git a/Maple2.Server.Game/Manager/Field/Navigation.cs b/Maple2.Server.Game/Manager/Field/Navigation.cs
index 61e8029e..87076a6a 100644
--- a/Maple2.Server.Game/Manager/Field/Navigation.cs
+++ b/Maple2.Server.Game/Manager/Field/Navigation.cs
@@ -34,7 +34,7 @@ public Navigation(string name) {
}
private DtNavMesh LoadNavMesh() {
- FileStream fs = new FileStream(System.IO.Path.Combine(Paths.NAVMESH_DIR, $"{Name}.navmesh"), FileMode.Open, FileAccess.Read);
+ FileStream fs = new FileStream(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Navmeshes", $"{Name}.navmesh"), FileMode.Open, FileAccess.Read);
BinaryReader br = new BinaryReader(fs);
DtMeshSetReader reader = new DtMeshSetReader();
diff --git a/Maple2.Server.Game/Maple2.Server.Game.csproj b/Maple2.Server.Game/Maple2.Server.Game.csproj
index 7571d64e..fd35e1e1 100644
--- a/Maple2.Server.Game/Maple2.Server.Game.csproj
+++ b/Maple2.Server.Game/Maple2.Server.Game.csproj
@@ -7,53 +7,61 @@
Windows
12
enable
+ false
- TRACE;TRIGGER_DEBUG
+ TRACE;TRIGGER_DEBUG
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $([System.IO.Path]::GetFileName($([System.String]::Copy('%(RecursiveDir)').TrimEnd('\'))))\
+ Scripts\Trigger\%(ParentDir)\%(Filename)%(Extension)
+ Always
+
+
+ Always
+
-
- Always
-
-
- $([System.IO.Path]::GetFileName($([System.String]::Copy('%(RecursiveDir)').TrimEnd('\'))))\
- Scripts\Trigger\%(ParentDir)\%(Filename)%(Extension)
- Always
-
-
- Scripts\Trigger\trigger_api.py
- Always
-
+
+ Always
+
diff --git a/Maple2.Server.Login/Dockerfile b/Maple2.Server.Login/Dockerfile
index 95d19a8e..45e2921f 100644
--- a/Maple2.Server.Login/Dockerfile
+++ b/Maple2.Server.Login/Dockerfile
@@ -10,13 +10,15 @@ COPY ["Maple2.Tools/Maple2.Tools.csproj", "Maple2.Tools/"]
COPY ["Maple2.Model/Maple2.Model.csproj", "Maple2.Model/"]
COPY ["Maple2.Database/Maple2.Database.csproj", "Maple2.Database/"]
COPY ["Maple2.Server.Core/Maple2.Server.Core.csproj", "Maple2.Server.Core/"]
-RUN dotnet restore -r win-x64 "Maple2.Server.Login/Maple2.Server.Login.csproj"
+RUN dotnet restore "Maple2.Server.Login/Maple2.Server.Login.csproj"
COPY . .
WORKDIR "/src/Maple2.Server.Login"
FROM build AS publish
-RUN dotnet publish -r win-x64 "Maple2.Server.Login.csproj" -c Debug -o /app/publish
+RUN dotnet publish "Maple2.Server.Login.csproj" -c Debug
FROM base AS final
WORKDIR /app
-COPY --from=publish /app/publish .
+COPY --from=publish /src/Maple2.Server.Login/bin/Debug/net8.0/publish .
+
+ENTRYPOINT ["dotnet", "Maple2.Server.Login.dll"]
diff --git a/Maple2.Server.Web/Dockerfile b/Maple2.Server.Web/Dockerfile
index e2fdb55c..16316066 100644
--- a/Maple2.Server.Web/Dockerfile
+++ b/Maple2.Server.Web/Dockerfile
@@ -12,14 +12,15 @@ COPY ["Maple2.Database/Maple2.Database.csproj", "Maple2.Database/"]
COPY ["Maple2.Server.Core/Maple2.Server.Core.csproj", "Maple2.Server.Core/"]
COPY ["Maple2.Model/Maple2.Model.csproj", "Maple2.Model/"]
COPY ["Maple2.Tools/Maple2.Tools.csproj", "Maple2.Tools/"]
-RUN dotnet restore -r win-x64 "Maple2.Server.Web/Maple2.Server.Web.csproj"
+RUN dotnet restore "Maple2.Server.Web/Maple2.Server.Web.csproj"
COPY . .
WORKDIR "/src/Maple2.Server.Web"
FROM build AS publish
-RUN dotnet publish -r win-x64 "Maple2.Server.Web.csproj" -c Debug -o /app/publish
+RUN dotnet publish "Maple2.Server.Web.csproj" -c Debug
FROM base AS final
WORKDIR /app
-COPY --from=publish /app/publish .
+COPY --from=publish /src/Maple2.Server.Web/bin/Debug/net8.0/publish .
+
ENTRYPOINT ["dotnet", "Maple2.Server.Web.dll"]
diff --git a/Maple2.Server.World/Dockerfile b/Maple2.Server.World/Dockerfile
index 97215882..2c79362e 100644
--- a/Maple2.Server.World/Dockerfile
+++ b/Maple2.Server.World/Dockerfile
@@ -10,13 +10,15 @@ COPY ["Maple2.Tools/Maple2.Tools.csproj", "Maple2.Tools/"]
COPY ["Maple2.Model/Maple2.Model.csproj", "Maple2.Model/"]
COPY ["Maple2.Database/Maple2.Database.csproj", "Maple2.Database/"]
COPY ["Maple2.Server.Core/Maple2.Server.Core.csproj", "Maple2.Server.Core/"]
-RUN dotnet restore -r win-x64 "Maple2.Server.World/Maple2.Server.World.csproj"
+RUN dotnet restore "Maple2.Server.World/Maple2.Server.World.csproj"
COPY . .
WORKDIR "/src/Maple2.Server.World"
FROM build AS publish
-RUN dotnet publish -r win-x64 "Maple2.Server.World.csproj" -c Debug -o /app/publish
+RUN dotnet publish "Maple2.Server.World.csproj" -c Debug
FROM base AS final
WORKDIR /app
-COPY --from=publish /app/publish .
+COPY --from=publish /src/Maple2.Server.World/bin/Debug/net8.0/publish .
+
+ENTRYPOINT ["dotnet", "Maple2.Server.World.dll"]
diff --git a/Maple2.sln b/Maple2.sln
index af1f3cb0..7432d492 100644
--- a/Maple2.sln
+++ b/Maple2.sln
@@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
setup.bat = setup.bat
setup.ps1 = setup.ps1
start.bat = start.bat
+ .dockerignore = .dockerignore
+ compose.yml = compose.yml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple2.Server.DebugGame", "Maple2.Server.DebugGame\Maple2.Server.DebugGame.csproj", "{F0E28D7F-A88B-4DFE-BCA6-C36C18FBF269}"