snider/project-dung
snider/project-dung
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added the bed to dev-akshay scene. Also updated the input mapping to map action button on the controller

Browse Source
This commit is contained in:
akshay 2022-08-17 21:32:07 -04:00
parent 22dafb6ab2
commit 63c0199d77
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project.godot
View File

@ -152,6 +152,7 @@ right={
action={ action={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":32,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":32,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
dialogic_default_action={ dialogic_default_action={

18
scenes/dev-akshay.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=2] [gd_scene load_steps=27 format=2]
[ext_resource path="res://scenes/player.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://scripts/dof_focus.gd" type="Script" id=2] [ext_resource path="res://scripts/dof_focus.gd" type="Script" id=2]
@ -19,6 +19,7 @@
[ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=17] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=17]
[ext_resource path="res://scenes/comm_station.tscn" type="PackedScene" id=18] [ext_resource path="res://scenes/comm_station.tscn" type="PackedScene" id=18]
[ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=19] [ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=19]
[ext_resource path="res://scenes/bed.tscn" type="PackedScene" id=20]
[sub_resource type="CylinderShape" id=8] [sub_resource type="CylinderShape" id=8]
height = 5.22615 height = 5.22615
@ -212,7 +213,7 @@ target = NodePath("../Player")
size = 4.0 size = 4.0
[node name="Player" parent="." instance=ExtResource( 1 )] [node name="Player" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 5.27448 ) transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 15.4653 )
[node name="power_station" parent="." instance=ExtResource( 3 )] [node name="power_station" parent="." instance=ExtResource( 3 )]
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0 ) transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0 )
@ -272,6 +273,19 @@ transform = Transform( -1.3411e-07, 0, 3, 0, 3, 0, -3, 0, -1.3411e-07, -1.295, 3
modulate = Color( 0, 0, 0, 1 ) modulate = Color( 0, 0, 0, 1 )
text = "TRANSFORMATRON" text = "TRANSFORMATRON"
[node name="Bed_Room" type="Spatial" parent="."]
transform = Transform( -0.999913, 0, 0.0131247, 0, 1, 0, -0.0131247, 0, -0.999913, -0.0536704, 0, 8.64287 )
[node name="Room_Label" type="Label3D" parent="Bed_Room"]
transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 )
modulate = Color( 0, 0, 0, 1 )
text = "Snoozer"
[node name="bed_hop_position" type="Spatial" parent="Bed_Room"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.216576, 0, -8.63037 )
[node name="bed" parent="Bed_Room/bed_hop_position" instance=ExtResource( 20 )]
[node name="Galley_Room" type="Spatial" parent="."] [node name="Galley_Room" type="Spatial" parent="."]
transform = Transform( 0.999685, 0, 0.0250777, 0, 1, 0, -0.0250777, 0, 0.999685, 0.13933, 0, -8.55076 ) transform = Transform( 0.999685, 0, 0.0250777, 0, 1, 0, -0.0250777, 0, 0.999685, 0.13933, 0, -8.55076 )