Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit fe18d63

Browse files
Leo MaihöferLeo Maihöfer
authored andcommitted
implemented semaphore for responseQueue
1 parent 1900966 commit fe18d63

2 files changed

Lines changed: 23 additions & 79 deletions

File tree

scenes/levels/ExampleScene.tscn

Lines changed: 22 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=139 format=4 uid="uid://dfkwq6qwtxw25"]
1+
[gd_scene load_steps=135 format=4 uid="uid://dfkwq6qwtxw25"]
22

33
[ext_resource type="Script" path="res://scripts/EnemyManager.cs" id="1_bmkfv"]
44
[ext_resource type="Script" path="res://scripts/Map.cs" id="1_pa1ge"]
@@ -46,20 +46,18 @@
4646
[ext_resource type="Texture2D" uid="uid://d1yvwy2drdwqd" path="res://assets/tilemaps/Reg tree wall.png" id="38_dsao3"]
4747
[ext_resource type="Texture2D" uid="uid://cn0pcaddy8lcv" path="res://assets/tilemaps/TX Struct.png" id="39_jhhw6"]
4848
[ext_resource type="Texture2D" uid="uid://bxo85wuubsbn2" path="res://assets/tilemaps/TX Tileset Wall.png" id="40_6y0o1"]
49-
[ext_resource type="Texture2D" uid="uid://doa646stnhnlu" path="res://assets/tilemaps/CaveTileset.png" id="44_3be5u"]
49+
[ext_resource type="Texture2D" uid="uid://dupi1mwbxnhef" path="res://assets/tilemaps/CaveTileset.png" id="44_3be5u"]
5050
[ext_resource type="TileSet" uid="uid://drgqbpyytiqxq" path="res://scenes/levels/CaveTileset.tres" id="44_njbx8"]
5151
[ext_resource type="TileSet" uid="uid://d2huqyd455jkj" path="res://assets/tilemaps/CratersTileset.tres" id="44_pqt0n"]
5252
[ext_resource type="Texture2D" uid="uid://cf35q1itw0rjk" path="res://assets/tilemaps/OtherTileset.png" id="44_ue1vq"]
5353
[ext_resource type="TileSet" uid="uid://cr4dvg656pbdl" path="res://scenes/levels/GrassTileset.tres" id="45_sj3iv"]
5454
[ext_resource type="TileSet" uid="uid://ctvb82jg20e6r" path="res://assets/tilemaps/AlienTrees.tres" id="45_xsodu"]
5555
[ext_resource type="Texture2D" uid="uid://bdww2mlgdic6y" path="res://assets/tilemaps/TreesTileset.png" id="47_3i3s2"]
56-
[ext_resource type="PackedScene" uid="uid://dr53bjmurlnut" path="res://scenes/Tutorial.tscn" id="48_3yv6f"]
56+
[ext_resource type="PackedScene" path="res://scenes/Tutorial.tscn" id="48_3yv6f"]
5757
[ext_resource type="Script" path="res://scripts/Interaction/CodeInput.cs" id="48_x4dce"]
5858
[ext_resource type="Texture2D" uid="uid://b1n85g1blpu64" path="res://assets/tilemaps/Houses.png" id="49_pb6br"]
5959
[ext_resource type="Texture2D" uid="uid://cmy47y4t8sx0w" path="res://assets/sprites/BigTree.ShrubberyAnimation.png" id="58_5gqqc"]
6060
[ext_resource type="PackedScene" uid="uid://xy3d46bjniyg" path="res://scenes/levels/BigTree/insideBigTree.tscn" id="58_llp75"]
61-
[ext_resource type="PackedScene" path="res://scenes/prefabs/teleport.tscn" id="59_8fv5o"]
62-
[ext_resource type="PackedScene" uid="uid://cb7y0rhixpx4d" path="res://scenes/prefabs/destination.tscn" id="60_mti2g"]
6361

6462
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qwcva"]
6563
bg_color = Color(0.6, 0.6, 0.6, 0.654902)
@@ -14972,9 +14970,8 @@ vertices = PackedVector2Array(14513, -10165, 14519, 6775.99, -14133, 6772, 13685
1497214970
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(3, 2, 4, 5)])
1497314971
outlines = Array[PackedVector2Array]([PackedVector2Array(-14143, 6782, -14143, -13823, 13696, -13824, 13695, -10176, 14523, -10175, 14529, 6786), PackedVector2Array(441.376, 2548.91, 716.14, 2538.64, 721.255, 2638.77, 461.107, 2617.72)])
1497414972

