aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xCHANGELOG.TXT8
-rwxr-xr-xVERSION.TXT2
-rw-r--r--levels.h19
-rw-r--r--towernbullet.h37
4 files changed, 44 insertions, 22 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 7b1e8d5..22314b3 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,10 +1,14 @@
===================================================================
Next version:
-0.7.1-6_PR
+0.7.1-7_PR
TODOs:
-Fusion (double color) bullets.
+More new things?
Pre-Released versions:
+0.7.1-6_PR (b69)
+Fusion bullet first work draft.
+Adjust level difficulty. It was indeed too easy...
+
0.7.1-5_PR (b68)
Draft new level. (Another level threatening you using circles!)
Update some old interfaces from BLR1.
diff --git a/VERSION.TXT b/VERSION.TXT
index ccea323..c6a8266 100755
--- a/VERSION.TXT
+++ b/VERSION.TXT
@@ -1 +1 @@
-0.7.1-5_PR (b68) \ No newline at end of file
+0.7.1-6_PR (b69) \ No newline at end of file
diff --git a/levels.h b/levels.h
index 35bd4dd..fcd5a48 100644
--- a/levels.h
+++ b/levels.h
@@ -2747,8 +2747,8 @@ void Level7Part13()
L7P13Creator(vector2d(450,336.6),60,blue);
}
}
-BCircle scircles[50];
-double rspd[50];int c;
+BCircle scircles[200];
+double rspd[200];
void Level7Part14()
{
frameleft=AMinute;clrtime=2;towcnt=0;
@@ -2762,31 +2762,32 @@ void Level7Part14()
}
if (Current_Position==1)
{
- ++part;All2pnt();avabrk=1.0f;avacurbrk=1.0f;memset(scircles,0,sizeof(scircles));c=0;
+ ++part;All2pnt();avabrk=1.0f;avacurbrk=1.0f;memset(scircles,0,sizeof(scircles));
}
}
void Level7Part15()
{
avacurbrk+=hge->Timer_GetDelta();
- avabrk=0.5+(frameleft/(double)AMinute)*0.5f;
+ avabrk=0.1+(frameleft/(double)AMinute)*0.4f;
if(avacurbrk>avabrk)
{
avacurbrk=0;
- for(int i=0;i<50;++i)
+ for(int i=0;i<200;++i)
{
if (scircles[i].GetRange()>510||scircles[i].GetRange()<1e-7)
{
- scircles[i].Init(1,(c&1?1:-1)*(frameleft<TenSeconds?0.0002:0.0001),60,vector2d(400,300),(TColors)c);
- ++c;c%=8;rspd[i]=0.5;break;
+ scircles[i].Init(1,(rand()&1?1:-1)*(frameleft<TwentySeconds?0.0003:0.0002),36,vector2d(400,300),(TColors)(rand()%8),(TColors)(rand()%8));
+ rspd[i]=0.575+(frameleft/(double)AMinute)*0.1;break;
}
}
}
- for(int i=0;i<50;++i)
+ for(int i=0;i<200;++i)
{
if (scircles[i].GetRange()>1e-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;
+ if (rspd[i]>0.002)rspd[i]-=0.0005*(LOWFPS?17:1);
+ if (rspd[i]<=0.002)rspd[i]=0.002;
scircles[i].Update();
}
}
diff --git a/towernbullet.h b/towernbullet.h
index bf33346..395c8ed 100644
--- a/towernbullet.h
+++ b/towernbullet.h
@@ -5,7 +5,7 @@
//Human-being who really knows what these mean, please contact Chirsno which is puzzled by these shitty codes..
//[Perfect Freeze]: code here for BLR2 won't change a lot since 30/08/2013
//Sorry that I would break that...
-//I found the rendering code stupid so I MUST rewrite it NOW.
+//I found the rendering code stupid so I MUST rewrite it RIGHT NOW.
// --Announcement from Chirsno
#include "effects.h"
static const char* TOWERNBULLET_H_FN="towernbullet.h";
@@ -16,6 +16,23 @@ void DirectBullet(Bullet &a,double rad)
a.bulletdir.y=sin(rad);
a.dist=1;
}
+void RenderAlter(vector2d p,TColors ca,TColors cb,double rot=0,double scl=1)
+{
+ float x,y,w,h;
+ bulletspr[ca]->GetTextureRect(&x,&y,&w,&h);
+ bulletspr[ca]->SetTextureRect(x,y,12,h);
+ bulletspr[ca]->SetHotSpot(12,12);
+ bulletspr[ca]->RenderEx(p.x,p.y,rot,scl);
+ bulletspr[ca]->SetTextureRect(x,y,w,h);
+ bulletspr[ca]->SetHotSpot(12,12);
+
+ bulletspr[cb]->GetTextureRect(&x,&y,&w,&h);
+ bulletspr[cb]->SetTextureRect(x,y,12,h);
+ bulletspr[cb]->SetHotSpot(12,12);
+ bulletspr[cb]->RenderEx(p.x,p.y,rot+pi,scl);
+ bulletspr[cb]->SetTextureRect(x,y,w,h);
+ bulletspr[cb]->SetHotSpot(12,12);
+}
int CreateBullet1(double x,double y,double bs,bool eff=false)
{
++shots;
@@ -1718,9 +1735,10 @@ int nonamecnt;
//"CTarg"
struct SimpleBullet
{
- hgeSprite *bulletspr;
+ TColors aC,aC2;
vector2d bulletpos;
int scollable,lastcoll;
+ double rot;
bool Update_SimpBul()
{
if (lastcoll)
@@ -1735,7 +1753,8 @@ 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
+ if (aC==COLOR_COUNT)bulletspr[aC]->RenderEx(bulletpos.x+7.2,bulletpos.y+7.2,0,0.6,0);//blink hack
+ else RenderAlter(vector2d(bulletpos.x+7.2,bulletpos.y+7.2),aC,aC2,rot,0.6);
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.
@@ -1772,9 +1791,7 @@ public:
{
CircBul[i].bulletpos=vector2d(3+Targ.targpos.x+range*sin(radian-i*(2*pi/BulLim)),
3+Targ.targpos.y-range*cos(radian-i*(2*pi/BulLim)));
- CircBul[i].bulletspr=new hgeSprite(SprSheet,72,0,24,24);
- CircBul[i].bulletspr->SetHotSpot(12,12);
- CircBul[i].bulletspr->SetColor(0x80FFFFFF);
+ CircBul[i].aC=blue;CircBul[i].aC2=COLOR_COUNT;CircBul[i].rot=0;
CircBul[i].scollable=0;
}
}
@@ -1817,7 +1834,7 @@ private:
double radian,range,DT,drad;
vector2d Centre;
public:
- void Init(double _irange,double _drad,int _Cnt,vector2d _Centre,TColors _Col=blue)
+ void Init(double _irange,double _drad,int _Cnt,vector2d _Centre,TColors _Col=blue,TColors _Col2=COLOR_COUNT)
{
range=_irange;
BCnt=_Cnt;
@@ -1830,9 +1847,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);
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);
+ Bullets[i].aC=_Col;Bullets[i].aC2=_Col2;
+ Bullets[i].rot=0;
}
}
double GetRange(){return range;}
@@ -1848,6 +1864,7 @@ 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].rot+=(LOWFPS?17:1)*pi/1000;
Bullets[i].Update_SimpBul();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 21:08:34 +0000