tweaked vending machine and added on off to boombox

This commit is contained in:
Derek
2024-07-17 18:27:45 -05:00
parent 4511023fcc
commit 1fa6585ee4
8 changed files with 57 additions and 17 deletions

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=9 format=3 uid="uid://bpkmyd3wvqi5p"] [gd_scene load_steps=9 format=3 uid="uid://bpkmyd3wvqi5p"]
[ext_resource type="AudioStream" uid="uid://diwsk0cw41ep1" path="res://assets/Audio/Music/Test Songs/easy-walk-SBA-347061820.wav" id="1_0tv5a"] [ext_resource type="AudioStream" uid="uid://diwsk0cw41ep1" path="res://assets/Audio/Music/Test Songs/easy-walk-SBA-347061820.wav" id="1_0tv5a"]
[ext_resource type="Script" path="res://scripts/breakable.gd" id="1_dm2iv"] [ext_resource type="Script" path="res://scripts/boombox.gd" id="1_ccqda"]
[ext_resource type="PackedScene" uid="uid://ccnnxudjaptb4" path="res://assets/boombox_broken.tscn" id="2_26e0l"] [ext_resource type="PackedScene" uid="uid://ccnnxudjaptb4" path="res://assets/boombox_broken.tscn" id="2_26e0l"]
[sub_resource type="BoxShape3D" id="BoxShape3D_1swe3"] [sub_resource type="BoxShape3D" id="BoxShape3D_1swe3"]
@@ -82,7 +82,7 @@ shadow_mesh = SubResource("ArrayMesh_nxwjy")
collision_layer = 2 collision_layer = 2
collision_mask = 7 collision_mask = 7
continuous_cd = true continuous_cd = true
script = ExtResource("1_dm2iv") script = ExtResource("1_ccqda")
broken_object = ExtResource("2_26e0l") broken_object = ExtResource("2_26e0l")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
@@ -99,4 +99,11 @@ transform = Transform3D(0.99997, 0.00767937, 0, -0.00767937, 0.99997, 0, 0, 0, 1
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Music"] [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Music"]
stream = ExtResource("1_0tv5a") stream = ExtResource("1_0tv5a")
autoplay = true
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 8
collision_mask = 15
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.433783, 0.16095)
shape = SubResource("BoxShape3D_1swe3")

View File

@@ -279,6 +279,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0145504, -0.0460228)
script = ExtResource("2_63tea") script = ExtResource("2_63tea")
gun_name = "Dumb Pistol" gun_name = "Dumb Pistol"
fire_mode = 2 fire_mode = 2
recoil_amount = 0.0
bullet_drop = 0.03
flare_light = NodePath("SpotLight3D") flare_light = NodePath("SpotLight3D")
bullet = ExtResource("3_4pvsf") bullet = ExtResource("3_4pvsf")
bullethole = ExtResource("4_bu1g0") bullethole = ExtResource("4_bu1g0")

View File

@@ -664,4 +664,4 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.60763, 1.16757, 11.4412)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.69462, 1.16757, 11.2398) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.69462, 1.16757, 11.2398)
[node name="vendingmahcine" parent="." instance=ExtResource("16_4ykdi")] [node name="vendingmahcine" parent="." instance=ExtResource("16_4ykdi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.7, 0.124041, 8.4) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.7, 0.124041, 7.5267)

File diff suppressed because one or more lines are too long

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 = 0 var money = 250
# 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():

28
scripts/boombox.gd Normal file
View File

@@ -0,0 +1,28 @@
extends RigidBody3D
@export var broken_object : Resource
@onready var music = $Music/AudioStreamPlayer3D
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
func interact():
if music.is_playing():
music.stop()
else:
music.play()
func breaking(current_velocity):
var spawn_broken = broken_object.instantiate()
spawn_broken.position = global_position
spawn_broken.transform.basis = global_transform.basis
spawn_broken.rotation = rotation
get_tree().get_root().add_child(spawn_broken)
queue_free()

View File

@@ -17,14 +17,16 @@ 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):
pass if active == false:
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:
if level_control.money >= item_price: if level_control.money >= item_price:
level_control.money -= item_price level_control.money -= item_price
anim_player.play("vend") anim_player.play("vend")
#label_3d.text = str(lerp(item_price,0,delta))
else: else:
pass #add "too poor" text here pass #add "too poor" text here
@@ -32,6 +34,6 @@ func vend():
var item_vend = item.instantiate() var item_vend = item.instantiate()
item_vend.position = vend_ray.global_position item_vend.position = vend_ray.global_position
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,10) item_vend.linear_velocity += vend_ray.global_transform.basis * Vector3(0,0,3)
active = false active = false
get_parent().add_child(item_vend) get_parent().add_child(item_vend)

View File

