adde knight, door ok

ProfAndreaPollini · Jul 27, 2022 · e24efb3 · e24efb3
1 parent 0a3d19a
commit e24efb3
Show file tree

Hide file tree

Showing 27 changed files with 398 additions and 18 deletions.
diff --git a/GameScreen.tscn b/GameScreen.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=2]
+[gd_scene load_steps=22 format=2]
 
 [ext_resource path="res://GameScreen.gd" type="Script" id=1]
 [ext_resource path="res://assets/0x72_16x16DungeonTileset.v4.png" type="Texture" id=2]
@@ -9,6 +9,7 @@
 [ext_resource path="res://assets/0x72_16x16DungeonTileset_walls.v2.png" type="Texture" id=7]
 [ext_resource path="res://assets/Structures.png" type="Texture" id=8]
 [ext_resource path="res://lib/door/Door.tscn" type="PackedScene" id=9]
+[ext_resource path="res://lib/toggle/ToggleElement.tscn" type="PackedScene" id=10]
 
 [sub_resource type="ConvexPolygonShape2D" id=11]
 points = PoolVector2Array( 16, 16, 0, 16, 0, 16, 16, 16 )
@@ -226,6 +227,9 @@ tile_data = PoolIntArray( -65536, 0, 196608, -65535, 0, 196608, -65534, 0, 19660
 
 [node name="Door" parent="Level/Level0" instance=ExtResource( 9 )]
 position = Vector2( 128, 32 )
+context = {
+"toggle": NodePath("../ToggleElement")
+}
 
 [node name="King" parent="Level/Level0" instance=ExtResource( 3 )]
 visible = false
@@ -246,4 +250,7 @@ position = Vector2( 217, 102 )
 [node name="HUD" parent="Level/Level0" instance=ExtResource( 6 )]
 player_path = NodePath("../Player")
 
+[node name="ToggleElement" parent="Level/Level0" instance=ExtResource( 10 )]
+position = Vector2( 184, 72 )
+
 [node name="Overlays" type="Node" parent="."]
diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_1.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_1.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_2.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_2.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_3.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_3.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_4.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Idle_4.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_1.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_1.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_2.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_2.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_3.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_3.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_4.png.import b/assets/Fantasy RPG NPCs - Individuel Frames/Knight - Standard/Knight_Walk_4.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/assets/dungeontiles-extended v1.1/dungeontileset-extended.png.import b/assets/dungeontiles-extended v1.1/dungeontileset-extended.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

diff --git a/lib/SenseArea.gd b/lib/SenseArea.gd
@@ -1,5 +1,6 @@
 tool
 extends Area2D
+class_name SenseArea
 
 export(Array,String)  var sensing_groups
 export(NodePath) var entity

diff --git a/lib/SenseArea.tscn b/lib/SenseArea.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://lib/SenseArea.gd" type="Script" id=1]
 
 [sub_resource type="CircleShape2D" id=22]
-radius = 25.423
+radius = 32.787
 
 [node name="SenseArea" type="Area2D"]
 script = ExtResource( 1 )

diff --git a/lib/door/Door.gd b/lib/door/Door.gd
@@ -1,23 +1,45 @@
-extends Node2D
+extends StaticBody2D
 
 
 export(Vector2) var closed_door_region_position
 export(Vector2) var opened_door_region_position
 
+export(Dictionary) var context = {}
+
+onready var conditions = $Conditions.get_children()
+
 var is_opened := false setget set_opened
 
 func _ready():
+	for condition in conditions:
+		condition.setup(context)
 	set_opened(false)
+
+
+func check_conditions():
 
+	for condition in conditions:
+		if not condition.check():
+			print("no")
+			return false
+	return true
 
 func set_opened(opened):
+
 	if opened:
+		opened = check_conditions()
+
+	if opened:
+
 		$Sprite.region_rect.position = opened_door_region_position
 		#$SenseArea.set_collision_mask_bit(0,false)
+		set_collision_mask_bit(0,false)
+
 	else:
 		$Sprite.region_rect.position = closed_door_region_position
 		#$SenseArea.set_collision_mask_bit(0,true)
-
+		set_collision_mask_bit(0,true)
+	is_opened = opened
 
 func _on_SenseArea_mouse_entered():
 	set_opened(true)

diff --git a/lib/door/Door.tscn b/lib/door/Door.tscn
@@ -1,13 +1,16 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://assets/0x72_16x16DungeonTileset_walls.v2.png" type="Texture" id=1]
 [ext_resource path="res://lib/SenseArea.tscn" type="PackedScene" id=2]
 [ext_resource path="res://lib/door/Door.gd" type="Script" id=3]
+[ext_resource path="res://lib/toggle/Interactor.tscn" type="PackedScene" id=4]
+[ext_resource path="res://lib/toggle/Interactor.gd" type="Script" id=5]
+[ext_resource path="res://lib/door/ToggleEnabledCondition.gd" type="Script" id=6]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 16, 12 )
 
