get events loading properly and positions doors properly in the intro
This commit is contained in:
parent
206b67ebbd
commit
492565b3a3
GPG key ID:
B8583C4B7D18119E
5 changed files with 126 additions and 79 deletions
|
|
@ -16,6 +16,9 @@ fog_depth_begin = 1.0
|
|||
[node name="DynamicMap" type="Node3D"]
|
||||
script = ExtResource("1_mytgt")
|
||||
|
||||
[node name="UILayer" type="CanvasLayer" parent="."]
|
||||
layer = 64
|
||||
|
||||
[node name="EventSystem" type="Node" parent="."]
|
||||
script = ExtResource("2_vb526")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=10 format=3 uid="uid://dm33ofcbh8sht"]
|
||||
[gd_scene load_steps=11 format=3 uid="uid://dm33ofcbh8sht"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://swqi7bl5fmpv" path="res://src/Player.gd" id="1_n772d"]
|
||||
[ext_resource type="Texture2D" uid="uid://rfpsi4xnxdu" path="res://GFX/BlinkIcon.png" id="2_kjp08"]
|
||||
|
|
@ -10,11 +10,16 @@
|
|||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_w1ang"]
|
||||
radius = 0.15
|
||||
height = 0.3
|
||||
height = 0.75
|
||||
|
||||
[sub_resource type="SeparationRayShape3D" id="SeparationRayShape3D_u64q7"]
|
||||
length = 0.5
|
||||
|
||||
[sub_resource type="CylinderMesh" id="CylinderMesh_ucuqk"]
|
||||
top_radius = 0.01
|
||||
bottom_radius = 0.01
|
||||
height = 0.05
|
||||
|
||||
[node name="Player" type="CharacterBody3D"]
|
||||
script = ExtResource("1_n772d")
|
||||
|
||||
|
|
@ -24,7 +29,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.65, 0)
|
|||
[node name="Camera" type="Camera3D" parent="Head"]
|
||||
|
||||
[node name="Collision" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.15, 0)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.375, 0)
|
||||
shape = SubResource("CapsuleShape3D_w1ang")
|
||||
|
||||
[node name="SepRay1" type="CollisionShape3D" parent="."]
|
||||
|
|
@ -36,6 +41,10 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0,
|
|||
enabled = false
|
||||
target_position = Vector3(0, -0.55, 0)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="SepRay1/RayCast3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.474526, 0)
|
||||
mesh = SubResource("CylinderMesh_ucuqk")
|
||||
|
||||
[node name="SepRay2" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.5, -0.155)
|
||||
shape = SubResource("SeparationRayShape3D_u64q7")
|
||||
|
|
@ -45,6 +54,10 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0,
|
|||
enabled = false
|
||||
target_position = Vector3(0, -0.55, 0)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="SepRay2/RayCast3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.474526, 0)
|
||||
mesh = SubResource("CylinderMesh_ucuqk")
|
||||
|
||||
[node name="SepRay3" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.5, -0.155)
|
||||
shape = SubResource("SeparationRayShape3D_u64q7")
|
||||
|
|
@ -54,6 +67,10 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0,
|
|||
enabled = false
|
||||
target_position = Vector3(0, -0.55, 0)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="SepRay3/RayCast3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.474526, 0)
|
||||
mesh = SubResource("CylinderMesh_ucuqk")
|
||||
|
||||
[node name="StairRay" type="RayCast3D" parent="."]
|
||||
|
||||
[node name="FloorRay" type="RayCast3D" parent="."]
|
||||
|
|
|
|||
|
|
@ -883,7 +883,7 @@ func _ready() -> void:
|
|||
#RMesh.LoadRMesh(self, roomInfo["mesh path"])
|
||||
|
||||
#CreateMap()
|
||||
#IntroEnabled = true
|
||||
IntroEnabled = true
|
||||
#LoadRoomTemplates("Data/rooms.ini")
|
||||
#CreateMap()
|
||||
|
||||
|
|
@ -3532,34 +3532,36 @@ func FillRoom(r:Room):
|
|||
#it = CreateItem("Dr. L's Note", "paper", r\x - 928.0 * RoomScale, 160.0 * RoomScale, r\z - 160.0 * RoomScale)
|
||||
#EntityParent(it\collider, r\obj)
|
||||
#;[End Block]
|
||||
#Case "173"
|
||||
elif rn == "173":
|
||||
#;[Block]
|
||||
#r\Objects[0] = CreatePivot()
|
||||
#PositionEntity (r\Objects[0], EntityX(r\obj) + 40.0 * RoomScale, 460.0 * RoomScale, EntityZ(r\obj) + 1072.0 * RoomScale)
|
||||
#r\Objects[1] = CreatePivot()
|
||||
#PositionEntity (r\Objects[1], EntityX(r\obj) - 80.0 * RoomScale, 100.0 * RoomScale, EntityZ(r\obj) + 526.0 * RoomScale)
|
||||
#r\Objects[2] = CreatePivot()
|
||||
#PositionEntity (r\Objects[2], EntityX(r\obj) - 128.0 * RoomScale, 100.0 * RoomScale, EntityZ(r\obj) + 320.0 * RoomScale)
|
||||
#
|
||||
#r\Objects[3] = CreatePivot()
|
||||
#PositionEntity (r\Objects[3], EntityX(r\obj) + 660.0 * RoomScale, 100.0 * RoomScale, EntityZ(r\obj) + 526.0 * RoomScale)
|
||||
#r\Objects[4] = CreatePivot()
|
||||
#PositionEntity (r\Objects[4], EntityX(r\obj) + 700 * RoomScale, 100.0 * RoomScale, EntityZ(r\obj) + 320.0 * RoomScale)
|
||||
#
|
||||
#r\Objects[5] = CreatePivot()
|
||||
#PositionEntity (r\Objects[5], EntityX(r\obj) + 1472.0 * RoomScale, 100.0 * RoomScale, EntityZ(r\obj) + 912.0 * RoomScale)
|
||||
#
|
||||
#For i = 0 To 5
|
||||
#EntityParent(r\Objects[i], r\obj)
|
||||
#Next
|
||||
#
|
||||
#r\RoomDoors[1] = CreateDoor(r\zone, EntityX(r\obj) + 288.0 * RoomScale, 0, EntityZ(r\obj) + 384.0 * RoomScale, 90, r, False, True)
|
||||
#r\RoomDoors[1]\AutoClose = False ;: r\RoomDoors[1]\locked = True
|
||||
#r\RoomDoors[1]\dir = 1 : r\RoomDoors[1]\open = False
|
||||
#
|
||||
#FreeEntity(r\RoomDoors[1]\buttons[0]) : r\RoomDoors[1]\buttons[0] = 0
|
||||
#FreeEntity(r\RoomDoors[1]\buttons[1]) : r\RoomDoors[1]\buttons[1] = 0
|
||||
#
|
||||
r.Objects[0] = CreatePivot()
|
||||
PositionEntity (r.Objects[0], EntityX(r.obj) + 40.0 * Constants.RoomScale, 460.0 * Constants.RoomScale, EntityZ(r.obj) + 1072.0 * Constants.RoomScale)
|
||||
r.Objects[1] = CreatePivot()
|
||||
PositionEntity (r.Objects[1], EntityX(r.obj) - 80.0 * Constants.RoomScale, 100.0 * Constants.RoomScale, EntityZ(r.obj) + 526.0 * Constants.RoomScale)
|
||||
r.Objects[2] = CreatePivot()
|
||||
PositionEntity (r.Objects[2], EntityX(r.obj) - 128.0 * Constants.RoomScale, 100.0 * Constants.RoomScale, EntityZ(r.obj) + 320.0 * Constants.RoomScale)
|
||||
|
||||
r.Objects[3] = CreatePivot()
|
||||
PositionEntity (r.Objects[3], EntityX(r.obj) + 660.0 * Constants.RoomScale, 100.0 * Constants.RoomScale, EntityZ(r.obj) + 526.0 * Constants.RoomScale)
|
||||
r.Objects[4] = CreatePivot()
|
||||
PositionEntity (r.Objects[4], EntityX(r.obj) + 700 * Constants.RoomScale, 100.0 * Constants.RoomScale, EntityZ(r.obj) + 320.0 * Constants.RoomScale)
|
||||
|
||||
r.Objects[5] = CreatePivot()
|
||||
PositionEntity (r.Objects[5], EntityX(r.obj) + 1472.0 * Constants.RoomScale, 100.0 * Constants.RoomScale, EntityZ(r.obj) + 912.0 * Constants.RoomScale)
|
||||
|
||||
for i in range(0, 6):
|
||||
EntityParent(r.Objects[i], r.obj)
|
||||
|
||||
r.RoomDoors[1] = CreateDoor(r.zone, EntityX(r.obj) - 288.0 * Constants.RoomScale, 0, EntityZ(r.obj) + 384.0 * Constants.RoomScale, 90, r, false, true)
|
||||
r.RoomDoors[1].AutoClose = false #: r\RoomDoors[1]\locked = True
|
||||
r.RoomDoors[1].dir = 1
|
||||
r.RoomDoors[1].open = false
|
||||
|
||||
FreeEntity(r.RoomDoors[1].buttons[0])
|
||||
r.RoomDoors[1].buttons[0] = null
|
||||
FreeEntity(r.RoomDoors[1].buttons[1])
|
||||
r.RoomDoors[1].buttons[1] = null
|
||||
|
||||
#de.Decals = CreateDecal(Rand(4, 5), EntityX(r\Objects[5], True), 0.002, EntityZ(r\Objects[5], True), 90, Rnd(360), 0)
|
||||
#de\Size = 1.2
|
||||
#ScaleSprite(de\obj, de\Size, de\Size)
|
||||
|
|
@ -3575,40 +3577,52 @@ func FillRoom(r:Room):
|
|||
#
|
||||
#;AddLight(r, r\x-224.0*RoomScale, r\y+640.0*RoomScale, r\z+128.0*RoomScale,2,2,200,200,200)
|
||||
#;AddLight(r, r\x-1056.0*RoomScale, r\y+608.0*RoomScale, r\z+416.0*RoomScale,2,2,200,200,200)
|
||||
#
|
||||
#r\RoomDoors[2] = CreateDoor(r\zone, r\x - 1008.0 * RoomScale, 0, r\z - 688.0 * RoomScale, 90, r, True, False, False, "", True)
|
||||
#r\RoomDoors[2]\AutoClose = False : r\RoomDoors[2]\open = False : r\RoomDoors[2]\locked = True
|
||||
#FreeEntity(r\RoomDoors[2]\buttons[0]) : r\RoomDoors[2]\buttons[0] = 0
|
||||
#FreeEntity(r\RoomDoors[2]\buttons[1]) : r\RoomDoors[2]\buttons[1] = 0
|
||||
#
|
||||
#r\RoomDoors[3] = CreateDoor(r\zone, r\x - 2320.0 * RoomScale, 0, r\z - 1248.0 * RoomScale, 90, r, True)
|
||||
#r\RoomDoors[3]\AutoClose = False : r\RoomDoors[3]\open = True : r\RoomDoors[3]\locked = True
|
||||
#
|
||||
#r\RoomDoors[4] = CreateDoor(r\zone, r\x - 4352.0 * RoomScale, 0, r\z - 1248.0 * RoomScale, 90, r, True)
|
||||
#r\RoomDoors[4]\AutoClose = False : r\RoomDoors[4]\open = True : r\RoomDoors[4]\locked = True
|
||||
#
|
||||
#;the door in the office below the walkway
|
||||
#r\RoomDoors[7] = CreateDoor(r\zone, r\x - 3712.0 * RoomScale, -385*RoomScale, r\z - 128.0 * RoomScale, 0, r, True)
|
||||
#r\RoomDoors[7]\AutoClose = False : r\RoomDoors[7]\open = True
|
||||
#
|
||||
#d.Doors = CreateDoor(r\zone, r\x - 3712 * RoomScale, -385*RoomScale, r\z - 2336 * RoomScale, 0, r, False)
|
||||
#d\locked = True : d\DisableWaypoint = True
|
||||
#
|
||||
#;the door from the concrete tunnel to the large hall
|
||||
#d.Doors = CreateDoor(r\zone, r\x - 6864 * RoomScale, 0, r\z - 1248 * RoomScale, 90, r, True)
|
||||
#d\AutoClose = False
|
||||
#d\locked = True
|
||||
#
|
||||
#;the locked door to the lower level of the hall
|
||||
#d.Doors = CreateDoor(r\zone, r\x - 5856 * RoomScale, 0, r\z - 1504 * RoomScale, 0, r, False)
|
||||
#d\locked = True : d\DisableWaypoint = True
|
||||
#
|
||||
#;the door to the staircase in the office room
|
||||
#d.Doors = CreateDoor(r\zone, r\x - 2432 * RoomScale, 0, r\z - 1000 * RoomScale, 0, r, False)
|
||||
#PositionEntity(d\buttons[0], r\x - 2592 * RoomScale, EntityY(d\buttons[0],True), r\z - 1016 * RoomScale, True)
|
||||
#PositionEntity(d\buttons[1], r\x - 2592 * RoomScale, EntityY(d\buttons[0],True), r\z - 984 * RoomScale, True)
|
||||
#d\locked = True : d\DisableWaypoint = True
|
||||
#
|
||||
|
||||
r.RoomDoors[2] = CreateDoor(r.zone, r.x + 1008.0 * Constants.RoomScale, 0, r.z - 688.0 * Constants.RoomScale, 90, r, true, false, false, "", true)
|
||||
r.RoomDoors[2].AutoClose = false
|
||||
r.RoomDoors[2].open = false
|
||||
r.RoomDoors[2].locked = true
|
||||
FreeEntity(r.RoomDoors[2].buttons[0])
|
||||
r.RoomDoors[2].buttons[0] = null
|
||||
FreeEntity(r.RoomDoors[2].buttons[1])
|
||||
r.RoomDoors[2].buttons[1] = null
|
||||
|
||||
r.RoomDoors[3] = CreateDoor(r.zone, r.x + 2320.0 * Constants.RoomScale, 0, r.z - 1248.0 * Constants.RoomScale, 90, r, true)
|
||||
r.RoomDoors[3].AutoClose = false
|
||||
r.RoomDoors[3].open = true
|
||||
r.RoomDoors[3].locked = true
|
||||
|
||||
r.RoomDoors[4] = CreateDoor(r.zone, r.x + 4352.0 * Constants.RoomScale, 0, r.z - 1248.0 * Constants.RoomScale, 90, r, true)
|
||||
r.RoomDoors[4].AutoClose = false
|
||||
r.RoomDoors[4].open = true
|
||||
r.RoomDoors[4].locked = true
|
||||
|
||||
# the door in the office below the walkway
|
||||
r.RoomDoors[7] = CreateDoor(r.zone, r.x + 3712.0 * Constants.RoomScale, -385 * Constants.RoomScale, r.z - 128.0 * Constants.RoomScale, 0, r, true)
|
||||
r.RoomDoors[7].AutoClose = false
|
||||
r.RoomDoors[7].open = true
|
||||
|
||||
var d = CreateDoor(r.zone, r.x + 3712 * Constants.RoomScale, -385 * Constants.RoomScale, r.z - 2336 * Constants.RoomScale, 0, r, false)
|
||||
d.locked = true
|
||||
d.DisableWaypoint = true
|
||||
|
||||
# the door from the concrete tunnel to the large hall
|
||||
d = CreateDoor(r.zone, r.x + 6864 * Constants.RoomScale, 0, r.z - 1248 * Constants.RoomScale, 90, r, true)
|
||||
d.AutoClose = false
|
||||
d.locked = true
|
||||
|
||||
# the locked door to the lower level of the hall
|
||||
d = CreateDoor(r.zone, r.x + 5856 * Constants.RoomScale, 0, r.z - 1504 * Constants.RoomScale, 0, r, false)
|
||||
d.locked = true
|
||||
d.DisableWaypoint = true
|
||||
|
||||
# the door to the staircase in the office room
|
||||
d = CreateDoor(r.zone, r.x + 2432 * Constants.RoomScale, 0, r.z - 1000 * Constants.RoomScale, 0, r, false)
|
||||
PositionEntity(d.buttons[0], r.x + 2592 * Constants.RoomScale, EntityY(d.buttons[0], true), r.z - 1016 * Constants.RoomScale, true)
|
||||
PositionEntity(d.buttons[1], r.x + 2592 * Constants.RoomScale, EntityY(d.buttons[0], true), r.z - 984 * Constants.RoomScale, true)
|
||||
d.locked = true
|
||||
d.DisableWaypoint = true
|
||||
|
||||
#tex = LoadTexture_Strict("GFX\map\Door02.jpg")
|
||||
#For ztemp = 0 To 1
|
||||
#d.Doors = CreateDoor(r\zone, r\x - 5760 * RoomScale, 0, r\z + (320+896*ztemp) * RoomScale, 0, r, False)
|
||||
|
|
@ -3653,12 +3667,14 @@ func FillRoom(r:Room):
|
|||
#PositionEntity(sc\ScrObj, r\x - 2256 * RoomScale, 224.0 * RoomScale, r\z - 928.0 * RoomScale)
|
||||
#TurnEntity(sc\ScrObj, 0, 90, 0)
|
||||
#EntityParent(sc\ScrObj, r\obj)
|
||||
#
|
||||
|
||||
#r\Objects[9] = LoadMesh_Strict("GFX\map\173_2.b3d",r\obj)
|
||||
r.Objects[9] = B3D.Load("GFX\\map\\173_2.b3d", r.obj)
|
||||
#EntityType r\Objects[9],HIT_MAP
|
||||
#EntityPickMode r\Objects[9],2
|
||||
#
|
||||
|
||||
#r\Objects[10] = LoadMesh_Strict("GFX\map\intro_labels.b3d",r\obj)
|
||||
r.Objects[10] = B3D.Load("GFX\\map\\intro_labels.b3d", r.obj)
|
||||
#;[End Block]
|
||||
#Case "room2ccont"
|
||||
#;[Block]
|
||||
|
|
@ -4793,7 +4809,13 @@ func CreateSprite():
|
|||
return Sprite3D.new()
|
||||
|
||||
func CreatePivot():
|
||||
return Node3D.new()
|
||||
var lol = Node3D.new()
|
||||
add_child(lol)
|
||||
return lol
|
||||
|
||||
func FreeEntity(dingus):
|
||||
if dingus:
|
||||
dingus.queue_free()
|
||||
|
||||
func EntityColor(sprite: Sprite3D, r: int, g: int, b: int):
|
||||
sprite.modulate = Color8(r, g, b)
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ func CreateEvent(eventname: String, roomname: String, id: int, prob: float = 0.0
|
|||
events.push_back(e)
|
||||
e.EventName = eventname
|
||||
e.room = r
|
||||
print("Adding event ", eventname, " at room ", r.RoomTemplate.Name)
|
||||
return e
|
||||
else:
|
||||
for r: Room in map.rooms:
|
||||
|
|
@ -230,13 +231,13 @@ func InitEvents():
|
|||
CreateEvent("room966","room966", 0)
|
||||
|
||||
CreateEvent("room1123", "room1123", 0, 0)
|
||||
;CreateEvent("room2test1074","room2test1074",0)
|
||||
;CreateEvent("room038","room038",0,0)
|
||||
;CreateEvent("room009","room009",0,0)
|
||||
;CreateEvent("medibay", "medibay", 0)
|
||||
;CreateEvent("room409", "room409", 0)
|
||||
;CreateEvent("room178", "room178", 0)
|
||||
;CreateEvent("room020", "room020", 0)
|
||||
# CreateEvent("room2test1074","room2test1074",0)
|
||||
# CreateEvent("room038","room038",0,0)
|
||||
# CreateEvent("room009","room009",0,0)
|
||||
# CreateEvent("medibay", "medibay", 0)
|
||||
# CreateEvent("room409", "room409", 0)
|
||||
# CreateEvent("room178", "room178", 0)
|
||||
# CreateEvent("room020", "room020", 0)
|
||||
CreateEvent("room2tesla", "room2tesla_lcz", 0, 0.9)
|
||||
CreateEvent("room2tesla", "room2tesla_hcz", 0, 0.9)
|
||||
|
||||
|
|
|
|||
|
|
@ -107,6 +107,8 @@ func GetStepSound():
|
|||
return Global.StepSoundFromTexture(a)
|
||||
return 0
|
||||
|
||||
var movementVector = Vector3()
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if (abs(cameraMoveByVector.x) > 0 or abs(cameraMoveByVector.y) > 0):
|
||||
Rotation.x -= rad_to_deg(cameraMoveByVector.x * 120 * delta);
|
||||
|
|
@ -248,7 +250,7 @@ func _process(delta: float) -> void:
|
|||
if not UnableToMove:
|
||||
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 " + str(shake))
|
||||
#print("step sound " + str(shake))
|
||||
if CurrStepSFX == 0:
|
||||
var temp = GetStepSound()
|
||||
if Sprint == 1.0:
|
||||
|
|
@ -349,6 +351,8 @@ func _process(delta: float) -> void:
|
|||
if not UnableToMove:
|
||||
var movementX = direction.x * CurrSpeed * Global.FPSfactor
|
||||
var movementZ = direction.z * CurrSpeed * Global.FPSfactor
|
||||
movementVector.x = movementX
|
||||
movementVector.z = movementZ
|
||||
position.x += movementX
|
||||
position.z += movementZ
|
||||
|
||||
|
|
@ -403,7 +407,7 @@ func _process(delta: float) -> void:
|
|||
if not UnableToMove:
|
||||
rotateStepSepRay()
|
||||
move_and_slide()
|
||||
snapDownToFloorCheck()
|
||||
#snapDownToFloorCheck()
|
||||
|
||||
ForceMove = false
|
||||
|
||||
|
|
@ -414,9 +418,9 @@ const RAY_ROT_L = deg_to_rad(-50)
|
|||
const RAY_ROT_R = deg_to_rad(50)
|
||||
var lastXzVel = Vector3()
|
||||
func rotateStepSepRay():
|
||||
var xzVel = velocity * Vector3(1, 0, 1)
|
||||
var xzVel = movementVector * Vector3(1, 0, 1)
|
||||
|
||||
if xzVel.length() < 0.1:
|
||||
if xzVel.length() < 0.0015:
|
||||
xzVel = lastXzVel
|
||||
else:
|
||||
lastXzVel = xzVel
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue