Compare commits
10 commits
2fc9af744d
...
04d5d2422c
Author | SHA1 | Date | |
---|---|---|---|
04d5d2422c | |||
|
a26e37d301 | ||
235aa27dfc | |||
65c832203e | |||
59bb7f775c | |||
a1a7e5f9d3 | |||
3adb32dc4a | |||
e833b0b3f3 | |||
35b69a05e0 | |||
2a814abe05 |
8 changed files with 93 additions and 1 deletions
BIN
Assets/SFX/Jesus/Projectile/Throw Variation 1.wav
Normal file
BIN
Assets/SFX/Jesus/Projectile/Throw Variation 1.wav
Normal file
Binary file not shown.
24
Assets/SFX/Jesus/Projectile/Throw Variation 1.wav.import
Normal file
24
Assets/SFX/Jesus/Projectile/Throw Variation 1.wav.import
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="wav"
|
||||||
|
type="AudioStreamWAV"
|
||||||
|
uid="uid://dornq2kwau6bg"
|
||||||
|
path="res://.godot/imported/Throw Variation 1.wav-cb6e200c1a7508bd3b1eaae71204fc57.sample"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/SFX/Jesus/Projectile/Throw Variation 1.wav"
|
||||||
|
dest_files=["res://.godot/imported/Throw Variation 1.wav-cb6e200c1a7508bd3b1eaae71204fc57.sample"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
force/8_bit=false
|
||||||
|
force/mono=false
|
||||||
|
force/max_rate=false
|
||||||
|
force/max_rate_hz=44100
|
||||||
|
edit/trim=false
|
||||||
|
edit/normalize=false
|
||||||
|
edit/loop_mode=0
|
||||||
|
edit/loop_begin=0
|
||||||
|
edit/loop_end=-1
|
||||||
|
compress/mode=0
|
BIN
Assets/SFX/Jesus/Projectile/Throw Variation 2.wav
Normal file
BIN
Assets/SFX/Jesus/Projectile/Throw Variation 2.wav
Normal file
Binary file not shown.
24
Assets/SFX/Jesus/Projectile/Throw Variation 2.wav.import
Normal file
24
Assets/SFX/Jesus/Projectile/Throw Variation 2.wav.import
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="wav"
|
||||||
|
type="AudioStreamWAV"
|
||||||
|
uid="uid://b2pd7efb2r7g5"
|
||||||
|
path="res://.godot/imported/Throw Variation 2.wav-29a6debbe12d45d7a1d5ed60acdd2d8f.sample"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/SFX/Jesus/Projectile/Throw Variation 2.wav"
|
||||||
|
dest_files=["res://.godot/imported/Throw Variation 2.wav-29a6debbe12d45d7a1d5ed60acdd2d8f.sample"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
force/8_bit=false
|
||||||
|
force/mono=false
|
||||||
|
force/max_rate=false
|
||||||
|
force/max_rate_hz=44100
|
||||||
|
edit/trim=false
|
||||||
|
edit/normalize=false
|
||||||
|
edit/loop_mode=0
|
||||||
|
edit/loop_begin=0
|
||||||
|
edit/loop_end=-1
|
||||||
|
compress/mode=0
|
BIN
Assets/SFX/Jesus/Projectile/Throw Variation 3.wav
Normal file
BIN
Assets/SFX/Jesus/Projectile/Throw Variation 3.wav
Normal file
Binary file not shown.
24
Assets/SFX/Jesus/Projectile/Throw Variation 3.wav.import
Normal file
24
Assets/SFX/Jesus/Projectile/Throw Variation 3.wav.import
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="wav"
|
||||||
|
type="AudioStreamWAV"
|
||||||
|
uid="uid://cqxnclejfbmvb"
|
||||||
|
path="res://.godot/imported/Throw Variation 3.wav-6149b642d398d05b4c6ebfab8846c3e5.sample"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/SFX/Jesus/Projectile/Throw Variation 3.wav"
|
||||||
|
dest_files=["res://.godot/imported/Throw Variation 3.wav-6149b642d398d05b4c6ebfab8846c3e5.sample"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
force/8_bit=false
|
||||||
|
force/mono=false
|
||||||
|
force/max_rate=false
|
||||||
|
force/max_rate_hz=44100
|
||||||
|
edit/trim=false
|
||||||
|
edit/normalize=false
|
||||||
|
edit/loop_mode=0
|
||||||
|
edit/loop_begin=0
|
||||||
|
edit/loop_end=-1
|
||||||
|
compress/mode=0
|
|
@ -1,7 +1,10 @@
|
||||||
[gd_scene load_steps=4 format=3 uid="uid://csxh42o8twxwn"]
|
[gd_scene load_steps=7 format=3 uid="uid://csxh42o8twxwn"]
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://Scripts/WeaponSystem/Projectile.gd" id="1_os652"]
|
[ext_resource type="Script" path="res://Scripts/WeaponSystem/Projectile.gd" id="1_os652"]
|
||||||
[ext_resource type="Texture2D" uid="uid://dlxjdb0tchrps" path="res://Assets/Sprites/crucefix.png" id="2_ibs3t"]
|
[ext_resource type="Texture2D" uid="uid://dlxjdb0tchrps" path="res://Assets/Sprites/crucefix.png" id="2_ibs3t"]
|
||||||
|
[ext_resource type="AudioStream" uid="uid://dornq2kwau6bg" path="res://Assets/SFX/Jesus/Projectile/Throw Variation 1.wav" id="4_11fc8"]
|
||||||
|
[ext_resource type="AudioStream" uid="uid://b2pd7efb2r7g5" path="res://Assets/SFX/Jesus/Projectile/Throw Variation 2.wav" id="5_njike"]
|
||||||
|
[ext_resource type="AudioStream" uid="uid://cqxnclejfbmvb" path="res://Assets/SFX/Jesus/Projectile/Throw Variation 3.wav" id="6_ky3xa"]
|
||||||
|
|
||||||
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_ki5cp"]
|
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_ki5cp"]
|
||||||
radius = 8.57143
|
radius = 8.57143
|
||||||
|
@ -11,6 +14,7 @@ height = 22.8571
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 5
|
collision_mask = 5
|
||||||
script = ExtResource("1_os652")
|
script = ExtResource("1_os652")
|
||||||
|
audio_pool = [NodePath("Audio Sources/Audio1"), NodePath("Audio Sources/Audio2"), NodePath("Audio Sources/Audio3")]
|
||||||
map_collision_layer = 1
|
map_collision_layer = 1
|
||||||
bunny_collision_layer = 4
|
bunny_collision_layer = 4
|
||||||
|
|
||||||
|
@ -20,4 +24,15 @@ texture = ExtResource("2_ibs3t")
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||||
shape = SubResource("CapsuleShape2D_ki5cp")
|
shape = SubResource("CapsuleShape2D_ki5cp")
|
||||||
|
|
||||||
|
[node name="Audio Sources" type="Node" parent="."]
|
||||||
|
|
||||||
|
[node name="Audio1" type="AudioStreamPlayer" parent="Audio Sources"]
|
||||||
|
stream = ExtResource("4_11fc8")
|
||||||
|
|
||||||
|
[node name="Audio2" type="AudioStreamPlayer" parent="Audio Sources"]
|
||||||
|
stream = ExtResource("5_njike")
|
||||||
|
|
||||||
|
[node name="Audio3" type="AudioStreamPlayer" parent="Audio Sources"]
|
||||||
|
stream = ExtResource("6_ky3xa")
|
||||||
|
|
||||||
[connection signal="body_entered" from="." to="." method="_on_collision"]
|
[connection signal="body_entered" from="." to="." method="_on_collision"]
|
||||||
|
|
|
@ -2,12 +2,17 @@ extends Area2D
|
||||||
|
|
||||||
@export var speed : float = 80.0
|
@export var speed : float = 80.0
|
||||||
@export var damage : int = 1
|
@export var damage : int = 1
|
||||||
|
@export var audio_pool := []
|
||||||
|
|
||||||
@export_flags_2d_physics var map_collision_layer : int
|
@export_flags_2d_physics var map_collision_layer : int
|
||||||
@export_flags_2d_physics var bunny_collision_layer : int
|
@export_flags_2d_physics var bunny_collision_layer : int
|
||||||
|
|
||||||
var dir : float
|
var dir : float
|
||||||
|
|
||||||
|
func _ready():
|
||||||
|
get_node(audio_pool[randi_range(0, 2)]).play()
|
||||||
|
pass
|
||||||
|
|
||||||
func _process(delta):
|
func _process(delta):
|
||||||
self.translate(Vector2(cos(dir), sin(dir)) * speed * delta)
|
self.translate(Vector2(cos(dir), sin(dir)) * speed * delta)
|
||||||
self.rotate(delta * 30)
|
self.rotate(delta * 30)
|
||||||
|
|
Reference in a new issue