14975-
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_6rxiw"]
14976-
radius = 198.002
14977-
height = 625.975
14973+
[sub_resource type="RectangleShape2D" id="RectangleShape2D_g520r"]
14974+
size = Vector2(190.043, 242.52)
1497814975

1497914976
[sub_resource type="SegmentShape2D" id="SegmentShape2D_i54bb"]
1498014977
a = Vector2(-14, -120)
@@ -15405,15 +15402,15 @@ scale = Vector2(0.999999, 0.999999)
1540515402

1540615403
[node name="InsideBigHouse" type="Node2D" parent="Abandoned Village/Sprite2D"]
1540715404
z_index = 2
15408-
position = Vector2(5807.01, -4040)
15405+
position = Vector2(-221, -475.001)
1540915406
script = ExtResource("25_0y114")
1541015407
SceneToShow = ExtResource("26_vmw0c")
1541115408
Radius = 500
1541215409
ItemActivationStatus = false
1541315410

1541415411
[node name="InsideBigHouse2" parent="Abandoned Village/Sprite2D" instance=ExtResource("26_vmw0c")]
1541515412
z_index = 30
15416-
position = Vector2(5812.01, -3628)
15413+
position = Vector2(-222, -200.001)
1541715414
scale = Vector2(3.7, 6.5)
1541815415

1541915416
[node name="VisibleForAI" type="Node2D" parent="Abandoned Village/Sprite2D"]
@@ -15453,7 +15450,6 @@ MusicPlayer2 = NodePath("../../AudioManager/creepy_music")
1545315450
[node name="Node2D" type="Node2D" parent="Abandoned Village"]
1545415451

1545515452
[node name="Sprite2D" type="Sprite2D" parent="Abandoned Village/Node2D"]
15456-
position = Vector2(8097, -5543)
1545715453

1545815454
[node name="InsideSmallHouse" parent="Abandoned Village/Node2D/Sprite2D" instance=ExtResource("19_qd0ov")]
1545915455
z_index = 30
@@ -15516,7 +15512,7 @@ script = ExtResource("6_7bcmx")
1551615512
NameForAi = "Torch"
1551715513

1551815514
[node name="Torch" parent="." instance=ExtResource("13_05imv")]
15519-
position = Vector2(11335, -9281)
15515+
position = Vector2(5631, -5569)
1552015516
ObjectName = "Torch"
1552115517
ObjectDescription = "An unlit Torch, engraved with ceremonial runes. It seems to important to just be burned, maybe it functions differently then a regular torch"
1552215518
ObjectHint = "Tell the commander about the object you just spotted. You may use the command [INTERACT] or [GOTO AND INTERACT]."
@@ -15899,9 +15895,9 @@ ShowWhileInRadius = true
1589915895

1590015896
[node name="CollisionShape2D" type="CollisionShape2D" parent="Big Tree/StaticBody2D"]
1590115897
z_index = 50
15902-
position = Vector2(94, -259)
15898+
position = Vector2(95, -200)
1590315899
rotation = -1.56722
15904-
shape = SubResource("CapsuleShape2D_6rxiw")
15900+
shape = SubResource("RectangleShape2D_g520r")
1590515901

1590615902
[node name="CaveEntranceTerminal" parent="." instance=ExtResource("13_05imv")]
1590715903
unique_name_in_owner = true
@@ -15918,7 +15914,7 @@ position = Vector2(-60, 114)
1591815914
shape = SubResource("SegmentShape2D_i54bb")
1591915915

1592015916
[node name="Scar" parent="." instance=ExtResource("13_05imv")]
15921-
position = Vector2(5647, -8048)
15917+
position = Vector2(5613, -8059)
1592215918
ObjectName = "Scar"
1592315919
ObjectDescription = "A big scar on the tree which could be the reason for the tree looking dead. It is not reachable because of the scrub"
1592415920
CustomOverrideMessage = "The tree seems to have recovered from the injurys and opens up to give the entrance to it's inside."
@@ -15958,6 +15954,17 @@ shape = SubResource("SegmentShape2D_k0qre")
1595815954
[node name="Big Tree" type="Sprite2D" parent="Node2D"]
1595915955
position = Vector2(5613, -8059)
1596015956

