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

stage3: deadly dance fixes

Browse source
This commit is contained in:
Andrei Alexeyev 2022-11-02 18:12:49 +01:00
parent f85aa25c00
commit b5710faa04
No known key found for this signature in database
GPG key ID: 72D26128040B9690
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/stages/stage3/spells/deadly_dance.c
View file

@ -14,8 +14,6 @@
#include "common_tasks.h"
#include "global.h"
MODERNIZE_THIS_FILE_AND_REMOVE_ME
TASK(deadly_dance_proj, { BoxedProjectile p; int t; int i; }) {
Projectile *p = TASK_BIND(ARGS.p);
@ -32,7 +30,9 @@ TASK(deadly_dance_proj, { BoxedProjectile p; int t; int i; }) {
DEFINE_EXTERN_TASK(stage3_spell_deadly_dance) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.08);
BEGIN_BOSS_ATTACK(&ARGS);
boss->move.attraction = 0;
aniplayer_queue(&boss->ani, "dance", 0);
int intensity = difficulty_value(15, 18, 21, 24);
@ -44,14 +44,14 @@ DEFINE_EXTERN_TASK(stage3_spell_deadly_dance) {
DECLARE_ENT_ARRAY(Projectile, projs, intensity*2);
real angle_ofs = rng_f32() * M_PI * 2;
double t = time * 1.5 * (0.4 + 0.3 * global.diff);
double moverad = fmin(160, time/2.7);
real t = time * 1.5 * (0.4 + 0.3 * global.diff);
real moverad = fmin(160, time/2.7);
boss->pos = VIEWPORT_W/2 + VIEWPORT_H*I/2 + sin(t/50.0) * moverad * cdir(M_PI_2 * t/100.0);
if(!(time % 70)) {
for(i = 0; i < intensity; ++i) {
double a = (M_PI/(5 + global.diff) * i * 2);
real a = (M_PI/(5 + global.diff) * i * 2);
ENT_ARRAY_ADD(&projs, PROJECTILE(
.proto = pp_wave,
.pos = boss->pos,
@ -83,7 +83,7 @@ DEFINE_EXTERN_TASK(stage3_spell_deadly_dance) {
if(!(time % 3)) {
for(i = -1; i < 2; i += 2) {
double c = psin(time/10.0);
real c = psin(time/10.0);
PROJECTILE(
.proto = pp_crystal,
.pos = boss->pos,

2
src/stages/stage3/timeline.c
View file

@ -595,7 +595,7 @@ DEFINE_EXTERN_TASK(stage3_timeline) {
INVOKE_TASK_DELAYED(2390, swarm_trail_fairy, VIEWPORT_W+20 + VIEWPORT_H*0.24*I, move_linear(-9));
INVOKE_TASK_DELAYED(2450, swarm_trail_fairy, -20 + VIEWPORT_H*0.32*I, move_linear( 9));
INVOKE_TASK_DELAYED(3400, common_call_func, stage_load_quicksave);
// INVOKE_TASK_DELAYED(3400, common_call_func, stage_load_quicksave);
STAGE_BOOKMARK_DELAYED(2500, pre-midboss);