From 2142dd20c4deb883b9736bd71e5e843c822fea65 Mon Sep 17 00:00:00 2001
From: derek <derek@scfilmvideo.com>
Date: Thu, 26 Sep 2024 16:49:42 -0500
Subject: [PATCH] tweaked gun anim and casing size

---
 assets/casing_2.tscn |  6 +++---
 assets/mac_10.tscn   | 28 ++++++++++++++--------------
 assets/player.tscn   |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/assets/casing_2.tscn b/assets/casing_2.tscn
index 7bc925f..1d66689 100644
--- a/assets/casing_2.tscn
+++ b/assets/casing_2.tscn
@@ -6,8 +6,8 @@
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_ejwa0"]
 margin = 0.001
-height = 0.07
-radius = 0.025
+height = 0.121962
+radius = 0.0314789
 
 [node name="casing_2" type="RigidBody3D" groups=["spawned"]]
 collision_layer = 0
@@ -21,7 +21,7 @@ angular_damp = 0.1
 script = ExtResource("1_34yke")
 
 [node name="casing2" parent="." instance=ExtResource("1_8ox1t")]
-transform = Transform3D(0.00349065, 6.13594e-06, -0.999994, 0.999992, 0.00174529, 0.00349065, 0.0017453, -0.999998, -4.37111e-08, 0, 0, 0)
+transform = Transform3D(0.00523598, 9.20392e-06, -1.49999, 1.49999, 0.00261793, 0.00523599, 0.00261795, -1.5, -6.55667e-08, 0, 0, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(-0.00106233, -0.000701004, -0.999999, 0.999999, -0.000431764, -0.00106203, -0.000431026, -1, 0.000701458, -7.7486e-06, 0.000259597, -3.74019e-06)
diff --git a/assets/mac_10.tscn b/assets/mac_10.tscn
index 50b1842..e0eebd5 100644
--- a/assets/mac_10.tscn
+++ b/assets/mac_10.tscn
@@ -71,7 +71,7 @@ tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/path = NodePath("mac10:position")
-tracks/0/interp = 1
+tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0, 0.05, 0.25),
@@ -83,7 +83,7 @@ tracks/1/type = "value"
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/path = NodePath("mac10:rotation")
-tracks/1/interp = 1
+tracks/1/interp = 2
 tracks/1/loop_wrap = true
 tracks/1/keys = {
 "times": PackedFloat32Array(0, 0.05, 0.25),
@@ -241,16 +241,16 @@ tracks/7/keys = {
 
 [sub_resource type="Animation" id="Animation_bsc1a"]
 resource_name = "shoot"
-length = 0.08
+length = 0.1
 step = 0.01
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/path = NodePath("mac10:position")
-tracks/0/interp = 1
+tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.03, 0.08),
+"times": PackedFloat32Array(0, 0.03, 0.1),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [Vector3(0, 0, 0), Vector3(0, 0.187845, 0.217808), Vector3(0, 0, 0)]
@@ -259,10 +259,10 @@ tracks/1/type = "value"
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/path = NodePath("mac10:rotation")
-tracks/1/interp = 1
+tracks/1/interp = 2
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.03, 0.08),
+"times": PackedFloat32Array(0, 0.03, 0.1),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [Vector3(0, -1.5708, 0), Vector3(-1.15092e-08, -1.5708, -0.266442), Vector3(0, -1.5708, 0)]
@@ -271,10 +271,10 @@ tracks/2/type = "value"
 tracks/2/imported = false
 tracks/2/enabled = true
 tracks/2/path = NodePath("mac10/chargerpull:position")
-tracks/2/interp = 1
+tracks/2/interp = 2
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.04, 0.08),
+"times": PackedFloat32Array(0, 0.04, 0.1),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [Vector3(0, 0, 0), Vector3(1, 0, 0), Vector3(0, 0, 0)]
@@ -283,10 +283,10 @@ tracks/3/type = "value"
 tracks/3/imported = false
 tracks/3/enabled = true
 tracks/3/path = NodePath("mac10/Trigger:rotation")
-tracks/3/interp = 1
+tracks/3/interp = 2
 tracks/3/loop_wrap = true
 tracks/3/keys = {
-"times": PackedFloat32Array(0, 0.01, 0.08),
+"times": PackedFloat32Array(0, 0.01, 0.1),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [Vector3(0, 0, -0.209061), Vector3(1.82515e-06, 6.88119e-07, 0.336512), Vector3(0, 0, -0.209061)]
@@ -295,10 +295,10 @@ tracks/4/type = "value"
 tracks/4/imported = false
 tracks/4/enabled = true
 tracks/4/path = NodePath("mac10/SpotLight3D:light_energy")
-tracks/4/interp = 1
+tracks/4/interp = 2
 tracks/4/loop_wrap = true
 tracks/4/keys = {
-"times": PackedFloat32Array(0, 0.03, 0.08),
+"times": PackedFloat32Array(0, 0.03, 0.1),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [0.0, 10.0, 0.0]
@@ -307,7 +307,7 @@ tracks/5/type = "value"
 tracks/5/imported = false
 tracks/5/enabled = true
 tracks/5/path = NodePath("mac10/flare:visible")
-tracks/5/interp = 1
+tracks/5/interp = 2
 tracks/5/loop_wrap = true
 tracks/5/keys = {
 "times": PackedFloat32Array(0, 0.01, 0.02),
diff --git a/assets/player.tscn b/assets/player.tscn
index bcf383c..bd7e0d4 100644
--- a/assets/player.tscn
+++ b/assets/player.tscn
@@ -69,7 +69,7 @@ current = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0341401, -0.111267)
 
 [node name="WeaponSpawner" type="Node3D" parent="Head/Camera3D/WeaponHolder"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.388891, -0.199195, -0.580209)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.269894, -0.199195, -0.580209)
 
 [node name="AmmoCounter" type="Label" parent="Head/Camera3D"]
 offset_right = 3840.0