Skip to content

Commit

Permalink
Add SCP-714 variants
Browse files Browse the repository at this point in the history
- Add Sanity Timer to Debug Hud 2
- Fix Stamina cap not draining all the way.
  • Loading branch information
SnoeGit authored and Jabka666 committed Apr 30, 2023
1 parent 0fafab9 commit 71700e0
Show file tree
Hide file tree
Showing 12 changed files with 131 additions and 64 deletions.
5 changes: 5 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ General:

- Player won't receive the crystallization effect if wearing SCP-427 and touching SCP-409.

- Add varinats of SCP-714 from SCP-914.

- Add Sanity timer to the Debug Hud 2.

Rooms:
- The door to SCP-005's containment chamber will be opened if SCP-005 appears inside SCP-409's containment chamber.
- Some design improvements.
Expand All @@ -18,6 +22,7 @@ Bug Fixes:
- Fixed an ability to open wooden doors in "cont2_1123" event.
- Fixed MAV in the Pocket Dimension throne room.
- Fixed an issue where SCP-049 achievement couldn't be obtained when using SCP-268.
- Fixed Stamina cap not draining exactly where it needs to.

v1.1.2

Expand Down
5 changes: 5 additions & 0 deletions Data/local.ini
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ kill_3 = EXCP_ACCESS_VIOLATION
kill_4 = %s found dead in Sector [DATA REDACTED]. The subject appears to have scribbled the letters "kys" in his own blood beside him. No other signs of physical trauma or struggle can be observed. Body was sent for autopsy.
superman = A Class D jumpsuit found in [DATA REDACTED]. Upon further examination, the jumpsuit was found to be filled with 12.5 kilograms of blue ash-like substance. Chemical analysis of the substance remains non-conclusive. Most likely related to SCP-914.
joint = %s found in a comatose state in [DATA REDACTED]. The subject was holding what appears to be a cigarette while smiling widely. Chemical analysis of the cigarette has been inconclusive, although it seems to contain a high concentration of an unidentified chemical whose molecular structure is remarkably similar to that of tetrahydrocannabinol.
ringsleep = %s found in a comatose state caused by an enhanced SCP-714 produced from SCP-914. Subject was terminated.
morepower = "Requesting support from MTF Nu-7. We need more firepower to take this thing down."
0081 = %s found ingesting Dr. [DATA REDACTED] at Sector [DATA REDACTED]. Subject was immediately terminated by Nine-Tailed Fox and sent for autopsy. SCP-008 infection was confirmed, after which the body was incinerated.
14991 = The whereabouts of SCP-1499 are still unknown, but a recon team has been dispatched to investigate reports of a violent attack to a church in the Russian town of [DATA REDACTED].
Expand Down Expand Up @@ -372,6 +373,8 @@ cap.off = You removed the cap.
cap.on = You put on the cap.
714.off = You removed the ring.
714.on = You put on the ring.
714.sleep = You feel a sudden need to sleep and never wake up.
714.small = The ring is too small to fit on your fingers.
suit.off = You removed the hazmat suit.
suit.on = You put on the hazmat suit.
suit.on.easy = You put on the hazmat suit and you can breathe easier.
Expand Down Expand Up @@ -505,6 +508,7 @@ docun = Unknown Note
148 = SCP-148 Ingot
joint = Joint
metalpanel = Metal Panel
ring = Green Jade Ring
smellyjoint = Smelly Joint
420j = Some SCP-420-J
500death = Upgraded Pill
Expand Down Expand Up @@ -985,6 +989,7 @@ debug_2.stamina = Stamina: %s
debug_2.stameff = Stamina Effect: %s
debug_2.stamtimer = Stamina Effect Timer: %s
debug_2.deaf = Deaf Timer: %s
debug_2.sanity = Sanity Timer: %s
debug_2.terminated = Terminated: %s
debug_2.death = Death Timer: %s
debug_2.fall = Fall Timer: %s
Expand Down
Binary file added GFX/Items/Inventory Icons/INV_scp_714_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GFX/Items/Inventory Icons/INV_scp_714_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GFX/Items/Textures/scp_714_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GFX/Items/Textures/scp_714_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 12 additions & 8 deletions Source Code/Events_Core.bb
Original file line number Diff line number Diff line change
Expand Up @@ -2091,11 +2091,11 @@ Function UpdateEvents%()
EndIf
EndIf
Next
If CoffinDistance < 4.0 And HasBatteryFor895 And (Not I_714\Using) Then
If CoffinDistance < 4.0 And HasBatteryFor895 And I_714\Using <> 2 Then
TurnEntity(me\Collider, 0.0, AngleDist(PointDirection(EntityX(me\Collider, True), EntityZ(me\Collider, True), EntityX(e\room\Objects[1], True), EntityZ(e\room\Objects[1], True)) + 90.0 + Sin(WrapAngle(e\EventState3 / 10.0)), EntityYaw(me\Collider)) / 4.0, 0.0, True)
CameraPitch = (CameraPitch * 0.8) + (((-60.0) * Min(Max((2.0 - Distance(EntityX(me\Collider, True), EntityX(e\room\Objects[1], True), EntityZ(me\Collider, True), EntityZ(e\room\Objects[1], True))) / 2.0, 0.0), 1.0)) * 0.2)

