From 62f6b4d873ee46b55d9fa7c8d778df827e6ca727 Mon Sep 17 00:00:00 2001
From: zerothelootrat <zero13812@gmail.com>
Date: Thu, 6 Jun 2024 03:24:17 -0400
Subject: [PATCH] implemented y-wing main cannon and effects.

---
 Assets/y-wing_main_laser.png         | Bin 0 -> 422 bytes
 Assets/y-wing_main_laser.png.import  |  34 +++++++++++++++++++++++++++
 Scenes/world.gd                      |   6 +++++
 Scenes/y_wing_main_cannon_laser.tscn |  30 +++++++++++++++++++++++
 Scripts/enemy_ywing.gd               |   3 ++-
 Scripts/y_wing_main_cannon_laser.gd  |  16 +++++++++++++
 6 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 Assets/y-wing_main_laser.png
 create mode 100644 Assets/y-wing_main_laser.png.import
 create mode 100644 Scenes/y_wing_main_cannon_laser.tscn
 create mode 100644 Scripts/y_wing_main_cannon_laser.gd

diff --git a/Assets/y-wing_main_laser.png b/Assets/y-wing_main_laser.png
new file mode 100644
index 0000000000000000000000000000000000000000..48dc69141a509e29328a7383ecee1c0149cc1465
GIT binary patch
literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^c0ioO!3HEbdJ|3nDaPU;cPEB*=VV?2*$JL5jv*Cu
z-rhc#d&ohc_2JD9K8-_XS)&@R2vjXlyUc8=Gkt3@XIFZ8nPcVu@(qHQZnQ6dzHx#9
zGteLg*7VIaW~UdYZ~yh8@?-h5Mfw#LldgPktKNF1>ZIDf?tKsbxo(bAk$W0<ZvN96
zNt4&AvnzgFHnOiYTF(1DYv$KUzBYRvA1_+>GV}DB={b*Nt@m9q)pd72{&#cSrq1^A
zKi^I-7X<5%I;TGS%$YaY7eLA$`k$_>RXP83cBbXO%JtJC^@aKm$<-IXDKrJ5zu$hu
zlzj}@cw9SeuZPX4UEReukFHGW4+lBuUVi`bHrqHupffCF!!NIYyuGatC^4~O%GcWJ
ztcvjUGk`9dQ(g)(2Z%~ycxA(#k6*n2V)`DxfAy~-*k69fuWo>fA}N3|S!SO7biUs8
i_}M(yM+_h4+c3!dc>Lp;m8LByygXg~T-G@yGywoTj>;<l

literal 0
HcmV?d00001

diff --git a/Assets/y-wing_main_laser.png.import b/Assets/y-wing_main_laser.png.import
new file mode 100644
index 0000000..2807bee
--- /dev/null
+++ b/Assets/y-wing_main_laser.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://qmnr2uqcocyi"
+path="res://.godot/imported/y-wing_main_laser.png-eb02e45ecdcfd605782f38b4c2feafab.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/y-wing_main_laser.png"
+dest_files=["res://.godot/imported/y-wing_main_laser.png-eb02e45ecdcfd605782f38b4c2feafab.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/Scenes/world.gd b/Scenes/world.gd
index 66e6658..a930b81 100644
--- a/Scenes/world.gd
+++ b/Scenes/world.gd
@@ -6,6 +6,7 @@ var Laser = preload("res://Scenes/PlayerLaser.tscn")
 var missile = preload("res://Scenes/missile.tscn")
 var missile_refil = preload("res://Scenes/missile_pickup.tscn")
 var enemy_laser = preload("res://Scenes/enemy_laser.tscn")
+var enemy_y_wing_main = preload("res://Scenes/y_wing_main_cannon_laser.tscn")
 
 var enemy_y_wing_turret_laser = preload("res://Scenes/turret_laser.tscn")
 var enemy_y_wing_main_laser = null
@@ -68,6 +69,11 @@ func firey_wingturret(location,firing_solution,target):
 	add_child(l)
 	#l.initialize(rotation,target)
 
+func fire_y_wing_main(location):
+	print("fired")
+	var l = enemy_y_wing_main.instantiate()
+	l.global_position = location
+	add_child(l)
 
 
 
diff --git a/Scenes/y_wing_main_cannon_laser.tscn b/Scenes/y_wing_main_cannon_laser.tscn
new file mode 100644
index 0000000..a9a785c
--- /dev/null
+++ b/Scenes/y_wing_main_cannon_laser.tscn
@@ -0,0 +1,30 @@
+[gd_scene load_steps=5 format=3 uid="uid://bclbidx5k15o7"]
+
+[ext_resource type="Script" path="res://Scripts/y_wing_main_cannon_laser.gd" id="1_2yenk"]
+[ext_resource type="Texture2D" uid="uid://qmnr2uqcocyi" path="res://Assets/y-wing_main_laser.png" id="1_jmsrt"]
+
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_iw7a3"]
+radius = 3.0
+height = 80.0
+
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_mtiwm"]
+radius = 3.0
+height = 80.0
+
+[node name="y-wing-main-cannon" type="Area2D"]
+collision_layer = 16
+collision_mask = 3
+script = ExtResource("1_2yenk")
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+texture = ExtResource("1_jmsrt")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(-8, 4)
+shape = SubResource("CapsuleShape2D_iw7a3")
+
+[node name="CollisionShape2D2" type="CollisionShape2D" parent="."]
+position = Vector2(7, 4)
+shape = SubResource("CapsuleShape2D_mtiwm")
+
+[connection signal="area_entered" from="." to="." method="_on_area_entered"]
diff --git a/Scripts/enemy_ywing.gd b/Scripts/enemy_ywing.gd
index a915cc8..6702890 100644
--- a/Scripts/enemy_ywing.gd
+++ b/Scripts/enemy_ywing.gd
@@ -43,8 +43,9 @@ func _physics_process(delta):
 	global_position.y += speed * delta
 	
 	#main cannon firing
-	if mainray.is_colliding and mainray.get_collider is player:
+	if mainray.is_colliding and mainray.get_collider() is player:
 		if main_cannon == true:
+			print("target")
 			fire_main_cannon()
 			main_cannon = false
 			mainCannonFire.start()
diff --git a/Scripts/y_wing_main_cannon_laser.gd b/Scripts/y_wing_main_cannon_laser.gd
new file mode 100644
index 0000000..ed40e33
--- /dev/null
+++ b/Scripts/y_wing_main_cannon_laser.gd
@@ -0,0 +1,16 @@
+extends Area2D
+
+var speed = 2500
+
+
+func _physics_process(delta):
+	global_position.y += speed * delta
+	if global_position.y >= 980:
+		queue_free()
+
+
+
+func _on_area_entered(area):
+	if area is player:
+		area.take_damage(1)
+		queue_free()