+++ /dev/null
-(supertux-sprite
- (action
- (name "normal")
- (x-offset 0)
- (y-offset 0)
- (images "bell1.png")
- )
- (action
- (name "ringing")
-(fps 14)
- (images
-"bell2.png"
-"bell3.png"
-"bell4.png"
-"bell3.png"
-"bell5.png"
-"bell6.png"
-"bell7.png"
-"bell6.png"
-
- )
- )
-)
(supertux-sprite
(action
(name "default")
- (images "info_block.png")
+ (images "infoblock.png")
)
)
#: data/levels/world1/level1.stl:155
msgid ""
-"-Bells:\n"
-"!images/objects/bell/bell-m.png\n"
-"#If you activate the bell\n"
+"-Fireflies:\n"
+"!images/objects/firefly/firefly.png\n"
+"#If you activate the firefly\n"
"#now, you will restart\n"
"#under it if you die."
msgstr ""
"-Zvonky:\n"
-"!images/objects/bell/bell-m.png\n"
+"!images/objects/firefly/firefly.png\n"
"#Pokud spustíš tento\n"
"#zvonek, vrátíš se sem\n"
"#pokud zemřeš."
(x 100)
(y 100)
)
- (bell (x 5313) (y 289))
+ (firefly (x 5313) (y 289))
(infoblock
(x 192) (y 320)
(message (_ "-Information blocks:
)
(infoblock
(x 5377) (y 225)
- (message (_ "-Bells:
-!images/objects/bell/bell-m.png
-#If you activate the bell
+ (message (_ "-Fireflies:
+!images/objects/firefly/firefly1.png
+#If you activate the firefly
#now, you will restart
#under it if you die."))
)
(x 100)
(y 170)
)
- (bell (x 7889) (y 327))
+ (firefly (x 7889) (y 327))
(mriceblock (x 613) (y 367))
(mrbomb (x 5833) (y 353))
(mrbomb (x 6091) (y 334))
(x 100)
(y 170)
)
- (bell (x 6988) (y 222))
+ (firefly (x 6988) (y 222))
(jumpy (x 686) (y 305))
(jumpy (x 1431) (y 275))
(mriceblock (x 2623) (y 175))
(x 100)
(y 170)
)
- (bell (x 8433) (y 317))
+ (firefly (x 8433) (y 317))
(bouncingsnowball (x 2052) (y 90))
(bouncingsnowball (x 1918) (y 205))
(mriceblock (x 1848) (y 376))
(x 100)
(y 170)
)
- (bell (x 4384) (y 251))
+ (firefly (x 4384) (y 251))
(jumpy (x 1952) (y 64))
(jumpy (x 3424) (y 96))
(jumpy (x 3680) (y 96))
(x 100)
(y 170)
)
- (bell (x 7233) (y 139))
+ (firefly (x 7233) (y 139))
(mriceblock (x 4548) (y 317))
(mriceblock (x 4633) (y 316))
(stalactite (x 5052) (y 42))
(x 100)
(y 170)
)
- (bell (x 8917) (y 310))
+ (firfly (x 8917) (y 310))
(mrbomb (x 1135) (y 424))
(mriceblock (x 8626) (y 374))
(mriceblock (x 8814) (y 405))
(x 100)
(y 170)
)
- (bell (x 8500) (y 283))
+ (firefly (x 8500) (y 283))
(mriceblock (x 1799) (y 347))
(mriceblock (x 1896) (y 347))
(mriceblock (x 1845) (y 347))
(x 100)
(y 170)
)
- (bell (x 7823) (y 206))
+ (firfly (x 7823) (y 206))
(mriceblock (x 3967) (y 151))
(mriceblock (x 3867) (y 247))
(mrbomb (x 4313) (y 334))
(x 100)
(y 170)
)
- (bell (x 8365) (y 311))
+ (firefly (x 8365) (y 311))
(mriceblock (x 733) (y 183))
(mriceblock (x 1149) (y 183))
(mriceblock (x 1406) (y 185))
(x 100)
(y 170)
)
- (bell (x 7083) (y 302))
+ (firefly (x 7083) (y 302))
(snowball (x 502) (y 374))
(mriceblock (x 1645) (y 375))
(mrbomb (x 2152) (y 361))
(x 100)
(y 100)
)
- (bell (x 5568) (y 286))
+ (firefly (x 5568) (y 286))
(sspiky (x 873) (y 407))
(snowball (x 2338) (y 149))
(snowball (x 4655) (y 313))
(x 100)
(y 170)
)
- (bell (x 7638) (y 366))
+ (firefly (x 7638) (y 366))
(mriceblock (x 591) (y 183))
(mriceblock (x 846) (y 180))
(mriceblock (x 786) (y 179))
(x 100)
(y 170)
)
- (bell (x 5922) (y 355))
+ (firefly (x 5922) (y 355))
(jumpy (x 4160) (y 188))
(mrbomb (x 5128) (y 209))
(mriceblock (x 6716) (y 58))
(x 100)
(y 170)
)
- (bell (x 4817) (y 372))
+ (firefly (x 4817) (y 372))
(mrbomb (x 580) (y 305))
(snowball (x 1238) (y 410))
(mrbomb (x 1075) (y 401))
(x 100)
(y 170)
)
- (bell (x 8329) (y 175))
+ (firfly (x 8329) (y 175))
(mriceblock (x 1565) (y 249))
(mriceblock (x 1621) (y 251))
(jumpy (x 2032) (y 213))
(x 100)
(y 170)
)
- (bell (x 6860) (y 222))
+ (firfly (x 6860) (y 222))
(mriceblock (x 757) (y 221))
(mriceblock (x 689) (y 221))
(mriceblock (x 605) (y 221))
(x 100)
(y 170)
)
- (bell (x 7024) (y 317))
+ (firefly (x 7024) (y 317))
(snowball (x 985) (y 220))
(snowball (x 939) (y 219))
(snowball (x 889) (y 219))
(x 100)
(y 170)
)
- (bell (x 6786) (y 374))
- (bell (x 14623) (y 186))
+ (firefly (x 6786) (y 374))
+ (firefly (x 14623) (y 186))
(jumpy (x 1277) (y 388))
(mriceblock (x 4345) (y 380))
(mriceblock (x 4115) (y 220))
(x 100)
(y 170)
)
- (bell (x 6445) (y 231))
+ (firefly (x 6445) (y 231))
(mriceblock (x 10464) (y 128))
(mriceblock (x 3616) (y 160))
(mrbomb (x 9398) (y 306))
(x 100)
(y 170)
)
- (bell (x 4718) (y 336))
+ (firefly (x 4718) (y 336))
(jumpy (x 6752) (y 32))
(jumpy (x 6528) (y 192))
(jumpy (x 288) (y 224))
(x 100)
(y 170)
)
- (bell (x 5006) (y 269))
+ (firefly (x 5006) (y 269))
(snowball (x 4800) (y 160))
(snowball (x 8153) (y 153))
(jumpy (x 9056) (y 159))
(x 100)
(y 170)
)
- (bell (x 8480) (y 352))
+ (firefly (x 8480) (y 352))
(mriceblock (x 1678) (y 293))
(mriceblock (x 1976) (y 335))
(mriceblock (x 2775) (y 221))
(x 100)
(y 170)
)
- (bell (x 7648) (y 331))
+ (fiefly (x 7648) (y 331))
(stalactite (x 1469) (y 192))
(stalactite (x 1631) (y 192))
(stalactite (x 2622) (y 261))
(x 100)
(y 170)
)
- (bell (x 8123) (y 310))
+ (firefly (x 8123) (y 310))
(mriceblock (x 4443) (y 109))
(mriceblock (x 4325) (y 232))
(jumpy (x 3952) (y 216))
(x 100)
(y 170)
)
- (bell (x 7613) (y 254))
+ (firefly (x 7613) (y 254))
(jumpy (x 13009) (y 259))
(jumpy (x 13618) (y 167))
(jumpy (x 15150) (y 324))
+++ /dev/null
-// $Id$
-//
-// SuperTux
-// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-#include <config.h>
-
-#include "bell.hpp"
-#include "resources.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "video/drawing_context.hpp"
-#include "player.hpp"
-#include "object_factory.hpp"
-#include "game_session.hpp"
-#include "sector.hpp"
-
-Bell::Bell(const lisp::Lisp& lisp)
- : ringing(false)
-{
- lisp.get("x", bbox.p1.x);
- lisp.get("y", bbox.p1.y);
- bbox.set_size(32, 32);
- sprite = sprite_manager->create("images/objects/bell/bell.sprite");
- set_group(COLGROUP_TOUCHABLE);
-}
-
-Bell::~Bell()
-{
- delete sprite;
-}
-
-void
-Bell::write(lisp::Writer& writer)
-{
- writer.start_list("bell");
- writer.write_float("x", bbox.p1.x);
- writer.write_float("y", bbox.p1.y);
- writer.end_list("bell");
-}
-
-void
-Bell::update(float )
-{
-}
-
-void
-Bell::draw(DrawingContext& context)
-{
- sprite->draw(context, get_pos(), LAYER_TILES);
-}
-
-HitResponse
-Bell::collision(GameObject& other, const CollisionHit& )
-{
- if(ringing)
- return ABORT_MOVE;
-
- Player* player = dynamic_cast<Player*> (&other);
- if(player) {
- ringing = true;
- // TODO play sound
- sprite->set_action("ringing");
- GameSession::current()->set_reset_point(Sector::current()->get_name(),
- get_pos());
- }
-
- return ABORT_MOVE;
-}
-
-IMPLEMENT_FACTORY(Bell, "bell");
+++ /dev/null
-// $Id$
-//
-// SuperTux
-// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-#ifndef __BELL_H__
-#define __BELL_H__
-
-#include "lisp/lisp.hpp"
-#include "moving_object.hpp"
-#include "sprite/sprite.hpp"
-#include "serializable.hpp"
-
-/**
- * A bell: When tux touches it, it begins ringing and you will respawn at this
- * position.
- */
-class Bell : public MovingObject, public Serializable
-{
-public:
- Bell(const lisp::Lisp& lisp);
- ~Bell();
-
- void write(lisp::Writer& writer);
- void update(float elapsed_time);
- void draw(DrawingContext& context);
- HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-private:
- Sprite* sprite;
- bool ringing;
-};
-
-#endif
-
--- /dev/null
+// $Id: Firefly.cpp 2979 2006-01-10 00:00:04Z matzebraun $
+//
+// SuperTux
+// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+#include <config.h>
+
+#include "firefly.hpp"
+#include "resources.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "player.hpp"
+#include "object_factory.hpp"
+#include "game_session.hpp"
+#include "sector.hpp"
+
+Firefly::Firefly(const lisp::Lisp& lisp)
+ : ringing(false)
+{
+ lisp.get("x", bbox.p1.x);
+ lisp.get("y", bbox.p1.y);
+ bbox.set_size(32, 32);
+ sprite = sprite_manager->create("images/objects/firefly/firefly.sprite");
+ set_group(COLGROUP_TOUCHABLE);
+}
+
+Firefly::~Firefly()
+{
+ delete sprite;
+}
+
+void
+Firefly::write(lisp::Writer& writer)
+{
+ writer.start_list("firefly");
+ writer.write_float("x", bbox.p1.x);
+ writer.write_float("y", bbox.p1.y);
+ writer.end_list("Firefly");
+}
+
+void
+Firefly::update(float )
+{
+}
+
+void
+Firefly::draw(DrawingContext& context)
+{
+ sprite->draw(context, get_pos(), LAYER_TILES);
+}
+
+HitResponse
+Firefly::collision(GameObject& other, const CollisionHit& )
+{
+ if(ringing)
+ return ABORT_MOVE;
+
+ Player* player = dynamic_cast<Player*> (&other);
+ if(player) {
+ ringing = true;
+ // TODO play sound
+ sprite->set_action("ringing");
+ GameSession::current()->set_reset_point(Sector::current()->get_name(),
+ get_pos());
+ }
+
+ return ABORT_MOVE;
+}
+
+IMPLEMENT_FACTORY(Firefly, "firefly");
--- /dev/null
+// $Id: bell.hpp 2642 2005-06-26 13:38:53Z matzebraun $
+//
+// SuperTux
+// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+#ifndef __FIREFLY_H__
+#define __FIREFLY_H__
+
+#include "lisp/lisp.hpp"
+#include "moving_object.hpp"
+#include "sprite/sprite.hpp"
+#include "serializable.hpp"
+
+/**
+ * A Firefly: When tux touches it, it begins buzzing and you will respawn at this
+ * position.
+ */
+class Firefly : public MovingObject, public Serializable
+{
+public:
+ Firefly(const lisp::Lisp& lisp);
+ ~Firefly();
+
+ void write(lisp::Writer& writer);
+ void update(float elapsed_time);
+ void draw(DrawingContext& context);
+ HitResponse collision(GameObject& other, const CollisionHit& hit);
+
+private:
+ Sprite* sprite;
+ bool ringing;
+};
+
+#endif
+
projects / supertux.git / commitdiff
