Mercurial > rinkhals

changeset 256:bca2f4396de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed unused cursors / generated sprites
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 05 Sep 2009 12:51:20 +0000
parents c4f9e604c81e
children fcaae2cfe3cd
files data/cursors/equip_knife.xbm data/cursors/equip_rifle.xbm data/sprites/helmet.png data/sprites/kevlar.png gamelib/cursors.py regenerate-pngs.py
diffstat 6 files changed, 16 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/data/cursors/equip_knife.xbm	Sat Sep 05 12:44:56 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#define im_width 16
-#define im_height 16
-static char im_bits[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,
-0x00,0xff,0x03,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00
-};
--- a/data/cursors/equip_rifle.xbm	Sat Sep 05 12:44:56 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#define im_width 16
-#define im_height 16
-static char im_bits[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0xff,0x0f,0xfe,0xff,0x00,0xf0,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00
-};
Binary file data/sprites/helmet.png has changed
Binary file data/sprites/kevlar.png has changed
--- a/gamelib/cursors.py	Sat Sep 05 12:44:56 2009 +0000
+++ b/gamelib/cursors.py	Sat Sep 05 12:51:20 2009 +0000
@@ -12,8 +12,6 @@
 
 for tag, filename in [
         ('chicken', 'cursors/chkn.xbm'),
-        ('rifle', 'cursors/equip_rifle.xbm'),
-        ('knife', 'cursors/equip_knife.xbm'),
         ]:
     path = data.filepath(filename)
     # pygame 1.8 needs the file twice to do the right thing
--- a/regenerate-pngs.py	Sat Sep 05 12:44:56 2009 +0000
+++ b/regenerate-pngs.py	Sat Sep 05 12:51:20 2009 +0000
@@ -55,36 +55,39 @@
     image_path = "data/images"
     cursor_path = "data/cursors"
     sprites = [
+        # chicken bits
         ("chkn", 20, 20),
         ("wing", 20, 20),
         ("eye", 20, 20),
+        ("equip_rifle", 20, 20),
+        ("equip_knife", 20, 20),
+        ("equip_kevlar", 20, 20),
+        ("equip_helmet", 20, 20),
         ("select_chkn", 20, 20),
-        ("chkn_death", 20, 20),
-        ("egg", 20, 20),
+        ("nest", 20, 20),
+        ("equip_egg", 20, 20),
+        # fox bits
         ("fox", 20, 20),
-        ("fox_death", 20, 20),
         ("ninja_fox", 20, 20),
         ("sapper_fox", 20, 20),
-        ("equip_rifle", 20, 20),
-        ("equip_knife", 20, 20),
-        ("muzzle_flash", 20, 20),
-        ("equip_kevlar", 20, 20),
-        ("equip_helmet", 20, 20),
+        ("rinkhals", 20, 20),
+        # buildings
         ("henhouse", 60, 40),
         ("select_henhouse", 60, 40),
         ("hendominium", 40, 60),
         ("select_hendominium", 40, 60),
         ("watchtower", 40, 40),
         ("select_watchtower", 40, 40),
-        ("nest", 20, 20),
-        ("equip_egg", 20, 20),
-        ("rinkhals", 20, 20),
+        # special effects
+        ("muzzle_flash", 20, 20),
+        ("chkn_death", 20, 20),
+        ("fox_death", 20, 20),
+        # other
+        ("egg", 20, 20),
     ]
 
     cursors = [
         ("chkn", 16, 16),
-        ("equip_knife", 16, 16),
-        ("equip_rifle", 16, 16),
         ("egg", 16, 16),
         ]