From: Stephen Groundwater Date: Fri, 14 Apr 2006 12:30:29 +0000 (+0000) Subject: yeti cleanup and death animation rework, hitbox fix ups X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c4b99247a3ffaea12211b90994a8cf042e665b8e;p=supertux.git yeti cleanup and death animation rework, hitbox fix ups SVN-Revision: 3336 --- diff --git a/data/images/creatures/yeti/iceyeti_dust0.png b/data/images/creatures/yeti/iceyeti_dust0.png index e9a78f15c..4c9f0a5d8 100644 Binary files a/data/images/creatures/yeti/iceyeti_dust0.png and b/data/images/creatures/yeti/iceyeti_dust0.png differ diff --git a/data/images/creatures/yeti/iceyeti_dust1.png b/data/images/creatures/yeti/iceyeti_dust1.png index 3b9ad676c..df89278c1 100644 Binary files a/data/images/creatures/yeti/iceyeti_dust1.png and b/data/images/creatures/yeti/iceyeti_dust1.png differ diff --git a/data/images/creatures/yeti/iceyeti_dust2.png b/data/images/creatures/yeti/iceyeti_dust2.png index 3be9f5fdb..f5d6aed2d 100644 Binary files a/data/images/creatures/yeti/iceyeti_dust2.png and b/data/images/creatures/yeti/iceyeti_dust2.png differ diff --git a/data/images/creatures/yeti/iceyeti_dust3.png b/data/images/creatures/yeti/iceyeti_dust3.png index ed49bd3fb..d1e53773d 100644 Binary files a/data/images/creatures/yeti/iceyeti_dust3.png and b/data/images/creatures/yeti/iceyeti_dust3.png differ diff --git a/data/images/creatures/yeti/yeti.sprite b/data/images/creatures/yeti/yeti.sprite index 53b77c2ae..28798909a 100644 --- a/data/images/creatures/yeti/yeti.sprite +++ b/data/images/creatures/yeti/yeti.sprite @@ -2,8 +2,8 @@ (action (name "right") (fps 4.0) - (x-offset 0) - (y-offset -15) + (x-offset 17) + (y-offset 12) (images "y1.png" "y2.png" "y3.png" @@ -17,72 +17,61 @@ (name "left") (mirror-action "right") (fps 4.0) - (x-offset 0) - (y-offset -15) + (x-offset 17) + (y-offset 12) ) (action (name "jump-right") (images "y-jump.png") - (x-offset -40) - (y-offset -15) + (x-offset 17) + (y-offset 12) ) (action (name "jump-left") (mirror-action "jump-right") - (x-offset 40) - (y-offset -15) + (x-offset 17) + (y-offset 12) ) (action (name "stand-right") (images "y.png") - (x-offset -40) - (y-offset -15) + (x-offset 17) + (y-offset 12) ) (action (name "stand-left") (mirror-action "stand-right") - (x-offset 40) - (y-offset -15) + (x-offset 17) + (y-offset 12) ) (action (name "roar") (images "y-jump2.png") - (x-offset 10) - (y-offset -15) + (x-offset 17) + (y-offset 12) ) (action (name "dead") - (images "iceyeti_flip0.png" - "iceyeti_flip1.png" - "iceyeti_flip2.png" - "iceyeti_flip3.png" - "iceyeti_flip0.png" - "iceyeti_flip1.png" - "iceyeti_flip2.png" - "iceyeti_flip3.png" - "iceyeti_dust0.png" - "iceyeti_dust1.png" - "iceyeti_dust2.png" - "iceyeti_dust3.png" - "iceyeti_dust0.png" - "iceyeti_dust1.png" - "iceyeti_dust2.png" - "iceyeti_dust3.png" - "iceyeti_dust0.png" - "iceyeti_dust1.png" - "iceyeti_dust2.png" - "iceyeti_dust3.png" - "iceyeti_dust0.png" - "iceyeti_dust1.png" - "iceyeti_dust2.png" - "iceyeti_dust3.png" - "iceyeti_dust0.png" - "iceyeti_dust1.png" - "iceyeti_dust2.png" - "iceyeti_dust3.png" - "iceyeti_dust0.png" - "iceyeti_dust1.png" - "iceyeti_dust2.png" - "iceyeti_dust3.png") + (images "iceyeti_dust0.png" +"iceyeti_dust0.png" +"iceyeti_dust0.png" +"iceyeti_dust0.png" +"iceyeti_dust1.png" +"iceyeti_dust1.png" +"iceyeti_dust1.png" +"iceyeti_dust1.png" +"iceyeti_dust2.png" +"iceyeti_dust2.png" +"iceyeti_dust2.png" +"iceyeti_dust2.png" +"iceyeti_dust3.png" +"iceyeti_dust3.png" +"iceyeti_dust3.png" +"iceyeti_dust3.png" +"iceyeti_dust3.png" +"iceyeti_dust3.png" +"iceyeti_dust3.png") +(x-offset 0) +(y-offset 27) ) ) diff --git a/data/levels/world1/27 - No More Mr Ice Guy.stl b/data/levels/world1/27 - No More Mr Ice Guy.stl index 787ade220..ca7ebc294 100644 --- a/data/levels/world1/27 - No More Mr Ice Guy.stl +++ b/data/levels/world1/27 - No More Mr Ice Guy.stl @@ -50,9 +50,9 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 + 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 + 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp index eb1bce488..b18e215ba 100644 --- a/src/badguy/yeti.cpp +++ b/src/badguy/yeti.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2006 Matthias Braun +// Copyright (C) 2005 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,11 +12,11 @@ // 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. - +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. #include #include @@ -41,7 +41,7 @@ Yeti::Yeti(const lisp::Lisp& reader) { reader.get("x", start_position.x); reader.get("y", start_position.y); - bbox.set_size(90, 106); + bbox.set_size(60, 90); sprite = sprite_manager->create("images/creatures/yeti/yeti.sprite"); sprite->set_action("right"); state = INIT; diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp index f914a3347..26ac54af3 100644 --- a/src/scripting/wrapper.cpp +++ b/src/scripting/wrapper.cpp @@ -1900,44 +1900,6 @@ static int gotoend_wrapper(HSQUIRRELVM vm) } -static int flip_wrapper(HSQUIRRELVM vm) -{ - (void) vm; - - try { - Scripting::flip(); - - return 0; - - } catch(std::exception& e) { - sq_throwerror(vm, e.what()); - return SQ_ERROR; - } catch(...) { - sq_throwerror(vm, _SC("Unexpected exception while executing function 'flip'")); - return SQ_ERROR; - } - -} - -static int finish_wrapper(HSQUIRRELVM vm) -{ - (void) vm; - - try { - Scripting::finish(); - - return 0; - - } catch(std::exception& e) { - sq_throwerror(vm, e.what()); - return SQ_ERROR; - } catch(...) { - sq_throwerror(vm, _SC("Unexpected exception while executing function 'finish'")); - return SQ_ERROR; - } - -} - static int camera_wrapper(HSQUIRRELVM vm) { (void) vm; @@ -2400,18 +2362,6 @@ void register_supertux_wrapper(HSQUIRRELVM v) throw SquirrelError(v, "Couldn't register function 'gotoend'"); } - sq_pushstring(v, "flip", -1); - sq_newclosure(v, &flip_wrapper, 0); - if(SQ_FAILED(sq_createslot(v, -3))) { - throw SquirrelError(v, "Couldn't register function 'flip'"); - } - - sq_pushstring(v, "finish", -1); - sq_newclosure(v, &finish_wrapper, 0); - if(SQ_FAILED(sq_createslot(v, -3))) { - throw SquirrelError(v, "Couldn't register function 'finish'"); - } - sq_pushstring(v, "camera", -1); sq_newclosure(v, &camera_wrapper, 0); if(SQ_FAILED(sq_createslot(v, -3))) {