Finishing up on Big Kong stage

10yard · Jan 6, 2025 · a740548 · a740548
1 parent 2586df3
commit a740548
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 49 deletions.
diff --git a/artwork/icon/shell/oric1_honeykong.png b/artwork/icon/shell/oric1_honeykong.png
diff --git a/artwork/icon/shell/pc_dk_aa.png b/artwork/icon/shell/pc_dk_aa.png
diff --git a/artwork/icon/shell/pc_kong_jr_gnw.png b/artwork/icon/shell/pc_kong_jr_gnw.png
diff --git a/dk_config.py b/dk_config.py
@@ -374,14 +374,14 @@ def is_pi():
     (2, 226), (34, 226), (50, 226), (94, 226), (114, 225), (130, 224), (146, 223), (162, 222), (194, 220), (210, 219),
     (194, 198), (146, 195), (130, 194), (114, 193), (82, 191), (66, 190), (34, 188), (18, 187), (1, 186),
     (31, 164), (82, 161), (98, 160), (130, 158), (162, 156), (194, 154), (210, 153),
-    (194, 132), (130, 128), (98, 126), (82, 125), (1, 120),
+    (194, 132), (130, 128), (98, 126), (82, 125), (66, 124), (1, 120),
     (66, 96), (98, 94), (114, 93), (130, 92), (146, 91), (162, 90), (194, 88), (210, 87),
     (194, 66), (162, 64), (146, 63), (130, 62), (90, 62), (2, 62),
     (98, 34)
 )
 
 # Range of slots that appear on each stage
