Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New working software list items #11643

Merged
merged 3 commits into from Oct 21, 2023
Merged

New working software list items #11643

merged 3 commits into from Oct 21, 2023

Conversation

A-Noid33
Copy link
Contributor

@A-Noid33 A-Noid33 commented Oct 20, 2023

Some metadata cleanup and consistency checking for Apple II softlists.

Software redumped (apple2_flop_orig.xml)

Wizardry III: Legacy of Llylgamyn (Version 4, 20-Aug-1983 update) [4AM, a2_qkumba]

Software redumped (apple2_flop_clcracked.xml)

Marty's Family Reader (4am crack) [4AM, LoGo]
Marty's Reading Workout (4am crack) [4AM, LoGo]
Greeting Card Maker (4am crack) [4am]
Peanuts Maze Marathon (4am crack) [4am]
The School Tool (4am crack) [4am]

New working software list items (apple2_flop_clcracked.xml)

A First Program About Insects (4am crack) [4am]
Algebra Word Problems (4am crack) [4am]
Alphabet Zoo (4am crack) [4AM]
Arithmekicks (4am crack) [4am]
Arithmetickle (4am crack) [4am]
Destiny (4am crack) [4am]
Equations I (4am crack) [4am]
Faire le Point-Bac Physique Volume 3 (French) (4am crack) [4am]
Floppy Teaches: How to Print Letters and Numerals (4am crack) [4am]
Floppy Teaches: Letter and Numeral Recognition (4am crack) [4am]
Floppy Teaches: What is Missing? (4am crack) [4am]
French Classroom Words (4am crack) [4am]
Gobbler (4am and san inc crack) [4AM]
Half Time: Computerized Charting for Marching Bands (version 2.0) (4am crack) [4am]
Knowledge Master Basics: Earth Science (4am crack) [4am]
Knowledge Master Basics: Geography (4am crack) [4am]
Knowledge Master Basics: Language Arts #1 (4am crack) [4am]
Knowledge Master Basics: Language Arts #2 (4am crack) [4am]
Knowledge Master Basics: Life Science #1 (4am crack) [4am]
Knowledge Master Basics: Life Science #2 (4am crack) [4am]
Knowledge Master Basics: Literature (4am crack) [4am]
Knowledge Master Basics: Math #1 (4am crack) [4am]
Knowledge Master Basics: Math #2 (4am crack) [4am]
Knowledge Master Basics: Physical Science (4am crack) [4am]
Knowledge Master Basics: Social Studies #2 (4am crack) [4am]
Map Reading (4am crack) [4am]
Math Football: Decimals (version 3.1.6) (4am crack) [4am]
Mathematics Word Problems - Grade 7 (4am crack) [4am]
Mathematics Word Problems - Grade 8 (4am crack) [4am]
Money (version 4.1.7) (4am crack) [4am]
MultiScribe (version 3.01c) (4am crack) [4AM]
Parachute Parts of Speech (4am crack) [4am]
Percent (version 3.1.6) (4am crack) [4am]
Percent Word Problems (4am crack) [4am]
Perplexing Puzzles (version 1985-07-09) (4am crack) [4am]
pfs: report (version 1984-03-20) (4am crack) [4AM]
pfs: report (version 1985-09-10) (4am crack) [4AM]
Punctuation Baseball Level A (version 4.1.5) (4am crack) [4am]
Real Number System (4am crack) [4am]
Rendezvous with Rama (4am crack) (Telarium Re-release) [4am]
Skill Builder: Social Studies - Grade 6 (4am crack) [4am]
Spider Hunt Spelling (version 4.1.6) (4am crack) [4am]
Story Writing (4am crack) [4am]
Take 1 (version 06431) (4am crack) [4AM]
The Great Knowledge Race (4am crack) [4am]
The Magic Cash Register (4am crack) [4am]
The Time Tunnel: Sports Edition (4am crack) [4am]
Time Capsule (4am crack) [4am]
Travels with Za-Zoom: The World (revision 2) (4am crack) [4am]
Word Problems Level C (version 3.1.6) (4am crack) [4am]

Software redumped (apple2_flop_orig.xml)
-------------------------------
Wizardry III: Legacy of Llylgamyn (Version 4, 20-Aug-1983 update) [4AM, a2_qkumba]

