diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index c2cbd2e..69c6271 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -17,7 +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" uid="uid://c4s6y758n77lw" path="res://villager_shared.tscn" id="21_hxwg1"] +[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"] @@ -247,6 +247,14 @@ transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 1.40507, -2.10425) [node name="villager" parent="." instance=ExtResource("21_hxwg1")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.369429, 2.40957, -0.685529) +target_location_xz = null +location_xz = null +target_direction_xz = null +direction_xz = null +walk_chance = null +spin_chance = null +walk_speed = null +dir_correction_rate = null [node name="Player" parent="." instance=ExtResource("22_cuxj6")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.192051, 2.60275, 0) diff --git a/godot/Models/grape_animations/pickup.res b/godot/Models/grape_animations/pickup.res index 199e933..0471c90 100644 Binary files a/godot/Models/grape_animations/pickup.res and b/godot/Models/grape_animations/pickup.res differ diff --git a/godot/Models/grape_animations/upper_body_holding.res b/godot/Models/grape_animations/upper_body_holding.res index 7badc09..4fc0701 100644 Binary files a/godot/Models/grape_animations/upper_body_holding.res and b/godot/Models/grape_animations/upper_body_holding.res differ diff --git a/godot/Models/grape_animations/upper_body_idle.res.res b/godot/Models/grape_animations/upper_body_idle.res.res index 0f2924d..fd30d7a 100644 Binary files a/godot/Models/grape_animations/upper_body_idle.res.res and b/godot/Models/grape_animations/upper_body_idle.res.res differ diff --git a/godot/Models/grape_animations/walk.res b/godot/Models/grape_animations/walk.res index d0c4987..40403e8 100644 Binary files a/godot/Models/grape_animations/walk.res and b/godot/Models/grape_animations/walk.res differ diff --git a/godot/Sounds/evilslime.ogg b/godot/Sounds/evilslime.ogg new file mode 100644 index 0000000..dc59965 --- /dev/null +++ b/godot/Sounds/evilslime.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3251811a1f62a2e4a27a7205ba21492898ada30948b79210abddd3d14435727 +size 23229 diff --git a/godot/Sounds/evilslime.ogg.import b/godot/Sounds/evilslime.ogg.import new file mode 100644 index 0000000..6b880c2 --- /dev/null +++ b/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 diff --git a/godot/Sounds/happyslime.ogg b/godot/Sounds/happyslime.ogg new file mode 100644 index 0000000..8459fbd --- /dev/null +++ b/godot/Sounds/happyslime.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ee0472aedc1e131dd805009b1df2b87eb5b41c87caaee8f2a314a4f45303949 +size 20239 diff --git a/godot/Sounds/happyslime.ogg.import b/godot/Sounds/happyslime.ogg.import new file mode 100644 index 0000000..b05d285 --- /dev/null +++ b/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 diff --git a/godot/Sounds/sadsound.ogg b/godot/Sounds/sadsound.ogg new file mode 100644 index 0000000..3c8258b --- /dev/null +++ b/godot/Sounds/sadsound.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf2ac78a63907d96aa686fafbd0a4e823be19426b36da4de4fd47edd6ad02e77 +size 20585 diff --git a/godot/Sounds/sadsound.ogg.import b/godot/Sounds/sadsound.ogg.import new file mode 100644 index 0000000..3380f95 --- /dev/null +++ b/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