Fixed player names, added new level.
Martin Felis
parent
c1993a50e9
commit
154d5888f8
|
|
@ -0,0 +1,46 @@
|
|||
[gd_scene load_steps=4 format=3 uid="uid://dobm413reyqom"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://7a2ma10hq0qa" path="res://scenes/PlatformA.tscn" id="1_ljufl"]
|
||||
[ext_resource type="PackedScene" uid="uid://bnmtyc1kkt6ku" path="res://scenes/PlatformB.tscn" id="2_alvfs"]
|
||||
[ext_resource type="PackedScene" uid="uid://cc521i07ajufm" path="res://entities/SpawnPoint.tscn" id="3_5ocaq"]
|
||||
|
||||
[node name="Level" type="Node3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.76534, 0, 5.93242)
|
||||
|
||||
[node name="Platforms" parent="." instance=ExtResource("1_ljufl")]
|
||||
|
||||
[node name="Platforms2" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.68666, 0, 5.21494)
|
||||
|
||||
[node name="Platforms3" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(0.768741, 0, -0.63956, 0, 1, 0, 0.63956, 0, 0.768741, 8.83345, 0, 2.90911)
|
||||
|
||||
[node name="Platforms4" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(-0.99988, 0, -0.0155154, 0, 1, 0, 0.0155154, 0, -0.99988, 13.9505, -4.76837e-07, -0.629952)
|
||||
|
||||
[node name="Platforms5" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(-0.99988, 0, -0.0155154, 0, 1, 0, 0.0155154, 0, -0.99988, 6.40327, 0, -5.73714)
|
||||
|
||||
[node name="Platforms6" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(-0.91991, 0, -0.392128, 0, 1, 0, 0.392128, 0, -0.91991, 17.1955, -4.76837e-07, -5.8158)
|
||||
|
||||
[node name="Platforms7" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(-0.91991, 0, -0.392128, 0, 1, 0, 0.392128, 0, -0.91991, 8.27811, 0, -7.69307)
|
||||
|
||||
[node name="Platforms8" parent="." instance=ExtResource("2_alvfs")]
|
||||
transform = Transform3D(0.769634, 0, 0.638486, 0, 1, 0, -0.638486, 0, 0.769634, -1.18219, 0, -6.89363)
|
||||
|
||||
[node name="Platforms9" parent="." instance=ExtResource("2_alvfs")]
|
||||
transform = Transform3D(0.330663, 0, -0.943749, 0, 1, 0, 0.943749, 0, 0.330663, 3.64812, -9.53674e-07, -15.7327)
|
||||
|
||||
[node name="Platforms10" parent="." instance=ExtResource("1_ljufl")]
|
||||
transform = Transform3D(-0.851736, 0, 0.523971, 0, 1, 0, -0.523971, 0, -0.851736, 15.3333, 0, -12.1468)
|
||||
|
||||
[node name="SpawnPointPlayer1" parent="." instance=ExtResource("3_5ocaq")]
|
||||
|
||||
[node name="SpawnPointPlayer2" parent="." instance=ExtResource("3_5ocaq")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.48618, 0, -11.2001)
|
||||
player_index = 1
|
||||
|
||||
[node name="SpawnPointPlayer3" parent="." instance=ExtResource("3_5ocaq")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.55561, 0, 3.26255)
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
[gd_scene load_steps=6 format=3 uid="uid://b1twlocviffui"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://7a2ma10hq0qa" path="res://scenes/PlatformA.tscn" id="1_p40sa"]
|
||||
[ext_resource type="PackedScene" uid="uid://bnmtyc1kkt6ku" path="res://scenes/PlatformB.tscn" id="2_wxrkl"]
|
||||
[ext_resource type="PackedScene" uid="uid://cc521i07ajufm" path="res://entities/SpawnPoint.tscn" id="3_sf7e8"]
|
||||
[ext_resource type="PackedScene" uid="uid://0fxjod84sli" path="res://scenes/PlatformParts/heptagon_platform_medium.tscn" id="4_mhnm5"]
|
||||
[ext_resource type="PackedScene" uid="uid://deod1xpjlgljl" path="res://scenes/PlatformParts/heptagon_platform_small.tscn" id="5_3ax6r"]
|
||||
|
||||
[node name="Level" type="Node3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.76534, 0, 5.93242)
|
||||
|
||||
[node name="Platforms" parent="." instance=ExtResource("1_p40sa")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.14317, 0, -7.62714)
|
||||
|
||||
[node name="Platforms2" parent="." instance=ExtResource("1_p40sa")]
|
||||
transform = Transform3D(0.960162, 0, 0.279444, 0, 1, 0, -0.279444, 0, 0.960162, 8.23778, 0, -2.69178)
|
||||
|
||||
[node name="Platforms3" parent="." instance=ExtResource("2_wxrkl")]
|
||||
transform = Transform3D(0.998982, 0, -0.0451189, 0, 1, 0, 0.0451189, 0, 0.998982, 7.95994, 0, -17.2561)
|
||||
|
||||
[node name="Platforms4" parent="." instance=ExtResource("2_wxrkl")]
|
||||
transform = Transform3D(0.922066, 0, 0.387033, 0, 1, 0, -0.387033, 0, 0.922066, -5.98415, 0, -9.7244)
|
||||
|
||||
[node name="Platforms5" parent="." instance=ExtResource("1_p40sa")]
|
||||
transform = Transform3D(0.923846, 0, -0.382764, 0, 1, 0, 0.382764, 0, 0.923846, 2.31558, 0, -23.054)
|
||||
|
||||
[node name="SpawnPoint" parent="." instance=ExtResource("3_sf7e8")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.08035, 0, -0.0552721)
|
||||
|
||||
[node name="SpawnPoint2" parent="." instance=ExtResource("3_sf7e8")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.21992, 0, -7.43863)
|
||||
|
||||
[node name="SpawnPoint3" parent="." instance=ExtResource("3_sf7e8")]
|
||||
transform = Transform3D(0.998982, 0, -0.0451189, 0, 1, 0, 0.0451189, 0, 0.998982, 3.70248, 0, -22.6231)
|
||||
|
||||
[node name="Platforms6" parent="." instance=ExtResource("2_wxrkl")]
|
||||
transform = Transform3D(0.886317, 0, -0.463079, 0, 1, 0, 0.463079, 0, 0.886317, 16.7673, 0, -9.85118)
|
||||
|
||||
[node name="SpawnPoint4" parent="." instance=ExtResource("3_sf7e8")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.6107, 0, -8.04518)
|
||||
|
||||
[node name="HeptagonPlatform" parent="." instance=ExtResource("4_mhnm5")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.28917, 0, -10.1963)
|
||||
|
||||
[node name="HeptagonPlatform2" parent="." instance=ExtResource("4_mhnm5")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.15056, 0, -9.08093)
|
||||
|
||||
[node name="HeptagonPlatform3" parent="." instance=ExtResource("5_3ax6r")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.78291, 0, -10.8037)
|
||||
|
||||
[node name="HeptagonPlatform4" parent="." instance=ExtResource("4_mhnm5")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.07311, 0, -10.3168)
|
||||
|
|
@ -162,6 +162,7 @@ theme_override_font_sizes/font_size = 160
|
|||
text = "CLASH"
|
||||
|
||||
[node name="GameFinishedWidgets" type="Panel" parent="GameUI"]
|
||||
visible = false
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
|
|
@ -230,6 +231,7 @@ text = "0"
|
|||
horizontal_alignment = 1
|
||||
|
||||
[node name="GameRunningWidgets" type="Panel" parent="GameUI"]
|
||||
visible = false
|
||||
custom_minimum_size = Vector2(0, 80)
|
||||
layout_mode = 1
|
||||
anchors_preset = 10
|
||||
|
|
@ -304,3 +306,11 @@ horizontal_alignment = 1
|
|||
layout_mode = 2
|
||||
text = "00:30:00"
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="LevelSelect" type="Panel" parent="GameUI"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
|
|
|||
|
|
@ -116,6 +116,8 @@ func find_spawn_points (node):
|
|||
if spawn_point:
|
||||
spawn_points.append(spawn_point)
|
||||
|
||||
find_spawn_points(child)
|
||||
|
||||
func apply_world_coloring_recursive (node):
|
||||
for child in node.get_children():
|
||||
var mesh_instance := child as MeshInstance3D
|
||||
|
|
@ -154,7 +156,7 @@ func spawn_players():
|
|||
player1.dash_action += "_p1"
|
||||
player1.bomb_action += "_p1"
|
||||
var player2: Player = player_scene.instantiate()
|
||||
player1.name = "Blue"
|
||||
player2.name = "Blue"
|
||||
player2.color = Color(0, 0, 1, 1)
|
||||
player2.coloring_sprite_path = world_coloring_viewport.get_node("Player2Sprite").get_path()
|
||||
player2.coloring_bomb_sprite_path = world_coloring_viewport.get_node("Player2BombSprite").get_path()
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
[gd_scene load_steps=13 format=3 uid="uid://b1nm5h3yccr16"]
|
||||
[gd_scene load_steps=11 format=3 uid="uid://b1nm5h3yccr16"]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/World.gd" id="1_gtcjp"]
|
||||
[ext_resource type="AudioStream" uid="uid://5da1smwywxdk" path="res://assets/music/Run-Amok(chosic.com).mp3" id="3_owwdt"]
|
||||
[ext_resource type="Texture2D" uid="uid://bnsrnuuq28p4d" path="res://assets/textures/player_draw_mask.png" id="4_dipd5"]
|
||||
[ext_resource type="Texture2D" uid="uid://vcebfpqo2ko7" path="res://assets/textures/player_bomb_mask.png" id="5_17c1g"]
|
||||
[ext_resource type="PackedScene" uid="uid://b1twlocviffui" path="res://levels/BridgedPlatforms.tscn" id="6_14y2b"]
|
||||
[ext_resource type="PackedScene" path="res://scenes/PixelCountComputeShader.tscn" id="6_75vqy"]
|
||||
[ext_resource type="PackedScene" uid="uid://7a2ma10hq0qa" path="res://scenes/PlatformA.tscn" id="6_83plb"]
|
||||
[ext_resource type="PackedScene" uid="uid://bnmtyc1kkt6ku" path="res://scenes/PlatformB.tscn" id="7_cld3m"]
|
||||
[ext_resource type="PackedScene" uid="uid://cc521i07ajufm" path="res://entities/SpawnPoint.tscn" id="8_ykvyf"]
|
||||
|
||||
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_5gauv"]
|
||||
sky_energy_multiplier = 5.0
|
||||
|
|
@ -81,45 +79,8 @@ modulate = Color(0.878431, 0, 0.980392, 1)
|
|||
position = Vector2(530, 500)
|
||||
texture = ExtResource("5_17c1g")
|
||||
|
||||
[node name="Level" type="Node3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.76534, 0, 5.93242)
|
||||
|
||||
[node name="Platforms" parent="Level" instance=ExtResource("6_83plb")]
|
||||
|
||||
[node name="Platforms2" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.68666, 0, 5.21494)
|
||||
|
||||
[node name="Platforms3" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(0.768741, 0, -0.63956, 0, 1, 0, 0.63956, 0, 0.768741, 8.83345, 0, 2.90911)
|
||||
|
||||
[node name="Platforms4" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(-0.99988, 0, -0.0155154, 0, 1, 0, 0.0155154, 0, -0.99988, 13.9505, -4.76837e-07, -0.629952)
|
||||
|
||||
[node name="Platforms5" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(-0.99988, 0, -0.0155154, 0, 1, 0, 0.0155154, 0, -0.99988, 6.40327, 0, -5.73714)
|
||||
|
||||
[node name="Platforms6" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(-0.91991, 0, -0.392128, 0, 1, 0, 0.392128, 0, -0.91991, 17.1955, -4.76837e-07, -5.8158)
|
||||
|
||||
[node name="Platforms7" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(-0.91991, 0, -0.392128, 0, 1, 0, 0.392128, 0, -0.91991, 8.27811, 0, -7.69307)
|
||||
|
||||
[node name="Platforms8" parent="Level" instance=ExtResource("7_cld3m")]
|
||||
transform = Transform3D(0.769634, 0, 0.638486, 0, 1, 0, -0.638486, 0, 0.769634, -1.18219, 0, -6.89363)
|
||||
|
||||
[node name="Platforms9" parent="Level" instance=ExtResource("7_cld3m")]
|
||||
transform = Transform3D(0.330663, 0, -0.943749, 0, 1, 0, 0.943749, 0, 0.330663, 3.64812, -9.53674e-07, -15.7327)
|
||||
|
||||
[node name="Platforms10" parent="Level" instance=ExtResource("6_83plb")]
|
||||
transform = Transform3D(-0.851736, 0, 0.523971, 0, 1, 0, -0.523971, 0, -0.851736, 15.3333, 0, -12.1468)
|
||||
|
||||
[node name="SpawnPointPlayer1" parent="Level" instance=ExtResource("8_ykvyf")]
|
||||
|
||||
[node name="SpawnPointPlayer2" parent="Level" instance=ExtResource("8_ykvyf")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.48618, 0, -11.2001)
|
||||
player_index = 1
|
||||
|
||||
[node name="SpawnPointPlayer3" parent="Level" instance=ExtResource("8_ykvyf")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.55561, 0, 3.26255)
|
||||
|
||||
[node name="Players" type="Node3D" parent="."]
|
||||
|
||||
[node name="Level" type="Node3D" parent="."]
|
||||
|
||||
[node name="Level" parent="Level" instance=ExtResource("6_14y2b")]
|
||||
|
|
|
|||
Loading…
Reference in New Issue