Software redumped (apple2_flop_clcracked.xml)
-------------------------------
Marty's Family Reader (4am crack) [4AM, LoGo]
Marty's Reading Workout (4am crack) [4AM, LoGo]
Greeting Card Maker (4am crack) [4am]
Peanuts Maze Marathon (4am crack) [4am]
The School Tool (4am crack) [4am]

New working software list items (apple2_flop_clcracked.xml)
-------------------------------
A First Program About Insects (4am crack) [4am]
Algebra Word Problems (4am crack) [4am]
Alphabet Zoo (4am crack) [4AM]
Arithmekicks (4am crack) [4am]
Arithmetickle (4am crack) [4am]
Destiny (4am crack) [4am]
Equations I (4am crack) [4am]
Faire le Point-Bac Physique Volume 3 (French) (4am crack) [4am]
Floppy Teaches: How to Print Letters and Numerals (4am crack) [4am]
Floppy Teaches: Letter and Numeral Recognition (4am crack) [4am]
Floppy Teaches: What is Missing? (4am crack) [4am]
French Classroom Words (4am crack) [4am]
Gobbler (4am and san inc crack) [4AM]
Half Time: Computerized Charting for Marching Bands (version 2.0) (4am crack) [4am]
Knowledge Master Basics: Earth Science (4am crack) [4am]
Knowledge Master Basics: Geography (4am crack) [4am]
Knowledge Master Basics: Language Arts mamedev#1 (4am crack) [4am]
Knowledge Master Basics: Language Arts mamedev#2 (4am crack) [4am]
Knowledge Master Basics: Life Science mamedev#1 (4am crack) [4am]
Knowledge Master Basics: Life Science mamedev#2 (4am crack) [4am]
Knowledge Master Basics: Literature (4am crack) [4am]
Knowledge Master Basics: Math mamedev#1 (4am crack) [4am]
Knowledge Master Basics: Math mamedev#2 (4am crack) [4am]
Knowledge Master Basics: Physical Science (4am crack) [4am]
Knowledge Master Basics: Social Studies mamedev#2 (4am crack) [4am]
Map Reading (4am crack) [4am]
Math Football: Decimals (version 3.1.6) (4am crack) [4am]
Mathematics Word Problems - Grade 7 (4am crack) [4am]
Mathematics Word Problems - Grade 8 (4am crack) [4am]
Money (version 4.1.7) (4am crack) [4am]
MultiScribe (version 3.01c) (4am crack) [4AM]
Parachute Parts of Speech (4am crack) [4am]
Percent (version 3.1.6) (4am crack) [4am]
Percent Word Problems (4am crack) [4am]
Perplexing Puzzles (version 1985-07-09) (4am crack) [4am]
pfs: report (version 1984-03-20) (4am crack) [4AM]
pfs: report (version 1985-09-10) (4am crack) [4AM]
Punctuation Baseball Level A (version 4.1.5) (4am crack) [4am]
Real Number System (4am crack) [4am]
Rendezvous with Rama (4am crack) (Telarium Re-release) [4am]
Skill Builder: Social Studies - Grade 6 (4am crack) [4am]
Spider Hunt Spelling (version 4.1.6) (4am crack) [4am]
Story Writing (4am crack) [4am]
Take 1 (version 06431) (4am crack) [4AM]
The Great Knowledge Race (4am crack) [4am]
The Magic Cash Register (4am crack) [4am]
The Time Tunnel: Sports Edition (4am crack) [4am]
Time Capsule (4am crack) [4am]
Travels with Za-Zoom: The World (revision 2) (4am crack) [4am]
Word Problems Level C (version 3.1.6) (4am crack) [4am]
Copy link
Member

@cuavas cuavas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • To me, it appears that several of the pfs software packages are missing parent/clone relationships for different versions of the same software. Can you please check that the different versions of pfs: write, pfs: report, etc. are just different versions of the same software and add parent/clone relationships as appropriate?
  • The latest version of a software package should be the parent in most situations. The parent should have the base name and suffixes should be appended to the name for clones. I found at least one case where a later revision was marked as a clone. Can you please check these?
  • You’ve changed the short names of several items in apple2_flop_clcracked.xml. Can you please ensure the short names match the equivalent uncracked software in apple2_flop_orig.xml? It makes it easier to do comparisons, etc.

Comment on lines 50258 to 50276
<software name="twztwrld">
<description>Travels with Za-Zoom: The World (revision 1) (4am crack)</description>
<year>1984</year>
<publisher>Focus Media</publisher>
<info name="programmer" value="Frederick Burggraf and Priscilla Minnich" />
<info name="usage" value="Requires a 48K Apple ][+ or later." />
<info name="version" value="revision 1" />
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS" />
<!--Dump released: 2014-11-14-->
<!--educational program-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="143360">
<rom name="travels with za-zoom - the world (4am crack).dsk" size="143360" crc="99196e5a" sha1="399fca093f2b85a20ad2b344ba2b29671c717e92" />
</dataarea>
</part>
</software>

<software name="twztwrld2">
<description>Travels with Za-Zoom: The World (revision 2) (4am crack)</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, the latest revision should be the parent and have the base name. Earlier revisions should be clones and have suffixes appended to their name attributes,.

Comment on lines 50317 to 50335
<software name="pfsa02">
<description>pfs (version A.02, 1980-10-23) (4am crack)</description>
<year>1980</year>
<publisher>Software Publishing Corporation</publisher>
<info name="developer" value="Software Publishing Corporation" />
<info name="usage" value="Runs on any Apple ][ or later with 48K." />
<info name="version" value="A.02, 1980-10-23" />
<sharedfeat name="compatibility" value="A2,A2P,A2E,A2EE,A2C,A2GS" />
<!--Dump released: 2021-10-07-->
<!--productivity program-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="143360">
<rom name="pfs va.02 (4am crack).dsk" size="143360" crc="5ace09ae" sha1="26063377c1a5e317710b18954b8db1306d08e8e5"/>
</dataarea>
</part>
</software>

<software name="pfsb00">
<description>pfs (version B.00, 1981-01-03) (4am crack)</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these different versions of the same thing? Should the older one be a clone?

Comment on lines 50387 to 50405
<software name="pfsfa00">
<description>pfs: file (version A.00) (4am crack)</description>
<year>1983</year>
<publisher>Software Publishing Corporation</publisher>
<info name="developer" value="Software Publishing Corporation" />
<info name="usage" value="Runs on any Apple //e or later with 64K." />
<info name="version" value="A.00" />
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS" />
<!--Dump released: 2021-11-11-->
<!--productivity program-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="143360">
<rom name="pfs file va.00 (4am crack).dsk" size="143360" crc="49980399" sha1="14451182f9d319d2c08a7f7fd68aec10654299b1"/>
</dataarea>
</part>
</software>

<software name="pfsfb01">
<description>pfs: file (version B.01) (4am crack)</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly, are the pfs: file versions different revisions of the same software? Is pfs: fichier the French version of pfs: file?

Comment on lines 50455 to 50473
<software name="pfsg830112">
<description>pfs: graph (version 1983-01-12) (4am crack)</description>
<year>1983</year>
<publisher>Software Publishing Corporation</publisher>
<info name="developer" value="Software Publishing Corporation" />
<info name="usage" value="Runs on any Apple //e or later with 64K. Due to programming errors, this version works best on an unenhanced Apple //e." />
<info name="version" value="1983-01-12" />
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS" />
<!--Dump released: 2022-06-28-->
<!--productivity program-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="143360">
<rom name="pfs graph 1983-01-12 (4am crack).dsk" size="143360" crc="56ee1260" sha1="29f14fd0564e271a10db7c73918735e9149d5d45"/>
</dataarea>
</part>
</software>

<software name="pfsg840131">
<description>pfs: graph (version 1984-01-31) (4am crack)</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the variants of pfs: graph different versions of the same software that should be clones?

Comment on lines 50506 to 50524
<software name="pfsrb00">
<description>pfs: report (version B.00, 1981-01-03) (4am crack)</description>
<year>1981</year>
<publisher>Software Publishing Corporation</publisher>
<info name="developer" value="Software Publishing Corporation" />
<info name="usage" value="Runs on any Apple ][+ or later with 64K. Due to programming errors, this version works best without an 80-column card." />
<info name="version" value="B.00, 1981-01-03" />
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS" />
<!--Dump released: 2022-06-29-->
<!--productivity program-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="143360">
<rom name="pfs report 1981-01-03 (vb.00) (4am crack).dsk" size="143360" crc="47f55268" sha1="a67c4ef6e2591bc0600b565c88f00552eecb5a51"/>
</dataarea>
</part>
</software>

