diff --git a/data/gfx/player.ani b/data/gfx/player.ani new file mode 100644 index 0000000..1564e86 --- /dev/null +++ b/data/gfx/player.ani @@ -0,0 +1,51 @@ +frameWidth=30 +frameHeight=30 + +[animation] +name=walk +speed=5 +loop=0 +frames=0,1,2,3 +[/animation] + +[animation] +name=stand +speed=10 +loop=0 +frames=4,5,6,7 +[/animation] + +[animation] +name=walk-sideshoot +speed=5 +loop=0 +frames=8,9,10,11 +[/animation] + +[animation] +name=stand-sideshoot +speed=5 +loop=0 +frames=12,13,14,15 +[/animation] + +[animation] +name=walk-centershoot +speed=5 +loop=0 +frames=16,17,18,19 +[/animation] + +[animation] +name=stand-centershoot +speed=5 +loop=0 +frames=20,21,22,23 +[/animation] + +[animation] +name=death +speed=5 +loop=0 +frames=24,25,26,27 +[/animation] \ No newline at end of file diff --git a/data/gfx/player_bal1.png b/data/gfx/player.png similarity index 100% rename from data/gfx/player_bal1.png rename to data/gfx/player.png diff --git a/data/gfx/player_arounder_body.png b/data/gfx/player_arounder_body.png deleted file mode 100644 index ec8aa4c..0000000 Binary files a/data/gfx/player_arounder_body.png and /dev/null differ diff --git a/data/gfx/player_arounder_death.png b/data/gfx/player_arounder_death.png deleted file mode 100644 index a2ee38b..0000000 Binary files a/data/gfx/player_arounder_death.png and /dev/null differ diff --git a/data/gfx/player_arounder_fire.png b/data/gfx/player_arounder_fire.png deleted file mode 100644 index 5da208b..0000000 Binary files a/data/gfx/player_arounder_fire.png and /dev/null differ diff --git a/data/gfx/player_arounder_head.png b/data/gfx/player_arounder_head.png deleted file mode 100644 index 211f287..0000000 Binary files a/data/gfx/player_arounder_head.png and /dev/null differ diff --git a/data/gfx/player_arounder_legs.png b/data/gfx/player_arounder_legs.png deleted file mode 100644 index cbc353b..0000000 Binary files a/data/gfx/player_arounder_legs.png and /dev/null differ diff --git a/data/gfx/player_body.ani b/data/gfx/player_body.ani deleted file mode 100644 index 3ad853d..0000000 --- a/data/gfx/player_body.ani +++ /dev/null @@ -1,176 +0,0 @@ -frameWidth=30 -frameHeight=30 - -[animation] -name=walk -speed=5 -loop=0 -frames=0,1,2,3 -[/animation] - -[animation] -name=stand -speed=10 -loop=0 -frames=4,5,6,7 -[/animation] - -[animation] -name=walk_1C -speed=5 -loop=0 -frames=8,9,10,11 -[/animation] - -[animation] -name=stand_1C -speed=10 -loop=0 -frames=12,13,14,15 -[/animation] - -[animation] -name=walk_2C -speed=5 -loop=0 -frames=16,17,18,19 -[/animation] - -[animation] -name=stand_2C -speed=10 -loop=0 -frames=20,21,22,23 -[/animation] - - - -[animation] -name=sideshoot -speed=5 -loop=0 -frames=24,25,26,27 -[/animation] - -[animation] -name=centershoot -speed=5 -loop=0 -frames=28,29,30,31 -[/animation] - -[animation] -name=sideshoot_1C -speed=5 -loop=0 -frames=32,33,34,35 -[/animation] - -[animation] -name=centershoot_1C -speed=5 -loop=0 -frames=36,37,38,39 -[/animation] - -[animation] -name=sideshoot_2C -speed=5 -loop=0 -frames=40,41,42,43 -[/animation] - -[animation] -name=centershoot_2C -speed=5 -loop=0 -frames=44,45,46,47 -[/animation] - - - -[animation] -name=walk_pwr -speed=3 -loop=0 -frames=0,1,2,3 -[/animation] - -[animation] -name=stand_pwr -speed=5 -loop=0 -frames=4,5,6,7 -[/animation] - -[animation] -name=walk_1C_pwr -speed=3 -loop=0 -frames=8,9,10,11 -[/animation] - -[animation] -name=stand_1C_pwr -speed=5 -loop=0 -frames=12,13,14,15 -[/animation] - -[animation] -name=walk_2C_pwr -speed=3 -loop=0 -frames=16,17,18,19 -[/animation] - -[animation] -name=stand_2C_pwr -speed=5 -loop=0 -frames=20,21,22,23 -[/animation] - - - -[animation] -name=sideshoot_pwr -speed=2 -loop=0 -frames=24,25,26,27 -[/animation] - -[animation] -name=centershoot_pwr -speed=2 -loop=0 -frames=28,29,30,31 -[/animation] - -[animation] -name=sideshoot_1C_pwr -speed=2 -loop=0 -frames=32,33,34,35 -[/animation] - -[animation] -name=centershoot_1C_pwr -speed=2 -loop=0 -frames=36,37,38,39 -[/animation] - -[animation] -name=sideshoot_2C_pwr -speed=2 -loop=0 -frames=40,41,42,43 -[/animation] - -[animation] -name=centershoot_2C_pwr -speed=2 -loop=0 -frames=44,45,46,47 -[/animation] \ No newline at end of file diff --git a/data/gfx/player_death.ani b/data/gfx/player_death.ani deleted file mode 100644 index 63a7677..0000000 --- a/data/gfx/player_death.ani +++ /dev/null @@ -1,9 +0,0 @@ -frameWidth=30 -frameHeight=30 - -[animation] -name=default -speed=5 -loop=0 -frames=0,1,2,3 -[/animation] \ No newline at end of file diff --git a/data/gfx/player_head.ani b/data/gfx/player_head.ani deleted file mode 100644 index 2409022..0000000 --- a/data/gfx/player_head.ani +++ /dev/null @@ -1,114 +0,0 @@ -frameWidth=30 -frameHeight=30 - -[animation] -name=walk -speed=5 -loop=0 -frames=0,1,2,3 -[/animation] - -[animation] -name=stand -speed=10 -loop=0 -frames=4,5,6,7 -[/animation] - -[animation] -name=walk_1C -speed=5 -loop=0 -frames=8,9,10,11 -[/animation] - -[animation] -name=stand_1C -speed=10 -loop=0 -frames=12,13,14,15 -[/animation] - -[animation] -name=walk_pwr -speed=5 -loop=0 -frames=16,17,18,19 -[/animation] - -[animation] -name=stand_pwr -speed=10 -loop=0 -frames=20,21,22,23 -[/animation] - -[animation] -name=walk_1C_pwr -speed=5 -loop=0 -frames=24,25,26,27 -[/animation] - -[animation] -name=stand_1C_pwr -speed=10 -loop=0 -frames=28,29,30,31 -[/animation] - -[animation] -name=sideshoot -speed=5 -loop=0 -frames=16,17,18,19 -[/animation] - -[animation] -name=centershoot -speed=5 -loop=0 -frames=20,21,22,23 -[/animation] - -[animation] -name=sideshoot_1C -speed=5 -loop=0 -frames=24,25,26,27 -[/animation] - -[animation] -name=centershoot_1C -speed=5 -loop=0 -frames=28,29,30,31 -[/animation] - -[animation] -name=sideshoot_pwr -speed=2 -loop=0 -frames=16,17,18,19 -[/animation] - -[animation] -name=centershoot_pwr -speed=2 -loop=0 -frames=20,21,22,23 -[/animation] - -[animation] -name=sideshoot_1C_pwr -speed=2 -loop=0 -frames=24,25,26,27 -[/animation] - -[animation] -name=centershoot_1C_pwr -speed=2 -loop=0 -frames=28,29,30,31 -[/animation] \ No newline at end of file diff --git a/data/gfx/player_legs.ani b/data/gfx/player_legs.ani deleted file mode 100644 index 1eb5c11..0000000 --- a/data/gfx/player_legs.ani +++ /dev/null @@ -1,16 +0,0 @@ -frameWidth=30 -frameHeight=30 - -[animation] -name=walk -speed=5 -loop=0 -frames=0,1,2,3 -[/animation] - -[animation] -name=stand -speed=10 -loop=0 -frames=4,5,6,7 -[/animation] \ No newline at end of file diff --git a/data/gfx/player_fire.ani b/data/gfx/player_power.ani similarity index 100% rename from data/gfx/player_fire.ani rename to data/gfx/player_power.ani diff --git a/data/gfx/player_bal1_fire.png b/data/gfx/player_power.png similarity index 100% rename from data/gfx/player_bal1_fire.png rename to data/gfx/player_power.png diff --git a/source/director.cpp b/source/director.cpp index 2a5ea99..8a48a0e 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -363,25 +363,12 @@ bool Director::setFileList() asset->add(prefix + "/data/gfx/title_dust.png", t_bitmap); asset->add(prefix + "/data/gfx/title_dust.ani", t_data); - asset->add(prefix + "/data/gfx/player_head.ani", t_data); - asset->add(prefix + "/data/gfx/player_body.ani", t_data); - asset->add(prefix + "/data/gfx/player_legs.ani", t_data); - asset->add(prefix + "/data/gfx/player_death.ani", t_data); - asset->add(prefix + "/data/gfx/player_fire.ani", t_data); + asset->add(prefix + "/data/gfx/player.png", t_bitmap); + asset->add(prefix + "/data/gfx/player.ani", t_data); + asset->add(prefix + "/data/gfx/player_power.png", t_bitmap); + asset->add(prefix + "/data/gfx/player_power.ani", t_data); - asset->add(prefix + "/data/gfx/player_bal1_head.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_body.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_legs.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_death.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_fire.png", t_bitmap); - - asset->add(prefix + "/data/gfx/player_arounder_head.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_body.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_legs.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_death.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_fire.png", t_bitmap); - - // Fuentes + // Fuentes de texto asset->add(prefix + "/data/font/8bithud.png", t_font); asset->add(prefix + "/data/font/8bithud.txt", t_font); asset->add(prefix + "/data/font/nokia.png", t_font);