Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Level/Island.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=34 format=3 uid="uid://3d51hjh2st8a"]
+[gd_scene load_steps=35 format=3 uid="uid://3d51hjh2st8a"]
 
 [ext_resource type="PackedScene" uid="uid://d2d4uv7o5gx5p" path="res://Level/World/screen_shader.tscn" id="1_huyen"]
 [ext_resource type="PackedScene" uid="uid://d3ccrfjpg4hbv" path="res://Models/palm_curved.tscn" id="3_bth2b"]
@@ -27,8 +27,9 @@
 [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"]
 [ext_resource type="PackedScene" path="res://Level/World/DayNightEnvironment.tscn" id="27_jutn4"]
 [ext_resource type="PackedScene" uid="uid://g4gmc0pwlak1" path="res://Models/buildings/fence.tscn" id="28_prydb"]
-[ext_resource type="PackedScene" path="res://crate.tscn" id="28_x0lrj"]
+[ext_resource type="PackedScene" uid="uid://ckbba1bs71tl" path="res://crate.tscn" id="28_x0lrj"]
-[ext_resource type="PackedScene" uid="uid://d0uw7ykhb1cx8" path="res://spawner.tscn" id="29_etvc6"]
+[ext_resource type="PackedScene" path="res://spawner.tscn" id="29_etvc6"]
+[ext_resource type="PackedScene" uid="uid://e0s4phx2jiit" path="res://cultist.tscn" id="30_8gvtc"]
 
 [sub_resource type="Animation" id="Animation_jpnyu"]
 resource_name = "waves"
@@ -495,6 +496,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.31447, 2.55588, -2.13044)
 [node name="Node3D" parent="." instance=ExtResource("29_etvc6")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.41845, 9.26863, -2.62281)
 
+[node name="Node3D2" type="Node3D" parent="."]
+
+[node name="Cultist" parent="." instance=ExtResource("30_8gvtc")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.10096, 2.40767, -1.07752)
+
 [connection signal="finished" from="Music" to="Music" method="_on_finished"]
 [connection signal="timeout" from="Music/Transition" to="Music" method="_on_transition_timer_timeout"]
 [connection signal="timeout" from="Music/Tween" to="Music" method="_on_tween_timer_timeout"]

godot/MeshInstance3D.gd

@@ -0,0 +1,4 @@
+extends MeshInstance3D
+
+func _process(_delta):
+	visible = Global.cheating

godot/Textures/kill.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cali86gqly7e3"
+path="res://.godot/imported/kill.png-e4f5f842049185427e5a508f24a44118.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/kill.png"
+dest_files=["res://.godot/imported/kill.png-e4f5f842049185427e5a508f24a44118.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

godot/Textures/redo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b5l5hur0x6nx0"
+path="res://.godot/imported/redo.png-2705bf6a1fcf83551fb9c16401980fe8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/redo.png"
+dest_files=["res://.godot/imported/redo.png-2705bf6a1fcf83551fb9c16401980fe8.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

godot/UI/PauseMenu.gd

@@ -27,3 +27,14 @@ func pause():
 
 func quit():
 	get_tree().quit()
+
+
+func _on_kill_pressed():
+	Global.cheating = true
+	toggle()
+
+
+
+func _on_restart_pressed():
+	toggle()
+	get_tree().reload_current_scene()

godot/UI/PauseMenu.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://cbca7q18ae42h"]
+[gd_scene load_steps=6 format=3 uid="uid://cbca7q18ae42h"]
 
 [ext_resource type="Script" path="res://UI/PauseMenu.gd" id="1_3puj1"]
 [ext_resource type="Texture2D" uid="uid://dxxd258q3uomg" path="res://UI/Play.png" id="1_c4do0"]
 [ext_resource type="Texture2D" uid="uid://hgb2ifbdpp3" path="res://UI/Exit.png" id="3_djmuk"]
+[ext_resource type="Texture2D" uid="uid://b5l5hur0x6nx0" path="res://Textures/redo.png" id="3_wl7bl"]
+[ext_resource type="Texture2D" uid="uid://cali86gqly7e3" path="res://Textures/kill.png" id="4_cr4ot"]
 
 [node name="PauseMenu" type="Control"]
 process_mode = 3
@@ -59,6 +61,11 @@ icon_alignment = 1
 
 [node name="Restart" type="Button" parent="CenterContainer/HBoxContainer"]
 layout_mode = 2
+icon = ExtResource("3_wl7bl")
+
+[node name="Kill" type="Button" parent="CenterContainer/HBoxContainer"]
+layout_mode = 2
+icon = ExtResource("4_cr4ot")
 
 [node name="QuitButton" type="Button" parent="CenterContainer/HBoxContainer"]
 process_mode = 3
@@ -76,4 +83,6 @@ flat = true
 icon_alignment = 1
 
 [connection signal="pressed" from="CenterContainer/HBoxContainer/ResumeButton" to="." method="unpause"]
+[connection signal="pressed" from="CenterContainer/HBoxContainer/Restart" to="." method="_on_restart_pressed"]
+[connection signal="pressed" from="CenterContainer/HBoxContainer/Kill" to="." method="_on_kill_pressed"]
 [connection signal="pressed" from="CenterContainer/HBoxContainer/QuitButton" to="." method="quit"]

godot/cultist.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=7 format=3 uid="uid://e0s4phx2jiit"]
+[gd_scene load_steps=10 format=3 uid="uid://e0s4phx2jiit"]
 
 [ext_resource type="Script" path="res://cultist.gd" id="1_k6djk"]
 [ext_resource type="PackedScene" uid="uid://c3q6fva1c1baa" path="res://Models/slime.tscn" id="2_004fn"]
 [ext_resource type="AudioStream" uid="uid://cxadu5w3jwv0b" path="res://Sounds/evilslime.ogg" id="3_novm4"]
+[ext_resource type="Script" path="res://MeshInstance3D.gd" id="4_trs5a"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_rypky"]
 radius = 2.5
@@ -13,6 +14,11 @@ radius = 0.055
 [sub_resource type="SphereShape3D" id="SphereShape3D_bmc5i"]
 radius = 0.05
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_y5n1c"]
+albedo_color = Color(1, 0, 1, 1)
+
+[sub_resource type="SphereMesh" id="SphereMesh_75ex5"]
+
 [node name="Cultist" type="CharacterBody3D"]
 script = ExtResource("1_k6djk")
 
@@ -38,5 +44,11 @@ shape = SubResource("SphereShape3D_bmc5i")
 [node name="evilslime" type="AudioStreamPlayer3D" parent="."]
 stream = ExtResource("3_novm4")
 
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 0, 0.181789, 0)
+material_override = SubResource("StandardMaterial3D_y5n1c")
+mesh = SubResource("SphereMesh_75ex5")
+script = ExtResource("4_trs5a")
+
 [connection signal="body_entered" from="TargetRadius" to="." method="_on_target_radius_body_entered"]
 [connection signal="body_entered" from="CollisionDetection" to="." method="_on_collision_detection_body_entered"]

godot/global.gd

@@ -0,0 +1,3 @@
+extends Node
+
+var cheating = false

godot/project.godot

@@ -15,6 +15,10 @@ run/main_scene="res://UI/TitleScreen.tscn"
 config/features=PackedStringArray("4.1", "Forward Plus")
 config/icon="res://icon.svg"
 
+[autoload]
+
+Global="*res://global.gd"
+
 [display]
 
 window/size/viewport_width=512