Allow music to play new tracks when menu is open - using callback

Add PC and DOS to arcade floor when using 64bit Windows, otherwise revert to some Zelda DK hacks. Add Amiga DK remake to the frontend/arcade floor Bring WinXP build up to v0.60, updating pygame
10yard · Apr 25, 2024 · b785eaf · b785eaf
1 parent d2c6db9
commit b785eaf
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 52 deletions.
diff --git a/build64.bat b/build64.bat
@@ -51,7 +51,7 @@ del dist\dkwolf\plugins\galakong\bin\wavplayxp.exe
 rmdir dist\dkwolf\plugins\allenkong\binxp /s /Q
 
 echo **** build the exe in virtual environment ****
-venv\Scripts\pyinstaller launch.py --onefile --clean --console --icon artwork\dkafe.ico
+venv64\Scripts\pyinstaller launch.py --onefile --clean --console --icon artwork\dkafe.ico
 
 echo **** clean up
 rmdir build /s /Q

diff --git a/dk_patch.py b/dk_patch.py
@@ -101,10 +101,13 @@ def apply_patches_and_addons():
 
 def install_addons():
     # Install addon files when found
+    if ARCH == "winxp":
+        # Add-on not supported on XP
+        return
     for addon in reversed(glob("dkafe_*_addon_*.zip")):
         # Installing message...
         from launch import write_text, update_screen, dk_font, RED, GREY
-        write_text("PREPARING ADD-ON PACK", font=dk_font, y=0, fg=RED)
+        write_text("INSTALLING ADD-ON PACK", font=dk_font, y=0, fg=RED)
         write_text("PLEASE WAIT...", font=dk_font, y=236, fg=RED)
         for i in range(0, 7):
             write_text(f"—" * 28, font=dk_font, y=244+i, fg=GREY)

diff --git a/dkwolf/cfg/apple2e.cfg b/dkwolf/cfg/apple2e.cfg
@@ -4,16 +4,6 @@
     <system name="apple2e">
         <input>
             <keyboard tag=":" enabled="1" />
-            <port tag=":X0" type="KEYBOARD" mask="2" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":X2" type="KEYBOARD" mask="64" defvalue="0">
-                <newseq type="standard">
-                    KEYCODE_J OR KEYCODE_1
-                </newseq>
-            </port>
             <port tag=":X6" type="KEYBOARD" mask="128" defvalue="0">
                 <newseq type="standard">
                     NONE

diff --git a/dkwolf/cfg/bbcb.cfg b/dkwolf/cfg/bbcb.cfg
@@ -44,7 +44,7 @@
             </port>
             <port tag=":COL2" type="KEYBOARD" mask="64" defvalue="64">
                 <newseq type="standard">
-                    KEYCODE_1
+                    KEYCODE_LCONTROL
                 </newseq>
             </port>
             <port tag=":COL8" type="KEYBOARD" mask="16" defvalue="16">
@@ -59,7 +59,7 @@
             </port>
             <port tag=":COL9" type="KEYBOARD" mask="16" defvalue="16">
                 <newseq type="standard">
-                    KEYCODE_ENTER OR KEYCODE_LCONTROL
+                    KEYCODE_1
                 </newseq>
             </port>
         </input>

diff --git a/dkwolf/cfg/plus4.cfg b/dkwolf/cfg/plus4.cfg
@@ -4,39 +4,24 @@
     <system name="plus4">
         <input>
             <keyboard tag=":" enabled="1" />
-            <port tag=":ROW1" type="KEYBOARD" mask="16" defvalue="16">
-                <newseq type="standard">
-                    KEYCODE_DOWN
-                </newseq>
-            </port>
-            <port tag=":ROW4" type="KEYBOARD" mask="2" defvalue="2">
-                <newseq type="standard">
-                    KEYCODE_I OR KEYCODE_LEFT
-                </newseq>
-            </port>
             <port tag=":ROW5" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":ROW5" type="KEYBOARD" mask="2" defvalue="2">
-                <newseq type="standard">
-                    KEYCODE_RIGHT
+                    KEYCODE_DOWN
                 </newseq>
             </port>
             <port tag=":ROW5" type="KEYBOARD" mask="8" defvalue="8">
                 <newseq type="standard">
-                    NONE
+                    KEYCODE_UP
                 </newseq>
             </port>
             <port tag=":ROW6" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
-                    NONE
+                    KEYCODE_LEFT
                 </newseq>
             </port>
             <port tag=":ROW6" type="KEYBOARD" mask="8" defvalue="8">
                 <newseq type="standard">
