Skip to content

Commit b785eaf

Browse files
committed
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
1 parent d2c6db9 commit b785eaf

File tree

10 files changed

+40
-52
lines changed

10 files changed

+40
-52
lines changed

Diff for: build64.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ del dist\dkwolf\plugins\galakong\bin\wavplayxp.exe
5151
rmdir dist\dkwolf\plugins\allenkong\binxp /s /Q
5252

5353
echo **** build the exe in virtual environment ****
54-
venv\Scripts\pyinstaller launch.py --onefile --clean --console --icon artwork\dkafe.ico
54+
venv64\Scripts\pyinstaller launch.py --onefile --clean --console --icon artwork\dkafe.ico
5555

5656
echo **** clean up
5757
rmdir build /s /Q

Diff for: dk_patch.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,13 @@ def apply_patches_and_addons():
101101

102102
def install_addons():
103103
# Install addon files when found
104+
if ARCH == "winxp":
105+
# Add-on not supported on XP
106+
return
104107
for addon in reversed(glob("dkafe_*_addon_*.zip")):
105108
# Installing message...
106109
from launch import write_text, update_screen, dk_font, RED, GREY
107-
write_text("PREPARING ADD-ON PACK", font=dk_font, y=0, fg=RED)
110+
write_text("INSTALLING ADD-ON PACK", font=dk_font, y=0, fg=RED)
108111
write_text("PLEASE WAIT...", font=dk_font, y=236, fg=RED)
109112
for i in range(0, 7):
110113
write_text(f"—" * 28, font=dk_font, y=244+i, fg=GREY)

Diff for: dkwolf/cfg/apple2e.cfg

-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@
44
<system name="apple2e">
55
<input>
66
<keyboard tag=":" enabled="1" />
7-
<port tag=":X0" type="KEYBOARD" mask="2" defvalue="0">
8-
<newseq type="standard">
9-
NONE
10-
</newseq>
11-
</port>
12-
<port tag=":X2" type="KEYBOARD" mask="64" defvalue="0">
13-
<newseq type="standard">
14-
KEYCODE_J OR KEYCODE_1
15-
</newseq>
16-
</port>
177
<port tag=":X6" type="KEYBOARD" mask="128" defvalue="0">
188
<newseq type="standard">
199
NONE

Diff for: dkwolf/cfg/bbcb.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</port>
4545
<port tag=":COL2" type="KEYBOARD" mask="64" defvalue="64">
4646
<newseq type="standard">
47-
KEYCODE_1
47+
KEYCODE_LCONTROL
4848
</newseq>
4949
</port>
5050
<port tag=":COL8" type="KEYBOARD" mask="16" defvalue="16">
@@ -59,7 +59,7 @@
5959
</port>
6060
<port tag=":COL9" type="KEYBOARD" mask="16" defvalue="16">
6161
<newseq type="standard">
62-
KEYCODE_ENTER OR KEYCODE_LCONTROL
62+
KEYCODE_1
6363
</newseq>
6464
</port>
6565
</input>

Diff for: dkwolf/cfg/plus4.cfg

