implement event loading, load all sounds, add step sounds
This commit is contained in:
parent
30c4a321d9
commit
df41dc7686
GPG key ID:
B8583C4B7D18119E
28 changed files with 11149 additions and 133 deletions
|
|
@ -3,6 +3,8 @@
|
|||
[ext_resource type="Script" uid="uid://c4vf0qbhcfk1p" path="res://src/LoadingScreen.gd" id="1_grr4e"]
|
||||
|
||||
[node name="LoadingScreen" type="Control"]
|
||||
z_index = 4096
|
||||
z_as_relative = false
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
|
|
@ -11,6 +13,16 @@ grow_horizontal = 2
|
|||
grow_vertical = 2
|
||||
script = ExtResource("1_grr4e")
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="."]
|
||||
z_index = -4
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
color = Color(0, 0, 0, 1)
|
||||
|
||||
[node name="Background" type="TextureRect" parent="."]
|
||||
visible = false
|
||||
z_index = -1
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
[gd_scene load_steps=3 format=3 uid="uid://bc46lc1tdvrio"]
|
||||
[gd_scene load_steps=4 format=3 uid="uid://bc46lc1tdvrio"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b08xfsygxqj6a" path="res://src/DynamicMap.gd" id="1_mytgt"]
|
||||
[ext_resource type="Script" uid="uid://pga6iqmmq4w0" path="res://src/EventSystem.gd" id="2_vb526"]
|
||||
|
||||
[sub_resource type="Environment" id="Environment_d5g72"]
|
||||
background_mode = 1
|
||||
|
|
@ -11,5 +12,8 @@ sdfgi_use_occlusion = true
|
|||
[node name="DynamicMap" type="Node3D"]
|
||||
script = ExtResource("1_mytgt")
|
||||
|
||||
[node name="EventSystem" type="Node" parent="."]
|
||||
script = ExtResource("2_vb526")
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||
environment = SubResource("Environment_d5g72")
|
||||
|
|
|
|||
|
|
@ -17,3 +17,16 @@ const gridsz = 19 # Same size as the main map itself (better for the map creator
|
|||
const RoomScale = 8.0 / 2048.0
|
||||
|
||||
const HideDistance = 15
|
||||
|
||||
const SAFE = 0
|
||||
const EUCLID = 1
|
||||
const KETER = 2
|
||||
const CUSTOM = 3
|
||||
|
||||
const SAVEANYWHERE = 0
|
||||
const SAVEONQUIT = 1
|
||||
const SAVEONSCREENS = 2
|
||||
|
||||
const EASY = 0
|
||||
const NORMAL = 1
|
||||
const HARD = 2
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@ func EntityParent(obj: Node, parent: Node):
|
|||
else:
|
||||
obj.reparent(parent, true)
|
||||
|
||||
func EntityDistance(ent1: Node3D, ent2: Node3D):
|
||||
return ent1.global_position.distance_to(ent2.global_position)
|
||||
|
||||
func ScaleEntity(obj: Node3D, x: float, y: float, z: float):
|
||||
if obj == null:
|
||||
pass
|
||||
|
|
@ -224,7 +227,7 @@ func UpdateDoors():
|
|||
var temp = Node3D.new()
|
||||
add_child(temp)
|
||||
#PositionEntity(temp, EntityX(Camera), EntityY(Camera), EntityZ(Camera))
|
||||
PointEntity(temp, d.buttons[i])
|
||||
#TODO: UNCOMMENT!!! PointEntity(temp, d.buttons[i])
|
||||
|
||||
#if EntityPick(temp, 0.6) == d.buttons[i]:
|
||||
#If ClosestButton = 0 Then
|
||||
|
|
@ -403,19 +406,7 @@ func UpdateParticles():
|
|||
p.pvt.queue_free()
|
||||
particles.erase(p)
|
||||
|
||||
# TODO: Remove when real loader is in!!
|
||||
var ParticleTextures = [
|
||||
load(Utils.GetCaseiFileName("GFX/smoke.png")),
|
||||
load(Utils.GetCaseiFileName("GFX/flash.jpg")),
|
||||
load(Utils.GetCaseiFileName("GFX/dust.jpg")),
|
||||
load(Utils.GetCaseiFileName("GFX/npcs/hg.pt")),
|
||||
load(Utils.GetCaseiFileName("GFX/map/sun.jpg")),
|
||||
load(Utils.GetCaseiFileName("GFX/bloodsprite.png")),
|
||||
load(Utils.GetCaseiFileName("GFX/smoke2.png")),
|
||||
load(Utils.GetCaseiFileName("GFX/spark.jpg")),
|
||||
load(Utils.GetCaseiFileName("GFX/particle.png"))
|
||||
]
|
||||
|
||||
var ParticleTextures = []
|
||||
var DecalTextures = []
|
||||
|
||||
var MenuOpen = false
|
||||
|
|
@ -429,6 +420,8 @@ var CanSave = false
|
|||
var SelectedScreen = null
|
||||
var SelectedDoor: Door = null
|
||||
var UpdateDoorsTimer: float = 0.0
|
||||
var QuickLoadPercent: int = -1
|
||||
var RemoteDoorOn: bool = false
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if not MenuOpen and not InvOpen and OtherOpen == null and SelectedDoor == null and not ConsoleOpen and not Using294 and SelectedScreen == null and EndingTimer >= 0:
|
||||
|
|
@ -467,9 +460,8 @@ func _process(delta: float) -> void:
|
|||
#UpdateRoomLights(Camera)
|
||||
#Else
|
||||
UpdateDoors()
|
||||
#If QuickLoadPercent = -1 Or QuickLoadPercent = 100
|
||||
#UpdateEvents()
|
||||
#EndIf
|
||||
if QuickLoadPercent == -1 or QuickLoadPercent == 100:
|
||||
eventSystem.UpdateEvents()
|
||||
#UpdateScreens()
|
||||
#TimeCheckpointMonitors()
|
||||
#Update294()
|
||||
|
|
@ -578,7 +570,123 @@ func CreateEmitter(x: float, y: float, z: float, emittertype: int) -> Emitter:
|
|||
emitters.push_back(e)
|
||||
return e
|
||||
|
||||
var OpenDoorSFX: Array = Utils.Init2DArray(3, 3)
|
||||
var CloseDoorSFX: Array = Utils.Init2DArray(3, 3)
|
||||
|
||||
var KeyCardSFX1: AudioStream
|
||||
var KeyCardSFX2: AudioStream
|
||||
var ButtonSFX2: AudioStream
|
||||
var ScannerSFX1: AudioStream
|
||||
var ScannerSFX2: AudioStream
|
||||
|
||||
var OpenDoorFastSFX: AudioStream
|
||||
var CautionSFX: AudioStream
|
||||
|
||||
var NuclearSirenSFX: AudioStream
|
||||
|
||||
var CameraSFX: AudioStream
|
||||
|
||||
var StoneDragSFX: AudioStream
|
||||
|
||||
var GunshotSFX: AudioStream
|
||||
var Gunshot2SFX: AudioStream
|
||||
var Gunshot3SFX: AudioStream
|
||||
var BullethitSFX: AudioStream
|
||||
|
||||
var TeslaIdleSFX: AudioStream
|
||||
var TeslaActivateSFX: AudioStream
|
||||
var TeslaPowerUpSFX: AudioStream
|
||||
|
||||
var MagnetUpSFX: AudioStream
|
||||
var MagnetDownSFX: AudioStream
|
||||
var FemurBreakerSFX: AudioStream
|
||||
var EndBreathCHN: AudioStream
|
||||
var EndBreathSFX: AudioStream
|
||||
|
||||
var DecaySFX = Utils.Init1DArray(5)
|
||||
|
||||
var BurstSFX: AudioStream
|
||||
|
||||
var RustleSFX = Utils.Init1DArray(3)
|
||||
|
||||
var Use914SFX: AudioStream
|
||||
var Death914SFX: AudioStream
|
||||
|
||||
var DripSFX = Utils.Init1DArray(4)
|
||||
|
||||
var LeverSFX: AudioStream
|
||||
var LightSFX: AudioStream
|
||||
var ButtGhostSFX: AudioStream
|
||||
|
||||
var RadioSFX = Utils.Init2DArray(5, 10)
|
||||
|
||||
var RadioSquelch: AudioStream
|
||||
var RadioStatic: AudioStream
|
||||
var RadioBuzz: AudioStream
|
||||
|
||||
var ElevatorBeepSFX: AudioStream
|
||||
var ElevatorMoveSFX: AudioStream
|
||||
|
||||
var PickSFX = Utils.Init1DArray(10)
|
||||
|
||||
var AmbientSFXCHN: AudioStream
|
||||
var CurrAmbientSFX: AudioStream
|
||||
var AmbientSFXAmount = Utils.Init1DArray(6)
|
||||
|
||||
var AmbientSFX = Utils.Init2DArray(6, 15)
|
||||
|
||||
var OldManSFX = Utils.Init1DArray(8)
|
||||
|
||||
var Scp173SFX = Utils.Init1DArray(3)
|
||||
|
||||
var HorrorSFX = Utils.Init1DArray(20)
|
||||
|
||||
var IntroSFX = Utils.Init1DArray(20)
|
||||
|
||||
# IntroSFX(13) = LoadSound_Strict("SFX\intro\shoot1.ogg")
|
||||
# IntroSFX(14) = LoadSound_Strict("SFX\intro\shoot2.ogg")
|
||||
|
||||
|
||||
var AlarmSFX = Utils.Init1DArray(5)
|
||||
|
||||
var CommotionState = Utils.Init1DArray(25)
|
||||
|
||||
var HeartBeatSFX: AudioStream
|
||||
|
||||
var VomitSFX: AudioStream
|
||||
|
||||
var BreathSFX = Utils.Init2DArray(2, 5)
|
||||
|
||||
var NeckSnapSFX = Utils.Init1DArray(3)
|
||||
|
||||
var DamageSFX = Utils.Init1DArray(9)
|
||||
|
||||
var MTFSFX = Utils.Init1DArray(8)
|
||||
|
||||
var CoughSFX = Utils.Init1DArray(3)
|
||||
#Global CoughCHN%, VomitCHN%
|
||||
|
||||
var MachineSFX: AudioStream
|
||||
var ApacheSFX: AudioStream
|
||||
#var CurrStepSFX
|
||||
var StepSFX = Utils.Init3DArray(5, 2, 8) # (normal/metal, walk/run, id)
|
||||
|
||||
var Step2SFX = Utils.Init1DArray(6)
|
||||
|
||||
var eventSystem: EventSystem
|
||||
|
||||
func _ready() -> void:
|
||||
# 0 = light containment, 1 = heavy containment, 2 = entrance
|
||||
AmbientSFXAmount[0] = 8
|
||||
AmbientSFXAmount[1] = 11
|
||||
AmbientSFXAmount[2] = 12
|
||||
# 3 = general, 4 = pre-breach
|
||||
AmbientSFXAmount[3] = 15
|
||||
AmbientSFXAmount[4] = 5
|
||||
# 5 = forest
|
||||
AmbientSFXAmount[5] = 10
|
||||
|
||||
eventSystem = $EventSystem
|
||||
OtherOpen = load("res://scenes/screens/LoadWorld.tscn").instantiate()
|
||||
add_child(OtherOpen)
|
||||
#add_child(RMesh.LoadRMesh("GFX\\map\\gatea_opt.rmesh", RoomTemplate.new()))
|
||||
|
|
@ -606,13 +714,13 @@ var I_Zone: MapZones = MapZones.new()
|
|||
var RandomSeed: String = ""
|
||||
var SelectedEnding: String = ""
|
||||
|
||||
var MapWidth = Main.options.get("options").get("map size").to_int()
|
||||
var MapHeight = Main.options.get("options").get("map size").to_int()
|
||||
@onready var MapWidth = Global.options.get("options").get("map size").to_int()
|
||||
@onready var MapHeight = Global.options.get("options").get("map size").to_int()
|
||||
|
||||
const HideDistance = 15.0
|
||||
|
||||
var MapTemp = Utils.Init2DArray(MapWidth + 1, MapHeight + 1, 0)
|
||||
var MapFound = Utils.Init2DArray(MapWidth + 1, MapHeight + 1, 0)
|
||||
@onready var MapTemp = Utils.Init2DArray(MapWidth + 1, MapHeight + 1, 0)
|
||||
@onready var MapFound = Utils.Init2DArray(MapWidth + 1, MapHeight + 1, 0)
|
||||
|
||||
var RoomTempID = 0
|
||||
var RoomAmbience = Utils.Init1DArray(20)
|
||||
|
|
@ -4467,7 +4575,7 @@ func LoadRoomTemplates(file: String):
|
|||
i += 1
|
||||
|
||||
var MapRoom: Array
|
||||
var MapName = Utils.Init2DArray(MapWidth, MapHeight, "")
|
||||
@onready var MapName = Utils.Init2DArray(MapWidth, MapHeight, "")
|
||||
var MapRoomID = Utils.Init1DArray(Constants.ROOM4 + 1, 0)
|
||||
|
||||
func GetZone(y):
|
||||
|
|
@ -4554,6 +4662,8 @@ func CalculateRoomExtents(r: Room):
|
|||
|
||||
print("roomextents: ", r.MinX, ", ", r.MinY, ", ", r.MinZ, ", ", r.MaxX, ", ", r.MaxY, ", ", r.MaxZ)
|
||||
|
||||
var mapMade: bool = false
|
||||
|
||||
var loadedRoomMeshes: int = 0
|
||||
func LoadRoomMesh(rt: RoomTemplate):
|
||||
var path = Utils.GetCaseiFileName(str("res://", rt.objPath.replace("\\", "/"))).replace("res://", "")
|
||||
|
|
@ -5317,3 +5427,4 @@ func CreateMap():
|
|||
r1.AdjDoor[3] = r2.AdjDoor[1]
|
||||
if (r1.Adjacent[0] != null) and (r1.Adjacent[1] != null) and (r1.Adjacent[2] != null) and (r1.Adjacent[3] != null):
|
||||
break
|
||||
mapMade = true
|
||||
|
|
|
|||
10409
src/EventSystem.gd
Normal file
10409
src/EventSystem.gd
Normal file
File diff suppressed because it is too large
Load diff
1
src/EventSystem.gd.uid
Normal file
1
src/EventSystem.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://pga6iqmmq4w0
|
||||
|
|
@ -4,9 +4,9 @@ var skipIntro = false
|
|||
|
||||
func _ready() -> void:
|
||||
DisplayServer.window_set_title(str("SCP - Containment Breach v", Global.GAME_VERSION))
|
||||
var width = Main.options.get("options").get("width").to_int()
|
||||
var height = Main.options.get("options").get("height").to_int()
|
||||
var fullscreen = Main.options.get("options").get("fullscreen").to_lower() == "true"
|
||||
var width = Global.options.get("options").get("width").to_int()
|
||||
var height = Global.options.get("options").get("height").to_int()
|
||||
var fullscreen = Global.options.get("options").get("fullscreen").to_lower() == "true"
|
||||
DisplayServer.window_set_max_size(Vector2i(width, height))
|
||||
DisplayServer.window_set_min_size(Vector2i(width, height))
|
||||
var window = get_window()
|
||||
|
|
|
|||
125
src/Global.gd
125
src/Global.gd
|
|
@ -109,26 +109,125 @@ var EnableVRam: int
|
|||
var NavImages: Array = Utils.Init1DArray(5, null)
|
||||
|
||||
var MusicVolume: float = 1.0
|
||||
var SFXVolume: float = 1.0
|
||||
var PlayerSoundVolume: float = 0
|
||||
|
||||
var materials: Dictionary
|
||||
func StepSoundFromTexture(textureName: String):
|
||||
if materials.has(textureName):
|
||||
if materials[textureName].has("stepsound"):
|
||||
return INI.GetInt(materials[textureName], "stepsound")
|
||||
return 0
|
||||
|
||||
# TODO: Set SFX volume!
|
||||
func PlayTempSound(path: String):
|
||||
func PlayTempSound(path) -> AudioStreamPlayer:
|
||||
var audioPlayer = AudioStreamPlayer.new()
|
||||
add_child(audioPlayer)
|
||||
audioPlayer.connect("finished", func():
|
||||
audioPlayer.queue_free()
|
||||
)
|
||||
if path is String:
|
||||
audioPlayer.stream = LoadAudio(path)
|
||||
elif path is AudioStream:
|
||||
audioPlayer.stream = path
|
||||
audioPlayer.play()
|
||||
return audioPlayer
|
||||
|
||||
func PlayTempSound3D(path: String, targetPos: Node3D):
|
||||
var audioPlayer = AudioStreamPlayer3D.new()
|
||||
add_child(audioPlayer)
|
||||
audioPlayer.global_position = targetPos.global_position
|
||||
audioPlayer.connect("finished", func():
|
||||
audioPlayer.queue_free()
|
||||
)
|
||||
audioPlayer.stream = LoadAudio(path)
|
||||
audioPlayer.play()
|
||||
return audioPlayer
|
||||
|
||||
func PlaySound2(path: String, cam: Node3D, entity: Node3D, range: float = 10, volume: float = 1.0):
|
||||
range = max(range, 1.0)
|
||||
|
||||
var audioPlayer = PlayTempSound3D(path, entity)
|
||||
if volume > 0:
|
||||
var dist: float = cam.global_position.distance_to(entity.global_position) / range
|
||||
if 1.0 - dist > 0.0 and 1.0 - dist < 1.0:
|
||||
audioPlayer.volume_db = linear_to_db(volume * (1 - dist) * SFXVolume)
|
||||
else:
|
||||
audioPlayer.stop()
|
||||
|
||||
return audioPlayer
|
||||
|
||||
var musicSystem: MusicSystem
|
||||
|
||||
var options: Dictionary
|
||||
|
||||
var difficulties: Array = Utils.Init1DArray(4)
|
||||
|
||||
var SelectedDifficulty: Difficulty
|
||||
|
||||
func _ready():
|
||||
#BumpEnabled = GetINIInt("options.ini", "options", "bump mapping enabled")
|
||||
#Brightness = GetINIFloat("options.ini", "options", "brightness")
|
||||
#HUDenabled = GetINIInt("options.ini", "options", "HUD enabled")
|
||||
#CameraFogNear = GetINIFloat("options.ini", "options", "camera fog near")
|
||||
#CameraFogFar = GetINIFloat("options.ini", "options", "camera fog far")
|
||||
#MouseSens = GetINIFloat("options.ini", "options", "mouse sensitivity")
|
||||
#EnableVRam = GetINIInt("options.ini", "options", "enable vram")
|
||||
options = INI.Load("res://options.ini")
|
||||
materials = INI.Load("res://Data/materials.ini")
|
||||
|
||||
musicSystem = MusicSystem.new()
|
||||
add_child(musicSystem)
|
||||
var optionsSection = options["options"]
|
||||
BumpEnabled = INI.GetInt(optionsSection, "bump mapping enabled")
|
||||
Brightness = INI.GetFloat(optionsSection, "brightness")
|
||||
HUDenabled = INI.GetInt(optionsSection, "HUD enabled")
|
||||
CameraFogNear = INI.GetFloat(optionsSection, "camera fog near")
|
||||
CameraFogFar = INI.GetFloat(optionsSection, "camera fog far")
|
||||
MouseSens = INI.GetFloat(optionsSection, "mouse sensitivity")
|
||||
EnableVRam = INI.GetInt(optionsSection, "enable vram")
|
||||
|
||||
MusicVolume = INI.GetFloat(options["audio"], "music volume")
|
||||
SFXVolume = INI.GetFloat(options["audio"], "sound volume")
|
||||
|
||||
difficulties[Constants.SAFE] = Difficulty.new()
|
||||
difficulties[Constants.SAFE].name = "Safe"
|
||||
difficulties[Constants.SAFE].description = "The game can be saved any time. However, as in the case of SCP Objects, a Safe classification does not mean that handling it does not pose a threat."
|
||||
difficulties[Constants.SAFE].permaDeath = false
|
||||
difficulties[Constants.SAFE].aggressiveNPCs = 0
|
||||
difficulties[Constants.SAFE].saveType = Constants.SAVEANYWHERE
|
||||
difficulties[Constants.SAFE].otherFactors = Constants.EASY
|
||||
difficulties[Constants.SAFE].r = 120
|
||||
difficulties[Constants.SAFE].g = 150
|
||||
difficulties[Constants.SAFE].b = 50
|
||||
|
||||
difficulties[Constants.EUCLID] = Difficulty.new()
|
||||
difficulties[Constants.EUCLID].name = "Euclid"
|
||||
difficulties[Constants.EUCLID].description = "In Euclid difficulty, saving is only allowed at specific locations marked by lit up computer screens. " + "Euclid-class objects are inherently unpredictable, so that reliable containment is not always possible."
|
||||
difficulties[Constants.EUCLID].permaDeath = false
|
||||
difficulties[Constants.EUCLID].aggressiveNPCs = 0
|
||||
difficulties[Constants.EUCLID].saveType = Constants.SAVEONSCREENS
|
||||
difficulties[Constants.EUCLID].otherFactors = Constants.NORMAL
|
||||
difficulties[Constants.EUCLID].r = 200
|
||||
difficulties[Constants.EUCLID].g = 200
|
||||
difficulties[Constants.EUCLID].b = 0
|
||||
|
||||
difficulties[Constants.KETER] = Difficulty.new()
|
||||
difficulties[Constants.KETER].name = "Keter"
|
||||
difficulties[Constants.KETER].description = "Keter-class objects are considered the most dangerous ones in Foundation containment. " + "The same can be said for this difficulty level: the SCPs are more aggressive, and you have only one life - when you die, the game is over. "
|
||||
difficulties[Constants.KETER].permaDeath = true
|
||||
difficulties[Constants.KETER].aggressiveNPCs = 1
|
||||
difficulties[Constants.KETER].saveType = Constants.SAVEONQUIT
|
||||
difficulties[Constants.KETER].otherFactors = Constants.HARD
|
||||
difficulties[Constants.KETER].r = 200
|
||||
difficulties[Constants.KETER].g = 0
|
||||
difficulties[Constants.KETER].b = 0
|
||||
|
||||
difficulties[Constants.CUSTOM] = Difficulty.new()
|
||||
difficulties[Constants.CUSTOM].name = "Custom"
|
||||
difficulties[Constants.CUSTOM].permaDeath = false
|
||||
difficulties[Constants.CUSTOM].aggressiveNPCs = 1
|
||||
difficulties[Constants.CUSTOM].saveType = Constants.SAVEANYWHERE
|
||||
difficulties[Constants.CUSTOM].customizable = true
|
||||
difficulties[Constants.CUSTOM].otherFactors = Constants.EASY
|
||||
difficulties[Constants.CUSTOM].r = 255
|
||||
difficulties[Constants.CUSTOM].g = 255
|
||||
difficulties[Constants.CUSTOM].b = 255
|
||||
|
||||
SelectedDifficulty = difficulties[Constants.SAFE]
|
||||
|
||||
MusicCHN.name = "MusicCHN"
|
||||
add_child(MusicCHN)
|
||||
|
|
@ -156,12 +255,12 @@ var PrevTime = 0
|
|||
func _process(delta):
|
||||
#FPSfactor = delta * 1000
|
||||
|
||||
#FPSfactor = max(min(delta * 70, 5.0), 0.2)
|
||||
FPSfactor = max(min(delta * 70, 5.0), 0.2)
|
||||
#print(max(min(delta * 70, 5.0), 0.2))
|
||||
CurTime = Time.get_ticks_usec()
|
||||
ElapsedTime = (CurTime - PrevTime) / 1000000.0
|
||||
PrevTime = CurTime
|
||||
FPSfactor = max(min(ElapsedTime * 70, 5.0), 0.2)
|
||||
#CurTime = Time.get_ticks_usec()
|
||||
#ElapsedTime = (CurTime - PrevTime) / 1000000.0
|
||||
#PrevTime = CurTime
|
||||
#FPSfactor = max(min(ElapsedTime * 70, 5.0), 0.2)
|
||||
|
||||
if Engine.time_scale == 0:
|
||||
FPSfactor = 0
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ func _ready() -> void:
|
|||
|
||||
$SelectionList.connect("selection_changed", func(resolutionRaw: String):
|
||||
var resSplit = resolutionRaw.split("x")
|
||||
Main.options.get("options")["width"] = resSplit[0]
|
||||
Main.options.get("options")["height"] = resSplit[1]
|
||||
Global.options.get("options")["width"] = resSplit[0]
|
||||
Global.options.get("options")["height"] = resSplit[1]
|
||||
)
|
||||
$Launch.connect("clicked", func():
|
||||
get_tree().change_scene_to_file("res://scenes/screens/GameStartup.tscn")
|
||||
|
|
|
|||
198
src/LoadAllSounds.gd
Normal file
198
src/LoadAllSounds.gd
Normal file
|
|
@ -0,0 +1,198 @@
|
|||
class_name LoadAllSounds
|
||||
|
||||
static func Go(map: DynamicMap):
|
||||
# Dim OpenDoorSFX%(3,3), CloseDoorSFX%(3,3)
|
||||
for i in range(3):
|
||||
map.OpenDoorSFX[0][i] = Global.LoadAudio(str("SFX/Door/DoorOpen", (i + 1), ".ogg"))
|
||||
map.CloseDoorSFX[0][i] = Global.LoadAudio(str("SFX/Door/DoorClose", (i + 1), ".ogg"))
|
||||
map.OpenDoorSFX[2][i] = Global.LoadAudio(str("SFX/Door/Door2Open", (i + 1), ".ogg"))
|
||||
map.CloseDoorSFX[2][i] = Global.LoadAudio(str("SFX/Door/Door2Close", (i + 1), ".ogg"))
|
||||
map.OpenDoorSFX[3][i] = Global.LoadAudio(str("SFX/Door/ElevatorOpen", (i + 1), ".ogg"))
|
||||
map.CloseDoorSFX[3][i] = Global.LoadAudio(str("SFX/Door/ElevatorClose", (i + 1), ".ogg"))
|
||||
|
||||
for i in range(2):
|
||||
map.OpenDoorSFX[1][i] = Global.LoadAudio(str("SFX/Door/BigDoorOpen", (i + 1), ".ogg"))
|
||||
map.CloseDoorSFX[1][i] = Global.LoadAudio(str("SFX/Door/BigDoorClose", (i + 1), ".ogg"))
|
||||
|
||||
map.KeyCardSFX1 = Global.LoadAudio("SFX/Interact/KeyCardUse1.ogg")
|
||||
map.KeyCardSFX2 = Global.LoadAudio("SFX/Interact/KeyCardUse2.ogg")
|
||||
map.ButtonSFX2 = Global.LoadAudio("SFX/Interact/Button2.ogg")
|
||||
map.ScannerSFX1 = Global.LoadAudio("SFX/Interact/ScannerUse1.ogg")
|
||||
map.ScannerSFX2 = Global.LoadAudio("SFX/Interact/ScannerUse2.ogg")
|
||||
|
||||
map.OpenDoorFastSFX = Global.LoadAudio("SFX/Door/DoorOpenFast.ogg")
|
||||
map.CautionSFX = Global.LoadAudio("SFX/Room/LockroomSiren.ogg")
|
||||
|
||||
# NuclearSirenSFX%
|
||||
|
||||
map.CameraSFX = Global.LoadAudio("SFX/General/Camera.ogg")
|
||||
|
||||
map.StoneDragSFX = Global.LoadAudio("SFX/SCP/173/StoneDrag.ogg")
|
||||
|
||||
map.GunshotSFX = Global.LoadAudio("SFX/General/Gunshot.ogg")
|
||||
map.Gunshot2SFX = Global.LoadAudio("SFX/General/Gunshot2.ogg")
|
||||
map.Gunshot3SFX = Global.LoadAudio("SFX/General/BulletMiss.ogg")
|
||||
map.BullethitSFX = Global.LoadAudio("SFX/General/BulletHit.ogg")
|
||||
|
||||
map.TeslaIdleSFX = Global.LoadAudio("SFX/Room/Tesla/Idle.ogg")
|
||||
map.TeslaActivateSFX = Global.LoadAudio("SFX/Room/Tesla/WindUp.ogg")
|
||||
map.TeslaPowerUpSFX = Global.LoadAudio("SFX/Room/Tesla/PowerUp.ogg")
|
||||
|
||||
map.MagnetUpSFX = Global.LoadAudio("SFX/Room/106Chamber/MagnetUp.ogg")
|
||||
map.MagnetDownSFX = Global.LoadAudio("SFX/Room/106Chamber/MagnetDown.ogg")
|
||||
# FemurBreakerSFX%
|
||||
# EndBreathCHN%
|
||||
# EndBreathSFX%
|
||||
|
||||
# Dim DecaySFX%(5)
|
||||
for i in range(4):
|
||||
map.DecaySFX[i] = Global.LoadAudio(str("SFX/SCP/106/Decay", i, ".ogg"))
|
||||
|
||||
map.BurstSFX = Global.LoadAudio("SFX/Room/TunnelBurst.ogg")
|
||||
|
||||
# DrawLoading(20, True)
|
||||
|
||||
# Dim RustleSFX%(3)
|
||||
for i in range(3):
|
||||
map.RustleSFX[i] = Global.LoadAudio(str("SFX/SCP/372/Rustle", i, ".ogg"))
|
||||
|
||||
map.Death914SFX = Global.LoadAudio("SFX/SCP/914/PlayerDeath.ogg")
|
||||
map.Use914SFX = Global.LoadAudio("SFX/SCP/914/PlayerUse.ogg")
|
||||
|
||||
# Dim DripSFX%(4)
|
||||
for i in range(4):
|
||||
map.DripSFX[i] = Global.LoadAudio(str("SFX/Character/D9341/BloodDrip", i, ".ogg"))
|
||||
|
||||
map.LeverSFX = Global.LoadAudio("SFX/Interact/LeverFlip.ogg")
|
||||
map.LightSFX = Global.LoadAudio("SFX/General/LightSwitch.ogg")
|
||||
|
||||
map.ButtGhostSFX = Global.LoadAudio("SFX/SCP/Joke/789J.ogg")
|
||||
|
||||
# Dim RadioSFX(5,10)
|
||||
map.RadioSFX[1][0] = Global.LoadAudio("SFX/Radio/RadioAlarm.ogg")
|
||||
map.RadioSFX[1][1] = Global.LoadAudio("SFX/Radio/RadioAlarm2.ogg")
|
||||
for i in range(9):
|
||||
map.RadioSFX[2][i] = Global.LoadAudio(str("SFX/Radio/scpradio", i, ".ogg"))
|
||||
|
||||
map.RadioSquelch = Global.LoadAudio("SFX/Radio/squelch.ogg")
|
||||
map.RadioStatic = Global.LoadAudio("SFX/Radio/static.ogg")
|
||||
map.RadioBuzz = Global.LoadAudio("SFX/Radio/buzz.ogg")
|
||||
|
||||
map.ElevatorBeepSFX = Global.LoadAudio("SFX/General/Elevator/Beep.ogg")
|
||||
map.ElevatorMoveSFX = Global.LoadAudio("SFX/General/Elevator/Moving.ogg")
|
||||
|
||||
# Dim PickSFX%(10)
|
||||
for i in range(4):
|
||||
map.PickSFX[i] = Global.LoadAudio(str("SFX/Interact/PickItem", i, ".ogg"))
|
||||
|
||||
# AmbientSFXCHN%
|
||||
# CurrAmbientSFX%
|
||||
# Dim AmbientSFXAmount(6)
|
||||
# 0 = light containment, 1 = heavy containment, 2 = entrance
|
||||
map.AmbientSFXAmount[0] = 11
|
||||
map.AmbientSFXAmount[1] = 11
|
||||
map.AmbientSFXAmount[2] = 12
|
||||
# 3 = general, 4 = pre-breach
|
||||
map.AmbientSFXAmount[3] = 15
|
||||
map.AmbientSFXAmount[4] = 5
|
||||
# 5 = forest
|
||||
map.AmbientSFXAmount[5] = 10
|
||||
|
||||
# Dim AmbientSFX%(6, 15)
|
||||
|
||||
# Dim OldManSFX%(6)
|
||||
for i in range(3):
|
||||
map.OldManSFX[i] = Global.LoadAudio(str("SFX/SCP/106/Corrosion", (i + 1), ".ogg"))
|
||||
|
||||
map.OldManSFX[3] = Global.LoadAudio("SFX/SCP/106/Laugh.ogg")
|
||||
map.OldManSFX[4] = Global.LoadAudio("SFX/SCP/106/Breathing.ogg")
|
||||
map.OldManSFX[5] = Global.LoadAudio("SFX/Room/PocketDimension/Enter.ogg")
|
||||
for i in range(3):
|
||||
map.OldManSFX[6 + i] = Global.LoadAudio(str("SFX/SCP/106/WallDecay", (i + 1), ".ogg"))
|
||||
|
||||
|
||||
# Dim Scp173SFX%(3)
|
||||
for i in range(3):
|
||||
map.Scp173SFX[i] = Global.LoadAudio(str("SFX/SCP/173/Rattle", (i + 1), ".ogg"))
|
||||
|
||||
# Dim HorrorSFX%(20)
|
||||
for i in range(12):
|
||||
map.HorrorSFX[i] = Global.LoadAudio(str("SFX/Horror/Horror", i, ".ogg"))
|
||||
|
||||
for i in range(14, 16):
|
||||
map.HorrorSFX[i] = Global.LoadAudio(str("SFX/Horror/Horror", i, ".ogg"))
|
||||
|
||||
# DrawLoading(25, True)
|
||||
|
||||
# Dim IntroSFX%(20)
|
||||
|
||||
for i in range(7, 10):
|
||||
map.IntroSFX[i] = Global.LoadAudio(str("SFX/Room/Intro/Bang", (i - 6), ".ogg"))
|
||||
|
||||
for i in range(10, 13):
|
||||
map.IntroSFX[i] = Global.LoadAudio(str("SFX/Room/Intro/Light", (i - 9), ".ogg"))
|
||||
|
||||
# IntroSFX(13) = Global.LoadAudio("SFX\intro\shoot1.ogg")
|
||||
# IntroSFX(14) = Global.LoadAudio("SFX\intro\shoot2.ogg")
|
||||
map.IntroSFX[15] = Global.LoadAudio("SFX/Room/Intro/173Vent.ogg")
|
||||
|
||||
# Dim AlarmSFX%(5)
|
||||
map.AlarmSFX[0] = Global.LoadAudio("SFX/Alarm/Alarm.ogg")
|
||||
# AlarmSFX(1) = Global.LoadAudio("SFX\Alarm\Alarm2.ogg")
|
||||
map.AlarmSFX[2] = Global.LoadAudio("SFX/Alarm/Alarm3.ogg")
|
||||
|
||||
# room_gw alarms
|
||||
map.AlarmSFX[3] = Global.LoadAudio("SFX/Alarm/Alarm4.ogg")
|
||||
map.AlarmSFX[4] = Global.LoadAudio("SFX/Alarm/Alarm5.ogg")
|
||||
|
||||
# Dim CommotionState%(23)
|
||||
|
||||
map.HeartBeatSFX = Global.LoadAudio("SFX/Character/D9341/Heartbeat.ogg")
|
||||
|
||||
# VomitSFX%
|
||||
|
||||
# Dim BreathSFX(2,5)
|
||||
# BreathCHN%
|
||||
for i in range(0, 5):
|
||||
map.BreathSFX[0][i] = Global.LoadAudio(str("SFX/Character/D9341/breath", i, ".ogg"))
|
||||
map.BreathSFX[1][i] = Global.LoadAudio(str("SFX/Character/D9341/breath", i, "gas.ogg"))
|
||||
|
||||
|
||||
# Dim NeckSnapSFX(3)
|
||||
for i in range(0, 3):
|
||||
map.NeckSnapSFX[i] = Global.LoadAudio(str("SFX/SCP/173/NeckSnap", (i + 1), ".ogg"))
|
||||
|
||||
# Dim DamageSFX%(9)
|
||||
for i in range(0, 9):
|
||||
map.DamageSFX[i] = Global.LoadAudio(str("SFX/Character/D9341/Damage", (i + 1), ".ogg"))
|
||||
|
||||
# Dim MTFSFX%(8)
|
||||
|
||||
# Dim CoughSFX%(3)
|
||||
# CoughCHN%
|
||||
# VomitCHN%
|
||||
for i in range(0, 3):
|
||||
map.CoughSFX[i] = Global.LoadAudio(str("SFX/Character/D9341/Cough", (i + 1), ".ogg"))
|
||||
|
||||
map.MachineSFX = Global.LoadAudio("SFX/SCP/914/Refining.ogg")
|
||||
|
||||
map.ApacheSFX = Global.LoadAudio("SFX/Character/Apache/Propeller.ogg")
|
||||
|
||||
# CurrStepSFX
|
||||
# Dim StepSFX%(4, 2, 8) ;(normal/metal, walk/run, id)
|
||||
for i in range(0, 8):
|
||||
map.StepSFX[0][0][i] = Global.LoadAudio(str("SFX/Step/Step", (i + 1), ".ogg"))
|
||||
map.StepSFX[1][0][i] = Global.LoadAudio(str("SFX/Step/StepMetal", (i + 1), ".ogg"))
|
||||
map.StepSFX[0][1][i] = Global.LoadAudio(str("SFX/Step/Run", (i + 1), ".ogg"))
|
||||
map.StepSFX[1][1][i] = Global.LoadAudio(str("SFX/Step/RunMetal", (i + 1), ".ogg"))
|
||||
if i < 3:
|
||||
map.StepSFX[2][0][i] = Global.LoadAudio(str("SFX/Character/MTF/Step", (i + 1), ".ogg"))
|
||||
map.StepSFX[3][0][i] = Global.LoadAudio(str("SFX/SCP/049/Step", (i + 1), ".ogg"))
|
||||
|
||||
if i < 4:
|
||||
map.StepSFX[4][0][i] = Global.LoadAudio(str("SFX/Step/SCP/StepSCP", (i + 1), ".ogg")) # new one 1.3.9
|
||||
|
||||
# Dim Step2SFX(6)
|
||||
for i in range(0, 3):
|
||||
map.Step2SFX[i] = Global.LoadAudio(str("SFX/Step/StepPD", (i + 1), ".ogg"))
|
||||
map.Step2SFX[i + 3] = Global.LoadAudio(str("SFX/Step/StepForest", (i + 1), ".ogg"))
|
||||
1
src/LoadAllSounds.gd.uid
Normal file
1
src/LoadAllSounds.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://bq5s2xnh5mlyh
|
||||
|
|
@ -20,10 +20,9 @@ func loadThread():
|
|||
|
||||
#Include "dreamfilter.bb"
|
||||
|
||||
Global.MusicVolume = INI.GetFloat(Main.options["audio"], "music volume")
|
||||
Global.MusicCHN.stream = Global.LoadAudio("SFX/Music/"+ str(Global.Music[2]) + ".ogg")
|
||||
Global.MusicCHN.stream.loop = true
|
||||
#Global.MusicCHN.volume_linear = Global.MusicVolume
|
||||
Global.MusicCHN.volume_db = linear_to_db(Global.MusicVolume)
|
||||
Global.MusicCHN.play.call_deferred()
|
||||
|
||||
loadingScreen.LoadProgress(10)
|
||||
|
|
@ -69,7 +68,7 @@ func loadThread():
|
|||
|
||||
var nomore = false
|
||||
func _process(delta: float) -> void:
|
||||
if not nomore and loadingScreen.loaded and Input.is_anything_pressed():
|
||||
if not nomore and loadingScreen.loaded and Input.is_action_just_pressed("ui_accept"):
|
||||
nomore = true
|
||||
get_tree().change_scene_to_file("res://scenes/screens/MainMenu.tscn")
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,13 @@ func _ready():
|
|||
|
||||
var thread: Thread
|
||||
func nextFrame():
|
||||
thread = Thread.new()
|
||||
thread.start(loadThread)
|
||||
#thread = Thread.new()
|
||||
#thread.start(loadThread)
|
||||
loadThread()
|
||||
|
||||
func loadThread():
|
||||
LoadAllSounds.Go(map)
|
||||
|
||||
#Local i%, de.Decals, d.Doors, it.Items, r.Rooms, sc.SecurityCams, e.Events
|
||||
|
||||
map.LoadRoomTemplates("Data/rooms.ini")
|
||||
|
|
@ -34,6 +37,10 @@ func loadThread():
|
|||
#else:
|
||||
#LoadMap("Map Creator\Maps\"+SelectedMap)
|
||||
|
||||
#var busyWork: int
|
||||
#while not map.mapMade:
|
||||
#busyWork += 1
|
||||
|
||||
#InitWayPoints()
|
||||
|
||||
loadingScreen.LoadProgress(79)
|
||||
|
|
@ -43,19 +50,19 @@ func loadThread():
|
|||
#Curr106.State = 70 * 60 * randi_range(12,17)
|
||||
|
||||
for d: Door in map.doors:
|
||||
map.EntityParent(d.obj, null)
|
||||
map.EntityParent.call_deferred(d.obj, null)
|
||||
if d.obj2 != null:
|
||||
map.EntityParent(d.obj2, null)
|
||||
map.EntityParent.call_deferred(d.obj2, null)
|
||||
if d.frameobj != null:
|
||||
map.EntityParent(d.frameobj, null)
|
||||
map.EntityParent.call_deferred(d.frameobj, null)
|
||||
if d.buttons[0] != null:
|
||||
map.EntityParent(d.buttons[0], null)
|
||||
map.EntityParent.call_deferred(d.buttons[0], null)
|
||||
if d.buttons[1] != null:
|
||||
map.EntityParent(d.buttons[1], null)
|
||||
map.EntityParent.call_deferred(d.buttons[1], null)
|
||||
|
||||
if d.obj2 != null and d.dir == 0:
|
||||
map.MoveEntity(d.obj, 0, 0, 8.0 * Constants.RoomScale)
|
||||
map.MoveEntity(d.obj2, 0, 0, 8.0 * Constants.RoomScale)
|
||||
map.MoveEntity.call_deferred(d.obj, 0, 0, 8.0 * Constants.RoomScale)
|
||||
map.MoveEntity.call_deferred(d.obj2, 0, 0, 8.0 * Constants.RoomScale)
|
||||
|
||||
#for it: Item in map.items:
|
||||
#map.EntityType (it.collider, HIT_ITEM)
|
||||
|
|
@ -70,7 +77,7 @@ func loadThread():
|
|||
for r: Room in map.rooms:
|
||||
for i in range(Constants.MaxRoomLights):
|
||||
if r.Lights[i] != null:
|
||||
map.EntityParent(r.Lights[i], null)
|
||||
map.EntityParent.call_deferred(r.Lights[i], null)
|
||||
|
||||
#if (not r.RoomTemplate.DisableDecals):
|
||||
#if randi_range(0, 4) == 1:
|
||||
|
|
@ -125,31 +132,29 @@ func loadThread():
|
|||
|
||||
#ResetEntity Collider
|
||||
|
||||
#If SelectedMap = "" Then InitEvents()
|
||||
#
|
||||
#For e.Events = Each Events
|
||||
#If e\EventName = "room2nuke"
|
||||
#e\EventState = 1
|
||||
#DebugLog "room2nuke"
|
||||
#EndIf
|
||||
#If e\EventName = "room106"
|
||||
#e\EventState2 = 1
|
||||
#DebugLog "room106"
|
||||
#EndIf
|
||||
#If e\EventName = "room2sl"
|
||||
#e\EventState3 = 1
|
||||
#DebugLog "room2sl"
|
||||
#EndIf
|
||||
#Next
|
||||
#
|
||||
#if SelectedMap == "":
|
||||
map.eventSystem.InitEvents()
|
||||
|
||||
for e: Event in map.eventSystem.events:
|
||||
if e.EventName == "room2nuke":
|
||||
e.EventState = 1.0
|
||||
print("room2nuke")
|
||||
if e.EventName == "room106":
|
||||
e.EventState2 = 1.0
|
||||
print("room106")
|
||||
if e.EventName == "room2sl":
|
||||
e.EventState3 = 1.0
|
||||
print("room2sl")
|
||||
|
||||
#MoveMouse viewport_center_x,viewport_center_y;320, 240
|
||||
#
|
||||
#AASetFont Font1
|
||||
|
||||
#HidePointer()
|
||||
Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
|
||||
|
||||
Global.player = load("res://scenes/world/Player.tscn").instantiate()
|
||||
map.add_child(Global.player)
|
||||
map.add_child.call_deferred(Global.player)
|
||||
|
||||
Global.player.BlinkTimer = -10
|
||||
#Global.player.BlurTimer = 100
|
||||
|
|
@ -158,11 +163,11 @@ func loadThread():
|
|||
for i in range(70):
|
||||
Global.FPSfactor = 1.0
|
||||
#FlushKeys()
|
||||
Global.player._process(Global.FPSfactor / 70.0)
|
||||
Global.player._physics_process(Global.FPSfactor / 70.0)
|
||||
#Global.player._process(Global.FPSfactor / 70.0)
|
||||
#Global.player._physics_process(Global.FPSfactor / 70.0)
|
||||
map.UpdateDoors()
|
||||
map.UpdateNPCs()
|
||||
map.UpdateWorld()
|
||||
#map.UpdateNPCs()
|
||||
#map.UpdateWorld()
|
||||
|
||||
if (int(float(i) * 0.27) != int(float(i - 1) * 0.27)):
|
||||
loadingScreen.LoadProgress(80 + int(float(i) * 0.27))
|
||||
|
|
@ -177,5 +182,13 @@ func loadThread():
|
|||
|
||||
#PrevTime = MilliSecs()
|
||||
|
||||
func _exit_tree() -> void:
|
||||
thread.wait_to_finish()
|
||||
var nomore = false
|
||||
func _process(delta: float) -> void:
|
||||
if not nomore and loadingScreen.loaded and Input.is_action_just_pressed("ui_accept"):
|
||||
nomore = true
|
||||
queue_free.call_deferred()
|
||||
map.OtherOpen = null
|
||||
|
||||
#
|
||||
#func _exit_tree() -> void:
|
||||
#thread.wait_to_finish()
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ func LoadProgress(progress: int):
|
|||
loadProgressIndex += 1
|
||||
loadProgressIndex = min(loadProgressIndex, loadingText.size() - 1)
|
||||
percent = progress
|
||||
queue_redraw.call_deferred()
|
||||
queue_redraw()
|
||||
|
||||
func _ready() -> void:
|
||||
background = $Background
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
class_name Main
|
||||
|
||||
static var options = INI.Load("res://options.ini")
|
||||
|
||||
static var SeedRnd = 0
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ var backBar: ColorRect
|
|||
var buttonList: Array
|
||||
var jankyFix: ColorRect
|
||||
func _ready() -> void:
|
||||
MusicSystem.UpdateMusic = true
|
||||
jankyFix = $JankyFix
|
||||
jankyFix.visible = true
|
||||
back = $Back
|
||||
|
|
@ -21,7 +22,7 @@ func _ready() -> void:
|
|||
$Buttons/Quit.connect("clicked", quitGame)
|
||||
|
||||
func newGame():
|
||||
print("clicked new game")
|
||||
get_tree().change_scene_to_file.call_deferred("res://scenes/world/DynamicMap.tscn")
|
||||
|
||||
func quitGame():
|
||||
get_tree().quit.call_deferred()
|
||||
|
|
@ -33,6 +34,23 @@ func _process(_delta: float) -> void:
|
|||
else:
|
||||
jankyCounter += 1
|
||||
|
||||
if jankyFix.visible:
|
||||
return
|
||||
|
||||
if MusicSystem.ShouldPlay == 21:
|
||||
#EndBreathSFX = LoadSound("SFX\Ending\MenuBreath.ogg")
|
||||
#EndBreathCHN = PlaySound(EndBreathSFX)
|
||||
#ShouldPlay = 66
|
||||
pass
|
||||
elif MusicSystem.ShouldPlay == 66:
|
||||
#if Not ChannelPlaying(EndBreathCHN) Then
|
||||
#FreeSound(EndBreathSFX)
|
||||
#ShouldPlay = 11
|
||||
#EndIf
|
||||
pass
|
||||
else:
|
||||
MusicSystem.ShouldPlay = 11
|
||||
|
||||
|
||||
Global.menuScale = size.y / 1024.0
|
||||
|
||||
|
|
|
|||
44
src/MusicSystem.gd
Normal file
44
src/MusicSystem.gd
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
extends Node
|
||||
class_name MusicSystem
|
||||
|
||||
static var NowPlaying: int = 2
|
||||
static var ShouldPlay: int = 11
|
||||
static var CurrMusicVolume: float = 1.0
|
||||
static var CurrMusic: int = 1
|
||||
static var UpdateMusic: bool = false
|
||||
|
||||
func _ready():
|
||||
name = "MusicSystem"
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if not UpdateMusic:
|
||||
return
|
||||
#if ConsoleFlush Then
|
||||
#If Not ChannelPlaying(ConsoleMusPlay) Then ConsoleMusPlay = PlaySound(ConsoleMusFlush)
|
||||
#ElseIf (Not PlayCustomMusic)
|
||||
if NowPlaying != ShouldPlay: # playing the wrong clip, fade out
|
||||
CurrMusicVolume = max(CurrMusicVolume - (Global.FPSfactor / 250.0), 0.0)
|
||||
if CurrMusicVolume == 0:
|
||||
if NowPlaying < 66:
|
||||
Global.MusicCHN.stop()
|
||||
NowPlaying = ShouldPlay
|
||||
CurrMusic = 0
|
||||
else: # playing the right clip
|
||||
CurrMusicVolume = CurrMusicVolume + (Global.MusicVolume - CurrMusicVolume) * (0.1 * Global.FPSfactor)
|
||||
|
||||
if NowPlaying < 66:
|
||||
if CurrMusic == 0:
|
||||
Global.MusicCHN.stop()
|
||||
Global.MusicCHN.stream = Global.LoadAudio("SFX/Music/" + str(Global.Music[NowPlaying]) + ".ogg")
|
||||
Global.MusicCHN.stream.loop = true
|
||||
Global.MusicCHN.volume_db = linear_to_db(0)
|
||||
Global.MusicCHN.play()
|
||||
CurrMusic = 1
|
||||
Global.MusicCHN.volume_db = linear_to_db(CurrMusicVolume)
|
||||
#Else
|
||||
#If FPSfactor > 0 Or OptionsMenu = 2 Then
|
||||
#;CurrMusicVolume = 1.0
|
||||
#If (Not ChannelPlaying(MusicCHN)) Then MusicCHN = PlaySound_Strict(CustomMusic)
|
||||
#ChannelVolume MusicCHN,1.0*MusicVolume
|
||||
#EndIf
|
||||
#EndIf
|
||||
1
src/MusicSystem.gd.uid
Normal file
1
src/MusicSystem.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://cev5wfhvjabsb
|
||||
|
|
@ -10,8 +10,10 @@ var sprintIconBG: ColorRect
|
|||
var blinkBar: Control
|
||||
var sprintBar: Control
|
||||
var Hud: Control
|
||||
var map: Node3D
|
||||
|
||||
func _ready() -> void:
|
||||
map = get_parent()
|
||||
Global.player = self
|
||||
head = $Head
|
||||
camera = $Head/Camera
|
||||
|
|
@ -67,6 +69,8 @@ var EyeStuck:float = 0
|
|||
var BlinkEffect:float = 1.0
|
||||
var BlinkEffectTimer:float = 0
|
||||
|
||||
var CurrStepSFX: int = 0
|
||||
|
||||
var LightBlink = 0
|
||||
var LightFlash = 0
|
||||
|
||||
|
|
@ -84,6 +88,11 @@ const IRRITATED_RED = Color(0.78431372549, 0, 0)
|
|||
|
||||
var cameraMoveByVector = Vector2()
|
||||
|
||||
func GetStepSound():
|
||||
if floorPick.is_colliding():
|
||||
return Global.StepSoundFromTexture(floorPick.get_collider().get_meta("texName"))
|
||||
return 0
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if (abs(cameraMoveByVector.x) > 0 or abs(cameraMoveByVector.y) > 0):
|
||||
Rotation.x -= rad_to_deg(cameraMoveByVector.x * 120 * delta);
|
||||
|
|
@ -111,13 +120,12 @@ func _process(delta: float) -> void:
|
|||
|
||||
if BlinkTimer <= -20:
|
||||
# Randomizes the frequency of blinking. Scales with difficulty.
|
||||
#Select SelectedDifficulty\otherFactors
|
||||
# Case EASY
|
||||
BLINKFREQ = randi_range(490,700)
|
||||
# Case NORMAL
|
||||
#BLINKFREQ = randi_range(455,665)
|
||||
# Case HARD
|
||||
#BLINKFREQ = randi_range(420,630)
|
||||
if Global.SelectedDifficulty.otherFactors == Constants.EASY:
|
||||
BLINKFREQ = randi_range(490,700)
|
||||
elif Global.SelectedDifficulty.otherFactors == Constants.NORMAL:
|
||||
BLINKFREQ = randi_range(455,665)
|
||||
elif Global.SelectedDifficulty.otherFactors == Constants.HARD:
|
||||
BLINKFREQ = randi_range(420,630)
|
||||
BlinkTimer = BLINKFREQ
|
||||
|
||||
BlinkTimer = BlinkTimer - Global.FPSfactor
|
||||
|
|
@ -227,33 +235,31 @@ func _process(delta: float) -> void:
|
|||
Shake = fmod((Shake + Global.FPSfactor * min(Sprint, 1.5) * 7), 720)
|
||||
if shake < 180 and fmod(Shake, 360) >= 180 and KillTimer >= 0:
|
||||
print("step sound")
|
||||
#if CurrStepSFX == 0:
|
||||
#temp = GetStepSound(Collider)
|
||||
#if Sprint == 1.0:
|
||||
#PlayerSoundVolume = max(4.0, PlayerSoundVolume)
|
||||
#tempchn% = PlaySound_Strict(StepSFX(temp, 0, Rand(0, 7)))
|
||||
#ChannelVolume tempchn, (1.0-(Crouch*0.6))*SFXVolume#
|
||||
#Else
|
||||
#PlayerSoundVolume = Max(2.5-(Crouch*0.6),PlayerSoundVolume)
|
||||
#tempchn% = PlaySound_Strict(StepSFX(temp, 1, Rand(0, 7)))
|
||||
#ChannelVolume tempchn, (1.0-(Crouch*0.6))*SFXVolume#
|
||||
#End If
|
||||
#elif CurrStepSFX == 1:
|
||||
#tempchn% = PlaySound_Strict(Step2SFX(Rand(0, 2)))
|
||||
#ChannelVolume tempchn, (1.0-(Crouch*0.4))*SFXVolume#
|
||||
#elif CurrStepSFX == 2:
|
||||
#tempchn% = PlaySound_Strict(Step2SFX(Rand(3,5)))
|
||||
#ChannelVolume tempchn, (1.0-(Crouch*0.4))*SFXVolume#
|
||||
#elif CurrStepSFX == 3:
|
||||
#If Sprint = 1.0 Then
|
||||
#PlayerSoundVolume = Max(4.0,PlayerSoundVolume)
|
||||
#tempchn% = PlaySound_Strict(StepSFX(0, 0, Rand(0, 7)))
|
||||
#ChannelVolume tempchn, (1.0-(Crouch*0.6))*SFXVolume#
|
||||
#Else
|
||||
#PlayerSoundVolume = Max(2.5-(Crouch*0.6),PlayerSoundVolume)
|
||||
#tempchn% = PlaySound_Strict(StepSFX(0, 1, Rand(0, 7)))
|
||||
#ChannelVolume tempchn, (1.0-(Crouch*0.6))*SFXVolume#
|
||||
#End If
|
||||
if CurrStepSFX == 0:
|
||||
var temp = GetStepSound()
|
||||
if Sprint == 1.0:
|
||||
Global.PlayerSoundVolume = max(4.0, Global.PlayerSoundVolume)
|
||||
var tempchn = Global.PlayTempSound(map.StepSFX[temp][0][randi_range(0, 7)])
|
||||
tempchn.volume_db = linear_to_db((1.0 - (Crouch * 0.6)) * Global.SFXVolume)
|
||||
else:
|
||||
Global.PlayerSoundVolume = max(2.5 - (Crouch * 0.6), Global.PlayerSoundVolume)
|
||||
var tempchn = Global.PlayTempSound(map.StepSFX[temp][1][randi_range(0, 7)])
|
||||
tempchn.volume_db = linear_to_db((1.0 - (Crouch * 0.6)) * Global.SFXVolume)
|
||||
elif CurrStepSFX == 1:
|
||||
var tempchn = Global.PlayTempSound(map.Step2SFX[randi_range(0, 2)])
|
||||
tempchn.volume_db = linear_to_db((1.0 - (Crouch * 0.4)) * Global.SFXVolume)
|
||||
elif CurrStepSFX == 2:
|
||||
var tempchn = Global.PlayTempSound(map.Step2SFX[randi_range(3,5)])
|
||||
tempchn.volume_db = linear_to_db((1.0 - (Crouch * 0.4)) * Global.SFXVolume)
|
||||
elif CurrStepSFX == 3:
|
||||
if Sprint == 1.0:
|
||||
Global.PlayerSoundVolume = max(4.0, Global.PlayerSoundVolume)
|
||||
var tempchn = Global.PlayTempSound(map.StepSFX[0][0][randi_range(0, 7)])
|
||||
tempchn.volume_db = linear_to_db((1.0 - (Crouch * 0.6)) * Global.SFXVolume)
|
||||
else:
|
||||
Global.PlayerSoundVolume = max(2.5 - (Crouch * 0.6), Global.PlayerSoundVolume)
|
||||
var tempchn = Global.PlayTempSound(map.StepSFX[0][1][randi_range(0, 7)])
|
||||
tempchn.volume_db = linear_to_db((1.0 - (Crouch * 0.6)) * Global.SFXVolume)
|
||||
else: # noclip on
|
||||
if Input.is_action_pressed("player_sprint"):
|
||||
Sprint = 2.5
|
||||
|
|
@ -350,18 +356,16 @@ func _process(delta: float) -> void:
|
|||
#Next
|
||||
|
||||
if CollidedFloor:
|
||||
#If DropSpeed# < - 0.07 Then
|
||||
#If CurrStepSFX=0 Then
|
||||
#PlaySound_Strict(StepSFX(GetStepSound(Collider), 0, Rand(0, 7)))
|
||||
#ElseIf CurrStepSFX=1
|
||||
#PlaySound_Strict(Step2SFX(Rand(0, 2)))
|
||||
#ElseIf CurrStepSFX=2
|
||||
#PlaySound_Strict(Step2SFX(Rand(3, 5)))
|
||||
#ElseIf CurrStepSFX=3
|
||||
#PlaySound_Strict(StepSFX(0, 0, Rand(0, 7)))
|
||||
#EndIf
|
||||
#PlayerSoundVolume = Max(3.0,PlayerSoundVolume)
|
||||
#EndIf
|
||||
if DropSpeed < -0.07:
|
||||
if CurrStepSFX == 0:
|
||||
Global.PlayTempSound(map.StepSFX[GetStepSound()][0][randi_range(0, 7)])
|
||||
elif CurrStepSFX == 1:
|
||||
Global.PlayTempSound(map.Step2SFX[randi_range(0, 2)])
|
||||
elif CurrStepSFX == 2:
|
||||
Global.PlayTempSound(map.Step2SFX[randi_range(3, 5)])
|
||||
elif CurrStepSFX == 3:
|
||||
Global.PlayTempSound(map.StepSFX[0][0][randi_range(0, 7)])
|
||||
Global.PlayerSoundVolume = max(3.0, Global.PlayerSoundVolume)
|
||||
DropSpeed = 0
|
||||
else:
|
||||
DropSpeed = min(max(DropSpeed - 0.006 * Global.FPSfactor, -2.0), 0.0)
|
||||
|
|
|
|||
42
src/UpdateEvents.gd
Normal file
42
src/UpdateEvents.gd
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
extends Node
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;~IDEal Editor Parameters:
|
||||
;~F#1#14#29#13B#343#535#545#5B1#630#68D#6B4#6C2#6CC#6D9#8CA#8EB#93F#976#983#9BD
|
||||
;~F#9CE#9EE#9F7#A01#A10#B0B#B2D#DE2#E29#E3F#E4B#E68#EB9#ED2#FA1#10A3#1123#113C#115B#11C6
|
||||
;~F#11D3#11EC#1284#1439#152D#1581#1633#16D4#1796#17A9#187A#18A7#18C4#18EB#191B#1941#1969#19BB#19F8#1A29
|
||||
;~F#1A3C#1AFD#1B6A#1B7D#1B8B#1BCF#1BF0#1CDE#1D53#1E50#1ED1#1F1F#1F24#1F73#1F79#213E
|
||||
;~B#10D3#1DD1
|
||||
;~C#Blitz3D
|
||||
1
src/UpdateEvents.gd.uid
Normal file
1
src/UpdateEvents.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://qgv7j32s51vr
|
||||
20
src/Utils.gd
20
src/Utils.gd
|
|
@ -54,7 +54,7 @@ static func GetCaseiFileName(path: String):
|
|||
|
||||
static func Init1DArray(size: int, initValue: Variant = null) -> Array:
|
||||
var array = []
|
||||
for i in range(size):
|
||||
for i in range(size + 1):
|
||||
array.append(initValue)
|
||||
|
||||
return array
|
||||
|
|
@ -62,14 +62,28 @@ static func Init1DArray(size: int, initValue: Variant = null) -> Array:
|
|||
# I want this to be array[y][x] but this is coming from b3d
|
||||
static func Init2DArray(sizeX: int, sizeY: int, initValue: Variant = null) -> Array:
|
||||
var array = []
|
||||
for i in range(sizeX):
|
||||
for i in range(sizeX + 1):
|
||||
var yArray = []
|
||||
array.append(yArray)
|
||||
for i1 in range(sizeY):
|
||||
for i1 in range(sizeY + 1):
|
||||
yArray.append(initValue)
|
||||
|
||||
return array
|
||||
|
||||
# [x][y][z], unfortunately
|
||||
static func Init3DArray(sizeX: int, sizeY: int, sizeZ: int, initValue: Variant = null) -> Array:
|
||||
var array = []
|
||||
for i in range(sizeX + 1):
|
||||
var yArray = []
|
||||
array.append(yArray)
|
||||
for i1 in range(sizeY + 1):
|
||||
var zArray = []
|
||||
yArray.append(zArray)
|
||||
for i2 in range(sizeZ + 1):
|
||||
zArray.append(initValue)
|
||||
|
||||
return array
|
||||
|
||||
static func GenerateSeedNumber(seedv: String):
|
||||
var hashv = 0
|
||||
if len(seedv) == 0:
|
||||
|
|
|
|||
|
|
@ -28,10 +28,11 @@ static func GetInt(dict: Dictionary, name: String) -> int:
|
|||
return dict[name].to_int()
|
||||
return 0
|
||||
|
||||
static func GetFloat(dict: Dictionary, name: String) -> int:
|
||||
static func GetFloat(dict: Dictionary, name: String) -> float:
|
||||
if dict.has(name):
|
||||
return dict[name].to_float()
|
||||
return 0
|
||||
else:
|
||||
return 0
|
||||
|
||||
static func GetBool(dict: Dictionary, name: String) -> bool:
|
||||
if dict.has(name):
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ static func LoadRMesh(file: String, rt: RoomTemplate):
|
|||
mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA_DEPTH_PRE_PASS if activeAlbedoHasAlpha else BaseMaterial3D.TRANSPARENCY_DISABLED
|
||||
meshInstance.set_surface_override_material(0, mat)
|
||||
meshInstance.create_trimesh_collision()
|
||||
meshInstance.get_child(0).set_meta("texName", textureName)
|
||||
scene.add_child(meshInstance)
|
||||
|
||||
#print("YOYOYO MARKER")
|
||||
|
|
|
|||
14
src/objects/Difficulty.gd
Normal file
14
src/objects/Difficulty.gd
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
class_name Difficulty
|
||||
|
||||
var name: String
|
||||
var description: String
|
||||
var permaDeath: bool
|
||||
var aggressiveNPCs: float
|
||||
var saveType: int
|
||||
var otherFactors: int
|
||||
|
||||
var r: int
|
||||
var g: int
|
||||
var b: int
|
||||
|
||||
var customizable: bool = false
|
||||
1
src/objects/Difficulty.gd.uid
Normal file
1
src/objects/Difficulty.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://c8sh6jv0vci5p
|
||||
16
src/objects/Event.gd
Normal file
16
src/objects/Event.gd
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
class_name Event
|
||||
|
||||
var EventName: String
|
||||
var room: Room
|
||||
|
||||
var EventState: float
|
||||
var EventState2: float
|
||||
var EventState3: float
|
||||
#var SoundCHN:, SoundCHN2%
|
||||
var Sound: AudioStream
|
||||
var Sound2: AudioStream
|
||||
#var SoundCHN_isStream%, SoundCHN2_isStream%
|
||||
|
||||
var EventStr: String
|
||||
|
||||
var img: CompressedTexture2D
|
||||
1
src/objects/Event.gd.uid
Normal file
1
src/objects/Event.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://ciycs8rul7vim
|
||||
Loading…
Add table
Reference in a new issue