Skip to content

Commit

Permalink
Removed leftover bits of the SCP-066 achievement (the addition of thi…
Browse files Browse the repository at this point in the history 
…s new achievements was reverted in accc960, but these changes were accidentally left in). #251
  • Loading branch information
@Regalis11
Regalis11 committed Sep 25, 2023
1 parent e60536b commit 75eee99
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
Binary file removed GFX/menu/achievements/Achv066.jpg
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions NPCs.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3919,10 +3919,6 @@ Function UpdateNPCs()

If Rand(700)=1 Then PlaySound2(LoadTempSound("SFX\SCP\066\Eric"+Rand(1,3)+".ogg"),Camera, n\Collider, 8.0)

If dist < 1.0+n\LastDist Then
GiveAchievement(Achv066)
n\State = Rand(2,3)
EndIf
Case 2 ;roll towards the player and make a sound, and then escape
If n\Frame < 647 Then
angle = CurveAngle(0, (AnimTime(n\obj)-2.0)/1.2445, 5.0)
Expand Down

3 comments on commit 75eee99

@ChronoQuote
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, you removed the whole block... some of that code was part of 066's AI.

Also there's technically one more change yet to be reverted, made in Main.bb. See 58062ae.

Alternatively you could merge #258 or #200 which reintroduce the achievement changes but without save compatibility issues. I've already updated both PRs to also revert this commit.

@Regalis11
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops. :/ I don't see what more there's to revert in Main.bb?

@ChronoQuote
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops. :/ I don't see what more there's to revert in Main.bb?

For i = 0 To 24 in DrawEnding was changed to For i = Achv008 To Achv1499 because all the SCP-related achievements were moved to the front of the achievement list, which is where they're supposed to be for the "SCPs encountered" stat to work. But now that the 1499 achievement is back to being in a spot further in the achievement list, this loop will count some achievements that aren't related to SCPs, resulting in an incorrect "SCPs encountered" stat.

Be sure to add the 066 AI stuff back in if you do revert that change. The block of code removed by this commit was previously just If dist < 1.0+n\LastDist Then n\State = Rand(2,3).

Please sign in to comment.