More work on populating the Crazy Kong board

dk_config.py

@@ -328,9 +328,9 @@
     (90, 34),
 
     (2, 226), (34, 226), (50, 226), (94, 226), (114, 225), (130, 224), (146, 223), (162, 222), (194, 220), (210, 219),
-    (146, 195), (130, 194), (114, 193), (82, 191), (66, 190), (50, 189), (18, 187), (2, 186),
+    (146, 195), (130, 194), (114, 193), (82, 191), (66, 190), (50, 189), (20, 187), (1, 186),
     (50, 163), (82, 161), (130, 158), (146, 157), (162, 156), (194, 154), (210, 153),
-    (146, 129), (130, 128), (98, 126), (82, 125), (50, 123), (18, 121), (2, 120),
+    (146, 129), (130, 128), (98, 126), (82, 125), (50, 123), (20, 121), (1, 120),
     (50, 97), (98, 94), (114, 93), (130, 92), (146, 91), (162, 90), (194, 88), (210, 87),
     (162, 64), (146, 63), (114, 62), (90, 62), (2, 62),
     (98, 34)
@@ -397,7 +397,7 @@
 TELEPORT_TO_POSXY = ((164, 193), (20, 92)), ((101, 98), (11, 138)), ((104, 180), (16, 140)), ((206, 72), (3, 161)), ((164, 193), (32, 92))
 OILCAN_POSXY = (16, 232), (172, 152), (104, 128), (68, 112), (16, 232)
 WARP_ARROW_POSXY = (20, 246), (176, 166), (108, 142), (72, 126), (20, 246)
-PAULINE_POSXY = (0, 0), (16, -8), (0, 0), (0, 0), (0, 0)
+PAULINE_POSXY = (0, 0), (16, -8), (0, 0), (0, 0), (8, 0)
 KONG_POSXY = (0, 0), (80, 4), (0, 4), (0, 4), (0, 0)
 COIN_GRAB_POSXY = (67, 73), (147, 77), (67, 77), (67, 77), (67, 73)
 COIN_AWARD_POSX = 0, 112, 28, 0, 0
@@ -679,7 +679,7 @@
     "pc_pico8_dinkyking": "ctrl>x|esc>forcequit:zepto8.exe",
     "pc_raiders":"ctrl>space",
     "pc_tic80_denis_kogne":"ctrl>z|alt>x|esc>forcequit:tic80.exe",
-    "pc_tic80_kongremake":"alt>x|ctrl>enter|esc>forcequit:tic80.exe",
+    "pc_tic80_kongremake":"ctrl>up|esc>forcequit:tic80.exe",
     "pc_trs80_ape":"ctrl>space|p>enter,1|num 2>home|num 1>enter,1",
     "pc_trs80_kong":"ctrl>space|num 1>home",
     "pc_trs80_dk":"ctrl>space|num 1>enter,1",

dk_interface.py

@@ -89,16 +89,18 @@ def get_award(sub, rom, score3, score2, score1, time_start=None, time_end=None):
 def format_K(number, lowest_number=None):
     # Format the provided number e.g. 15000 = 15K
     # if lowest number is provided then format will only be done if the number is above 1000
-    if int(lowest_number) < 1000:
-        return number
+    if lowest_number:
+        if int(lowest_number) < 1000:
+            return number
+        else:
+            num = float('{:.3g}'.format(float(number)))
+            magnitude = 0
+            while abs(num) >= 1000:
+                magnitude += 1
+                num /= 1000.0
+            return '{}{}'.format('{:f}'.format(num).rstrip('0').rstrip('.'), ['', 'K', 'M', 'B', 'T'][magnitude])
     else:
-        num = float('{:.3g}'.format(float(number)))
-        magnitude = 0
-        while abs(num) >= 1000:
-            magnitude += 1
-            num /= 1000.0
-        return '{}{}'.format('{:f}'.format(num).rstrip('0').rstrip('.'), ['', 'K', 'M', 'B', 'T'][magnitude])
-
+        return 0
 
 if __name__ == "__main__":
     pass

launch.py

@@ -39,6 +39,7 @@ def exit_program(confirm=False):
             except (EOFError, FileNotFoundError, IOError):
                 pygame.time.delay(250 * attempt)
         rotate_display(exiting=True)
+        kill_pc_external(program="remap_pc.exe")  # ensure keyboard remaps are ended
         pygame.quit()
         sys.exit()
 
@@ -48,7 +49,7 @@ def kill_pc_external(pid=None, program=None):
     if pid:
         call(f"taskkill /f /PID {pid}", stdout=DEVNULL, stderr=STDOUT, creationflags=CREATE_NO_WINDOW)
     elif program:
-        call(f"taskkill /f /IM {program}", stdout=DEVNULL, stderr=STDOUT, creationflags=CREATE_NO_WINDOW)
+        call(f"taskkill /f /IM {os.path.basename(program)}", stdout=DEVNULL, stderr=STDOUT, creationflags=CREATE_NO_WINDOW)
 
 
 def rotate_display(exiting=False, initial=False, rotate=ROTATION):
