From b19b35b0a4b6832977c0ff6119515e3a39ec72a0 Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Mon, 14 Feb 2022 13:18:08 -0800 Subject: [PATCH] Fix markdown, html files and Makefile In particular the lists were mangled; I made sure that the html files have the IOCCC headers/footers by using rdiscount to another file and then yanking/pasting the generated lists in the one file into the target files. I also removed terminals.markdown which was a mistake I made when I sent a patch (so I assume) to the judges. Makefile now refers to *.text instead of *.markdown and no longer refers to judges file as that was only part of the preview repo for winners. There might have been other changes I have made but everything *appears* to be okay now. --- 2020/ferguson1/Makefile | 8 +-- 2020/ferguson1/bugs.html | 22 ++++---- 2020/ferguson1/bugs.text | 10 ++++ 2020/ferguson1/chocolate-cake.html | 4 +- 2020/ferguson1/chocolate-cake.text | 4 +- 2020/ferguson1/gameplay.html | 82 +++++++++++++++++++----------- 2020/ferguson1/gameplay.text | 33 ++++++++++++ 2020/ferguson1/hint.text | 14 ++++- 2020/ferguson1/index.html | 6 +++ 2020/ferguson1/spoilers.html | 27 ++++++---- 2020/ferguson1/spoilers.text | 10 ++++ 2020/ferguson1/terminals.html | 37 +++++++++----- 2020/ferguson1/terminals.text | 14 +++++ 13 files changed, 202 insertions(+), 69 deletions(-) diff --git a/2020/ferguson1/Makefile b/2020/ferguson1/Makefile index 97359f881..67c05ff94 100644 --- a/2020/ferguson1/Makefile +++ b/2020/ferguson1/Makefile @@ -421,10 +421,10 @@ MAY_NEED_GCC= gcc ############################## # OBJ= prog.o termcaps.o -DATA= COMPILING HACKING bugs.markdown cannibalism.log \ - chocolate-cake.markdown crazy.log gameplay.markdown \ - judges.markdown snake-colours.sh snake.1 spoilers.markdown \ - termcaps.c terminals.markdown troubleshooting.markdown +DATA= COMPILING HACKING bugs.text cannibalism.log \ + chocolate-cake.text crazy.log gameplay.text \ + snake-colours.sh snake.1 spoilers.text \ + termcaps.c terminals.text troubleshooting.text TARGET= prog snake snake-colours play snake-colours termcaps ${ALT_TARGET} # ALT_OBJ= diff --git a/2020/ferguson1/bugs.html b/2020/ferguson1/bugs.html index 565de0e8b..97aef96ef 100644 --- a/2020/ferguson1/bugs.html +++ b/2020/ferguson1/bugs.html @@ -27,16 +27,18 @@

Current bugs and things that look like bugs but are not, as of 12 September 2020.

-

-- Built-in test unit for some features! -- The snake doesn’t seem to be moving -- getch() also accepts input from some input hardware other than keyboards -- SIZE=0 is the same as SIZE=1 and other oddities -- ‘I was a few places behind my tail and I ran into it!’ -- With negative growth the snake drops from the middle of the body -- It looks like the bug is in the snake -- On the safety of the bug placement loop -- Vertical snake has more space between snake char than horizontal

+

+

Built-in test unit for some features!

