pull/4/head
John Montagu, the 4th Earl of Sandvich 2023-07-19 01:25:02 -07:00
parent 2979f69405
commit 4ac4590cae
Signed by: sandvich
GPG Key ID: 9A39BE37E602B22D
17 changed files with 352 additions and 26 deletions

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cyldr0ck3yfrp"
path="res://.godot/imported/torch-lamp.png-9d1bb0925cf254976eada5dcc0694a4f.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Misc/torch-lamp.png"
dest_files=["res://.godot/imported/torch-lamp.png-9d1bb0925cf254976eada5dcc0694a4f.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
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=1

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 B

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://har1bd5u4dq3"
path="res://.godot/imported/torch.png-a5b622a0de1d4e6244fce3f5c31d2324.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Misc/torch.png"
dest_files=["res://.godot/imported/torch.png-a5b622a0de1d4e6244fce3f5c31d2324.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
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=1

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b8ann6yb8qox4"
path="res://.godot/imported/light-pixel.png-d30110ea010169a59ef281e39651990b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Particles/light-pixel.png"
dest_files=["res://.godot/imported/light-pixel.png-d30110ea010169a59ef281e39651990b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
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=1

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -0,0 +1,79 @@
[gd_scene load_steps=11 format=3 uid="uid://c1w7t6irnohfx"]
[ext_resource type="Texture2D" uid="uid://har1bd5u4dq3" path="res://Assets/Sprites/Misc/torch.png" id="1_14bgb"]
[ext_resource type="Texture2D" uid="uid://b8ann6yb8qox4" path="res://Assets/Sprites/Particles/light-pixel.png" id="2_f0xs8"]
[sub_resource type="AtlasTexture" id="AtlasTexture_js1l1"]
atlas = ExtResource("1_14bgb")
region = Rect2(0, 0, 8, 12)
[sub_resource type="AtlasTexture" id="AtlasTexture_gdxtl"]
atlas = ExtResource("1_14bgb")
region = Rect2(8, 0, 8, 12)
[sub_resource type="AtlasTexture" id="AtlasTexture_da7fw"]
atlas = ExtResource("1_14bgb")
region = Rect2(16, 0, 8, 12)
[sub_resource type="AtlasTexture" id="AtlasTexture_rpccx"]
atlas = ExtResource("1_14bgb")
region = Rect2(24, 0, 8, 12)
[sub_resource type="AtlasTexture" id="AtlasTexture_crwu1"]
atlas = ExtResource("1_14bgb")
region = Rect2(32, 0, 8, 12)
[sub_resource type="AtlasTexture" id="AtlasTexture_r3kxc"]
atlas = ExtResource("1_14bgb")
region = Rect2(40, 0, 8, 12)
[sub_resource type="AtlasTexture" id="AtlasTexture_225la"]
atlas = ExtResource("1_14bgb")
region = Rect2(48, 0, 8, 12)
[sub_resource type="SpriteFrames" id="SpriteFrames_gf7ku"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_js1l1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_gdxtl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_da7fw")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_rpccx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_crwu1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_r3kxc")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_225la")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]
[node name="Torch" type="Node2D"]
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
texture_filter = 1
position = Vector2(0, -12)
sprite_frames = SubResource("SpriteFrames_gf7ku")
autoplay = "default"
frame = 5
frame_progress = 0.743234
[node name="PointLight2D" type="PointLight2D" parent="."]
color = Color(1, 0.898039, 0.686275, 1)
blend_mode = 2
shadow_enabled = true
shadow_filter_smooth = 3.0
texture = ExtResource("2_f0xs8")
offset = Vector2(0, 2)

View File

@ -0,0 +1,114 @@
[gd_scene load_steps=16 format=3 uid="uid://ceadk7pam7vab"]
[ext_resource type="Texture2D" uid="uid://cyldr0ck3yfrp" path="res://Assets/Sprites/Misc/torch-lamp.png" id="1_dlkl0"]
[ext_resource type="Texture2D" uid="uid://b8ann6yb8qox4" path="res://Assets/Sprites/Particles/light-pixel.png" id="2_yuj6j"]
[sub_resource type="AtlasTexture" id="AtlasTexture_ikvnd"]
atlas = ExtResource("1_dlkl0")
region = Rect2(0, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_b7wal"]
atlas = ExtResource("1_dlkl0")
region = Rect2(12, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_68y2k"]
atlas = ExtResource("1_dlkl0")
region = Rect2(24, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_eib4d"]
atlas = ExtResource("1_dlkl0")
region = Rect2(36, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_7q5cd"]
atlas = ExtResource("1_dlkl0")
region = Rect2(48, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_k8jtr"]
atlas = ExtResource("1_dlkl0")
region = Rect2(60, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_egan1"]
atlas = ExtResource("1_dlkl0")
region = Rect2(72, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_eymjc"]
atlas = ExtResource("1_dlkl0")
region = Rect2(84, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_go3ky"]
atlas = ExtResource("1_dlkl0")
region = Rect2(96, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_rvq52"]
atlas = ExtResource("1_dlkl0")
region = Rect2(108, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_cjdtb"]
atlas = ExtResource("1_dlkl0")
region = Rect2(120, 0, 12, 24)
[sub_resource type="AtlasTexture" id="AtlasTexture_vi5xh"]
atlas = ExtResource("1_dlkl0")
region = Rect2(132, 0, 12, 24)
[sub_resource type="SpriteFrames" id="SpriteFrames_gf7ku"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_ikvnd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_b7wal")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_68y2k")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_eib4d")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_7q5cd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_k8jtr")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_egan1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_eymjc")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_go3ky")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_rvq52")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_cjdtb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_vi5xh")
}],
"loop": true,
"name": &"default",
"speed": 10.0
}]
[node name="TorchLamp" type="Node2D"]
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
texture_filter = 1
position = Vector2(0, -12)
sprite_frames = SubResource("SpriteFrames_gf7ku")
autoplay = "default"
frame = 6
frame_progress = 0.743234
[node name="PointLight2D" type="PointLight2D" parent="."]
color = Color(1, 0.827451, 0.619608, 1)
blend_mode = 2
shadow_enabled = true
shadow_filter_smooth = 3.0
texture = ExtResource("2_yuj6j")
offset = Vector2(0, 2)

View File

@ -34,6 +34,21 @@ orbit_velocity_min = 0.0
orbit_velocity_max = 2.0 orbit_velocity_max = 2.0
color_ramp = SubResource("GradientTexture1D_yfhnr") color_ramp = SubResource("GradientTexture1D_yfhnr")
[sub_resource type="Animation" id="Animation_w1abs"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sound:volume_db")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [-16.0]
}
[sub_resource type="Animation" id="Animation_0brc4"] [sub_resource type="Animation" id="Animation_0brc4"]
resource_name = "death" resource_name = "death"
length = 4.0 length = 4.0
@ -50,21 +65,6 @@ tracks/0/keys = {
"values": [-16.0, -64.0] "values": [-16.0, -64.0]
} }
[sub_resource type="Animation" id="Animation_w1abs"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sound:volume_db")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [-16.0]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_v8fdt"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_v8fdt"]
_data = { _data = {
"RESET": SubResource("Animation_w1abs"), "RESET": SubResource("Animation_w1abs"),

View File

@ -2,19 +2,16 @@
[ext_resource type="PackedScene" uid="uid://clwv2owvk6abe" path="res://Scenes/BaseMap.tscn" id="1_ifiic"] [ext_resource type="PackedScene" uid="uid://clwv2owvk6abe" path="res://Scenes/BaseMap.tscn" id="1_ifiic"]
[ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="2_wnjm0"] [ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="2_wnjm0"]
[ext_resource type="Texture2D" uid="uid://5k0o7d7j65a4" path="res://Assets/Sprites/arena-tileset-normal.png" id="3_iitgk"]
[ext_resource type="PackedScene" uid="uid://d2skjvvx6fal0" path="res://Characters/Doc.tscn" id="4_c0csw"] [ext_resource type="PackedScene" uid="uid://d2skjvvx6fal0" path="res://Characters/Doc.tscn" id="4_c0csw"]
[ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="5_aevwf"] [ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="5_aevwf"]
[ext_resource type="PackedScene" uid="uid://c1w7t6irnohfx" path="res://Entities/Torch.tscn" id="6_1wwor"]
[ext_resource type="PackedScene" uid="uid://ceadk7pam7vab" path="res://Entities/TorchLamp.tscn" id="6_jy3pc"]
[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_8jil2"] [sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_8jil2"]
polygon = PackedVector2Array(-8, -4, -6, -5, -6, -18, 6, -18, 6, -5, 8, -4, 8, 4, 4, 8, -4, 8, -8, 3.5) polygon = PackedVector2Array(-8, -4, -6, -5, -6, -18, 6, -18, 6, -5, 8, -4, 8, 4, 4, 8, -4, 8, -8, 3.5)
[sub_resource type="CanvasTexture" id="CanvasTexture_dnsyd"]
diffuse_texture = ExtResource("2_wnjm0")
normal_texture = ExtResource("3_iitgk")
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_fcd6d"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_fcd6d"]
texture = SubResource("CanvasTexture_dnsyd") texture = ExtResource("2_wnjm0")
0:0/0 = 0 0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0 0:0/0/physics_layer_0/angular_velocity = 0.0
@ -252,7 +249,7 @@ physics_layer_0/collision_layer = 1
sources/2 = SubResource("TileSetAtlasSource_5yxvt") sources/2 = SubResource("TileSetAtlasSource_5yxvt")
sources/0 = SubResource("TileSetAtlasSource_fcd6d") sources/0 = SubResource("TileSetAtlasSource_fcd6d")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_h6m08"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_im5g2"]
resource_local_to_scene = true resource_local_to_scene = true
shader = ExtResource("5_aevwf") shader = ExtResource("5_aevwf")
shader_parameter/color = Quaternion(1, 1, 1, 1) shader_parameter/color = Quaternion(1, 1, 1, 1)
@ -265,9 +262,42 @@ layer_3/tile_data = PackedInt32Array(-196612, 65536, 1, -131076, 65536, 1, -6554
layer_4/tile_data = PackedInt32Array(-524296, 327680, 0, -589818, 262144, 0, -589817, 262144, 1, -589819, 327680, 0, -589820, 196608, 1, -589821, 327680, 1, -589822, 131072, 1, -589823, 262144, 1, -589824, 327680, 0, -524289, 131072, 1, -524290, 327680, 0, -524291, 327680, 1, -524292, 327680, 1, -524293, 327680, 0, -524294, 131072, 1, -524295, 262144, 1, -589832, 131072, 2, -589831, 131072, 2, -589830, 131072, 2, -589829, 131072, 2, -589828, 131072, 2, -589827, 131072, 2, -589826, 131072, 2, -589825, 131072, 2, -655360, 131072, 2, -655359, 131072, 2, -655358, 131072, 2, -655357, 131072, 2, -655356, 131072, 2, -655355, 131072, 2, -655354, 131072, 2, -655353, 131072, 2, -655352, 327680, 2, -589833, 262144, 2, -524297, 196608, 3, -458761, 196608, 3, -393225, 196608, 3, -327689, 196608, 3, -262153, 196608, 3, -196617, 196608, 3, -131081, 196608, 3, -65545, 196608, 3, -9, 196608, 3, 65527, 196608, 3, 131063, 196608, 3, 196599, 196608, 3, 262135, 196608, 3, 327671, 196608, 3, 393207, 196608, 3, 458743, 196608, 3, 524279, 196608, 3, 262152, 131072, 3, 327688, 131072, 3, 393224, 131072, 3, 458760, 131072, 3, 196616, 131072, 3, 131080, 131072, 3, 65544, 131072, 3, 8, 131072, 3, -65528, 131072, 3, -131064, 131072, 3, -196600, 131072, 3, -262136, 131072, 3, -589816, 131072, 3, -524280, 131072, 3, -458744, 131072, 3, -393208, 131072, 3, -327672, 131072, 3, 589816, 196608, 2, 589817, 196608, 2, 589818, 196608, 2, 589819, 196608, 2, 589820, 196608, 2, 589821, 196608, 2, 589822, 196608, 2, 589823, 196608, 2, 524288, 196608, 2, 524289, 196608, 2, 524290, 196608, 2, 524291, 196608, 2, 524292, 196608, 2, 524293, 196608, 2, 524294, 196608, 2, 524295, 196608, 2, 524296, 327680, 3, 589815, 262144, 3) layer_4/tile_data = PackedInt32Array(-524296, 327680, 0, -589818, 262144, 0, -589817, 262144, 1, -589819, 327680, 0, -589820, 196608, 1, -589821, 327680, 1, -589822, 131072, 1, -589823, 262144, 1, -589824, 327680, 0, -524289, 131072, 1, -524290, 327680, 0, -524291, 327680, 1, -524292, 327680, 1, -524293, 327680, 0, -524294, 131072, 1, -524295, 262144, 1, -589832, 131072, 2, -589831, 131072, 2, -589830, 131072, 2, -589829, 131072, 2, -589828, 131072, 2, -589827, 131072, 2, -589826, 131072, 2, -589825, 131072, 2, -655360, 131072, 2, -655359, 131072, 2, -655358, 131072, 2, -655357, 131072, 2, -655356, 131072, 2, -655355, 131072, 2, -655354, 131072, 2, -655353, 131072, 2, -655352, 327680, 2, -589833, 262144, 2, -524297, 196608, 3, -458761, 196608, 3, -393225, 196608, 3, -327689, 196608, 3, -262153, 196608, 3, -196617, 196608, 3, -131081, 196608, 3, -65545, 196608, 3, -9, 196608, 3, 65527, 196608, 3, 131063, 196608, 3, 196599, 196608, 3, 262135, 196608, 3, 327671, 196608, 3, 393207, 196608, 3, 458743, 196608, 3, 524279, 196608, 3, 262152, 131072, 3, 327688, 131072, 3, 393224, 131072, 3, 458760, 131072, 3, 196616, 131072, 3, 131080, 131072, 3, 65544, 131072, 3, 8, 131072, 3, -65528, 131072, 3, -131064, 131072, 3, -196600, 131072, 3, -262136, 131072, 3, -589816, 131072, 3, -524280, 131072, 3, -458744, 131072, 3, -393208, 131072, 3, -327672, 131072, 3, 589816, 196608, 2, 589817, 196608, 2, 589818, 196608, 2, 589819, 196608, 2, 589820, 196608, 2, 589821, 196608, 2, 589822, 196608, 2, 589823, 196608, 2, 524288, 196608, 2, 524289, 196608, 2, 524290, 196608, 2, 524291, 196608, 2, 524292, 196608, 2, 524293, 196608, 2, 524294, 196608, 2, 524295, 196608, 2, 524296, 327680, 3, 589815, 262144, 3)
[node name="CanvasModulate" parent="." index="0"] [node name="CanvasModulate" parent="." index="0"]
color = Color(0.753984, 0.753984, 0.753984, 1) color = Color(0.501961, 0.501961, 0.501961, 1)
[node name="Doc" parent="Entities" index="0" instance=ExtResource("4_c0csw")] [node name="Doc" parent="Entities" index="0" instance=ExtResource("4_c0csw")]
material = SubResource("ShaderMaterial_h6m08") material = SubResource("ShaderMaterial_im5g2")
PreferredWeightDistance = 256.0 PreferredWeightDistance = 256.0
MaxWeightDistance = 32.0 MaxWeightDistance = 32.0
[node name="Torch" parent="Entities" index="1" instance=ExtResource("6_1wwor")]
position = Vector2(-120, -112)
[node name="Torch2" parent="Entities" index="2" instance=ExtResource("6_1wwor")]
position = Vector2(-72, -112)
[node name="Torch3" parent="Entities" index="3" instance=ExtResource("6_1wwor")]
position = Vector2(-24, -113)
[node name="Torch4" parent="Entities" index="4" instance=ExtResource("6_1wwor")]
position = Vector2(24, -112)
[node name="Torch5" parent="Entities" index="5" instance=ExtResource("6_1wwor")]
position = Vector2(72, -112)
[node name="Torch6" parent="Entities" index="6" instance=ExtResource("6_1wwor")]
position = Vector2(120, -112)
[node name="TorchLamp" parent="." index="6" instance=ExtResource("6_jy3pc")]
position = Vector2(-96, -120)
[node name="TorchLamp2" parent="." index="7" instance=ExtResource("6_jy3pc")]
position = Vector2(-48, -120)
[node name="TorchLamp3" parent="." index="8" instance=ExtResource("6_jy3pc")]
position = Vector2(0, -120)
[node name="TorchLamp4" parent="." index="9" instance=ExtResource("6_jy3pc")]
position = Vector2(48, -120)
[node name="TorchLamp5" parent="." index="10" instance=ExtResource("6_jy3pc")]
position = Vector2(96, -120)

View File

@ -32,8 +32,8 @@ public partial class DocChooseAttackState : NPCState
private void ResetStates() private void ResetStates()
{ {
//_possibleStates.Add(DartState); _possibleStates.Add(DartState);
//_possibleStates.Add(SpikeState); _possibleStates.Add(SpikeState);
_possibleStates.Add(UnwantedFrequencyState); _possibleStates.Add(UnwantedFrequencyState);
} }

View File

@ -38,6 +38,7 @@ public partial class World : Node2D
public override void _Ready() public override void _Ready()
{ {
Godot.RenderingServer.SetDefaultClearColor(Godot.Colors.Black);
if (StartingArea is not null) if (StartingArea is not null)
{ {
LoadScene(StartingArea); LoadScene(StartingArea);