Alpha 3: Eclipse

propfeds · Dec 20, 2019 · 0245026 · 0245026
1 parent 291430f
commit 0245026
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,17 @@
+# Binaries
 export/readme.txt
 export/bin/
-fonts/*_powder.png
+
+# Terminal Blues export palette
 palettes/current.gpl
+
+# Reference
 ref/
+
+# Scripts
+fonts/*/*_powder.png
+scripts/py/*.hex
+scripts/py/*.png
+
+# Testing variants
 master_*.aseprite
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -8,7 +8,7 @@
 - **New fonts!** Current font listing:
   - **Brass:** Brass Gold, no Blues
   - **Classic:** The IBM CGA font, thick variant
-  - **Heavy:** (Placeholder) Polyducks' Textmachine Handwriting
+  - **Heavy:** Eclipse, custom font
   - **Light:** Blightbulb, custom font
   - **Shadow:** The regular game's Heavy font, for maximum readability
 - **New variants!**

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -29,10 +29,10 @@ The Terminal Blues [export script](../scripts/lua_ase/export.lua) does not requi
     They're also coloured with max green (index 2),
     but I've decreased its alpha so it won't burn your eyes.
     - Draw a **heart**, a **mana-resembling symbol**, a **return** symbol,
-    cardinal **arrows**, an **upside-down question mark**, a **theta**,
+    cardinal **arrows**, a **white smiley face**, a **theta**,
     and a **cursor block** for your font too.
     - Colour your heart *red* (index 4), your mana star *purple* (index 21),
-    your theta *iron blue* (index 13), the upside-down question mark whatever
+    your theta *iron blue* (index 13), the white smiley face whatever
     (I chose *green* (index 10) because originally it was a tridude,
     and will replace the depth symbol in Xom's spaceship),
     and the capital D (depth) (right of return symbol) *room blue* (index 14)

diff --git a/export/blues/alphabet_heavy.bmp b/export/blues/alphabet_heavy.bmp
diff --git a/export/protea/alphabet_heavy.bmp b/export/protea/alphabet_heavy.bmp
diff --git a/fonts/blightbulb/v0.00_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.00.png b/fonts/blightbulb/v0.00_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.00.png
diff --git a/fonts/blightbulb/v0.01_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.01.png b/fonts/blightbulb/v0.01_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.01.png
diff --git a/fonts/blightbulb/v0.02_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.02.png b/fonts/blightbulb/v0.02_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.02.png
diff --git a/fonts/blightbulb/v0.03_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.03.png b/fonts/blightbulb/v0.03_blightbulb_gs_ro.png → fonts/blightbulb/blightbulb_gs_ro_0.03.png
diff --git a/fonts/eclipse/eclipse_gs_ro_0.00.png b/fonts/eclipse/eclipse_gs_ro_0.00.png
diff --git a/fonts/bulb_leaflet.aseprite → fonts/fonts.aseprite b/fonts/bulb_leaflet.aseprite → fonts/fonts.aseprite
diff --git a/master.aseprite b/master.aseprite
diff --git a/readme.md b/readme.md
@@ -6,14 +6,14 @@ The Hacklike reimagined in a deep blue terminal aesthetic. Featuring:
 
 - Terrain, monsters and items in Code Page 437/Extended ASCII/ANSI[^1]
 - (??? Heresy) Spell icons completely in 14px pixel-art
-- Custom fonts!
+- Custom fonts: `blightbulb` and `eclipse` to replace the [Light and Heavy](docs/quirks.md#my-heavy-and-light-fonts-are-swapped) fonts!
 - Questionable colourblind support
 
 ## Instructions
 
 Latest release: [1.0.1](https://github.com/PropFeds/terminal-blues/releases/latest)
 
-Latest alpha/beta: [1.1.0-alpha.2](https://github.com/PropFeds/terminal-blues/releases/tag/1.1.0-alpha.2)
+Latest alpha/beta: [1.1.0-alpha.3](https://github.com/PropFeds/terminal-blues/releases/tag/1.1.0-alpha.3)
 
 Terminal Blues comes with a few variants:
 

diff --git a/scripts/py/cp437_to_powder.py b/scripts/py/cp437_to_powder.py
@@ -19,7 +19,7 @@
 [( 1,2),( 0,4),( 3,2),( 4,2),( 5,2),(14,5),( 6, 2),(10, 2),( 8, 2),( 9,2)],
 [(13,3),(13,2),(12,5),( 7,2),(12,2),(14,2),(15, 2),(11, 2),(15, 5),(12,7)],
 [( 2,2),(12,3),(14,3),(15,3),(11,5),(13,5),(11, 7),(13, 7),( 0, 6),(14,7)],
-[(12,2),(14,2),(12,3),(14,3),(11,3),(10,3),( 9,14),( 8,10),(14,15),( 0,0)]]
+[(12,2),(14,2),(12,3),(14,3),(11,3),(10,3),( 9,14),( 2, 0),(14,15),( 0,0)]]
 
 for j in range(11):
     for i in range(10):