added ds3os

atillart-one · May 6, 2022 · 3b54641 · 3b54641
1 parent cf9a5a1
commit 3b54641
Show file tree

Hide file tree

Showing 39 changed files with 77 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ Under usernames, follow the instructions to add your accounts.
 
 ## Additional Notes
 The Champion's Ashes mod WILL ban you if you have it enabled and launch the game. Make sure it's disabled before using an account that you don't want banned.  
+The DS3 Open Server can be updated by replacing the files inside the ds3os folder.
 If you need to disable installing/updating Champion's Ashes, simply delete the Git folder in the files folder present in the launcher folder.  
 Storing mods outside the Game folder requires the launcher to be run with Administrator privileges. Simply right click AshesLauncher4.exe and select run as admin.
 
@@ -34,6 +35,7 @@ Discord: 	    https://discord.gg/xEMdvaTVc3
 ## Credits
 The Champion's Ashes team  (Champion's Ashes)   
 Church Guard (Lazy Loader: https://www.nexusmods.com/darksouls3/mods/677)  
+TLeonardUK (Dark Souls III Open Server: https://github.com/TLeonardUK/ds3os)
 
 Featuring background images from:  
 Nobody#6945  

diff --git a/accounts.ini b/accounts.ini
@@ -0,0 +1,12 @@
+; This file contains the usernames and their labels used by the launcher to switch accounts.
+
+[enable]
+; Set to True to use.
+enable = False
+
+[usernames]
+; Add accounts by adding lines in the format 'username = label'.
+; where username is your steam username and label is the name that will be displayed for it in the launcher.
+; For example, the below line will show up with the name 'modded' in the launcher and log into the account with the username 'darksoulsalt'.
+; darksoulsalt = modded
+steam username here = display name for launcher here
diff --git a/data/Adobe Garamond Pro Regular.ttf b/data/Adobe Garamond Pro Regular.ttf
diff --git a/data/Pro B.otf b/data/Pro B.otf
diff --git a/data/Pro M.otf b/data/Pro M.otf
diff --git a/data/accounts.png b/data/accounts.png
diff --git a/data/ashes.png b/data/ashes.png
diff --git a/data/bg.png b/data/bg.png
diff --git a/data/box.png b/data/box.png
diff --git a/data/changelog.png b/data/changelog.png
diff --git a/data/cross.png b/data/cross.png
diff --git a/data/default.png b/data/default.png
diff --git a/data/disabled.png b/data/disabled.png
diff --git a/data/disabled_select.png b/data/disabled_select.png
diff --git a/data/discord.png b/data/discord.png
diff --git a/data/down.png b/data/down.png
diff --git a/data/enabled.png b/data/enabled.png
diff --git a/data/enabled_select.png b/data/enabled_select.png
diff --git a/data/fidelity.png b/data/fidelity.png
diff --git a/data/friz.otf b/data/friz.otf
diff --git a/data/graphics_panel.png b/data/graphics_panel.png
diff --git a/data/graphics_panel_select.png b/data/graphics_panel_select.png
diff --git a/data/hold.png b/data/hold.png
diff --git a/data/home.png b/data/home.png
diff --git a/data/home_select.png b/data/home_select.png
diff --git a/data/icon.png b/data/icon.png
diff --git a/data/logo.png b/data/logo.png
diff --git a/data/mods.png b/data/mods.png
diff --git a/data/panel.png b/data/panel.png
diff --git a/data/patch.png b/data/patch.png
diff --git a/data/patchnotes.txt b/data/patchnotes.txt
@@ -0,0 +1,27 @@
+VERSION 1.8.1
+
+--------------------------
+Summary
+-Bug Fixes
+
+--------------------------
+Bug fixes
+
+Kos Parasite 
+-Lost version now has a 20 faith requirement instead of 20 int.
+
+Gundyr's Halberd
+-Fixed model
+
+Lothric war scythe
+-Fixed a bug that allowed 1H second R2 to hit twice when close
+
+Bloodlust
+-Fixed a bug that allowed 1H second R2 to have no hitboxes
+-Fixed Weapon Art descriptions
+
+Soldering Iron
+-Fixed Weapon Art descriptions
+
+High Wall and Irithyll Maps
+-Fixed texture bugs
diff --git a/data/paths.png b/data/paths.png
diff --git a/data/play.png b/data/play.png
diff --git a/data/play_select.png b/data/play_select.png
diff --git a/data/tick.png b/data/tick.png
diff --git a/data/up.png b/data/up.png
diff --git a/data/vanilla.png b/data/vanilla.png
diff --git a/data/wiki.png b/data/wiki.png
diff --git a/main.py b/main.py
@@ -109,7 +109,7 @@ def set_appwindow(root):
 
 
     """
-    Creates (if it doesn't exist) and reads the needed variables.
+    Creates (if file doesn't exist) and reads the needed variables.
     """
     Path("C:/ProgramData/AshesLauncher").mkdir(exist_ok=True)
     if os.path.isfile("C:/ProgramData/AshesLauncher/settings.txt"):
@@ -132,6 +132,7 @@ def onObjectClick(event):
 
 
     installing = 0
+    private_servers = 0
 
 
     def report_callback_exception(self, exc, val, tb):
@@ -216,7 +217,14 @@ def play_mod(event):
 
         def vanilla():
             delete()
-            webbrowser.open('steam://rungameid/374320')
+            global private_servers
+            if private_servers == 0:
+                webbrowser.open('steam://rungameid/374320')
+            elif os.path.isfile(os.path.abspath("./files/ds3os/Loader/loader.exe")):
+                subprocess.Popen(os.path.abspath("./files/ds3os/Loader/loader.exe"))
+            else:
+                messagebox.showerror("AshesLauncher", "DS3 Open Server not found. Please install it under the 'ds3os' "
+                                                      "folder inside the 'files' folder.")
 
         def launch():
             delete()
@@ -274,7 +282,14 @@ def launch():
 
                 shutil.copy("files/lazyLoad/lazyLoad.ini", dir_path + "/lazyLoad.ini")
             shutil.copy("files/lazyLoad/dinput8.dll", dir_path + "/dinput8.dll")
-            webbrowser.open('steam://rungameid/374320')
+            global private_servers
+            if private_servers == 0:
+                webbrowser.open('steam://rungameid/374320')
+            elif os.path.isfile(os.path.abspath("./ds3os/Loader/loader.exe")):
+                subprocess.Popen(os.path.abspath("./ds3os/Loader/loader.exe"))
+            else:
+                messagebox.showerror("AshesLauncher", "DS3 Open Server not found. Please install it under the 'ds3os' "
+                                                      "folder inside the 'files' folder..")
 
         if git_enabled == 1:
             class CloneProgress(git.RemoteProgress):
@@ -645,6 +660,15 @@ def preset_default(event):
             else:
                 messagebox.showerror("AshesLauncher", "Please install the mod first.")
 
+        def server_toggle(event):
+            global private_servers
+            if private_servers == 0:
+                canvas.itemconfig(checkbox, image=tick)
+                private_servers = 1
+
+            else:
+                canvas.itemconfig(checkbox, image=box)
+                private_servers = 0
 
         """ Swap Tabs"""
 
@@ -734,6 +758,8 @@ def tab_select(i, event):
         ashes_img = tkinter.PhotoImage(file=resource_path('ashes.png'))
         accs_img = tkinter.PhotoImage(file=resource_path('accounts.png'))
         logo = tkinter.PhotoImage(file=resource_path('logo.png'))
+        box = tkinter.PhotoImage(file=resource_path('box.png'))
+        tick = tkinter.PhotoImage(file=resource_path('tick.png'))
 
         """BACKGROUND"""
         bg = tkinter.PhotoImage(file=resource_path('bg.png'))
@@ -812,6 +838,12 @@ def get_bg():
 
         canvas.create_image(650, 220, image=logo, tags='home', anchor=tkinter.NW)
 
+        checkbox = canvas.create_image(40, 630, image=box, anchor=tkinter.NW, tags='home')
+        canvas.create_text(75, 632,
+                           text='Use Private Servers',
+                           fill='#e4dfd4', justify=tkinter.CENTER,
+                           font=("Friz Quadrata Std", 14), tags='home', anchor=tkinter.NW)
+
         """Display Patch Notes"""
         canvas.create_image(-3, 135, image=patch, anchor=tkinter.NW, tags='home')
         canvas_patch = tkinter.Canvas(width=580, height=270, highlightthickness=0)
@@ -1016,6 +1048,7 @@ def switch_account():
         canvas.tag_bind(mod_button, "<ButtonPress-1>", mod_enabled)
         canvas.tag_bind(mod_button, "<Enter>", lambda event: canvas.itemconfig(mod_button, image=disabled_select))
         canvas.tag_bind(mod_button, "<Leave>", lambda event: canvas.itemconfig(mod_button, image=disabled))
+        canvas.tag_bind(checkbox, '<ButtonPress-1>', server_toggle)
         canvas.tag_bind(home_button, '<ButtonPress-1>', lambda event: tab_select('home', event))
         canvas.tag_bind(graphics_button, '<ButtonPress-1>', lambda event: tab_select('graphics', event))
         canvas.tag_bind(mods_button, '<ButtonPress-1>', lambda event: tab_select('mods', event))