Add more stuff:

* Classic smilies added: Kolobok, vB, Yolks
* Fixed card JSON files to use $IMAGE_FILE as a placeholder instead of a key
* New Frames
* Removed Pyong from make-all (incomplete naming)

make-all.sh

@@ -12,7 +12,6 @@ smilies=(
 	'smiley/onion'
 	'smiley/phpbbb'
 	'smiley/phpbby'
-	'smiley/pyong'
 	'smiley/ultleob'
 	'smiley/ultleog'
 	'smiley/ultleor'
@@ -20,9 +19,11 @@ smilies=(
 	'smiley/ultleoy'
 	'smiley/windows98'
 	'smiley/xat'
+	'smiley/kolobok'
+	'smiley/yolks'
 )
 frames=(
-	'frame/win98.png 24 4 4 5'
+	'frame/win3x.png 24 4 4 5'
 	'frame/winxp.png 29 3 3 3'
 	'frame/win98.png 23 4 4 4'
 	'frame/irix.png 32 8 8 8'
@@ -36,6 +37,11 @@ frames=(
 	'frame/ore-gold.png 8'
 	'frame/ore-silver.png 8'
 	'frame/ore-moonstone.png 8'
+	'frame/macos7.png 19 2 2 1'
+	'frame/macos8.png 22 7 7 6'
+	'frame/macosx.png 23 1 1 1'
+	'frame/nextstep.png 23 1 1 1'
+	'frame/amiga1.png 20 16 18 2'
 )
 cards=(
 	'card/firenevit.gif -'
@@ -45,16 +51,16 @@ cards=(
 	'card/water.gif -'
 	'card/juststeel.png -'
 	'card/ranga.png -'
-	'card/win3x/arcade.gif #008080 - #008080'
-	'card/win3x/argyle.gif #000080 #ffffff #000080'
-	'card/win3x/castle.gif #c0c0c0 - #c0c0c0'
-	'card/win3x/egypt.gif #808000 - #808080'
-	'card/win3x/honey.gif #808000 - #ffff00'
-	'card/win3x/redbrick.gif #800000 #ffffff #000000'
-	'card/win3x/rivets.gif #008080 - #008080'
-	'card/win3x/squares.gif #800080 - $800080'
-	'card/win3x/thatch.gif #ffffff - #ffffff'
-	'card/win3x/zigzag.gif #008080 #ffffff #008080'
+	'card/win3x/win-arcade.gif #008080 - #008080'
+	'card/win3x/win-argyle.gif #000080 #ffffff #000080'
+	'card/win3x/win-castle.gif #c0c0c0 - #c0c0c0'
+	'card/win3x/win-egypt.gif #808000 - #808080'
+	'card/win3x/win-honey.gif #808000 - #ffff00'
+	'card/win3x/win-redbrick.gif #800000 #ffffff #000000'
+	'card/win3x/win-rivets.gif #008080 - #008080'
+	'card/win3x/win-squares.gif #800080 - $800080'
+	'card/win3x/win-thatch.gif #ffffff - #ffffff'
+	'card/win3x/win-zigzag.gif #008080 #ffffff #008080'
 	'card/gridplane/cyberbeige.gif -'
 	'card/gridplane/cyberblue.gif -'
 	'card/gridplane/cybercyan.gif -'
@@ -76,4 +82,4 @@ done
 echo "== PACKING CARDS =="
 for card in "${cards[@]}"; do
 	sh make-card.sh $card
-done
+done