me\Sanity = me\Sanity - (fps\Factor[0] * 1.1 / (wi\NightVision + wi\SCRAMBLE))
me\Sanity = me\Sanity - ((fps\Factor[0] * 1.1 / (wi\NightVision + wi\SCRAMBLE)) / (1.0 + I_714\Using))
me\RestoreSanity = False
me\BlurTimer = Sin(MilliSecs() / 10) * Abs(me\Sanity)

Expand Down Expand Up @@ -4673,7 +4673,7 @@ Function UpdateEvents%()

UpdateRedLight(e\room\Objects[1], 1500, 800)

If (Not I_714\Using) And wi\GasMask <> 4 And wi\HazmatSuit <> 4 Then
If I_714\Using <> 2 And wi\GasMask <> 4 And wi\HazmatSuit <> 4 Then
If EntityVisible(e\room\Objects[0], Camera) Then
e\SoundCHN2 = LoopSound2(e\Sound2, e\SoundCHN2, Camera, e\room\Objects[1], 10.0, e\EventState3 / (86.0 * 70.0))

Expand Down Expand Up @@ -5083,7 +5083,7 @@ Function UpdateEvents%()
e\EventState2 = Min(e\EventState2 + (fps\Factor[0] / 6000.0), 1.0)
e\EventState3 = CurveValue(e\EventState2, e\EventState3, 50.0)

If (Not I_714\Using) And wi\HazmatSuit <> 4 And wi\GasMask <> 4 Then
If I_714\Using <> 2 And wi\HazmatSuit <> 4 And wi\GasMask <> 4 Then
me\Sanity = me\Sanity - (fps\Factor[0] * 1.1)
me\BlurTimer = Sin(MilliSecs() / 10.0) * Abs(me\Sanity)
EndIf
Expand Down Expand Up @@ -5118,7 +5118,7 @@ Function UpdateEvents%()
e\EventState3 = Max(e\EventState3 - (fps\Factor[0] / 100.0), 0.0)
EndIf

If e\EventState3 > 0.0 And (Not I_714\Using) And wi\HazmatSuit <> 4 And wi\GasMask <> 4 Then
If e\EventState3 > 0.0 And I_714\Using <> 2 And wi\HazmatSuit <> 4 And wi\GasMask <> 4 Then
e\SoundCHN = LoopSound2(e\Sound, e\SoundCHN, Camera, e\room\OBJ, 10.0, e\EventState3)
e\SoundCHN2 = LoopSound2(e\Sound2, e\SoundCHN2, Camera, e\room\OBJ, 10.0, (e\EventState3 - 0.5) * 2.0)
EndIf
Expand Down Expand Up @@ -5985,7 +5985,7 @@ Function UpdateEvents%()
Case e_cont2_1123
;[Block]
If PlayerRoom = e\room Then
If (Not I_714\Using) And wi\HazmatSuit <> 4 And wi\GasMask <> 4 Then
If I_714\Using = 0 And wi\HazmatSuit <> 4 And wi\GasMask <> 4 Then
If EntityDistanceSquared(me\Collider, e\room\Objects[0]) < 0.81 Lor e\EventState > 0.0 Then
If e\EventState = 0.0 Then me\BlurTimer = 1000.0
me\CameraShake = 1.0
Expand Down Expand Up @@ -8227,10 +8227,14 @@ Function UpdateDimension106%()