diff --git a/2020/ferguson1/bugs.text b/2020/ferguson1/bugs.text index 26aa2305b..e9c2aea3a 100644 --- a/2020/ferguson1/bugs.text +++ b/2020/ferguson1/bugs.text @@ -1,16 +1,26 @@ Current bugs and things that look like bugs but are not, as of 12 September 2020. + - [Built-in test unit for some features!](#builtin-test-unit) + - [The snake doesn't seem to be moving](#stillsnake) + - [getch() also accepts input from some input hardware other than keyboards](#getch) + - [SIZE=0 is the same as SIZE=1 and other oddities](#size) + - ['I was a few places behind my tail and I ran into it!'](#bitetail) + - [With negative growth the snake drops from the middle of the body](#middleofsnake) + - [It looks like the bug is in the snake](#buginsnake) + - [On the safety of the bug placement loop](#bugplacement) + - [Vertical snake has more space between snake char than horizontal](#verticalsnake) + # Built-in test unit for some features! Fun fact: There's something of a built-in test unit for some features; much diff --git a/2020/ferguson1/chocolate-cake.html b/2020/ferguson1/chocolate-cake.html index 6c9f95d09..811f24b4f 100644 --- a/2020/ferguson1/chocolate-cake.html +++ b/2020/ferguson1/chocolate-cake.html @@ -27,12 +27,14 @@

Double-layered Chocolate Fudge Cake

-

Here’s a delicious double-layered chocolate fudge cake (picture) that is +

Here’s a delicious double-layered chocolate fudge cake that is something of my mum’s speciality. It’s complicated and I should warn that nobody has seemed to get it down as well as she has but it’s well worth the effort if you love chocolate. My late stepmum who only liked white chocolate loved this cake!

+

picture of the double-layered chocolate fudge cake

+

There are two sets of ingredients and instructions; the cake and the icing. In addition there are some notes to pay attention to; some will be repeated because they’re really important for the quality of the cake.

diff --git a/2020/ferguson1/chocolate-cake.text b/2020/ferguson1/chocolate-cake.text index feff7f3ec..47b01fbf1 100644 --- a/2020/ferguson1/chocolate-cake.text +++ b/2020/ferguson1/chocolate-cake.text @@ -1,11 +1,13 @@ # Double-layered Chocolate Fudge Cake -Here's a delicious double-layered chocolate fudge cake ([picture][]) that is +Here's a delicious double-layered chocolate fudge cake that is something of my mum's speciality. It's complicated and I should warn that nobody has seemed to get it down as well as she has but it's well worth the effort if you love chocolate. My late stepmum who only liked white chocolate loved this cake! +picture of the double-layered chocolate fudge cake + There are two sets of ingredients and instructions; the cake and the icing. In addition there are some notes to pay attention to; some will be repeated because they're really important for the quality of the cake. diff --git a/2020/ferguson1/gameplay.html b/2020/ferguson1/gameplay.html index d13cb465d..a65753278 100644 --- a/2020/ferguson1/gameplay.html +++ b/2020/ferguson1/gameplay.html @@ -30,35 +30,59 @@ have included much more than just the input keys and a few printouts of the game. For normal play you probably don’t even need this file at all unless it be for the input keys.

-

-1. Testing terminal environment/capabilities -2. Input keys -3. Gameplay - * The initial screen - * Playing the game - * Walls - * Cannibalism - * Stretching (shedding) - * Winning - * Quitting -4. Gameplay modes - * Photosensitive epilepsy/Stimulation overload trigger warnings - * Drawing / Practice mode - * Computer playing / Automatic mode (Photosensitive epilepsy/Stimulation overload trigger) - * Variations - * Grow-Shrink (Positive/Negative Winning) mode - * Hypnotic / Sleepy mode (Photosensitive epilepsy/Stimulation overload trigger) - * Stimulation / Calming mode - * Other ideas -5. Scripts - * Colours selection - * Automate the above gameplay modes -6. Game variables - * WAIT - Snake speed - * EVADE - Bug evasion frequency - * SIZE / MAXSIZE - Initial snake / max sizes - * GROW / SHEDS - Growth / Shedding sizes -7. Conclusion (and inspirational words for everyone)

+

+ +
    +

  1. Testing terminal environment/capabilities

    2. +

  2. Input keys

    3. +

  3. Gameplay

    + + +
    4. +

  4. Gameplay modes

    + + +
    5. +

  5. Scripts

    + + +
    6. +

  6. Game variables

    + + +
    7. +

  7. Conclusion (and inspirational words for everyone)

    8. +
+

1. Testing terminal environment/capabilities

diff --git a/2020/ferguson1/gameplay.text b/2020/ferguson1/gameplay.text index 22a0c3caf..59427180a 100644 --- a/2020/ferguson1/gameplay.text +++ b/2020/ferguson1/gameplay.text @@ -4,35 +4,68 @@ game. For normal play you probably don't even need this file at all unless it be for the input keys. + 1. [Testing terminal environment/capabilities](#support) + + 2. [Input keys](#input) + + 3. [Gameplay](#gameplay) * [The initial screen](#initial) + * [Playing the game](#playing) + * [Walls](#walls) + * [Cannibalism](#cannibalism) + * [Stretching (shedding)](#shedding) + * [Winning](#winning) + * [Quitting](#quitting) + + 4. [Gameplay modes](#modes) * [**Photosensitive epilepsy/Stimulation overload trigger warnings**](#warning) + * [Drawing / Practice mode](#drawing) + * [Computer playing / Automatic mode (**Photosensitive epilepsy/Stimulation overload trigger**)](#auto) + * [Variations](#auto-variations) + * [Grow-Shrink (Positive/Negative Winning) mode](#grow-shrink) + * [Hypnotic / Sleepy mode (**Photosensitive epilepsy/Stimulation overload trigger**)](#hypnotic) + * [Stimulation / Calming mode](#stim) + * [Other ideas](#other-ideas) + + 5. [Scripts](#scripts) + * [Colours selection](#colours) + * [Automate the above gameplay modes](#preset) + + 6. [Game variables](#variables) + * [WAIT - Snake speed](#wait) + * [EVADE - Bug evasion frequency](#evade) + * [SIZE / MAXSIZE - Initial snake / max sizes](#sizes) + * [GROW / SHEDS - Growth / Shedding sizes](#growth) + + 7. [Conclusion (and inspirational words for everyone)](#conclusions) + # 1. Testing terminal environment/capabilities Most people probably won't have any issue at all but for those who have any diff --git a/2020/ferguson1/hint.text b/2020/ferguson1/hint.text index db6e4c60d..a64ecae1a 100644 --- a/2020/ferguson1/hint.text +++ b/2020/ferguson1/hint.text @@ -181,16 +181,26 @@ and [troubleshooting.html][] - along with the most important one * ['Bugs'](#bugs) * [NAQs/IAQs (Never/Infrequently Asked Questions)](#naqs) + - [Do I have any inspirations for this entry?](#inspirations) + - [Are there any features I thought of that I wanted to implement but did not get to for some reason or another?](#features) + - [Are there ways that one can make this game easier?](#easier) + - [Are there ways to make it harder?](#harder) + - [How do snakes grow in real life?](#moult) + - [Any other interesting things about snakes?](#other) + - [Why can you go the opposite direction and so immediately die when not cannibalising?](#opposite) + - [Do you have any **DELICIOUS CHOCOLATE CAKE** recipes?](#chocolatecake) + - [What are the files prog.orig.c, prog.2.c, prog-j.c and prog.alt.c ?](#alt) + * [Winning thoughts, dedications and thanks](#winning) @@ -494,7 +504,9 @@ mother. I also want to dedicate this to Vicky Wilmore who has given me a lot of love the past few years and who was there for me in some very dark times. Thank -you Vicky sweetheart from the bottom of my heart and soul xxx. +you Vicky sweetheart from the bottom of my heart and soul. Although we have +parted ways, whether for now or for ever, you will always always always have a +place in my heart and soul xxx I would like to thank my dear friend Martijn Schoemaker for encouraging me in my programming over the years and who I owe a great deal to. Thank you for diff --git a/2020/ferguson1/index.html b/2020/ferguson1/index.html index 5e88fe798..d50dc7100 100644 --- a/2020/ferguson1/index.html +++ b/2020/ferguson1/index.html @@ -513,6 +513,12 @@ without complaint and with all the love, compassion, empathy, sympathy and devotion anyone could ever ask for. Bless you again and again and again dear mother.

+

I also want to dedicate this to Vicky Wilmore who has given me a lot of +love the past few years and who was there for me in some very dark times. Thank +you Vicky sweetheart from the bottom of my heart and soul. Although we have +parted ways, whether for now or for ever, you will always always always have a +place in my heart and soul xxx

+

I would like to thank my dear friend Martijn Schoemaker for encouraging me in my programming over the years and who I owe a great deal to. Thank you for believing in me and my programming abilities (and other abilities) even when I diff --git a/2020/ferguson1/spoilers.html b/2020/ferguson1/spoilers.html index 0d773486e..733caaf96 100644 --- a/2020/ferguson1/spoilers.html +++ b/2020/ferguson1/spoilers.html @@ -39,16 +39,23 @@ everything will be answered here.

wants to know more about it) read on. Yes I write a lot. But you probably already knew that so no harm there, hey?

-

-- How does it work? -- How does the snake movement work? -- Drawing (manual) and computer playing (automatic) modes -- Collision detection - * Cannibal collision detection - * Collision detection when resizing the window of the game -- Obfuscation -- Skinning the snake (i.e. decreasing the iocccsize) -- A few more interesting size optimisations

+

+ +

How does it work?

diff --git a/2020/ferguson1/spoilers.text b/2020/ferguson1/spoilers.text index c25c386d2..2d67e9080 100644 --- a/2020/ferguson1/spoilers.text +++ b/2020/ferguson1/spoilers.text @@ -13,16 +13,26 @@ wants to know more about it) read on. Yes I write a lot. But you probably already knew that so no harm there, hey? + - [How does it work?](#works) + - [How does the snake movement work?](#movement) + - [Drawing (manual) and computer playing (automatic) modes](#manual-automatic) + - [Collision detection](#collision) + * [Cannibal collision detection](#cannibalcollision) + * [Collision detection when resizing the window of the game](#resizing) + - [Obfuscation](#obfuscation) + - [Skinning the snake (i.e. decreasing the iocccsize)](#skinning) + - [A few more interesting size optimisations](#size) + # How does it work? The gameplay I have already described but this explains the way things are diff --git a/2020/ferguson1/terminals.html b/2020/ferguson1/terminals.html index 1e90cca69..759677aca 100644 --- a/2020/ferguson1/terminals.html +++ b/2020/ferguson1/terminals.html @@ -31,19 +31,30 @@ file. I discuss terminal capabilities, dimensions (setting and how to restore sanity if it causes any problems) as well as colours (limitations etc.).

-

-- Capabilities support testing program -- Setting the game dimensions - * The LINES and COLUMNS environmental variables - * Terminal insanity - * Restoring the terminal - * Terminal size abuse -- Terminal limitations -- Terminal colours - * Curses background - * Monochrome terminals - * Colour limitations - * Disabling colour

+

+ +

Capabilities support testing program

diff --git a/2020/ferguson1/terminals.text b/2020/ferguson1/terminals.text index 8eeb23093..bc85fc516 100644 --- a/2020/ferguson1/terminals.text +++ b/2020/ferguson1/terminals.text @@ -6,19 +6,33 @@ sanity if it causes any problems) as well as colours (limitations etc.). + - [Capabilities support testing program](#termcaps) + - [Setting the game dimensions](#dimensions) + * [The LINES and COLUMNS environmental variables](#linescolumns) + * [Terminal insanity](#insanity) + * [Restoring the terminal](#restore) + * [Terminal size abuse](#abuse) + - [Terminal limitations](#termlimitations) + + - [Terminal colours](#colours) + * [Curses background](#background) + * [Monochrome terminals](#monochrome) + * [Colour limitations](#colourlimitations) + * [Disabling colour](#disablecolour) + # Capabilities support testing program Although it should be playable without the features I use (except that cursor