From 469f254644f458a3088b3d7c62256505f950b973 Mon Sep 17 00:00:00 2001
From: SlightlyObscure <33038788+SlightlyObscure@users.noreply.github.com>
Date: Mon, 18 Nov 2019 18:25:57 +0100
Subject: [PATCH] removed an oppsie

---
 Characters/Player/Player.tscn | 5 ++---
 Level/PathTestWorld.tscn      | 6 ++++--
 Things/Door/Door.gd           | 6 +++---
 Things/Keycard/Keycard.gd     | 5 +++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn
index 6b63c2d..0d5a1b9 100644
--- a/Characters/Player/Player.tscn
+++ b/Characters/Player/Player.tscn
@@ -16,12 +16,11 @@ lookingAt_nodepath = NodePath("Body/Camera/LookingAt")
 [node name="Body" type="Spatial" parent="."]
 
 [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
-far = 500.0
 
 [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
 cast_to = Vector3( 0, 0, 2 )
 
diff --git a/Level/PathTestWorld.tscn b/Level/PathTestWorld.tscn
index c5a30f8..c18fdb7 100644
--- a/Level/PathTestWorld.tscn
+++ b/Level/PathTestWorld.tscn
@@ -98,12 +98,14 @@ card_lvl = 1
 
 [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 )
+card_door = false
 
 [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 )
-door_id = 1
+card_door = false
+door_lvl = 1
 
 [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 )
 card_door = true
-door_id = 1
+door_lvl = 1
diff --git a/Things/Door/Door.gd b/Things/Door/Door.gd
index f67ec15..cd8859a 100644
--- a/Things/Door/Door.gd
+++ b/Things/Door/Door.gd
@@ -2,7 +2,7 @@ extends KinematicBody
 
 # export variables
 export(bool) var card_door
-export(int) var door_id
+export(int) var door_lvl
 
 # const
 const OPENING_SPEED = 50
@@ -25,12 +25,12 @@ func _process(delta):
 # called by player to interact with this scene
 func do_interact(var player):
 	if card_door:
-		if player.keycard_lvl >= door_id:
+		if player.keycard_lvl >= door_lvl:
 			_isMoving = true
 			_isOpening = !_isOpening
 		else:
 			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
 		_isOpening = !_isOpening
 	else:
diff --git a/Things/Keycard/Keycard.gd b/Things/Keycard/Keycard.gd
index 5222588..b1dd50b 100644
--- a/Things/Keycard/Keycard.gd
+++ b/Things/Keycard/Keycard.gd
@@ -8,8 +8,9 @@ func _ready():
 	pass # Replace with function body.
 
 func do_interact(var player):
-	player.keycard_lvl = card_lvl
-	queue_free()
+	if card_lvl > player.keycard_lvl:
+		player.keycard_lvl = card_lvl
+		queue_free()
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):