minor tweaks from last

This commit is contained in:
Derek
2024-07-17 18:51:43 -05:00
parent 1fa6585ee4
commit 77b2ecee74
6 changed files with 15 additions and 19 deletions

View File

@@ -394,7 +394,7 @@ _data = {
[node name="mac10" node_paths=PackedStringArray("flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")] [node name="mac10" node_paths=PackedStringArray("flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")]
script = ExtResource("2_6i1l4") script = ExtResource("2_6i1l4")
gun_name = "Mac 10" gun_name = "Mac 10"
recoil_amount = 1.0 recoil_amount = 0.7
max_ammo = 30 max_ammo = 30
bullet_drop = 0.07 bullet_drop = 0.07
random_spread_amt = 0.5 random_spread_amt = 0.5

View File

@@ -425,8 +425,7 @@ transitions = ["Start", "walk", SubResource("AnimationNodeStateMachineTransition
radius = 0.25 radius = 0.25
[node name="spider" type="CharacterBody3D"] [node name="spider" type="CharacterBody3D"]
collision_layer = 11 collision_layer = 3
collision_mask = 11
script = ExtResource("1_t4vx0") script = ExtResource("1_t4vx0")
[node name="body" type="MeshInstance3D" parent="."] [node name="body" type="MeshInstance3D" parent="."]
@@ -435,7 +434,7 @@ mesh = SubResource("ArrayMesh_exipw")
skeleton = NodePath("") skeleton = NodePath("")
[node name="leg1" type="MeshInstance3D" parent="body"] [node name="leg1" type="MeshInstance3D" parent="body"]
transform = Transform3D(0.687491, 0.699597, 0.194727, -0.71325, 0.700909, 0, -0.136486, -0.138889, 0.980856, -0.305074, -0.206463, 0.323723) transform = Transform3D(0.700373, 0.712705, 0.0390842, -0.71325, 0.700909, 0, -0.0273945, -0.0278769, 0.999234, -0.305074, -0.206463, 0.323723)
mesh = SubResource("ArrayMesh_cwwo8") mesh = SubResource("ArrayMesh_cwwo8")
skeleton = NodePath("") skeleton = NodePath("")
@@ -445,7 +444,7 @@ mesh = SubResource("ArrayMesh_epfun")
skeleton = NodePath("") skeleton = NodePath("")
[node name="leg2" type="MeshInstance3D" parent="body"] [node name="leg2" type="MeshInstance3D" parent="body"]
transform = Transform3D(-0.612169, -0.622708, 0.487323, -0.713114, 0.701047, 8.99523e-09, -0.341636, -0.347517, -0.873222, 0.318604, -0.206463, 0.321527) transform = Transform3D(-0.552519, -0.561973, 0.615555, -0.713078, 0.701084, 1.13895e-08, -0.431555, -0.438939, -0.788094, 0.318604, -0.206463, 0.321527)
mesh = SubResource("ArrayMesh_j8pcb") mesh = SubResource("ArrayMesh_j8pcb")
skeleton = NodePath("") skeleton = NodePath("")
@@ -455,7 +454,7 @@ mesh = SubResource("ArrayMesh_vgp1v")
skeleton = NodePath("") skeleton = NodePath("")
[node name="leg3" type="MeshInstance3D" parent="body"] [node name="leg3" type="MeshInstance3D" parent="body"]
transform = Transform3D(0.687491, 0.699597, -0.194727, -0.71325, 0.700909, 0, 0.136486, 0.138889, 0.980856, -0.327034, -0.206463, -0.315327) transform = Transform3D(0.700373, 0.712705, -0.0390842, -0.71325, 0.700909, 0, 0.0273945, 0.0278769, 0.999234, -0.327034, -0.206463, -0.315327)
mesh = SubResource("ArrayMesh_wv2l2") mesh = SubResource("ArrayMesh_wv2l2")
skeleton = NodePath("") skeleton = NodePath("")
@@ -465,7 +464,7 @@ mesh = SubResource("ArrayMesh_375ql")
skeleton = NodePath("") skeleton = NodePath("")
[node name="leg4" type="MeshInstance3D" parent="body"] [node name="leg4" type="MeshInstance3D" parent="body"]
transform = Transform3D(-0.58948, -0.599627, -0.541258, -0.713115, 0.701047, -1.32007e-07, 0.379448, 0.38598, -0.840856, 0.351545, -0.206463, -0.339484) transform = Transform3D(-0.522986, -0.531933, -0.665982, -0.713079, 0.701084, -1.67143e-07, 0.46691, 0.474898, -0.745967, 0.351545, -0.206463, -0.339484)
mesh = SubResource("ArrayMesh_v81tc") mesh = SubResource("ArrayMesh_v81tc")
skeleton = NodePath("") skeleton = NodePath("")

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=53 format=3 uid="uid://dyop6vk3rgkkb"] [gd_scene load_steps=52 format=3 uid="uid://dyop6vk3rgkkb"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"]
[ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"] [ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"]
@@ -11,7 +11,6 @@
[ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"] [ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"]
[ext_resource type="AudioStream" uid="uid://jo4n05go5hdt" path="res://assets/Audio/train-pass-by-steady-loop-SBA-300156766.wav" id="7_00j8j"] [ext_resource type="AudioStream" uid="uid://jo4n05go5hdt" path="res://assets/Audio/train-pass-by-steady-loop-SBA-300156766.wav" id="7_00j8j"]
[ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="8_b57j8"] [ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="8_b57j8"]
[ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spiderTEst.tscn" id="12_gnu56"]
[ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="15_3iv0j"] [ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="15_3iv0j"]
[ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="16_4ykdi"] [ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="16_4ykdi"]
@@ -642,9 +641,6 @@ mass = 10.0
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5641, 1.51906, 11.3001) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5641, 1.51906, 11.3001)
mass = 10.0 mass = 10.0
[node name="spider14" parent="." instance=ExtResource("12_gnu56")]
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -3.267, -0.228641, 15.75)
[node name="bottle1" parent="." instance=ExtResource("15_3iv0j")] [node name="bottle1" parent="." instance=ExtResource("15_3iv0j")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.88146, 0.608878, 12.1473) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.88146, 0.608878, 12.1473)

