From d9f6263a08f49c6f4338185a6e42110099a3172c Mon Sep 17 00:00:00 2001
From: Marek Moeckel <wansti@gmx.de>
Date: Wed, 20 Jul 2005 14:49:01 +0000
Subject: [PATCH] added Mr Fluffy badguy I want him for a secret (he's going to
 appear only once in the whole game), so please don't mention him anywhere or
 put him in the editor!

SVN-Revision: 2739
---
 data/images/creatures/mr_fluffy/left-0.png        | Bin 0 -> 2858 bytes
 data/images/creatures/mr_fluffy/left-1.png        | Bin 0 -> 2857 bytes
 data/images/creatures/mr_fluffy/left-2.png        | Bin 0 -> 3024 bytes
 data/images/creatures/mr_fluffy/squished-left.png | Bin 0 -> 1532 bytes
 data/images/sprites.strf                          |  27 ++++++
 src/badguy/fluffy.cpp                             |  99 ++++++++++++++++++++++
 src/badguy/fluffy.hpp                             |  44 ++++++++++
 7 files changed, 170 insertions(+)
 create mode 100644 data/images/creatures/mr_fluffy/left-0.png
 create mode 100644 data/images/creatures/mr_fluffy/left-1.png
 create mode 100644 data/images/creatures/mr_fluffy/left-2.png
 create mode 100644 data/images/creatures/mr_fluffy/squished-left.png
 create mode 100644 src/badguy/fluffy.cpp
 create mode 100644 src/badguy/fluffy.hpp

diff --git a/data/images/creatures/mr_fluffy/left-0.png b/data/images/creatures/mr_fluffy/left-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba96d87206336f3fe5d033e0c70839b2ddb1e82e
GIT binary patch
literal 2858
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
IM6N<$f><q$CIA2c

literal 0
HcmV?d00001

diff --git a/data/images/creatures/mr_fluffy/left-1.png b/data/images/creatures/mr_fluffy/left-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..65b8760d3eeea9b94f133c5773f4abfa1305cade
GIT binary patch
literal 2857
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
Hu0mjfyPIv}

literal 0
HcmV?d00001

diff --git a/data/images/creatures/mr_fluffy/left-2.png b/data/images/creatures/mr_fluffy/left-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..19bbad6f22f127f9d373a8d09c615f4c09da0299
GIT binary patch
literal 3024
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
S7{^Zl0000<MNUMnLSTY9)Xk3o

literal 0
HcmV?d00001