+5-25
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,24 @@
44
<system name="plus4">
55
<input>
66
<keyboard tag=":" enabled="1" />
7-
<port tag=":ROW1" type="KEYBOARD" mask="16" defvalue="16">
8-
<newseq type="standard">
9-
KEYCODE_DOWN
10-
</newseq>
11-
</port>
12-
<port tag=":ROW4" type="KEYBOARD" mask="2" defvalue="2">
13-
<newseq type="standard">
14-
KEYCODE_I OR KEYCODE_LEFT
15-
</newseq>
16-
</port>
177
<port tag=":ROW5" type="KEYBOARD" mask="1" defvalue="1">
188
<newseq type="standard">
19-
NONE
20-
</newseq>
21-
</port>
22-
<port tag=":ROW5" type="KEYBOARD" mask="2" defvalue="2">
23-
<newseq type="standard">
24-
KEYCODE_RIGHT
9+
KEYCODE_DOWN
2510
</newseq>
2611
</port>
2712
<port tag=":ROW5" type="KEYBOARD" mask="8" defvalue="8">
2813
<newseq type="standard">
29-
NONE
14+
KEYCODE_UP
3015
</newseq>
3116
</port>
3217
<port tag=":ROW6" type="KEYBOARD" mask="1" defvalue="1">
3318
<newseq type="standard">
34-
NONE
19+
KEYCODE_LEFT
3520
</newseq>
3621
</port>
3722
<port tag=":ROW6" type="KEYBOARD" mask="8" defvalue="8">
3823
<newseq type="standard">
39-
NONE
24+
KEYCODE_RIGHT
4025
</newseq>
4126
</port>
4227
<port tag=":ROW7" type="KEYBOARD" mask="1" defvalue="1">
@@ -46,12 +31,7 @@
4631
</port>
4732
<port tag=":ROW7" type="KEYBOARD" mask="16" defvalue="16">
4833
<newseq type="standard">
49-
KEYCODE_LCONTROL OR KEYCODE_1 OR KEYCODE_SPACE
50-
</newseq>
51-
</port>
52-
<port tag=":ROW7" type="KEYBOARD" mask="64" defvalue="64">
53-
<newseq type="standard">
54-
KEYCODE_UP
34+
KEYCODE_SPACE OR KEYCODE_1
5535
</newseq>
5636
</port>
5737
<port tag=":joy2:joy:JOY" type="P1_JOYSTICK_UP" mask="1" defvalue="1">

Diff for: launch.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ def display_icons(detect_only=False, with_background=False, below_y=None, above_
417417
# Display icons and return icon that is near to Jumpman
418418
for _x, _y, name, sub, des, alt, slot, emu, rec, unlock, st3, st2, st1 in _g.icons:
419419
if int(slot) - 1 in range(*SLOTS_PER_STAGE[_g.stage]):
420-
p_des = alt.replace(" :", ":") if alt.strip() else des
420+
p_des = alt.replace(" :", ":").replace("№","00") if alt.strip() else des
421421
unlocked = True
422422
up_arrow = False
423423
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):
862862

863863

864864
def menu_callback():
865+
# Keep playlist playing while in menu
866+
if ENABLE_PLAYLIST and not playlist.get_busy():
867+
play_from_tracklist()
868+
865869
# Allow menu scroll using left/right cursor or page up/page down keys
866870
keys=pygame.key.get_pressed()
867871
# Long press of up/down also scrolls
@@ -1225,7 +1229,7 @@ def process_interrupts():
12251229
elif since_last_move() % 4 > 1:
12261230
p_des = f'3rd prize at {format_K(st3, st3)}' + _mins
12271231
else:
1228-
p_des = alt.replace(" :", ":")
1232+
p_des = alt.replace(" :", ":").replace("№","00")
12291233
if p_des:
12301234
write_text(p_des, x=108 + _g.psx, y=38 + _g.psy, bg=MAGENTA, fg=PINK, bubble=True)
12311235
else:

Diff for: patch/gametext/pc_dk_amiga_pd.txt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Commodore Amiga - Donkey Kong PD
2+
3+
A PC remake of the Amiga Donkey Kong game.
4+
5+
A great 1991 PD/FREEWARE game for the Amiga. You must
6+
collect all bonus items to reach a bonus fifth level.
7+
8+
Keep an eye on Pauline as the bonus counts down.
9+
10+
Developed by Crozza Games

Diff for: readme.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ The latest releases are available to download from below. Refer to the **How to
1616

1717
| Download Link | Version | Operating System |
1818
| -------------------------------------------------------------------------------------------------------------------- | ------- | ------------------------------------------|
19-
| [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 |
20-
| [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 |
21-
| [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 |
19+
| [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 |
20+
| [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 |
21+
| [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 |
2222
| [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 |
2323

2424

Diff for: requirements64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ future==0.18.3
33
importlib-metadata==6.7.0
44
ips-util==1.0
55
pefile==2023.2.7
6-
pygame==2.1.0
6+
pygame==2.2.0
77
pygame-menu==3.5.8
88
pyinstaller==5.13.1
99
pyinstaller-hooks-contrib==2023.10

Diff for: romlist_addon.csv

+8-7
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ nes_dk_zelda04,shell,ZK4,NES: Zelda 4 (Zol),147,,,169000,2,4,8
6060
nes_dk_zelda05,shell,ZK5,NES: Zelda 5 (Armos),148,,,170000,2,4,8
6161
nes_dk_zelda06,shell,ZK6,NES: Zelda 6 (Link 2),149,,,171000,2,4,8
6262
nes_dk_zelda07,shell,ZK7,NES: Zelda 7 (Triforce),150,,,172000,2,4,8
63-
pc_dk_craze,shell,PCDK,PC : DK Craze,151.1,,,175000,2,4,8
64-
nes_dk_zelda08,shell,ZK8,NES: Zelda 8 (Child),151.2,,,173000,2,4,8
65-
dos_dk,shell,DOS,DOS: DK Original,152.1,,,173000,2,4,8
66-
nes_dk_zelda09,shell,ZK9,NES: Zelda 9 (GB Link),152.2,,,174000,2,4,8
67-
dos_kong,shell,Champ,DOS: Champ Kong,153.1,,,174000,2,4,8
68-
nes_dk_zelda10,shell,ZK10,NES: Zelda10 (Marin),153.2,,,175000,2,4,8
6963
plus4_climbit,shell,C16,C16: Climb-It,154,,,176000,2,4,8
7064
plus4_rollerkong,shell,Rk,C16: RollerKong,155,,,177000,2,4,8
7165
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
7973
gnw_dkjr,shell,DK JR,G&W: DK Junior,166,,,186000,2,4,8
8074
gnw_dkong,shell,G&WDK,G&W: DK Original,167,,,187000,2,4,8
8175
vic20_kongokong,shell,V20CK,V20: Kongo Kong,168,,,188000,2,4,8
82-
gnw_dkcirc,shell,G&W Circus,G&W: DK Circus,169,,,189000,2,4,8
76+
pc_dk_amiga_pd,shell,AmigaDK,A500: Amiga DK PD,169.1,,,189000,2,4,8
77+
gnw_dkcirc,shell,G&W Circus,G&W: DK Circus,169.2,,,189000,2,4,8
8378
##a2600_dk_demo_easy,shell,Arcade Demo Easy,2600: Arcade Demo (Easy),9999,,,110000,2,4,8
8479
##a2600_dk_demo_hard,shell,Arcade Demo Hard,2600: Arcade Demo (Hard),9999,,,110000,2,4,8
8580
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
221216
##vic20_vic_kong,shell,Vic Kong,V20: Vic Kong,9999,,,110000,2,4,8
222217
spectrum_dk,shell,DK,ZXS: DK Original,9999,,,0,2,4,8
223218
spectrum_wallykong,shell,WallyKong,ZXS: Wally Kong,9999,,,110000,2,4,8
219+
pc_dk_craze,shell,PCDK,PC : DK Craze,151.1,,,175000,2,4,8
220+
nes_dk_zelda08,shell,ZK8,NES: Zelda 8 (Child),151.2,,,173000,2,4,8
221+
dos_dk,shell,DOS,DOS: DK Original,152.1,,,173000,2,4,8
222+
nes_dk_zelda09,shell,ZK9,NES: Zelda 9 (GB Link),152.2,,,174000,2,4,8
223+
dos_kong,shell,Champ,DOS: Champ Kong,153.1,,,174000,2,4,8
224+
nes_dk_zelda10,shell,ZK10,NES: Zelda10 (Marin),153.2,,,175000,2,4,8

0 commit comments

Comments
 (0)