View File

@@ -9,7 +9,7 @@ var ammo_current = [0,0]
var ammo_reserve = [0,0] var ammo_reserve = [0,0]
var guns_dict = {} var guns_dict = {}
var current_gun_index var current_gun_index
var money = 250 var money = 0
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():

View File

@@ -17,10 +17,7 @@ func _ready():
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
if active == false: pass
while item_price > 0:
item_price = lerp(int(item_price),int(0),delta * .01)
label_3d.text = "$" + str(item_price)
func interact(): func interact():
if active == true: if active == true:
@@ -28,7 +25,10 @@ func interact():
level_control.money -= item_price level_control.money -= item_price
anim_player.play("vend") anim_player.play("vend")
else: else:
pass #add "too poor" text here var original_text = label_3d.text
label_3d.text = "too poor"
await get_tree().create_timer(2.0).timeout
label_3d.text = original_text
func vend(): func vend():
var item_vend = item.instantiate() var item_vend = item.instantiate()
@@ -36,4 +36,5 @@ func vend():
item_vend.transform.basis = vend_ray.global_transform.basis item_vend.transform.basis = vend_ray.global_transform.basis
item_vend.linear_velocity += vend_ray.global_transform.basis * Vector3(0,0,3) item_vend.linear_velocity += vend_ray.global_transform.basis * Vector3(0,0,3)
active = false active = false
label_3d.text = "offline"
get_parent().add_child(item_vend) get_parent().add_child(item_vend)

View File

@@ -173,7 +173,7 @@ shadow_enabled = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.684768, 2.06592, 1.22063) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.684768, 2.06592, 1.22063)
modulate = Color(0.642333, 0.82, 0, 1) modulate = Color(0.642333, 0.82, 0, 1)
outline_modulate = Color(0, 0, 0, 0) outline_modulate = Color(0, 0, 0, 0)
text = "<null>" text = "$250"
font = ExtResource("3_1f40n") font = ExtResource("3_1f40n")
outline_size = 0 outline_size = 0
script = ExtResource("4_lcs0l") script = ExtResource("4_lcs0l")