-                    NONE
+                    KEYCODE_RIGHT
                 </newseq>
             </port>
             <port tag=":ROW7" type="KEYBOARD" mask="1" defvalue="1">
@@ -46,12 +31,7 @@
             </port>
             <port tag=":ROW7" type="KEYBOARD" mask="16" defvalue="16">
                 <newseq type="standard">
-                    KEYCODE_LCONTROL OR KEYCODE_1 OR KEYCODE_SPACE
-                </newseq>
-            </port>
-            <port tag=":ROW7" type="KEYBOARD" mask="64" defvalue="64">
-                <newseq type="standard">
-                    KEYCODE_UP
+                    KEYCODE_SPACE OR KEYCODE_1
                 </newseq>
             </port>
             <port tag=":joy2:joy:JOY" type="P1_JOYSTICK_UP" mask="1" defvalue="1">

diff --git a/launch.py b/launch.py
@@ -417,7 +417,7 @@ def display_icons(detect_only=False, with_background=False, below_y=None, above_
     # Display icons and return icon that is near to Jumpman
     for _x, _y, name, sub, des, alt, slot, emu, rec, unlock, st3, st2, st1 in _g.icons:
         if int(slot) - 1 in range(*SLOTS_PER_STAGE[_g.stage]):
-            p_des = alt.replace(" :", ":") if alt.strip() else des
+            p_des = alt.replace(" :", ":").replace("№","00") if alt.strip() else des
             unlocked = True
             up_arrow = False
             if _g.score < unlock and UNLOCK_MODE and not BASIC_MODE and not intro:
@@ -862,6 +862,10 @@ def open_menu(menu, remember_selection=False):
 
 
 def menu_callback():
+    # Keep playlist playing while in menu
+    if ENABLE_PLAYLIST and not playlist.get_busy():
+        play_from_tracklist()
+
     # Allow menu scroll using left/right cursor or page up/page down keys
     keys=pygame.key.get_pressed()
     # Long press of up/down also scrolls
@@ -1225,7 +1229,7 @@ def process_interrupts():
             elif since_last_move() % 4 > 1:
                 p_des = f'3rd prize at {format_K(st3, st3)}' + _mins
             else:
-                p_des = alt.replace(" :", ":")
+                p_des = alt.replace(" :", ":").replace("№","00")
             if p_des:
                 write_text(p_des, x=108 + _g.psx, y=38 + _g.psy, bg=MAGENTA, fg=PINK, bubble=True)
         else:

diff --git a/patch/gametext/pc_dk_amiga_pd.txt b/patch/gametext/pc_dk_amiga_pd.txt
@@ -0,0 +1,10 @@
+Commodore Amiga - Donkey Kong PD
+
+A PC remake of the Amiga Donkey Kong game.
+
+A great 1991 PD/FREEWARE game for the Amiga. You must
+collect all bonus items to reach a bonus fifth level. 
+
+Keep an eye on Pauline as the bonus counts down.
+
+Developed by Crozza Games 
diff --git a/readme.md b/readme.md
@@ -16,9 +16,9 @@ The latest releases are available to download from below.  Refer to the **How to
 
 | Download Link                                                                                                        | Version | Operating System                          |
 | -------------------------------------------------------------------------------------------------------------------- | ------- | ------------------------------------------|
-| [dkafe_win64_binary_v0.59.zip](https://github.com/10yard/dkafe/releases/download/v0.59/dkafe_win64_binary_v0.59.zip) | 0.59    | Windows 64 bit (x64) systems: 10, 11      |
-| [dkafe_win32_binary_v0.59.zip](https://github.com/10yard/dkafe/releases/download/v0.59/dkafe_win32_binary_v0.59.zip) | 0.59    | Windows 32 bit (x86) systems: Vista, 7, 8 |
-| [dkafe_winxp_binary_v0.55.zip](https://github.com/10yard/dkafe/releases/download/v0.55/dkafe_winxp_binary_v0.55.zip) | 0.55    | Windows XP only                           |
+| [dkafe_win64_binary_v0.60.zip](https://github.com/10yard/dkafe/releases/download/v0.60/dkafe_win64_binary_v0.60.zip) | 0.60    | Windows 64 bit (x64) systems: 10, 11      |
+| [dkafe_win32_binary_v0.60.zip](https://github.com/10yard/dkafe/releases/download/v0.60/dkafe_win32_binary_v0.60.zip) | 0.60    | Windows 32 bit (x86) systems: Vista, 7, 8 |
+| [dkafe_winxp_binary_v0.60.zip](https://github.com/10yard/dkafe/releases/download/v0.60/dkafe_winxp_binary_v0.60.zip) | 0.60    | Windows XP only                           |
 | [dkafe_rpi4_image_v0.55.gz](https://github.com/10yard/dkafe/releases/download/v0.55/dkafe_rpi4_image_v0.55.gz)       | 0.55    | Raspberry Pi 4 and 400 only               |
 
 

diff --git a/requirements64.txt b/requirements64.txt
@@ -3,7 +3,7 @@ future==0.18.3
 importlib-metadata==6.7.0
 ips-util==1.0
 pefile==2023.2.7
-pygame==2.1.0
+pygame==2.2.0
 pygame-menu==3.5.8
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.10

diff --git a/romlist_addon.csv b/romlist_addon.csv
@@ -60,12 +60,6 @@ nes_dk_zelda04,shell,ZK4,NES: Zelda 4 (Zol),147,,,169000,2,4,8
 nes_dk_zelda05,shell,ZK5,NES: Zelda 5 (Armos),148,,,170000,2,4,8
 nes_dk_zelda06,shell,ZK6,NES: Zelda 6 (Link 2),149,,,171000,2,4,8
 nes_dk_zelda07,shell,ZK7,NES: Zelda 7 (Triforce),150,,,172000,2,4,8
-pc_dk_craze,shell,PCDK,PC : DK Craze,151.1,,,175000,2,4,8
-nes_dk_zelda08,shell,ZK8,NES: Zelda 8 (Child),151.2,,,173000,2,4,8
-dos_dk,shell,DOS,DOS: DK Original,152.1,,,173000,2,4,8
-nes_dk_zelda09,shell,ZK9,NES: Zelda 9 (GB Link),152.2,,,174000,2,4,8
-dos_kong,shell,Champ,DOS: Champ Kong,153.1,,,174000,2,4,8
-nes_dk_zelda10,shell,ZK10,NES: Zelda10 (Marin),153.2,,,175000,2,4,8
 plus4_climbit,shell,C16,C16: Climb-It,154,,,176000,2,4,8
 plus4_rollerkong,shell,Rk,C16: RollerKong,155,,,177000,2,4,8
 c64_dk,shell,C64,C64: DK (Nintendo),156,,,178000,2,4,8
@@ -79,7 +73,8 @@ lcd_cdkong,shell,LCDDK,LCD: DK Coleco,165,,,185000,2,4,8
 gnw_dkjr,shell,DK JR,G&W: DK Junior,166,,,186000,2,4,8
 gnw_dkong,shell,G&WDK,G&W: DK Original,167,,,187000,2,4,8
 vic20_kongokong,shell,V20CK,V20: Kongo Kong,168,,,188000,2,4,8
-gnw_dkcirc,shell,G&W Circus,G&W: DK Circus,169,,,189000,2,4,8
+pc_dk_amiga_pd,shell,AmigaDK,A500: Amiga DK PD,169.1,,,189000,2,4,8
+gnw_dkcirc,shell,G&W Circus,G&W: DK Circus,169.2,,,189000,2,4,8
 ##a2600_dk_demo_easy,shell,Arcade Demo Easy,2600: Arcade Demo (Easy),9999,,,110000,2,4,8
 ##a2600_dk_demo_hard,shell,Arcade Demo Hard,2600: Arcade Demo (Hard),9999,,,110000,2,4,8
 a2600_ck_fast,shell,CK Fast,2600: CK Fast,9999,,,110000,2,4,8
@@ -221,3 +216,9 @@ vic20_littlekong,shell,LittleKong,V20: Little Kong,9999,,,110000,2,4,8
 ##vic20_vic_kong,shell,Vic Kong,V20: Vic Kong,9999,,,110000,2,4,8
 spectrum_dk,shell,DK,ZXS: DK Original,9999,,,0,2,4,8
 spectrum_wallykong,shell,WallyKong,ZXS: Wally Kong,9999,,,110000,2,4,8
+pc_dk_craze,shell,PCDK,PC : DK Craze,151.1,,,175000,2,4,8
+nes_dk_zelda08,shell,ZK8,NES: Zelda 8 (Child),151.2,,,173000,2,4,8
+dos_dk,shell,DOS,DOS: DK Original,152.1,,,173000,2,4,8
+nes_dk_zelda09,shell,ZK9,NES: Zelda 9 (GB Link),152.2,,,174000,2,4,8
+dos_kong,shell,Champ,DOS: Champ Kong,153.1,,,174000,2,4,8
+nes_dk_zelda10,shell,ZK10,NES: Zelda10 (Marin),153.2,,,175000,2,4,8