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)

card/firenevit.json

@@ -1 +1,11 @@
-{"firenevit": {"": {"$IMAGE_FILE": "8d6b873f59b06e01ec663d6288058b53ff33588f9a4a9a984ac9f4195947dc65.gif","--usercard-outline": "#f8e45c","--usercard-color": "#000000","background-repeat": "repeat-x","background-position": "0px 100%"},":hover": {},":active": {}}}
+{
+	"firenevit": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-outline": "#f8e45c",
+			"--usercard-color": "#000000",
+			"background-repeat": "repeat-x",
+			"background-position": "0px 100%"
+		}
+	}
+}

card/gridplane/cyberblue.json

@@ -1 +1,14 @@
-{"cyberblue":{"":{"$IMAGE_FILE":"053af7586a16fa7f198ae21b1ded5621786712d468bcdc9494079326087a8e43.gif","--usercard-color":"#000000","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cyberblue": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat":"repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/gridplane/cybercyan.json

@@ -1 +1,14 @@
-{"cybercyan":{"":{"$IMAGE_FILE":"c2eb4acfe68e32e8d7c927b96cd334402d4be95456a35fc2e0ba11dccd14065a.gif","--usercard-color":"#000000","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cybercyan": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat": "repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/gridplane/cybergreen.json

@@ -1 +1,14 @@
-{"cybergreen":{"":{"$IMAGE_FILE":"c03995af9969f198d92e2b213a8a60c65dcfa69d6dec7d9d7a15ae68efe8dcce.gif","--usercard-color":"#000000","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cybergreen": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat": "repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/gridplane/cyberltblue.json

@@ -1 +1,14 @@
-{"cyberltblue":{"":{"$IMAGE_FILE":"9682ecbb6caff3a997f6e042db2fdcb0a36a059eb766274213a3fbc7a7661bb5.gif","--usercard-color":"#182952","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cyberltblue": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#182952",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat": "repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/gridplane/cyberpurple.json

@@ -1 +1,14 @@
-{"cyberpurple":{"":{"$IMAGE_FILE":"98dd2bf87b357b7192ac5f533b86757092b3105fdda5474c442f3abbe34974f1.gif","--usercard-color":"#000000","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cyberpurple": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat": "repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/gridplane/cyberred.json

@@ -1 +1,14 @@
-{"cyberred":{"":{"$IMAGE_FILE":"568f1f415775c9d5d0e1fa4b51c086601939bc56909780f97c6c4679c795294b.gif","--usercard-color":"#000000","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cyberred": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat": "repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/gridplane/cyberyellow.json

@@ -1 +1,14 @@
-{"cyberyellow":{"":{"$IMAGE_FILE":"f564900df9e99f1f635e2ff8c3e00cd5d3c531f08d42a51877b9992403f3e0a3.gif","--usercard-color":"#000000","--main-text":"#FFFFFF","--usercard-outline":"#000000","background-repeat":"repeat-x"},".tallcard":{"background-position":"bottom"}}}
+{
+	"cyberyellow": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--main-text": "#FFFFFF",
+			"--usercard-outline": "#000000",
+			"background-repeat": "repeat-x"
+		},
+		".tallcard": {
+			"background-position": "bottom"
+		}
+	}
+}

card/juststeel.json

@@ -1 +1,7 @@
-{"juststeel": {"": {"$IMAGE_FILE": "303c695fe4cbd878ade2ae050f66ea2d9c79dc07ec866a3894ea2491b2ec4d80.png"}}}
+{
+	"juststeel": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE"
+		}
+	}
+}

card/nyanstars.json

@@ -1 +1,9 @@
-{"nyanstars": {"": {"$IMAGE_FILE": "90db31bd81cf26e36e32d94631bbf35382105dff5b70af52af8ca6a0ae97d2ba.gif","--usercard-color": "#013368","--usercard-outline":"#FFFFFF"}}}
+{
+	"nyanstars": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#013368",
+			"--usercard-outline":"#FFFFFF"
+		}
+	}
+}

card/ranga.json

@@ -1 +1,11 @@
-{"ditranga":{"":{"$IMAGE_FILE":"d2f13b7695fde87d1cc08c16b27b67e114c8e1c6bf92e51acd9f7ad10aa96630.png","--usercard-color":"#b4b17e","--usercard-outline":"#e1e2eb","background-position":"bottom right","background-size":"cover"}}}
+{
+	"ditranga":{
+		"":{
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#b4b17e",
+			"--usercard-outline": "#e1e2eb",
+			"background-position": "bottom right",
+			"background-size": "cover"
+		}
+	}
+}

card/warpspeed.json

@@ -1 +1,9 @@
-{"warpspeed": {"": {"$IMAGE_FILE": "db38f2a933750341e6f74351bea61464286341153f068eeb4bc2b466e0c6c933.gif","--usercard-color": "#000000","--usercard-outline": "#FFFFFF"},":hover": {},":active": {}}}
+{
+	"warpspeed": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#000000",
+			"--usercard-outline": "#FFFFFF"
+		}
+	}
+}

card/water.json

@@ -1 +1,8 @@
-{"water": {"": {"$IMAGE_FILE": "9bd6a650dec787dd705c6ddb2b2c98e5cca0c03eeb95591ad7f2defdb7af3fbd.gif","--usercard-color": "#218CFF"},":hover": {},":active": {}}}
+{
+	"water": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#218CFF"
+		}
+	}
+}

card/worlioblue.json

@@ -1 +1,8 @@
-{"worlioblue": {"": {"$IMAGE_FILE": "86ac0951c43096e5acf52daa6bed873936faf7110162b6854a263140fc5b9259.png","--usercard-color": "#1E90FF"}}}
+{
+	"worlioblue": {
+		"": {
+			"--usercard-image": "$IMAGE_FILE",
+			"--usercard-color": "#1E90FF"
+		}
+	}
+}

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

make-card.sh

@@ -7,7 +7,7 @@ OUTNAME="$(sha256sum "$1" | awk '{ print $1 }').${1##*.}"
 cp "$INPUT" "$TARGET_DIRECTORY/$OUTNAME"
 echo "Writing card '$PACK'..."
 if [[ $2 == '-' && -z $3 ]]; then
-	cp "${INPUT%.*}.json" "$TARGET_DIRECTORY/$PACK.json"
+	sed -e 's/$IMAGE_FILE/'$OUTNAME'/g' "${INPUT%.*}.json" > "$TARGET_DIRECTORY/$PACK.json"
 	exit;
 fi
 printf "{\"$PACK\":{" > "$TARGET_DIRECTORY/$PACK.json"

make-smiley.sh

@@ -3,14 +3,16 @@ TARGET_DIRECTORY=${TARGET_DIRECTORY?-out}
 INPUT=$1
 PACK=`basename $INPUT`
 mkdir -p "$TARGET_DIRECTORY"
+printf "Writing $PACK..."
 printf "{\"$PACK\":{" > "$TARGET_DIRECTORY/$PACK.json"
 shopt -s nullglob
 for i in $INPUT/*.png $INPUT/*.jpg $INPUT/*.gif $INPUT/*.svg; do
 	FILE="$(basename "${i%.*}")"
 	OUTNAME="$(sha256sum "$i" | awk '{ print $1 }').${i##*.}"
 	cp "$i" "$TARGET_DIRECTORY/$OUTNAME"
-	echo "Writing smiley '$PACK/$FILE'..."
+	printf "$FILE..."
 	printf "\"$FILE\":\"$OUTNAME\"," >> "$TARGET_DIRECTORY/$PACK.json"
 done
+printf "DONE!\n"
 sed -i '$ s/.$//' "$TARGET_DIRECTORY/$PACK.json"
-printf "}}" >> "$TARGET_DIRECTORY/$PACK.json"
+printf "}}" >> "$TARGET_DIRECTORY/$PACK.json"

smiley/kolobok/README.txt

@@ -0,0 +1,54 @@
+====================================================================
+=                                                                  =
+=  KOLOBOK Smiles                                                  =
+=  Author: Mantsurov Ivan, aka Aiwan                               =
+=  http://www.en.kolobok.us                                        =
+=                                                                  =
+====================================================================
+=                                                                  =
+=                         CONTENTS:                                =
+=   - PROGRAMS                                                     =
+=   - LICENSE                                                      =
+=                                                                  =
+====================================================================
+
+--------------------------------------------------------------------
+                           PROGRAMS
+--------------------------------------------------------------------
+
+  The following programs were used to create these smiles:
+
+* Ulead GIF Animator 5.05 <20> in this program I do everything (and I draw using it)
+* IrfanView 4.10 <20> for reviewing and processing of drawings
+* GIF Movie Gear 4.1.2 <20> for size reduction and cleaning of GIF final version.
+
+--------------------------------------------------------------------
+                              LICENSE
+--------------------------------------------------------------------
+
+This license agreement covers the conditions according to which you can use the kolobok smilies. If you cannot or not willing to accept the given conditions though you partly follow the conditions of the given agreement, you cannot use my works.
+
+- You can distribute them for free use in forums, chats and other applications, as long as the smiles are unmodified and this text file is included within the RAR file.
+- They must not be used commercially without agreeing on the terms with me first.
+- You may not repackage them and redistribute them with other smiles without my permission.
+- They must not be converted to any other format, Edit and distributed without my permission.
+- You may not sell them or use them for profit either individually, or in any sort of collection or smiles-pack.
+- You should ask for my permission before using them in any programms or projects.
+- You should ASK FOR AUTHOR PERMISSION before using artworks of mine or of our site's artists at your own private gallery. Works of every author must be placed at separate section named accordingly with author's name. Also you should point to this website like to a source (if the author does not want to point his own).
+- When using my works, non-profit organisations are allowed not to ask for my permission but should place my copyright "Copyright <20> Aiwan. Kolobok Smiles" and a link to my Website http://www.kolobok.us on the bottom of every page where my works are used.
+- If you do not agree with this licence, you must remove the files from your storage devices and stop using the archive.
+
+-----------------------------------------------------------
+
+  "Kolobok Smiles" are copyrighted and officially registered at The U.S. Copyright Office of the Library of Congress (USA) and protected by international and national copyright law.
+
+  My works are free for personal using. But All of them are my property. Private person does not need my permission to use them at homepages, sites, blogs, forums, etc.
+
+  If you have any questions, please email me at Aiwan@yandex.ru. Please, writeing in head word "KOLOBOK" or "kolobok". Otherwise your letter can be defined as SPAM. Excuse me for difficulty.
+
+  Truly yours, Aiwan.
+
+  http://www.en.kolobok.us - Welcome!
+  DO NOT SEARCH for MY SMILES WHERE THEIR MUST NOT BE!
+
+  Copyright <20> 2004-2010 Kolobok Smiles