summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assets/characters/base_character/BaseCharacter.tscn4
-rw-r--r--assets/weapons/goo_gun_update_model/goo_gun.tscn7
2 files changed, 8 insertions, 3 deletions
diff --git a/assets/characters/base_character/BaseCharacter.tscn b/assets/characters/base_character/BaseCharacter.tscn
index fedc9b5..a1af819 100644
--- a/assets/characters/base_character/BaseCharacter.tscn
+++ b/assets/characters/base_character/BaseCharacter.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=6 format=2]
-[ext_resource path="res://assets/weapons/goo_gun/GooGun.tscn" type="PackedScene" id=1]
+[ext_resource path="res://assets/weapons/goo_gun_update_model/goo_gun.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/characters/base_character/friendly_material.tres" type="Material" id=2]
[ext_resource path="res://assets/characters/base_character/BaseCharacter.gd" type="Script" id=3]
@@ -23,7 +23,7 @@ mesh = SubResource( 1 )
material/0 = null
[node name="GooGun" parent="." instance=ExtResource( 1 )]
-transform = Transform( -0.3, 0, -2.62268e-08, 0, 0.3, 0, 2.62268e-08, 0, -0.3, 0.425, 0.125, -0.1 )
+transform = Transform( -0.3, 0, -2.62268e-08, 0, 0.3, 0, 2.62268e-08, 0, -0.3, 0.425, 0.125, 0 )
[node name="CollisionShape" type="CollisionShape" parent="."]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0 )
diff --git a/assets/weapons/goo_gun_update_model/goo_gun.tscn b/assets/weapons/goo_gun_update_model/goo_gun.tscn
index bfcc229..5e9c4fe 100644
--- a/assets/weapons/goo_gun_update_model/goo_gun.tscn
+++ b/assets/weapons/goo_gun_update_model/goo_gun.tscn
@@ -1,5 +1,10 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
[ext_resource path="res://assets/weapons/goo_gun_update_model/goo_gun.gltf" type="PackedScene" id=1]
+[ext_resource path="res://assets/weapons/goo_gun/GooGun.gd" type="Script" id=2]
[node name="goo_gun" instance=ExtResource( 1 )]
+script = ExtResource( 2 )
+
+[node name="Nozzle" type="Spatial" parent="." index="2"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.342731, 1.96888 )