diff --git a/data/images/creatures/mr_fluffy/squished-left.png b/data/images/creatures/mr_fluffy/squished-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c1bb576dbc12cc23721212c35a5c15f9a78904d
GIT binary patch
literal 1532
zcmV<Y1q1qtP)<h;3K|Lk000e1NJLTq001HY000gM1^@s6N-55d00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)dv&~Bp%`g$}0c>03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00m%4L_t(I%Z-&=h@Dpz
z$A5c&xAUDdm(Kl?Ni&($Om345Ni;UCq1Hf@LW?D#R7j;#Qd7Zd%NT0XN=Z$GArD?(
zY{3du<CK80C0-CUZAJ+O?PY>Gkm)3IjdMF^&Ue1c{`THJ1d3pxU5|?e>$ld!?=ScW
z_1aUv3o-oY-RVhu;rUHr{TCd^K?p%u@F^AxAR%z2Dum%H6O;2qNk*L2;;)@O{KQAu
zAwH=2<HIBM(h+ZWw>Qi7&eq#IdYdRUI{0-y!V~CNlT>r^%zy#u0#f1y4#HaENTE_t
zIYg1-y{p&E#qqbs&iwl6?H>yA%Fzqbcf{6G=)JwJx1HN}cH!UVAp!}2RR*0}OrpV9
zWYNX(K!grf0Es~@E2;}At}n?FO`bzga#&u-k&a;E-wXWq%B9r}jcd1k<)`;w|6dRX
z;1@^Ed#>O}XItZIy41|pySng84kD2J>FgxE8ynDx!Ni*Je=O6|T|~GNn`!=h?grh>
z1yoI=Vv8{rtwCT3>pe<s1)4g2vTBa&d+gZMAN2Kge0{L(bH_IK?4G#vuiv}_;GBE>
zR}FzDYdd${ao=3xap3p>_pComM|;Sn3)4LP>ZA0FPt&ue$mk#Ec;M7N?p=R~md1dI
zu`-Xpe3&i8{dm?A6eL1`<A5K!U@Tgh_djZLO|j@Pc_W6P<aLFO_wQPJch?`To`2oh
z(=l-0_D%f{6>lrjH_*zx8^6eb;{%vG+IjNi!~Epv>wIEo12~fIo;p6c<{$^2-A%T>
znKM8C4#S^+k*>}<ZcInCwuCso1R*Fic(?_Lu%MM?bul3beOwpj<|39B%lxN?Gh3P6
zwYGimp!3!JPwvVx_28OK-8e;`H9d8hkF_&=Vu+`nKh2@tyRn{&)fSywI=hN&S+|X$
zZyn|QLqBBmoxK!_E&@qigNKkHgg|GSw4zX%VR0r#VzJf|S2D)Nm#9QFrWVSSlPQs<
zNhrr=-rHNPMhM3N1D8kVIrH2xhF%zE_{0!buB>44TUTjixN)t@mrgy(g@<3_GcP^D
z)b$$D6?Ak4SY=386;?r9R?J^tW%gQy`Pqn>$ublFyve1%O))*c%*twvvWhfK0dNzQ
zhFNaF7%q>_^Wf>dTsZj_AK%l){%?PlL&N(R8M?^eU^Da6G5fx;i_71;N@sV-tJ~h-
zo^RgC?@#`fwib`da!gqCQK>>Dnm9^XT#g9?hiWZje6E5JmeA2mR+lKpvmk8c?4{F<
zuG041I7^xQ`y@>Q&OI~A;La9m6~(~TCPs!XvSUXxS!QVK2s!u6D4pF!gn-Tc4U7z3
zq_x>0ixr-<EX-9fR#OZ-Y_4%IEUm;$->l*LlKO(jJ1aA+CW{EI2>ik=k36>Txdund
z@~3*YP#^g8^>tI<)r7L(`z|2JO^y%}Ap}XRh*lMju$1b2f<Pj%)M|=KIRPOk7F_a7
zGjlUyVs3?*N)2Hx#zsUsW;I=<7Dq;#eC(HRp4$Gt&`vz?-3C|6mA&gWh@PG{>f1_4
zS0a5Mtqm&GRHIt}E7b(0G_I65E+mN|N-~tP6axnf2r2Pgi37~sTw-EniqvEXt*KQj
z#Gs<A_TtE2hM)L9vmU(bm>)|2$d=CT@9){Lk%H?WjbW)0QEIBEvAGH9+?uu4;&~DY
zSRqiUVY!?zw@@WXGAh+7i|Hb{P6_fHDIB7xj5a2Yw0`UdZ@%!e56zk{-+e*~=x>wq
zphX_93km^2fl{fFuI5%M)f!4Ea;v~(s4T%c4j6;*0*uzAwHkSr;7W(wC}WISu-cAG
ic;wkPp1<}%S@U15HjC3vR@e*x0000<MNUMnLSTY3mgZ;x

literal 0
HcmV?d00001

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 054da592e..879e7c47a 100644
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -864,6 +864,33 @@
          (y-offset -19)
          (mirror-action "squished-left")))
 
+ (sprite (name "fluffy")
+       (action
+         (name "left")
+         (x-offset 2)
+         (y-offset 4)
+         (images "creatures/mr_fluffy/left-0.png"
+                 "creatures/mr_fluffy/left-1.png"
+                 "creatures/mr_fluffy/left-2.png"
+                 "creatures/mr_fluffy/left-1.png"))
+
+       (action
+         (name "right")
+         (x-offset 2)
+         (y-offset 4)
+         (mirror-action "left"))
+       (action
+         (name "squished-left")
+         (x-offset 1)
+         (y-offset -19)
+         (images "creatures/mr_fluffy/squished-left.png"))
+
+       (action
+         (name "squished-right")
+         (x-offset 1)
+         (y-offset -19)
+         (mirror-action "squished-left")))
+
      (sprite (name "jumpy")
        (action
          (name "left-up")
diff --git a/src/badguy/fluffy.cpp b/src/badguy/fluffy.cpp
new file mode 100644
index 000000000..48e007ad5
--- /dev/null
+++ b/src/badguy/fluffy.cpp
@@ -0,0 +1,99 @@
+//  $Id: Fluffy.cpp 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.
+
+#include <config.h>
+
+#include "fluffy.hpp"
+
+static const float WALKSPEED = 80;
+
+Fluffy::Fluffy(const lisp::Lisp& reader)
+{
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
+  bbox.set_size(31.8, 31.8);
+  sprite = sprite_manager->create("fluffy");
+  set_direction = false;
+}
+
+Fluffy::Fluffy(float pos_x, float pos_y, Direction d)
+{
+  start_position.x = pos_x;
+  start_position.y = pos_y;
+  bbox.set_size(31.8, 31.8);
+  sprite = sprite_manager->create("fluffy");
+  set_direction = true;
+  initial_direction = d;
+}
+
+void
+Fluffy::write(lisp::Writer& writer)
+{
+  writer.start_list("fluffy");
+
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
+
+  writer.end_list("fluffy");
+}
+
+void
+Fluffy::activate()
+{
+  if (set_direction) {dir = initial_direction;}
+  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+  sprite->set_action(dir == LEFT ? "left" : "right");
+}
+
+bool
+Fluffy::collision_squished(Player& player)
+{
+  sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
+  kill_squished(player);
+  return true;
+}
+
+HitResponse
+Fluffy::collision_solid(GameObject& , const CollisionHit& hit)
+{
+  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+    physic.set_velocity_y(0);
+  } else { // hit right or left
+    dir = dir == LEFT ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());
+  }
+
+  return CONTINUE;
+}
+
+HitResponse
+Fluffy::collision_badguy(BadGuy& , const CollisionHit& hit)
+{
+  if(fabsf(hit.normal.x) > .8) { // left or right hit
+    dir = dir == LEFT ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());       
+  }
+
+  return CONTINUE;
+}
+
+IMPLEMENT_FACTORY(Fluffy, "fluffy")
diff --git a/src/badguy/fluffy.hpp b/src/badguy/fluffy.hpp
new file mode 100644
index 000000000..f26f0a1a2
--- /dev/null
+++ b/src/badguy/fluffy.hpp
@@ -0,0 +1,44 @@
+//  $Id: snowball.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 __FLUFFY_H__
+#define __FLUFFY_H__
+
+#include "badguy.hpp"
+
+class Fluffy : public BadGuy
+{
+public:
+  Fluffy(const lisp::Lisp& reader);
+  Fluffy(float pos_x, float pos_y, Direction d);
+
+  void activate();
+  void write(lisp::Writer& writer);
+  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
+  
+protected:
+  bool collision_squished(Player& player);
+  bool set_direction;
+  Direction initial_direction;  
+};
+
+#endif
+
-- 
2.11.0