super-tux-commit Mailing List for Super Tux (Page 61)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Matze B. <mat...@us...> - 2004-05-28 09:41:55
|
Update of /cvsroot/super-tux/supertux/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10948/docs Added Files: gameobjects.dia Log Message: added inheritance diagram for the gameobjects --- NEW FILE: gameobjects.dia --- (This appears to be a binary file; contents omitted.) |
|
From: Matze B. <mat...@us...> - 2004-05-28 09:40:38
|
Update of /cvsroot/super-tux/supertux/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10746/docs Log Message: Directory /cvsroot/super-tux/supertux/docs added to the repository |
|
From: Ryan F. <sik...@us...> - 2004-05-28 07:31:38
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18988 Modified Files: collision.h collision.cpp tile.h tile.cpp player.cpp Log Message: - added unisolid patch from Upsilon Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- player.cpp 27 May 2004 17:01:28 -0000 1.127 +++ player.cpp 28 May 2004 07:31:25 -0000 1.128 @@ -312,7 +312,10 @@ { return ( issolid(base.x + base.width / 2, base.y + base.height) || issolid(base.x + 1, base.y + base.height) || - issolid(base.x + base.width - 1, base.y + base.height) ); + issolid(base.x + base.width - 1, base.y + base.height) || + isunisolid(base.x + base.width / 2, base.y + base.height) || + isunisolid(base.x + 1, base.y + base.height) || + isunisolid(base.x + base.width - 1, base.y + base.height) ); } bool Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- tile.h 20 May 2004 12:12:38 -0000 1.21 +++ tile.h 28 May 2004 07:31:25 -0000 1.22 @@ -50,6 +50,9 @@ /** solid tile that is indestructable by Tux */ bool solid; + /** uni-directional solid tile */ + bool unisolid; + /** a brick that can be destroyed by jumping under it */ bool brick; Index: collision.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- collision.cpp 17 May 2004 06:26:41 -0000 1.23 +++ collision.cpp 28 May 2004 07:31:25 -0000 1.24 @@ -251,6 +251,13 @@ return tile && tile->solid; } +bool isunisolid(float x, float y) +{ + Tile* tile = gettile(x,y); + return tile && tile->unisolid; +} + + bool isbrick(float x, float y) { Tile* tile = gettile(x,y); Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- tile.cpp 17 May 2004 06:26:41 -0000 1.23 +++ tile.cpp 28 May 2004 07:31:25 -0000 1.24 @@ -88,6 +88,7 @@ Tile* tile = new Tile; tile->id = -1; tile->solid = false; + tile->unisolid = false; tile->brick = false; tile->ice = false; tile->water = false; @@ -102,6 +103,7 @@ LispReader reader(lisp_cdr(element)); assert(reader.read_int("id", &tile->id)); reader.read_bool("solid", &tile->solid); + reader.read_bool("unisolid", &tile->unisolid); reader.read_bool("brick", &tile->brick); reader.read_bool("ice", &tile->ice); reader.read_bool("water", &tile->water); Index: collision.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- collision.h 24 May 2004 11:59:59 -0000 1.14 +++ collision.h 28 May 2004 07:31:25 -0000 1.15 @@ -53,6 +53,7 @@ // Some little helper function to check for tile properties bool issolid(float x, float y); +bool isunisolid(float x, float y); bool isbrick(float x, float y); bool isice(float x, float y); bool isspike(float x, float y); |
|
From: Ryan F. <sik...@us...> - 2004-05-27 23:54:40
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18754 Modified Files: badguy.cpp Log Message: - walking tree tweaks Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- badguy.cpp 27 May 2004 14:18:00 -0000 1.95 +++ badguy.cpp 27 May 2004 23:54:31 -0000 1.96 @@ -834,11 +834,29 @@ void BadGuy::action_walkingtree(double elapsed_time) { + Player& tux = *World::current()->get_tux(); + Direction v_dir = physic.get_velocity_x() < 0 ? LEFT : RIGHT; + if (dying == DYING_NOT) check_horizontal_bump(); fall(); + if (mode == BGM_BIG) + { + if ((tux.base.x + tux.base.width/2 > base.x + base.width/2) && v_dir == LEFT) + { + dir = RIGHT; + physic.set_velocity_x(-physic.get_velocity_x()); + } + else if ((tux.base.x + tux.base.width/2 < base.x + base.width/2) && v_dir == RIGHT) + { + dir = LEFT; + physic.set_velocity_x(-physic.get_velocity_x()); + } + } + + physic.apply(elapsed_time, base.x, base.y); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); |
|
From: Ricardo C. <rm...@us...> - 2004-05-27 17:01:42
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7817/src Modified Files: gameloop.cpp player.cpp player.h resources.cpp special.cpp sprite.h world.cpp Log Message: Implemented Tux growing animation. Bug: since the Sprite does not respect the frames order, it may not animate correctly. I think the best fix is to make Player object to take care of that using Surfaces. Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- player.h 26 May 2004 15:57:36 -0000 1.63 +++ player.h 27 May 2004 17:01:28 -0000 1.64 @@ -83,6 +83,8 @@ extern Sprite* smalltux_gameover; extern Sprite* smalltux_star; extern Sprite* largetux_star; +extern Sprite* growingtux_left; +extern Sprite* growingtux_right; struct PlayerSprite { @@ -142,6 +144,7 @@ Timer kick_timer; Timer shooting_timer; // used to show the arm when Tux is shooting Timer dying_timer; + Timer growing_timer; Physic physic; public: @@ -165,7 +168,7 @@ bool on_ground(); bool under_solid(); bool tiles_on_air(int tiles); - void grow(); + void grow(bool animate); void move(const Vector& vector); bool is_dead() const { return dead; } Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sprite.h 27 May 2004 14:18:00 -0000 1.8 +++ sprite.h 27 May 2004 17:01:28 -0000 1.9 @@ -62,6 +62,9 @@ void draw_part(float sx, float sy, float x, float y, float w, float h); int get_current_frame() const; + float get_fps() { return fps; } ; + int get_frames() { return surfaces.size(); } ; + void draw(const Vector& pos, int special_drawing = SD_NONE) { draw(pos.x, pos.y, special_drawing); } Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- special.cpp 24 May 2004 21:02:27 -0000 1.50 +++ special.cpp 27 May 2004 17:01:28 -0000 1.51 @@ -343,24 +343,24 @@ if (kind == UPGRADE_GROWUP) { play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER); - pplayer->grow(); + pplayer->grow(true); } else if (kind == UPGRADE_FIREFLOWER) { play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER); - pplayer->grow(); + pplayer->grow(true); pplayer->got_power = pplayer->FIRE_POWER; } else if (kind == UPGRADE_ICEFLOWER) { play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER); - pplayer->grow(); + pplayer->grow(true); pplayer->got_power = pplayer->ICE_POWER; } else if (kind == UPGRADE_FIREFLOWER) { play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER); - pplayer->grow(); + pplayer->grow(true); pplayer->got_power = pplayer->FIRE_POWER; } else if (kind == UPGRADE_HERRING) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- player.cpp 26 May 2004 22:46:59 -0000 1.126 +++ player.cpp 27 May 2004 17:01:28 -0000 1.127 @@ -41,6 +41,8 @@ Sprite* smalltux_gameover; Sprite* smalltux_star; Sprite* largetux_star; +Sprite* growingtux_left; +Sprite* growingtux_right; PlayerSprite smalltux; PlayerSprite largetux; @@ -117,6 +119,7 @@ frame_timer.init(true); kick_timer.init(true); shooting_timer.init(true); + growing_timer.init(true); physic.reset(); } @@ -171,6 +174,7 @@ skidding_timer.init(true); safe_timer.init(true); frame_timer.init(true); + growing_timer.init(true); physic.reset(); } @@ -569,7 +573,7 @@ } void -Player::grow() +Player::grow(bool animate) { if(size == BIG) return; @@ -578,6 +582,9 @@ base.height = 64; base.y -= 32; + if(animate) + growing_timer.start((int)((growingtux_left->get_frames() / growingtux_left->get_fps()) * 1000)); + old_base = previous_base = base; } @@ -659,7 +666,14 @@ } else { - if (duck && size != SMALL) + if(growing_timer.check()) + { + if (dir == RIGHT) + growingtux_right->draw(pos); + else + growingtux_left->draw(pos); + } + else if (duck && size != SMALL) { if (dir == RIGHT) sprite->duck_right->draw(pos); Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- world.cpp 26 May 2004 15:57:36 -0000 1.116 +++ world.cpp 27 May 2004 17:01:28 -0000 1.117 @@ -97,7 +97,7 @@ // fall through case PlayerStatus::GROWUP_BONUS: - tux->grow(); + tux->grow(false); break; } } Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- gameloop.cpp 24 May 2004 21:02:26 -0000 1.137 +++ gameloop.cpp 27 May 2004 17:01:27 -0000 1.138 @@ -482,7 +482,7 @@ void GameSession::action(double frame_ratio) { - if (exit_status == ES_NONE) + if (exit_status == ES_NONE && !world->get_tux()->growing_timer.check()) { // Update Tux and the World world->action(frame_ratio); Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- resources.cpp 16 May 2004 03:28:22 -0000 1.33 +++ resources.cpp 27 May 2004 17:01:28 -0000 1.34 @@ -54,6 +54,9 @@ largetux_star = sprite_manager->load("largetux-star"); smalltux_gameover = sprite_manager->load("smalltux-gameover"); + growingtux_left = sprite_manager->load("tux-grow-left"); + growingtux_right = sprite_manager->load("tux-grow-right"); + smalltux.stand_left = sprite_manager->load("smalltux-stand-left"); smalltux.stand_right = sprite_manager->load("smalltux-stand-right"); smalltux.walk_left = sprite_manager->load("smalltux-walk-left"); |
|
From: Ricardo C. <rm...@us...> - 2004-05-27 16:58:27
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7207/data Modified Files: supertux.strf Log Message: Added growing Tux entries. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- supertux.strf 26 May 2004 22:57:33 -0000 1.38 +++ supertux.strf 27 May 2004 16:58:16 -0000 1.39 @@ -188,6 +188,31 @@ "shared/largetux-star-2.png" )) + ;; Growing Tux animation + (sprite (name "tux-grow-left") + (fps 4.0) + (x-hotspot 6) + (y-hotspot 2) + (images "shared/tux-grow-left-1.png" + "shared/tux-grow-left-2.png" + "shared/tux-grow-left-3.png" + "shared/tux-grow-left-4.png" + "shared/tux-grow-left-5.png" + "shared/tux-grow-left-6.png" + "shared/tux-grow-left-7.png")) + + (sprite (name "tux-grow-right") + (fps 4.0) + (x-hotspot 6) + (y-hotspot 2) + (images "shared/tux-grow-right-1.png" + "shared/tux-grow-right-2.png" + "shared/tux-grow-right-3.png" + "shared/tux-grow-right-4.png" + "shared/tux-grow-right-5.png" + "shared/tux-grow-right-6.png" + "shared/tux-grow-right-7.png")) + ;; Icetux (sprite (name "icetux-walk-left") (x-hotspot 6) |
|
From: Ricardo C. <rm...@us...> - 2004-05-27 16:57:57
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7046/data/images/shared Added Files: tux-grow-left-1.png tux-grow-left-2.png tux-grow-left-3.png tux-grow-left-4.png tux-grow-left-5.png tux-grow-left-6.png tux-grow-left-7.png tux-grow-right-1.png tux-grow-right-2.png tux-grow-right-3.png tux-grow-right-4.png tux-grow-right-5.png tux-grow-right-6.png tux-grow-right-7.png Log Message: Tux growing animation by Benjamin! --- NEW FILE: tux-grow-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-right-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-right-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-right-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-grow-left-1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-05-27 14:18:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7938/src Modified Files: badguy.cpp sprite.cpp sprite.h texture.cpp texture.h Log Message: Draw enemies upside down when falling. The drawing code in texture.cpp is just a hack. Not sure how we can flip surfaces in SDL. The OpenGL should be easily done, I will take care of it later. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- badguy.cpp 25 May 2004 22:05:05 -0000 1.94 +++ badguy.cpp 27 May 2004 14:18:00 -0000 1.95 @@ -978,7 +978,10 @@ } Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right; - sprite->draw(viewport.world2screen(Vector(base.x, base.y))); + if(dying == DYING_FALLING) + sprite->draw(viewport.world2screen(Vector(base.x, base.y)), SD_VERTICAL_FLIP); + else + sprite->draw(viewport.world2screen(Vector(base.x, base.y))); if (debug_mode) fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150); Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- sprite.cpp 20 May 2004 23:07:25 -0000 1.10 +++ sprite.cpp 27 May 2004 14:18:00 -0000 1.11 @@ -73,13 +73,20 @@ } void -Sprite::draw(float x, float y) +Sprite::draw(float x, float y, int special_drawing) { time = SDL_GetTicks(); unsigned int frame = get_current_frame(); if (frame < surfaces.size()) - surfaces[frame]->draw(x - x_hotspot, y - y_hotspot); + { + if(special_drawing == SD_SEMI_TRANSPARENT) + surfaces[frame]->draw(x - x_hotspot, y - y_hotspot, 128); + if(special_drawing == SD_VERTICAL_FLIP) + surfaces[frame]->draw(x - x_hotspot, y - y_hotspot, 255, true); + else + surfaces[frame]->draw(x - x_hotspot, y - y_hotspot); + } } void Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- sprite.h 20 May 2004 23:07:25 -0000 1.7 +++ sprite.h 27 May 2004 14:18:00 -0000 1.8 @@ -26,6 +26,8 @@ #include "texture.h" #include "vector.h" +enum SpecialDrawing { SD_NONE, SD_VERTICAL_FLIP, SD_SEMI_TRANSPARENT }; + class Sprite { private: @@ -56,12 +58,12 @@ /** Update the sprite and process to the next frame */ void update(float delta); - void draw(float x, float y); + void draw(float x, float y, int special_drawing = SD_NONE); void draw_part(float sx, float sy, float x, float y, float w, float h); int get_current_frame() const; - void draw(const Vector& pos) - { draw(pos.x, pos.y); } + void draw(const Vector& pos, int special_drawing = SD_NONE) + { draw(pos.x, pos.y, special_drawing); } std::string get_name() const { return name; } int get_width() const; Index: texture.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/texture.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- texture.h 20 May 2004 12:12:38 -0000 1.24 +++ texture.h 27 May 2004 14:18:00 -0000 1.25 @@ -88,7 +88,7 @@ /** Reload the surface, which is necesarry in case of a mode swich */ void reload(); - void draw(float x, float y, Uint8 alpha = 255, bool update = false); + void draw(float x, float y, Uint8 alpha = 255, bool upside_down = false, bool update = false); void draw_bg(Uint8 alpha = 255, bool update = false); void draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha = 255, bool update = false); void draw_stretched(float x, float y, int w, int h, Uint8 alpha, bool update = false); Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/texture.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- texture.cpp 9 May 2004 18:08:02 -0000 1.25 +++ texture.cpp 27 May 2004 14:18:00 -0000 1.26 @@ -207,11 +207,15 @@ } void -Surface::draw(float x, float y, Uint8 alpha, bool update) +Surface::draw(float x, float y, Uint8 alpha, bool upside_down, bool update) { if (impl) { - if (impl->draw(x, y, alpha, update) == -2) + if(upside_down) // FIXME: this should be done by the SDL and OpenGL draw() + for(float sy = 0; sy < h; sy++) + impl->draw_part(0, sy, x, y+(h-sy), w, 1, alpha, update); + + else if (impl->draw(x, y, alpha, update) == -2) reload(); } } |
|
From: Ryan F. <sik...@us...> - 2004-05-27 03:04:36
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23738 Modified Files: TODO Log Message: - updated TODO Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- TODO 19 May 2004 03:49:53 -0000 1.54 +++ TODO 27 May 2004 03:04:12 -0000 1.55 @@ -25,19 +25,18 @@ [H] Change resolution to 800x600 - Levels need to be updated to resolution - - Might still be some other bugs to iron out [H] Buttjump related things ? Right now only breaks bricks beneath tux - what else should it break - Breaks 1 box too much at the left when tux is facing left. - Should kill enemies with a certain range - Animation (need images) ? Should disable Tux's movement temporarily (1 second?) -[H] Camera movement shouldn't be so fast at the beggining, it takes the focus - from the game (backscrolling) [H] Tux should fall while walking in tiles that have a space between. - Possible solution: reduce Tux's width -[H] Enemies should turn upside down after being hit by an kicked iceblock, +[H] Enemies should turn upside down after being hit by a kicked iceblock, fireball or bomb +[H] When you jump into the roof or a bonus and fall back down you collide with + the badguys twice. Noticable with iceblocks. (level 15) [M] Save score on per-level basis to make high-score [M] Save time on per-level basis to make low-time-score |
|
From: Ricardo C. <rm...@us...> - 2004-05-27 02:47:44
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20572/data/levels/world1 Modified Files: level13.stl Log Message: Resized level to 19 height. Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level13.stl 4 May 2004 19:12:39 -0000 1.11 +++ level13.stl 27 May 2004 02:47:32 -0000 1.12 @@ -4,7 +4,7 @@ (author "Ricardo Cruz") (name "Above the Arctic Skies") (width 290) - (height 15) + (height 19) (start_pos_x 100) (start_pos_y 170) (background "") @@ -17,11 +17,11 @@ (bkgd_blue_bottom 255) (time 200) (gravity 10.0) - (back_scrolling #f) (particle_system "clouds") (theme "antarctica") (interactive-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 103 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 9 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 @@ -35,7 +35,10 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 48 48 48 48 48 48 48 48 48 48 48 48 48 48 0 0 0 79 0 0 0 0 79 0 0 48 48 48 48 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 48 0 0 0 0 48 0 0 0 0 79 0 0 79 0 0 0 48 48 48 48 48 48 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 79 0 79 0 79 0 10 12 0 0 0 16 17 17 17 18 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 22 30 17 17 17 17 17 17 17 17 31 12 6 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 9 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 48 48 48 48 48 48 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 48 48 48 48 48 48 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 48 0 79 0 79 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 23 12 0 0 0 0 0 0 0 6 10 12 6 0 16 17 17 17 31 30 17 17 17 17 17 17 17 17 17 17 31 30 17 17 17 17 17 17 17 17 17 31 30 17 17 18 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 13 14 14 14 14 14 15 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 7 8 8 8 8 8 8 8 8 8 8 9 79 0 79 0 79 0 10 21 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 11 12 0 0 0 0 0 0 0 6 10 12 6 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 10 12 0 0 0 - 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 10 11 11 11 11 11 12 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 13 14 14 14 14 14 14 14 14 14 14 15 79 0 79 0 79 0 10 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 11 12 0 0 0 0 0 0 0 6 10 12 6 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 10 12 0 0 0 + 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 16 17 17 17 17 17 18 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 13 14 14 14 14 14 14 14 14 14 14 15 79 0 79 0 79 0 10 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 11 12 0 0 0 0 0 0 0 6 10 12 6 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 10 12 0 0 0 + 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 10 11 11 11 11 11 11 11 11 11 11 12 79 0 79 0 79 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 10 12 0 0 0 + 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 16 31 11 11 11 11 11 11 11 11 11 12 79 0 79 0 79 0 16 31 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 30 18 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 10 12 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 79 0 0 0 0 79 0 0 0 0 79 0 0 0 79 0 0 0 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 0 0 79 0 0 79 0 79 0 79 0 0 79 0 79 79 0 79 0 0 79 0 0 79 0 0 79 0 0 79 0 79 0 0 79 0 0 79 0 79 0 79 0 0 0 79 0 79 0 0 79 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 79 0 0 0 0 0 79 0 0 79 0 0 0 0 79 0 0 79 0 0 0 79 0 10 11 11 11 11 11 11 11 11 30 18 79 0 79 0 79 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 177 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 10 12 0 0 0 ) (background-tm @@ -43,6 +46,7 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 130 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -54,6 +58,9 @@ 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 124 125 0 124 125 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 122 123 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 0 8 8 109 110 111 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 122 123 0 124 125 0 122 123 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 0 0 124 125 0 124 125 0 0 122 123 0 124 125 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 122 123 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 122 123 0 0 0 24 0 0 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 109 110 111 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 122 123 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 122 123 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 197 197 197 197 197 197 197 197 197 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 195 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (foreground-tm @@ -61,6 +68,7 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 130 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -72,64 +80,67 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (reset-points (point (x 4384) (y 251)) ) (objects - (money (x 1952) (y 32)) - (money (x 3424) (y 64)) - (money (x 3680) (y 64)) - (money (x 3936) (y 64)) - (money (x 4608) (y 64)) - (money (x 3648) (y 96)) - (money (x 3904) (y 96)) - (money (x 4249) (y 97)) - (money (x 4576) (y 96)) - (money (x 5152) (y 96)) - (money (x 4217) (y 129)) - (snowball (x 2304) (y 160)) - (snowball (x 1632) (y 192)) - (snowball (x 1696) (y 192)) - (snowball (x 1760) (y 192)) - (snowball (x 1792) (y 192)) - (snowball (x 3126) (y 186)) - (snowball (x 3169) (y 188)) - (money (x 320) (y 224)) - (snowball (x 4928) (y 224)) - (snowball (x 5088) (y 224)) - (mriceblock (x 5152) (y 224)) - (snowball (x 5792) (y 224)) - (snowball (x 6324) (y 220)) - (money (x 608) (y 256)) - (snowball (x 960) (y 256)) - (snowball (x 2902) (y 251)) - (snowball (x 2946) (y 251)) - (snowball (x 2240) (y 320)) - (snowball (x 2272) (y 320)) - (mriceblock (x 2368) (y 320)) - (mriceblock (x 5408) (y 352)) - (snowball (x 5440) (y 352)) - (snowball (x 664) (y 377)) - (snowball (x 7028) (y 405)) - (mriceblock (x 7119) (y 409)) - (snowball (x 7197) (y 408)) - (mriceblock (x 7276) (y 412)) - (snowball (x 7742) (y 276)) - (snowball (x 7874) (y 274)) - (bouncingsnowball (x 3350) (y 93)) - (bouncingsnowball (x 6485) (y 86)) - (bouncingsnowball (x 6576) (y 52)) - (mrbomb (x 6508) (y 396)) - (flyingsnowball (x 6872) (y 275)) - (flyingsnowball (x 6816) (y 205)) - (flyingsnowball (x 5770) (y 133)) - (flyingsnowball (x 5987) (y 240)) - (flyingsnowball (x 2325) (y 73)) - (flyingsnowball (x 1275) (y 202)) - (snowball (x 2664) (y 339)) - (snowball (x 2708) (y 339)) + (money (x 1952) (y 64)) + (money (x 3424) (y 96)) + (money (x 3680) (y 96)) + (money (x 3936) (y 96)) + (money (x 4608) (y 96)) + (money (x 3648) (y 128)) + (money (x 3904) (y 128)) + (money (x 4249) (y 129)) + (money (x 4576) (y 128)) + (money (x 5152) (y 128)) + (money (x 4217) (y 161)) + (snowball (x 2304) (y 192)) + (snowball (x 1632) (y 224)) + (snowball (x 1696) (y 224)) + (snowball (x 1760) (y 224)) + (snowball (x 1792) (y 224)) + (snowball (x 3126) (y 218)) + (snowball (x 3169) (y 220)) + (money (x 320) (y 256)) + (snowball (x 4928) (y 256)) + (snowball (x 5088) (y 256)) + (mriceblock (x 5152) (y 256)) + (snowball (x 5792) (y 256)) + (snowball (x 6324) (y 252)) + (money (x 608) (y 288)) + (snowball (x 960) (y 288)) + (snowball (x 2902) (y 283)) + (snowball (x 2946) (y 283)) + (snowball (x 2240) (y 352)) + (snowball (x 2272) (y 352)) + (mriceblock (x 2368) (y 352)) + (mriceblock (x 5408) (y 384)) + (snowball (x 5440) (y 384)) + (snowball (x 664) (y 409)) + (snowball (x 7028) (y 437)) + (mriceblock (x 7119) (y 441)) + (snowball (x 7197) (y 440)) + (mriceblock (x 7276) (y 444)) + (snowball (x 7742) (y 308)) + (snowball (x 7874) (y 306)) + (bouncingsnowball (x 3350) (y 125)) + (bouncingsnowball (x 6485) (y 118)) + (bouncingsnowball (x 6576) (y 84)) + (mrbomb (x 6508) (y 428)) + (flyingsnowball (x 6872) (y 307)) + (flyingsnowball (x 6816) (y 237)) + (flyingsnowball (x 5770) (y 165)) + (flyingsnowball (x 5987) (y 272)) + (flyingsnowball (x 2325) (y 105)) + (flyingsnowball (x 1275) (y 234)) + (snowball (x 2664) (y 371)) + (snowball (x 2708) (y 371)) ) ) |
|
From: Ricardo C. <rm...@us...> - 2004-05-26 22:57:47
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14287/data Modified Files: supertux.strf Log Message: Updated file to reflect added files. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- supertux.strf 25 May 2004 21:21:22 -0000 1.37 +++ supertux.strf 26 May 2004 22:57:33 -0000 1.38 @@ -632,11 +632,14 @@ (y-hotspot 0) (images "shared/trampoline-4.png")) - ; Flying platforms + ; Flying platform (sprite (name "flying_platform") (x-hotspot 0) (y-hotspot 0) - (images "shared/flying_platform-1.png")) + (images "shared/flying_platform-1.png" + "shared/flying_platform-2.png" + "shared/flying_platform-3.png" + "shared/flying_platform-4.png")) ; Wingling (sprite (name "wingling-left") |
|
From: Ricardo C. <rm...@us...> - 2004-05-26 22:56:23
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13952/data/images/shared Modified Files: flying_platform-1.png Added Files: flying_platform-2.png flying_platform-3.png flying_platform-4.png Log Message: Uploaded Benjamin's flying platform animations. These are bigger, should they be resized to the older size (96x40)? Index: flying_platform-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/flying_platform-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsHXQzy6 and /tmp/cvsMfUbo6 differ --- NEW FILE: flying_platform-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: flying_platform-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: flying_platform-4.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-05-26 22:47:11
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12170/src Modified Files: gameobjs.cpp gameobjs.h player.cpp Log Message: A couple of improvements for the flying platform. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- player.cpp 26 May 2004 15:57:36 -0000 1.125 +++ player.cpp 26 May 2004 22:46:59 -0000 1.126 @@ -822,7 +822,11 @@ pplatform_c = (FlyingPlatform*) p_c_object; base.y = pplatform_c->base.y - base.height; + physic.set_velocity_x(pplatform_c->get_vel_x()); + physic.enable_gravity(false); + can_jump = true; + fall_mode = ON_GROUND; break; default: Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- gameobjs.cpp 24 May 2004 21:02:27 -0000 1.35 +++ gameobjs.cpp 26 May 2004 22:46:59 -0000 1.36 @@ -302,6 +302,11 @@ point = 0; move = false; + float x = pos_x[point+1] - pos_x[point]; + float y = pos_y[point+1] - pos_y[point]; + vel_x = x*velocity / sqrt(x*x + y*y); + vel_y = -(velocity - vel_x); + frame = 0; } @@ -341,6 +346,11 @@ pos_y[point] == pos_y[point+1])) { point++; + + float x = pos_x[point+1] - pos_x[point]; + float y = pos_y[point+1] - pos_y[point]; + vel_x = x*velocity / sqrt(x*x + y*y); + vel_y = -(velocity - vel_x); } } else // last point @@ -349,7 +359,7 @@ // reverse vector return; } - +/* if(pos_x[point+1] > base.x) base.x += velocity * frame_ratio; else if(pos_x[point+1] < base.x) @@ -359,15 +369,10 @@ base.y += velocity * frame_ratio; else if(pos_y[point+1] < base.y) base.y -= velocity * frame_ratio; -/* -float x = pos_x[point+1] - pos_x[point]; -float y = pos_y[point+1] - pos_y[point]; -float vel_x = x*velocity / sqrt(x*x + y*y); -float vel_y = velocity - vel_x; +*/ base.x += vel_x * frame_ratio; base.y += vel_y * frame_ratio; -*/ } void Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- gameobjs.h 24 May 2004 21:02:27 -0000 1.23 +++ gameobjs.h 26 May 2004 22:46:59 -0000 1.24 @@ -132,6 +132,9 @@ virtual void collision(const MovingObject& other, int); void collision(void *p_c_object, int c_object, CollisionType type); + float get_vel_x() { return vel_x; } + float get_vel_y() { return vel_y; } + Physic physic; enum { M_NORMAL, M_HELD } mode; @@ -140,6 +143,8 @@ std::vector<int> pos_y; float velocity; + float vel_x, vel_y; // calculated based in the velocity + int point; bool move; unsigned int frame; |
|
From: Matze B. <mat...@us...> - 2004-05-26 15:58:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24829 Modified Files: level.cpp level.h player.cpp player.h world.cpp world.h Log Message: some cleanups and robustness checks, I added while searching for a bug (that was none as it turned out :) Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- world.h 24 May 2004 21:18:56 -0000 1.50 +++ world.h 26 May 2004 15:57:36 -0000 1.51 @@ -66,14 +66,18 @@ DisplayManager displaymanager; public: - static World* current() { return current_; } - static void set_current(World* w) { current_ = w; } + static World* current() + { return current_; } + static void set_current(World* w) + { current_ = w; } World(const std::string& filename, int level_nr = -1); ~World(); - Level* get_level() { return level; } - Player* get_tux() { return tux; } + Level* get_level() + { return level; } + Player* get_tux() + { return tux; } void add_object(GameObject* object); Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- level.h 25 May 2004 00:28:24 -0000 1.53 +++ level.h 26 May 2004 15:57:36 -0000 1.54 @@ -94,8 +94,6 @@ int bkgd_speed; Vector start_pos; float gravity; - bool back_scrolling; - float hor_autoscroll_speed; /** A collection of points to which Tux can be reset after a lost live */ std::vector<ResetPoint> reset_points; Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- player.cpp 25 May 2004 15:32:45 -0000 1.124 +++ player.cpp 26 May 2004 15:57:36 -0000 1.125 @@ -886,8 +886,7 @@ } void -Player::check_bounds(Camera& viewport, - bool back_scrolling, bool hor_autoscroll) +Player::check_bounds(Camera& viewport) { /* Keep tux in bounds: */ if (base.x < 0) @@ -921,17 +920,6 @@ return; } } - - if(hor_autoscroll) - { - if(base.x == viewport.get_translation().x) - if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32))) - kill(KILL); - - if(base.x + base.width > viewport.get_translation().x + screen->w) - base.x = viewport.get_translation().x + screen->w - base.width; - } - } // EOF // Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- player.h 25 May 2004 00:28:24 -0000 1.62 +++ player.h 26 May 2004 15:57:36 -0000 1.63 @@ -161,7 +161,7 @@ void collision(void* p_c_object, int c_object); void kill(HurtMode mode); void player_remove_powerups(); - void check_bounds(Camera& viewport, bool back_scrolling, bool hor_autoscroll); + void check_bounds(Camera& viewport); bool on_ground(); bool under_solid(); bool tiles_on_air(int tiles); Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- level.cpp 25 May 2004 00:28:24 -0000 1.85 +++ level.cpp 26 May 2004 15:57:36 -0000 1.86 @@ -227,8 +227,6 @@ start_pos.y = 170; time_left = 100; gravity = 10.; - back_scrolling = false; - hor_autoscroll_speed = 0; bkgd_speed = 50; bkgd_top.red = 0; bkgd_top.green = 0; @@ -265,7 +263,9 @@ if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) { - printf("World: Parse Error in file %s", filename.c_str()); + lisp_free(root_obj); + std::cout << "World: Parse Error in file '" << filename + << "'.\n"; return -1; } @@ -281,21 +281,16 @@ if (!reader.read_float("start_pos_y", &start_pos.y)) start_pos.y = 170; time_left = 500; if(!reader.read_int("time", &time_left)) { - printf("Warning no time specified for level.\n"); + printf("Warning: no time specified for level.\n"); } height = 15; - reader.read_int("height", &height); - - back_scrolling = false; - reader.read_bool("back_scrolling", &back_scrolling); - - hor_autoscroll_speed = 0; - reader.read_float("hor_autoscroll_speed", &hor_autoscroll_speed); + if(!reader.read_int("height", &height)) { + printf("Warning: no height specified for level.\n"); + } bkgd_speed = 50; reader.read_int("bkgd_speed", &bkgd_speed); - bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0; reader.read_int("bkgd_red_top", &bkgd_top.red); @@ -369,8 +364,9 @@ if (reader.read_lisp("camera", &cur)) { LispReader reader(cur); - if(world) + if(world) { world->camera->read(reader); + } } } } @@ -388,13 +384,13 @@ char str[80]; /* Save data file: */ - sprintf(str, "/levels/%s/", subset.c_str()); + snprintf(str, sizeof(str), "/levels/%s/", subset.c_str()); fcreatedir(str); - snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(), - level); + snprintf(filename, sizeof(filename), + "%s/levels/%s/level%d.stl", st_dir, subset.c_str(), level); if(!fwriteable(filename)) - snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), - subset.c_str(), level); + snprintf(filename, sizeof(filename), "%s/levels/%s/level%d.stl", + datadir.c_str(), subset.c_str(), level); std::ofstream out(filename); if(!out.good()) { @@ -422,8 +418,6 @@ writer.write_int("time", time_left); writer.write_int("width", width); writer.write_int("height", height); - writer.write_bool("back_scrolling", back_scrolling); - writer.write_float("hor_autoscroll_speed", hor_autoscroll_speed); writer.write_float("gravity", gravity); writer.write_int_vector("background-tm", bg_tiles); Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- world.cpp 25 May 2004 10:38:52 -0000 1.115 +++ world.cpp 26 May 2004 15:57:36 -0000 1.116 @@ -200,8 +200,7 @@ void World::action(float elapsed_time) { - tux->check_bounds(*camera, - level->back_scrolling, (bool)level->hor_autoscroll_speed); + tux->check_bounds(*camera); /* update objects (don't use iterators here, because the list might change * during the iteration) |
|
From: Ryan F. <sik...@us...> - 2004-05-25 23:53:54
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25374 Modified Files: camera.cpp Log Message: - added David's camera patch Index: camera.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/camera.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- camera.cpp 25 May 2004 00:28:24 -0000 1.6 +++ camera.cpp 25 May 2004 23:53:43 -0000 1.7 @@ -202,10 +202,10 @@ || (player->dir == ::RIGHT && scrollchange == LEFT)) scrollchange = NONE; // when in left 1/3rd of screen scroll left - if(player->base.x < translation.x + screen->w/3 && do_backscrolling) + if(player->base.x < translation.x + screen->w/3 - 32 && do_backscrolling) scrollchange = LEFT; // scroll right when in right 1/3rd of screen - else if(player->base.x > translation.x + screen->w/3*2) + else if(player->base.x > translation.x + screen->w/3*2 + 32) scrollchange = RIGHT; // calculate our scroll target depending on scroll mode @@ -220,10 +220,10 @@ // that's the distance we would have to travel to reach target_x float delta_x = translation.x - target_x; // the speed we'd need to travel to reach target_x in this frame - float speed_x = delta_x / elapsed_time; + float speed_x = 1.3 * delta_x / elapsed_time; // limit our speed - float maxv = 1 + fabsf(player->physic.get_velocity_x() * 1.3); + float maxv = 1.3 * (1 + fabsf(player->physic.get_velocity_x() * 1.3)); if(speed_x > maxv) speed_x = maxv; else if(speed_x < -maxv) |
|
From: Ryan F. <sik...@us...> - 2004-05-25 23:24:21
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20256/data/levels/test Modified Files: level10.stl Log Message: - added walkingtree to test level Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level10.stl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- level10.stl 25 May 2004 10:08:48 -0000 1.7 +++ level10.stl 25 May 2004 23:24:10 -0000 1.8 @@ -23,9 +23,9 @@ (reset-points ) (objects - (mriceblock + (walkingtree (x 1176) - (y 272) + (y 250) (stay-on-platform #f) ) (wingling |
|
From: Ryan F. <sik...@us...> - 2004-05-25 22:05:20
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6022/data/images/shared Modified Files: walkingtree-left-1.png Log Message: - tweaked walkingtree Index: walkingtree-left-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/walkingtree-left-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsUIpeJr and /tmp/cvsq3TSpG differ |
|
From: Ryan F. <sik...@us...> - 2004-05-25 22:05:19
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6022/src Modified Files: badguy.cpp Log Message: - tweaked walkingtree Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- badguy.cpp 25 May 2004 21:21:22 -0000 1.93 +++ badguy.cpp 25 May 2004 22:05:05 -0000 1.94 @@ -1140,12 +1140,11 @@ if (mode == BGM_BIG) { set_sprite(img_walkingtree_left_small, img_walkingtree_left_small); - physic.set_velocity_x(physic.get_velocity_x() * 1.1); + physic.set_velocity_x(physic.get_velocity_x() * 2.0f); // XXX magic number: 66 is BGM_BIG height - base.y += 66 - base.height; - player->base.y = base.y - player->base.height - 2; make_player_jump(player); + base.y += 66 - base.height; World::current()->add_score(Vector(base.x, base.y), 25 * player_status.score_multiplier); @@ -1156,8 +1155,6 @@ else squish_me(player); } - - } void |
|
From: Ryan F. <sik...@us...> - 2004-05-25 21:21:34
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31209/src Modified Files: badguy.cpp badguy.h Log Message: - added walking tree enemy. still needs some work Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- badguy.h 25 May 2004 19:41:48 -0000 1.48 +++ badguy.h 25 May 2004 21:21:22 -0000 1.49 @@ -50,6 +50,7 @@ BAD_SPIKY, BAD_SNOWBALL, BAD_WINGLING, + BAD_WALKINGTREE, NUM_BadGuyKinds }; @@ -82,7 +83,10 @@ FISH_WAIT, FLY_UP, - FLY_DOWN + FLY_DOWN, + + BGM_BIG, + BGM_SMALL }; public: DyingType dying; @@ -147,6 +151,7 @@ void action_spiky(double frame_ratio); void action_snowball(double frame_ratio); void action_wingling(double frame_ratio); + void action_walkingtree(double frame_ratio); /** initializes the badguy (when he appears on screen) */ void activate(Direction direction); Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- badguy.cpp 25 May 2004 19:41:47 -0000 1.92 +++ badguy.cpp 25 May 2004 21:21:22 -0000 1.93 @@ -75,6 +75,8 @@ Sprite* img_snowball_squished_left; Sprite* img_snowball_squished_right; Sprite* img_wingling_left; +Sprite* img_walkingtree_left; +Sprite* img_walkingtree_left_small; #define BADGUY_WALK_SPEED .8f #define WINGLING_FLY_SPEED 1.6f @@ -103,6 +105,8 @@ return BAD_SNOWBALL; else if (str == "wingling") return BAD_WINGLING; + else if (str == "walkingtree") + return BAD_WALKINGTREE; else { printf("Couldn't convert badguy: '%s'\n", str.c_str()); @@ -147,6 +151,8 @@ case BAD_WINGLING: return "wingling"; break; + case BAD_WALKINGTREE: + return "walkingtree"; default: return "snowball"; } @@ -291,6 +297,13 @@ physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0); physic.enable_gravity(false); set_sprite(img_wingling_left, img_wingling_left); + } else if (kind == BAD_WALKINGTREE) { + // TODO: why isn't the height/width being set properly in set_sprite? + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + mode = BGM_BIG; + set_sprite(img_walkingtree_left, img_walkingtree_left); + base.width = 66; + base.height = 66; } base.x = start_position.x; @@ -818,6 +831,23 @@ // TODO: Winglings should be removed after flying off the screen } +void +BadGuy::action_walkingtree(double elapsed_time) +{ + if (dying == DYING_NOT) + check_horizontal_bump(); + + fall(); + + physic.apply(elapsed_time, base.x, base.y); + if (dying != DYING_FALLING) + collision_swept_object_map(&old_base,&base); + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); +} + void BadGuy::action(float elapsed_time) @@ -923,6 +953,10 @@ action_wingling(elapsed_time); break; + case BAD_WALKINGTREE: + action_walkingtree(elapsed_time); + break; + default: break; } @@ -1102,6 +1136,25 @@ } else if(kind == BAD_WINGLING) { squish_me(player); set_sprite(img_wingling_left, img_wingling_left); + } else if(kind == BAD_WALKINGTREE) { + if (mode == BGM_BIG) + { + set_sprite(img_walkingtree_left_small, img_walkingtree_left_small); + physic.set_velocity_x(physic.get_velocity_x() * 1.1); + // XXX magic number: 66 is BGM_BIG height + base.y += 66 - base.height; + + player->base.y = base.y - player->base.height - 2; + make_player_jump(player); + + World::current()->add_score(Vector(base.x, base.y), + 25 * player_status.score_multiplier); + player_status.score_multiplier++; + + mode = BGM_SMALL; + } + else + squish_me(player); } @@ -1353,6 +1406,8 @@ img_snowball_squished_left = sprite_manager->load("snowball-squished-left"); img_snowball_squished_right = sprite_manager->load("snowball-squished-right"); img_wingling_left = sprite_manager->load("wingling-left"); + img_walkingtree_left = sprite_manager->load("walkingtree-left"); + img_walkingtree_left_small = sprite_manager->load("walkingtree-left-small"); } void free_badguy_gfx() |
|
From: Ryan F. <sik...@us...> - 2004-05-25 21:21:31
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31209/data Modified Files: supertux.strf Log Message: - added walking tree enemy. still needs some work Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- supertux.strf 25 May 2004 02:51:30 -0000 1.36 +++ supertux.strf 25 May 2004 21:21:22 -0000 1.37 @@ -644,6 +644,15 @@ (y-hotspot 0) (images "shared/wingling-1.png")) + ; Walkingtree + (sprite (name "walkingtree-left") + (x-hotspot 0) + (y-hotspot 0) + (images "shared/walkingtree-left-1.png")) + (sprite (name "walkingtree-left-small") + (x-hotspot 0) + (y-hotspot 0) + (images "shared/walkingtree-left-small-1.png")) ) ;; EOF ;; |
|
From: Ryan F. <sik...@us...> - 2004-05-25 21:21:31
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31209/data/images/shared Added Files: walkingtree-left-1.png walkingtree-left-small-1.png Log Message: - added walking tree enemy. still needs some work --- NEW FILE: walkingtree-left-small-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: walkingtree-left-1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ryan F. <sik...@us...> - 2004-05-25 19:41:58
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9629 Modified Files: badguy.cpp badguy.h Log Message: - some wingling tweaks Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- badguy.h 25 May 2004 02:51:30 -0000 1.47 +++ badguy.h 25 May 2004 19:41:48 -0000 1.48 @@ -102,6 +102,7 @@ bool removable; bool seen; int squishcount; /// number of times this enemy was squiched + Vector target; // Target that badguy is aiming for (wingling uses this) Timer timer; Vector start_position; Physic physic; Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- badguy.cpp 25 May 2004 10:38:52 -0000 1.91 +++ badguy.cpp 25 May 2004 19:41:47 -0000 1.92 @@ -201,6 +201,7 @@ dir = LEFT; seen = false; animation_offset = 0; + target.x = target.y = -1; sprite_left = sprite_right = 0; physic.reset(); frozen_timer.init(true); @@ -244,6 +245,7 @@ { mode = NORMAL; animation_offset = 0; + target.x = target.y = -1; physic.reset(); frozen_timer.init(true); timer.init(true); @@ -791,11 +793,19 @@ else { Player& tux = *World::current()->get_tux(); + int dirsign = physic.get_velocity_x() < 0 ? -1 : 1; - if (fabsf(tux.base.x - base.x) < 200 && base.y < tux.base.y && tux.dying == DYING_NOT) - physic.set_velocity(-2.0f, -2.0f); - else - physic.set_velocity(-WINGLING_FLY_SPEED, 0); + if (fabsf(tux.base.x - base.x) < 150 && base.y < tux.base.y && tux.dying == DYING_NOT) + { + if (target.x < 0 && target.y < 0) + { + target.x = tux.base.x; + target.y = tux.base.y; + physic.set_velocity(dirsign * 1.5f, -2.25f); + } + } + else if (base.y >= target.y - 16) + physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0); } physic.apply(elapsed_time, base.x, base.y); @@ -803,7 +813,9 @@ // Handle dying timer: if (dying == DYING_SQUISHED && !timer.check()) - remove_me(); + remove_me(); + + // TODO: Winglings should be removed after flying off the screen } |
|
From: Ricardo C. <rm...@us...> - 2004-05-25 15:32:57
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24695/src Modified Files: player.cpp Log Message: Disable gravity when on flying platform. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- player.cpp 25 May 2004 00:28:24 -0000 1.123 +++ player.cpp 25 May 2004 15:32:45 -0000 1.124 @@ -822,6 +822,7 @@ pplatform_c = (FlyingPlatform*) p_c_object; base.y = pplatform_c->base.y - base.height; + physic.enable_gravity(false); break; default: |
|
From: Matze B. <mat...@us...> - 2004-05-25 10:39:03
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2346 Modified Files: badguy.cpp world.cpp Log Message: more tuning of badguy activation Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- badguy.cpp 25 May 2004 10:13:07 -0000 1.90 +++ badguy.cpp 25 May 2004 10:38:52 -0000 1.91 @@ -215,9 +215,16 @@ --base.y; } - // just activate the badguy, since he might be on screen already. If not he - // gets deactivated anyway - activate(LEFT); + if(World::current()->camera) { + Vector scroll = World::current()->camera->get_translation(); + + if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE && + start_position.x < scroll.x + screen->w + X_OFFSCREEN_DISTANCE && + start_position.y > scroll.y - Y_OFFSCREEN_DISTANCE && + start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) { + activate(LEFT); + } + } } void Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- world.cpp 25 May 2004 00:28:24 -0000 1.114 +++ world.cpp 25 May 2004 10:38:52 -0000 1.115 @@ -43,6 +43,7 @@ World* World::current_ = 0; World::World(const std::string& filename, int level_nr) + : level(0), tux(0), background(0), camera(0) { // FIXME: Move this to action and draw and everywhere else where the // world calls child functions @@ -109,6 +110,8 @@ } delete level; + + current_ = 0; } void |
|
From: Matze B. <mat...@us...> - 2004-05-25 10:13:28
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30321 Modified Files: badguy.cpp defines.h Log Message: attempt to tune badguy activation Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- badguy.cpp 25 May 2004 02:51:30 -0000 1.89 +++ badguy.cpp 25 May 2004 10:13:07 -0000 1.90 @@ -841,10 +841,10 @@ start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) activate(LEFT); } else { - if(base.x + base.width < scroll_x - X_OFFSCREEN_DISTANCE - || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE - || base.y + base.height < scroll_y - Y_OFFSCREEN_DISTANCE - || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) { + if(base.x + base.width < scroll_x - X_OFFSCREEN_DISTANCE*4 + || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE*4 + || base.y + base.height < scroll_y - Y_OFFSCREEN_DISTANCE*4 + || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4) { seen = false; if(dying != DYING_NOT) remove_me(); Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- defines.h 24 May 2004 22:53:39 -0000 1.42 +++ defines.h 25 May 2004 10:13:07 -0000 1.43 @@ -92,8 +92,8 @@ /* Size constraints: */ -#define X_OFFSCREEN_DISTANCE screen->w*2 -#define Y_OFFSCREEN_DISTANCE screen->h*2 +#define X_OFFSCREEN_DISTANCE screen->w/2 +#define Y_OFFSCREEN_DISTANCE screen->h/2 #define LEVEL_WIDTH 375 |
248 messages has been excluded from this view by a project administrator.
