From 6402dda0c56d306e7569402c57b0c77662599da2 Mon Sep 17 00:00:00 2001 From: "chirs241097@gmail.com" Date: Sat, 22 Feb 2014 17:10:25 +0000 Subject: M trunk/CHANGELOG.TXT M trunk/VERSION.TXT M trunk/levels.h M trunk/main.cpp M trunk/towernbullet.h --- CHANGELOG.TXT | 13 ++++++++++--- VERSION.TXT | 2 +- levels.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ main.cpp | 2 ++ towernbullet.h | 9 +++++---- 5 files changed, 62 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 931b865..7b1e8d5 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,10 +1,14 @@ =================================================================== Next version: -0.7.1-5_PR +0.7.1-6_PR TODOs: -New levels. +Fusion (double color) bullets. Pre-Released versions: +0.7.1-5_PR (b68) +Draft new level. (Another level threatening you using circles!) +Update some old interfaces from BLR1. + 0.7.1-4_PR (b67) New level (name and placement undetermined). Fix level transition mismatches. @@ -141,6 +145,9 @@ New trigger method for clear range... 0.4.4-0_PRG (b37a) Regression version for releasing... +------------------------------------------------------------- +This will be released as a official Preview Release version.<-obsolete +------------------------------------------------------------- 0.5.2-0_PR (b37) New part for level5. Now I'm working on the regression 0.4.x. @@ -204,7 +211,7 @@ Completing level2... New parts for level2. level2 is almost completed now. PlayerLockX/Y implemented. ------------------------------------------------------------- -This will be released as a official Preview Release version. +This will be released as a official Preview Release version.<-obsolete ------------------------------------------------------------- BLR will be licensed under WTFPL from now. (WTF?) diff --git a/VERSION.TXT b/VERSION.TXT index 185c66a..ccea323 100755 --- a/VERSION.TXT +++ b/VERSION.TXT @@ -1 +1 @@ -0.7.1-4_PR (b67) \ No newline at end of file +0.7.1-5_PR (b68) \ No newline at end of file diff --git a/levels.h b/levels.h index 8eb7759..35bd4dd 100644 --- a/levels.h +++ b/levels.h @@ -2747,6 +2747,50 @@ void Level7Part13() L7P13Creator(vector2d(450,336.6),60,blue); } } +BCircle scircles[50]; +double rspd[50];int c; +void Level7Part14() +{ + frameleft=AMinute;clrtime=2;towcnt=0; + DisableAllTower=false; + if (IfShowTip) + { + IfShowTip=false; + FadeTip=false; + Current_Position=2; + ShowTip("??????"); + } + if (Current_Position==1) + { + ++part;All2pnt();avabrk=1.0f;avacurbrk=1.0f;memset(scircles,0,sizeof(scircles));c=0; + } +} +void Level7Part15() +{ + avacurbrk+=hge->Timer_GetDelta(); + avabrk=0.5+(frameleft/(double)AMinute)*0.5f; + if(avacurbrk>avabrk) + { + avacurbrk=0; + for(int i=0;i<50;++i) + { + if (scircles[i].GetRange()>510||scircles[i].GetRange()<1e-7) + { + scircles[i].Init(1,(c&1?1:-1)*(frameleft1e-7&&scircles[i].GetRange()<510) + { + scircles[i].SetRange(scircles[i].GetRange()+(LOWFPS?17:1)*rspd[i]); + if (rspd[i]>0.05)rspd[i]-=LOWFPS?0.0085:0.0005; + scircles[i].Update(); + } + } +} //vvvvvvvvvvvvvvvvvvvvvv Old Levels vvvvvvvvvvvvvvvvvvvvvv// /*void Level1Part2()//Simple tower8-discard { diff --git a/main.cpp b/main.cpp index 18e1cd1..cb2123f 100644 --- a/main.cpp +++ b/main.cpp @@ -407,6 +407,8 @@ void CallLevels() if (level==7&&part==11)Level7Part11(); if (level==7&&part==12)Level7Part12(); if (level==7&&part==13)Level7Part13(); + if (level==7&&part==14)Level7Part14(); + if (level==7&&part==15)Level7Part15(); /*if (level==1&&part==3)Level1Part3(); if (level==1&&part==4)Level1Part4(); if (level==1&&part==5)Level1Part5(); diff --git a/towernbullet.h b/towernbullet.h index 01c9570..bf33346 100644 --- a/towernbullet.h +++ b/towernbullet.h @@ -1735,16 +1735,16 @@ struct SimpleBullet } if (lastcoll>=200)lastcoll=0; if (scollable>=200)scollable=0; + bulletspr->RenderEx(bulletpos.x+7.2,bulletpos.y+7.2,0,0.6,0);//blink hack double dis=GetDist(bulletpos,playerpos); if (dis<=6&&clrrange<1e-5&&clrrad-pi/2<1e-7&&!lastcoll) //If collision is detected or the bullet flys out of screen, delete it. { - ++coll,scminus+=10000;lastcoll=1; + ++coll,scminus+=10000;lastcoll=1;Mult_BatClear(); return true;//Collision } else { - bulletspr->RenderEx(bulletpos.x+7.2,bulletpos.y+7.2,0,0.6,0); if (dis<=16&&!scollable)++semicoll,++dsmc,scollable=1,SCEffect_Attatch(); return false; } @@ -1817,7 +1817,7 @@ private: double radian,range,DT,drad; vector2d Centre; public: - void Init(double _irange,double _drad,int _Cnt,vector2d _Centre) + void Init(double _irange,double _drad,int _Cnt,vector2d _Centre,TColors _Col=blue) { range=_irange; BCnt=_Cnt; @@ -1829,7 +1829,8 @@ public: { Bullets[i].bulletpos=vector2d(3+Centre.x+range*sin(radian-i*(2*pi/BCnt))-6, 3+Centre.y-range*cos(radian-i*(2*pi/BCnt))-6); - Bullets[i].bulletspr=new hgeSprite(SprSheet,0,0,24,24); + TextureRect rct=GetTextureRect(0,_Col); + Bullets[i].bulletspr=new hgeSprite(SprSheet,rct.x,rct.y,rct.w,rct.h); Bullets[i].bulletspr->SetHotSpot(12,12); Bullets[i].bulletspr->SetColor(0x80FFFFFF); } -- cgit v1.2.3