improved map design

pull/6/head
John Montagu, the 4th Earl of Sandvich 2023-08-16 21:03:54 -07:00
parent 316c9e8bc4
commit 52994723b4
Signed by: sandvich
GPG Key ID: 9A39BE37E602B22D
3 changed files with 111 additions and 37 deletions

View File

@ -1,22 +1,62 @@
[gd_scene load_steps=13 format=3 uid="uid://b2x17su05ou5w"]
[gd_scene load_steps=23 format=3 uid="uid://b2x17su05ou5w"]
[ext_resource type="PackedScene" uid="uid://clwv2owvk6abe" path="res://Scenes/BaseMap.tscn" id="1_ifiic"]
[ext_resource type="TileSet" uid="uid://l61kbx31ug4p" path="res://Scenes/Maps/ArenaTileset.tres" id="2_x0mh7"]
[ext_resource type="PackedScene" uid="uid://d2skjvvx6fal0" path="res://Characters/Doc.tscn" id="4_ej0f3"]
[ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="5_h8k5p"]
[ext_resource type="Texture2D" uid="uid://dl2q3k0w8e4fp" path="res://Assets/Sprites/Props/tree-dark.png" id="5_wlxp1"]
[ext_resource type="PackedScene" uid="uid://c1w7t6irnohfx" path="res://Entities/Torch.tscn" id="6_1wwor"]
[ext_resource type="Texture2D" uid="uid://ds0xg848g3jid" path="res://Assets/Sprites/Props/tree-dark-5.png" id="6_flapa"]
[ext_resource type="PackedScene" uid="uid://ceadk7pam7vab" path="res://Entities/TorchLamp.tscn" id="6_jy3pc"]
[ext_resource type="Texture2D" uid="uid://d1ukste16yq6v" path="res://Assets/Sprites/Particles/player-light.png" id="7_y7j0e"]
[ext_resource type="AudioStream" uid="uid://dy4qjflo1k28b" path="res://Assets/Sounds/calm-storm-ambient.mp3" id="8_wox7d"]
[ext_resource type="Script" path="res://BoundingBoxes/ConnectorBox.cs" id="9_fg062"]
[ext_resource type="Texture2D" uid="uid://c1a7lvb4uuwfy" path="res://Assets/Sprites/Particles/circle-16.png" id="11_yjp7m"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_y8wqw"]
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2sl6o"]
light_mode = 1
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_mv7qr"]
light_mode = 1
[sub_resource type="ShaderMaterial" id="ShaderMaterial_tywlr"]
resource_local_to_scene = true
shader = ExtResource("5_h8k5p")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="Gradient" id="Gradient_80go6"]
offsets = PackedFloat32Array(0, 0.2, 0.8, 1)
colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_gyo0n"]
gradient = SubResource("Gradient_80go6")
[sub_resource type="Curve" id="Curve_d18qq"]
_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.5, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
point_count = 3
[sub_resource type="CurveTexture" id="CurveTexture_wiyu8"]
curve = SubResource("Curve_d18qq")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_h14dv"]
emission_shape = 3
emission_box_extents = Vector3(192, 192, 1)
particle_flag_disable_z = true
spread = 180.0
gravity = Vector3(0, 0, 0)
initial_velocity_min = 8.0
initial_velocity_max = 32.0
orbit_velocity_min = 0.0
orbit_velocity_max = 0.0
scale_min = 0.1
scale_max = 0.2
scale_curve = SubResource("CurveTexture_wiyu8")
color = Color(0.176471, 0.0901961, 0.172549, 1)
color_ramp = SubResource("GradientTexture1D_gyo0n")
turbulence_enabled = true
[sub_resource type="RectangleShape2D" id="RectangleShape2D_gwpea"]
size = Vector2(256, 256)
@ -31,8 +71,8 @@ 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, 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_5/name = "Layer -1"
ClearColor = Color(0.105882, 0.0470588, 0.117647, 1)
AreaName = "The Arena"
MapName = "The Arena"
AreaName = "The True Arena"
MapName = "The True Arena"
[node name="CanvasModulate" parent="." index="0"]
color = Color(0.317647, 0.184314, 0.345098, 1)
@ -109,8 +149,24 @@ position = Vector2(72, -112)
visible = false
position = Vector2(120, -112)
[node name="Tree" type="Node2D" parent="Props" index="18"]
z_index = 2
position = Vector2(136, 147)
[node name="Sprite2D" type="Sprite2D" parent="Props/Tree" index="0"]
material = SubResource("CanvasItemMaterial_2sl6o")
texture = ExtResource("5_wlxp1")
[node name="Tree2" type="Node2D" parent="Props" index="19"]
z_index = 2
position = Vector2(168, 51)
[node name="Sprite2D" type="Sprite2D" parent="Props/Tree2" index="0"]
material = SubResource("CanvasItemMaterial_mv7qr")
texture = ExtResource("6_flapa")
[node name="Doc" parent="Entities" index="0" instance=ExtResource("4_ej0f3")]
material = SubResource("ShaderMaterial_y8wqw")
material = SubResource("ShaderMaterial_tywlr")
[node name="PointLight2D" type="PointLight2D" parent="Entities" index="1"]
position = Vector2(168, -42)
@ -128,6 +184,14 @@ stream = ExtResource("8_wox7d")
volume_db = -5.0
autoplay = true
[node name="GPUParticles2D" type="GPUParticles2D" parent="Entities" index="3"]
amount = 16
process_material = SubResource("ParticleProcessMaterial_h14dv")
texture = ExtResource("11_yjp7m")
lifetime = 2.5
explosiveness = 0.1
randomness = 0.2
[node name="Area2D" type="Area2D" parent="Areas" index="0"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Areas/Area2D" index="0"]

View File

@ -165,77 +165,77 @@ size = Vector2(64, 97)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_5pcme"]
size = Vector2(18, 6)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_p4o7n"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_b0g15"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_f1es4"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_e0vkp"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_qchsh"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_w0lgd"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_f2j2j"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yvgbs"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_js5wo"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ll4ps"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yn404"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_okuwb"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ooleg"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_e8ijv"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_4woqh"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_x2s81"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_dwdwr"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_w56q3"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_0xwix"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_7fwc3"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
shader_parameter/intensity = 0.0
shader_parameter/alpha_modulate = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_o1rkw"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_h4cnx"]
resource_local_to_scene = true
shader = ExtResource("28_b3suq")
shader_parameter/color = Vector4(1, 1, 1, 1)
@ -697,47 +697,55 @@ position = Vector2(256, -9)
position = Vector2(80, 373)
[node name="Centurion" parent="Entities" index="7" instance=ExtResource("30_qfl2k")]
material = SubResource("ShaderMaterial_p4o7n")
material = SubResource("ShaderMaterial_b0g15")
position = Vector2(-360, 31)
[node name="Centurion2" parent="Entities" index="8" instance=ExtResource("30_qfl2k")]
material = SubResource("ShaderMaterial_f1es4")
material = SubResource("ShaderMaterial_e0vkp")
position = Vector2(-224, 131)
[node name="Legionary" parent="Entities" index="9" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_qchsh")
[node name="Centurion3" parent="Entities" index="9" instance=ExtResource("30_qfl2k")]
material = SubResource("ShaderMaterial_e0vkp")
position = Vector2(-280, 411)
[node name="Centurion4" parent="Entities" index="10" instance=ExtResource("30_qfl2k")]
material = SubResource("ShaderMaterial_e0vkp")
position = Vector2(-232, 728)
[node name="Legionary" parent="Entities" index="11" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_w0lgd")
position = Vector2(-214, 72)
[node name="Legionary2" parent="Entities" index="10" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_f2j2j")
[node name="Legionary2" parent="Entities" index="12" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_yvgbs")
position = Vector2(-496, 15)
[node name="Legionary3" parent="Entities" index="11" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_js5wo")
[node name="Legionary3" parent="Entities" index="13" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_ll4ps")
position = Vector2(-240, 152)
[node name="Legionary4" parent="Entities" index="12" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_yn404")
[node name="Legionary4" parent="Entities" index="14" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_okuwb")
position = Vector2(-300, 384)
[node name="Legionary5" parent="Entities" index="13" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_ooleg")
[node name="Legionary5" parent="Entities" index="15" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_e8ijv")
position = Vector2(-152, 728)
[node name="Legionary6" parent="Entities" index="14" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_4woqh")
[node name="Legionary6" parent="Entities" index="16" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_x2s81")
position = Vector2(-258, 455)
[node name="Legionary7" parent="Entities" index="15" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_dwdwr")
[node name="Legionary7" parent="Entities" index="17" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_w56q3")
position = Vector2(-556, 402)
[node name="Legionary8" parent="Entities" index="16" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_0xwix")
[node name="Legionary8" parent="Entities" index="18" instance=ExtResource("27_84gw4")]
material = SubResource("ShaderMaterial_7fwc3")
position = Vector2(-404, 505)
[node name="Cultist" parent="Entities" index="17" instance=ExtResource("30_xj4yo")]
material = SubResource("ShaderMaterial_o1rkw")
[node name="Cultist" parent="Entities" index="19" instance=ExtResource("30_xj4yo")]
material = SubResource("ShaderMaterial_h4cnx")
position = Vector2(191, 567)
[node name="ArenaEntrance" type="Marker2D" parent="Markers" index="0"]

View File

@ -7,6 +7,8 @@ uniform float alpha_modulate : hint_range(0.0, 1.0) = 1.0;
void fragment() {
vec4 tex = texture(TEXTURE, UV);
tex.rgb = mix(tex.rgb, color.rgb, intensity);
COLOR = tex;
COLOR.r = tex.r;
COLOR.g = tex.g;
COLOR.b = tex.b;
COLOR.a *= alpha_modulate;
}