diff options
| author | Malfurious <m@lfurio.us> | 2022-07-22 05:26:34 -0400 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2022-07-22 05:26:34 -0400 |
| commit | 44e739bb05542d1249ccf8388bd15b3f0b052e0c (patch) | |
| tree | 42a67300e8e2ebcbd9868e6af1f7e992b285c3c6 /assets/characters/base_character/BaseCharacter.tscn | |
| parent | 4a9ff23bb13bfe5c182222fdb4314afc4f5c1fa8 (diff) | |
| parent | ea3ecd73dab3e0e06bb145b38e8258b9dd02abcb (diff) | |
| download | project-s-44e739bb05542d1249ccf8388bd15b3f0b052e0c.tar.gz project-s-44e739bb05542d1249ccf8388bd15b3f0b052e0c.zip | |
Merge branch 'weapon-behavior'
Implements the basics for the Goo Gun primary fire
* weapon-behavior:
Despawn bullets on collision with another physics body
Tweak Goo Gun bullet physics to better mimic reference weapon
Implement Goo Gun primary fire
Add bullet / ink pellet object for Goo Gun
Diffstat (limited to '')
| -rw-r--r-- | assets/characters/base_character/BaseCharacter.tscn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/assets/characters/base_character/BaseCharacter.tscn b/assets/characters/base_character/BaseCharacter.tscn index 191e581..7b22f63 100644 --- a/assets/characters/base_character/BaseCharacter.tscn +++ b/assets/characters/base_character/BaseCharacter.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=5 format=2] +[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/characters/base_character/friendly_material.tres" type="Material" id=2] +[ext_resource path="res://assets/characters/base_character/BaseCharacter.gd" type="Script" id=3] [sub_resource type="CapsuleMesh" id=1] material = ExtResource( 2 ) @@ -13,6 +14,7 @@ radius = 0.3 height = 0.9 [node name="BaseCharacter" type="KinematicBody"] +script = ExtResource( 3 ) [node name="Body" type="MeshInstance" parent="."] transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0 ) |