From 463bf1cb5059e14b3af73adf0037a9ae8a5dcd2c Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Sun, 25 Sep 2011 14:32:18 -0500 Subject: Fuzzy Bear and Mr.Sun fixes/improvements --- src/mrsun.cpp | 167 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 133 insertions(+), 34 deletions(-) (limited to 'src/mrsun.cpp') diff --git a/src/mrsun.cpp b/src/mrsun.cpp index 19b5902..01ab485 100755 --- a/src/mrsun.cpp +++ b/src/mrsun.cpp @@ -34,18 +34,21 @@ class daMrSun_c : public dEn_c { int dying; char sunDying; + u64 eventFlag; + + void dieFall_Execute(); static daMrSun_c *build(); void updateModelMatrices(); -// void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther); -// void yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther); + void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther); USING_STATES(daMrSun_c); DECLARE_STATE(Follow); @@ -71,6 +74,8 @@ extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char r extern "C" dStageActor_c *GetSpecificPlayerActor(int number); +int NearestPlayer(daMrSun_c *Sprite); +float PlayertoSpriteDistance(Vec sprite, Vec player); CREATE_STATE(daMrSun_c, Follow); CREATE_STATE(daMrSun_c, Swoop); @@ -83,16 +88,34 @@ CREATE_STATE(daMrSun_c, Wait); #define DEACTIVATE 0 +struct EventTable_t { + u64 events; + // ... +}; + +extern EventTable_t *EventTable; + + + +void daMrSun_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { + this->_vf220(apOther->owner); + OSReport("I hit Mario."); +} + void daMrSun_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Fireball"); } -void daMrSun_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { +bool daMrSun_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Iceball"); - if (this->settings == 0) { // It's a sun - if (this->sunDying == 5) { - this->isDead = 1; - doStateChange(&StateID_DieIceVanish); } - else { - this->sunDying = this->sunDying + 1; } - } } + + if (this->settings == 1) { // It's a moon + OSReport("What Kind is it?: %d", apOther->owner->name); + if (apOther->owner->name == 0x76) { // BROS_ICEBALL + OSReport("No hits 4 u."); + return true; + } + } + OSReport("K it hit."); + return false; +} void daMrSun_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Rolling Object"); this->timer = 0; @@ -101,13 +124,17 @@ void daMrSun_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOt OSReport("Hit Hammer"); this->timer = 0; doStateChange(&StateID_DieFall); } -void daMrSun_c::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Yoshi Fire"); } +void daMrSun_c::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther) { + OSReport("Hit StarMario"); + this->timer = 0; + doStateChange(&StateID_DieFall); } +void daMrSun_c::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Groundpound"); } + void daMrSun_c::dieFall_Execute() { this->timer = this->timer + 1; - this->dying = this->dying + 0.15; @@ -132,6 +159,7 @@ void daMrSun_c::dieFall_Execute() { doStateChange(&StateID_Follow); } this->pos.y = this->Baseline; + this->aPhysics.addToList(); doStateChange(&StateID_Follow); } } @@ -141,7 +169,7 @@ int daMrSun_c::onCreate() { OSReport("Creating the Mr.Sun Models"); allocator.link(-1, GameHeaps[0], 0, 0x20); - if (this->settings == 0) { // It's a sun + if ((this->settings & 0xF) == 0) { // It's a sun hasGlow = true; nw4r::g3d::ResFile rf(getResource("bilikyu", "g3d/sun.brres")); @@ -158,9 +186,6 @@ int daMrSun_c::onCreate() { nw4r::g3d::ResFile rf(getResource("bilikyu", "g3d/moon.brres")); bodyModel.setup(rf.GetResMdl("Moon"), &allocator, 0x224, 1, 0); SetupTextures_Map(&bodyModel, 0); - -// glowModel.setup(rf.GetResMdl("MoonGlow"), &allocator, 0x224, 1, 0); -// SetupTextures_Map(&glowModel, 0); } allocator.unlink(); @@ -173,17 +198,19 @@ int daMrSun_c::onCreate() { ActivePhysics::Info HitMeBaby; HitMeBaby.xDistToCenter = 0.0; HitMeBaby.yDistToCenter = 0.0; - HitMeBaby.xDistToEdge = 16.0; - HitMeBaby.yDistToEdge = 16.0; HitMeBaby.category1 = 0x3; HitMeBaby.category2 = 0x0; - HitMeBaby.bitfield1 = 0x4F; + HitMeBaby.bitfield1 = 0x6F; - if (this->settings == 0) { // It's a sun - HitMeBaby.bitfield2 = 0x3E020C; // Can be hit by iceballs of all kinds, shells and rollies, pipe cannons, and star power + if ((this->settings & 0xF) == 0) { // It's a sun + HitMeBaby.bitfield2 = 0xffbafffc; + HitMeBaby.xDistToEdge = 24.0; + HitMeBaby.yDistToEdge = 24.0; } else { // It's a moon - HitMeBaby.bitfield2 = 0x3E0200; // Can be hit by fireballs of all kinds, shells and rollies, pipe cannons, and star power + HitMeBaby.bitfield2 = 0xffbafffe; + HitMeBaby.xDistToEdge = 12.0; + HitMeBaby.yDistToEdge = 12.0; } HitMeBaby.unkShort1C = 0; @@ -207,6 +234,14 @@ int daMrSun_c::onCreate() { this->sunDying = 0; this->pos.z = 3300.00; + + + char eventNum = (this->settings >> 16) & 0xFF; + OSReport("Event to activate: %d", eventNum); + + this->eventFlag = (u64)1 << (eventNum - 1); + + OSReport("Setting Mr.Sun's State"); doStateChange(&StateID_Follow); @@ -224,9 +259,69 @@ int daMrSun_c::onExecute() { //OSReport("Oh Mr.Sun, Sun, Mr.Golden Sun"); acState.execute(); updateModelMatrices(); + if (this->aPhysics.result1 == 1) { + char PlayerID = NearestPlayer(this); + dStageActor_c *Player = GetSpecificPlayerActor(PlayerID); + + this->_vf220(Player); + } + + if (EventTable->events & this->eventFlag) { + this->kill(); + this->pos.y = this->pos.y + 800.0; + } + return true; } +int NearestPlayer(daMrSun_c *Sprite) { + float pfloat[] = { 0.0, 0.0, 0.0, 0.0 }; + float max = 1000000.0; + char maxPlayer = 5; + int i; + OSReport("FINDING NEAREST PLAYER"); + + for (i=0; i<4; i++) { + OSReport("K, let's check out Player %d", i); + dStageActor_c *Player = GetSpecificPlayerActor(i); + if (Player != 0) { + OSReport("Player %d exists", i); + pfloat[i] = PlayertoSpriteDistance(Sprite->pos, Player->pos); + + OSReport("if %f > %f", pfloat[i], max); + if (pfloat[i] < max) { + max = pfloat[i]; + maxPlayer = i; + OSReport("MaxPlayer now %d", i); + } + } + } + + OSReport("MaxPlayer finalized at %d", i); + + return maxPlayer; +} + +float PlayertoSpriteDistance(Vec sprite, Vec player) { + float x = sprite.x - player.x; + float y = sprite.y - player.y; + + float x2 = x * x; + float y2 = y * y; + + float returnval = x2+y2; + + OSReport("X: (%f - %f)^2 = %f", sprite.x, player.x, x2); + OSReport("Y: (%f - %f)^2 = %f", sprite.y, player.y, y2); + + + if (returnval < 0) { returnval = -returnval; } + + OSReport("Return: %f", returnval); + + return returnval; +} + int daMrSun_c::onDraw() { bodyModel.scheduleForDrawing(); if (hasGlow) @@ -282,10 +377,10 @@ void daMrSun_c::executeState_Follow() { this->direction = dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(this, this->pos); float speedDelta; - if (this->settings == 0) { speedDelta = 0.1; } // It's a sun + if ((this->settings & 0xF) == 0) { speedDelta = 0.1; } // It's a sun else { speedDelta = 0.15; } // It's a moon - OSReport("Speed: %f", this->speed.x); +// OSReport("Speed: %f", this->speed.x); if (this->direction == 0) { this->speed.x = this->speed.x + speedDelta; @@ -328,7 +423,7 @@ void daMrSun_c::beginState_Swoop() { if (this->swoopTarget.y < (this->pos.y - 50)) { doStateChange(&StateID_Spit); } if (((this->pos.x - 96) < this->swoopTarget.x) && (this->swoopTarget.x < (this->pos.x + 96))) { doStateChange(&StateID_Spit); } - if (this->settings == 0) { + if ((this->settings & 0xF) == 0) { this->swoopTarget.y = this->swoopTarget.y - 16; } // It's a sun @@ -392,7 +487,7 @@ void daMrSun_c::executeState_Spiral() { Magnitude = 11.0; // Use a period of 0.1 for the moon - if (this->settings == 0) { Period = 0.1; } // It's a sun + if ((this->settings & 0xF) == 0) { Period = 0.1; } // It's a sun else { Period = 0.125; } // It's a moon this->pos.x = this->xSpiralOffset + Magnitude*((this->SpiralLoop * cos(this->SpiralLoop))); @@ -424,7 +519,7 @@ void daMrSun_c::executeState_Spit() { if (this->direction == 0) { neg = 1.0; } - if (this->settings == 0) { + if ((this->settings & 0xF) == 0) { dStageActor_c *spawner = CreateActor(106, 0, this->pos, 0, 0); spawner->speed.x = 6.0 * neg; spawner->speed.y = -2.5; @@ -447,16 +542,19 @@ void daMrSun_c::executeState_Spit() { spawner->speed.x = 6.0 * neg; spawner->speed.y = -2.5; spawner->pos.z = 3350.0; + *((u32 *) (((char *) spawner) + 0x3DC)) = this->id; spawner = CreateActor(118, 0, this->pos, 0, 0); spawner->speed.x = 0.0 * neg; spawner->speed.y = -6.0; spawner->pos.z = 3350.0; + *((u32 *) (((char *) spawner) + 0x3DC)) = this->id; spawner = CreateActor(118, 0, this->pos, 0, 0); spawner->speed.x = 3.5 * neg; spawner->speed.y = -6.0; spawner->pos.z = 3350.0; + *((u32 *) (((char *) spawner) + 0x3DC)) = this->id; } // It's a moon } @@ -557,7 +655,7 @@ void daMrSun_c::executeState_Spin() { ylaunch = -5.0; } - if (this->settings == 0) { + if ((this->settings & 0xF) == 0) { dStageActor_c *spawner = CreateActor(106, 0, this->pos, 0, 0); spawner->speed.x = xlaunch; spawner->speed.y = ylaunch; @@ -569,6 +667,8 @@ void daMrSun_c::executeState_Spin() { spawner->speed.x = xlaunch; spawner->speed.y = ylaunch; spawner->pos.z = 3350.0; + + *((u32 *) (((char *) spawner) + 0x3DC)) = this->id; } // It's a moon } @@ -608,15 +708,14 @@ void daMrSun_c::executeState_Wait() { int Choice; int TimerMax; - if (this->settings == 0) { TimerMax = 20; } // It's a sun + if ((this->settings & 0xF) == 0) { TimerMax = 20; } // It's a sun else { TimerMax = 15; } // It's a moon if (this->timer > TimerMax) { -// doStateChange(&StateID_Spit); - Choice = GenerateRandomNumber(7); + Choice = GenerateRandomNumber(9); - OSReport("Choice: %d", Choice); +// OSReport("Choice: %d", Choice); if (Choice == 0) { doStateChange(&StateID_Spit); } else if (Choice == 1) { doStateChange(&StateID_Spit); } -- cgit v1.2.3