-SLOTS_PER_STAGE = (0, 46), (46, 81), (81, 125), (125, 169), (169, 215), (215, 260)
+SLOTS_PER_STAGE = (0, 46), (46, 81), (81, 125), (125, 169), (169, 215), (215, 262)
 
 # Control assignments. Links global variables to event data.  These shouldn't be changed.
 CONTROL_ASSIGNMENTS = (

diff --git a/dkwolf/cfg/oric1.cfg b/dkwolf/cfg/oric1.cfg
@@ -4,59 +4,39 @@
     <system name="oric1">
         <input>
             <keyboard tag=":" enabled="1" />
-            <port tag=":ROW1" type="KEYBOARD" mask="64" defvalue="64">
+            <port tag=":ROW0" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
-                    KEYCODE_Q OR KEYCODE_UP
+                    KEYCODE_7 OR KEYCODE_UP
                 </newseq>
             </port>
-            <port tag=":ROW2" type="KEYBOARD" mask="1" defvalue="1">
+            <port tag=":ROW0" type="KEYBOARD" mask="4" defvalue="4">
                 <newseq type="standard">
-                    KEYCODE_M OR KEYCODE_LCONTROL
+                    KEYCODE_5 OR KEYCODE_LEFT
                 </newseq>
             </port>
-            <port tag=":ROW2" type="KEYBOARD" mask="16" defvalue="16">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":ROW4" type="KEYBOARD" mask="8" defvalue="8">
+            <port tag=":ROW2" type="KEYBOARD" mask="2" defvalue="2">
                 <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":ROW4" type="KEYBOARD" mask="32" defvalue="32">
-                <newseq type="standard">
-                    NONE
+                    KEYCODE_6 OR KEYCODE_RIGHT
                 </newseq>
             </port>
-            <port tag=":ROW4" type="KEYBOARD" mask="64" defvalue="64">
+            <port tag=":ROW2" type="KEYBOARD" mask="16" defvalue="16">
                 <newseq type="standard">
                     NONE
                 </newseq>
             </port>
-            <port tag=":ROW4" type="KEYBOARD" mask="128" defvalue="128">
+            <port tag=":ROW4" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
-                    NONE
+                    KEYCODE_SPACE OR KEYCODE_LCONTROL
                 </newseq>
             </port>
             <port tag=":ROW5" type="KEYBOARD" mask="4" defvalue="4">
                 <newseq type="standard">
-                    KEYCODE_O OR KEYCODE_LEFT
-                </newseq>
-            </port>
-            <port tag=":ROW5" type="KEYBOARD" mask="8" defvalue="8">
-                <newseq type="standard">
-                    KEYCODE_P OR KEYCODE_RIGHT
+                    KEYCODE_O OR KEYCODE_1
                 </newseq>
             </port>
-            <port tag=":ROW6" type="KEYBOARD" mask="32" defvalue="32">
+            <port tag=":ROW7" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
-                    KEYCODE_A OR KEYCODE_DOWN
-                </newseq>
-            </port>
-            <port tag=":ROW7" type="KEYBOARD" mask="16" defvalue="16">
-                <newseq type="standard">
-                    NONE
+                    KEYCODE_8 OR KEYCODE_DOWN
                 </newseq>
             </port>
         </input>

diff --git a/dkwolf/cfg/spectrum.cfg b/dkwolf/cfg/spectrum.cfg
@@ -14,14 +14,49 @@
                     KEYCODE_Q OR KEYCODE_UP OR KEYCODE_LCONTROL
                 </newseq>
             </port>
-            <port tag=":LINE5" type="KEYBOARD" mask="1" defvalue="1">
+            <port tag=":LINE3" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
-                    KEYCODE_P OR KEYCODE_RIGHT
+                    NONE
                 </newseq>
             </port>
-            <port tag=":LINE5" type="KEYBOARD" mask="2" defvalue="2">
+            <port tag=":LINE6" type="KEYBOARD" mask="2" defvalue="2">
                 <newseq type="standard">
-                    KEYCODE_O OR KEYCODE_LEFT
+                    KEYCODE_L OR KEYCODE_RIGHT
+                </newseq>
+            </port>
+            <port tag=":LINE6" type="KEYBOARD" mask="4" defvalue="4">
+                <newseq type="standard">
+                    KEYCODE_K OR KEYCODE_LEFT
+                </newseq>
+            </port>
+            <port tag=":LINE7" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_SPACE OR KEYCODE_1
+                </newseq>
+            </port>
+            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_RIGHT" mask="1" defvalue="0">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_LEFT" mask="2" defvalue="0">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_DOWN" mask="4" defvalue="0">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_UP" mask="8" defvalue="0">
+                <newseq type="standard">
+                    NONE
+                </newseq>
+            </port>
+            <port tag=":exp:kempjoy:JOY" type="P1_BUTTON1" mask="16" defvalue="0">
+                <newseq type="standard">
+                    NONE
                 </newseq>
             </port>
         </input>

diff --git a/patch/gametext/oric1_honeykong.txt b/patch/gametext/oric1_honeykong.txt
@@ -0,0 +1,10 @@
+Tangerine ORIC - Honey Kong
+
+A good "Kong" game with some nice animations. 
+The collision detection could be a bit better, which 
+means the barrels are quite hard to jump at first, 
+but with practice, it becomes easier.
+
+There are 20 levels to work through!
+
+Developed by Sprites
diff --git a/readme.md b/readme.md
@@ -384,7 +384,7 @@ The application requires settings.txt and romlist.csv to be present in the insta
 The settings.txt contains the emulator, rom path, controls and other configuration.  See [Frontend Settings](#frontend-settings) section below.
 
 The romlist.csv contains information about the roms, which game slot they should appear in and how they can be unlocked and launched in the frontend.  See [How to use romlist.csv](#how-to-use-romlist-csv) below.
-There are 260 configurable game slots in total. 
+There are 262 configurable game slots in total. 
 
 
 ![DKAFE slots](https://github.com/10yard/dkafe/blob/master/artwork/about/slots.png)
@@ -647,7 +647,7 @@ The file can be configured to launch roms from the default rom directory (by lea
 The subfolder is useful when you have multiple roms with the same name e.g. there are lots of hacked versions of dkong.zip.  If the emulator supports a rompath argument then DKAFE will launch the rom directly from its subfolder.
 If the emulator does not support a rompath (e.g. Advmame) then the rom will be copied over to the main rompath. See `ALLOW_ROM_OVERWRITE` option.  With this approach I recommend the original rom be placed into its own subfolder (e.g. `/roms/original`) to prevent it from being overwritten.
 
-All roms in the list should be given an emulator number (e.g. 1 for DKWolf, as defined in `settings.txt`), a slot position (between 1 and 260) and a basic descriptive name.  Set the slot position to 0 or 999 if you want the rom to only appear in the menu. 
+All roms in the list should be given an emulator number (e.g. 1 for DKWolf, as defined in `settings.txt`), a slot position (between 1 and 262) and a basic descriptive name.  Set the slot position to 0 or 999 if you want the rom to only appear in the menu. 
 
 As well as an emulator number,  the roms can be given a recording emulator number (e.g. 2 for DK Wolf recordings).  This provides emulator details for when the rom is launched in recording mode.  Set to zero to disable recording.
 

diff --git a/romlist_addon.csv b/romlist_addon.csv
@@ -129,12 +129,17 @@ dragon32_kingcuthbert,shell,D32 Cuthbert,D32: King Cuthbert,235,,,238000,2,4,8
 jupace_krazykong,shell,JUP Krazy,JUP: Kong,236,,,239000,2,4,8
 lcd_gckong,shell,LCD Gakken,LCD: Gakken Crazy Kong,238,,,240000,2,4,8
 pc_lowresnx_denis_kogne,shell,NX D.Kogne,NX: Denis Kogne,241,,,241000,2,4,8
-dos_davikong,shell,DOS David's,DOS: David's Kong,242,,,242000,2,4,8
+nes_dk_jr_rescue_kuck,shell,NES Rescue,NES: Donkey Kong Jr Rescue Kuck,242,,,242000,2,4,8
 nes_dk_badly_drawn,shell,NES Badly,NES: Badly Drawn Donkey Kong,243,,,243000,2,4,8
 nes_dk_zelda12,shell,NES Zelda12,NES: ZeldaKong12 (Tarin),245,,,244000,2,4,8
-pc_pc88_dk3,shell,DK3 CounterAttack,PC88: DK3 Great Counter Attack,246,,,245000,2,4,8
-nes_dk_jr_rescue_kuck,shell,NES Rescue,NES: Donkey Kong Jr Rescue Kuck,247,,,246000,2,4,8
-gbcolor_dk_arcade,shell,GB Arcade,GBC: Donkey Kong Arcade,248,,,247000,2,4,8
+pc_pc88_dk3,shell,PC88 DK3 Counter,PC88: DK3 Great Counter Attack,247,,,245000,2,4,8
+dos_davikong,shell,DOS David's,DOS: David's Kong,248,,,246000,2,4,8
+gbcolor_dk_arcade,shell,GB Arcade,GBC: Donkey Kong Arcade,250,,,247000,2,4,8
+pc_dk_aa,shell,PC Attacks,PC: Donkey Kong Attacks,253,,,248000,2,4,8
+spectrum_wallykong,shell,SPEC Wally,SPEC48K: Wally Kong,256,,,249000,2,4,8
+pc_trs80_killergorilla,shell,TRS80 KillerGorilla,TRS80: Killer Gorilla,260,,,250000,2,4,8
+oric1_honeykong,shell,ORIC Honey Kong,ORIC: Honey Kong,261,,,251000,2,4,8
+pc_kong_jr_gnw,shell,PC Jr. Tribute,G&W: Kong Jr Tribute,262,,,252000,2,4,8
 ##vic20-se_dk_ackenhausen,shell,DK,VIC20: Donkey Kong (Ackenhausen),9999,,,188000,2,4,8
 a2600_ck,shell,CK,2600: Crazy Kong,9999,,,0,2,4,8
 a2600_ck_fast,shell,CK Fast,2600: CK Fast,9999,,,121000,2,4,8
@@ -250,15 +255,13 @@ nes_ninjaturtles_jr,shell,Ninja JR,NES: Ninja Turtles JR,9999,,,121000,2,4,8
 nes_pinkfloyd,shell,PinkFloyd,NES: Pink Floyd's The Wall,9999,,,121000,2,4,8
 nes_udx_vs_dk,shell,UDX vs DK,NES: UDX vs Donkey Kong,9999,,,121000,2,4,8
 oric1_dinkykong,shell,DinkyKong,ORIC: Dinky Kong,9999,,,130000,2,4,8
-oric1_honeykong,shell,Honey Kong,ORIC: Honey Kong,9999,,,130000,2,4,8
 oric1_orickong,shell,OricKong,ORIC: Oric Kong,9999,,,130000,2,4,8
 orica_4k_kong,shell,4K Kong,ORIC: 4K Kong,9999,,,130000,2,4,8
 pc_a2600_arcade_hard,shell,VCS(Hard),2600: Arcade Demo (Hard),9999,,,221000,2,4,8
 pc_arduboy_dkjr,shell,DK JR,ARDUBOY: DK Junior,9999,,,220000,2,4,8
 pc_arduboy_kong2,shell,Kong 2,ARDUBOY: Kong 2,9999,,,220000,2,4,8
 pc_atarist_junior,shell,DK JR,ST: Donkey JR (G&W),9999,,,0,2,4,8
 pc_atom_kong,shell,AcornKong,ATOM: Acorn Kong,9999,,,208000,2,4,8
-pc_dk_aa,shell,PC DKAttacks,PC: Donkey Kong Attacks,9999,,,197000,2,4,8
 pc_dk_jr_remake,shell,JR,PC: Donkey Kong JR Remake,9999,,,197000,2,4,8
 pc_dk_plus,shell,PC DK+,PC: Donkey Kong Plus,9999,,,197000,2,4,8
 pc_dk_redux,shell,Redux,PC: Donkey Kong Redux,9999,,,197000,2,4,8
@@ -268,7 +271,6 @@ pc_dkongse_gnw,shell,SE,G&W: Donkey Kong Special,9999,,,209000,2,4,8
 pc_fixitfelix3,shell,FixItFelix3,PC: Fix-It Felix 3,9999,,,197000,2,4,8
 pc_hbf900a_congo,shell,Congo,MSX: Congo,9999,,,143000,2,4,8
 pc_kidnappers_inc,shell,Kidnappers Inc,PC: Kidnappers Inc.,9999,,,197000,2,4,8
-pc_kong_jr_gnw,shell,Kong!,G&W: Kong Jr Tribute,9999,,,209000,2,4,8
 pc_mc10_kong,shell,Kong,MC10: Kong,9999,,,208000,2,4,8
 pc_monkeyjump_gnw,shell,Monkey,G&W: Monkey Jump,9999,,,209000,2,4,8
 pc_nes_dkjr_hdpack,shell,NESJR HD,NES: Donkey Kong JR HD Pack,9999,,,112000,2,4,8
@@ -278,7 +280,6 @@ pc_pokitto_kong2,shell,Kong 2,POKITTO: Donkey Kong 2 (G&W),9999,,,220000,2,4,8
 pc_spectrum_dkjr2,shell,DK JR2,SPEC48K: Donkey Kong Junior 2,9999,,,160000,2,4,8
 pc_supervision_superkong,shell,SuperKong,SV: Super Kong,9999,,,152000,2,4,8
 pc_trs80_ape,shell,Ape,TRS80: Ape Escape,9999,,,211000,2,4,8
-pc_trs80_killergorilla,shell,KillerGorilla,TRS80: Killer Gorilla,9999,,,211000,2,4,8
 pc_trs80_skyscraper,shell,Skyscraper,TRS80: Skyscraper,9999,,,211000,2,4,8
 pc_wildmanjump_gnw,shell,WildMan,G&W: Wild Man Jump,9999,,,209000,2,4,8
 pet4032_dk_junior,shell,DK Junior,G&W: Donkey Kong Junior (G&W),9999,,,133000,2,4,8
@@ -298,7 +299,6 @@ spectrum_kongs_revenge,shell,KongsRevenge,SPEC48K: Kongs Revenge,9999,,,160000,2
 spectrum_krazykong,shell,Krazy,SPEC48K: Krazy Kong,9999,,,160000,2,4,8
 spectrum_monkeybiz,shell,Monkey,SPEC48K: Monkey Bizness,9999,,,160000,2,4,8
 spectrum_spec_kong,shell,Spec Kong,SPEC48K: Spec Kong,9999,,,160000,2,4,8
-spectrum_wallykong,shell,Wally,SPEC48K: Wally Kong,9999,,,160000,2,4,8
 spectrum_wrathofkong,shell,Wrath,SPEC48K: Wrath of Kong,9999,,,160000,2,4,8
 vic20_crazykong,shell,CrazyKong,VIC20: Crazy Kong,9999,,,188000,2,4,8
 vic20_kongokong,shell,V20CK,VIC20: Kongo Kong,9999,,,188000,2,4,8