From 783fc7799c9794ea73f682c36b892f2d29dbefd5 Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Sat, 21 Mar 2009 21:42:38 +0000 Subject: [PATCH] Replaced moth with bat --- data/levels/level99.dat | 1 + data/sprites/bat.png | Bin 0 -> 1006 bytes data/sprites/bat1.png | Bin 0 -> 1044 bytes data/sprites/batcaught.png | Bin 0 -> 979 bytes data/sprites/batdead.png | Bin 0 -> 972 bytes data/sprites/moth.png | Bin 1396 -> 0 bytes data/sprites/moth1.png | Bin 1351 -> 0 bytes data/sprites/mothcaught.png | Bin 1393 -> 0 bytes data/sprites/mothdead.png | Bin 1368 -> 0 bytes data/sprites/{mothfire0.png => sonar0.png} | Bin data/sprites/{mothfire1.png => sonar1.png} | Bin data/sprites/{mothfire2.png => sonar2.png} | Bin data/sprites/{mothfire3.png => sonar3.png} | Bin data/sprites/{mothfire4.png => sonar4.png} | Bin data/sprites/{mothfire5.png => sonar5.png} | Bin defs.h | 16 +++---- rc.c | 46 +++++++++--------- shared.c | 52 ++++++++++----------- website/img/bat.png | Bin 0 -> 1502 bytes website/img/moth.png | Bin 2023 -> 0 bytes website/img/{mothfire.png => sonar.png} | Bin website/info.html | 4 +- 22 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 data/sprites/bat.png create mode 100644 data/sprites/bat1.png create mode 100644 data/sprites/batcaught.png create mode 100644 data/sprites/batdead.png delete mode 100644 data/sprites/moth.png delete mode 100644 data/sprites/moth1.png delete mode 100644 data/sprites/mothcaught.png delete mode 100644 data/sprites/mothdead.png rename data/sprites/{mothfire0.png => sonar0.png} (100%) rename data/sprites/{mothfire1.png => sonar1.png} (100%) rename data/sprites/{mothfire2.png => sonar2.png} (100%) rename data/sprites/{mothfire3.png => sonar3.png} (100%) rename data/sprites/{mothfire4.png => sonar4.png} (100%) rename data/sprites/{mothfire5.png => sonar5.png} (100%) create mode 100644 website/img/bat.png delete mode 100644 website/img/moth.png rename website/img/{mothfire.png => sonar.png} (100%) diff --git a/data/levels/level99.dat b/data/levels/level99.dat index 9575eeb..eb74d8e 100644 --- a/data/levels/level99.dat +++ b/data/levels/level99.dat @@ -11,6 +11,7 @@ monsters 1 29 6 7 34 14 171 12 15 +172 3 10 endmonsters exitdir 1 4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4, diff --git a/data/sprites/bat.png b/data/sprites/bat.png new file mode 100644 index 0000000000000000000000000000000000000000..c342a47195fc1016498899e5231d8ba4407fa926 GIT binary patch literal 1006 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 diff --git a/data/sprites/mothdead.png b/data/sprites/mothdead.png deleted file mode 100644 index da43aa2de128d1a7dc4bf25f5969a8fe382265ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1368 zcmV-e1*iInP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02U_CX>@2HM@dakSAh-}000EDNkl#*)bMQ@7gMVgLXiR|0&=!xQB5dEht>&>J^y zC}Y83K}n_PicOmc3rS**Bn=WFG%ra%Z>p%+cCfx)+Yt<2De8K@oTlIUroLX_I1U6M z59r|VaAx4)L!1l-6*ZfsbXBEIcDrG3ZiYI$9se~x{{GgcrnSFBBJXBKMo`82^#uc9 zw2;pq9B6I5O3Jz}i*s`WhdQc-c`#r}RD27u4~jg2(xb|X_+S#oo8GZJGlR?TFPrLGRDo12M8g@T?6g>0HE zQ{3|9D0cq5iNY8FU>82TW=#)G5c}4yT$vZ6(ULPqj_7)!U=S>8AdDfENGOv-L)zOr zcdC@lra!uQ6Bw5Z3!*4uimE4a*)(jft{L3EfB%r|a6CKJ+v}EjJ_i^x2qBPp9%+(9 z4&S|t35JpLQ&T3p&!=IURtd9t9?7x{48s5bz{OaM{d!{JlcFGW2;p!Q>vlsSnFPk= zg0ap{z!U|DAi(PN8kEfj&W#&SAoven4g~x&moELVq@lqIsZ++>*|V^0*RD0GQ0Na;5Ui$>5@0=^>B08)`rZ=;i-*hKABKeo56;e=J4ZaT zckj2DVN&*%7Esb@$lkvnAvo>>x~!~kvF2Ytcx_Sd*k~Q+YX%EDJTORsrpFx?>kE4Biff zx2FkKI+iO$niT13nz2o@Jb;Psj}47fyL_uyU$k;XJ?f? z2M*}0$0O;A0+h{`^Z5N50x;vs)my;HFxMsoq3!RPnfR97yLHClFbq`%U6R0JHZQR? zG|=C5bs56sBtw;yNU6cWl4_O(3S*i4aA@e$-xGr>70t;lPL>azGGP zS=02|swy>UHtV$0$rrQPYBiV369`!egaUYl#j-~=3_<4kJSIt5SCmYCW+q44Y$5;@ zbCC#YDlH{ket*&^7RyMp88&xxSQD~5Io{j*6`3s-Spp$hSCpiZO1T)9%l5*C4TRlf zvLXN&N~hle0QW1kwTEI(r%}+fOk9%oE#tT!FLrh5BrnUB`0T7+-q_esWi|tW5NL)W zB?^Um0MPB>xYM(u2qui|fp0Rrz!-K6=v!{XccW a|M3r1Ni&(7g=ifB0000jumpdir*getspeed(s), B_TRUE); faceplayer(s); } - } else if (s->id == P_MOTH) { + } else if (s->id == P_BAT) { /* timer1 tracks state, timer2 tracks previous direction timer3 is current direction */ - if (s->timer1 == MS_FLY) { + if (s->timer1 == BS_FLY) { if (s->timer3 == D_NONE) { int tx,ty; int d; @@ -5098,9 +5098,9 @@ int movesprite(sprite_t *s) { tt = gettileat(s->x, s->y - s->img->h - getspeed(s), NULL, NULL); if (tt->solid) { // hit a wall - s->timer1 = MS_PAUSE1; + s->timer1 = BS_PAUSE1; s->timer2 = s->timer3; // old dir - s->timer3 = MOTH_PAUSE; + s->timer3 = BAT_PAUSE; } else { s->moved = MV_FLY; s->y -= getspeed(s); @@ -5109,9 +5109,9 @@ int movesprite(sprite_t *s) { tt = gettileat(s->x, s->y + getspeed(s), NULL, NULL); if (tt->solid) { // hit a wall - s->timer1 = MS_PAUSE1; + s->timer1 = BS_PAUSE1; s->timer2 = s->timer3; // old dir - s->timer3 = MOTH_PAUSE; + s->timer3 = BAT_PAUSE; } else { s->moved = MV_FLY; s->y += getspeed(s); @@ -5120,19 +5120,19 @@ int movesprite(sprite_t *s) { s->dir = s->timer3; if (movex(s, s->dir * getspeed(s), B_TRUE)) { // hit a wall - s->timer1 = MS_PAUSE1; + s->timer1 = BS_PAUSE1; s->timer2 = s->timer3; // old dir - s->timer3 = MOTH_PAUSE; + s->timer3 = BAT_PAUSE; } else { s->moved = MV_FLY; } } } - } else if (s->timer1 == MS_PAUSE1) { + } else if (s->timer1 == BS_PAUSE1) { s->moved = MV_FLY; // wait for countdown... s->timer3--; - if ((s->timer3 == MOTH_FIRESPACE*2) || (s->timer3 == MOTH_FIRESPACE) || (s->timer3 == 0)) { + if ((s->timer3 == BAT_FIRESPACE*2) || (s->timer3 == BAT_FIRESPACE) || (s->timer3 == 0)) { sprite_t *ss,*target = NULL; // closest player target = getclosestplayer(s); @@ -5141,8 +5141,8 @@ int movesprite(sprite_t *s) { // get angle towards target ang = atan2(target->y - s->y, target->x - s->x); // shoot - playfx(FX_MOTHFIRE); - ss = addsprite(P_MOTHFIRE,s->x,s->y - s->img->h/2,"mothfire" ); + playfx(FX_SONAR); + ss = addsprite(P_SONAR,s->x,s->y - s->img->h/2,"bat_sonar" ); ss->xs = cos(ang) * getspeed(ss); ss->ys = sin(ang) * getspeed(ss); ss->timer1 = 0; @@ -5150,15 +5150,15 @@ int movesprite(sprite_t *s) { } if (s->timer3 == 0) { // go to next state - s->timer1 = MS_PAUSE2; - s->timer3 = MOTH_PAUSE; + s->timer1 = BS_PAUSE2; + s->timer3 = BAT_PAUSE; } - } else if (s->timer1 == MS_PAUSE2) { + } else if (s->timer1 == BS_PAUSE2) { s->moved = MV_FLY; s->timer3--; if (s->timer3 == 0) { // go to next state - s->timer1 = MS_FLY; + s->timer1 = BS_FLY; s->timer3 = D_NONE; } } @@ -5761,12 +5761,12 @@ int movesprite(sprite_t *s) { } else if (s->x <= TILEW) { s->dead = D_FINAL; } - } else if (s->id == P_MOTHFIRE) { + } else if (s->id == P_SONAR) { // timer1 = frame // update frame if ((timer % 5) == 0) { s->timer1++; - if (s->timer1 >= imageset[P_MOTHFIRE].numimages) { + if (s->timer1 >= imageset[P_SONAR].numimages) { s->timer1 = 0; } } @@ -5776,11 +5776,11 @@ int movesprite(sprite_t *s) { // die if it leaves screen if (s->x >= (640-TILEW)) { s->dead = D_FINAL; - } else if (s->x <= (-(s->img->w/2))) { + } else if (s->x <= TILEW) { s->dead = D_FINAL; } else if (s->y >= (480+(s->img->h))) { s->dead = D_FINAL; - } else if (s->y <= 0) { + } else if (s->y <= TILEH) { s->dead = D_FINAL; } } else if (s->id == P_RAYGUNBULLET) { @@ -6917,10 +6917,10 @@ double getspeed(sprite_t *s ) { } else if (id == P_SPIDER) { if (s->angry) speed = 2; else speed = 1.5; - } else if (id == P_MOTH) { + } else if (id == P_BAT) { if (s->angry) speed = 3; else speed = 2.5; - } else if (id == P_MOTHFIRE) { + } else if (id == P_SONAR) { speed = 2.5; } else if (id == P_KINGRAT) { speed = 1.5; @@ -9762,7 +9762,7 @@ int initsound(void) { loadfx(FX_CHOMP, "chomp.wav"); loadfx(FX_GROWL, "growl.wav"); loadfx(FX_LAMP, "lamp.wav"); - loadfx(FX_MOTHFIRE, "pea.wav"); + loadfx(FX_SONAR, "pea.wav"); // load sound effects for (i = 0; i < MAXFX; i++) { diff --git a/shared.c b/shared.c index 49ebfb9..b8e7283 100644 --- a/shared.c +++ b/shared.c @@ -862,8 +862,8 @@ void setdefaults(sprite_t *s) { s->timer1 = KAS_WALK1; s->timer2 = KA_WALKTIME; s->timer3 = KA_SHOOTTIME; - } else if (s->id == P_MOTH) { - s->timer1 = MS_FLY; + } else if (s->id == P_BAT) { + s->timer1 = BS_FLY; s->timer2 = D_NONE; s->timer3 = D_NONE; } @@ -879,7 +879,7 @@ void setdefaults(sprite_t *s) { case P_BLACKCLOUD: case P_SPIDER: case P_KINGFLY: - case P_MOTH: + case P_BAT: s->flies = B_TRUE; break; case P_FLY: @@ -1452,13 +1452,13 @@ int loadimagesets(void) { loadspriteimage(P_WSPIDER,F_CLIMB2, "sprites/whitespiderclimb1.png"); imageset[P_WSPIDER].numimages = 10; - loadspriteimage(P_MOTH,F_WALK1, "sprites/moth.png"); - loadspriteimage(P_MOTH,F_JUMP, "sprites/moth1.png"); - loadspriteimage(P_MOTH,F_FALL, "sprites/moth1.png"); - loadspriteimage(P_MOTH,F_CAUGHT, "sprites/mothcaught.png"); - loadspriteimage(P_MOTH,F_DEAD, "sprites/mothdead.png"); + loadspriteimage(P_BAT,F_WALK1, "sprites/bat.png"); + loadspriteimage(P_BAT,F_JUMP, "sprites/bat1.png"); + loadspriteimage(P_BAT,F_FALL, "sprites/bat1.png"); + loadspriteimage(P_BAT,F_CAUGHT, "sprites/batcaught.png"); + loadspriteimage(P_BAT,F_DEAD, "sprites/batdead.png"); /* next 3 are auto generated */ - imageset[P_MOTH].numimages = 8; + imageset[P_BAT].numimages = 8; loadspriteimage(P_SPIDER,F_WALK1, "sprites/newspider.png"); @@ -1949,17 +1949,17 @@ int loadimagesets(void) { loadspriteimage(P_BIGFIREBALL,1, "sprites/bigfire2.png"); imageset[P_BIGFIREBALL].numimages = 2; - loadspriteimage(P_MOTHFIRE,0, "sprites/mothfire0.png"); - loadspriteimage(P_MOTHFIRE,1, "sprites/mothfire1.png"); - loadspriteimage(P_MOTHFIRE,2, "sprites/mothfire2.png"); - loadspriteimage(P_MOTHFIRE,3, "sprites/mothfire3.png"); - loadspriteimage(P_MOTHFIRE,4, "sprites/mothfire4.png"); - loadspriteimage(P_MOTHFIRE,5, "sprites/mothfire5.png"); - loadspriteimage(P_MOTHFIRE,6, "sprites/mothfire4.png"); - loadspriteimage(P_MOTHFIRE,7, "sprites/mothfire3.png"); - loadspriteimage(P_MOTHFIRE,8, "sprites/mothfire2.png"); - loadspriteimage(P_MOTHFIRE,9, "sprites/mothfire1.png"); - imageset[P_MOTHFIRE].numimages = 10; + loadspriteimage(P_SONAR,0, "sprites/sonar0.png"); + loadspriteimage(P_SONAR,1, "sprites/sonar1.png"); + loadspriteimage(P_SONAR,2, "sprites/sonar2.png"); + loadspriteimage(P_SONAR,3, "sprites/sonar3.png"); + loadspriteimage(P_SONAR,4, "sprites/sonar4.png"); + loadspriteimage(P_SONAR,5, "sprites/sonar5.png"); + loadspriteimage(P_SONAR,6, "sprites/sonar4.png"); + loadspriteimage(P_SONAR,7, "sprites/sonar3.png"); + loadspriteimage(P_SONAR,8, "sprites/sonar2.png"); + loadspriteimage(P_SONAR,9, "sprites/sonar1.png"); + imageset[P_SONAR].numimages = 10; // manual angry image for black cloud @@ -2122,7 +2122,7 @@ void drawsprite(sprite_t *s) { if (isfruit(s->id)) { frame = F_WALK1; } else if (isbullet(s->id)) { - if (s->id == P_MOTHFIRE) { + if (s->id == P_SONAR) { frame = s->timer1; } else { if ((timer/6) % 2 == 0) { @@ -2846,7 +2846,7 @@ int isbullet(int id) { if (id == P_SPIT) return B_TRUE; if (id == P_FIREBALL) return B_TRUE; if (id == P_BIGFIREBALL) return B_TRUE; - if (id == P_MOTHFIRE) return B_TRUE; + if (id == P_SONAR) return B_TRUE; return B_FALSE; } @@ -3306,7 +3306,7 @@ int ismonster(int id) { case P_ANT1: case P_ANT2: case P_ANT3: - case P_MOTH: + case P_BAT: return MT_MONSTER; case P_BLACKCLOUD: case P_KINGRAT: @@ -3822,7 +3822,7 @@ void setfruitinfo(void) { setinfo(P_SPIDER, "Redback", "Redback spiders will lurk quietly on the ceiling, crawling back and forth. If they notice a player nearby however they will swiftly pounce down onto their prey!", "spider.png"); setinfo(P_WSPIDER, "Whitetail", "Whitetail spiders are more intelligent than other monsters - they are aware of nearby players and will use the landscape to track them down!", "whitespider.png"); - setinfo(P_MOTH, "Moth", "The moth moves in straight lines until it hits a wall. Although simplistic in their movement, moths have the ability to fire a burst of hypno-rays to take out an unwary player!", "moth.png"); + setinfo(P_BAT, "Bat", "The bat moves in a straight line until it hits a wall. Although simplistic in their movement, bats have the ability to fire a burst of sonar to take out an unwary player!", "bat.png"); setinfo(P_FROG, "Frog", "Green frogs will continually bounce around, making them more difficult to catch. They are also excellent swimmers.", "frog.png"); @@ -3909,8 +3909,8 @@ void dumpinfo(void) { printf(""); } else if (i == P_WSPIDER) { printf(""); - } else if (i == P_MOTH) { - printf(""); + } else if (i == P_BAT) { + printf(""); } printf("
%s%s\n", diff --git a/website/img/bat.png b/website/img/bat.png new file mode 100644 index 0000000000000000000000000000000000000000..06c855c8f111086c050bebd0b2cefb435f445b42 GIT binary patch literal 1502 zcmV<41tI#0P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG_ z01hYcz6~(|00mx2L_t(o!?jpRZyZGw{;HQ*dS<-MI36dqlgWkzL+k9Ah?9zfW#ey6gVOwxB|H#5=Dqe4nzt$0U_Wxj>qF=w%(>^daL46ZB;tmW5*FK zJ@s@=RrOcj`|7<{O^|*O?CxSuIiBq_A=#mg>=6*2WkDq6IS!1ZOvYkuWRHN@POL zd`?!CPh?qsccymurNc*RM`}k7Uy=y>*U(K@04xarr1{hHuQb*gO#ll2UlB}>v7hR8 zCGNu0XU@L)U}gELYnT9lZo3KF)RD<#K59Iw+W<7a!ay(zfMsMwoj-rRxw`bvDv>1< zl(l`&+YH>`2i?#Y0ffRB!tW3mBLJ8ZciV5b7O(H0IdGN`vKaUQLeB?6Ad}6#58wu0 zSqQ-A7Vu{_v48fR#hW+tAq|d)K>!+t$mVm%XxaB*;5lIoNzv1``$Qp20A$OwI)!3! zlrlD-*9!1F4@8zL5~G&y`wszR^7(wWI<;@yv@8lheg5T>ulF49R`Uh+EdP5)}Vwy$_$3Q_z3nJZa z%dQ?ch-Rw^8iq{GOkV{CE~j4>Q~;RIx`8?DCL z72B{^D5V~EmB(!Wz!gLvcVnXP9`m_nn(eGAUEeo1hkUVsL&uI|baD!|X`;E+!Jyy6 zNVx*v3sJ7lqC7Pf+`D_{mmmnUeh_#xsshk`i(d6$beLe5=!KTv%8@uAsrP zEmoa9hE7`t4FdRXAJs$0Ff}uc{MZVyZ0ATWve6^iw%9Zib z_uqW|1;W6S)XXVW1|(UA-ra=Pw~*ILaQZsh^#`{dz1_5QqfRLua98yJ*n&B{-4g;Y zjcY2cTG$4*xxT&ufLVHXS<^H!Rz2|Iz}DedIx;y8s#e1K(qG@{t>&NIR{H^^w9j{2 z1jyp|9&aBAj6K1Ylu|}SX~g5Abhz1;-u;lvi^^}rQ4H97ol9UQG z%J_W_nh5d8;UFR{CFzK!Ri4TYrD`a&xha~LhHcue@CkD%;?Z2zj42B3_tlMQF zvC0W$NhkmhQy5~;a^NHh2LiE1mlA4jF;&ssGPGkoHRQk;e?b~3B#3&?C*+;_lCz>%07*qoM6N<$ Eg7#&n2LJ#7 literal 0 HcmV?d00001 diff --git a/website/img/moth.png b/website/img/moth.png deleted file mode 100644 index d76cb94185c053f997eda0ba7863773dd021136b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2023 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L02U_CX>@2HM@dakSAh-}000LT%5FoZerF9#yb)#L^qGfHN$!NPKBhI_Y;ymowPHo@o>-#wTb3C1% zT!-{=r6W7J{=V}&zwdlc1Z#T`_npFxJ=d)R-QYV|!$#;jfYY@qK-Zz1-o)WW9V>K6 zKFW~K-^fQHT?HswqdcwiZpF!vpcD(Ah!ggN4LqMi@^YB_KNWO%0((?sP6SDqLd<a`uI~{$YgU>c4C{Y+6Et*WcjW3=0MZs_r~+1sYz#UE^W_D{&(AXG`3U#P!Iq5Cl6EGdg@HyX;{jY$--7Vj^n934DkYZNGbYsQlPT;-c7{ukkk~>@QD*a&_gOTXw9KVdv|`N zG1An%uX`)BM4O)8*S!@!zpr<1t5khN351M0+T-ZW;{ntVR_(B^fD}+@*|6kQfcctL zsuR_bQT0;Egw_?0>eliy!ZI}jQPM~!Ck7+QAny6csrjQj@7$Ih_}8WTr)~MkZZr3T zOvY?j7jeN{Qfc0DVJWA`om=9rL@*kh$e8S|c>qumfcZXBy%%G%%P+LF#JUjj!i_qX zh)sZ~5`?b?U~@u&c*y?j(CCQStk}@erv3Q#q#nRQ6$-^NM05o?AsHqYifDaX2=@<7 zr)CxkRmPaL7GR=7)PgSo0HtqWY`RI;mo=H}X>DtSrbH5XNU@A!8P>IESW_@0bSy9C zO=v)t)Z7}S*^-3{rbnCGTD%Rnug8Yr(l_2oz4gb}`roFM)Sb(yhL=9ahp zA+=CET`60!nML*P|4dzc@tga1e@P((kwD1#>z}h2fke}@d7M!(O2jprW60%9=y9f8 z!5sFby5-N%>48Z2!n6m`-PxawTIrSM|;VfLAcA zaUc>5^=GBOpLcQ9h@(pr3wZmMX7^WrICWger4E<)sj#jAN9z=RZvSxl7yBRTkcx&^ zl?j&a*}l=}+}!F_ZTo7~c1)vU6{gY)7XiRp%$Gmd&=P@B*k%O`q9)*ZSBUTQ@p#P$m=88I+pJ{BvqH zlV%%Q08o)-rMj^-_Oa%+xU>1Tn0N0-Bcw4%@bhmBANyb-H_z@^5dccu5+e@`82PsWjJEX!4+Sc>Rs?)R^pd6ffZ0DzG#6f-@$IwFk$*KzGqX=0`@ z`j?ZVuMZ54kFk(ZW`Jq{4F<021B})yr)!B^Wf48ha$+N^DnjfXVM=%t)ea}I&{4ZK zwL@G5fC5`Z2H5lgxT4q;OXXV4Rbd;|z}PG=Vju70!AZgaOvYH5>9mBvTerdC8;#nA zm;tG9=69J=nRlF3z+pko;LK?Yv26uFsZOg#xoQ`2 zU-#u_R>UQzbiOU zUDj6X_>s^iitVDLO~q^BH$A9Vh0vQB%me@c diff --git a/website/img/mothfire.png b/website/img/sonar.png similarity index 100% rename from website/img/mothfire.png rename to website/img/sonar.png diff --git a/website/info.html b/website/info.html index f632ff2..1e6e1d5 100644 --- a/website/info.html +++ b/website/info.html @@ -34,8 +34,8 @@
Queen AntAfter an ant has eaten enough, they become a Queen. Queens are just as fast as soldiers and can also breath fire. Furthermore, they are only one meal away from spawning additional ants!
WhitetailWhitetail spiders are more intelligent than other monsters - they are aware of nearby players and will use the landscape to track them down! - -
MothThe moth moves in straight lines until it hits a wall. Although simplistic in their movement, moths have the ability to fire a burst of hypno-rays to take out an unwary player! + +
BatThe bat moves in a straight line until it hits a wall. Although simplistic in their movement, bats have the ability to fire a burst of sonar to take out an unwary player! Bosses
Cloud of DoomThis unkillable cloud will appear if you spend too much time on one level. Beware, as the only way to defeat the cloud of doom is to complete the level before it grows too large to handle!
King RatThis mighty creature is the ruler of the rats, and impervious to the player's net. It can only be harmed by slamming another monster into it! King Rat will roam the level searching for a player, and upon spotting them will charge at high speed.