-[node name="Door" type="Area2D"]
+[node name="Door" type="StaticBody2D"]
 collision_layer = 64
 collision_mask = 17
 script = ExtResource( 3 )
@@ -28,5 +31,13 @@ radius = 32.787
 position = Vector2( 0, 4 )
 shape = SubResource( 1 )
 
+[node name="Conditions" type="Node" parent="."]
+
+[node name="ToggleEnabledCondition" type="Node" parent="Conditions"]
+script = ExtResource( 6 )
+
+[node name="Interactor" parent="." instance=ExtResource( 4 )]
+script = ExtResource( 5 )
+
 [connection signal="mouse_entered" from="SenseArea" to="." method="_on_SenseArea_mouse_entered"]
 [connection signal="mouse_exited" from="SenseArea" to="." method="_on_SenseArea_mouse_exited"]
diff --git a/lib/door/DoorWithKey.tscn b/lib/door/DoorWithKey.tscn
@@ -0,0 +1,15 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://lib/door/Door.tscn" type="PackedScene" id=1]
+[ext_resource path="res://lib/door/HasKeyCondition.gd" type="Script" id=2]
+[ext_resource path="res://lib/door/IsEnabledCondition.gd" type="Script" id=3]
+
+[node name="DoorWithKey" instance=ExtResource( 1 )]
+
+[node name="Conditions" type="Node" parent="." index="3"]
+
+[node name="InventoryContainsCondition" type="Node" parent="Conditions" index="0"]
+script = ExtResource( 2 )
+
+[node name="IsEnabledCondition" type="Node" parent="Conditions" index="1"]
+script = ExtResource( 3 )
diff --git a/lib/door/HasKeyCondition.gd b/lib/door/HasKeyCondition.gd
@@ -0,0 +1,7 @@
+extends Node
+
+export(NodePath) var player
+export(String) var object_id
+
+func check():
+	return true 
diff --git a/lib/door/InventoryContainsCondition.tscn b/lib/door/InventoryContainsCondition.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://lib/door/HasKeyCondition.gd" type="Script" id=1]
+
+[node name="InventoryContainsCondition" type="Node"]
+script = ExtResource( 1 )
diff --git a/lib/door/IsEnabledCondition.gd b/lib/door/IsEnabledCondition.gd
@@ -0,0 +1,5 @@
+extends Node
+
+
+func check() -> bool:
+	return true
diff --git a/lib/door/IsEnabledCondition.tscn b/lib/door/IsEnabledCondition.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://lib/door/IsEnabledCondition.gd" type="Script" id=1]
+
+[node name="IsEnabledCondition" type="Node"]
+script = ExtResource( 1 )
diff --git a/lib/door/ToggleEnabledCondition.gd b/lib/door/ToggleEnabledCondition.gd
@@ -0,0 +1,16 @@
+extends Node
+
+onready var toggle
+
+func setup(context) -> void:
+	toggle = get_parent().get_parent().get_node(context.get("toggle"))
+
+
+func check() -> bool:
+
+	if toggle.is_toggled:
+		print("toggled")
+	else:
+		print("not toggled")
+	return toggle.is_toggled
+