@@ -1030,7 +1031,6 @@ def launch_rom(info, launch_plugin=None, override_emu=None):
                 if ARCH == "win64":
                     for remap_program in os.path.join(ROOT_DIR, "remap_pc.exe"), os.path.join(ROOT_DIR, "dist", "remap_pc.exe"), os.path.join(ROM_DIR, "pc", "remap_pc.exe"):
                         if os.path.exists(remap_program):
-                            print(remap_program)
                             Popen(f'"{remap_program}" "{name}" "{KEYBOARD_REMAP[name]}', creationflags=CREATE_NO_WINDOW)
                             break
 
@@ -1047,7 +1047,7 @@ def launch_rom(info, launch_plugin=None, override_emu=None):
 
             # Terminate any temporary keyboard mappings
             if remap_program:
-                kill_pc_external(program=os.path.basename(remap_program))
+                kill_pc_external(program=remap_program)
 
             # If there was a specific config file then copy it back to account for any changes
             if sub == "shell":

patch/gametext/gnw_dkong.txt

@@ -1,7 +1,5 @@
 Game & Watch - Donkey Kong DK-52
 
-The game takes place over two screens. 
-
 Mario starts at the bottom left of the bottom screen.
 Move right and dodge Donkey Kong's barrels by pressing
 the jump button. When Mario reaches the ladder, press
@@ -15,7 +13,6 @@ right dodging more barrels. When the crane swings all
 the way to the left, Mario can Jump to grab it and cut 
 one of the wires holding Donkey Kong's girder. 
 Mario will then return to the beginning of the level. 
-Cut all four wires to clear the level and receive a 
-score bonus.
+Cut all 4 wires to clear the level and receive a bonus.
 
 Developed By Nintendo

patch/gametext/pc_dk_jr_remake.txt

@@ -0,0 +1,17 @@
+PC - Donkey Kong Junior Remake
+
+A Windows remake of the Nintendo classic from 1982.
+
+Donkey Kong, has been imprisoned in a cage. Donkey 
+Kong's cage is guarded by Mario, Donkey Kong Jr. must 
+save his father from Mario by putting the key or keys 
+in the stage into all of the locks. Mario attempts to 
+stop DK Jr. by releasing the many animals he controls 
+to knock DK Jr. off the vines and platforms. DK Jr.
+defeats Mario if the player completes the fourth 
+stage by putting all six keys in their locks, making 
+the floor disappear. 
+
+DK Jr can destroy an enemy by dropping fruit on them.
+
+Developed by P J Crossley

patch/gametext/pc_dk_redux.txt

@@ -0,0 +1,10 @@
+PC - Donkey Kong Redux
+
+The author spent multiple hours watching videos of the
+original Donkey Kong game with the aim of replicating
+the behaviour, game logic and timing. 
+
+The game includes the option of 4 new levels added to
+the original 4 levels.
+
+Developed by Raouls

patch/gametext/pc_dk_remake.txt

@@ -0,0 +1,9 @@
+PC - Donkey Kong Remake
+
+A nice remake.  Well made and close to the original in 
+many ways. Precise jumping and accurate movement will 
+help you in completing this game. 
+
+This remake has an extra 2 levels added.
+
+Developed by P J Crossley

patch/gametext/pc_dkongse_gnw.txt

@@ -0,0 +1,13 @@
+Game & Watch - Donkey Kong Special Edition
+
+Donkey Kong captured a beautiful girl and carried her
+into a building under construction.
+Donkey Kong throws barrels at Mario to stop him from 
+saving the girl.
+- Knock the girder out from under Donkey Kong.
+- Do not jump when iron bar is moving over Mario.
+- Move the lever on the upper girder to lift the crane.
+- Jump to get the hook and cut the wire holding the 
+  girder on which Donkey Kong is standing.
+
+Developed By Luca "MADrigal" Antignano

patch/gametext/pc_monkeyjump_gnw.txt

@@ -0,0 +1,12 @@
+Game & Watch - Monkey Jump
+
+Kong has kidnapped a very nice girl and taken her to 
+the mysterious jungle. She's waiting for you to save 
+her.
+- You can escape the kong by jumping the tires he's 
+throwing at you.
+- The magic cakes on floors 2 and 4 make you 
+invincible for a short time.
+- You can smash tires by simply hitting them.
+
+Developed By Luca "MADrigal" Antignano

patch/gametext/pc_pico8_ape.txt

@@ -0,0 +1,9 @@
+Pico-8 Fantasy Console - Ape Approacher
+
+An interesting twist on Donkey Kong.
+
+You must disobey the rules by approaching and
+photographing the ape.  Collect batteries along the 
+way and find a good vantage point.
+
+Developed by mrjorts

patch/gametext/pc_pico8_denis_kogne.txt

@@ -0,0 +1,9 @@
+Pico-8 Fantasy Console - Denis Kogne
+
+You play Denis,  who must make a table from IKEA.
+You can't jump, but you can throw hammers to kill shop
+guys enemys.
+You get bonus +50 pts when you collect minimum of 4 
+table legs, 4 screws and 1 table top.
+
+Developed by BGelais (Lostcadesoft)

