Remove redundant tape-sampling loop accelerator names

skoolkid · Jul 23, 2023 · 79775aa · 79775aa
1 parent d5f47e3
commit 79775aa
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 452 deletions.
diff --git a/skoolkit/loadsample.py b/skoolkit/loadsample.py
@@ -925,17 +925,3 @@ def __init__(self, name, code, offset, in_time, loop_time, loop_r_inc, ear_mask,
         0     # Zero flag is reset upon edge detection by AND $40
     ),
 }
-
-ACCELERATORS['cyberlode'] = ACCELERATORS['bleepload']
-ACCELERATORS['edge'] = ACCELERATORS['rom']
-ACCELERATORS['elite-uni-loader'] = ACCELERATORS['speedlock']
-ACCELERATORS['excelerator'] = ACCELERATORS['bleepload']
-ACCELERATORS['flash-loader'] = ACCELERATORS['rom']
-ACCELERATORS['ftl'] = ACCELERATORS['speedlock']
-ACCELERATORS['gargoyle'] = ACCELERATORS['speedlock']
-ACCELERATORS['hewson-slowload'] = ACCELERATORS['rom']
-ACCELERATORS['injectaload'] = ACCELERATORS['bleepload']
-ACCELERATORS['poliload'] = ACCELERATORS['dinaload']
-ACCELERATORS['power-load'] = ACCELERATORS['bleepload']
-ACCELERATORS['softlock'] = ACCELERATORS['rom']
-ACCELERATORS['zydroload'] = ACCELERATORS['speedlock']
diff --git a/sphinx/source/commands.rst b/sphinx/source/commands.rst
@@ -1452,38 +1452,26 @@ loop accelerators are:
 * ``crl2`` (Terrahawks)
 * ``crl3`` (Oink)
 * ``crl4`` (Federation)
-* ``cyberlode`` (Cyberlode 1.1 - same as ``bleepload``)
 * ``cybexlab`` (17.11.1989, Belegost, Starfox)
 * ``d-and-h`` (Multi-Player Soccer Manager)
 * ``delphine`` (Zakliaty zámok programátorov)
 * ``design-design`` (various games published by Design Design Software)
 * ``digital-integration`` (Digital Integration)
 * ``dinaload`` (Dinaload)
-* ``edge`` (Edge - same as ``rom``)
-* ``elite-uni-loader`` (Elite Uni-Loader - same as ``speedlock``)
-* ``excelerator`` (The Excelerator Loader - same as ``bleepload``)
-* ``flash-loader`` (Flash Loader - same as ``rom``)
-* ``ftl`` (FTL - same as ``speedlock``)
-* ``gargoyle`` (Gargoyle - same as ``speedlock``)
 * ``gargoyle2`` (various games created or published by Gargoyle Games)
 * ``gremlin`` (various games published by Gremlin Graphics)
 * ``gremlin2`` (Super Cars)
-* ``hewson-slowload`` (Hewson Slowload - same as ``rom``)
-* ``injectaload`` (Injectaload - same as ``bleepload``)
 * ``microprose`` (F-15 Strike Eagle)
 * ``microsphere`` (Back to Skool, Contact Sam Cruise, Skool Daze, Sky Ranger)
 * ``micro-style`` (Xenophobe)
 * ``mirrorsoft`` (Action Reflex)
 * ``palas`` (Bad Night)
 * ``paul-owens`` (Paul Owens Protection System)
-* ``poliload`` (Poliload - same as ``dinaload``)
-* ``power-load`` (Power-Load - same as ``bleepload``)
 * ``raxoft`` (Piskworks, Podraz 4)
 * ``realtime`` (Starstrike II)
 * ``rom`` (any loader whose sampling loop is the same as the ROM's)
 * ``search-loader`` (Search Loader)
 * ``silverbird`` (Olli & Lissa II: Halloween)
-* ``softlock`` (SoftLock - same as ``rom``)
 * ``software-projects`` (BC's Quest for Tires, Lode Runner)
 * ``sparklers`` (Bargain Basement, Flunky)
 * ``speedlock`` (Speedlock - all versions)
@@ -1492,7 +1480,6 @@ loop accelerators are:
 * ``tiny`` (Il Cobra di Cristallo, Negy a Nyero, Phantomasa, and others)
 * ``us-gold`` (Gauntlet II)
 * ``weird-science`` (Flash Beer Trilogy, Ghost Castles, TV-Game)
-* ``zydroload`` (Zydroload - same as ``speedlock``)
 
 The ``load`` parameter may be used to specify an alternative command line to
 load the tape in cases where neither 'LOAD ""' nor 'LOAD ""CODE' works. Its

diff --git a/sphinx/source/man/tap2sna.py.rst b/sphinx/source/man/tap2sna.py.rst
@@ -184,38 +184,26 @@ loop accelerators are:
 |  ``crl2`` (Terrahawks)
 |  ``crl3`` (Oink)
 |  ``crl4`` (Federation)
-|  ``cyberlode`` (Cyberlode 1.1 - same as ``bleepload``)
 |  ``cybexlab`` (17.11.1989, Belegost, Starfox)
 |  ``d-and-h`` (Multi-Player Soccer Manager)
 |  ``delphine`` (Zakliaty zámok programátorov)
 |  ``design-design`` (various games published by Design Design Software)
 |  ``digital-integration`` (Digital Integration)
 |  ``dinaload`` (Dinaload)
-|  ``edge`` (Edge - same as ``rom``)
-|  ``elite-uni-loader`` (Elite Uni-Loader - same as ``speedlock``)
-|  ``excelerator`` (The Excelerator Loader - same as ``bleepload``)
-|  ``flash-loader`` (Flash Loader - same as ``rom``)
-|  ``ftl`` (FTL - same as ``speedlock``)
-|  ``gargoyle`` (Gargoyle - same as ``speedlock``)
 |  ``gargoyle2`` (various games created or published by Gargoyle Games)
 |  ``gremlin`` (various games published by Gremlin Graphics)
 |  ``gremlin2`` (Super Cars)
-|  ``hewson-slowload`` (Hewson Slowload - same as ``rom``)
-|  ``injectaload`` (Injectaload - same as ``bleepload``)
 |  ``microprose`` (F-15 Strike Eagle)
 |  ``microsphere`` (Back to Skool, Contact Sam Cruise, Skool Daze, Sky Ranger)
 |  ``micro-style`` (Xenophobe)
 |  ``mirrorsoft`` (Action Reflex)
 |  ``palas`` (Bad Night)
 |  ``paul-owens`` (Paul Owens Protection System)
-|  ``poliload`` (Poliload - same as ``dinaload``)
-|  ``power-load`` (Power-Load - same as ``bleepload``)
 |  ``raxoft`` (Piskworks, Podraz 4)
 |  ``realtime`` (Starstrike II)
 |  ``rom`` (any loader whose sampling loop is the same as the ROM's)
 |  ``search-loader`` (Search Loader)
 |  ``silverbird`` (Olli & Lissa II: Halloween)
-|  ``softlock`` (SoftLock - same as ``rom``)
 |  ``software-projects`` (BC's Quest for Tires, Lode Runner)
 |  ``sparklers`` (Bargain Basement, Flunky)
 |  ``speedlock`` (Speedlock - all versions)
@@ -224,7 +212,6 @@ loop accelerators are:
 |  ``tiny`` (Il Cobra di Cristallo, Negy a Nyero, Phantomasa, and others)
 |  ``us-gold`` (Gauntlet II)
 |  ``weird-science`` (Flash Beer Trilogy, Ghost Castles, TV-Game)
-|  ``zydroload`` (Zydroload - same as ``speedlock``)
 
 The ``load`` parameter may be used to specify an alternative command line to
 load the tape in cases where neither 'LOAD ""' nor 'LOAD ""CODE' works. Its

diff --git a/sphinx/source/migration.rst b/sphinx/source/migration.rst
@@ -42,6 +42,23 @@ unless the ``--force`` option was given. In SkoolKit 9, `tap2sna.py` will
 overwrite an existing snapshot by default, and the ``--force`` option is no
 longer supported.
 
+The following tape-sampling loop accelerator names are not available in
+SkoolKit 9:
+
+* ``cyberlode`` (use ``bleepload`` instead)
+* ``edge`` (use ``rom`` instead)
+* ``elite-uni-loader`` (use ``speedlock`` instead)
+* ``excelerator`` (use ``bleepload`` instead)
+* ``flash-loader`` (use ``rom`` instead)
+* ``ftl`` (use ``speedlock`` instead)
+* ``gargoyle`` (use ``speedlock`` instead)
+* ``hewson-slowload`` (use ``rom`` instead)
+* ``injectaload`` (use ``bleepload`` instead)
+* ``poliload`` (use ``dinaload`` instead)
+* ``power-load`` (use ``bleepload`` instead)
+* ``softlock`` (use ``rom`` instead)
+* ``zydroload`` (use ``speedlock`` instead)
+
 trace.py
 --------
 In SkoolKit 8, :ref:`trace.py` had a ``--dump`` option for specifying an output