Add support for Spectrum 128K and include "DK Arcade" and "DK Reloade…

…d Again". Existing Spectrum becomes Spectrum 48K Add tape stop option to shell Swap out some console variants to the arcade floor: NES:What's Up Donkey Kong Amstrad PCW: Climb-It Spectrum 48K: DK Reloaded and Wrath of Kong Spectrum 128K: DK Reloaded Again
10yard · Jul 10, 2024 · 9cc5bdb · 9cc5bdb
1 parent 926e131
commit 9cc5bdb
Show file tree

Hide file tree

Showing 39 changed files with 494 additions and 140 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.64
+v0.65
diff --git a/artwork/about/versions_detected.png b/artwork/about/versions_detected.png
diff --git a/artwork/icon/shell/nes_dk_whatsup.png b/artwork/icon/shell/nes_dk_whatsup.png
diff --git a/artwork/icon/shell/pcw10_climbit.png b/artwork/icon/shell/pcw10_climbit.png
diff --git a/artwork/icon/shell/spec128_dk_reload_again.png b/artwork/icon/shell/spec128_dk_reload_again.png
diff --git a/artwork/icon/shell/spectrum_dk.png b/artwork/icon/shell/spectrum_dk.png
diff --git a/artwork/icon/shell/spectrum_dk_reloaded.png b/artwork/icon/shell/spectrum_dk_reloaded.png
diff --git a/artwork/icon/shell/spectrum_wrathofkong.png b/artwork/icon/shell/spectrum_wrathofkong.png
diff --git a/build32.bat b/build32.bat
@@ -54,7 +54,7 @@ xcopy dkwolf\hash dist\dkwolf\hash /S /i /Y
 rmdir dist\dkwolf\inp /s /Q
 
 echo **** define systems to be included in the add-on pack
-set systems=a2600,a5200,a7800,a800xl,adam,apple2e,bbcb,c64,c64p,cgenie,coco3,coleco,cpc6128,crvision,dos,dragon32,fds,gameboy,gbcolor,genesis,gnw,hbf900a,jupace,intv,lcd,mo5,mz700,nes,oric1,pc,pcw10,pet4032,plus4,sg1000,snes,spectrum,ti99_4a,vic20,zx81
+set systems=a2600,a5200,a7800,a800xl,adam,apple2e,bbcb,c64,c64p,cgenie,coco3,coleco,cpc6128,crvision,dos,dragon32,fds,gameboy,gbcolor,genesis,gnw,hbf900a,jupace,intv,lcd,mo5,mz700,nes,oric1,pc,pcw10,pet4032,plus4,sg1000,snes,spectrum,spec128,ti99_4a,vic20,zx81
 
 echo **** adjust controller defaults for some consoles
 for %%s in (%systems%) do xcopy dkwolf\cfg\%%s*.cfg dist\dkwolf\cfg\ /Y

diff --git a/build64.bat b/build64.bat
@@ -42,7 +42,7 @@ xcopy dkwolf\hash dist\dkwolf\hash /S /i /Y
 rmdir dist\dkwolf\inp /s /Q
 
 echo **** define systems to be included in the add-on pack
-set systems=a2600,a5200,a7800,a800xl,adam,apple2e,bbcb,c64,c64p,cgenie,coco3,coleco,cpc6128,crvision,dos,dragon32,fds,gameboy,gbcolor,genesis,gnw,hbf900a,intv,jupace,lcd,mo5,mz700,nes,oric1,pc,pcw10,pet4032,plus4,sg1000,snes,spectrum,ti99_4a,vic20,zx81
+set systems=a2600,a5200,a7800,a800xl,adam,apple2e,bbcb,c64,c64p,cgenie,coco3,coleco,cpc6128,crvision,dos,dragon32,fds,gameboy,gbcolor,genesis,gnw,hbf900a,intv,jupace,lcd,mo5,mz700,nes,oric1,pc,pcw10,pet4032,plus4,sg1000,snes,spec128,spectrum,ti99_4a,vic20,zx81
 
 echo **** adjust controller defaults for some consoles
 for %%s in (%systems%) do xcopy dkwolf\cfg\%%s*.cfg dist\dkwolf\cfg\ /Y
@@ -89,5 +89,5 @@ copy roms\logger.zip dist\console_addon\roms\ /Y
 copy roms\congo.zip dist\console_addon\roms\ /Y
 
 del releases\add-ons\dkafe_console_addon_pack_v3.zip
-%zip_path% a releases\add-ons\dkafe_console_addon_pack_v3.zip .\dist\console_addon\*
+%zip_path% a releases\add-ons\dkafe_console_addon_pack_v4.zip .\dist\console_addon\*
 rmdir dist\console_addon /s /Q
