Compare commits

..

10 commits

Author SHA1 Message Date
04d5d2422c Merge Weapon SF from branch 'dev-sfx'
Conflicts:
	Assets/UI/Theme.tres
2023-04-15 05:51:16 +02:00
khushmmehta
a26e37d301 Audio And Stuff 2023-04-12 12:56:44 +05:30
235aa27dfc Making Workflow Builds Verbose
All checks were successful
Export Game
2023-04-11 20:54:12 +00:00
65c832203e Merge pull request 'Ui Rebuild and Full Controller Support' (#59) from dev-base into stable
All checks were successful
Export Game
Reviewed-on: #59
2023-04-11 20:41:54 +00:00
59bb7f775c Merge pull request 'New In Game Art' (#48) from dev-base into stable
All checks were successful
Export Game
Reviewed-on: #48
2023-04-10 13:07:44 +00:00
a1a7e5f9d3 Merge pull request 'Getting Stuff Together' (#42) from dev-base into stable
All checks were successful
Export Game
Reviewed-on: #42
2023-04-09 17:21:28 +00:00
3adb32dc4a Merge branch 'dev-base'
All checks were successful
Export Game
Conflicts:
	Assets/Sprites/EvilBunny/bunny_down.png
	Assets/Sprites/EvilBunny/bunny_down.png.import
	Assets/Sprites/EvilBunny/bunny_left.png
	Assets/Sprites/EvilBunny/bunny_left.png.import
	Assets/Sprites/EvilBunny/bunny_righ.png
	Assets/Sprites/EvilBunny/bunny_up.png
	Assets/Sprites/EvilBunny/bunny_up.png.import
	Assets/Sprites/bunny_down.png
	Assets/Sprites/bunny_left.png
	Assets/Sprites/bunny_left.png.import
	Assets/Sprites/bunny_righ.png
	Assets/Sprites/bunny_righ.png.import
	Assets/Sprites/bunny_up.png
	Assets/Sprites/bunny_up.png.import
	Assets/Sprites/crucefix.png.import
2023-04-08 22:51:17 +02:00
e833b0b3f3 Merge pull request '„project.godot“ ändern' (#34) from snoweuph-patch-1 into stable
Some checks are pending
Export Game
Reviewed-on: #34
2023-04-08 20:48:01 +00:00
35b69a05e0 „project.godot“ ändern 2023-04-08 20:47:40 +00:00
2a814abe05 Basic Movement and Map Generation (#22)
All checks were successful
Export Game
Basic Movement and Map Generation are Done
also got some art in stock, missing a lot still though.
nothing to fancy for now

Co-authored-by: Snoweuph, AXVIII3
Reviewed-on: #22
2023-04-08 00:41:09 +00:00
8 changed files with 93 additions and 1 deletions

Binary file not shown.

View 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

Binary file not shown.

View 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

Binary file not shown.

View 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

View file

@ -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"]

View file

@ -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)