This commit is contained in:
1 parent
baeb8c78ca
commit
fe5d4dd4ba
14 files changed
+223
-11
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 444 B |
@@ -0,0 +1,43 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dgdkh6ug00c1i"
|
||||
path="res://.godot/imported/a_button.png-b61c5afa519361c1c8042b68eac4b874.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/controls/a_button.png"
|
||||
dest_files=["res://.godot/imported/a_button.png-b61c5afa519361c1c8042b68eac4b874.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/high_quality_mode=0
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
mipmaps/preserve_alpha_test_coverage=false
|
||||
mipmaps/alpha_test_threshold=0.5
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 444 B |
@@ -0,0 +1,43 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://br3x26uxp4we1"
|
||||
path="res://.godot/imported/b_button.png-872952b6274b25e12ec7a11367a3c731.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/controls/b_button.png"
|
||||
dest_files=["res://.godot/imported/b_button.png-872952b6274b25e12ec7a11367a3c731.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/high_quality_mode=0
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
mipmaps/preserve_alpha_test_coverage=false
|
||||
mipmaps/alpha_test_threshold=0.5
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 424 B |
@@ -0,0 +1,43 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bq82wmjgkgyr6"
|
||||
path="res://.godot/imported/e_key.png-4fb0b6402a8a3b59f224e435a5e81939.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/controls/e_key.png"
|
||||
dest_files=["res://.godot/imported/e_key.png-4fb0b6402a8a3b59f224e435a5e81939.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/high_quality_mode=0
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
mipmaps/preserve_alpha_test_coverage=false
|
||||
mipmaps/alpha_test_threshold=0.5
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 424 B |
@@ -0,0 +1,43 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dap66w6y5315a"
|
||||
path="res://.godot/imported/space_key.png-5b51cba03f7f09d916ff19e36f43fc58.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/controls/space_key.png"
|
||||
dest_files=["res://.godot/imported/space_key.png-5b51cba03f7f09d916ff19e36f43fc58.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/high_quality_mode=0
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
mipmaps/preserve_alpha_test_coverage=false
|
||||
mipmaps/alpha_test_threshold=0.5
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
+11
-4
@@ -2,7 +2,8 @@
|
||||
|
||||
[ext_resource type="Script" uid="uid://b64hyvumk366h" path="res://hidden_sign.gd" id="1_a20ku"]
|
||||
[ext_resource type="Texture2D" uid="uid://djlqqmqpsd0kc" path="res://art/sign.png" id="2_soj2u"]
|
||||
[ext_resource type="Texture2D" uid="uid://d0cd1alr8k706" path="res://art/interact_button.png" id="3_7o2b3"]
|
||||
[ext_resource type="Texture2D" uid="uid://dgdkh6ug00c1i" path="res://art/controls/a_button.png" id="3_soj2u"]
|
||||
[ext_resource type="Texture2D" uid="uid://bq82wmjgkgyr6" path="res://art/controls/e_key.png" id="4_7o2b3"]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_eumkw"]
|
||||
size = Vector2(26, 32)
|
||||
@@ -19,11 +20,17 @@ texture = ExtResource("2_soj2u")
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D/Area2D" unique_id=1560168165]
|
||||
shape = SubResource("RectangleShape2D_eumkw")
|
||||
|
||||
[node name="ButtonPrompt" type="Sprite2D" parent="Sprite2D" unique_id=1864817335]
|
||||
[node name="ButtonPrompt" type="Sprite2D" parent="Sprite2D" unique_id=1936022603]
|
||||
visible = false
|
||||
position = Vector2(0, -8.000002)
|
||||
position = Vector2(0, -24)
|
||||
scale = Vector2(0.8, 0.8)
|
||||
texture = ExtResource("3_7o2b3")
|
||||
texture = ExtResource("3_soj2u")
|
||||
|
||||
[node name="KeyPrompt" type="Sprite2D" parent="Sprite2D" unique_id=715238624]
|
||||
visible = false
|
||||
position = Vector2(0, -24)
|
||||
scale = Vector2(0.8, 0.8)
|
||||
texture = ExtResource("4_7o2b3")
|
||||
|
||||
[connection signal="interacted" from="." to="." method="_on_interacted"]
|
||||
[connection signal="body_entered" from="Sprite2D/Area2D" to="." method="_on_approach"]
|
||||
|
||||
@@ -33,11 +33,21 @@ func _on_approach(body) -> void:
|
||||
return
|
||||
_is_interactable = true
|
||||
self.add_to_group("nearby_interactables")
|
||||
if %Player2D.controller_ui:
|
||||
print("CONTROLLER UI")
|
||||
$Sprite2D/ButtonPrompt.show()
|
||||
$Sprite2D/KeyPrompt.hide()
|
||||
else:
|
||||
print("KEYBOARD UI")
|
||||
$Sprite2D/KeyPrompt.show()
|
||||
$Sprite2D/ButtonPrompt.hide()
|
||||
|
||||
func _on_abandon(body) -> void:
|
||||
if body!=%Player2D:
|
||||
return
|
||||
_is_interactable = false
|
||||
self.remove_from_group("nearby_interactables")
|
||||
if %Player2D.controller_ui:
|
||||
$Sprite2D/ButtonPrompt.hide()
|
||||
else:
|
||||
$Sprite2D/KeyPrompt.hide()
|
||||
+9
-2
@@ -2,8 +2,9 @@
|
||||
|
||||
[ext_resource type="Script" uid="uid://bh588bpddschq" path="res://pharaoh.gd" id="1_mt7kg"]
|
||||
[ext_resource type="Texture2D" uid="uid://b2nldodte5p6s" path="res://art/sarco_closed.png" id="2_mt7kg"]
|
||||
[ext_resource type="Texture2D" uid="uid://d0cd1alr8k706" path="res://art/interact_button.png" id="3_6vea8"]
|
||||
[ext_resource type="Texture2D" uid="uid://b7t1tef0syf74" path="res://art/sarco_open.png" id="3_r6lmd"]
|
||||
[ext_resource type="Texture2D" uid="uid://dgdkh6ug00c1i" path="res://art/controls/a_button.png" id="4_p22wv"]
|
||||
[ext_resource type="Texture2D" uid="uid://bq82wmjgkgyr6" path="res://art/controls/e_key.png" id="5_j5wn3"]
|
||||
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_xwxqv"]
|
||||
animations = [{
|
||||
@@ -46,7 +47,13 @@ shape = SubResource("RectangleShape2D_eumkw")
|
||||
visible = false
|
||||
position = Vector2(0, -24)
|
||||
scale = Vector2(0.8, 0.8)
|
||||
texture = ExtResource("3_6vea8")
|
||||
texture = ExtResource("4_p22wv")
|
||||
|
||||
[node name="KeyPrompt" type="Sprite2D" parent="Sprite2D" unique_id=1070463653]
|
||||
visible = false
|
||||
position = Vector2(0, -24)
|
||||
scale = Vector2(0.8, 0.8)
|
||||
texture = ExtResource("5_j5wn3")
|
||||
|
||||
[connection signal="interacted" from="." to="." method="_on_interacted"]
|
||||
[connection signal="body_entered" from="Sprite2D/Area2D" to="." method="_on_approach"]
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
extends CharacterBody2D
|
||||
|
||||
var controller_ui = false
|
||||
|
||||
const SPEED = 380.0
|
||||
const DASH_SPEED = 600
|
||||
const HORIZONTAL_DASH_MULT = 1.8
|
||||
@@ -119,6 +121,13 @@ func on_death(instant = false, player_position = position):
|
||||
death_cooldown = 0
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if Input.is_key_pressed(Key.KEY_W) or Input.is_key_pressed(Key.KEY_A) or Input.is_key_pressed(Key.KEY_S) or Input.is_key_pressed(Key.KEY_D):
|
||||
print("KEYBOARD")
|
||||
controller_ui = false
|
||||
elif Input.get_action_strength("move_horizontal") > 0:
|
||||
print("CONTROLLER")
|
||||
controller_ui = true
|
||||
|
||||
if Input.is_action_just_released("restart") or (Input.is_action_pressed("controller_restart_left") and Input.is_action_pressed("controller_restart_right")):
|
||||
get_tree().reload_current_scene()
|
||||
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
[ext_resource type="Script" uid="uid://dvo0iux2pcggi" path="res://sign.gd" id="1_q3tny"]
|
||||
[ext_resource type="Texture2D" uid="uid://djlqqmqpsd0kc" path="res://art/sign.png" id="2_q3tny"]
|
||||
[ext_resource type="Texture2D" uid="uid://d0cd1alr8k706" path="res://art/interact_button.png" id="3_e8cgb"]
|
||||
[ext_resource type="Texture2D" uid="uid://dgdkh6ug00c1i" path="res://art/controls/a_button.png" id="3_tbceu"]
|
||||
[ext_resource type="Texture2D" uid="uid://bq82wmjgkgyr6" path="res://art/controls/e_key.png" id="4_e8cgb"]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_eumkw"]
|
||||
size = Vector2(26, 32)
|
||||
@@ -20,11 +21,17 @@ texture = ExtResource("2_q3tny")
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D/Area2D" unique_id=1560168165]
|
||||
shape = SubResource("RectangleShape2D_eumkw")
|
||||
|
||||
[node name="ButtonPrompt" type="Sprite2D" parent="Sprite2D" unique_id=1864817335]
|
||||
[node name="ButtonPrompt" type="Sprite2D" parent="Sprite2D" unique_id=385403317]
|
||||
visible = false
|
||||
position = Vector2(0, -8.000002)
|
||||
position = Vector2(0.99999994, -7.000002)
|
||||
scale = Vector2(0.8, 0.8)
|
||||
texture = ExtResource("3_e8cgb")
|
||||
texture = ExtResource("3_tbceu")
|
||||
|
||||
[node name="KeyPrompt" type="Sprite2D" parent="Sprite2D" unique_id=1108548281]
|
||||
visible = false
|
||||
position = Vector2(0.99999994, -6.000002)
|
||||
scale = Vector2(0.8, 0.8)
|
||||
texture = ExtResource("4_e8cgb")
|
||||
|
||||
[connection signal="interacted" from="." to="." method="_on_interacted"]
|
||||
[connection signal="body_entered" from="Sprite2D/Area2D" to="." method="_on_approach"]
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ func _ready() -> void:
|
||||
add_to_group("TELEPORTERS")
|
||||
|
||||
func check_for_pair() -> String:
|
||||
print(paired_teleporter)
|
||||
#print(paired_teleporter)
|
||||
return paired_teleporter
|
||||
|
||||
func disable():
|
||||
|
||||
Reference in new issue
Block a user