patch/gametext/pc_pico8_dinkyking.txt

@@ -0,0 +1,12 @@
+Pico-8 Fantasy Console - Dinky King
+
+You are the Dinky King! You must save the Queen from
+the Jealous Jester. 
+The Queen dropped her stuff! Make sure to grab it for 
+her on the way. Arrest that Jester! And if you can...
+topple him to his doom in the last level. 
+
+Difficulty increases slightly each time you complete 
+all four levels.
+
+Developed by gradualgames

patch/gametext/pc_raiders.txt

@@ -0,0 +1,14 @@
+PC - Donkey-Me: Raiders of the Lost Ark
+
+A Donkey Kong and Indiana Jones fusion.
+A classc remake with a twist - Indiana Jones is the 
+hero.
+
+The game is divided into various phases that represent 
+scenes from the movie. The first, for example, is set 
+in the beginning of the movie, with the classic scene 
+with the giant rolling rock and the golden idol. 
+In others, you'll have to reach the lost ark, or the 
+truck where Marian was kidnapped.
+
+Developed by Bruneras

patch/gametext/pc_tic80_denis_kogne.txt

@@ -0,0 +1,11 @@
+TIC80 Fantasy Console - Denis Kogne
+
+The authors best version of this game.
+
+You play Denis,  who must make a table from IKEA.
+You can't jump, but you can throw hammers to kill shop
+guys enemys.
+You get bonus +50 pts when you collect minimum of 4 
+table legs, 4 screws and 1 table top.
+
+Developed by BGelais (Lostcadesoft)

patch/gametext/pc_tic80_kongremake.txt

@@ -0,0 +1,12 @@
+TIC-80 Fantasy Console - Kong Remake
+
+There's been a terrible accident...
+The shipping container was unlocked and a shipment of
+barrels has got loose.
+You must destroy the shipping container.
+Watch out for the acid tank.  It makes the barrels
+jumpy!
+
+Use the hammer if you must.
+
+Developed by derrick, george

patch/gametext/pc_trs80_ape.txt

@@ -0,0 +1,9 @@
+Tandy TRS80 - Ape Escape
+
+You'll go bananas over Ape.
+
+An extremely blocky but surprisingly playable Donkey 
+Kong clone.
+
+Developed by Glen and Ray Kreisel / BananaSoft
+

patch/gametext/pc_trs80_dk.txt

@@ -0,0 +1,13 @@
+Tandy TRS80 - Donkey Kong
+
+A remarkable job of matching the look and feel of the 
+original. All the arcade screens are present, although
+the graphics are simplified to work with 128x48 screen.
+The gameplay even feels the same as the arcade version.
+Westmoreland and Gilman wrote Donkey Kong in 1982 but 
+never released it due to licensing problems.
+
+Despite its status as unreleased, Donkey Kong is a 
+finished game.
+
+Port Developed by Wayne Westmoreland and Terry Gilman

patch/gametext/pc_trs80_killergorilla.txt

@@ -0,0 +1,12 @@
+Tandy TRS80 - Killer Gorilla
+
+The killer gorilla has captured the player's 
+girlfriend, and is holding her hostage atop a 
+structure consisting of platforms, conveyor belts, and
+ladders. The player must move through 4 separate 
+stages, trying to reach the top of each. 
+
+Yet more blocky Donkey Kong delights on the TRS80!
+
+Developed by Dubois and McNamara Software
+

patch/gametext/pc_trs80_kong.txt

@@ -0,0 +1,6 @@
+Tandy TRS80 - Kong
+
+Another blocky Donkey Kong clone.
+
+Developed by Karlheinz Nogai
+

patch/gametext/pc_wildmanjump_gnw.txt

@@ -0,0 +1,15 @@
+Game & Watch - Wild Man Jump
+
+Kong has kidnapped a very nice girl and taken her to 
+the mysterious jungle. She's waiting for you to save 
+her.  
+
+Yes, it's the same as "Monkey Jump".
+
+- You can escape the kong by jumping the tires he's 
+throwing at you.
+- The magic cakes on floors 2 and 4 make you 
+invincible for a short time.
+- You can smash tires by simply hitting them.
+
+Developed By Luca "MADrigal" Antignano

remap_pc.py

@@ -20,6 +20,10 @@ def kill_pc_external(pid=None, program=None):
         call(f"taskkill /f /PID {pid}", stdout=DEVNULL, stderr=STDOUT, creationflags=CREATE_NO_WINDOW)
     elif program:
         call(f"taskkill /f /IM {program}", stdout=DEVNULL, stderr=STDOUT, creationflags=CREATE_NO_WINDOW)
+    # Ensure remappings are ended
+    keyboard.unhook_all()
+    call(f"taskkill /f /IM remap_pc.exe")
+    sys.exit()
 
 def remap(name, mappings):
     """asynchronous: temporary keyboard remapping and force quit option"""