@@ -103,10 +103,10 @@ tracks/3/path = NodePath("Cube_001:rotation")
tracks/3/interp = 2 tracks/3/interp = 2
tracks/3/loop_wrap = true tracks/3/loop_wrap = true
tracks/3/keys = { tracks/3/keys = {
"times": PackedFloat32Array(3, 3.2), "times": PackedFloat32Array(3, 3.2, 3.38, 3.71),
"transitions": PackedFloat32Array(1, 1), "transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 0, "update": 0,
"values": [Vector3(-1.5708, 0, 0), Vector3(-3.65297, 0, 0)] "values": [Vector3(-1.5708, 0, 0), Vector3(-3.65297, 0, 0), Vector3(-3.65297, 0, 0), Vector3(-1.5708, 0, 0)]
} }
tracks/4/type = "method" tracks/4/type = "method"
tracks/4/imported = false tracks/4/imported = false
@@ -128,19 +128,20 @@ _data = {
"vend": SubResource("Animation_60f6j") "vend": SubResource("Animation_60f6j")
} }
[node name="vendingmachine" instance=ExtResource("1_8fhd0")] [node name="vendingmachine" groups=["interact"] instance=ExtResource("1_8fhd0")]
script = ExtResource("2_jtasa") script = ExtResource("2_jtasa")
item = ExtResource("2_qn8st") item = ExtResource("2_qn8st")
item_name = "Revolver" item_name = "Revolver"
item_price = 250 item_price = 250
[node name="Cube_001" parent="." index="1"] [node name="Cube_001" parent="." index="1"]
transform = Transform3D(1, 0, 0, 0, -0.930849, 0.365404, 0, -0.365404, -0.930849, -0.0321195, 0.920841, 1.17642) transform = Transform3D(1, 0, 0, 0, -3.61999e-06, 1, 0, -1, -3.61999e-06, -0.0321195, 0.920841, 1.17642)
[node name="Glass" parent="." index="2"] [node name="Glass" parent="." index="2"]
mesh = SubResource("ArrayMesh_66b6k") mesh = SubResource("ArrayMesh_66b6k")
[node name="StaticBody3D" type="StaticBody3D" parent="." index="4"] [node name="StaticBody3D" type="StaticBody3D" parent="." index="4"]
collision_mask = 7
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.116262, 1.40336, 0.595886) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.116262, 1.40336, 0.595886)
@@ -153,7 +154,7 @@ transform = Transform3D(-0.0215597, -0.106081, 0.225348, 0.010103, -0.226377, -0
transform = Transform3D(-0.0215597, -0.106081, 0.225348, 0.010103, -0.226377, -0.105599, 0.248864, 4.49794e-10, 0.0238094, 0.164161, 2.55643, 0.471795) transform = Transform3D(-0.0215597, -0.106081, 0.225348, 0.010103, -0.226377, -0.105599, 0.248864, 4.49794e-10, 0.0238094, 0.164161, 2.55643, 0.471795)
[node name="revolver14" parent="." index="7" instance=ExtResource("2_goj2p")] [node name="revolver14" parent="." index="7" instance=ExtResource("2_goj2p")]
transform = Transform3D(-0.0215597, -0.106081, 0.225348, 0.010103, -0.226377, -0.105599, 0.248864, -9.31322e-09, 0.0238094, -0.0161762, 0.355468, 0.955517) transform = Transform3D(-0.0215595, -0.106081, 0.225348, 0.0101037, -0.226377, -0.105599, 0.248864, 7.5437e-07, 0.0238096, -0.0237292, 1.94229, 0.717401)
[node name="revolver15" parent="." index="8" instance=ExtResource("2_goj2p")] [node name="revolver15" parent="." index="8" instance=ExtResource("2_goj2p")]
transform = Transform3D(0.0215597, 0.106081, -0.225348, -0.010103, 0.226377, 0.105599, 0.248864, 2.08348e-09, 0.0238094, -0.135839, 1.79441, 0.471795) transform = Transform3D(0.0215597, 0.106081, -0.225348, -0.010103, 0.226377, 0.105599, 0.248864, 2.08348e-09, 0.0238094, -0.135839, 1.79441, 0.471795)
@@ -186,7 +187,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182373, 1.45037, 0.997813)
shape = SubResource("BoxShape3D_te7mh") shape = SubResource("BoxShape3D_te7mh")
[node name="vendingmachine_coil" parent="." index="14"] [node name="vendingmachine_coil" parent="." index="14"]
transform = Transform3D(-1, 2.38498e-08, 0, -2.38498e-08, -1, 0, 0, 0, 1, -0.0259684, 1.80304, 0.628036) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0259684, 1.80304, 0.628036)
[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="15"] [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="15"]
libraries = { libraries = {