80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

move and rename scythe_nonspell_common task

Browse source
This commit is contained in:
laochailan 2021-09-25 08:39:24 +02:00 • committed by Andrei Alexeyev
parent 6a58fea718
commit 657345cce6
No known key found for this signature in database
GPG key ID: 72D26128040B9690
5 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/stages/stage6/elly.c
View file

@ -97,41 +97,6 @@ DEFINE_EXTERN_TASK(stage6_elly_scythe_spin) {
}
}
DEFINE_EXTERN_TASK(stage6_elly_scythe_nonspell) {
EllyScythe *scythe = TASK_BIND(ARGS.scythe);
cmplx center = VIEWPORT_W/2.0 + 200.0 * I;
scythe->move = move_towards(center, 0.1);
WAIT(40);
scythe->move.retention = 0.9;
for(int t = 0;; t++) {
play_sfx_loop("shot1_loop");
real theta = 0.01 * t * (1 + 0.001 * t) + M_PI/2;
scythe->pos = center + 200 * cos(theta) * (1 + sin(theta) * I) / (1 + pow(sin(theta), 2));
scythe->angle = 0.2 * t * (1 + 0*0.001 * t);
cmplx dir = cdir(scythe->angle);
real vel = difficulty_value(1.4, 1.8, 2.2, 2.6);
cmplx color_dir = cdir(3 * theta);
if(t > 50) {
PROJECTILE(
.proto = pp_ball,
.pos = scythe->pos + 60 * dir * cdir(1.2),
.color = RGB(creal(color_dir), cimag(color_dir), creal(color_dir * cdir(2.1))),
.move = move_accelerated(0, 0.01 *vel * dir),
);
}
YIELD;
}
}
static void baryons_connector_particles(cmplx a, cmplx b) {
Sprite *spr = res_sprite("stage6/baryon_connector");

1
src/stages/stage6/elly.h
View file

@ -43,7 +43,6 @@ Boss *stage6_elly_init_scythe_attack(ScytheAttackTaskArgs *args);
// duration < 0 means infinite duration
DECLARE_EXTERN_TASK(stage6_elly_scythe_spin, { BoxedEllyScythe scythe; real angular_velocity; int duration; });
DECLARE_EXTERN_TASK(stage6_elly_scythe_nonspell, { BoxedEllyScythe scythe; });
#define NUM_BARYONS 6

38
src/stages/stage6/nonspells/boss_nonspell_1.c
View file

@ -11,13 +11,49 @@
#include "nonspells.h"
#include "../elly.h"
DEFINE_EXTERN_TASK(stage6_boss_nonspell_scythe_common) {
EllyScythe *scythe = TASK_BIND(ARGS.scythe);
cmplx center = VIEWPORT_W/2.0 + 200.0 * I;
scythe->move = move_towards(center, 0.1);
WAIT(40);
scythe->move.retention = 0.9;
for(int t = 0;; t++) {
play_sfx_loop("shot1_loop");
real theta = 0.01 * t * (1 + 0.001 * t) + M_PI/2;
scythe->pos = center + 200 * cos(theta) * (1 + sin(theta) * I) / (1 + pow(sin(theta), 2));
scythe->angle = 0.2 * t * (1 + 0*0.001 * t);
cmplx dir = cdir(scythe->angle);
real vel = difficulty_value(1.4, 1.8, 2.2, 2.6);
cmplx color_dir = cdir(3 * theta);
if(t > 50) {
PROJECTILE(
.proto = pp_ball,
.pos = scythe->pos + 60 * dir * cdir(1.2),
.color = RGB(creal(color_dir), cimag(color_dir), creal(color_dir * cdir(2.1))),
.move = move_accelerated(0, 0.01 *vel * dir),
);
}
YIELD;
}
}
DEFINE_EXTERN_TASK(stage6_boss_nonspell_1) {
STAGE_BOOKMARK(boss-non1);
stage6_elly_init_scythe_attack(&ARGS);
BEGIN_BOSS_ATTACK(&ARGS.base);
INVOKE_SUBTASK(stage6_elly_scythe_nonspell, ARGS.scythe);
INVOKE_SUBTASK(stage6_boss_nonspell_scythe_common, ARGS.scythe);
STALL;
}

2
src/stages/stage6/nonspells/boss_nonspell_2.c
View file

@ -17,7 +17,7 @@ DEFINE_EXTERN_TASK(stage6_boss_nonspell_2) {
BEGIN_BOSS_ATTACK(&ARGS.base);
aniplayer_queue(&boss->ani, "snipsnip", 0);
INVOKE_SUBTASK(stage6_elly_scythe_nonspell, ARGS.scythe);
INVOKE_SUBTASK(stage6_boss_nonspell_scythe_common, ARGS.scythe);
int interval = difficulty_value(3, 3, 2, 2);

1
src/stages/stage6/nonspells/nonspells.h
View file

@ -15,6 +15,7 @@
#include "stages/stage6/elly.h"
DECLARE_EXTERN_TASK(stage6_boss_nonspell_scythe_common, { BoxedEllyScythe scythe; });
DECLARE_EXTERN_TASK(stage6_boss_nonspell_baryons_common, { BoxedEllyBaryons baryons; });
DECLARE_EXTERN_TASK_WITH_INTERFACE(stage6_boss_nonspell_1, ScytheAttack);