From ad4cc7039db0c05354df820cbd62f5ca7e651193 Mon Sep 17 00:00:00 2001 From: Marek Moeckel Date: Wed, 6 Apr 2005 19:50:50 +0000 Subject: [PATCH] more work on forest level split dispenser into two different types: -a cannon for MrRocket badguys -a dropper for everything else (image stolen from Pingus) SVN-Revision: 2349 --- data/images/shared/dispenser-broken.png | Bin 943 -> 6001 bytes data/images/shared/dispenser-dropper.png | Bin 0 -> 2595 bytes data/images/shared/dispenser-working.png | Bin 834 -> 4910 bytes data/images/supertux.strf | 22 ++- data/levels/world2/level1.stl | 268 +++++++++++++++---------------- src/badguy/dispenser.cpp | 15 +- 6 files changed, 162 insertions(+), 143 deletions(-) create mode 100644 data/images/shared/dispenser-dropper.png diff --git a/data/images/shared/dispenser-broken.png b/data/images/shared/dispenser-broken.png index dbd6dccdb0247632f0334644cfe7fc2fb0b88aea..28d7a1875c48f11ea14d76d632f46c60c72da6b4 100644 GIT binary patch literal 6001 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 literal 0 HcmV?d00001 diff --git a/data/images/shared/dispenser-working.png b/data/images/shared/dispenser-working.png index c36e65567072b08a297c243f0f83a0c3d91e093c..57c53b4b31349cca4743722b495460af2e361346 100644 GIT binary patch delta 4869 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 delta 761 zcmVat+oDo-luSqWv2CH4UCH%=BG*Ifl_1 za`Ln22=m4-wes5;`(G@<^e zC#%YjmulDRVnNlusd-(&%?yDQ=SWQi<^vJA4y-hts0vr9Nahi1Xrx=|=SD|;p=`hVedq1o!S;Xt6Fk~|jIEt*^tLuZM6hhYY+y9| zr{vw3g*6WMFKzHlM*q_o9gTjdw3i+<(#DDuPL=W!qlY;;l@O9FIZy$4T`TQkcreate("dispenser"); - sprite->set_action("working"); + if (badguy == "mrrocket") { + sprite->set_action(dir == LEFT ? "working-left" : "working-right"); + } + else {sprite->set_action("dropper");} } void @@ -43,7 +46,7 @@ bool Dispenser::collision_squished(Player& player) { //TODO: Should it act like a normal tile when killed? - sprite->set_action("broken"); + sprite->set_action(dir == LEFT ? "broken-left" : "broken-right"); dispense_timer.start(0); player.bounce(*this); kill_squished(player); @@ -74,8 +77,9 @@ Dispenser::launch_badguy() Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir)); else if (badguy == "mriceblock") Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir)); - else if (badguy == "mrrocket") - Sector::current()->add_object(new MrRocket(get_pos().x, get_pos().y+32, dir)); + else if (badguy == "mrrocket") { + int offset = (dir == LEFT ? -32 : 32); + Sector::current()->add_object(new MrRocket(get_pos().x+offset, get_pos().y, dir));} else if (badguy == "poisonivy") Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); else if (badguy == "random") @@ -86,8 +90,7 @@ Dispenser::launch_badguy() case 1: Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y+32, dir)); break; case 2: Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir)); break; case 3: Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir)); break; - case 4: Sector::current()->add_object(new MrRocket(get_pos().x, get_pos().y+32, dir)); break; - case 5: Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); break; + case 4: Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); break; } } } -- 2.11.0