diff --git a/MacBuild/conv3rt.sh b/MacBuild/conv3rt.sh new file mode 100644 index 0000000..d6656d5 --- /dev/null +++ b/MacBuild/conv3rt.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# Lex's gif->png script + +for file in *.gif +do + convert ${file} ${file:0:$((${#file}-3))}"png" +done + +for file in `ls | grep -G -e "-[1-9]\+.png"` +do + rm $file +done + +for file in `ls | grep -e "-0.png"` +do + newfile=`echo $file | sed -e 's|\(.*\)-0.png|\1.png|'` + mv $file $newfile +done + +# for file in *.gif +# do +# rm ${file:0:$((${#file}-3))}"png" +# done diff --git a/parsetools.py b/parsetools.py index 388b51e..53fc7d7 100644 --- a/parsetools.py +++ b/parsetools.py @@ -372,45 +372,45 @@ def img2smiley(string): return string smiledict = { - ":rancorous:": "pc_rancorous.gif", - ":apple:": "apple.gif", - ":bathearst:": "bathearst.gif", + ":rancorous:": "pc_rancorous.png", + ":apple:": "apple.png", + ":bathearst:": "bathearst.png", ":cathearst:": "cathearst.png", - ":woeful:": "pc_bemused.gif", - ":sorrow:": "blacktear.gif", - ":pleasant:": "pc_pleasant.gif", + ":woeful:": "pc_bemused.png", + ":sorrow:": "blacktear.png", + ":pleasant:": "pc_pleasant.png", ":blueghost:": "blueslimer.gif", ":slimer:": "slimer.gif", - ":candycorn:": "candycorn.gif", + ":candycorn:": "candycorn.png", ":cheer:": "cheer.gif", ":duhjohn:": "confusedjohn.gif", - ":datrump:": "datrump.gif", - ":facepalm:": "facepalm.gif", + ":datrump:": "datrump.png", + ":facepalm:": "facepalm.png", ":bonk:": "headbonk.gif", - ":mspa:": "mspa_face.gif", + ":mspa:": "mspa_face.png", ":gun:": "mspa_reader.gif", ":cal:": "lilcal.png", - ":amazedfirman:": "pc_amazedfirman.gif", - ":amazed:": "pc_amazed.gif", - ":chummy:": "pc_chummy.gif", - ":cool:": "pccool.gif", - ":smooth:": "pccool.gif", - ":distraughtfirman": "pc_distraughtfirman.gif", - ":distraught:": "pc_distraught.gif", - ":insolent:": "pc_insolent.gif", - ":bemused:": "pc_bemused.gif", - ":3:": "pckitty.gif", - ":mystified:": "pc_mystified.gif", - ":pranky:": "pc_pranky.gif", - ":tense:": "pc_tense.gif", + ":amazedfirman:": "pc_amazedfirman.png", + ":amazed:": "pc_amazed.png", + ":chummy:": "pc_chummy.png", + ":cool:": "pccool.png", + ":smooth:": "pccool.png", + ":distraughtfirman": "pc_distraughtfirman.png", + ":distraught:": "pc_distraught.png", + ":insolent:": "pc_insolent.png", + ":bemused:": "pc_bemused.png", + ":3:": "pckitty.png", + ":mystified:": "pc_mystified.png", + ":pranky:": "pc_pranky.png", + ":tense:": "pc_tense.png", ":record:": "record.gif", ":squiddle:": "squiddle.gif", ":tab:": "tab.gif", - ":beetip:": "theprofessor.gif", + ":beetip:": "theprofessor.png", ":flipout:": "weasel.gif", - ":befuddled:": "what.gif", - ":pumpkin:": "whatpumpkin.gif", - ":trollcool:": "trollcool.gif", + ":befuddled:": "what.png", + ":pumpkin:": "whatpumpkin.png", + ":trollcool:": "trollcool.png", ":jadecry:": "jadespritehead.gif", ":ecstatic:": "ecstatic.png", ":relaxed:": "relaxed.png", @@ -422,7 +422,7 @@ smiledict = { ":manipulative:": "manipulative.png", ":vigorous:": "vigorous.png", ":perky:": "perky.png", - ":acceptant:": "acceptant.gif", + ":acceptant:": "acceptant.png", } reverse_smiley = dict((v,k) for k, v in smiledict.iteritems()) diff --git a/smilies/acceptant.gif b/smilies/acceptant.gif deleted file mode 100644 index dfb44ca..0000000 Binary files a/smilies/acceptant.gif and /dev/null differ diff --git a/smilies/acceptant.png b/smilies/acceptant.png new file mode 100644 index 0000000..163ee04 Binary files /dev/null and b/smilies/acceptant.png differ diff --git a/smilies/apple.gif b/smilies/apple.gif deleted file mode 100644 index 5a4960e..0000000 Binary files a/smilies/apple.gif and /dev/null differ diff --git a/smilies/apple.png b/smilies/apple.png new file mode 100644 index 0000000..b1462d9 Binary files /dev/null and b/smilies/apple.png differ diff --git a/smilies/bathearst.gif b/smilies/bathearst.gif deleted file mode 100644 index 757acb4..0000000 Binary files a/smilies/bathearst.gif and /dev/null differ diff --git a/smilies/bathearst.png b/smilies/bathearst.png new file mode 100644 index 0000000..e47162f Binary files /dev/null and b/smilies/bathearst.png differ diff --git a/smilies/blacktear.gif b/smilies/blacktear.gif deleted file mode 100644 index b13cb3c..0000000 Binary files a/smilies/blacktear.gif and /dev/null differ diff --git a/smilies/blacktear.png b/smilies/blacktear.png new file mode 100644 index 0000000..8c91ad8 Binary files /dev/null and b/smilies/blacktear.png differ diff --git a/smilies/blueslimer.png b/smilies/blueslimer.png new file mode 100644 index 0000000..4db51ec Binary files /dev/null and b/smilies/blueslimer.png differ diff --git a/smilies/candycorn.gif b/smilies/candycorn.gif deleted file mode 100644 index 9de4452..0000000 Binary files a/smilies/candycorn.gif and /dev/null differ diff --git a/smilies/candycorn.png b/smilies/candycorn.png new file mode 100644 index 0000000..6ca85c5 Binary files /dev/null and b/smilies/candycorn.png differ diff --git a/smilies/cheer.png b/smilies/cheer.png new file mode 100644 index 0000000..16d3b8f Binary files /dev/null and b/smilies/cheer.png differ diff --git a/smilies/confusedjohn.png b/smilies/confusedjohn.png new file mode 100644 index 0000000..2bc5e43 Binary files /dev/null and b/smilies/confusedjohn.png differ diff --git a/smilies/datrump.gif b/smilies/datrump.gif deleted file mode 100644 index ed03902..0000000 Binary files a/smilies/datrump.gif and /dev/null differ diff --git a/smilies/datrump.png b/smilies/datrump.png new file mode 100644 index 0000000..af259b4 Binary files /dev/null and b/smilies/datrump.png differ diff --git a/smilies/facepalm.gif b/smilies/facepalm.gif deleted file mode 100644 index 711ebce..0000000 Binary files a/smilies/facepalm.gif and /dev/null differ diff --git a/smilies/facepalm.png b/smilies/facepalm.png new file mode 100644 index 0000000..e5bc561 Binary files /dev/null and b/smilies/facepalm.png differ diff --git a/smilies/headbonk.png b/smilies/headbonk.png new file mode 100644 index 0000000..ac67711 Binary files /dev/null and b/smilies/headbonk.png differ diff --git a/smilies/jadespritehead.png b/smilies/jadespritehead.png new file mode 100644 index 0000000..c4a5fce Binary files /dev/null and b/smilies/jadespritehead.png differ diff --git a/smilies/mspa_face.gif b/smilies/mspa_face.gif deleted file mode 100644 index 1a10b79..0000000 Binary files a/smilies/mspa_face.gif and /dev/null differ diff --git a/smilies/mspa_face.png b/smilies/mspa_face.png new file mode 100644 index 0000000..1629678 Binary files /dev/null and b/smilies/mspa_face.png differ diff --git a/smilies/mspa_reader.png b/smilies/mspa_reader.png new file mode 100644 index 0000000..86730e2 Binary files /dev/null and b/smilies/mspa_reader.png differ diff --git a/smilies/pc_amazed.gif b/smilies/pc_amazed.gif deleted file mode 100644 index 8401577..0000000 Binary files a/smilies/pc_amazed.gif and /dev/null differ diff --git a/smilies/pc_amazed.png b/smilies/pc_amazed.png new file mode 100644 index 0000000..96563ae Binary files /dev/null and b/smilies/pc_amazed.png differ diff --git a/smilies/pc_amazedfirman.gif b/smilies/pc_amazedfirman.gif deleted file mode 100644 index d9fab2a..0000000 Binary files a/smilies/pc_amazedfirman.gif and /dev/null differ diff --git a/smilies/pc_amazedfirman.png b/smilies/pc_amazedfirman.png new file mode 100644 index 0000000..4286405 Binary files /dev/null and b/smilies/pc_amazedfirman.png differ diff --git a/smilies/pc_bemused.gif b/smilies/pc_bemused.gif deleted file mode 100644 index e89d43d..0000000 Binary files a/smilies/pc_bemused.gif and /dev/null differ diff --git a/smilies/pc_bemused.png b/smilies/pc_bemused.png new file mode 100644 index 0000000..68d63e5 Binary files /dev/null and b/smilies/pc_bemused.png differ diff --git a/smilies/pc_chummy.gif b/smilies/pc_chummy.gif deleted file mode 100644 index 1689a7f..0000000 Binary files a/smilies/pc_chummy.gif and /dev/null differ diff --git a/smilies/pc_chummy.png b/smilies/pc_chummy.png new file mode 100644 index 0000000..1f2724f Binary files /dev/null and b/smilies/pc_chummy.png differ diff --git a/smilies/pc_distraught.gif b/smilies/pc_distraught.gif deleted file mode 100644 index 47e0a39..0000000 Binary files a/smilies/pc_distraught.gif and /dev/null differ diff --git a/smilies/pc_distraught.png b/smilies/pc_distraught.png new file mode 100644 index 0000000..f9126bc Binary files /dev/null and b/smilies/pc_distraught.png differ diff --git a/smilies/pc_distraughtfirman.gif b/smilies/pc_distraughtfirman.gif deleted file mode 100644 index ac65d35..0000000 Binary files a/smilies/pc_distraughtfirman.gif and /dev/null differ diff --git a/smilies/pc_distraughtfirman.png b/smilies/pc_distraughtfirman.png new file mode 100644 index 0000000..409b308 Binary files /dev/null and b/smilies/pc_distraughtfirman.png differ diff --git a/smilies/pc_insolent.gif b/smilies/pc_insolent.gif deleted file mode 100644 index 652958a..0000000 Binary files a/smilies/pc_insolent.gif and /dev/null differ diff --git a/smilies/pc_insolent.png b/smilies/pc_insolent.png new file mode 100644 index 0000000..0785670 Binary files /dev/null and b/smilies/pc_insolent.png differ diff --git a/smilies/pc_mystified.gif b/smilies/pc_mystified.gif deleted file mode 100644 index f523f37..0000000 Binary files a/smilies/pc_mystified.gif and /dev/null differ diff --git a/smilies/pc_mystified.png b/smilies/pc_mystified.png new file mode 100644 index 0000000..af0b859 Binary files /dev/null and b/smilies/pc_mystified.png differ diff --git a/smilies/pc_pleasant.gif b/smilies/pc_pleasant.gif deleted file mode 100644 index fe7a61e..0000000 Binary files a/smilies/pc_pleasant.gif and /dev/null differ diff --git a/smilies/pc_pleasant.png b/smilies/pc_pleasant.png new file mode 100644 index 0000000..7f41490 Binary files /dev/null and b/smilies/pc_pleasant.png differ diff --git a/smilies/pc_pranky.gif b/smilies/pc_pranky.gif deleted file mode 100644 index 8fd795f..0000000 Binary files a/smilies/pc_pranky.gif and /dev/null differ diff --git a/smilies/pc_pranky.png b/smilies/pc_pranky.png new file mode 100644 index 0000000..bf26cd1 Binary files /dev/null and b/smilies/pc_pranky.png differ diff --git a/smilies/pc_rancorous.gif b/smilies/pc_rancorous.gif deleted file mode 100644 index afd9f97..0000000 Binary files a/smilies/pc_rancorous.gif and /dev/null differ diff --git a/smilies/pc_rancorous.png b/smilies/pc_rancorous.png new file mode 100644 index 0000000..9da5b9f Binary files /dev/null and b/smilies/pc_rancorous.png differ diff --git a/smilies/pc_tense.gif b/smilies/pc_tense.gif deleted file mode 100644 index 1948969..0000000 Binary files a/smilies/pc_tense.gif and /dev/null differ diff --git a/smilies/pc_tense.png b/smilies/pc_tense.png new file mode 100644 index 0000000..63b34e8 Binary files /dev/null and b/smilies/pc_tense.png differ diff --git a/smilies/pccool.gif b/smilies/pccool.gif deleted file mode 100644 index bd3ba35..0000000 Binary files a/smilies/pccool.gif and /dev/null differ diff --git a/smilies/pccool.png b/smilies/pccool.png new file mode 100644 index 0000000..b4a15b3 Binary files /dev/null and b/smilies/pccool.png differ diff --git a/smilies/pckitty.gif b/smilies/pckitty.gif deleted file mode 100644 index f84e97c..0000000 Binary files a/smilies/pckitty.gif and /dev/null differ diff --git a/smilies/pckitty.png b/smilies/pckitty.png new file mode 100644 index 0000000..6663bbe Binary files /dev/null and b/smilies/pckitty.png differ diff --git a/smilies/record.png b/smilies/record.png new file mode 100644 index 0000000..d668c3e Binary files /dev/null and b/smilies/record.png differ diff --git a/smilies/slimer.png b/smilies/slimer.png new file mode 100644 index 0000000..aedb2ba Binary files /dev/null and b/smilies/slimer.png differ diff --git a/smilies/squiddle.png b/smilies/squiddle.png new file mode 100644 index 0000000..9f16866 Binary files /dev/null and b/smilies/squiddle.png differ diff --git a/smilies/tab.png b/smilies/tab.png new file mode 100644 index 0000000..6f5fa7a Binary files /dev/null and b/smilies/tab.png differ diff --git a/smilies/theprofessor.gif b/smilies/theprofessor.gif deleted file mode 100644 index 45c863c..0000000 Binary files a/smilies/theprofessor.gif and /dev/null differ diff --git a/smilies/theprofessor.png b/smilies/theprofessor.png new file mode 100644 index 0000000..9a7b6ed Binary files /dev/null and b/smilies/theprofessor.png differ diff --git a/smilies/trollcool.gif b/smilies/trollcool.gif deleted file mode 100644 index 25e8ffb..0000000 Binary files a/smilies/trollcool.gif and /dev/null differ diff --git a/smilies/trollcool.png b/smilies/trollcool.png new file mode 100644 index 0000000..76dc247 Binary files /dev/null and b/smilies/trollcool.png differ diff --git a/smilies/weasel.png b/smilies/weasel.png new file mode 100644 index 0000000..aec489d Binary files /dev/null and b/smilies/weasel.png differ diff --git a/smilies/what.gif b/smilies/what.gif deleted file mode 100644 index 9727eab..0000000 Binary files a/smilies/what.gif and /dev/null differ diff --git a/smilies/what.png b/smilies/what.png new file mode 100644 index 0000000..f632afd Binary files /dev/null and b/smilies/what.png differ diff --git a/smilies/whatpumpkin.gif b/smilies/whatpumpkin.gif deleted file mode 100644 index 92f05e0..0000000 Binary files a/smilies/whatpumpkin.gif and /dev/null differ diff --git a/smilies/whatpumpkin.png b/smilies/whatpumpkin.png new file mode 100644 index 0000000..57d1275 Binary files /dev/null and b/smilies/whatpumpkin.png differ