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

godot/Level/Island.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=31 format=3 uid="uid://3d51hjh2st8a"]
+[gd_scene load_steps=32 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"]
@@ -23,6 +23,7 @@
 [ext_resource type="PackedScene" uid="uid://b3aus2kigf8xt" path="res://Models/beach_decor/cooler.tscn" id="24_sl7ne"]
 [ext_resource type="PackedScene" uid="uid://cft26nug7kyqb" path="res://ambient_light_1.tscn" id="25_novxt"]
 [ext_resource type="PackedScene" uid="uid://ukful430mmkn" path="res://color_cube.tscn" id="25_rm0cr"]
+[ext_resource type="PackedScene" uid="uid://d2pvg0f5jtpve" path="res://slime_kill_box.tscn" id="27_cjxk6"]
 [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"]
 [ext_resource type="PackedScene" uid="uid://6ycop5t3nra5" 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"]
@@ -478,6 +479,8 @@ shape = SubResource("BoxShape3D_um2bu")
 
 [node name="DayNightEnvironment" parent="." instance=ExtResource("27_jutn4")]
 
+[node name="SlimeKillBox" parent="." instance=ExtResource("27_cjxk6")]
+
 [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/Models/island.gd

@@ -0,0 +1,6 @@
+extends Node3D
+
+var color: Color = Color("aef54d")
+
+func _ready():
+	$Island_001.get_active_material(0).albedo_color = color

godot/Models/island.tscn

@@ -1,13 +1,11 @@
 [gd_scene load_steps=4 format=3 uid="uid://difi2tur2j4dg"]
 
 [ext_resource type="PackedScene" uid="uid://dfyt6kjw8yli" path="res://Models/island.glb" id="1_5vc8b"]
-[ext_resource type="Material" uid="uid://b88xmds4mx7rd" path="res://Textures/grass.tres" id="2_knbpa"]
+[ext_resource type="Script" path="res://Models/island.gd" id="2_1q8nk"]
 [ext_resource type="Material" uid="uid://yuhlhpwji3c4" path="res://Textures/sand.tres" id="2_nhexh"]
 
 [node name="island" instance=ExtResource("1_5vc8b")]
+script = ExtResource("2_1q8nk")
 
 [node name="Island" parent="." index="0"]
 material_override = ExtResource("2_nhexh")
-
-[node name="Island_001" parent="." index="1"]
-material_override = ExtResource("2_knbpa")

godot/Models/island_grass1.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b3wyfvquke8qo"
+path.s3tc="res://.godot/imported/island_grass1.png-c39d61eb86dec28b8d2d96218e7ec133.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://Models/island_grass1.png"
+dest_files=["res://.godot/imported/island_grass1.png-c39d61eb86dec28b8d2d96218e7ec133.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+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=0

godot/Player.gd

@@ -114,11 +114,18 @@ func _physics_process(delta):
 	move_and_slide()
 
 func drop():
-	var obj = holding.get_ref()
+	var obj: Node3D = holding.get_ref()
 	if not obj:
 		print("dropped, but wasn't holding anything?")
 		return
 	remove_collision_exception_with(obj)
+	obj.look_at(Vector3(
+		$grape_man.global_position.x,
+		obj.global_position.y,
+		$grape_man.global_position.z,
+		))
+	obj.rotate_y(deg_to_rad(-90))
+	obj.translate_object_local(Vector3(0.125, 0.0, 0.0))
 	obj.set_process(true)
 	holding = weakref(null)
 

godot/Sounds/death.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://c2cnum2ucjh2q"
+path="res://.godot/imported/death.ogg-d87d44f044d6d892acc0289ac44ecb04.oggvorbisstr"
+
+[deps]
+
+source_file="res://Sounds/death.ogg"
+dest_files=["res://.godot/imported/death.ogg-d87d44f044d6d892acc0289ac44ecb04.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

godot/slime_kill_box.gd

@@ -0,0 +1,7 @@
+extends Area3D
+
+
+func _on_body_entered(body):
+	if "color_changes" in body:
+		body.queue_free()
+		$AudioStreamPlayer.play()

godot/slime_kill_box.tscn

@@ -0,0 +1,21 @@
+[gd_scene load_steps=4 format=3 uid="uid://d2pvg0f5jtpve"]
+
+[ext_resource type="Script" path="res://slime_kill_box.gd" id="1_pa1cf"]
+[ext_resource type="AudioStream" uid="uid://c2cnum2ucjh2q" path="res://Sounds/death.ogg" id="2_ne510"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_bvuti"]
+size = Vector3(0.5, 0.5, 0.5)
+
+[node name="SlimeKillBox" type="Area3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.29885, 1.93466, -1.55725)
+script = ExtResource("1_pa1cf")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.17611, 0)
+shape = SubResource("BoxShape3D_bvuti")
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("2_ne510")
+volume_db = -10.0
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]