From 4a17fde692b900393d796675bcf7011aa7399dad Mon Sep 17 00:00:00 2001 From: Anson Bridges Date: Fri, 30 Sep 2022 11:20:16 -0400 Subject: syncing off main --- godot/scenes/characters/PlayerRigid.tscn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'godot/scenes/characters/PlayerRigid.tscn') diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn index 6e9fe48..87a463d 100644 --- a/godot/scenes/characters/PlayerRigid.tscn +++ b/godot/scenes/characters/PlayerRigid.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://scripts/characters/player_controller_new.gd" type="Script" id=1] [ext_resource path="res://theming/FreeMono.otf" type="DynamicFontData" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://scenes/weapons/hands.res" type="Resource" id=5] [ext_resource path="res://scenes/weapons/pistol.tres" type="Resource" id=6] [ext_resource path="res://scenes/weapons/rockets.tres" type="Resource" id=7] +[ext_resource path="res://scenes/weapons/grapplinghook.tres" type="Resource" id=8] [sub_resource type="PhysicsMaterial" id=8] resource_local_to_scene = true @@ -46,6 +47,7 @@ script = ExtResource( 1 ) weapon_slot1 = ExtResource( 5 ) weapon_slot2 = ExtResource( 6 ) weapon_slot3 = ExtResource( 7 ) +weapon_slot4 = ExtResource( 8 ) [node name="Collision" type="CollisionShape" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0 ) -- cgit v1.2.3