diff --git a/Assets/Guards/EliteGuard.ase b/Assets/Guards/EliteGuard.ase index ef54bda..7147d73 100644 Binary files a/Assets/Guards/EliteGuard.ase and b/Assets/Guards/EliteGuard.ase differ diff --git a/Assets/Guards/EliteGuard.png b/Assets/Guards/EliteGuard.png index 9cefd13..cf90d5a 100644 Binary files a/Assets/Guards/EliteGuard.png and b/Assets/Guards/EliteGuard.png differ diff --git a/Assets/Guards/EliteGuardGreen.ase b/Assets/Guards/EliteGuardGreen.ase index 07fb1b3..be1ad13 100644 Binary files a/Assets/Guards/EliteGuardGreen.ase and b/Assets/Guards/EliteGuardGreen.ase differ diff --git a/Assets/Guards/EliteGuardGreen.png b/Assets/Guards/EliteGuardGreen.png index bd9de48..135a400 100644 Binary files a/Assets/Guards/EliteGuardGreen.png and b/Assets/Guards/EliteGuardGreen.png differ diff --git a/Src/Guard/EliteGuard/EliteGuard.gd b/Src/Guard/EliteGuard/EliteGuard.gd index 2572b2e..6c51ef8 100644 --- a/Src/Guard/EliteGuard/EliteGuard.gd +++ b/Src/Guard/EliteGuard/EliteGuard.gd @@ -13,6 +13,8 @@ var player onready var losRay: RayCast2D = $Flippable/LOSRay onready var pathLine: PathLine = $PathLine +var guard_normal_texture: Texture = preload("res://Assets/Guards/EliteGuard.png") +var guard_green_texture: Texture = preload("res://Assets/Guards/EliteGuardGreen.png") func _ready() -> void: speed = normalSpeed @@ -21,6 +23,12 @@ func _ready() -> void: $Flippable/TaserRange.connect("body_entered", self, "onTaserRangeBodyEntered") $AnimationPlayer.connect("animation_finished", self, "onAnimationFinished") + # sets sprite texture on level type + match Global.game_manager.getCurrentLevel().level_type: + Types.LevelTypes.Western: + $Flippable/Sprite.texture = guard_normal_texture + Types.LevelTypes.Eastern: + $Flippable/Sprite.texture = guard_green_texture func _physics_process(delta: float) -> void: velocity = direction * speed diff --git a/Src/Guard/EliteGuard/EliteGuard.tscn b/Src/Guard/EliteGuard/EliteGuard.tscn index 0caae98..93875b6 100644 --- a/Src/Guard/EliteGuard/EliteGuard.tscn +++ b/Src/Guard/EliteGuard/EliteGuard.tscn @@ -36,10 +36,10 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 0.2 ), -"transitions": PoolRealArray( 1, 1 ), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [ 9, 10 ] +"values": [ 0, 9, 10 ] } [sub_resource type="Animation" id=5] @@ -69,7 +69,7 @@ script = ExtResource( 2 ) position = Vector2( 0, -16 ) texture = ExtResource( 1 ) hframes = 11 -frame = 5 +frame = 6 [node name="LineOfSight" type="Area2D" parent="Flippable"] diff --git a/Src/Levels/TestLevel.tscn b/Src/Levels/TestLevel.tscn index 37e67d6..338cebb 100644 --- a/Src/Levels/TestLevel.tscn +++ b/Src/Levels/TestLevel.tscn @@ -113,16 +113,10 @@ door_name = "DoorWall11" [node name="StaircaseCellar" parent="LevelObjects/Doors" instance=ExtResource( 10 )] position = Vector2( 240, 320 ) connected_door_path = NodePath("../../../../Level6/LevelObjects/Doors/StaircaseE0") -lockLevel = 0 -doorType = 0 -door_name = "" [node name="StaircaseE0" parent="LevelObjects/Doors" instance=ExtResource( 10 )] position = Vector2( 240, 256 ) connected_door_path = NodePath("../../../../Level6/LevelObjects/Doors/StaircaseCellar") -lockLevel = 0 -doorType = 0 -door_name = "" [node name="DoorWall" parent="LevelObjects/Doors" instance=ExtResource( 8 )] position = Vector2( -196.565, 256 ) @@ -134,9 +128,7 @@ hint = "This door is locked " [node name="Staircase" parent="LevelObjects/Doors" instance=ExtResource( 10 )] position = Vector2( -129.695, 256.354 ) connected_door_path = NodePath("../StaircaseE0") -lockLevel = 0 doorType = 1 -door_name = "" [node name="Lights" type="Node2D" parent="LevelObjects"] __meta__ = { @@ -218,8 +210,6 @@ script = ExtResource( 15 ) [node name="Closet" parent="." instance=ExtResource( 23 )] position = Vector2( -240, 256 ) -canHidePlayer = true -canBeOpened = true [node name="Guard" parent="." instance=ExtResource( 22 )] position = Vector2( -362.162, 254.294 ) diff --git a/_Org/_steam/events/week1/dog.gif b/_Org/_steam/events/week1/dog.gif new file mode 100644 index 0000000..8a83c71 Binary files /dev/null and b/_Org/_steam/events/week1/dog.gif differ diff --git a/_Org/_steam/events/week1/portraits.png b/_Org/_steam/events/week1/portraits.png new file mode 100644 index 0000000..823b847 Binary files /dev/null and b/_Org/_steam/events/week1/portraits.png differ