made tracker gun and blunderbuss tweaks

This commit is contained in:
Derek
2024-11-24 20:48:18 -06:00
parent 0312da48b8
commit cca03000e5
10 changed files with 2356 additions and 43 deletions

2243
assets/blo1DAE.tmp Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=112 format=4 uid="uid://6agmt1hqlhww"]
[gd_scene load_steps=111 format=4 uid="uid://6agmt1hqlhww"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_sbpvn"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_fn4vb"]
@@ -30,7 +30,6 @@
[ext_resource type="PackedScene" uid="uid://cp7tsicuudd6v" path="res://assets/boxcar_1.tscn" id="16_65evy"]
[ext_resource type="Script" path="res://scripts/room_check.gd" id="16_ba8wj"]
[ext_resource type="PackedScene" uid="uid://dws4iro7820fc" path="res://assets/pistol1_pickup.tscn" id="17_buv6l"]
[ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="18_1yuda"]
[ext_resource type="Texture2D" uid="uid://bervxllx4mjqe" path="res://assets/Textures/dickbutt.png" id="22_i7w8i"]
[ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="23_khhfu"]
[ext_resource type="PackedScene" uid="uid://dvlpc0mrx16l" path="res://assets/table1.tscn" id="24_eaw7j"]
@@ -1377,9 +1376,6 @@ transform = Transform3D(0.558498, -0.829506, 0, 0.829506, 0.558498, 0, 0, 0, 1,
[node name="Crate1" parent="." instance=ExtResource("12_30nle")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.75245, 1.6523, 16.1195)
[node name="Boombox" parent="." instance=ExtResource("18_1yuda")]
transform = Transform3D(0.501435, 0, 0.865195, 0, 1, 0, -0.865195, 0, 0.501435, -3.53689, 0.411566, 9.81991)
[node name="paintings1" type="Node3D" parent="."]
transform = Transform3D(-8.74228e-08, 2, -8.74228e-08, 0, -8.74228e-08, -2, -2, -8.74228e-08, 3.82137e-15, -84.9064, 22.4587, 199.939)

View File

@@ -361,7 +361,6 @@ _data = {
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0145504, -0.0460228)
script = ExtResource("2_ieev5")
gun_name = "Tracker Pistol"
fire_mode = 2
recoil_amount = Vector3(0, 0.05, 0.05)
bullet_speed = 50
tracker_indicator = NodePath("gun/slide/TrackerIndicator")

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://rcixv0spjpvw"]
[gd_scene load_steps=10 format=3 uid="uid://rcixv0spjpvw"]
[ext_resource type="Script" path="res://scripts/tracker_marker.gd" id="1_pi8qa"]
@@ -17,6 +17,33 @@ emission_energy_multiplier = 10.0
top_radius = 0.1
bottom_radius = 0.01
[sub_resource type="Animation" id="Animation_u52hi"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("MeshHandle:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("MeshHandle/Mesh:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
[sub_resource type="Animation" id="Animation_rkem3"]
resource_name = "mark"
length = 0.25
@@ -33,20 +60,17 @@ tracks/0/keys = {
"update": 0,
"values": [Vector3(0, 20, 0), Vector3(0, 0, 0)]
}
[sub_resource type="Animation" id="Animation_u52hi"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("MeshHandle:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("MeshHandle/Mesh:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.02),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
[sub_resource type="Animation" id="Animation_ylwlm"]
@@ -79,9 +103,38 @@ tracks/1/keys = {
}]
}
[sub_resource type="Animation" id="Animation_cu36u"]
resource_name = "check"
step = 0.01
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("MeshHandle/Mesh:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("MeshHandle:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 20, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_776o6"]
_data = {
"RESET": SubResource("Animation_u52hi"),
"check": SubResource("Animation_cu36u"),
"mark": SubResource("Animation_rkem3"),
"remove": SubResource("Animation_ylwlm")
}
@@ -106,4 +159,3 @@ surface_material_override/0 = SubResource("StandardMaterial3D_fmyhe")
libraries = {
"": SubResource("AnimationLibrary_776o6")
}
autoplay = "mark"