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

godot/Level/Island.tscn

@@ -17,6 +17,7 @@
 [ext_resource type="PackedScene" uid="uid://bj8le45u845v3" path="res://Models/beach_decor/floatie.tscn" id="15_2v7p7"]
 [ext_resource type="PackedScene" uid="uid://dhrnbubumgi5h" path="res://Models/buildings/buildingruined.tscn" id="15_6cbuu"]
 [ext_resource type="PackedScene" uid="uid://dvpank15vkvtv" path="res://Models/beach_decor/parsol.tscn" id="21_dlhqg"]
+[ext_resource type="PackedScene" path="res://villager_shared.tscn" id="21_hxwg1"]
 [ext_resource type="PackedScene" uid="uid://7utef1nnena8" path="res://player.tscn" id="22_cuxj6"]
 [ext_resource type="PackedScene" uid="uid://b3aus2kigf8xt" path="res://Models/beach_decor/cooler.tscn" id="24_sl7ne"]
 [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"]

godot/Sounds/WelcomeToOceanCity.ogg.import

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

godot/Sounds/evilslime.ogg.import

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

godot/Sounds/happyslime.ogg.import

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

godot/Sounds/sadsound.ogg.import

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