15957+
[node name="InsideBigTree" parent="Node2D/Big Tree" instance=ExtResource("58_llp75")]
15958+
z_index = 30
15959+
position = Vector2(114, 58)
15960+
scale = Vector2(2.5, 2.5)
15961+
15962+
[node name="ShowWhileInRadius" type="Node2D" parent="Node2D/Big Tree"]
15963+
scale = Vector2(2.5, 2.5)
15964+
script = ExtResource("25_0y114")
15965+
SceneToShow = ExtResource("58_llp75")
15966+
Radius = 500
15967+
1596115968
[node name="AnimationPlayer" type="AnimationPlayer" parent="Node2D"]
1596215969
root_node = NodePath("../TreeScrub")
1596315970
libraries = {
@@ -15970,66 +15977,3 @@ position = Vector2(5655, -8388)
1597015977
scale = Vector2(3.5, 3.5)
1597115978
texture = ExtResource("58_5gqqc")
1597215979
hframes = 17
15973-
15974-
[node name="InsideBigTree" parent="." instance=ExtResource("58_llp75")]
15975-
position = Vector2(9634, -8452)
15976-
scale = Vector2(5.81, 5.81)
15977-
15978-
[node name="TeleportNodes" type="Node" parent="."]
15979-
15980-
[node name="Teleport" parent="TeleportNodes" node_paths=PackedStringArray("Destination") instance=ExtResource("59_8fv5o")]
15981-
position = Vector2(8245, -5525)
15982-
Length = 150
15983-
Width = 20
15984-
Destination = NodePath("../Destination")
15985-
15986-
[node name="Teleport2" parent="TeleportNodes" node_paths=PackedStringArray("Destination") instance=ExtResource("59_8fv5o")]
15987-
position = Vector2(12094, -6034)
15988-
Length = 150
15989-
Width = 10
15990-
Destination = NodePath("../Destination2")
15991-
15992-
[node name="Teleport3" parent="TeleportNodes" node_paths=PackedStringArray("Destination") instance=ExtResource("59_8fv5o")]
15993-
position = Vector2(8391, -2350)
15994-
scale = Vector2(0.999999, 0.999999)
15995-
Length = 150
15996-
Width = 10
15997-
Destination = NodePath("../Destination3")
15998-
15999-
[node name="Teleport4" parent="TeleportNodes" node_paths=PackedStringArray("Destination") instance=ExtResource("59_8fv5o")]
16000-
position = Vector2(14412, -5950)
16001-
scale = Vector2(0.999999, 0.999999)
16002-
Length = 200
16003-
Width = 10
16004-
Destination = NodePath("../Destination4")
16005-
16006-
[node name="Teleport5" parent="TeleportNodes" node_paths=PackedStringArray("Destination") instance=ExtResource("59_8fv5o")]
16007-
position = Vector2(9147, -401)
16008-
Length = 150
16009-
Width = 10
16010-
Destination = NodePath("../Destination5")
16011-
16012-
[node name="Teleport6" parent="TeleportNodes" node_paths=PackedStringArray("Destination") instance=ExtResource("59_8fv5o")]
16013-
position = Vector2(17248, -6058)
16014-
Length = 200
16015-
Width = 10
16016-
Destination = NodePath("../Destination6")
16017-
16018-
[node name="Destination" parent="TeleportNodes" instance=ExtResource("60_mti2g")]
16019-
position = Vector2(12091, -6203)
16020-
16021-
[node name="Destination2" parent="TeleportNodes" instance=ExtResource("60_mti2g")]
16022-
position = Vector2(8246, -5413)
16023-
16024-
[node name="Destination3" parent="TeleportNodes" instance=ExtResource("60_mti2g")]
16025-
position = Vector2(14412, -6109)
16026-
scale = Vector2(0.999999, 0.999999)
16027-
16028-
[node name="Destination4" parent="TeleportNodes" instance=ExtResource("60_mti2g")]
16029-
position = Vector2(8388, -2284)
16030-
16031-
[node name="Destination5" parent="TeleportNodes" instance=ExtResource("60_mti2g")]
16032-
position = Vector2(17248, -6144)
16033-
16034-
[node name="Destination6" parent="TeleportNodes" instance=ExtResource("60_mti2g")]
16035-
position = Vector2(9149, -333)

scripts/Chat.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private async Task HandleInputAsync(string input)
145145
else
146146
{
147147
string? response = await GeminiService.MakeQuery(completeInput); //Run on background thread
148-
if (response != null || response == "")
148+
if (response is not null or "")
149149
{
150150
EmitSignal(SignalName.ResponseReceived, response, new Ally());
151151
GD.Print($"----------------\nResponse:\n{response}");

0 commit comments

Comments
 (0)