diff options
| author | oy <Tom_Adams@web.de> | 2011-02-16 11:45:19 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-02-16 11:45:19 +0100 |
| commit | 927954a53bd4d1322e5474fd054d3241212394c4 (patch) | |
| tree | f99bbd6ff481c62ca29c4f3f6b85ffc8c36747be /datasrc | |
| parent | b59c710ebac43c5d1aa126aa7f1eb49e9c942ac0 (diff) | |
| download | zcatch-927954a53bd4d1322e5474fd054d3241212394c4.tar.gz zcatch-927954a53bd4d1322e5474fd054d3241212394c4.zip | |
added new emoticons. Closes #362
Diffstat (limited to 'datasrc')
| -rw-r--r-- | datasrc/content.py | 10 | ||||
| -rw-r--r-- | datasrc/network.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/datasrc/content.py b/datasrc/content.py index 8a971d8c..b4b95c9b 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -354,17 +354,17 @@ container.sprites.Add(Sprite("exclamation", set_emoticons, 1, 0, 1, 1)) container.sprites.Add(Sprite("hearts", set_emoticons, 2, 0, 1, 1)) container.sprites.Add(Sprite("drop", set_emoticons, 3, 0, 1, 1)) container.sprites.Add(Sprite("dotdot", set_emoticons, 0, 1, 1, 1)) -container.sprites.Add(Sprite("music1", set_emoticons, 1, 1, 1, 1)) -container.sprites.Add(Sprite("music2", set_emoticons, 2, 1, 1, 1)) +container.sprites.Add(Sprite("music", set_emoticons, 1, 1, 1, 1)) +container.sprites.Add(Sprite("sorry", set_emoticons, 2, 1, 1, 1)) container.sprites.Add(Sprite("ghost", set_emoticons, 3, 1, 1, 1)) container.sprites.Add(Sprite("sushi", set_emoticons, 0, 2, 1, 1)) container.sprites.Add(Sprite("splattee", set_emoticons, 1, 2, 1, 1)) container.sprites.Add(Sprite("deviltee", set_emoticons, 2, 2, 1, 1)) container.sprites.Add(Sprite("zomg", set_emoticons, 3, 2, 1, 1)) container.sprites.Add(Sprite("zzz", set_emoticons, 0, 3, 1, 1)) -container.sprites.Add(Sprite("blank1", set_emoticons, 1, 3, 1, 1)) -container.sprites.Add(Sprite("deadtee", set_emoticons, 2, 3, 1, 1)) -container.sprites.Add(Sprite("blank2", set_emoticons, 3, 3, 1, 1)) +container.sprites.Add(Sprite("wtf", set_emoticons, 1, 3, 1, 1)) +container.sprites.Add(Sprite("eyes", set_emoticons, 2, 3, 1, 1)) +container.sprites.Add(Sprite("question", set_emoticons, 3, 3, 1, 1)) container.sprites.Add(Sprite("browse_lock", set_browseicons, 0,0,1,1)) container.sprites.Add(Sprite("browse_heart", set_browseicons, 1,0,1,1)) diff --git a/datasrc/network.py b/datasrc/network.py index 656a1d84..c80adc57 100644 --- a/datasrc/network.py +++ b/datasrc/network.py @@ -4,7 +4,7 @@ Emotes = ["NORMAL", "PAIN", "HAPPY", "SURPRISE", "ANGRY", "BLINK"] PlayerStates = ["UNKNOWN", "PLAYING", "IN_MENU", "CHATTING"] GameFlags = ["TEAMS", "FLAGS"] -Emoticons = [str(x) for x in range(1,16)] +Emoticons = [str(x) for x in range(0,16)] Powerups = ["HEALTH", "ARMOR", "WEAPON", "NINJA"] |