From 0fc674b7c864e05a4c19acd6f77d28bfea535615 Mon Sep 17 00:00:00 2001 From: LMH Date: Fri, 17 Oct 2014 14:51:03 -1000 Subject: [PATCH] Added a halloween themed brick covered with cobwebs --- .../objects/bonus_block/brickWeb.sprite | 8 ++++++ data/images/tiles.strf | 27 +++++++++++++++--- data/images/tiles/blocks/brick2.png | Bin 0 -> 3309 bytes data/images/tiles/blocks/brick2_full.png | Bin 0 -> 3209 bytes src/supertux/sector.cpp | 4 ++- 5 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 data/images/objects/bonus_block/brickWeb.sprite create mode 100644 data/images/tiles/blocks/brick2.png create mode 100644 data/images/tiles/blocks/brick2_full.png diff --git a/data/images/objects/bonus_block/brickWeb.sprite b/data/images/objects/bonus_block/brickWeb.sprite new file mode 100644 index 00000000000..fc6f9f993d7 --- /dev/null +++ b/data/images/objects/bonus_block/brickWeb.sprite @@ -0,0 +1,8 @@ +(supertux-sprite + (action + (name "empty") + (images "empty.png")) + (action + (name "normal") + (images "../../tiles/blocks/brick2.png")) +) diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 617dbc3589d..0297d2b9ab5 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -225,8 +225,8 @@ 3122 3108 3109 3127 3131 3132 3133 3134 - 3118 3119 0 0 - 3124 3125 0 0 + 3118 3119 0 3159 + 3124 3125 0 3160 3128 3129 0 0 3135 3136 0 0 )) @@ -667,7 +667,7 @@ ) (tilegroup (name "Block") - (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 44 83 2947 2948 84 102 140 103 104 105 112 128 3037 2943 2944 2945 2946 1311 2153) + (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 3159 44 83 2947 2948 84 102 140 103 104 105 3160 112 128 3037 2943 2944 2945 2946 1311 2153) ) (tilegroup (name "Background") @@ -1329,6 +1329,14 @@ (solid #t) (brick #t) ) + (tile + (id 3159) + (images + "tiles/blocks/brick2.png" + ) + (solid #t) + (brick #t) + ) (tiles (width 1) (height 5) @@ -1470,6 +1478,17 @@ (data 1) (next-tile 84) ) + (tile + (id 3160) + (images + "tiles/blocks/brick2.png" + ) + (editor-images "tiles/blocks/brick2_full.png") + (solid #t) + (brick #t) + (data 1) + (next-tile 84) + ) (tiles (width 3) (height 2) @@ -4218,5 +4237,5 @@ ) (image "tiles/halloween/black.png") ) -;; next-id: 3159 +;; next-id: 3161 ) diff --git a/data/images/tiles/blocks/brick2.png b/data/images/tiles/blocks/brick2.png new file mode 100644 index 0000000000000000000000000000000000000000..97471b2b834dcc70ed59d9b244f51324e9e98117 GIT binary patch literal 3309 zcmVJZvLRw*O0t@m{29VcRx}5CEvI3an!4dC|M$Te4@W zoU&kqifMI}@<~ehEUNAzI~l_ph)^mPNRIU434{pNG;;pPZW>lRfKYVu*-3ia_S1ap zR>t}+;1Ab=qL58Za^lDVyqdwO&MWkeOj718r!qL5Tw;KlkVnRHy3llAghXctiIE=c zMw38vE}fsf$($9NnH(Rcr|l33LGzl2@RWzJZNZ#n4`7-m-6!@^%I9gheJj!`Vi!}K z+P|IYjkhq7cQRIR(moO=mMCD`Hp%29*-VN+a2h@1c`>(sCYs_XqpY$9DJ1!9hIrdY z6bdDT5P-la6_8Sr%Vs$C&TH5bR&Dwot?#~yX-Z5RY^fonV7T`js?$jzQb(%$92?fI z;B5POjvmhtj8q|z)XttmPggr0ua88046*H{f7yAe^@}Z1!m@ANMj@BR>2&eg{z*K;D-w042`ZCViHkh9vmGgI zLg8wvqha~qyALZGfKYVsRFaFX;PknZI456Y(YhyzUp|XrgDq`bx=N~GvGeE%Zp}s@ zuxt|{1hyqn6v1ewNLzmrgw3k(Swg`e^TJa&0@FFvnq+oel%fe9Ux;KPE&vpO#L3q= zabPdH(?whB33>|^^dH&AtSUdcLr2$i6iws7uhrtx1w|8DX8F-I9U&AP4jtX06Q~Ta z`nG$}bq6!uN!Hfu_@Z-&7ZhCXGFC0DXZfO=m{m7}iTD@*0$}i+pUA!M9H46`OBNpw z-Mg0Yt|QE;_Ar$<8II?WQX(bfiw18T89-NHLA8&GtiiH*5gZN;!<2-p>$qi6Gv3Mw ziBz6T-R;?Wqss3>N{OcHxI7-b9uE($tRr0Ep=%^VEM4HeuLdaCuzK^8+~Ch*N!Y({58Y>v zQ$1%P(b>&N+oHE`gndVQm==k0`^GKT4U8UoNe)a39G-HH?s^f^GEp@RRZ*y~^`ki) z^d$^j-U<+ssd$V-XU4cPmSM}v8Mqw^re(8Wc94Q08Owsxt@cHzhUm(|G=9k$Jo<4%DI6gkp;Igy+Q>c z30BR+UFPG5|MWBd_KBzX^NAsxPK`SjRWY8((KC`qs4i@2k1UkIMZg#!7e08UhTxNY`*r*?{WT<9Yg{yq_h|t z9YuFINyU1(aq(*2|L{WwVtMid;#--Lhe0yC3E?ps!HmPq}gUcHrol5cPnIV$d61FXw%9+dvx&hEsg@^y{SvG9i z%KxvSP;>@UP*J~?|2Gr_U*X*)tFLnVK_%w;|9Lyim|F8KzyKwSxfGvY1MZK z1pGACg*ezghHKhf`uqBL`@|5rLWxY#BpNKkp=&(y%s;aJ?t8I-^SvX8Ypt(U-`q7k z{Ow0E`aWS^(?a~jxOHhGg>yUk=`-Krq<0=nBs*k~eeiGe>xOvG+4(@)L^wcDpu5#bXS-iF9 z4}97gCp@!>ISozhId++{1$S||<2b2I60IUi?}alYGilsq&g%eD+BB|wfU^hRAd?tn z_+lHDX=6*t=X-yP*W;wIt{hKv0hcFidPcG|FJ8{VJD=p_M>{AL4ZLm#_b#iW%I_qX z$#Cq*M?Ch_k13ccftk&eg=)!VQ+O)E%xqpwRb9h%fMWa-9Y^0q(aSK564Ck=7Tx(c zs%^4(UI?paFJo4iWAASx5DXw3ZU*Cd=2yG14TECdAe$@UacSf%!KeGSGjDziPM4cg zt;hK3b3fzCXqw?Eg$q~n^pEEl8|u3rME!f7kY^_X3{7MSMCx#RJY4>C8;csE7*eBR z{$1$qa&oB&I*+|gDw$&c$w7XwaW0u`i5;H}vZNu1)9u8v1$z$n00M!H6q3bDSF>p8 z3Py*oQYsY~8y=!GIm93KpS$*;4etAq9LQHt%%*Uc2l0odqYu1G?|6~ni7e8RxXOd1 zC&p=5zLDpD@hfyiVoAY|Hr5kQ7WuS$g2q`Pgd#|$itIan1yxb_=bt=BMVX4%=SS0> z#QM)O+}qBfQRyli0>voy`W0spL-e9$q0?odGr48x!>Hq7kB>uKwW z<9ADjCW}a0@*jV`z$;HLWXI7#YQlNS%Y8U>L2cNJQ8Ibqg%=RQW_eST2Os}FE`Nk% zww2^m{8}ymNTYz2%d)s-K8icYsn%oMaPvC)+7D4GmdNMxai~PWL7Nn9LOMI90ApjrGIz}1*V(acfnt-`h? zimKChHOAqNI1kS(5vrL>uD6@N?A-}AIGie>%1XkO0m^+b_IxqG!)s>o$f{aiJ#d+5 z&_ljxvF`2%36wc;d;KV?gLpiFuIog?mDd5>)8;}dh0p0En@r#+t7LFI%YifFG~c|K zKmGCdY-|ZLV@?GC9;eQl->Hbqx1}h27Y~<|8&g*L!Ke1T=QWiybW9FwY5?4rHZbjNQW+{(dG|^ld z(g3R@Q8fjr3N%f{QbE(52nqh1HzRa60>}=u;Rwz`QQat-gJjo!>{1TZ;R8*3Rg-4= zzOD%cEz?agGexMj2`KUT+pmz%XSpcTKe=(6~vCM}b6VvOp! zEx5cPEX%^QOj_>P$_KlC%|I;2g{w&v1d1XMs)nM%+C{av92%NKK}BOuG{=|SX?(!O@OUqy!e$Jqhz5dI`?nfKuvWOfpVRu*?x9x`z?(N zZo=jEkWQsofA1y|@fhpYZ^X=JnHcRu{Q6(N|9bmZ#~#h)vXn|ia+x$6Hf`nOclJ=q z=MVxUpa=y;v2i#YT%9Oj+7bkWeJ(283dNFvM5CdpiKVOWV*79Y4QvxzDs0;NG^SzD rb*_y>Y?LKmzl}(A1|Pin$6x**Cl1kC^ERYU00000NkvXXu0mjfltE~& literal 0 HcmV?d00001 diff --git a/data/images/tiles/blocks/brick2_full.png b/data/images/tiles/blocks/brick2_full.png new file mode 100644 index 0000000000000000000000000000000000000000..856c292a3969ceda21ff24b1b9596b851fda4363 GIT binary patch literal 3209 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, tile->getData())); solids->change(x, y, 0); } else if(tile->getAttributes() & Tile::BRICK) { - if( ( id == 78 ) || ( id == 105 ) ){ + if( ( id == 3159 ) || ( id == 3160 ) ){ + add_object( std::make_shared(pos, tile->getData(), "images/objects/bonus_block/brickWeb.sprite") ); + } else if( ( id == 78 ) || ( id == 105 ) ){ add_object( std::make_shared(pos, tile->getData(), "images/objects/bonus_block/brickIce.sprite") ); } else if( ( id == 77 ) || ( id == 104 ) ){ add_object( std::make_shared(pos, tile->getData(), "images/objects/bonus_block/brick.sprite") );