(hopefully) cleaned everything else

This commit is contained in:
Andrew "Akari" Alexeyew 2012-08-04 04:25:43 +03:00
parent fff1998e83
commit 60a0b3e2a1
3 changed files with 16 additions and 8 deletions

View file

@ -127,7 +127,8 @@ int collision_item(Item *i) {
}
inline void spawn_item(complex pos, Type type) {
create_item(pos, 5*cexp(I*tsrand()/frand()*M_PI*2), type);
tsrand_fill(2);
create_item(pos, 5*cexp(I*tsrand_a(0)/frand(1)*M_PI*2), type);
}
void spawn_items(complex pos, int point, int power, int bomb, int life) {

View file

@ -98,19 +98,23 @@ int youmu_slash(Enemy *e, int t) {
global.plr.pos = VIEWPORT_W + (VIEWPORT_H - 100)*I - exp(-_i/8.0+log(4*VIEWPORT_W/5.0));
FROM_TO(30, 60, 10) {
create_particle1c("youmu_slice", VIEWPORT_W/2.0 - 150 + 100*_i + VIEWPORT_H/2.0*I - 10-10I + 20*frand()+20I*frand(), NULL, Slice, timeout, 200)->angle = -10.0+20.0*frand();
tsrand_fill(3);
create_particle1c("youmu_slice", VIEWPORT_W/2.0 - 150 + 100*_i + VIEWPORT_H/2.0*I - 10-10I + 20*afrand(0)+20I*afrand(1), NULL, Slice, timeout, 200)->angle = -10.0+20.0*afrand(2);
}
FROM_TO(40,200,1)
if(frand() > 0.7)
create_particle2c("blast", VIEWPORT_W*frand() + (VIEWPORT_H+50)*I, rgb(frand(),frand(),frand()), Shrink, timeout_linear, 80, 3*(1-2.0*frand())-14I+frand()*2I);
if(frand() > 0.7) {
tsrand_fill(6);
create_particle2c("blast", VIEWPORT_W*afrand(0) + (VIEWPORT_H+50)*I, rgb(afrand(1),afrand(2),afrand(3)), Shrink, timeout_linear, 80, 3*(1-2.0*afrand(4))-14I+afrand(5)*2I);
}
int tpar = 30;
if(t < 30)
tpar = t;
if(t < creal(e->args[0])-60 && frand() > 0.2) {
create_particle2c("smoke", VIEWPORT_W*frand() + (VIEWPORT_H+100)*I, rgba(0.4,0.4,0.4,frand()*0.2 - 0.2 + 0.6*(tpar/30.0)), PartDraw, spin, 300, -7I+frand()*1I);
tsrand_fill(3);
create_particle2c("smoke", VIEWPORT_W*afrand(0) + (VIEWPORT_H+100)*I, rgba(0.4,0.4,0.4,afrand(1)*0.2 - 0.2 + 0.6*(tpar/30.0)), PartDraw, spin, 300, -7I+afrand(2)*1I);
}
return 1;
}
@ -164,11 +168,13 @@ int youmu_split(Enemy *e, int t) {
TIMER(&t);
FROM_TO(30,260,1) {
create_particle2c("smoke", VIEWPORT_W/2 + VIEWPORT_H/2*I, rgba(0.4,0.4,0.4,frand()*0.2+0.4), PartDraw, spin, 300, 6*cexp(I*frand()*2*M_PI));
tsrand_fill(2);
create_particle2c("smoke", VIEWPORT_W/2 + VIEWPORT_H/2*I, rgba(0.4,0.4,0.4,afrand(0)*0.2+0.4), PartDraw, spin, 300, 6*cexp(I*afrand(1)*2*M_PI));
}
FROM_TO(100,220,10) {
create_particle1c("youmu_slice", VIEWPORT_W/2.0 + VIEWPORT_H/2.0*I - 200-200I + 400*frand()+400I*frand(), NULL, Slice, timeout, 100-_i)->angle = 360.0*frand();
tsrand_fill(3);
create_particle1c("youmu_slice", VIEWPORT_W/2.0 + VIEWPORT_H/2.0*I - 200-200I + 400*afrand(0)+400I*afrand(1), NULL, Slice, timeout, 100-_i)->angle = 360.0*afrand(2);
}
float talt = atan((t-e->args[0]/2)/30.0)*10+atan(-e->args[0]/2);

View file

@ -398,6 +398,7 @@ void Petal(Projectile *p, int t) {
void petal_explosion(int n, complex pos) {
int i;
for(i = 0; i < n; i++) {
create_particle4c("petal", pos, rgba(0.6,1-frand()*0.4,0.5,1-0.5*frand()), Petal, asymptotic, (3+5*frand())*cexp(I*M_PI*2*frand()), 5, frand() + frand()*I, frand() + 360I*frand());
tsrand_fill(8);
create_particle4c("petal", pos, rgba(0.6,1-afrand(0)*0.4,0.5,1-0.5*afrand(1)), Petal, asymptotic, (3+5*afrand(2))*cexp(I*M_PI*2*afrand(3)), 5, afrand(4) + afrand(5)*I, afrand(6) + 360I*afrand(7));
}
}