<software name="pfsrb02">
<description>pfs: report (version B.02) (4am crack)</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should alternate versions of pfs: report be clones?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cuavas Completed updated the parent-clone relationships.

@A-Noid33
Copy link
Contributor Author

A-Noid33 commented Oct 20, 2023 via email

@cuavas
Copy link
Member

cuavas commented Oct 21, 2023

I assume that Parent-Clone relationships will be per-software lists, so there will be a parent in cleanly cracked and a separate parent in original.

Correct – there’s no way to specify relationships between software in different software lists at this time.

What should I do with 800K 3.5" floppies vs 5.25" floppies? Should I make the 800K floppy the parent, when we have both 3.5 and 5.25 of the same base version?

Interesting question. My gut instinct says to make the 5.25" version the parent if the software is compatible with 8-bit Apple II machines as 5.25" drives were standard (ignoring the misguided IIc+). For 16-bit IIgs software, maybe the 3.5" version could be made the parent? I’m not sure.

Maybe @rb6502 has opinions on this.

Copy link
Member

@cuavas cuavas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the name of clones, please append a suffix to the parent name where it makes sense. It’s a lot easier to see the groups of clones in sorted listings that way, and it makes things easier to read. Up to sixteen characters are allowed.

<software name="pfsfa00">
<software name="pfsfa00" cloneof="pfsfile">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For cases like this, can you please just make the name of the clone the name of the parent with a suffix appended? It makes it easier to see the groups of clones in a sorted listing. In this case, you can make the clone’s name pfsfilea00. There’s no need to force the name for clones into eight characters (up to sixteen characters are allowed by validation).

<software name="pfsg840131">
<software name="pfsg840131" cloneof="pfsgraph">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here – pfsgraph840131 fits in sixteen characters fine.

@cuavas cuavas merged commit 0910494 into mamedev:master Oct 21, 2023
3 checks passed
@rb6502
Copy link
Contributor

rb6502 commented Oct 21, 2023

Maybe @rb6502 has opinions on this.

My opinion is simple: separate 5.25 and 3.5 software lists. IIgs and IIc+ (and the Liron card whenever the IWM is restructured to have correct controller/drive boundaries) prioritize the 3.5. Then you aren't polluting the software list namespace with "aplwks40_35" and you aren't violating the rule of least surprise.

@cuavas
Copy link
Member

cuavas commented Oct 21, 2023

I’m still uncomfortable with artificial splits like that. There’s already the interface used to match media to a suitable device, it falls over for software that included multiple media types, and it makes it much harder to group releases of the same software on different media.

@rb6502
Copy link
Contributor

rb6502 commented Oct 21, 2023

That split has the advantage of not requiring additional work on the software loading.

To work without the split, multiple media types in the same software needs to work, there needs to be some way to specify which one to try first (so IIgs and IIc+ can get 3.5), and there needs to be a way to specify sets of media types so that a dual-media AppleWorks set wouldn't load both 5.25 and 3.5, but a Windows 95 boot floppy + CD-ROM would.

@A-Noid33
Copy link
Contributor Author

A-Noid33 commented Oct 21, 2023 via email

@rb6502
Copy link
Contributor

rb6502 commented Oct 21, 2023

Right. We'd need separate compatibility tags per media set. I'm less concerned about memory requirements because I think you should be able to -ramsize 16K and have everything get angry at you just like on hardware.

The upshot is that all of this potentially adds a lot of complexity to the software handling, and you can side-step a lot of it with separate lists.

@A-Noid33
Copy link
Contributor Author

A-Noid33 commented Oct 24, 2023 via email

@cuavas
Copy link
Member

cuavas commented Oct 24, 2023

Is there no woz-a-day of revision 1? At any rate, I agree with you on trying to maintain the same names across lists, although I might call the rev 1 crack crscalir1 since it’s rev 1 while the crscali in the other list is rev 2.

@A-Noid33
Copy link
Contributor Author

A-Noid33 commented Oct 24, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants