From 36a0bfbc1463f8fb8d09c2c601204aae5d60d476 Mon Sep 17 00:00:00 2001 From: Joe R Date: Sat, 4 Sep 2021 10:07:08 -0400 Subject: [PATCH] Fixed up some sections of the documentation. --- html-src/ganjifa.html | 1 + html-src/gen-html.py | 34 ++++++++++++++---------------- html-src/general_rules.html | 11 ++++++++++ html-src/hanafuda.html | 8 +++---- html-src/howtoplay.html | 2 +- html-src/index.html | 10 ++++----- html-src/rules/scorpiontowers.html | 2 +- pysollib/kivy/menubar.py | 2 +- pysollib/ui/tktile/menubar.py | 2 +- 9 files changed, 40 insertions(+), 32 deletions(-) diff --git a/html-src/ganjifa.html b/html-src/ganjifa.html index f481c407..3f31b97e 100644 --- a/html-src/ganjifa.html +++ b/html-src/ganjifa.html @@ -1,4 +1,5 @@

General Ganjifa Card Rules

+

Ganjifa are playing cards from India and other nations in the region. Usually round, some rectangular decks have been produced. The most significant difference between Ganjifa and other types of cards is that Ganjifa cards have diff --git a/html-src/gen-html.py b/html-src/gen-html.py index 214694dd..b435fd89 100755 --- a/html-src/gen-html.py +++ b/html-src/gen-html.py @@ -50,7 +50,7 @@ files = [ ('glossary.html', 'PySol - Glossary'), ('hanafuda.html', 'PySol - Rules for General Flower Card Rules'), ('hexadeck.html', 'PySol - General Hex A Deck Card Rules'), - ('howtoplay.html', 'How to play PySol'), + ('howtoplay.html', 'How to Use PySol'), ('index.html', 'PySol - a Solitaire Game Collection'), ('install.html', 'PySol - Installation'), ('intro.html', 'PySol - Introduction'), @@ -61,9 +61,10 @@ files = [ ] rules_files = [ - # ('hanoipuzzle.html', ), + ('hanoipuzzle.html', 'PySol - Rules for Hanoi Puzzle'), ('mahjongg.html', 'PySol - Rules for Mahjongg'), ('matrix.html', 'PySol - Rules for Matrix'), + ('notshisensho.html', 'PySol - Rules for Not Shisen-Sho'), ('pegged.html', 'PySol - Rules for Pegged'), ('shisensho.html', 'PySol - Rules for Shisen-Sho'), ('spider.html', 'PySol - Rules for Spider'), @@ -121,6 +122,8 @@ rules_footer = '''

Back to the index +
+Back to individual game rules ''' @@ -191,9 +194,6 @@ def gen_rules_html(): if not rules_fn: rules_fn = _get_game_rules_filename(gi.name) - if rules_fn in files_list: - continue - if rules_fn in rules_ls: rules_dir = 'rules' elif rules_fn in wikipedia_ls: @@ -204,20 +204,18 @@ def gen_rules_html(): continue # print '>>>', rules_fn + if rules_fn not in files_list: + title = 'PySol - Rules for ' + gi.name + s = '' + if gi.si.game_type == GI.GT_HANAFUDA: + s = 'General Flower Card rules' + elif gi.si.game_type == GI.GT_DASHAVATARA_GANJIFA or \ + gi.si.game_type == GI.GT_MUGHAL_GANJIFA: + s = 'About Ganjifa' + elif gi.si.game_type == GI.GT_HEXADECK: + s = 'General Hex A Deck rules' - title = 'PySol - Rules for ' + gi.name - s = '' - if gi.si.game_type == GI.GT_HANAFUDA: - s = 'General Flower Card rules' - elif gi.si.game_type == GI.GT_DASHAVATARA_GANJIFA: - s = 'About Ganjifa' - elif gi.si.game_type == GI.GT_HEXADECK: - s = 'General Hex A Deck rules' - elif gi.si.game_type == GI.GT_MUGHAL_GANJIFA: - s = 'About Ganjifa' - # print '***', gi.name, '***' - - rules_list.append((rules_dir, rules_fn, title, s)) + rules_list.append((rules_dir, rules_fn, title, s)) files_list.append(rules_fn) # rules_list.append((rules_fn, gi.name)) print('

  • %s' diff --git a/html-src/general_rules.html b/html-src/general_rules.html index 9fdd7410..8c0b2384 100644 --- a/html-src/general_rules.html +++ b/html-src/general_rules.html @@ -36,3 +36,14 @@ from the Foundations. Of course, you can also use the Undo key <Z>.

    If you're confused by all this, just watch a demo game :-) + +

    Other Types of Decks

    + +

    +A few of the games in PySol use a different type of deck. For more info about +some of the other decks PySol games can use, see the following: +

    diff --git a/html-src/hanafuda.html b/html-src/hanafuda.html index 6b5351bc..0c952361 100644 --- a/html-src/hanafuda.html +++ b/html-src/hanafuda.html @@ -5,10 +5,8 @@ There are some characteristics common to all the games played with Hanafuda cards. They are all played with one or more of the Asian flower card decks. This deck is common in a number of Pacific regions including Hawaii. There are twelve suits of four cards each. The suits are associated with the twelve -months of the year. For a good explanation of what the suits are, -try Graham Leonard's Hanafuda and Kabufuda -site. - +months of the year. +

    Most of the flower card solitaire games are played like western deck games with minor changes. See the General Rules for @@ -17,5 +15,5 @@ move all the cards from the tableau to the foundations. Probably the most difficult part of learning to play with hanafuda cards is learning which cards belong in which suits and what their ranking is. The ranking of the suits is sometimes as important as the ranking of the cards in the suit. Try keeping -this hanafuda help image displayed where you can refer to it as you play. +this hanafuda help image displayed where you can refer to it as you play.

    diff --git a/html-src/howtoplay.html b/html-src/howtoplay.html index 5a262693..332f4ed2 100644 --- a/html-src/howtoplay.html +++ b/html-src/howtoplay.html @@ -1,4 +1,4 @@ -

    How to play PySol

    +

    How to use PySol

    Mouse Usage

    diff --git a/html-src/index.html b/html-src/index.html index 4187549f..c96a443f 100644 --- a/html-src/index.html +++ b/html-src/index.html @@ -1,9 +1,9 @@

    PySol - a Solitaire Game Collection

    - -

    Introduction -

    Installation -

    How to play - +

    Rules