Code signing update

Improvements to download and install of add-on.  Pauline speaks some messages.  Clear event queue to prevent freezing.
Refresh list of arcade other roms after installing add-on

Author: 10yard

.gitignore

@@ -39,3 +39,6 @@
 /sounds/award1.mp3
 /sounds/award2.mp3
 /roms/gbcolor/gbcolor_dk_gw_gallery.state
+/dkwolf/dkwolf32_addon.exe
+/dkwolf/dkwolf_addon.exe
+/fonts/tom-thumb.bdc

build32_sign.bat

@@ -6,5 +6,5 @@ echo  Sign Windows 32bit executables - when build is not performed on host machi
 echo ----------------------------------------------------------------------------------------------
 
 echo **** Code sign program executables with Open Source Developer Certificate
-"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool" sign /tr http://timestamp.apple.com/ts01 /n "Open Source Developer" dist\launch32.exe dist\dkwolf\dkwolf.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool" sign /tr http://timestamp.ssl.trustwave.com /n "Open Source Developer" dist\launch32.exe dist\dkwolf\dkwolf.exe
 pause

build64.bat

@@ -65,7 +65,7 @@ rmdir build /s /Q
 del *.spec
 
 echo **** Code sign program executables with Open Source Developer Certificate
-"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool" sign /tr http://timestamp.apple.com/ts01 /n "Open Source Developer" dist\launch.exe dist\remap_pc.exe dist\dkwolf\dkwolf.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool" sign /tr http://timestamp.ssl.trustwave.com /n "Open Source Developer" dist\launch.exe dist\remap_pc.exe dist\dkwolf\dkwolf.exe
 
 echo **** package into a release ZIP getting the version from version.txt
 set /p version=<VERSION
@@ -117,8 +117,8 @@ del dist\console_addon\roms\pc /s /Q
 del dist\console_addon\roms\dos /s /Q
 
 echo **** Addon version of dkwolf 32 bit includes all drivers
-del dist\console_addon\dkwolf\dkwolf.exe /s /Q
-copy dkwolf\dkwolf_addon32.exe dist\console_addon\dkwolf\dkwolf_addon.exe /Y
+del dist\console_addon\dkwolf\dkwolf_addon.exe /s /Q
+copy dkwolf\dkwolf32_addon.exe dist\console_addon\dkwolf\dkwolf_addon.exe /Y
 
 
 %zip_path% a releases\add-ons\dkafe_console_addon_pack_%addon_version%_reduced.zip .\dist\console_addon\* -m0=LZMA -mx6

dk_config.py

@@ -547,6 +547,8 @@ def is_pi():
 COIN_INFO = ["Hey Jumpman!", '', "You must collect coins..", "to unlock more games", "", "Push COIN for game info", ""]
 FREE_INFO = ["Hey Jumpman!", '', "All arcades are free to play", "", "Push COIN to for game info", ""]
 TEXT_INFO = ["", "Push 'JUMP' to play or 'P1 START' for game options"]
+INSTALL_INFO = ["Hey, we're installing everything now", "Hang tight while we sort it all out", "It shouldn't take too much longer"]
+DOWNLOAD_INFO = ["Hey, we're downloading the add-on", "It's jam packed with cool stuff",  "Hang on in there"]
 
 NO_ROMS_MESSAGE = [
     "NO ROMS WERE FOUND!", "",

dk_patch.py

@@ -117,16 +117,17 @@ def install_addons():
         return
     for addon in reversed(glob("dkafe_*_addon_*.zip")):
         # Installing message...
-        from launch import write_text, update_screen, dk_font, pl_font, RED, GREY, MAGENTA, PINK, get_image
+        from launch import write_text, update_screen, dk_font, pl_font, RED, GREY, MAGENTA, PINK, BLACK, INSTALL_INFO, get_image
         write_text("EXTRACTING ADD-ON PACK", font=dk_font, y=0, fg=RED)
         write_text("The console add-on pack is being extracted and installed.", font=pl_font, y=14, fg=RED)
         _g.screen.blit(get_image("artwork/sprite/pauline.png"), (0, 215))
-        write_text("Please wait...", x=22, y=218, bg=MAGENTA, fg=PINK, bubble=True)
+        write_text("Installing...", x=22, y=218, bg=MAGENTA, fg=PINK, bubble=True)
         pygame.draw.rect(_g.screen, GREY, [0, 245, 224, 8], 0)
         update_screen()
 
         # Do Install
         try:
+            _counter = 0
             with zipfile.ZipFile(addon) as zf:
                 file_list = zf.namelist()
                 for idx, file in enumerate(file_list):
@@ -142,10 +143,14 @@ def install_addons():
                             _g.screen.blit(get_image("artwork/sprite/dk2.png"), (167, 205))
                         else:
                             _g.screen.blit(get_image("artwork/sprite/dk3.png"), (167, 205))
-                        pygame.draw.rect(_g.screen, RED, [0, 245, _progress, 8], 0)
-                        write_text(f'{_percent:.2f}' + "% installed", x=22, y=218, bg=MAGENTA, fg=PINK, bubble=True)
+                        pygame.draw.rect(_g.screen, RED, [0, 245, _progress, 8], 0)  # progress bar
+                        pygame.draw.rect(_g.screen, BLACK, [22, 210, 150, 16], 0)   # clear message
+                        write_text(INSTALL_INFO[int(_counter % (len(INSTALL_INFO) * 60) / 60)], x=22, y=218,
+                                   bg=MAGENTA, fg=PINK, bubble=True)
+                        _counter += 1
                         update_screen()
                     zf.extract(file)
+                    pygame.event.clear()
                     update_screen()
                 zf.close()
         except:
@@ -158,6 +163,7 @@ def install_addons():
             for path in pathlist:
                 os.remove(str(path))
         os.remove(addon)
+
         return addon  # restrict to install of 1 add-on for now
 
 

dkwolf/cfg/dkongjr.cfg

@@ -3,7 +3,7 @@
 <mameconfig version="10">
     <system name="dkongjr">
         <counters>
-            <coins index="0" number="56" />
+            <coins index="0" number="57" />
         </counters>
     </system>
 </mameconfig>

dkwolf/plugins/skipstartupframes/src/startplugin.lua

@@ -175,7 +175,7 @@ function ssf:startplugin()
     menuNotifier = emu.register_menu(menu_callback, menu_populate, _p("plugin-skipstartupframes", "Skip Startup Frames"))
 
   -- otherwise MAME 0.227 and newer compatibility check
-  elseif tonumber(emu.app_version()) >= 0.227 then
+  elseif emu.app_version() >= "0.227" then
    	emu.register_start(function()
 		startNotifier = True
         start()

launch.py

@@ -153,6 +153,13 @@ def check_patches_available():
             _, _count = _s.read_romlist("romlist_addon.csv")
             _count += 2  # add "congo bongo" and "dkongjre" to count
             write_text(f"+ {str(_count)} CLONES, PORTS & HACKS IN THE CONSOLE ADD-ON PACK", font=pl_font, x=0, y=239, fg=WHITE)
+
+            # Refresh list of arcade other roms
+            arcade_other = []
+            for _rom in glob(os.path.join(ROM_DIR, "other", "*.zip")):
+                arcade_other.append(os.path.basename(_rom).split(".")[0])
+            globals()["ARCADE_OTHER"] = arcade_other
+
         if applied_patches or installed_addons:
             jump_to_continue(0)
     else:
@@ -778,7 +785,7 @@ def get_addon():
         write_text("The console add-on pack is being downloaded.", font=pl_font, y=14, fg=RED)
         _g.screen.blit(get_image("artwork/sprite/pauline.png"), (0, 215))
         _g.screen.blit(get_image("artwork/sprite/dk0.png"), (167, 205))
-        write_text("Please wait...", x=22, y=218, bg=MAGENTA, fg=PINK, bubble=True)
+        write_text("Downloading...", x=22, y=218, bg=MAGENTA, fg=PINK, bubble=True)
         pygame.draw.rect(_g.screen, GREY, [0, 245, 224, 8], 0)
         update_screen()
         try:
@@ -790,11 +797,12 @@ def get_addon():
         if total_size > 0:
             chunk_size, download_size = 1024, 0
             with open(latest_addon_path, 'wb') as f:
+                _counter = 0
                 for chunk in r.iter_content(chunk_size=chunk_size):
                     if chunk:
                         f.write(chunk)
                         download_size += chunk_size
-                        if pygame.time.get_ticks() % 30 == 0:
+                        if pygame.time.get_ticks() % 60 == 0:
                             _progress = round((download_size / total_size) * DISPLAY[0])
                             _percent = (download_size / total_size) * 100
                             _g.screen.blit(get_image("artwork/sprite/dkblank.png"), (167, 205))
@@ -806,10 +814,13 @@ def get_addon():
                                 _g.screen.blit(get_image("artwork/sprite/dk2.png"), (167, 205))
                             else:
                                 _g.screen.blit(get_image("artwork/sprite/dk3.png"), (167, 205))
-                            pygame.draw.rect(_g.screen, RED, [0, 245, _progress, 8], 0)
-                            write_text(f'{_percent:.2f}' + "% downloaded", x=22, y=218, bg=MAGENTA, fg=PINK, bubble=True)
+                            pygame.draw.rect(_g.screen, RED, [0, 245, _progress, 8], 0) # progress bar
+                            pygame.draw.rect(_g.screen, BLACK, [22, 210, 150, 16], 0)  # clear message
+                            write_text(DOWNLOAD_INFO[int(_counter % (len(DOWNLOAD_INFO) * 60) / 60)], x=22, y=218,
+                                       bg=MAGENTA, fg=PINK, bubble=True)
+                            _counter += 1
                             update_screen()
-
+                    pygame.event.clear()
             # Allow up to 10 seconds for the file to save fully.
             for i in range(0, 10):
                 if os.path.exists(latest_addon_path):

readme.md

@@ -20,8 +20,8 @@ The latest releases are available to download from below.  Refer to the [How to
 | -------------------------------------------------------------------------------------------------------------------- | ------- | -------------------------------------------|
 | [dkafe_win64_binary_v0.73.zip](https://github.com/10yard/dkafe/releases/download/v0.73/dkafe_win64_binary_v0.73.zip) | 0.73    | Windows 64 bit (x64) systems (Recommended) |
 | [dkafe_win32_binary_v0.73.zip](https://github.com/10yard/dkafe/releases/download/v0.73/dkafe_win32_binary_v0.73.zip) | 0.73    | Windows 32 bit (x86) systems               |
-| [dkafe_winxp_binary_v0.67.zip](https://github.com/10yard/dkafe/releases/download/v0.67/dkafe_winxp_binary_v0.67.zip) | 0.67    | Windows XP only                            |
 | [dkafe_rpi4_image_v0.72.gz](https://github.com/10yard/dkafe/releases/download/v0.72/dkafe_rpi4_image_v0.72.gz)       | 0.72    | Raspberry Pi 4 and 400 only                |
+| [dkafe_winxp_binary_v0.67.zip](https://github.com/10yard/dkafe/releases/download/v0.67/dkafe_winxp_binary_v0.67.zip) | 0.67    | Windows XP (No longer maintained)          |
 
 * Windows binaries are digitally signed to ensure the origin of the files and their integrity.
 * DKAFE sources can also run on other systems, for example, see the section on installing to [Ubuntu Linux](#ubuntu-linux)
@@ -62,9 +62,9 @@ There is now a console add-on pack which adds 4 extra stages and is packed out w
  - Several Donkey Kong hacks and plugins made by me specifically for use with this frontend.
  - A custom lightweight version of WolfMAME built specifically for Donkey Kong, and it's clones and bootlegs.
  - MAME plugins and scripts that interface with the frontend to add cool features such as score targets, stage practice and a coaching mode.
- - A built in music playlist that features 14 fantastic Donkey Kong remix tracks by default.
+ - A built in music playlist that features 16 fantastic Donkey Kong remix tracks by default.
  - Extensive configuration options.
- - An optional console add-on pack featuring over 300 ports, clones and hacks for 60 classic gaming systems.
+ - An optional console add-on pack featuring over 300 ports, clones and hacks for 60 classic gaming systems, and a bonus arcade stage.
 
 ### The frontend does not include:
  - Roms or information on how to obtain them.
@@ -309,7 +309,7 @@ An optional add-on pack includes over 300 Donkey Kong ports and hacks for the fo
  - Watara Supervision
 
 
-The Donkey Kong console games will appear on the 4 extra stages (*Crazy Kong and Big Kong stages are exclusive to Win x64 platform).
+The Donkey Kong console games will appear on the 4 extra stages (*Crazy Kong and Big Kong stages are exclusive to Win x64 platform).  There is also a bonus arcade stage.
 In unlock mode,  you must play for a given amount of time to win coins instead of reaching a target score  e.g. Play 2 minutes for 3rd prize,  4 minutes for 2nd prize and 8 minutes for first prize.
 
 The default controls for these games have been configured to work with arcade controls.  Typically press "P1 Start" or "Jump" to start.
@@ -716,7 +716,6 @@ I would love to get to the infamous killscreen on level 22.  My current PB is 51
 ## What's next?
 
  - Add a test screen for the player controls and a welcome screen to set the initial frontend preferences.
- - Create an alternative frontend for vertical arcade games (like 60-in-1 board) with DK, Pacman, Ms Pacman, Galaga, Burger Time, Frogger etc.  No roms will be provided.
 
 
 ## Thanks to