bif/retrace
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues with pill levels and collision

Browse Source
This commit is contained in:
karl 2020-01-08 11:37:26 +01:00
parent 0688ba411a
commit fc0eb63dc8
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Characters/Player/Player.tscn
View File

@ -176,7 +176,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 )
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="LookingAt" type="RayCast" parent="Body/PillCameras"] [node name="LookingAt" type="RayCast" parent="Body/PillCameras"]
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 ) transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
enabled = true enabled = true
cast_to = Vector3( 0, 0, 2 ) cast_to = Vector3( 0, 0, 2 )
@ -268,7 +268,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 )
script = ExtResource( 11 ) script = ExtResource( 11 )
[node name="Pills" parent="PillTaker" instance=ExtResource( 12 )] [node name="Pills" parent="PillTaker" instance=ExtResource( 12 )]
transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, 0.1, 0, -0.1, -4.37114e-009, 0, 0.7, 0 ) transform = Transform( 0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0.7, 0 )
visible = false visible = false
[node name="InteractArea" type="Area" parent="."] [node name="InteractArea" type="Area" parent="."]

2
Characters/Player/UI/UI.gd
View File

@ -34,4 +34,4 @@ func add_item (name):
func _process(_delta): func _process(_delta):
_labelPillLevel.text = "curLevel: " + String(Pills._level) _labelPillLevel.text = "curLevel: " + String(Pills._level)
_pillLevel.value = Pills._level - 1 _pillLevel.value = Pills._level

2
Characters/Player/UI/UI.tscn
View File

@ -33,7 +33,7 @@ margin_left = -0.571533
margin_top = 24.7845 margin_top = 24.7845
margin_right = 247.428 margin_right = 247.428
margin_bottom = 64.7845 margin_bottom = 64.7845
max_value = 6.0 max_value = 7.0
step = 0.1 step = 0.1
value = 6.0 value = 6.0
texture_progress = ExtResource( 2 ) texture_progress = ExtResource( 2 )

2
Global/Pills.gd
View File

@ -2,7 +2,7 @@ extends Node
var _level: float setget _set_level, get_level var _level: float setget _set_level, get_level
var _min: float = 1.0 var _min: float = 0.0
var _max: float = 7.0 var _max: float = 7.0
var _decrease_per_second: float = 0.2 var _decrease_per_second: float = 0.2
var _pill_add_amount: float = 2.0 var _pill_add_amount: float = 2.0

8
Level/Buildings/MeldewesenHome.tscn
View File

@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[sub_resource type="SpatialMaterial" id=10] [sub_resource type="SpatialMaterial" id=1]
albedo_color = Color( 1, 0.466667, 0.466667, 1 ) albedo_color = Color( 1, 0.466667, 0.466667, 1 )
[sub_resource type="CubeMesh" id=11] [sub_resource type="CubeMesh" id=2]
material = SubResource( 10 ) material = SubResource( 1 )
size = Vector3( 26, 26, 20 ) size = Vector3( 26, 26, 20 )
[node name="MeldewesenHome" type="Spatial"] [node name="MeldewesenHome" type="Spatial"]
@ -12,5 +12,5 @@ transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -57, 0,
[node name="MeshInstance" type="MeshInstance" parent="."] [node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, 0 )
mesh = SubResource( 11 ) mesh = SubResource( 2 )
material/0 = null material/0 = null