diff options
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/Classes/UMain.pas | 18 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 7 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSingModi.pas | 8 |
3 files changed, 6 insertions, 27 deletions
diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas index 8dd8c0a3..9b6ea3d5 100644 --- a/Game/Code/Classes/UMain.pas +++ b/Game/Code/Classes/UMain.pas @@ -45,7 +45,7 @@ type //LineBonus Mod
ScoreLast: Real;//Last Line Score
- ScorePercent: integer;//Aktual Fillstate of the SingBar
+ {ScorePercent: integer;//Aktual Fillstate of the SingBar
ScorePercentTarget: integer;//Target Fillstate of the SingBar
//end Singbar Mod
@@ -63,7 +63,7 @@ type LineBonus_TargetY: integer;
LineBonus_StartX: integer;
LineBonus_StartY: integer;
- //PhrasenBonus - Line Bonus Mod End
+ //PhrasenBonus - Line Bonus Mod End }
//PerfectLineTwinkle Mod (effect)
@@ -736,20 +736,6 @@ begin Player[PlayerNum].ScoreGolden := 0;
Player[PlayerNum].ScoreGoldenI := 0;
Player[PlayerNum].ScoreTotalI := 0;
-
-
- //SingBar Mod
- Player[PlayerNum].ScoreLast := 0;
- Player[PlayerNum].ScorePercent := 50;// Sets to 50% when song starts
- Player[PlayerNum].ScorePercentTarget := 50;// Sets to 50% when song starts
- //end SingBar Mod
-
- //PhrasenBonus - Line Bonus Mod
- Player[PlayerNum].LineBonus_Visible := False; //Hide Line Bonus
- Player[PlayerNum].LineBonus_Alpha := 0;
- Player[PlayerNum].LineBonus_TargetX := 70 + PlayerNum*500;
- Player[PlayerNum].LineBonus_TargetY := 30;
- //PhrasenBonus - Line Bonus Mod End
end;
//--------------------
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index 4e60a78b..391fdccf 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -1252,13 +1252,6 @@ begin If (Ini.LineBonus > 0) then
begin
-
- //Generate Text
- if A >= 8 then
- Player[I].LineBonus_Text := Theme.Sing.LineBonusText[8]
- else
- Player[I].LineBonus_Text := Theme.Sing.LineBonusText[Floor(A)];
-
//PhrasenBonus give Points
Player[I].ScoreLine := Player[I].ScoreLine + (1000 / (Length(Czesci[0].Czesc) - NumEmptySentences) * A / 8);
Player[I].ScoreLineI := Round(Player[I].ScoreLine / 10) * 10;
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas index 44615662..d18dd5bc 100644 --- a/Game/Code/Screens/UScreenSingModi.pas +++ b/Game/Code/Screens/UScreenSingModi.pas @@ -282,7 +282,7 @@ begin begin
if (Player[I].ScoreTotalI<=10000) then
PlayerInfo.Playerinfo[I].Score:= Player[I].ScoreTotalI;
- PlayerInfo.Playerinfo[I].Bar := Player[I].ScorePercent;
+ PlayerInfo.Playerinfo[I].Bar := Round(Scores.Players[I].RBPos * 100);
end;
end;
@@ -557,7 +557,7 @@ end; begin
if PlayerInfo.Playerinfo[I].Enabled then
begin
- PlayerInfo.Playerinfo[I].Bar := Player[I].ScorePercent;
+ //PlayerInfo.Playerinfo[I].Bar := Player[I].ScorePercent;
PlayerInfo.Playerinfo[I].Score := Player[I].ScoreTotalI;
end;
end;
@@ -582,8 +582,8 @@ end; //Player[I].ScoreTotal := Player[I].ScoreTotal + (PlayerInfo.Playerinfo[I].Score - Player[I].ScoreTotalI);
Player[I].ScoreTotalI := PlayerInfo.Playerinfo[I].Score;
end;
- if (PlayerInfo.Playerinfo[I].Bar <> Player[I].ScorePercent) then
- Player[I].ScorePercentTarget := PlayerInfo.Playerinfo[I].Bar;
+ {if (PlayerInfo.Playerinfo[I].Bar <> Player[I].ScorePercent) then
+ Player[I].ScorePercentTarget := PlayerInfo.Playerinfo[I].Bar; }
end;
// back stereo
|