diff --git a/buildxp.bat b/buildxp.bat
@@ -62,7 +62,7 @@ xcopy dkwolf\changes dist\launchxp\dkwolf\changes /S /i /Y
 rmdir dist\launchxp\dkwolf\inp /s /Q
 
 echo **** define systems to be included in the add-on pack
-set systems=a2600,a5200,a7800,a800xl,adam,apple2e,bbcb,c64,c64p,coco3,coleco,cpc6128,crvision,dos,dragon32,fds,gameboy,gbcolor,genesis,gnw,hbf900a,intv,lcd,mo5,mz700,nes,oric1,pc,pcw10,pet4032,plus4,sg1000,snes,spectrum,ti99_4a,vic20,zx81
+set systems=a2600,a5200,a7800,a800xl,adam,apple2e,bbcb,c64,c64p,coco3,coleco,cpc6128,crvision,dos,dragon32,fds,gameboy,gbcolor,genesis,gnw,hbf900a,intv,lcd,mo5,mz700,nes,oric1,pc,pcw10,pet4032,plus4,sg1000,snes,spectrum,spec128,ti99_4a,vic20,zx81
 
 echo **** adjust controller defaults for some consoles
 for %%s in (%systems%) do xcopy dkwolf\cfg\%%s*.cfg dist\dkwolf\cfg\ /Y

