diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index cc74b8e131..9042dceab8 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -954,6 +954,7 @@
+
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index 915fdddf1d..0f2a6728ca 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -2350,6 +2350,9 @@
+ This function is deprecated. Please use GetStepAttacks() instead.
+
+
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 659cfcd9d4..2710e0ea21 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -707,7 +707,8 @@ Skip=Skip
Skippy=Skippy
Slow=Slow
SN2=Supernova 2
-SongAttacks=Song Attacks
+SongAttacks=Step Attacks
+StepAttacks=Step Attacks
Song BGAnimation=Song BGAnimation
Song Bitmap=Song Bitmap
Song Movie=Song Movie
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 612548a389..0c463a9684 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2353,10 +2353,10 @@ Mines,3="mod,mines;name,Add"
Mines,4="mod,attackmines;name,AttackMines"
Attacks="3"
-AttacksDefault="mod,songattacks"
-Attacks,1="name,SongAttacks"
+AttacksDefault="mod,stepattacks"
+Attacks,1="name,StepAttacks"
Attacks,2="mod,randomattacks;name,RandomAttacks"
-Attacks,3="mod,no randomattacks,no songattacks;name,Off"
+Attacks,3="mod,no randomattacks,no stepattacks;name,Off"
PlayerAutoPlay="2"
PlayerAutoPlayDefault="mod,no playerautoplay"
diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp
index 97d4ccd7ec..76005c156b 100644
--- a/src/PlayerOptions.cpp
+++ b/src/PlayerOptions.cpp
@@ -37,7 +37,7 @@ void PlayerOptions::Init()
m_fBlind = 0; m_SpeedfBlind = 1.0f;
m_fCover = 0; m_SpeedfCover = 1.0f;
m_fRandAttack = 0; m_SpeedfRandAttack = 1.0f;
- m_fSongAttack = 1; m_SpeedfSongAttack = 1.0f;
+ m_fStepAttack = 1; m_SpeedfStepAttack = 1.0f;
m_fPlayerAutoPlay = 0; m_SpeedfPlayerAutoPlay = 1.0f;
m_bSetTiltOrSkew = false;
m_fPerspectiveTilt = 0; m_SpeedfPerspectiveTilt = 1.0f;
@@ -73,7 +73,7 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
APPROACH( fBlind );
APPROACH( fCover );
APPROACH( fRandAttack );
- APPROACH( fSongAttack );
+ APPROACH( fStepAttack );
APPROACH( fPlayerAutoPlay );
APPROACH( fPerspectiveTilt );
APPROACH( fSkew );
@@ -180,7 +180,7 @@ void PlayerOptions::GetMods( vector &AddTo, bool bForceNoteSkin ) const
AddPart( AddTo, m_fCover, "Cover" );
AddPart( AddTo, m_fRandAttack, "RandomAttacks" );
- AddPart( AddTo, m_fSongAttack, "SongAttacks" );
+ AddPart( AddTo, m_fStepAttack, "StepAttacks" );
AddPart( AddTo, m_fPlayerAutoPlay, "PlayerAutoPlay" );
AddPart( AddTo, m_fPassmark, "Passmark" );
@@ -417,7 +417,7 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
else if( sBit == "blind" ) SET_FLOAT( fBlind )
else if( sBit == "cover" ) SET_FLOAT( fCover )
else if( sBit == "randomattacks" ) SET_FLOAT( fRandAttack )
- else if( sBit == "songattacks" ) SET_FLOAT( fSongAttack )
+ else if( sBit == "stepattacks" ) SET_FLOAT( fStepAttack )
else if( sBit == "playerautoplay" ) SET_FLOAT( fPlayerAutoPlay )
else if( sBit == "passmark" ) SET_FLOAT( fPassmark )
else if( sBit == "overhead" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = 0; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
@@ -657,7 +657,7 @@ bool PlayerOptions::operator==( const PlayerOptions &other ) const
COMPARE(m_fBlind);
COMPARE(m_fCover);
COMPARE(m_fRandAttack);
- COMPARE(m_fSongAttack);
+ COMPARE(m_fStepAttack);
COMPARE(m_fPlayerAutoPlay);
COMPARE(m_fPerspectiveTilt);
COMPARE(m_fSkew);
@@ -713,7 +713,7 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps, PlayerN
if( m_bTransforms[TRANSFORM_ECHO] ) return true;
// Removing attacks is easier in general.
- if (!m_fSongAttack && !m_fRandAttack && pSong->HasAttacks())
+ if (!m_fStepAttack && !m_fRandAttack && pSteps->HasAttacks())
return true;
if( m_fCover ) return true;
@@ -961,7 +961,9 @@ public:
DEFINE_METHOD( GetBlind, m_fBlind )
DEFINE_METHOD( GetCover, m_fCover )
DEFINE_METHOD( GetRandomAttacks, m_fRandAttack )
- DEFINE_METHOD( GetSongAttacks, m_fSongAttack )
+ // This one is deprecated.
+ DEFINE_METHOD( GetSongAttacks, m_fStepAttack )
+ DEFINE_METHOD( GetStepAttacks, m_fStepAttack )
DEFINE_METHOD( GetSkew, m_fSkew )
DEFINE_METHOD( GetPassmark, m_fPassmark )
DEFINE_METHOD( GetRandomSpeed, m_fRandomSpeed )
@@ -988,6 +990,7 @@ public:
// SetSkew
ADD_METHOD( GetSongAttacks );
// SetSongAttacks
+ ADD_METHOD( GetStepAttacks );
ADD_METHOD( GetCMod );
ADD_METHOD( GetXMod );
diff --git a/src/PlayerOptions.h b/src/PlayerOptions.h
index d1c8f2ee98..8e5bb30da8 100644
--- a/src/PlayerOptions.h
+++ b/src/PlayerOptions.h
@@ -27,7 +27,7 @@ public:
m_fBlind(0), m_SpeedfBlind(1.0f),
m_fCover(0), m_SpeedfCover(1.0f),
m_fRandAttack(0), m_SpeedfRandAttack(1.0f),
- m_fSongAttack(1), m_SpeedfSongAttack(1.0f),
+ m_fStepAttack(1), m_SpeedfStepAttack(1.0f),
m_fPlayerAutoPlay(0), m_SpeedfPlayerAutoPlay(1.0f),
m_bSetTiltOrSkew(false),
m_fPerspectiveTilt(0), m_SpeedfPerspectiveTilt(1.0f),
@@ -167,7 +167,7 @@ public:
float m_fBlind, m_SpeedfBlind;
float m_fCover, m_SpeedfCover; // hide the background per-player--can't think of a good name
float m_fRandAttack, m_SpeedfRandAttack;
- float m_fSongAttack, m_SpeedfSongAttack;
+ float m_fStepAttack, m_SpeedfStepAttack;
float m_fPlayerAutoPlay, m_SpeedfPlayerAutoPlay;
bool m_bSetTiltOrSkew; // true if the tilt or skew was set by FromString
float m_fPerspectiveTilt, m_SpeedfPerspectiveTilt; // -1 = near, 0 = overhead, +1 = space
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 96e8a56354..8cec7becf5 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -821,7 +821,7 @@ void ScreenGameplay::InitSongQueues()
Steps *pSteps = GAMESTATE->m_pCurSteps[ pi->GetStepsAndTrailIndex() ];
pi->m_vpStepsQueue.push_back( pSteps );
- if( pi->GetPlayerState()->m_PlayerOptions.GetCurrent().m_fSongAttack != 0 &&
+ if( pi->GetPlayerState()->m_PlayerOptions.GetCurrent().m_fStepAttack != 0 &&
pSteps->m_Attacks.size() > 0 )
{
pi->m_asModifiersQueue.push_back( pSteps->m_Attacks );