1
Fork 0
mirror of https://github.com/Steffo99/swear-jar.git synced 2024-11-22 07:44:17 +00:00

Merge branch 'main' of github.com:Steffo99/ld54

This commit is contained in:
Steffo 2023-10-02 18:29:10 +02:00
commit 4e5ade9ddf
Signed by: steffo
GPG key ID: 2A24051445686895
19 changed files with 212 additions and 26 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=3 uid="uid://cqshgmptdav2b"]
[gd_scene load_steps=24 format=3 uid="uid://cqshgmptdav2b"]
[ext_resource type="Script" path="res://converters/converter.gd" id="1_fgju3"]
[ext_resource type="Texture2D" uid="uid://chc8wqc1pclbk" path="res://converters/gold_to_gem/gold_converter_back.png" id="2_hh4ft"]

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=34 format=3 uid="uid://ddrhfhebwtq5"]
[gd_scene load_steps=45 format=3 uid="uid://ddrhfhebwtq5"]
[ext_resource type="Script" path="res://converters/converter.gd" id="1_qln0a"]
[ext_resource type="Texture2D" uid="uid://devcho3gaigt0" path="res://converters/item_converter/item_converter_back_1.png" id="2_136t7"]
@ -6,7 +6,6 @@
[ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="3_qehi7"]
[ext_resource type="Texture2D" uid="uid://dsolplf1s7va6" path="res://converters/item_converter/item_converter_back_3.png" id="4_bs7n5"]
[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="4_ihtl7"]
[ext_resource type="PackedScene" uid="uid://dme22vvfgme5f" path="res://entity/coin_silver/coin_silver.tscn" id="5_fp5qt"]
[ext_resource type="Texture2D" uid="uid://c4vpmiwjfvcpy" path="res://converters/item_converter/item_converter_back_4.png" id="5_lk4ym"]
[ext_resource type="Texture2D" uid="uid://c0kstbgsm65vq" path="res://converters/item_converter/item_converter_back_5.png" id="6_io2km"]
[ext_resource type="Texture2D" uid="uid://crnu1x5n33yqu" path="res://converters/item_converter/item_converter_front_1.png" id="7_khayw"]
@ -14,10 +13,19 @@
[ext_resource type="Texture2D" uid="uid://fqerky4lyps8" path="res://converters/item_converter/item_converter_front_3.png" id="9_88mk7"]
[ext_resource type="Texture2D" uid="uid://bw0jgw0jen4lg" path="res://converters/item_converter/item_converter_front_4.png" id="10_fjv52"]
[ext_resource type="Texture2D" uid="uid://4tg81ksibacf" path="res://converters/item_converter/item_converter_front_5.png" id="11_cg5dk"]
[ext_resource type="PackedScene" uid="uid://bevj27e1ha8m3" path="res://converters/converter_placement_body.tscn" id="17_udaa3"]
[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="14_t5rsp"]
[ext_resource type="Texture2D" uid="uid://wpen8vmuyvqv" path="res://entity/item/item_chalice.png" id="15_4mivw"]
[ext_resource type="AudioStream" uid="uid://du16ilpv6gmxd" path="res://audio/conversione/drop_in_lava.wav" id="15_nahnf"]
[ext_resource type="Texture2D" uid="uid://dvthocklcjh15" path="res://entity/item/item_chalice_gems.png" id="16_b46dj"]
[ext_resource type="AudioStream" uid="uid://dv1e0wiiquxp0" path="res://audio/conversione/lava.wav" id="16_ptmks"]
[ext_resource type="AudioStream" uid="uid://c0uhi1hrejyxg" path="res://audio/conversione/new_item.wav" id="17_4wm4w"]
[ext_resource type="PackedScene" uid="uid://vkvtap437nnf" path="res://color/colored.tscn" id="17_ickrn"]
[ext_resource type="PackedScene" uid="uid://bevj27e1ha8m3" path="res://converters/converter_placement_body.tscn" id="17_udaa3"]
[ext_resource type="Shader" path="res://entity/gem/gem_shading_material.gdshader" id="18_36lk7"]
[ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="19_ih6j4"]
[ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="20_rkbv1"]
[ext_resource type="Script" path="res://entity/gem/RandomValue.gd" id="21_wmo4c"]
[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="22_5s1fv"]
[sub_resource type="AtlasTexture" id="AtlasTexture_uqtie"]
atlas = ExtResource("2_136t7")
@ -115,6 +123,22 @@ size = Vector2(26, 4)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_k11if"]
size = Vector2(26, 5)
[sub_resource type="CircleShape2D" id="CircleShape2D_hwdjv"]
radius = 18.5017
[sub_resource type="PackedScene" id="PackedScene_srx0t"]
_bundled = {
"conn_count": 1,
"conns": PackedInt32Array(5, 5, 30, 29, 18, 0, 0),
"editable_instances": [],
"names": PackedStringArray("Item", "collision_layer", "collision_mask", "mass", "inertia", "physics_material_override", "continuous_cd", "linear_damp", "angular_damp", "RigidBody2D", "CollisionShape2D", "scale", "shape", "Sprite2D", "texture_filter", "texture", "Sprite", "Colored", "shader", "Collectible", "type", "Valuable", "value", "RandomValue", "script", "Node", "SoundWorking", "stream", "AudioStreamPlayer", "_on_done", "collected"),
"node_count": 9,
"node_paths": [],
"nodes": PackedInt32Array(-1, -1, 9, 0, -1, 8, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 6, 0, 0, 0, 10, 10, -1, 2, 11, 7, 12, 8, 0, 1, 0, 13, 13, -1, 2, 14, 5, 15, 9, 0, 1, 0, 13, 16, -1, 2, 14, 5, 15, 10, 0, 3, 0, 2147483647, 17, 11, 1, 18, 12, 0, 0, 0, 2147483647, 19, 13, 1, 20, 14, 0, 0, 0, 2147483647, 21, 15, 1, 22, 16, 0, 6, 0, 25, 23, -1, 1, 24, 17, 0, 0, 0, 28, 26, -1, 1, 27, 18, 0),
"variants": [5, 7, 1.5, 800.0, ExtResource("14_t5rsp"), 1, 0.1, Vector2(4, 4), SubResource("CircleShape2D_hwdjv"), ExtResource("15_4mivw"), ExtResource("16_b46dj"), ExtResource("17_ickrn"), ExtResource("18_36lk7"), ExtResource("19_ih6j4"), &"Gem", ExtResource("20_rkbv1"), 10, ExtResource("21_wmo4c"), ExtResource("22_5s1fv")],
"version": 3
}
[sub_resource type="RectangleShape2D" id="RectangleShape2D_jeo5f"]
size = Vector2(26, 8.83334)
@ -167,7 +191,7 @@ debug_color = Color(0, 0.701961, 0.188235, 0.419608)
[node name="Spawner" parent="." instance=ExtResource("4_ihtl7")]
position = Vector2(0, 8)
scene = ExtResource("5_fp5qt")
scene = SubResource("PackedScene_srx0t")
buffer_cap = 1
spawn_rect = Rect2(-8, 0, 16, 4)
spawn_rotation_degrees_min = 80.0