diff --git a/dk_config.py b/dk_config.py
@@ -573,7 +573,7 @@
 """
 
 # Console Addon Specific
-ADDON_URL = "https://www.dropbox.com/scl/fi/h6i1i9w5bpfad47uogijm/dkafe_console_addon_pack_v3.zip?rlkey=hpbwog3m52qpq76idg07019v5&dl=0"
+ADDON_URL = "https://www.dropbox.com/scl/fi/6ycpwsq4r03rfuva8q2ck/dkafe_console_addon_pack_v4.zip?rlkey=6yb4hnwckf0zkk94ytf9ewpqr&dl=0"
 if ENABLE_ADDONS:
     VERSION += "+"
 ROMLIST_FILES = ["romlist.csv", "romlist_addon.csv" if ENABLE_ADDONS else ""]
@@ -623,7 +623,8 @@
     "plus4":"Commodore C16/Plus4",
     "sg1000":"Sega SG-1000",
     "snes":"Super Nintendo Entertainment System",
-    "spectrum":"Sinclair ZX Spectrum",
+    "spectrum":"Sinclair ZX Spectrum 48K",
+    "spec128":"Sinclair ZX Spectrum 128K",
     "ti99_4a":"Texas Instruments TI-99",
     "tic80":"TIC-80 Fantasy Console",
     "trs80":"Tandy TRS-80",
@@ -652,7 +653,8 @@
     "pcw10": "-flop",
     "pet4032": "-quik",
     "plus4": "-quik",
-    "spectrum": "-dump",
+    "spectrum": "-nokeepaspect -dump",
+    "spec128": "-nokeepaspect -dump",
     "vic20": "-quik",
     "vic20p": "-quik",
     "zx81": "-cass"}
@@ -669,8 +671,11 @@
     "plus4_crazyjump":"-joy1 joy -quik",
     "plus4_dkplus":"-joy1 joy -quik",
     "spectrum_ape_escape":"-cass",
+    "spectrum_dk_reloaded":"-cass",
     "spectrum_kongs_revenge":"-cass",
     "spectrum_crazykongcity":"-cass",
+    "spectrum_spec_kong":"-cass",
+    "spectrum_wrathofkong":"-speed 1.1 -cass",
     "vic20_logger": "-ram 3k -cass",
     "vic20_mickybricky": "-cass",
     "vic20_fast_eddie":"-cart",
@@ -721,7 +726,7 @@
     "pc_trs80_dk":"ctrl>space|num 1>enter,1",
     "pc_trs80_killergorilla":"ctrl>space",
     "pc_trs80_skyscraper":"ctrl>space|1>1,n,\\,enter",
-    "pc_spectrum_dk_arcade":"1>0|ctrl>space,0|up>q|down>a|left>o|right>p|esc>forcequit:zesarux.exe",
+    "pc_spectrum_dkjr2":"left>o|right>p|up>q|down>a|ctrl>m|num 2>num 1|num 3>num 1|alt>n|esc>forcequit:zesarux.exe",
     "pc_zx80_kong":"ctrl>num 0|esc>forcequit:zesarux.exe"}
 
 # Sound setup

diff --git a/dkwolf/cfg/apple2e.cfg b/dkwolf/cfg/apple2e.cfg
@@ -9,7 +9,7 @@
                     NONE
                 </newseq>
             </port>
-            <port tag=":X2" type="KEYBOARD" mask="64" defvalue="0">
+            <port tag=":X6" type="KEYBOARD" mask="64" defvalue="0">
                 <newseq type="standard">
                     KEYCODE_1
                 </newseq>
@@ -50,48 +50,22 @@
                     NONE
                 </newseq>
                 <newseq type="increment">
-                    KEYCODE_DOWN
-                </newseq>
-                <newseq type="decrement">
-                    KEYCODE_UP
-                </newseq>
-            </port>
-            <port tag=":gameio:joy:joystick_2_x" type="P2_AD_STICK_X" mask="255" defvalue="128">
-                <newseq type="increment">
-                    KEYCODE_RIGHT
-                </newseq>
-                <newseq type="decrement">
-                    KEYCODE_LEFT
-                </newseq>
-            </port>
-            <port tag=":gameio:joy:joystick_2_y" type="P2_AD_STICK_Y" mask="255" defvalue="128">
-                <newseq type="increment">
-                    KEYCODE_DOWN
+                    NONE
                 </newseq>
                 <newseq type="decrement">
-                    KEYCODE_UP
+                    NONE
                 </newseq>
             </port>
             <port tag=":gameio:joy:joystick_buttons" type="P1_BUTTON1" mask="16" defvalue="0">
                 <newseq type="standard">
-                    KEYCODE_LCONTROL
+                    KEYCODE_LCONTROL OR KEYCODE_UP OR KEYCODE_DOWN
                 </newseq>
             </port>
             <port tag=":gameio:joy:joystick_buttons" type="P1_BUTTON2" mask="32" defvalue="0">
                 <newseq type="standard">
                     KEYCODE_LALT
                 </newseq>
             </port>
-            <port tag=":gameio:joy:joystick_buttons" type="P2_BUTTON1" mask="64" defvalue="0">
-                <newseq type="standard">
-                    KEYCODE_LCONTROL
-                </newseq>
-            </port>
-            <port tag=":gameio:joy:joystick_buttons" type="P2_BUTTON2" mask="128" defvalue="0">
-                <newseq type="standard">
-                    KEYCODE_LALT
-                </newseq>
-            </port>
             <port tag=":keyb_special" type="KEYBOARD" mask="2" defvalue="0">
                 <newseq type="standard">
                     NONE
@@ -102,11 +76,6 @@
                     NONE
                 </newseq>
             </port>
-            <port tag=":keyb_special" type="KEYBOARD" mask="128" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
         </input>
         <image_directories>
             <device instance="floppydisk1" directory="C:\dkafe\roms\apple2e\apple2e_dk.zip\" />

diff --git a/dkwolf/cfg/plus4.cfg b/dkwolf/cfg/plus4.cfg
@@ -2,9 +2,6 @@
 <!-- This file is autogenerated; comments and unknown tags will be stripped -->
 <mameconfig version="10">
     <system name="plus4">
-        <video>
-            <target index="0" view="Screen 0 Pixel Aspect (14:9)" />
-        </video>
         <input>
             <keyboard tag=":" enabled="1" />
             <port tag=":ROW5" type="KEYBOARD" mask="1" defvalue="1">

diff --git a/dkwolf/cfg/spec128.cfg b/dkwolf/cfg/spec128.cfg
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!-- This file is autogenerated; comments and unknown tags will be stripped -->
+<mameconfig version="10">
+    <system name="spec128">
+        <input>
+            <keyboard tag=":" enabled="1" />
+            <port tag=":LINE1" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_A OR KEYCODE_DOWN
+                </newseq>
+            </port>
+            <port tag=":LINE2" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_Q OR KEYCODE_UP
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_P OR KEYCODE_RIGHT
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="2" defvalue="2">
+                <newseq type="standard">
+                    KEYCODE_O OR KEYCODE_LEFT
+                </newseq>
+            </port>
+            <port tag=":LINE7" type="KEYBOARD" mask="4" defvalue="4">
+                <newseq type="standard">
+                    KEYCODE_M OR KEYCODE_LCONTROL
+                </newseq>
+            </port>
+        </input>
+        <image_directories>
+            <device instance="snapshot" directory="C:\dkafe\roms\spec128\spec128_dk_reload_again.zip\" />
+            <device instance="quickload" directory="" />
+            <device instance="cassette" directory="" />
+        </image_directories>
+    </system>
+</mameconfig>
diff --git a/dkwolf/cfg/spec128_dk_arcade.cfg b/dkwolf/cfg/spec128_dk_arcade.cfg
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!-- This file is autogenerated; comments and unknown tags will be stripped -->
+<mameconfig version="10">
+    <system name="spec128">
+        <input>
+            <keyboard tag=":" enabled="1" />
+            <port tag=":LINE1" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_A OR KEYCODE_DOWN
+                </newseq>
+            </port>
+            <port tag=":LINE2" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_Q OR KEYCODE_UP
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":LINE4" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_0 OR KEYCODE_1
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_P OR KEYCODE_RIGHT
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="2" defvalue="2">
+                <newseq type="standard">
+                    KEYCODE_O OR KEYCODE_LEFT
+                </newseq>
+            </port>
+            <port tag=":LINE7" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_SPACE OR KEYCODE_LCONTROL
+                </newseq>
+            </port>
+        </input>
+        <image_directories>
+            <device instance="snapshot" directory="C:\dkafe\roms\spec128\spec128_dk_reload_again.zip\" />
+            <device instance="quickload" directory="" />
+            <device instance="cassette" directory="" />
+        </image_directories>
+    </system>
+</mameconfig>
diff --git a/dkwolf/cfg/spec128_dk_reload_again.cfg b/dkwolf/cfg/spec128_dk_reload_again.cfg
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!-- This file is autogenerated; comments and unknown tags will be stripped -->
+<mameconfig version="10">
+    <system name="spec128">
+        <input>
+            <keyboard tag=":" enabled="1" />
+            <port tag=":LINE1" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_A OR KEYCODE_DOWN
+                </newseq>
+            </port>
+            <port tag=":LINE2" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_Q OR KEYCODE_UP
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_P OR KEYCODE_RIGHT
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="2" defvalue="2">
+                <newseq type="standard">
+                    KEYCODE_O OR KEYCODE_LEFT
+                </newseq>
+            </port>
+            <port tag=":LINE7" type="KEYBOARD" mask="4" defvalue="4">
+                <newseq type="standard">
+                    KEYCODE_M OR KEYCODE_LCONTROL
+                </newseq>
+            </port>
+        </input>
+        <image_directories>
+            <device instance="snapshot" directory="C:\dkafe\roms\spec128\spec128_dk_reload_again.zip\" />
+            <device instance="quickload" directory="" />
+            <device instance="cassette" directory="" />
+        </image_directories>
+    </system>
+</mameconfig>
diff --git a/dkwolf/cfg/spectrum.cfg b/dkwolf/cfg/spectrum.cfg
@@ -4,10 +4,34 @@
     <system name="spectrum">
         <input>
             <keyboard tag=":" enabled="1" />
-            <port tag=":CONFIG" type="CONFIG" mask="128" defvalue="0" value="128" />
+            <port tag=":LINE3" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="2" defvalue="2">
+                <newseq type="standard">
+                    KEYCODE_1
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="4" defvalue="4">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="8" defvalue="8">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="16" defvalue="16">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
         </input>
         <image_directories>
-            <device instance="snapshot" directory="C:\dkafe\roms\spectrum\spectrum_killerkong.zip\" />
+            <device instance="snapshot" directory="C:\dkafe\roms\spectrum\spectrum_dk.zip\" />
             <device instance="quickload" directory="" />
             <device instance="cassette" directory="" />
         </image_directories>

diff --git a/dkwolf/cfg/spectrum_dk_reloaded.cfg b/dkwolf/cfg/spectrum_dk_reloaded.cfg
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!-- This file is autogenerated; comments and unknown tags will be stripped -->
+<mameconfig version="10">
+    <system name="spectrum">
+        <input>
+            <keyboard tag=":" enabled="1" />
+            <port tag=":LINE1" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_A OR KEYCODE_DOWN
+                </newseq>
+            </port>
+            <port tag=":LINE2" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_Q OR KEYCODE_UP
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":LINE3" type="KEYBOARD" mask="2" defvalue="2">
+                <newseq type="standard">
+                    KEYCODE_1 OR KEYCODE_2
+                </newseq>
+            </port>
+            <port tag=":LINE4" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_0
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_P OR KEYCODE_RIGHT
+                </newseq>
+            </port>
+            <port tag=":LINE5" type="KEYBOARD" mask="2" defvalue="2">
+                <newseq type="standard">
+                    KEYCODE_O OR KEYCODE_LEFT
+                </newseq>
+            </port>
+            <port tag=":LINE7" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_SPACE OR KEYCODE_LCONTROL
+                </newseq>
+            </port>
+        </input>
+        <image_directories>
+            <device instance="snapshot" directory="C:\dkafe\roms\spectrum\spectrum_wallykong.zip\" />
+            <device instance="quickload" directory="" />
+            <device instance="cassette" directory="" />
+        </image_directories>
+    </system>
+</mameconfig>