removed an oppsie

This commit is contained in:
SlightlyObscure 2019-11-18 18:25:57 +01:00
parent 95f354ed74
commit 469f254644
4 changed files with 12 additions and 10 deletions

View File

@ -16,12 +16,11 @@ lookingAt_nodepath = NodePath("Body/Camera/LookingAt")
[node name="Body" type="Spatial" parent="."] [node name="Body" type="Spatial" parent="."]
[node name="Camera" type="Camera" parent="Body"] [node name="Camera" type="Camera" parent="Body"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 )
current = true current = true
far = 500.0
[node name="LookingAt" type="RayCast" parent="Body/Camera"] [node name="LookingAt" type="RayCast" parent="Body/Camera"]
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 ) transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 )
enabled = true enabled = true
cast_to = Vector3( 0, 0, 2 ) cast_to = Vector3( 0, 0, 2 )

View File

@ -98,12 +98,14 @@ card_lvl = 1
[node name="Door" parent="." instance=ExtResource( 7 )] [node name="Door" parent="." instance=ExtResource( 7 )]
transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 10 ) transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 10 )
card_door = false
[node name="Door2" parent="." instance=ExtResource( 7 )] [node name="Door2" parent="." instance=ExtResource( 7 )]
transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 8 ) transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 8 )
door_id = 1 card_door = false
door_lvl = 1
[node name="Door3" parent="." instance=ExtResource( 7 )] [node name="Door3" parent="." instance=ExtResource( 7 )]
transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 6 ) transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 6 )
card_door = true card_door = true
door_id = 1 door_lvl = 1

View File

@ -2,7 +2,7 @@ extends KinematicBody
# export variables # export variables
export(bool) var card_door export(bool) var card_door
export(int) var door_id export(int) var door_lvl
# const # const
const OPENING_SPEED = 50 const OPENING_SPEED = 50
@ -25,12 +25,12 @@ func _process(delta):
# called by player to interact with this scene # called by player to interact with this scene
func do_interact(var player): func do_interact(var player):
if card_door: if card_door:
if player.keycard_lvl >= door_id: if player.keycard_lvl >= door_lvl:
_isMoving = true _isMoving = true
_isOpening = !_isOpening _isOpening = !_isOpening
else: else:
print("keycard level too low") print("keycard level too low")
elif player.key_chain.has(door_id) or door_id == 0: elif player.key_chain.has(door_lvl) or door_lvl == 0:
_isMoving = true _isMoving = true
_isOpening = !_isOpening _isOpening = !_isOpening
else: else:

View File

@ -8,8 +8,9 @@ func _ready():
pass # Replace with function body. pass # Replace with function body.
func do_interact(var player): func do_interact(var player):
player.keycard_lvl = card_lvl if card_lvl > player.keycard_lvl:
queue_free() player.keycard_lvl = card_lvl
queue_free()
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):