View file

@ -38,7 +38,7 @@ radius = 1.5
height = 28.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_31dtl"]
size = Vector2(26, 4)
size = Vector2(26, 11.1667)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_k11if"]
size = Vector2(26, 5)

View file

@ -10,8 +10,8 @@
[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="6_svrnw"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jkfas"]
radius = 4.0
height = 10.0
radius = 13.25
height = 32.0
[node name="Gem" type="RigidBody2D"]
collision_layer = 4

View file

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://wpen8vmuyvqv"
path="res://.godot/imported/item_chalice.png-7c6bf5aba6af81724e4a9b47b0fa9097.ctex"
path="res://.godot/imported/item_chalice.png-c5df7a19dd55b2ba93c6d0a5ed67bc40.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://entity/item_chalice.png"
dest_files=["res://.godot/imported/item_chalice.png-7c6bf5aba6af81724e4a9b47b0fa9097.ctex"]
source_file="res://entity/item/item_chalice.png"
dest_files=["res://.godot/imported/item_chalice.png-c5df7a19dd55b2ba93c6d0a5ed67bc40.ctex"]
[params]

View file

@ -0,0 +1,54 @@
[gd_scene load_steps=11 format=3 uid="uid://451ddbtq4163"]
[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_vp2el"]
[ext_resource type="Texture2D" uid="uid://wpen8vmuyvqv" path="res://entity/item/item_chalice.png" id="2_rnc33"]
[ext_resource type="Texture2D" uid="uid://dvthocklcjh15" path="res://entity/item/item_chalice_gems.png" id="3_crdaw"]
[ext_resource type="PackedScene" uid="uid://vkvtap437nnf" path="res://color/colored.tscn" id="4_n40wg"]
[ext_resource type="Shader" path="res://entity/gem/gem_shading_material.gdshader" id="5_bkxhb"]
[ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="6_eanc2"]
[ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="7_0qpb5"]
[ext_resource type="Script" path="res://entity/gem/RandomValue.gd" id="8_87qrp"]
[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="9_v6jws"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_6xf6v"]
radius = 12.95
height = 42.31
[node name="ItemChalice" type="RigidBody2D"]
collision_layer = 5
collision_mask = 7
mass = 1.5
inertia = 800.0
physics_material_override = ExtResource("1_vp2el")
continuous_cd = 1
linear_damp = 0.1
angular_damp = 0.1
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2(4, 4)
shape = SubResource("CapsuleShape2D_6xf6v")
[node name="Sprite2D" type="Sprite2D" parent="CollisionShape2D"]
texture_filter = 1
texture = ExtResource("2_rnc33")
[node name="Sprite" type="Sprite2D" parent="CollisionShape2D"]
texture_filter = 1
texture = ExtResource("3_crdaw")
[node name="Colored" parent="CollisionShape2D/Sprite" instance=ExtResource("4_n40wg")]
shader = ExtResource("5_bkxhb")
[node name="Collectible" parent="." instance=ExtResource("6_eanc2")]
type = &"Gem"
[node name="Valuable" parent="." instance=ExtResource("7_0qpb5")]
value = 10
[node name="RandomValue" type="Node" parent="Valuable"]
script = ExtResource("8_87qrp")
[node name="SoundWorking" type="AudioStreamPlayer" parent="."]
stream = ExtResource("9_v6jws")
[connection signal="collected" from="Collectible" to="Collectible" method="_on_done" flags=18]

View file

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dvthocklcjh15"
path="res://.godot/imported/item_chalice_gems.png-182c84a35d2925a897cade98742ac714.ctex"
path="res://.godot/imported/item_chalice_gems.png-00db24473f6cbe288664e42289ba7c68.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://entity/item_chalice_gems.png"
dest_files=["res://.godot/imported/item_chalice_gems.png-182c84a35d2925a897cade98742ac714.ctex"]
source_file="res://entity/item/item_chalice_gems.png"
dest_files=["res://.godot/imported/item_chalice_gems.png-00db24473f6cbe288664e42289ba7c68.ctex"]
[params]

View file

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://brlo5pqo0x86l"
path="res://.godot/imported/item_crown.png-b1fdb9663d17347d4fbd39044017f645.ctex"
path="res://.godot/imported/item_crown.png-79b26b3e29df09fdd86d05f7fb7107d2.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://entity/item_crown.png"
dest_files=["res://.godot/imported/item_crown.png-b1fdb9663d17347d4fbd39044017f645.ctex"]
source_file="res://entity/item/item_crown.png"
dest_files=["res://.godot/imported/item_crown.png-79b26b3e29df09fdd86d05f7fb7107d2.ctex"]
[params]

View file

@ -0,0 +1,54 @@
[gd_scene load_steps=11 format=3 uid="uid://d32fgw4klo4x3"]
[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_j1ug7"]
[ext_resource type="Texture2D" uid="uid://brlo5pqo0x86l" path="res://entity/item/item_crown.png" id="2_4mgp8"]
[ext_resource type="Texture2D" uid="uid://l7kr24oe0fc8" path="res://entity/item/item_crown_gems.png" id="3_cpnmq"]
[ext_resource type="PackedScene" uid="uid://vkvtap437nnf" path="res://color/colored.tscn" id="4_ttx03"]
[ext_resource type="Shader" path="res://entity/gem/gem_shading_material.gdshader" id="5_c6qlx"]
[ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="6_4lslk"]
[ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="7_7rpe6"]
[ext_resource type="Script" path="res://entity/gem/RandomValue.gd" id="8_utkrs"]
[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="9_6xmfi"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jkfas"]
radius = 13.25
height = 32.0
[node name="ItemCrown" type="RigidBody2D"]
collision_layer = 5
collision_mask = 7
mass = 1.5
inertia = 800.0
physics_material_override = ExtResource("1_j1ug7")
continuous_cd = 1
linear_damp = 0.1
angular_damp = 0.1
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2(4, 4)
shape = SubResource("CapsuleShape2D_jkfas")
[node name="Sprite2D" type="Sprite2D" parent="CollisionShape2D"]
texture_filter = 1
texture = ExtResource("2_4mgp8")
[node name="Sprite" type="Sprite2D" parent="CollisionShape2D"]
texture_filter = 1
texture = ExtResource("3_cpnmq")
[node name="Colored" parent="CollisionShape2D/Sprite" instance=ExtResource("4_ttx03")]
shader = ExtResource("5_c6qlx")
[node name="Collectible" parent="." instance=ExtResource("6_4lslk")]
type = &"Gem"
[node name="Valuable" parent="." instance=ExtResource("7_7rpe6")]
value = 10
[node name="RandomValue" type="Node" parent="Valuable"]
script = ExtResource("8_utkrs")
[node name="SoundWorking" type="AudioStreamPlayer" parent="."]
stream = ExtResource("9_6xmfi")
[connection signal="collected" from="Collectible" to="Collectible" method="_on_done" flags=18]

View file

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://l7kr24oe0fc8"
path="res://.godot/imported/item_crown_gems.png-57e99547b8bc3470cb75cd17193c0abd.ctex"
path="res://.godot/imported/item_crown_gems.png-20cb9b6c45e833bf6f0cfe53ff4bfe74.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://entity/item_crown_gems.png"
dest_files=["res://.godot/imported/item_crown_gems.png-57e99547b8bc3470cb75cd17193c0abd.ctex"]
source_file="res://entity/item/item_crown_gems.png"
dest_files=["res://.godot/imported/item_crown_gems.png-20cb9b6c45e833bf6f0cfe53ff4bfe74.ctex"]
[params]

View file

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dcw3cq3ni253t"
path="res://.godot/imported/item_ring.png-a4f5983b41259568642782622b1a92ac.ctex"
path="res://.godot/imported/item_ring.png-11e67ad2864164079ba081a171645596.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://entity/item_ring.png"
dest_files=["res://.godot/imported/item_ring.png-a4f5983b41259568642782622b1a92ac.ctex"]
source_file="res://entity/item/item_ring.png"
dest_files=["res://.godot/imported/item_ring.png-11e67ad2864164079ba081a171645596.ctex"]
[params]

View file

@ -0,0 +1,54 @@
[gd_scene load_steps=11 format=3 uid="uid://y2p6j177k3nr"]
[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_yyeot"]
[ext_resource type="Texture2D" uid="uid://dcw3cq3ni253t" path="res://entity/item/item_ring.png" id="2_kevks"]
[ext_resource type="Texture2D" uid="uid://dnfkvj0usdb6n" path="res://entity/item/item_ring_gems.png" id="3_foriv"]
[ext_resource type="PackedScene" uid="uid://vkvtap437nnf" path="res://color/colored.tscn" id="4_dscrk"]
[ext_resource type="Shader" path="res://entity/gem/gem_shading_material.gdshader" id="5_pu8lc"]
[ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="6_lont5"]
[ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="7_37tvl"]
[ext_resource type="Script" path="res://entity/gem/RandomValue.gd" id="8_ddhh8"]
[ext_resource type="AudioStream" uid="uid://br25ip30mu174" path="res://audio/conversione/mechanic_sound.wav" id="9_0enei"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_ka4h2"]
radius = 5.64
height = 17.01
[node name="ItemRing" type="RigidBody2D"]
collision_layer = 5
collision_mask = 7
mass = 1.5
inertia = 800.0
physics_material_override = ExtResource("1_yyeot")
continuous_cd = 1
linear_damp = 0.1
angular_damp = 0.1
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2(4, 4)
shape = SubResource("CapsuleShape2D_ka4h2")
[node name="Sprite2D" type="Sprite2D" parent="CollisionShape2D"]
texture_filter = 1
texture = ExtResource("2_kevks")
[node name="Sprite" type="Sprite2D" parent="CollisionShape2D"]
texture_filter = 1
texture = ExtResource("3_foriv")
[node name="Colored" parent="CollisionShape2D/Sprite" instance=ExtResource("4_dscrk")]
shader = ExtResource("5_pu8lc")
[node name="Collectible" parent="." instance=ExtResource("6_lont5")]
type = &"Gem"
[node name="Valuable" parent="." instance=ExtResource("7_37tvl")]
value = 10
[node name="RandomValue" type="Node" parent="Valuable"]
script = ExtResource("8_ddhh8")
[node name="SoundWorking" type="AudioStreamPlayer" parent="."]
stream = ExtResource("9_0enei")
[connection signal="collected" from="Collectible" to="Collectible" method="_on_done" flags=18]

View file

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dnfkvj0usdb6n"
path="res://.godot/imported/item_ring_gems.png-15fb2caf015b721a6fe6cd5c86878289.ctex"
path="res://.godot/imported/item_ring_gems.png-83a22b3deeb0b23cf11f84fd34725cf7.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://entity/item_ring_gems.png"
dest_files=["res://.godot/imported/item_ring_gems.png-15fb2caf015b721a6fe6cd5c86878289.ctex"]
source_file="res://entity/item/item_ring_gems.png"
dest_files=["res://.godot/imported/item_ring_gems.png-83a22b3deeb0b23cf11f84fd34725cf7.ctex"]
[params]