diff --git a/proto2/assets/blender-2.80/car.blend b/proto2/assets/blender-2.80/car.blend index fb1a8b8..fa71591 100644 Binary files a/proto2/assets/blender-2.80/car.blend and b/proto2/assets/blender-2.80/car.blend differ diff --git a/proto2/main.gd b/proto2/main.gd index 5524dd4..cbca41c 100644 --- a/proto2/main.gd +++ b/proto2/main.gd @@ -24,8 +24,8 @@ func update_quests(): if q.is_active(): q.update() func start_quest(quest: Quest): - $start_quest_notification.start_notification(quest.get_title(), quest.get_description()) - + notifications.quest_notfication(quest.get_title(), quest.get_description()) + func start_interaction(obj): print("started interaction") if obj.is_in_group("characters"): @@ -52,12 +52,15 @@ func start_training(ball): ball_game.set_team_start(1, k.global_transform.origin) elif k.name == "gate": ball_game.set_team_gate(1, k) + var t_start = randi() % 2 for ch in world.cheer_team.keys(): assert world.cheer_team[ch] != null - ball_game.add_cheer(randi() % 2, world.cheer_team[ch]) + ball_game.add_cheer(t_start, world.cheer_team[ch]) + t_start ^= 1 for ch in world.team.keys(): assert world.team[ch] != null - ball_game.add_player(randi() % 2, world.team[ch]) + ball_game.add_player(t_start, world.team[ch]) + t_start ^= 1 ball_game.set_ball(ball) ball_game.set_main(self) add_child(ball_game) @@ -132,9 +135,13 @@ func _ready(): tut_quest.connect("started", self, "start_quest") world.quests.push_back(tut_quest) var tut1_quest = WalkQuest.new("Walk to closet room", "Walk to closet room designated location", get_node("quest_dst_closet")) + tut1_quest.connect("started", self, "start_quest") var tut2_quest = StatsQuest.new("Hire 6 team members", "Hire six team members to start with your team", {"player_count": 6}) + tut2_quest.connect("started", self, "start_quest") var tut3_quest = WalkQuest.new("Walk to gym", "Walk to gym designated location", get_node("quest_dst_gym")) + tut3_quest.connect("started", self, "start_quest") var tut4_quest = StatsQuest.new("Train your team once", "Complete your team training once", {"team_train_count": 1}) + tut4_quest.connect("started", self, "start_quest") tut1_quest.set_next_quest(tut2_quest) tut2_quest.set_next_quest(tut3_quest) tut3_quest.set_next_quest(tut4_quest) diff --git a/proto2/main.tscn b/proto2/main.tscn index 885a2f5..6bd6729 100644 --- a/proto2/main.tscn +++ b/proto2/main.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://fonts/Hack_Regular.ttf" type="DynamicFontData" id=1] [ext_resource path="res://fonts/DroidSansFallback.ttf" type="DynamicFontData" id=2] [ext_resource path="res://main.gd" type="Script" id=3] -[ext_resource path="res://ui/start_quest_notification.tscn" type="PackedScene" id=4] -[ext_resource path="res://elements/arrow.tscn" type="PackedScene" id=5] -[ext_resource path="res://characters/male_2018.tscn" type="PackedScene" id=6] -[ext_resource path="res://ui/interaction.tscn" type="PackedScene" id=7] +[ext_resource path="res://furniture/training_basket.tscn" type="PackedScene" id=4] +[ext_resource path="res://walls/level_level.tscn" type="PackedScene" id=5] +[ext_resource path="res://ui/interaction.tscn" type="PackedScene" id=6] +[ext_resource path="res://furniture/master_desk_act.tscn" type="PackedScene" id=7] [ext_resource path="res://ui/quest_journal.tscn" type="PackedScene" id=8] -[ext_resource path="res://walls/level_level.tscn" type="PackedScene" id=9] -[ext_resource path="res://furniture/master_desk_act.tscn" type="PackedScene" id=10] -[ext_resource path="res://furniture/training_basket.tscn" type="PackedScene" id=11] +[ext_resource path="res://characters/male_2018.tscn" type="PackedScene" id=9] +[ext_resource path="res://elements/arrow.tscn" type="PackedScene" id=10] [sub_resource type="NavigationMesh" id=1] vertices = PoolVector3Array( -0.844101, 2.99984, -39.4165, -1.2441, 2.99984, -39.6165, -1.0441, 2.99984, -35.2165, -0.844101, 2.99984, 10.3835, -1.2441, 2.99984, 10.1835, -1.0441, 2.99984, 14.7835, -0.6441, 2.99984, 14.9835, -39.8441, 2.99984, -0.0165215, -39.6441, 2.99984, 2.38348, -39.4441, 2.99984, 1.98348, -39.6441, 2.99984, -7.81652, -39.8441, 2.99984, -10.0165, -17.8441, 2.99984, 10.3835, -18.2441, 2.99984, 10.1835, -18.0441, 2.99984, 14.7835, -17.6441, 2.99984, 14.9835, 10.3559, 2.99984, 2.18348, 21.7559, 2.99984, 2.18348, 19.1559, 2.99984, 1.98348, 9.1559, 2.99984, 1.98348, -39.4441, 2.99984, 1.98348, -39.6441, 2.99984, 2.38348, -35.0441, 2.99984, 2.38348, -39.4441, 2.99984, 1.98348, -35.0441, 2.99984, 2.38348, -34.8441, 2.99984, 2.38348, -26.6441, 2.99984, 2.18348, -29.8441, 2.99984, 1.98348, -34.8441, 2.99984, -18.2165, -35.0441, 2.99984, -18.2165, -39.4441, 2.99984, -18.0165, -39.6441, 2.99984, -17.6165, -30.2441, 2.99984, -17.8165, -28.4441, 2.99984, -18.0165, -10.0441, 2.99984, 21.9835, -10.2441, 2.99984, 22.1835, -0.244102, 2.99984, 22.1835, -0.0441017, 2.99984, 21.9835, -39.6441, 2.99984, 22.3835, -39.8441, 2.99984, 19.7835, -39.8441, 2.99984, 29.7835, -39.6441, 2.99984, 30.9835, -1.2441, 2.99984, -17.8165, -1.0441, 2.99984, -18.2165, -9.8441, 2.99984, -18.2165, -11.0441, 2.99984, -17.8165, -0.844101, 2.99984, -29.2165, -0.844101, 2.99984, -39.4165, -1.0441, 2.99984, -35.2165, -1.0441, 2.99984, -34.6165, -21.8441, 2.99984, -14.6165, -22.2441, 2.99984, -14.8165, -22.0441, 2.99984, -8.61652, -21.8441, 2.99984, -8.41652, 29.3559, 2.99984, 1.98348, 29.9559, 2.99984, 2.38348, 30.1559, 2.99984, 2.38348, 39.3559, 2.99984, 2.18348, 39.5559, 2.99984, 1.78348, -9.8441, 2.99984, -8.41652, -9.8441, 2.99984, -14.6165, -10.0441, 2.99984, -14.6165, -10.0441, 2.99984, -8.41652, -39.8441, 2.99984, -39.8165, -39.6441, 2.99984, -39.4165, -30.2441, 2.99984, -39.6165, -30.0441, 2.99984, -39.8165, -9.8441, 2.99984, -2.21652, -9.8441, 2.99984, -8.41652, -10.0441, 2.99984, -8.41652, -10.0441, 2.99984, -2.21652, 29.3559, 2.99984, 1.98348, 19.1559, 2.99984, 1.98348, 21.7559, 2.99984, 2.18348, -21.8441, 2.99984, -8.41652, -22.0441, 2.99984, -8.61652, -22.0441, 2.99984, -2.21652, -21.8441, 2.99984, -2.21652, -19.6441, 2.99984, 39.5835, -20.0441, 2.99984, 39.7835, -10.0441, 2.99984, 39.7835, -9.8441, 2.99984, 39.5835, -34.8441, 2.99984, -14.6165, -35.0441, 2.99984, -15.0165, -35.0441, 2.99984, -8.41652, -34.8441, 2.99984, -8.21652, 19.7559, 2.99984, -39.8165, 19.3559, 2.99984, -39.6165, 29.5559, 2.99984, -39.6165, 29.7559, 2.99984, -39.8165, -34.6441, 2.99984, 9.98348, -34.8441, 2.99984, 2.38348, -35.0441, 2.99984, 2.38348, -35.0441, 2.99984, 8.78348, -34.8441, 2.99984, 10.3835, -10.0441, 2.99984, -39.8165, -11.0441, 2.99984, -39.6165, -1.2441, 2.99984, -39.6165, -0.0441017, 2.99984, -39.8165, -0.6441, 2.99984, 9.98348, -0.844101, 2.99984, 10.3835, 10.3559, 2.99984, 10.1835, 10.7559, 2.99984, 9.78348, -34.8441, 2.99984, 10.3835, -35.0441, 2.99984, 8.78348, -35.0441, 2.99984, 15.1835, -34.6441, 2.99984, 14.9835, -39.6441, 2.99984, 30.9835, -39.8441, 2.99984, 29.7835, -39.8441, 2.99984, 39.7835, -39.4441, 2.99984, 39.5835, -35.0441, 2.99984, -15.0165, -34.8441, 2.99984, -14.6165, -28.6441, 2.99984, -14.8165, -26.8441, 2.99984, -15.0165, 29.7559, 2.99984, 21.9835, 29.3559, 2.99984, 22.1835, 39.3559, 2.99984, 22.1835, 39.5559, 2.99984, 21.7835, -26.8441, 2.99984, -15.0165, -28.6441, 2.99984, -14.8165, -22.2441, 2.99984, -14.8165, -18.2441, 2.99984, -15.2165, 39.5559, 2.99984, 21.7835, 39.7559, 2.99984, 29.7835, 39.7559, 2.99984, 19.7835, -18.2441, 2.99984, -15.2165, -22.2441, 2.99984, -14.8165, -21.8441, 2.99984, -14.6165, -10.0441, 2.99984, -14.6165, -9.6441, 2.99984, -15.0165, -21.8441, 2.99984, -2.21652, -22.0441, 2.99984, -2.21652, -28.2441, 2.99984, -2.01652, -26.6441, 2.99984, -1.81652, -18.2441, 2.99984, -1.81652, -34.8441, 2.99984, -8.21652, -35.0441, 2.99984, -8.41652, -35.0441, 2.99984, -1.81652, -34.6441, 2.99984, -2.01652, -9.8441, 2.99984, -18.2165, -10.0441, 2.99984, -18.2165, -11.0441, 2.99984, -17.8165, -20.2441, 2.99984, 1.98348, -29.8441, 2.99984, 1.98348, -26.6441, 2.99984, 2.18348, -18.2441, 2.99984, 2.18348, -30.0441, 2.99984, -39.8165, -30.2441, 2.99984, -39.6165, -20.6441, 2.99984, -39.6165, -20.0441, 2.99984, -39.8165, 22.1559, 2.99984, 8.58348, 22.1559, 2.99984, 2.38348, 21.7559, 2.99984, 2.18348, 21.9559, 2.99984, 9.78348, 39.7559, 2.99984, -0.0165215, 39.7559, 2.99984, -10.0165, 39.5559, 2.99984, -8.61652, 39.5559, 2.99984, 1.78348, 22.1559, 2.99984, 14.7835, 22.1559, 2.99984, 8.58348, 21.9559, 2.99984, 9.78348, -35.0441, 2.99984, -35.0165, -34.8441, 2.99984, -34.6165, -28.4441, 2.99984, -34.8165, -26.6441, 2.99984, -35.0165, -0.844101, 2.99984, -39.4165, 9.1559, 2.99984, -39.6165, 9.7559, 2.99984, -39.8165, -0.0441017, 2.99984, -39.8165, -1.2441, 2.99984, -39.6165, -18.0441, 2.99984, -35.2165, -26.6441, 2.99984, -35.0165, -28.4441, 2.99984, -34.8165, -22.0441, 2.99984, -34.6165, -21.8441, 2.99984, -34.6165, 30.1559, 2.99984, 15.1835, 29.9559, 2.99984, 14.7835, 22.1559, 2.99984, 14.7835, -39.4441, 2.99984, -18.0165, -39.6441, 2.99984, -28.6165, -39.8441, 2.99984, -30.0165, -39.8441, 2.99984, -20.0165, -39.6441, 2.99984, -17.6165, -28.2441, 2.99984, -2.01652, -34.6441, 2.99984, -2.01652, -35.0441, 2.99984, -1.81652, -26.6441, 2.99984, -1.81652, 9.7559, 2.99984, -39.8165, 9.1559, 2.99984, -39.6165, 19.3559, 2.99984, -39.6165, 19.7559, 2.99984, -39.8165, -20.0441, 2.99984, -39.8165, -20.6441, 2.99984, -39.6165, -11.0441, 2.99984, -39.6165, -10.0441, 2.99984, -39.8165, 39.7559, 2.99984, 9.78348, 39.7559, 2.99984, -0.0165215, 39.5559, 2.99984, 1.78348, -1.2441, 2.99984, 2.18348, -1.0441, 2.99984, 9.78348, -0.6441, 2.99984, 9.98348, -0.844101, 2.99984, 2.38348, -1.0441, 2.99984, 1.78348, 9.7559, 2.99984, 21.9835, 9.5559, 2.99984, 22.1835, 19.5559, 2.99984, 22.1835, 19.7559, 2.99984, 21.9835, -17.8441, 2.99984, 2.38348, -18.2441, 2.99984, 2.18348, -18.0441, 2.99984, 9.78348, -17.6441, 2.99984, 9.98348, 9.1559, 2.99984, 1.98348, -0.844101, 2.99984, 1.78348, -0.844101, 2.99984, 2.38348, 10.3559, 2.99984, 2.18348, -34.6441, 2.99984, 14.9835, -35.0441, 2.99984, 15.1835, -27.0441, 2.99984, 15.1835, -26.2441, 2.99984, 14.9835, -1.0441, 2.99984, 1.78348, -0.844101, 2.99984, 2.38348, -0.844101, 2.99984, 1.78348, -1.0441, 2.99984, -2.21652, -1.2441, 2.99984, -1.81652, -18.0441, 2.99984, 14.7835, -26.2441, 2.99984, 14.9835, -27.0441, 2.99984, 15.1835, -18.8441, 2.99984, 15.1835, -17.6441, 2.99984, 14.9835, -0.0441017, 2.99984, 21.9835, -0.244102, 2.99984, 22.1835, 9.5559, 2.99984, 22.1835, 9.7559, 2.99984, 21.9835, 19.7559, 2.99984, 21.9835, 19.5559, 2.99984, 22.1835, 29.3559, 2.99984, 22.1835, 29.7559, 2.99984, 21.9835, -17.6441, 2.99984, 14.9835, -18.8441, 2.99984, 15.1835, -10.6441, 2.99984, 15.1835, -9.2441, 2.99984, 14.9835, 29.7559, 2.99984, -39.8165, 29.5559, 2.99984, -39.6165, 39.5559, 2.99984, -39.4165, 39.7559, 2.99984, -39.8165, -1.0441, 2.99984, 14.7835, -9.2441, 2.99984, 14.9835, -10.6441, 2.99984, 15.1835, -2.4441, 2.99984, 15.1835, -0.6441, 2.99984, 14.9835, -10.0441, 2.99984, -18.2165, -21.8441, 2.99984, -18.2165, -20.6441, 2.99984, -17.8165, -11.0441, 2.99984, -17.8165, -39.6441, 2.99984, -39.4165, -39.8441, 2.99984, -39.8165, -39.8441, 2.99984, -30.0165, -39.6441, 2.99984, -28.6165, -0.6441, 2.99984, 14.9835, -2.4441, 2.99984, 15.1835, 5.5559, 2.99984, 15.1835, 10.9559, 2.99984, 14.9835, -29.6441, 2.99984, 39.5835, -30.0441, 2.99984, 39.7835, -20.0441, 2.99984, 39.7835, -19.6441, 2.99984, 39.5835, 10.9559, 2.99984, 14.9835, 5.5559, 2.99984, 15.1835, 13.7559, 2.99984, 15.1835, -10.6441, 2.99984, 1.98348, -20.2441, 2.99984, 1.98348, -18.2441, 2.99984, 2.18348, -10.6441, 2.99984, 1.98348, -18.2441, 2.99984, 2.18348, -17.8441, 2.99984, 2.38348, -9.6441, 2.99984, 2.18348, -0.844101, 2.99984, -8.61652, -0.844101, 2.99984, -18.8165, -1.0441, 2.99984, -18.2165, -1.0441, 2.99984, -14.6165, -34.6441, 2.99984, 9.98348, -34.8441, 2.99984, 10.3835, -26.6441, 2.99984, 10.1835, -26.2441, 2.99984, 9.98348, 19.9559, 2.99984, 39.5835, 19.7559, 2.99984, 39.7835, 29.7559, 2.99984, 39.7835, 29.7559, 2.99984, 39.5835, -26.2441, 2.99984, 9.98348, -26.6441, 2.99984, 10.1835, -18.2441, 2.99984, 10.1835, -18.0441, 2.99984, 9.78348, 30.1559, 2.99984, 8.78348, 29.9559, 2.99984, 8.58348, 29.9559, 2.99984, 14.7835, 30.1559, 2.99984, 15.1835, -17.6441, 2.99984, 9.98348, -18.0441, 2.99984, 9.78348, -18.2441, 2.99984, 10.1835, -17.8441, 2.99984, 10.3835, 10.7559, 2.99984, 9.78348, 10.3559, 2.99984, 10.1835, 21.7559, 2.99984, 10.1835, 21.9559, 2.99984, 9.78348, -17.6441, 2.99984, 9.98348, -17.8441, 2.99984, 10.3835, -9.6441, 2.99984, 10.1835, -9.2441, 2.99984, 9.98348, 9.9559, 2.99984, 39.5835, 9.7559, 2.99984, 39.7835, 19.7559, 2.99984, 39.7835, 19.9559, 2.99984, 39.5835, -9.2441, 2.99984, 9.98348, -9.6441, 2.99984, 10.1835, -1.2441, 2.99984, 10.1835, -1.0441, 2.99984, 9.78348, -0.844101, 2.99984, -8.61652, -1.0441, 2.99984, -8.61652, -1.0441, 2.99984, -2.21652, -0.844101, 2.99984, 1.78348, -0.6441, 2.99984, 9.98348, -1.0441, 2.99984, 9.78348, -1.2441, 2.99984, 10.1835, -0.844101, 2.99984, 10.3835, -1.0441, 2.99984, 1.78348, -10.6441, 2.99984, 1.98348, -9.6441, 2.99984, 2.18348, -1.2441, 2.99984, 2.18348, -34.8441, 2.99984, -34.6165, -35.0441, 2.99984, -35.0165, -35.0441, 2.99984, -26.6165, -34.8441, 2.99984, -26.4165, 0.155899, 2.99984, 39.5835, -0.0441017, 2.99984, 39.7835, 9.7559, 2.99984, 39.7835, 9.9559, 2.99984, 39.5835, -18.0441, 2.99984, -35.2165, -21.8441, 2.99984, -34.6165, -10.0441, 2.99984, -34.6165, -9.4441, 2.99984, -35.0165, 29.9559, 2.99984, 8.58348, 30.1559, 2.99984, 8.78348, 30.1559, 2.99984, 2.38348, 29.9559, 2.99984, 2.38348, -9.4441, 2.99984, -35.0165, -10.0441, 2.99984, -34.6165, -9.8441, 2.99984, -34.6165, -9.8441, 2.99984, -26.4165, -9.8441, 2.99984, -34.6165, -10.0441, 2.99984, -34.6165, -10.0441, 2.99984, -26.4165, -0.844101, 2.99984, -8.61652, -1.0441, 2.99984, -14.6165, -1.0441, 2.99984, -8.61652, -9.8441, 2.99984, -18.2165, -9.8441, 2.99984, -26.4165, -10.0441, 2.99984, -26.4165, -10.0441, 2.99984, -18.2165, 39.5559, 2.99984, 30.5835, 39.5559, 2.99984, 39.3835, 39.7559, 2.99984, 39.7835, 39.7559, 2.99984, 29.7835, -21.8441, 2.99984, -26.4165, -21.8441, 2.99984, -34.6165, -22.0441, 2.99984, -34.6165, -22.0441, 2.99984, -26.4165, 22.1559, 2.99984, 14.7835, 21.9559, 2.99984, 9.78348, 21.7559, 2.99984, 10.1835, 21.9559, 2.99984, 14.7835, -21.8441, 2.99984, -18.2165, -21.8441, 2.99984, -26.4165, -22.0441, 2.99984, -26.4165, -22.0441, 2.99984, -18.2165, 39.5559, 2.99984, 39.3835, 29.7559, 2.99984, 39.5835, 29.7559, 2.99984, 39.7835, 39.7559, 2.99984, 39.7835, -21.8441, 2.99984, -18.2165, -22.0441, 2.99984, -18.2165, -28.4441, 2.99984, -18.0165, -30.2441, 2.99984, -17.8165, -20.6441, 2.99984, -17.8165, -34.8441, 2.99984, -26.4165, -35.0441, 2.99984, -26.6165, -35.0441, 2.99984, -18.2165, -34.8441, 2.99984, -18.2165, 39.7559, 2.99984, -30.0165, 39.7559, 2.99984, -39.8165, 39.5559, 2.99984, -39.4165, 39.5559, 2.99984, -29.2165, -39.4441, 2.99984, 39.5835, -39.8441, 2.99984, 39.7835, -30.0441, 2.99984, 39.7835, -29.6441, 2.99984, 39.5835, -39.8441, 2.99984, 19.7835, -39.6441, 2.99984, 22.3835, -39.4441, 2.99984, 21.9835, -39.6441, 2.99984, 12.1835, -39.8441, 2.99984, 9.78348, -39.6441, 2.99984, 2.38348, -39.8441, 2.99984, -0.0165215, -39.8441, 2.99984, 9.78348, -39.6441, 2.99984, 12.1835, -9.8441, 2.99984, 39.5835, -10.0441, 2.99984, 39.7835, -0.0441017, 2.99984, 39.7835, 0.155899, 2.99984, 39.5835, 21.7559, 2.99984, 2.18348, 22.1559, 2.99984, 2.38348, 29.9559, 2.99984, 2.38348, 29.3559, 2.99984, 1.98348, 21.9559, 2.99984, 14.7835, 10.9559, 2.99984, 14.9835, 13.7559, 2.99984, 15.1835, 21.9559, 2.99984, 15.1835, 39.5559, 2.99984, 11.7835, 39.5559, 2.99984, 21.7835, 39.7559, 2.99984, 19.7835, 39.7559, 2.99984, 9.78348, 21.9559, 2.99984, 14.7835, 21.9559, 2.99984, 15.1835, 30.1559, 2.99984, 15.1835, 22.1559, 2.99984, 14.7835, -10.0441, 2.99984, -2.21652, -21.8441, 2.99984, -2.21652, -18.2441, 2.99984, -1.81652, -9.8441, 2.99984, -1.81652, 39.7559, 2.99984, -10.0165, 39.7559, 2.99984, -20.0165, 39.5559, 2.99984, -18.8165, 39.5559, 2.99984, -8.61652, -9.8441, 2.99984, -2.21652, -10.0441, 2.99984, -2.21652, -9.8441, 2.99984, -1.81652, -39.6441, 2.99984, -17.6165, -39.8441, 2.99984, -20.0165, -39.8441, 2.99984, -10.0165, -39.6441, 2.99984, -7.81652, -29.6441, 2.99984, 21.9835, -30.0441, 2.99984, 22.1835, -20.0441, 2.99984, 22.1835, -19.6441, 2.99984, 21.9835, -9.6441, 2.99984, -15.0165, -10.0441, 2.99984, -14.6165, -9.8441, 2.99984, -14.6165, -9.4441, 2.99984, -35.0165, -9.8441, 2.99984, -34.6165, -1.0441, 2.99984, -34.6165, -1.0441, 2.99984, -35.2165, 39.3559, 2.99984, 2.18348, 39.5559, 2.99984, 11.7835, 39.7559, 2.99984, 9.78348, 39.5559, 2.99984, 1.78348, -19.6441, 2.99984, 21.9835, -20.0441, 2.99984, 22.1835, -10.2441, 2.99984, 22.1835, -10.0441, 2.99984, 21.9835, -0.844101, 2.99984, -29.2165, -1.0441, 2.99984, -34.6165, -1.0441, 2.99984, -26.6165, -0.844101, 2.99984, -18.8165, -0.844101, 2.99984, -29.2165, -1.0441, 2.99984, -26.6165, -1.0441, 2.99984, -18.2165, 39.5559, 2.99984, 21.7835, 39.3559, 2.99984, 22.1835, 39.5559, 2.99984, 30.5835, 39.7559, 2.99984, 29.7835, -1.2441, 2.99984, -15.0165, -9.6441, 2.99984, -15.0165, -9.8441, 2.99984, -14.6165, -1.0441, 2.99984, -14.6165, -39.4441, 2.99984, 21.9835, -39.6441, 2.99984, 22.3835, -30.0441, 2.99984, 22.1835, -29.6441, 2.99984, 21.9835, -1.2441, 2.99984, -17.8165, -1.2441, 2.99984, -15.0165, -1.0441, 2.99984, -14.6165, -1.0441, 2.99984, -18.2165, -9.8441, 2.99984, -2.21652, -9.8441, 2.99984, -1.81652, -1.2441, 2.99984, -1.81652, -1.0441, 2.99984, -2.21652, 39.7559, 2.99984, -20.0165, 39.7559, 2.99984, -30.0165, 39.5559, 2.99984, -29.2165, 39.5559, 2.99984, -18.8165, -39.2441, 0.399841, -35.4165, -39.8441, 0.399841, -35.2165, -39.8441, 0.399841, -32.8165, -35.4441, 0.399841, -32.8165, -35.4441, 0.399841, -35.2165, -35.4441, 0.399841, -35.2165, -34.0441, 0.399841, -35.4165, -34.2441, 0.399841, -39.2165, -39.2441, 0.399841, -39.2165, -39.2441, 0.399841, -35.4165, -30.4441, 0.399841, -35.6165, -30.2441, 0.399841, -35.0165, -29.6441, 0.399841, -35.0165, -29.4441, 0.399841, -35.6165, -26.0441, 0.399841, -39.2165, -29.4441, 0.399841, -35.6165, -18.4441, 0.399841, -35.6165, -17.8441, 0.399841, -39.2165, -18.4441, 0.399841, -35.6165, -18.2441, 0.399841, -35.0165, -17.6441, 0.399841, -35.0165, -17.4441, 0.399841, -35.6165, -17.8441, 0.399841, -39.2165, -26.0441, 0.399841, -39.2165, -34.2441, 0.399841, -39.2165, -30.4441, 0.399841, -35.6165, -29.4441, 0.399841, -35.6165, -6.4441, 0.399841, -35.6165, -6.2441, 0.399841, -35.0165, -5.6441, 0.399841, -35.0165, -5.4441, 0.399841, -35.6165, -17.4441, 0.399841, -35.6165, -6.4441, 0.399841, -35.6165, -9.6441, 0.399841, -39.2165, -17.8441, 0.399841, -39.2165, -34.2441, 0.399841, -39.2165, -34.0441, 0.399841, -35.4165, -30.4441, 0.399841, -35.6165, -5.4441, 0.399841, -35.6165, -1.4441, 0.399841, -35.4165, -1.4441, 0.399841, -39.2165, -5.4441, 0.399841, -35.6165, -1.4441, 0.399841, -39.2165, -9.6441, 0.399841, -39.2165, -6.4441, 0.399841, -35.6165, -1.0441, 0.399841, -33.2165, -1.0441, 0.399841, -32.6165, -0.444099, 0.399841, -32.4165, -0.444099, 0.399841, -33.4165, -0.444099, 0.399841, -13.4165, -1.0441, 0.399841, -13.2165, -1.0441, 0.399841, -12.6165, -0.444099, 0.399841, -12.4165, 24.3559, 0.399841, -35.6165, 15.7559, 0.399841, -35.6165, -0.444099, 0.399841, -23.0165, 15.7559, 0.399841, -2.21652, 24.3559, 0.399841, -2.21652, 39.1559, 0.399841, -18.8165, -0.444099, 0.399841, -23.0165, -0.444099, 0.399841, -13.4165, 15.7559, 0.399841, -2.21652, 23.1559, 0.399841, -39.2165, 22.9559, 0.399841, -38.2165, 24.5559, 0.399841, -38.0165, 31.1559, 0.399841, -39.2165, 15.5559, 0.399841, -38.0165, 17.1559, 0.399841, -38.2165, 16.9559, 0.399841, -39.2165, 8.1559, 0.399841, -39.2165, 17.1559, 0.399841, 1.38348, 17.1559, 0.399841, 0.183479, 15.5559, 0.399841, -0.0165215, 8.3559, 0.399841, 1.58348, 24.5559, 0.399841, -0.0165215, 22.9559, 0.399841, 0.183479, 23.1559, 0.399841, 1.58348, 31.1559, 0.399841, 1.58348, 8.1559, 0.399841, -39.2165, -0.444099, 0.399841, -33.4165, -0.444099, 0.399841, -32.4165, -0.444099, 0.399841, -5.41652, -0.444099, 0.399841, 1.58348, 8.3559, 0.399841, 1.58348, 31.1559, 0.399841, 1.58348, 39.1559, 0.399841, 1.58348, 39.1559, 0.399841, -8.61652, 8.1559, 0.399841, -39.2165, -0.444099, 0.399841, -39.2165, -0.444099, 0.399841, -33.4165, 16.3559, 0.399841, -2.01652, 16.3559, 0.399841, -0.61652, 23.7559, 0.399841, -0.61652, 23.7559, 0.399841, -2.01652, 39.1559, 0.399841, -29.0165, 39.1559, 0.399841, -39.2165, 31.1559, 0.399841, -39.2165, 23.7559, 0.399841, -35.8165, 23.7559, 0.399841, -37.4165, 16.3559, 0.399841, -37.4165, 16.3559, 0.399841, -35.8165, -0.444099, 0.399841, -13.4165, -0.444099, 0.399841, -12.4165, 15.7559, 0.399841, -2.21652, 31.1559, 0.399841, -39.2165, 24.5559, 0.399841, -38.0165, 24.3559, 0.399841, -35.6165, 39.1559, 0.399841, -18.8165, 39.1559, 0.399841, -29.0165, 24.3559, 0.399841, -2.21652, 24.5559, 0.399841, -0.0165215, 31.1559, 0.399841, 1.58348, 39.1559, 0.399841, -8.61652, 39.1559, 0.399841, -18.8165, 15.7559, 0.399841, -2.21652, 16.3559, 0.399841, -2.01652, 23.7559, 0.399841, -2.01652, 24.3559, 0.399841, -2.21652, 24.3559, 0.399841, -35.6165, 23.7559, 0.399841, -35.8165, 16.3559, 0.399841, -35.8165, 15.7559, 0.399841, -35.6165, 8.3559, 0.399841, 1.58348, 15.5559, 0.399841, -0.0165215, 15.7559, 0.399841, -2.21652, -0.444099, 0.399841, -12.4165, -0.444099, 0.399841, -5.41652, 15.7559, 0.399841, -35.6165, 15.5559, 0.399841, -38.0165, 8.1559, 0.399841, -39.2165, -0.444099, 0.399841, -32.4165, -0.444099, 0.399841, -23.0165, 17.1559, 0.399841, -38.2165, 22.9559, 0.399841, -38.2165, 23.1559, 0.399841, -39.2165, 16.9559, 0.399841, -39.2165, 15.9559, 2.59984, -37.4165, 15.9559, 2.59984, -36.2165, 24.1559, 2.59984, -36.2165, 24.1559, 2.59984, -37.6165, -29.6441, 0.399841, -35.0165, -30.2441, 0.399841, -35.0165, -30.4441, 0.399841, -34.4165, -29.4441, 0.399841, -34.4165, -22.4441, 0.399841, -26.4165, -22.4441, 0.399841, -34.4165, -29.4441, 0.399841, -34.4165, -30.4441, 0.399841, -34.4165, -34.4441, 0.399841, -34.4165, -34.4441, 0.399841, -26.4165, -29.4441, 0.399841, -34.4165, -30.4441, 0.399841, -34.4165, -34.4441, 0.399841, -26.4165, -34.4441, 0.399841, -18.4165, -22.4441, 0.399841, -18.4165, -22.4441, 0.399841, -26.4165, -17.6441, 0.399841, -35.0165, -18.2441, 0.399841, -35.0165, -18.4441, 0.399841, -34.4165, -17.4441, 0.399841, -34.4165, -10.4441, 0.399841, -26.4165, -10.4441, 0.399841, -34.4165, -17.4441, 0.399841, -34.4165, -18.4441, 0.399841, -34.4165, -21.4441, 0.399841, -34.4165, -21.4441, 0.399841, -26.4165, -17.4441, 0.399841, -34.4165, -18.4441, 0.399841, -34.4165, -21.4441, 0.399841, -26.4165, -21.4441, 0.399841, -18.4165, -10.4441, 0.399841, -18.4165, -10.4441, 0.399841, -26.4165, -1.6441, 0.399841, -32.4165, -1.0441, 0.399841, -32.6165, -1.0441, 0.399841, -33.2165, -1.6441, 0.399841, -33.4165, -5.4441, 0.399841, -34.4165, -6.4441, 0.399841, -34.4165, -5.4441, 0.399841, -34.4165, -5.6441, 0.399841, -35.0165, -6.2441, 0.399841, -35.0165, -6.4441, 0.399841, -34.4165, -9.4441, 0.399841, -18.4165, -1.4441, 0.399841, -18.4165, -1.4441, 0.399841, -25.6165, -9.4441, 0.399841, -26.4165, -1.6441, 0.399841, -32.4165, -6.4441, 0.399841, -34.4165, -9.4441, 0.399841, -34.4165, -9.4441, 0.399841, -26.4165, -1.4441, 0.399841, -25.6165, -1.6441, 0.399841, -33.4165, -1.4441, 0.399841, -34.4165, -5.4441, 0.399841, -34.4165, -39.2441, 0.399841, -31.4165, -39.8441, 0.399841, -31.2165, -39.8441, 0.399841, -28.6165, -39.2441, 0.399841, -28.4165, -39.2441, 0.399841, -27.4165, -39.8441, 0.399841, -27.2165, -39.8441, 0.399841, -24.6165, -39.2441, 0.399841, -24.4165, -35.4441, 0.399841, -25.6165, -39.2441, 0.399841, -23.4165, -39.8441, 0.399841, -23.2165, -39.8441, 0.399841, -20.6165, -39.2441, 0.399841, -20.4165, -35.4441, 0.399841, -25.6165, -39.2441, 0.399841, -24.4165, -39.2441, 0.399841, -23.4165, -35.4441, 0.399841, -25.6165, -39.2441, 0.399841, -28.4165, -39.2441, 0.399841, -27.4165, -39.2441, 0.399841, -23.4165, -39.2441, 0.399841, -20.4165, -35.4441, 0.399841, -18.4165, -35.4441, 0.399841, -25.6165, -35.4441, 0.399841, -32.8165, -39.8441, 0.399841, -32.8165, -39.2441, 0.399841, -32.4165, -35.4441, 0.399841, -32.8165, -39.2441, 0.399841, -32.4165, -39.2441, 0.399841, -31.4165, -39.2441, 0.399841, -20.4165, -39.2441, 0.399841, -18.4165, -35.4441, 0.399841, -18.4165, -35.4441, 0.399841, -32.8165, -39.2441, 0.399841, -31.4165, -39.2441, 0.399841, -28.4165, -35.4441, 0.399841, -25.6165, -35.4441, 0.399841, -15.2165, -35.0441, 0.399841, -15.4165, -35.0441, 0.399841, -17.4165, -39.2441, 0.399841, -17.4165, -39.2441, 0.399841, -15.4165, -39.2441, 0.399841, -15.4165, -39.8441, 0.399841, -15.2165, -39.8441, 0.399841, -12.6165, -39.2441, 0.399841, -12.4165, -35.4441, 0.399841, -15.2165, -39.2441, 0.399841, -11.4165, -39.8441, 0.399841, -11.2165, -39.8441, 0.399841, -8.61652, -39.2441, 0.399841, -8.41652, -35.4441, 0.399841, -9.21652, -39.2441, 0.399841, -7.41652, -39.8441, 0.399841, -7.21652, -39.8441, 0.399841, -4.61652, -39.2441, 0.399841, -4.41652, -35.4441, 0.399841, -9.21652, -35.4441, 0.399841, -15.2165, -39.2441, 0.399841, -12.4165, -39.2441, 0.399841, -11.4165, -35.4441, 0.399841, -3.01652, -35.4441, 0.399841, -9.21652, -39.2441, 0.399841, -7.41652, -39.2441, 0.399841, -4.41652, -35.4441, 0.399841, -9.21652, -39.2441, 0.399841, -8.41652, -39.2441, 0.399841, -7.41652, -39.2441, 0.399841, -4.41652, -39.4441, 0.399841, -3.21652, -35.4441, 0.399841, -3.01652, -30.4441, 0.399841, -15.6165, -30.2441, 0.399841, -15.0165, -29.6441, 0.399841, -15.0165, -29.4441, 0.399841, -15.6165, -17.4441, 0.399841, -15.6165, -6.4441, 0.399841, -15.6165, -9.8441, 0.399841, -17.4165, -18.2441, 0.399841, -17.4165, -18.4441, 0.399841, -15.6165, -18.2441, 0.399841, -15.0165, -17.6441, 0.399841, -15.0165, -17.4441, 0.399841, -15.6165, -18.2441, 0.399841, -17.4165, -26.6441, 0.399841, -17.4165, -30.4441, 0.399841, -15.6165, -29.4441, 0.399841, -15.6165, -6.4441, 0.399841, -15.6165, -6.2441, 0.399841, -15.0165, -5.6441, 0.399841, -15.0165, -5.4441, 0.399841, -15.6165, -35.0441, 0.399841, -17.4165, -35.0441, 0.399841, -15.4165, -30.4441, 0.399841, -15.6165, -26.6441, 0.399841, -17.4165, -5.4441, 0.399841, -15.6165, -1.4441, 0.399841, -15.4165, -1.4441, 0.399841, -17.4165, -5.4441, 0.399841, -15.6165, -1.4441, 0.399841, -17.4165, -9.8441, 0.399841, -17.4165, -6.4441, 0.399841, -15.6165, -18.4441, 0.399841, -15.6165, -18.2441, 0.399841, -17.4165, -26.6441, 0.399841, -17.4165, -29.4441, 0.399841, -15.6165, -29.6441, 0.399841, -15.0165, -30.2441, 0.399841, -15.0165, -30.4441, 0.399841, -14.4165, -29.4441, 0.399841, -14.4165, -22.4441, 0.399841, -2.41652, -22.4441, 0.399841, -14.4165, -29.4441, 0.399841, -14.4165, -34.4441, 0.399841, -2.41652, -30.4441, 0.399841, -14.4165, -34.4441, 0.399841, -14.4165, -34.4441, 0.399841, -2.41652, -29.4441, 0.399841, -14.4165, -30.4441, 0.399841, -14.4165, -34.4441, 0.399841, -2.41652, -17.4441, 0.399841, -14.4165, -17.6441, 0.399841, -15.0165, -18.2441, 0.399841, -15.0165, -18.4441, 0.399841, -14.4165, -21.4441, 0.399841, -2.41652, -10.4441, 0.399841, -2.41652, -10.4441, 0.399841, -14.4165, -17.4441, 0.399841, -14.4165, -21.4441, 0.399841, -2.41652, -18.4441, 0.399841, -14.4165, -21.4441, 0.399841, -14.4165, -21.4441, 0.399841, -2.41652, -1.6441, 0.399841, -12.4165, -1.0441, 0.399841, -12.6165, -1.0441, 0.399841, -13.2165, -1.6441, 0.399841, -13.4165, -5.4441, 0.399841, -14.4165, -6.4441, 0.399841, -14.4165, -5.4441, 0.399841, -14.4165, -5.6441, 0.399841, -15.0165, -6.2441, 0.399841, -15.0165, -6.4441, 0.399841, -14.4165, -1.6441, 0.399841, -13.4165, -1.4441, 0.399841, -14.4165, -5.4441, 0.399841, -14.4165, -1.6441, 0.399841, -12.4165, -6.4441, 0.399841, -14.4165, -9.4441, 0.399841, -14.4165, -9.4441, 0.399841, -2.41652, -1.4441, 0.399841, -2.41652, -39.4441, 0.399841, -3.21652, -39.8441, 0.399841, -3.21652, -39.8441, 0.399841, -0.61652, -39.2441, 0.399841, -0.416519, -35.4441, 0.399841, -1.61652, -35.4441, 0.399841, -3.01652, -34.2441, 0.399841, 1.58348, -34.0441, 0.399841, -1.41652, -35.4441, 0.399841, -1.61652, -39.2441, 0.399841, -0.416519, -39.2441, 0.399841, 1.58348, 16.1559, 2.39984, -0.216522, 24.1559, 2.59984, -0.416519, 24.1559, 2.59984, -1.81652, 15.9559, 2.59984, -1.81652, 16.0559, 2.59984, -1.01652, 17.2988, 2.39984, -0.245094, -34.0441, 0.399841, -1.41652, -34.2441, 0.399841, 1.58348, -26.0441, 0.399841, 1.58348, -26.0441, 0.399841, -1.41652, -17.8441, 0.399841, 1.58348, -9.6441, 0.399841, 1.58348, -9.6441, 0.399841, -1.41652, -17.8441, 0.399841, -1.41652, -9.6441, 0.399841, 1.58348, -1.4441, 0.399841, 1.58348, -1.4441, 0.399841, -1.41652, -9.6441, 0.399841, -1.41652, -17.8441, 0.399841, -1.41652, -26.0441, 0.399841, -1.41652, -26.0441, 0.399841, 1.58348, -17.8441, 0.399841, 1.58348, 9.5559, 0.399841, 9.38348, 9.7559, 0.399841, 9.98348, 10.3559, 0.399841, 9.98348, 10.5559, 0.399841, 9.38348, 8.5559, 0.399841, 2.58348, 21.5559, 0.399841, 9.58348, 18.5559, 0.399841, 2.58348, 17.5559, 0.399841, 2.58348, 17.1559, 0.399841, 0.183479, 17.1559, 0.399841, 1.38348, 17.7559, 0.399841, 1.58348, 18.3559, 0.399841, 1.58348, 18.3559, 0.399841, 1.58348, 23.1559, 0.399841, 1.58348, 22.9559, 0.399841, 0.183479, 17.1559, 0.399841, 0.183479, 21.5559, 0.399841, 9.58348, 21.5559, 0.399841, 2.58348, 18.5559, 0.399841, 2.58348, 8.5559, 0.399841, 2.58348, -0.444099, 0.399841, 2.58348, -0.444099, 0.399841, 9.58348, 9.5559, 0.399841, 9.38348, 18.5559, 0.399841, 2.58348, 18.3559, 0.399841, 1.58348, 17.7559, 0.399841, 1.58348, 17.5559, 0.399841, 2.58348, 10.5559, 0.399841, 9.38348, 21.5559, 0.399841, 9.58348, 17.5559, 0.399841, 2.58348, 8.5559, 0.399841, 2.58348, -35.0441, 0.399841, 6.38348, -35.0441, 0.399841, 5.78348, -35.4441, 0.399841, 5.58348, -35.6441, 0.399841, 6.78348, -35.6441, 0.399841, 6.78348, -35.4441, 0.399841, 5.58348, -35.4441, 0.399841, 2.58348, -39.2441, 0.399841, 2.58348, -39.2441, 0.399841, 4.58348, -39.2441, 0.399841, 4.58348, -39.8441, 0.399841, 4.78348, -39.8441, 0.399841, 7.18348, -35.6441, 0.399841, 6.78348, -35.0441, 0.399841, 5.78348, -35.0441, 0.399841, 6.38348, -34.4441, 0.399841, 6.58348, -34.4441, 0.399841, 5.58348, -18.4441, 0.399841, 6.58348, -17.8441, 0.399841, 6.38348, -17.8441, 0.399841, 5.78348, -18.4441, 0.399841, 5.58348, -26.4441, 0.399841, 2.58348, -34.4441, 0.399841, 2.58348, -34.4441, 0.399841, 5.58348, -26.4441, 0.399841, 9.58348, -18.4441, 0.399841, 6.58348, -18.4441, 0.399841, 5.58348, -26.4441, 0.399841, 2.58348, -34.4441, 0.399841, 5.58348, -34.4441, 0.399841, 6.58348, -34.4441, 0.399841, 6.58348, -34.4441, 0.399841, 9.58348, -26.4441, 0.399841, 9.58348, -26.4441, 0.399841, 9.58348, -18.4441, 0.399841, 9.58348, -18.4441, 0.399841, 6.58348, -18.4441, 0.399841, 5.58348, -18.4441, 0.399841, 2.58348, -26.4441, 0.399841, 2.58348, -17.8441, 0.399841, 5.78348, -17.8441, 0.399841, 6.38348, -17.4441, 0.399841, 6.58348, -17.4441, 0.399841, 5.58348, -9.4441, 0.399841, 2.58348, -17.4441, 0.399841, 5.58348, -17.4441, 0.399841, 6.58348, -9.4441, 0.399841, 9.58348, -1.4441, 0.399841, 9.58348, -1.4441, 0.399841, 2.58348, -17.4441, 0.399841, 6.58348, -17.4441, 0.399841, 9.58348, -9.4441, 0.399841, 9.58348, -9.4441, 0.399841, 2.58348, -17.4441, 0.399841, 2.58348, -17.4441, 0.399841, 5.58348, 25.5559, 0.399841, 14.3835, 25.7559, 0.399841, 14.9835, 26.3559, 0.399841, 14.9835, 26.5559, 0.399841, 14.3835, 29.5559, 0.399841, 2.58348, 22.5559, 0.399841, 2.58348, 22.5559, 0.399841, 2.58348, 22.5559, 0.399841, 14.5835, 25.5559, 0.399841, 14.3835, 26.5559, 0.399841, 14.3835, 29.5559, 0.399841, 14.5835, 29.5559, 0.399841, 2.58348, 39.1559, 0.399841, 11.3835, 39.1559, 0.399841, 2.58348, 30.5559, 0.399841, 2.58348, 30.5559, 0.399841, 11.5835, -35.6441, 0.399841, 13.5835, -35.0441, 0.399841, 13.3835, -35.0441, 0.399841, 12.7835, -35.6441, 0.399841, 12.5835, -39.2441, 0.399841, 11.5835, -39.2441, 0.399841, 12.5835, -35.6441, 0.399841, 6.78348, -39.2441, 0.399841, 7.58348, -39.2441, 0.399841, 8.58348, -39.2441, 0.399841, 8.58348, -39.8441, 0.399841, 8.78348, -39.8441, 0.399841, 11.3835, -39.2441, 0.399841, 12.5835, -39.8441, 0.399841, 12.7835, -39.8441, 0.399841, 15.3835, -39.2441, 0.399841, 15.7835, -35.4441, 0.399841, 14.9835, -35.6441, 0.399841, 13.5835, -39.2441, 0.399841, 8.58348, -39.8441, 0.399841, 11.3835, -39.2441, 0.399841, 11.5835, -35.6441, 0.399841, 12.5835, -35.6441, 0.399841, 6.78348, -35.6441, 0.399841, 6.78348, -39.8441, 0.399841, 7.18348, -39.2441, 0.399841, 7.58348, -0.844101, 0.399841, 12.7835, -0.844101, 0.399841, 13.3835, -0.444099, 0.399841, 13.5835, 8.5559, 0.399841, 14.5835, -0.444099, 0.399841, 12.5835, 17.5559, 0.399841, 14.3835, 17.7559, 0.399841, 14.9835, 18.3559, 0.399841, 14.9835, 18.5559, 0.399841, 14.3835, 17.5559, 0.399841, 14.3835, 21.5559, 0.399841, 10.5835, 10.5559, 0.399841, 10.5835, 8.5559, 0.399841, 14.5835, 10.5559, 0.399841, 10.5835, 10.3559, 0.399841, 9.98348, 9.7559, 0.399841, 9.98348, 9.5559, 0.399841, 10.5835, 8.5559, 0.399841, 14.5835, 8.5559, 0.399841, 14.5835, 9.5559, 0.399841, 10.5835, -0.444099, 0.399841, 10.5835, -0.444099, 0.399841, 12.5835, -0.444099, 0.399841, 13.5835, -0.444099, 0.399841, 14.5835, 8.5559, 0.399841, 14.5835, 18.5559, 0.399841, 14.3835, 21.5559, 0.399841, 14.5835, 21.5559, 0.399841, 10.5835, 17.5559, 0.399841, 14.3835, 18.5559, 0.399841, 14.3835, 21.5559, 0.399841, 10.5835, -35.0441, 0.399841, 12.7835, -35.0441, 0.399841, 13.3835, -34.4441, 0.399841, 13.5835, -34.4441, 0.399841, 12.5835, -18.4441, 0.399841, 13.5835, -17.8441, 0.399841, 13.3835, -17.8441, 0.399841, 12.7835, -18.4441, 0.399841, 12.5835, -18.4441, 0.399841, 12.5835, -18.4441, 0.399841, 10.5835, -26.4441, 0.399841, 10.5835, -26.4441, 0.399841, 10.5835, -34.4441, 0.399841, 10.5835, -34.4441, 0.399841, 12.5835, -34.4441, 0.399841, 13.5835, -34.4441, 0.399841, 14.5835, -26.4441, 0.399841, 14.5835, -26.4441, 0.399841, 14.5835, -18.4441, 0.399841, 14.5835, -18.4441, 0.399841, 13.5835, -26.4441, 0.399841, 14.5835, -18.4441, 0.399841, 13.5835, -18.4441, 0.399841, 12.5835, -26.4441, 0.399841, 10.5835, -34.4441, 0.399841, 12.5835, -34.4441, 0.399841, 13.5835, -17.8441, 0.399841, 12.7835, -17.8441, 0.399841, 13.3835, -17.4441, 0.399841, 13.5835, -17.4441, 0.399841, 12.5835, -1.4441, 0.399841, 13.5835, -0.844101, 0.399841, 13.3835, -0.844101, 0.399841, 12.7835, -1.4441, 0.399841, 12.5835, -9.4441, 0.399841, 10.5835, -17.4441, 0.399841, 10.5835, -17.4441, 0.399841, 12.5835, -1.4441, 0.399841, 12.5835, -1.4441, 0.399841, 10.5835, -9.4441, 0.399841, 10.5835, -17.4441, 0.399841, 13.5835, -17.4441, 0.399841, 14.5835, -9.4441, 0.399841, 14.5835, -9.4441, 0.399841, 14.5835, -1.4441, 0.399841, 14.5835, -1.4441, 0.399841, 13.5835, -9.4441, 0.399841, 14.5835, -1.4441, 0.399841, 13.5835, -1.4441, 0.399841, 12.5835, -9.4441, 0.399841, 10.5835, -17.4441, 0.399841, 12.5835, -17.4441, 0.399841, 13.5835, 39.1559, 0.399841, 15.5835, 39.7559, 0.399841, 15.3835, 39.7559, 0.399841, 12.7835, 39.1559, 0.399841, 12.5835, 30.5559, 0.399841, 11.5835, 30.5559, 0.399841, 15.3835, 39.1559, 0.399841, 12.5835, 39.1559, 0.399841, 11.3835, 30.5559, 0.399841, 11.5835, 30.5559, 0.399841, 15.3835, 30.1559, 0.399841, 15.5835, 30.1559, 0.399841, 21.5835, 39.1559, 0.399841, 21.5835, 39.1559, 0.399841, 15.5835, -39.2441, 0.399841, 16.5835, -39.8441, 0.399841, 16.7835, -39.8441, 0.399841, 19.3835, -39.2441, 0.399841, 19.5835, -39.2441, 0.399841, 19.5835, -39.2441, 0.399841, 21.5835, -35.0441, 0.399841, 21.5835, -35.4441, 0.399841, 14.9835, -39.2441, 0.399841, 15.7835, -39.2441, 0.399841, 16.5835, -35.0441, 0.399841, 15.5835, -35.4441, 0.399841, 14.9835, -39.2441, 0.399841, 16.5835, -39.2441, 0.399841, 19.5835, -35.0441, 0.399841, 21.5835, -14.4441, 0.399841, 21.3835, -14.2441, 0.399841, 21.9835, -13.6441, 0.399841, 21.9835, -13.4441, 0.399841, 21.3835, -8.8441, 0.399841, 15.5835, -13.4441, 0.399841, 21.3835, -2.8441, 0.399841, 21.5835, -2.2441, 0.399841, 15.5835, 26.5559, 0.399841, 15.5835, 26.3559, 0.399841, 14.9835, 25.7559, 0.399841, 14.9835, 25.5559, 0.399841, 15.5835, -15.4441, 0.399841, 15.5835, -14.4441, 0.399841, 21.3835, -13.4441, 0.399841, 21.3835, -8.8441, 0.399841, 15.5835, 18.5559, 0.399841, 15.5835, 18.3559, 0.399841, 14.9835, 17.7559, 0.399841, 14.9835, 17.5559, 0.399841, 15.5835, 19.1559, 0.399841, 21.5835, 19.1559, 0.399841, 21.5835, 17.5559, 0.399841, 15.5835, 10.9559, 0.399841, 15.5835, 8.1559, 0.399841, 21.5835, 30.1559, 0.399841, 21.5835, 30.1559, 0.399841, 15.5835, 26.5559, 0.399841, 15.5835, 30.1559, 0.399841, 21.5835, 26.5559, 0.399841, 15.5835, 25.5559, 0.399841, 15.5835, 19.1559, 0.399841, 21.5835, 30.1559, 0.399841, 21.5835, 25.5559, 0.399841, 15.5835, 18.5559, 0.399841, 15.5835, 10.9559, 0.399841, 15.5835, 4.3559, 0.399841, 15.5835, 8.1559, 0.399841, 21.5835, -22.0441, 0.399841, 15.5835, -24.6441, 0.399841, 21.5835, -14.4441, 0.399841, 21.3835, -15.4441, 0.399841, 15.5835, -28.6441, 0.399841, 15.5835, -35.0441, 0.399841, 15.5835, -35.0441, 0.399841, 21.5835, -24.6441, 0.399841, 21.5835, 4.3559, 0.399841, 15.5835, -2.2441, 0.399841, 15.5835, -2.8441, 0.399841, 21.5835, 8.1559, 0.399841, 21.5835, -22.0441, 0.399841, 15.5835, -28.6441, 0.399841, 15.5835, -24.6441, 0.399841, 21.5835, -13.4441, 0.399841, 22.5835, -13.6441, 0.399841, 21.9835, -14.2441, 0.399841, 21.9835, -14.4441, 0.399841, 22.5835, -9.8441, 0.399841, 39.1835, -0.0441017, 0.399841, 39.1835, 9.7559, 0.399841, 39.1835, 6.1559, 0.399841, 22.5835, -0.444099, 0.399841, 22.5835, -33.0441, 0.399841, 22.5835, -39.2441, 0.399841, 22.5835, -39.2441, 0.399841, 30.7835, 39.1559, 0.399841, 30.7835, 39.1559, 0.399841, 22.5835, 32.5559, 0.399841, 22.5835, -39.2441, 0.399841, 30.7835, -39.2441, 0.399841, 39.1835, -29.4441, 0.399841, 39.1835, 29.3559, 0.399841, 39.1835, 39.1559, 0.399841, 39.1835, 39.1559, 0.399841, 30.7835, -26.8441, 0.399841, 22.5835, -33.0441, 0.399841, 22.5835, -39.2441, 0.399841, 30.7835, 39.1559, 0.399841, 30.7835, 32.5559, 0.399841, 22.5835, 25.9559, 0.399841, 22.5835, -26.8441, 0.399841, 22.5835, -39.2441, 0.399841, 30.7835, -29.4441, 0.399841, 39.1835, -19.6441, 0.399841, 39.1835, -20.6441, 0.399841, 22.5835, 29.3559, 0.399841, 39.1835, 39.1559, 0.399841, 30.7835, 25.9559, 0.399841, 22.5835, 19.3559, 0.399841, 22.5835, 19.5559, 0.399841, 39.1835, -0.0441017, 0.399841, 39.1835, -0.444099, 0.399841, 22.5835, -7.0441, 0.399841, 22.5835, -9.8441, 0.399841, 39.1835, -19.6441, 0.399841, 39.1835, -9.8441, 0.399841, 39.1835, -14.4441, 0.399841, 22.5835, -20.6441, 0.399841, 22.5835, 19.5559, 0.399841, 39.1835, 19.3559, 0.399841, 22.5835, 12.7559, 0.399841, 22.5835, 9.7559, 0.399841, 39.1835, -9.8441, 0.399841, 39.1835, -7.0441, 0.399841, 22.5835, -13.4441, 0.399841, 22.5835, 9.7559, 0.399841, 39.1835, 12.7559, 0.399841, 22.5835, 6.1559, 0.399841, 22.5835 ) @@ -35,12 +34,12 @@ extents = Vector3( 4, 1, 0.935753 ) [sub_resource type="BoxShape" id=5] extents = Vector3( 4, 1, 0.901123 ) -[sub_resource type="DynamicFont" id=7] +[sub_resource type="DynamicFont" id=6] size = 14 use_filter = true font_data = ExtResource( 2 ) -[sub_resource type="DynamicFont" id=6] +[sub_resource type="DynamicFont" id=7] size = 80 font_data = ExtResource( 1 ) @@ -57,16 +56,16 @@ script = ExtResource( 3 ) [node name="navmesh" type="NavigationMeshInstance" parent="nav"] navmesh = SubResource( 1 ) -[node name="level_level" parent="nav/navmesh" instance=ExtResource( 9 )] +[node name="level_level" parent="nav/navmesh" instance=ExtResource( 5 )] [node name="Camera" type="Camera" parent="."] transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 22.648, 6, 17.621 ) environment = SubResource( 3 ) -[node name="arrow" parent="Camera" instance=ExtResource( 5 )] +[node name="arrow" parent="Camera" instance=ExtResource( 10 )] transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0.065, 0.035, -0.06 ) -[node name="master" parent="." instance=ExtResource( 6 )] +[node name="master" parent="." instance=ExtResource( 9 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 25.412, 0, 3.836 ) [node name="line_spawn" type="Spatial" parent="."] @@ -106,10 +105,7 @@ margin_right = 140.0 margin_bottom = 17.0 text = "Current task:" -[node name="start_quest_notification" parent="." instance=ExtResource( 4 )] -visible = false - -[node name="interaction" parent="." instance=ExtResource( 7 )] +[node name="interaction" parent="." instance=ExtResource( 6 )] visible = false [node name="quest_dst_closet" type="Position3D" parent="."] @@ -124,10 +120,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -27.7753, 0.5, -8.53481 ) [node name="quest_dst_male_dorm" type="Position3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -27.231, 0.5, -25.5247 ) -[node name="master_desk_act" parent="." instance=ExtResource( 10 )] +[node name="master_desk_act" parent="." instance=ExtResource( 7 )] transform = Transform( 0.000582179, 0, -1, 0, 1, 0, 1, 0, 0.000582179, 29.152, 0, 5.478 ) -[node name="training_basket" parent="." instance=ExtResource( 11 )] +[node name="training_basket" parent="." instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 37.749, 0, -0.96 ) [node name="team0" type="Spatial" parent="."] @@ -232,7 +228,7 @@ __meta__ = { [node name="header" type="Label" parent="score/v"] margin_right = 240.0 margin_bottom = 19.0 -custom_fonts/font = SubResource( 7 ) +custom_fonts/font = SubResource( 6 ) text = "GAME SCORE" align = 1 @@ -240,7 +236,7 @@ align = 1 margin_top = 23.0 margin_right = 240.0 margin_bottom = 117.0 -custom_fonts/font = SubResource( 6 ) +custom_fonts/font = SubResource( 7 ) text = "00:00" [node name="footer" type="Label" parent="score/v"] diff --git a/proto2/project.godot b/proto2/project.godot index ab28d7d..c12e4c2 100644 --- a/proto2/project.godot +++ b/proto2/project.godot @@ -63,6 +63,7 @@ run/main_scene="res://ui/menu_root.tscn" world="*res://autoloads/world.gd" controls="*res://autoloads/controls.gd" characters="*res://autoloads/characters.gd" +notifications="*res://autoloads/notifications.gd" [input] diff --git a/proto2/ui/start_quest_notification.gd b/proto2/ui/start_quest_notification.gd index fb7a5bb..e28a4ca 100644 --- a/proto2/ui/start_quest_notification.gd +++ b/proto2/ui/start_quest_notification.gd @@ -1,36 +1,6 @@ extends Control -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - -# Called when the node enters the scene tree for the first time. -var expose_time:float = 0.0 -var cooldown_time: float = 0.0 -var queue = [] -func _ready(): - pass # Replace with function body. - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - if queue.size() > 0: - if cooldown_time <= 0.0: - var item = queue[0] - queue.pop_front() - if visible: - hide() - $v/quest_title.text = item.title - $v/quest_desc.text = item.desc - expose_time = 0.0 - cooldown_time = 2.0 - show() - release_focus() - if expose_time > 10.0: - if visible: - hide() - cooldown_time -= delta - else: - expose_time += delta -func start_notification(title, desc): - queue.push_back({"title": title, "desc": desc}) - print("start notification", title) +func display_notification(title, desc): + $v/quest_title.text = title + $v/quest_desc.text = desc + show() diff --git a/proto2/ui/start_quest_notification.tscn b/proto2/ui/start_quest_notification.tscn index 06502a5..81d0a71 100644 --- a/proto2/ui/start_quest_notification.tscn +++ b/proto2/ui/start_quest_notification.tscn @@ -1,6 +1,34 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://ui/start_quest_notification.gd" type="Script" id=1] +[ext_resource path="res://fonts/DroidSansFallback.ttf" type="DynamicFontData" id=2] + +[sub_resource type="DynamicFont" id=1] +size = 36 +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=2] +size = 30 +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=3] +size = 24 +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=4] +size = 20 +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +font_data = ExtResource( 2 ) [node name="start_quest_notification" type="Control"] anchor_left = 0.5 @@ -22,37 +50,42 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -93.0 -margin_top = -34.0 -margin_right = 93.0 -margin_bottom = 34.0 +margin_left = -250.0 +margin_top = -82.0 +margin_right = 250.0 +margin_bottom = 82.0 +rect_min_size = Vector2( 500, 164 ) __meta__ = { "_edit_use_anchors_": false } [node name="msg" type="Label" parent="v"] -margin_right = 186.0 -margin_bottom = 14.0 +margin_right = 500.0 +margin_bottom = 48.0 +custom_fonts/font = SubResource( 1 ) text = "Starting quest:" align = 1 [node name="quest_title" type="Label" parent="v"] -margin_top = 18.0 -margin_right = 186.0 -margin_bottom = 32.0 +margin_top = 52.0 +margin_right = 500.0 +margin_bottom = 92.0 +custom_fonts/font = SubResource( 2 ) text = "quest title" align = 1 [node name="quest_desc" type="Label" parent="v"] -margin_top = 36.0 -margin_right = 186.0 -margin_bottom = 50.0 +margin_top = 96.0 +margin_right = 500.0 +margin_bottom = 129.0 +custom_fonts/font = SubResource( 3 ) text = "quest description" align = 3 [node name="msg2" type="Label" parent="v"] -margin_top = 54.0 -margin_right = 186.0 -margin_bottom = 68.0 +margin_top = 133.0 +margin_right = 500.0 +margin_bottom = 160.0 +custom_fonts/font = SubResource( 4 ) text = "Quest added to your journal" align = 1 diff --git a/proto2/walls/level-kit_inside-doors.escn b/proto2/walls/level-kit_inside-doors.escn index bb4f911..0b2ad6e 100644 --- a/proto2/walls/level-kit_inside-doors.escn +++ b/proto2/walls/level-kit_inside-doors.escn @@ -2,13 +2,13 @@ [ext_resource id=1 path="concrete_floor_02_diff_1k.jpg" type="Texture"] -[ext_resource id=2 path="concrete_floor_02_spec_1k.jpg" type="Texture"] +[ext_resource id=2 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] -[ext_resource id=3 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] +[ext_resource id=3 path="concrete_floor_02_rough_1k.jpg" type="Texture"] -[ext_resource id=4 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] +[ext_resource id=4 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] -[ext_resource id=5 path="concrete_floor_02_rough_1k.jpg" type="Texture"] +[ext_resource id=5 path="concrete_floor_02_spec_1k.jpg" type="Texture"] [sub_resource id=1 type="Shader"] @@ -320,10 +320,10 @@ void fragment () { resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=5 type="ArrayMesh"] @@ -371,10 +371,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=8 type="ArrayMesh"] @@ -422,10 +422,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=11 type="ArrayMesh"] @@ -473,10 +473,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=14 type="ArrayMesh"] @@ -524,10 +524,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=17 type="ArrayMesh"] @@ -575,10 +575,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=20 type="ArrayMesh"] @@ -626,10 +626,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=23 type="ArrayMesh"] @@ -677,10 +677,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=26 type="ArrayMesh"] @@ -728,10 +728,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=29 type="ArrayMesh"] @@ -779,10 +779,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=32 type="ArrayMesh"] @@ -830,10 +830,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=35 type="ArrayMesh"] @@ -881,10 +881,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=38 type="ArrayMesh"] @@ -932,10 +932,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=41 type="ArrayMesh"] @@ -983,10 +983,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=44 type="ArrayMesh"] @@ -1034,10 +1034,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=47 type="ArrayMesh"] @@ -1085,10 +1085,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=50 type="ArrayMesh"] @@ -1136,10 +1136,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=53 type="ArrayMesh"] @@ -1187,10 +1187,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=56 type="ArrayMesh"] @@ -1238,10 +1238,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=59 type="ArrayMesh"] @@ -1289,10 +1289,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=62 type="ArrayMesh"] @@ -1340,10 +1340,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=65 type="ArrayMesh"] @@ -1391,10 +1391,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=68 type="ArrayMesh"] @@ -1442,10 +1442,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=71 type="ArrayMesh"] @@ -1493,10 +1493,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=74 type="ArrayMesh"] @@ -1544,10 +1544,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=77 type="ArrayMesh"] @@ -1595,10 +1595,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=80 type="ArrayMesh"] @@ -1646,10 +1646,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=83 type="ArrayMesh"] @@ -1697,10 +1697,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=86 type="ArrayMesh"] @@ -1748,10 +1748,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=89 type="ArrayMesh"] @@ -1799,10 +1799,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=92 type="ArrayMesh"] @@ -1850,10 +1850,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=95 type="ArrayMesh"] @@ -1901,10 +1901,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=98 type="ArrayMesh"] @@ -1952,10 +1952,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=101 type="ArrayMesh"] @@ -2003,10 +2003,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=104 type="ArrayMesh"] @@ -2054,10 +2054,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=107 type="ArrayMesh"] @@ -2105,10 +2105,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=110 type="ArrayMesh"] @@ -2156,10 +2156,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=113 type="ArrayMesh"] @@ -2207,10 +2207,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=116 type="ArrayMesh"] @@ -2258,10 +2258,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=119 type="ArrayMesh"] @@ -2309,10 +2309,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=122 type="ArrayMesh"] @@ -2360,10 +2360,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=125 type="ArrayMesh"] @@ -2411,10 +2411,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=128 type="ArrayMesh"] @@ -2462,10 +2462,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=131 type="ArrayMesh"] @@ -2508,10 +2508,10 @@ surfaces/1 = { resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=133 type="ShaderMaterial"] @@ -2564,10 +2564,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=137 type="ArrayMesh"] @@ -2615,10 +2615,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=140 type="ArrayMesh"] @@ -2666,10 +2666,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=143 type="ArrayMesh"] @@ -2717,10 +2717,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=146 type="ArrayMesh"] diff --git a/proto2/walls/level-kit_inside-walls.escn b/proto2/walls/level-kit_inside-walls.escn index 9275bfd..37e932a 100644 --- a/proto2/walls/level-kit_inside-walls.escn +++ b/proto2/walls/level-kit_inside-walls.escn @@ -2,13 +2,13 @@ [ext_resource id=1 path="concrete_floor_02_diff_1k.jpg" type="Texture"] -[ext_resource id=2 path="concrete_floor_02_spec_1k.jpg" type="Texture"] +[ext_resource id=2 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] -[ext_resource id=3 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] +[ext_resource id=3 path="concrete_floor_02_rough_1k.jpg" type="Texture"] -[ext_resource id=4 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] +[ext_resource id=4 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] -[ext_resource id=5 path="concrete_floor_02_rough_1k.jpg" type="Texture"] +[ext_resource id=5 path="concrete_floor_02_spec_1k.jpg" type="Texture"] [sub_resource id=1 type="Shader"] @@ -320,10 +320,10 @@ void fragment () { resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=5 type="ArrayMesh"] @@ -371,10 +371,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=8 type="ArrayMesh"] @@ -422,10 +422,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=11 type="ArrayMesh"] @@ -473,10 +473,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=14 type="ArrayMesh"] @@ -524,10 +524,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=17 type="ArrayMesh"] @@ -575,10 +575,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=20 type="ArrayMesh"] @@ -626,10 +626,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=23 type="ArrayMesh"] @@ -677,10 +677,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=26 type="ArrayMesh"] @@ -728,10 +728,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=29 type="ArrayMesh"] @@ -779,10 +779,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=32 type="ArrayMesh"] @@ -830,10 +830,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=35 type="ArrayMesh"] @@ -881,10 +881,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=38 type="ArrayMesh"] @@ -932,10 +932,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=41 type="ArrayMesh"] @@ -983,10 +983,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=44 type="ArrayMesh"] @@ -1034,10 +1034,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=47 type="ArrayMesh"] @@ -1085,10 +1085,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=50 type="ArrayMesh"] @@ -1136,10 +1136,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=53 type="ArrayMesh"] @@ -1212,10 +1212,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=58 type="ArrayMesh"] @@ -1263,10 +1263,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=61 type="ArrayMesh"] @@ -1314,10 +1314,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=64 type="ArrayMesh"] @@ -1365,10 +1365,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=67 type="ArrayMesh"] @@ -1416,10 +1416,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=70 type="ArrayMesh"] @@ -1467,10 +1467,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=73 type="ArrayMesh"] @@ -1518,10 +1518,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=76 type="ArrayMesh"] @@ -1569,10 +1569,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=79 type="ArrayMesh"] @@ -1620,10 +1620,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=82 type="ArrayMesh"] @@ -1671,10 +1671,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=85 type="ArrayMesh"] @@ -1722,10 +1722,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=88 type="ArrayMesh"] @@ -1773,10 +1773,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=91 type="ArrayMesh"] @@ -1824,10 +1824,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=94 type="ArrayMesh"] @@ -1875,10 +1875,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=97 type="ArrayMesh"] @@ -1926,10 +1926,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=100 type="ArrayMesh"] @@ -1977,10 +1977,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=103 type="ArrayMesh"] @@ -2028,10 +2028,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=106 type="ArrayMesh"] @@ -2079,10 +2079,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=109 type="ArrayMesh"] @@ -2130,10 +2130,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=112 type="ArrayMesh"] @@ -2181,10 +2181,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=115 type="ArrayMesh"] @@ -2232,10 +2232,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=118 type="ArrayMesh"] @@ -2283,10 +2283,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=121 type="ArrayMesh"] @@ -2334,10 +2334,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=124 type="ArrayMesh"] @@ -2385,10 +2385,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=127 type="ArrayMesh"] @@ -2436,10 +2436,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=130 type="ArrayMesh"] @@ -2487,10 +2487,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=133 type="ArrayMesh"] @@ -2538,10 +2538,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=136 type="ArrayMesh"] diff --git a/proto2/walls/level-kit_outside-walls.escn b/proto2/walls/level-kit_outside-walls.escn index 27ed30e..2f6ad9f 100644 --- a/proto2/walls/level-kit_outside-walls.escn +++ b/proto2/walls/level-kit_outside-walls.escn @@ -2,13 +2,13 @@ [ext_resource id=1 path="concrete_floor_02_diff_1k.jpg" type="Texture"] -[ext_resource id=2 path="concrete_floor_02_spec_1k.jpg" type="Texture"] +[ext_resource id=2 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] -[ext_resource id=3 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] +[ext_resource id=3 path="concrete_floor_02_rough_1k.jpg" type="Texture"] -[ext_resource id=4 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] +[ext_resource id=4 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] -[ext_resource id=5 path="concrete_floor_02_rough_1k.jpg" type="Texture"] +[ext_resource id=5 path="concrete_floor_02_spec_1k.jpg" type="Texture"] [sub_resource id=1 type="Shader"] @@ -320,10 +320,10 @@ void fragment () { resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=5 type="ArrayMesh"] @@ -371,10 +371,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=8 type="ArrayMesh"] @@ -422,10 +422,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=11 type="ArrayMesh"] @@ -473,10 +473,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=14 type="ArrayMesh"] @@ -524,10 +524,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=17 type="ArrayMesh"] @@ -575,10 +575,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=20 type="ArrayMesh"] @@ -626,10 +626,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=23 type="ArrayMesh"] @@ -677,10 +677,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=26 type="ArrayMesh"] @@ -728,10 +728,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=29 type="ArrayMesh"] @@ -779,10 +779,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=32 type="ArrayMesh"] @@ -830,10 +830,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=35 type="ArrayMesh"] @@ -881,10 +881,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=38 type="ArrayMesh"] @@ -932,10 +932,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=41 type="ArrayMesh"] @@ -983,10 +983,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=44 type="ArrayMesh"] @@ -1034,10 +1034,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=47 type="ArrayMesh"] @@ -1085,10 +1085,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=50 type="ArrayMesh"] @@ -1136,10 +1136,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=53 type="ArrayMesh"] @@ -1187,10 +1187,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=56 type="ArrayMesh"] @@ -1238,10 +1238,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=59 type="ArrayMesh"] @@ -1289,10 +1289,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=62 type="ArrayMesh"] @@ -1340,10 +1340,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=65 type="ArrayMesh"] @@ -1391,10 +1391,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=68 type="ArrayMesh"] @@ -1442,10 +1442,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=71 type="ArrayMesh"] @@ -1493,10 +1493,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=74 type="ArrayMesh"] @@ -1544,10 +1544,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=77 type="ArrayMesh"] @@ -1595,10 +1595,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=80 type="ArrayMesh"] @@ -1646,10 +1646,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=83 type="ArrayMesh"] @@ -1697,10 +1697,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=86 type="ArrayMesh"] @@ -1748,10 +1748,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=89 type="ArrayMesh"] @@ -1799,10 +1799,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=92 type="ArrayMesh"] @@ -1850,10 +1850,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=95 type="ArrayMesh"] @@ -1901,10 +1901,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=98 type="ArrayMesh"] @@ -1952,10 +1952,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=101 type="ArrayMesh"] @@ -2003,10 +2003,10 @@ shader = SubResource(1) resource_name = "" shader = SubResource(3) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(2) -shader_param/texture_2 = ExtResource(3) -shader_param/texture_3 = ExtResource(5) -shader_param/texture_4 = ExtResource(4) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(4) +shader_param/texture_3 = ExtResource(3) +shader_param/texture_4 = ExtResource(2) [sub_resource id=104 type="ArrayMesh"] diff --git a/proto2/walls/level_level.escn b/proto2/walls/level_level.escn index 116d83c..99d6dfc 100644 --- a/proto2/walls/level_level.escn +++ b/proto2/walls/level_level.escn @@ -4,11 +4,11 @@ [ext_resource id=2 path="concrete_floor_02_Disp_1k.jpg" type="Texture"] -[ext_resource id=3 path="concrete_floor_02_spec_1k.jpg" type="Texture"] +[ext_resource id=3 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] -[ext_resource id=4 path="concrete_floor_02_Nor_1k.jpg" type="Texture"] +[ext_resource id=4 path="concrete_floor_02_rough_1k.jpg" type="Texture"] -[ext_resource id=5 path="concrete_floor_02_rough_1k.jpg" type="Texture"] +[ext_resource id=5 path="concrete_floor_02_spec_1k.jpg" type="Texture"] [sub_resource id=1 type="Shader"] @@ -209,9 +209,9 @@ void fragment () { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=3 type="Shader"] @@ -366,9 +366,9 @@ surfaces/1 = { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=7 type="ShaderMaterial"] @@ -417,9 +417,9 @@ surfaces/1 = { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=10 type="ShaderMaterial"] @@ -468,9 +468,9 @@ surfaces/1 = { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=13 type="ShaderMaterial"] @@ -519,9 +519,9 @@ surfaces/1 = { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=16 type="ShaderMaterial"] @@ -570,9 +570,9 @@ surfaces/1 = { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=19 type="ShaderMaterial"] @@ -621,9 +621,9 @@ surfaces/1 = { resource_name = "" shader = SubResource(1) shader_param/texture_0 = ExtResource(1) -shader_param/texture_1 = ExtResource(3) -shader_param/texture_2 = ExtResource(4) -shader_param/texture_3 = ExtResource(5) +shader_param/texture_1 = ExtResource(5) +shader_param/texture_2 = ExtResource(3) +shader_param/texture_3 = ExtResource(4) shader_param/texture_4 = ExtResource(2) [sub_resource id=22 type="ShaderMaterial"]