If Safe Lor chs\NoTarget Lor I_268\InvisibilityOn Then
EntityTexture(e\room\Objects[19], e\room\Textures[0])
ElseIf Dist < 64.0 And (Not I_714\Using) And wi\GasMask <> 4 And wi\HazmatSuit <> 4 Then
ElseIf Dist < 64.0 And I_714\Using <> 2 And wi\GasMask <> 4 And wi\HazmatSuit <> 4 Then
e\SoundCHN = LoopSound2(e\Sound, e\SoundCHN, Camera, e\room\Objects[19], 8.0)
EntityTexture(e\room\Objects[19], e\room\Textures[1])
InjurePlayer((8.0 - SqrValue) * (fps\Factor[0] * 0.0003))
If I_714\Using = 1 Then
InjurePlayer((8.0 - SqrValue) * (fps\Factor[0] * 0.0002))
Else
InjurePlayer((8.0 - SqrValue) * (fps\Factor[0] * 0.0003))
EndIf

If Dist < 49.0 Then
Pvt = CreatePivot()
Expand Down
26 changes: 24 additions & 2 deletions Source Code/Items_Core.bb
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@ Function RemoveWearableItems%(item.Items)
;[Block]
I_268\Using = 0
;[End Block]
Case "scp714"
Case "scp714", "coarse714"
;[Block]
I_714\Using = False
I_714\Using = 0
;[End Block]
Case "scramble", "finescramble"
;[Block]
Expand Down Expand Up @@ -1693,6 +1693,28 @@ Function Use914%(item.Items, Setting%, x#, y#, z#)
;[End Block]
End Select
;[End Block]
Case "scp714", "coarse714", "fine714", "ring"
;[Block]
Select Setting
Case ROUGH
;[Block]
de.Decals = CreateDecal(DECAL_CORROSIVE_1, x, 8.0 * RoomScale + 0.010, z, 90.0, Rnd(360.0), 0.0, 0.2, 0.8)
EntityParent(de\OBJ, PlayerRoom\OBJ)
;[End Block]
Case COARSE
;[Block]
it2.Items = CreateItem("SCP-714", "coarse714", x, y, z)
;[End Block]
Case ONETOONE
;[Block]
it2.Items = CreateItem("Green Jade Ring", "ring", x, y, z)
;[End Block]
Case FINE, VERYFINE
;[Block]
it2.Items = CreateItem("SCP-714", "fine714", x, y, z)
;[End Block]
End Select
;[End Block]
Case "scp420j", "cigarette", "joint", "scp420s"
;[Block]
Select Setting
Expand Down
4 changes: 4 additions & 0 deletions Source Code/Loading_Core.bb
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,8 @@ Function LoadItems%()
CreateItemTemplate("SCP-500", "SCP-500", "scp500", "scp_500.b3d", "INV_scp_500.png", "", 0.035, 2)
CreateItemTemplate("SCP-513", "SCP-513", "scp513", "scp_513.b3d", "INV_scp_513.png", "", 0.1, 2)
CreateItemTemplate("SCP-714", "SCP-714", "scp714", "scp_714.b3d", "INV_scp_714.png", "", 0.3, 3)
CreateItemTemplate("SCP-714", "SCP-714", "coarse714", "scp_714.b3d", "INV_scp_714_grey.png", "", 0.3, 3, "scp_714_grey.png")
CreateItemTemplate("SCP-714", "SCP-714", "fine714", "scp_714.b3d", "INV_scp_714_blue.png", "", 0.3, 3, "scp_714_blue.png")
CreateItemTemplate("SCP-860", "SCP-860", "scp860", "scp_860.b3d", "INV_scp_860.png", "", 0.003, 3)
CreateItemTemplate("SCP-1025", "SCP-1025", "scp1025", "scp_1025.b3d", "INV_scp_1025.png", "", 0.1, 0)
CreateItemTemplate("SCP-1123", "SCP-1123", "scp1123", "scp_1123.b3d", "INV_scp_1123.png", "", 0.015, 2)
Expand All @@ -810,6 +812,8 @@ Function LoadItems%()
it.ItemTemplates = CreateItemTemplate(GetLocalString("items", "500death"), "Upgraded Pill", "scp500pilldeath", "pill.b3d", "INV_scp_500_pill.png", "", 0.0001, 2)
EntityColor(it\OBJ, 255.0, 0.0, 0.0)

CreateItemTemplate(GetLocalString("items", "ring"), "Green Jade Ring", "ring", "scp_714.b3d", "INV_scp_714.png", "", 0.2, 3)

; ~ [MISC ITEMS]

CreateItemTemplate(GetLocalString("items", "helmet"), "Ballistic Helmet", "helmet", "ballistic_helmet.b3d", "INV_ballistic_helmet.png", "", 0.018, 2)
Expand Down
Loading

0 comments on commit 71700e0

Please # to comment.