diff --git a/Graphics/characters/SpongeBob_Net/AnimList.Txt b/Graphics/characters/SpongeBob_Net/AnimList.Txt index 1e8e5b3b5..199ddd435 100644 --- a/Graphics/characters/SpongeBob_Net/AnimList.Txt +++ b/Graphics/characters/SpongeBob_Net/AnimList.Txt @@ -18,6 +18,5 @@ GetHit CrouchDown CrouchUp LookUp -IdleNet IdleWeapon Celebrate \ No newline at end of file diff --git a/source/player/player.cpp b/source/player/player.cpp index 276121097..de91ac54e 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -353,7 +353,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLENOFACE, -//NOIDLE ANIM_SPONGEBOB_NET_IDLENET, // ANIM_SPONGEBOB_IDLENET, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_NET_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -394,7 +393,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLENOFACE, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_CORALBLOWER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -435,7 +433,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLENOFACE, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_JELLYLAUNCHER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -476,7 +473,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLENOFACE, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_WAND_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -517,7 +513,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLENOFACE, -//NOIDLE ANIM_SPONGEBOB_JELLYFISH_IDLENET, // ANIM_SPONGEBOB_IDLENET, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_JELLYFISH_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -558,7 +553,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLENOFACE, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index 0b77e6601..24fc92128 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -266,6 +266,7 @@ void CPlayerModeCoralBlower::think() } CPadVibrationManager::setVibration(0,CPadVibrationManager::VIBE_CORAL_BLOWER_SUCK); } + setState(STATE_IDLE); // Re-enter idle state - stops idle anims happening :/ break; case BLOWER_STATE__FULL: if(getPadInputDown()&PI_FIRE&&getState()==STATE_IDLE) @@ -325,6 +326,7 @@ void CPlayerModeCoralBlower::think() if(m_launchHeading>BLOWER_MAXIMUM_AIM_ANGLE)m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE; } } + setState(STATE_IDLE); // Re-enter idle state - stops idle anims happening :/ break; } } diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index 4ea5148a4..3e9db4235 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -243,7 +243,7 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode) if(finished) { int animNo; - if(m_idleTime<5) + if(m_idleTime<2) { // Run the default idle anim a number of times before // starting to do weird things.. @@ -254,7 +254,7 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode) // Alternate random idle anims with the default one if(m_currentIdleAnim==0&&getNumIdleAnims()>1) { - m_currentIdleAnim=getRndRange(getNumIdleAnims()); + m_currentIdleAnim=getRndRange(getNumIdleAnims()-1)+1; } else { @@ -293,7 +293,7 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode) static IdleAnims s_unarmedIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default + { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 }, @@ -324,7 +324,7 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims() static IdleAnims s_weaponIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default + { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, @@ -350,7 +350,7 @@ int CPlayerStateWeaponIdle::getNumIdleAnims() static IdleAnims s_netIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default + { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },