Skip to content

Commit 697fab3

Browse files
committed
fix mismatched weapon colors
1 parent 6e599ac commit 697fab3

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/scenes/Player.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ ui_raycast_length = 5.0
5454
transform = Transform( 1, 0, 0, 0, 0.819152, -0.573577, 0, 0.573577, 0.819152, 0, -0.0995175, 0.142936 )
5555

5656
[node name="WeaponSaber" parent="ARVROrigin/LeftHand/Palm" instance=ExtResource( 13 )]
57-
hand = 1
5857

5958
[node name="RightHand" type="ARVRController" parent="ARVROrigin"]
6059
controller_id = 2
@@ -70,6 +69,7 @@ ui_raycast_length = 5.0
7069
transform = Transform( 1, 0, 0, 0, 0.819152, -0.573577, 0, 0.573577, 0.819152, 0, -0.0995175, 0.142936 )
7170

7271
[node name="WeaponSaber" parent="ARVROrigin/RightHand/Palm" instance=ExtResource( 13 )]
72+
hand = 1
7373

7474
[node name="PauseLabel" parent="ARVROrigin" instance=ExtResource( 9 )]
7575
pause_mode = 2

src/scenes/Weapon.gd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ class_name Weapon
55
enum HANDS{LEFT,RIGHT}
66

77
#TODO: offload to global so player can change weapon color
8-
const LEFT_COLOR = Color("67f8fd")
9-
const RIGHT_COLOR = Color("f66df4")
10-
8+
const LEFT_COLOR = Color("f66df4")
9+
const RIGHT_COLOR = Color("67f8fd")
1110

1211
export(String) var weapon_name="Weapon"
1312
export(HANDS) var hand

0 commit comments

Comments
 (0)