added dropplet water, grenade, states, animation, YAYAY
This commit is contained in:
tim committed
1 parent
f36db7cd2a
commit
5418f512cd
67 files changed
+1150
-52
No files matched your search
@@ -0,0 +1,20 @@
|
||||
[gd_scene format=3 uid="uid://d5n7kwhkl4le"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://w8ctpjxlfoih" path="res://Scripts/dropplet.gd" id="1_8btdw"]
|
||||
|
||||
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_l34re"]
|
||||
friction = 0.1
|
||||
bounce = 0.5
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_8btdw"]
|
||||
radius = 1.0
|
||||
|
||||
[node name="Dropplet" type="RigidBody2D" unique_id=1699297511]
|
||||
physics_material_override = SubResource("PhysicsMaterial_l34re")
|
||||
contact_monitor = true
|
||||
max_contacts_reported = 100
|
||||
script = ExtResource("1_8btdw")
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=607348583]
|
||||
shape = SubResource("CircleShape2D_8btdw")
|
||||
+106
-8
@@ -5,6 +5,11 @@
|
||||
[ext_resource type="Script" uid="uid://b2otvelhtq7en" path="res://Scripts/SceneManager.gd" id="2_wowpa"]
|
||||
[ext_resource type="PackedScene" uid="uid://dmk1mp1hqm62b" path="res://Scenes/player.tscn" id="3_wowpa"]
|
||||
[ext_resource type="Script" uid="uid://4hekg0d8n04f" path="res://Scripts/trigger.gd" id="3_wrm1d"]
|
||||
[ext_resource type="PackedScene" uid="uid://ceyxo0mrrrd6d" path="res://Scenes/grenade.tscn" id="6_h4fw4"]
|
||||
[ext_resource type="Script" uid="uid://nhqfqpjecvt8" path="res://Scripts/fluid_container.gd" id="6_v158k"]
|
||||
[ext_resource type="Texture2D" uid="uid://b12wjykuncw11" path="res://Matirials/FluidPartical.tres" id="7_h4fw4"]
|
||||
[ext_resource type="PackedScene" uid="uid://d5n7kwhkl4le" path="res://Scenes/dropplet.tscn" id="8_ldgsr"]
|
||||
[ext_resource type="Shader" uid="uid://bvte4ugmua4n3" path="res://Scripts/Fluid.gdshader" id="10_ldgsr"]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_2poj3"]
|
||||
size = Vector2(178, 20)
|
||||
@@ -14,6 +19,27 @@ size = Vector2(178, 20)
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_3dryh"]
|
||||
radius = 111.364265
|
||||
|
||||
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_o5yvi"]
|
||||
blend_mode = 1
|
||||
light_mode = 1
|
||||
|
||||
[sub_resource type="QuadMesh" id="QuadMesh_v158k"]
|
||||
size = Vector2(5, 5)
|
||||
|
||||
[sub_resource type="MultiMesh" id="MultiMesh_v158k"]
|
||||
instance_count = 4
|
||||
mesh = SubResource("QuadMesh_v158k")
|
||||
buffer = PackedFloat32Array(0, 8e-45, 1e-45, 0, 1e-44, 8e-45, 1e-45, 7e-45, 3e-45, 1e-45, 8e-45, 7e-45, 3e-45, 6e-45, 4e-45, 3e-45, 7e-45, 6e-45, 0, 0.6, 0.7, 1, -3.3646448, 14.557036, 0, 0.6, 0.7, 0.42, 0, 0, 0, 0)
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_o5yvi"]
|
||||
shader = ExtResource("10_ldgsr")
|
||||
shader_parameter/threshold = 0.50000002375
|
||||
shader_parameter/smoothness = 0.02000000095
|
||||
shader_parameter/fluid_color = Color(0, 0.53333336, 0.61960787, 1)
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ldgsr"]
|
||||
size = Vector2(33, 103)
|
||||
|
||||
[node name="Game" type="Node2D" unique_id=1698001017]
|
||||
script = ExtResource("1_qxrlw")
|
||||
|
||||
@@ -30,30 +56,30 @@ metadata/_edit_group_ = true
|
||||
position = Vector2(3, 0)
|
||||
shape = SubResource("RectangleShape2D_2poj3")
|
||||
|
||||
[node name="StaticBody2D" type="StaticBody2D" parent="." unique_id=1600506296]
|
||||
[node name="WorldFloor" type="StaticBody2D" parent="." unique_id=1600506296]
|
||||
position = Vector2(448, 452)
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D" unique_id=1926005878]
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="WorldFloor" unique_id=1926005878]
|
||||
shape = SubResource("WorldBoundaryShape2D_2poj3")
|
||||
|
||||
[node name="Player" parent="." unique_id=56223176 instance=ExtResource("3_wowpa")]
|
||||
position = Vector2(150, 303)
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="." unique_id=1184709580]
|
||||
[node name="destroyer" type="Area2D" parent="." unique_id=1184709580]
|
||||
position = Vector2(873, 340)
|
||||
script = ExtResource("3_wrm1d")
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=1623965811]
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="destroyer" unique_id=1623965811]
|
||||
shape = SubResource("CircleShape2D_3dryh")
|
||||
debug_color = Color(0.7716697, 0.28327075, 0.8513461, 0.41960785)
|
||||
|
||||
[node name="StaticBody2D2" type="StaticBody2D" parent="." unique_id=938313164]
|
||||
[node name="Ramp" type="StaticBody2D" parent="." unique_id=938313164]
|
||||
position = Vector2(392, 392)
|
||||
constant_linear_velocity = Vector2(10000, -5000)
|
||||
|
||||
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StaticBody2D2" unique_id=435374624]
|
||||
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Ramp" unique_id=435374624]
|
||||
polygon = PackedVector2Array(-67, 16, 32, 16, 32, -31)
|
||||
|
||||
[node name="Crates" type="Node2D" parent="." unique_id=982841392]
|
||||
@@ -73,5 +99,77 @@ position = Vector2(511, 365)
|
||||
[node name="Crate5" parent="Crates" unique_id=1833569865 instance=ExtResource("2_3dryh")]
|
||||
position = Vector2(469, 242)
|
||||
|
||||
[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]
|
||||
[connection signal="triggerActiveSignal" from="Area2D" to="." method="_on_triggerSignal"]
|
||||
[node name="Grenade" parent="." unique_id=1290284523 instance=ExtResource("6_h4fw4")]
|
||||
position = Vector2(575.5, 321.5)
|
||||
scale = Vector2(6.755, 4.215)
|
||||
|
||||
[node name="FluidContainer" type="Node2D" parent="." unique_id=1120087352]
|
||||
script = ExtResource("6_v158k")
|
||||
|
||||
[node name="MultiMeshInstance2D" type="MultiMeshInstance2D" parent="FluidContainer" unique_id=391615966]
|
||||
material = SubResource("CanvasItemMaterial_o5yvi")
|
||||
multimesh = SubResource("MultiMesh_v158k")
|
||||
texture = ExtResource("7_h4fw4")
|
||||
|
||||
[node name="Dropplet" parent="FluidContainer" unique_id=1699297511 instance=ExtResource("8_ldgsr")]
|
||||
position = Vector2(93, 301)
|
||||
|
||||
[node name="Dropplet2" parent="FluidContainer" unique_id=451606999 instance=ExtResource("8_ldgsr")]
|
||||
position = Vector2(93, 301)
|
||||
|
||||
[node name="Dropplet3" parent="FluidContainer" unique_id=1184492161 instance=ExtResource("8_ldgsr")]
|
||||
position = Vector2(93, 301)
|
||||
|
||||
[node name="Dropplet4" parent="FluidContainer" unique_id=1222152104 instance=ExtResource("8_ldgsr")]
|
||||
position = Vector2(93, 301)
|
||||
|
||||
[node name="BackBufferCopy" type="BackBufferCopy" parent="." unique_id=263444442]
|
||||
position = Vector2(575.5, 321.5)
|
||||
scale = Vector2(6.755, 4.215)
|
||||
copy_mode = 2
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="BackBufferCopy" unique_id=476141794]
|
||||
material = SubResource("ShaderMaterial_o5yvi")
|
||||
offset_left = -84.75204
|
||||
offset_top = -77.2242
|
||||
offset_right = 83.86381
|
||||
offset_bottom = 76.27521
|
||||
|
||||
[node name="Box" type="Node2D" parent="." unique_id=1091011481]
|
||||
|
||||
[node name="StaticBody2D" type="StaticBody2D" parent="Box" unique_id=1170266336]
|
||||
position = Vector2(154, 333)
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Box/StaticBody2D" unique_id=801438640]
|
||||
position = Vector2(-2.5, 41.5)
|
||||
shape = SubResource("RectangleShape2D_ldgsr")
|
||||
|
||||
[node name="StaticBody2D4" type="StaticBody2D" parent="Box" unique_id=1387898222]
|
||||
position = Vector2(30.999992, 286)
|
||||
rotation = -0.62133723
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Box/StaticBody2D4" unique_id=991907868]
|
||||
position = Vector2(-2.5, 41.5)
|
||||
shape = SubResource("RectangleShape2D_ldgsr")
|
||||
|
||||
[node name="StaticBody2D2" type="StaticBody2D" parent="Box" unique_id=877846752]
|
||||
position = Vector2(53, 330)
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Box/StaticBody2D2" unique_id=1150133989]
|
||||
position = Vector2(-2.5, 41.5)
|
||||
shape = SubResource("RectangleShape2D_ldgsr")
|
||||
|
||||
[node name="StaticBody2D3" type="StaticBody2D" parent="Box" unique_id=2125119042]
|
||||
position = Vector2(144, 421)
|
||||
rotation = 1.5707964
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Box/StaticBody2D3" unique_id=1057588662]
|
||||
position = Vector2(6.5, 41.5)
|
||||
shape = SubResource("RectangleShape2D_ldgsr")
|
||||
|
||||
[connection signal="body_entered" from="destroyer" to="destroyer" method="_on_body_entered"]
|
||||
[connection signal="triggerActiveSignal" from="destroyer" to="." method="_on_triggerSignal"]
|
||||
@@ -0,0 +1,17 @@
|
||||
[gd_scene format=3 uid="uid://ceyxo0mrrrd6d"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://jrqdl3mm7rly" path="res://Scripts/grenade.gd" id="1_v44n1"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_b5j7x"]
|
||||
radius = 2.0
|
||||
|
||||
[node name="Grenade" type="RigidBody2D" unique_id=1290284523]
|
||||
contact_monitor = true
|
||||
max_contacts_reported = 3
|
||||
script = ExtResource("1_v44n1")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1668727236]
|
||||
shape = SubResource("CircleShape2D_b5j7x")
|
||||
debug_color = Color(0.81547993, 0.40661094, 1.1551381e-06, 1)
|
||||
|
||||
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
|
||||
@@ -1,10 +1,152 @@
|
||||
[gd_scene format=3 uid="uid://dmk1mp1hqm62b"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://btmoyp0rwqmxe" path="res://Scripts/player.gd" id="1_v0iea"]
|
||||
[ext_resource type="Texture2D" uid="uid://c87goe3qmmrv0" path="res://assets/graphics/player/Running/player run 48x48.png" id="2_6t5aa"]
|
||||
[ext_resource type="Texture2D" uid="uid://p72rbg7thsvi" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_cvnsp"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_2poj3"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_ukyrk"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(0, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_7dp3o"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(48, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_h4iuc"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(96, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_fd4e3"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(144, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_qqcod"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(192, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_igrcy"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(240, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_fs7ks"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(288, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_l6n3p"]
|
||||
atlas = ExtResource("2_6t5aa")
|
||||
region = Rect2(336, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_6t5aa"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(0, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_vgqql"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(48, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_fkybt"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(96, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_x3wgy"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(144, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_3smsa"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(192, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_8erm5"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(240, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_f1ek2"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(288, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_tx1dd"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(336, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_gymyn"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(384, 0, 48, 48)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_pu2lt"]
|
||||
atlas = ExtResource("2_cvnsp")
|
||||
region = Rect2(432, 0, 48, 48)
|
||||
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_ukyrk"]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_ukyrk")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_7dp3o")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_h4iuc")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_fd4e3")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_qqcod")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_igrcy")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_fs7ks")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_l6n3p")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"Run",
|
||||
"speed": 12.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_6t5aa")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_vgqql")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_fkybt")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_x3wgy")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_3smsa")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_8erm5")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_f1ek2")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_tx1dd")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_gymyn")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_pu2lt")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"idle",
|
||||
"speed": 12.0
|
||||
}]
|
||||
|
||||
[node name="Player" type="CharacterBody2D" unique_id=56223176]
|
||||
texture_filter = 1
|
||||
script = ExtResource("1_v0iea")
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
@@ -17,3 +159,16 @@ target_position = Vector2(24, 0)
|
||||
|
||||
[node name="LeftCast" type="RayCast2D" parent="." unique_id=648222680]
|
||||
target_position = Vector2(-24, 0)
|
||||
|
||||
[node name="RightSpawn" type="Marker2D" parent="." unique_id=358294407]
|
||||
position = Vector2(16, -5)
|
||||
|
||||
[node name="LeftSpawn" type="Marker2D" parent="." unique_id=1342289836]
|
||||
position = Vector2(-15, -5)
|
||||
|
||||
[node name="PlayerGraphic" type="AnimatedSprite2D" parent="." unique_id=1409812048]
|
||||
position = Vector2(0, -6)
|
||||
sprite_frames = SubResource("SpriteFrames_ukyrk")
|
||||
animation = &"Run"
|
||||
autoplay = "idle"
|
||||
frame_progress = 0.013636588
|
||||
Reference in new issue
Block a user