From 5953e0c292fea3d6e47d795dc9aa7dff30641d57 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Tue, 1 Jan 2019 17:03:45 +0100
Subject: [PATCH] move exploding line

---
 .../ExplodingLine.tscn => ExplodingLine.tscn  | 34 ++++++++++++++-----
 ExplodingLine/Breakage1.tres                  | 15 --------
 ExplodingLine/Breakage2.tres                  | 15 --------
 GridMap.gd                                    |  2 +-
 WorldEnvironment.tscn                         |  2 +-
 5 files changed, 28 insertions(+), 40 deletions(-)
 rename ExplodingLine/ExplodingLine.tscn => ExplodingLine.tscn (78%)
 delete mode 100644 ExplodingLine/Breakage1.tres
 delete mode 100644 ExplodingLine/Breakage2.tres

diff --git a/ExplodingLine/ExplodingLine.tscn b/ExplodingLine.tscn
similarity index 78%
rename from ExplodingLine/ExplodingLine.tscn
rename to ExplodingLine.tscn
index 563ac1c..b29f056 100644
--- a/ExplodingLine/ExplodingLine.tscn
+++ b/ExplodingLine.tscn
@@ -1,8 +1,6 @@
 [gd_scene load_steps=10 format=2]
 
-[ext_resource path="res://ExplodingLine/Breakage1.tres" type="PrismMesh" id=1]
-[ext_resource path="res://ExplodingLine/Breakage2.tres" type="PrismMesh" id=2]
-[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=3]
+[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1]
 
 [sub_resource type="Gradient" id=1]
 
@@ -65,9 +63,29 @@ anim_offset_random = 0.0
 anim_loop = false
 _sections_unfolded = [ "Color", "Emission Shape", "Gravity", "Scale", "Spread" ]
 
-[sub_resource type="CubeMesh" id=6]
+[sub_resource type="PrismMesh" id=6]
 
-material = ExtResource( 3 )
+material = ExtResource( 1 )
+custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
+left_to_right = 2.98023e-008
+size = Vector3( 0.2, 0.2, 0.2 )
+subdivide_width = 2
+subdivide_height = 0
+subdivide_depth = 0
+
+[sub_resource type="PrismMesh" id=7]
+
+material = ExtResource( 1 )
+custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
+left_to_right = 0.5
+size = Vector3( 0.2, 0.2, 0.2 )
+subdivide_width = 2
+subdivide_height = 0
+subdivide_depth = 0
+
+[sub_resource type="CubeMesh" id=8]
+
+material = ExtResource( 1 )
 custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
 size = Vector3( 0.2, 0.2, 0.2 )
 subdivide_width = 0
@@ -100,9 +118,9 @@ local_coords = false
 draw_order = 0
 process_material = SubResource( 5 )
 draw_passes = 3
-draw_pass_1 = ExtResource( 1 )
-draw_pass_2 = ExtResource( 2 )
-draw_pass_3 = SubResource( 6 )
+draw_pass_1 = SubResource( 6 )
+draw_pass_2 = SubResource( 7 )
+draw_pass_3 = SubResource( 8 )
 _sections_unfolded = [ "Draw Passes", "Drawing", "Process Material", "Time", "Transform" ]
 
 
diff --git a/ExplodingLine/Breakage1.tres b/ExplodingLine/Breakage1.tres
deleted file mode 100644
index d709fa5..0000000
--- a/ExplodingLine/Breakage1.tres
+++ /dev/null
@@ -1,15 +0,0 @@
-[gd_resource type="PrismMesh" load_steps=2 format=2]
-
-[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1]
-
-
-[resource]
-
-material = ExtResource( 1 )
-custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
-left_to_right = 2.98023e-008
-size = Vector3( 0.2, 0.2, 0.2 )
-subdivide_width = 2
-subdivide_height = 0
-subdivide_depth = 0
-
diff --git a/ExplodingLine/Breakage2.tres b/ExplodingLine/Breakage2.tres
deleted file mode 100644
index a3f48a5..0000000
--- a/ExplodingLine/Breakage2.tres
+++ /dev/null
@@ -1,15 +0,0 @@
-[gd_resource type="PrismMesh" load_steps=2 format=2]
-
-[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1]
-
-
-[resource]
-
-material = ExtResource( 1 )
-custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
-left_to_right = 0.5
-size = Vector3( 0.2, 0.2, 0.2 )
-subdivide_width = 2
-subdivide_height = 0
-subdivide_depth = 0
-
diff --git a/GridMap.gd b/GridMap.gd
index 3dac70f..f6f7ab4 100644
--- a/GridMap.gd
+++ b/GridMap.gd
@@ -1,7 +1,7 @@
 extends GridMap
 
 const Tetromino = preload("res://Tetrominos/Tetromino.gd")
-const ExplodingLine = preload("res://ExplodingLine/ExplodingLine.tscn")
+const ExplodingLine = preload("res://ExplodingLine.tscn")
 
 const EMPTY_CELL = -1
 const MINO = 0
diff --git a/WorldEnvironment.tscn b/WorldEnvironment.tscn
index 614e176..be70c38 100644
--- a/WorldEnvironment.tscn
+++ b/WorldEnvironment.tscn
@@ -163,7 +163,7 @@ subdivide_width = 0
 subdivide_height = 0
 subdivide_depth = 0
 
-[node name="Main" type="WorldEnvironment" index="0"]
+[node name="Main" type="WorldEnvironment"]
 
 environment = SubResource( 2 )
 script = ExtResource( 2 )