From 035cb79e48ee19b2f5653ae89c28bf8ac8c31c90 Mon Sep 17 00:00:00 2001 From: drmaynard1 Date: Tue, 21 May 2024 19:10:22 +1000 Subject: [PATCH 1/4] Updated TaskSystem.bb to include new tasks --- SourceCode/TaskSystem.bb | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/SourceCode/TaskSystem.bb b/SourceCode/TaskSystem.bb index 84313ae..32e1ba8 100644 --- a/SourceCode/TaskSystem.bb +++ b/SourceCode/TaskSystem.bb @@ -11,19 +11,22 @@ Const TASK_RENDER_TIME = 70*5 Const TASK_OPENINV = 0 Const TASK_CLICKKEYCARD = 1 Const TASK_OPENDOOR = 2 -Const TASK_CHECKPOINT = 3 +Const TASK_ELECLOCATE = 3 +Const TASK_ELECFOUND = 4 +Const TASK_CHECKPOINT = 5 ;Checkpoint tasks (story mode) -Const TASK_FIXELEVATOR = 4 +Const TASK_FIXELEVATOR = 6 ;Sewers tasks (story mode) -Const TASK_FINDWEAPON = 5 -Const TASK_FINDFUSE = 6 -Const TASK_FINDFUSEBOX = 7 +Const TASK_FINDWEAPON = 7 +Const TASK_FINDFUSE = 8 +Const TASK_FINDFUSEBOX = 9 ;Checkpoint tasks (classic mode) -Const TASK_GOTOZONE = 8 -Const TASK_CONTAIN173 = 9 -Const TASK_CONTAIN106 = 10 -Const TASK_173TOCHAMBER = 11 -Const TASK_106RECALL = 12 +Const TASK_GOTOZONE = 10 +Const TASK_CONTAIN173 = 11 +Const TASK_CONTAIN106 = 12 +Const TASK_173TOCHAMBER = 13 +Const TASK_106RECALL = 14 + Type NewTask Field ID% @@ -32,7 +35,7 @@ Type NewTask Field Timer# End Type -Function BeginTask.NewTask(ID%) + Function BeginTask.NewTask(ID%) Local t.NewTask For t = Each NewTask @@ -70,6 +73,10 @@ Function BeginTask.NewTask(ID%) t\txt = GetLocalString("Tasks", "173_tochamber") Case TASK_106RECALL t\txt = GetLocalString("Tasks", "106_recall") + Case TASK_ELECLOCATE + t\txt = GetLocalString("Tasks", "elec_locate") + Case TASK_ELECFOUND + t\txt = GetLocalString("Tasks", "elec_found") End Select t\Timer = TASK_RENDER_TIME t\Status = TASK_STATUS_NEW @@ -243,4 +250,4 @@ Function DrawTasks() End Function ;~IDEal Editor Parameters: -;~C#Blitz3D \ No newline at end of file +;~C#Blitz3D From 9e4d1f74bbc98bd4e6cd0e66d1b5cfddcd91866b Mon Sep 17 00:00:00 2001 From: drmaynard1 Date: Tue, 21 May 2024 19:13:17 +1000 Subject: [PATCH 2/4] Edited Gate_A_Enterance.bb to include new tasks --- SourceCode/Rooms/Gate_A_Entrance.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SourceCode/Rooms/Gate_A_Entrance.bb b/SourceCode/Rooms/Gate_A_Entrance.bb index b355a11..47bc194 100644 --- a/SourceCode/Rooms/Gate_A_Entrance.bb +++ b/SourceCode/Rooms/Gate_A_Entrance.bb @@ -192,7 +192,7 @@ Function UpdateEvent_Gate_A_Entrance(e.Events) EndIf If e\EventState = 3 And (Not IsStreamPlaying_Strict(IntercomStreamCHN)) Then - BeginTask(TASK_CHECKPOINT) + BeginTask(TASK_ELECLOCATE) e\EventState = 4 ElseIf e\EventState = 4 And e\room\dist >= 25.0 Then If SelectedDifficulty\saveType = SAVEONSCREENS Then @@ -218,4 +218,4 @@ Function UpdateEvent_Gate_A_Entrance(e.Events) End Function ;~IDEal Editor Parameters: -;~C#Blitz3D \ No newline at end of file +;~C#Blitz3D From 32be2e69d57ce6a04a8f9dba390e4ad8aff30d3f Mon Sep 17 00:00:00 2001 From: drmaynard1 Date: Tue, 21 May 2024 19:14:48 +1000 Subject: [PATCH 3/4] Edited Electrical_Center.bb to work with new tasks --- SourceCode/Rooms/Electrical_Center.bb | 31 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/SourceCode/Rooms/Electrical_Center.bb b/SourceCode/Rooms/Electrical_Center.bb index 612f058..918447f 100644 --- a/SourceCode/Rooms/Electrical_Center.bb +++ b/SourceCode/Rooms/Electrical_Center.bb @@ -1,4 +1,3 @@ - Function FillRoom_Electrical_Center(r.Rooms) Local d.Doors,it.Items,sc.SecurityCams Local i,n @@ -21,7 +20,7 @@ Function FillRoom_Electrical_Center(r.Rooms) End Function Function UpdateEvent_Electrical_Center(e.Events) - + If PlayerRoom = e\room Then EntityPick(Camera, 1.5) @@ -31,6 +30,8 @@ Function UpdateEvent_Electrical_Center(e.Events) e\EventState = Max(e\EventState,1) PlaySound_Strict HorrorSFX[7] PlaySound_Strict LeverSFX + EndTask(TASK_ELECLOCATE) + BeginTask(TASK_ELECFOUND) EndIf EndIf @@ -47,18 +48,22 @@ Function UpdateEvent_Electrical_Center(e.Events) SecondaryLightOn = CurveValue(0.0, SecondaryLightOn, 10.0) EndIf - ;Remote Door Control - RemoteDoorOn = UpdateLever(e\room\Levers[2]\obj) - - If e\EventState > 0 And e\EventState < 200 Then - e\EventState = e\EventState + FPSfactor - RotateEntity(e\room\Levers[1]\obj, CurveValue(-80, EntityPitch(e\room\Levers[1]\obj), 5), EntityYaw(e\room\Levers[1]\obj), 0) - EndIf - - EndIf - + ; Remote Door Control + RemoteDoorOn = UpdateLever(e\room\Levers[2]\obj) + If RemoteDoorOn Then + If e\EventState > 0 And e\EventState < 200 Then + EndTask(TASK_ELEFOUND) + e\EventState = e\EventState + FPSfactor + RotateEntity(e\room\Levers[1]\obj, CurveValue(-80, EntityPitch(e\room\Levers[1]\obj), 5), EntityYaw(e\room\Levers[1]\obj), 0) + EndIf + Else + EndTask(TASK_ELECFOUND) ; Ensure TASK_ELECFOUND is ended when RemoteDoorOn is False - drmaynard + BeginTask(TASK_CHECKPOINT) ; Now we simply go to the next task - drmynard + EndIf + + EndIf End Function ;~IDEal Editor Parameters: ;~F#1#16 -;~C#Blitz3D \ No newline at end of file +;~C#Blitz3D From d35492741478369dfcacc4d807c2285348f5f6a3 Mon Sep 17 00:00:00 2001 From: drmaynard1 Date: Tue, 21 May 2024 19:16:48 +1000 Subject: [PATCH 4/4] Updated local.ini to include text for new tasks --- Data/local.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Data/local.ini b/Data/local.ini index 3467fbb..65882cb 100644 --- a/Data/local.ini +++ b/Data/local.ini @@ -426,4 +426,6 @@ to_zone=Use the elevator to go to the Light or Heavy Containment Zone. contain_173=Find SCP-173 to start the containment procedure. contain_106=Find SCP-106's containment chamber. 173_tochamber=Bring SCP-173 to it's containment chamber. -106_recall=Execute Recall Protocol RP-106-N. \ No newline at end of file +106_recall=Execute Recall Protocol RP-106-N. +elec_locate=Find the Electrical Room. +elec_found=Disable the Remote Door Control System.