Begin level 0, mv world Level, mv players Players

Also, levels now inherit a level object

assets/levels/0.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: '0.blend'
+# Material Count: 1
+
+newmtl Material
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2

assets/levels/0.obj

@@ -0,0 +1,294 @@
+# Blender v2.79 (sub 0) OBJ File: '0.blend'
+# www.blender.org
+mtllib 0.mtl
+o Cube.002
+v -1.092366 9.818959 42.550369
+v -1.092366 21.363312 42.550369
+v -1.092366 11.635796 33.559551
+v -1.092366 19.569632 33.559551
+v -0.472983 9.818959 42.550369
+v -0.472983 21.363312 42.550369
+v -0.472983 11.635796 33.559551
+v -0.472983 19.569632 33.559551
+v -1.092366 10.359627 42.550369
+v -1.092366 11.851984 33.559551
+v -0.472983 11.851984 33.559551
+v -0.472983 10.359627 42.550369
+v -1.092366 20.396225 42.550369
+v -1.092366 18.891346 33.559551
+v -0.472983 18.891346 33.559551
+v -0.472983 20.396225 42.550369
+v 5.818319 11.851984 33.559551
+v 5.818319 11.635796 33.559551
+v 7.572081 9.818959 42.550369
+v 7.572081 10.359627 42.550369
+v -7.702229 11.635796 33.559551
+v -9.457354 9.818959 42.550369
+v -7.702229 11.851984 33.559551
+v -9.457354 10.359627 42.550369
+v -0.472983 11.851984 33.559551
+v -0.472983 10.359627 42.550369
+v 5.818319 11.851984 33.559551
+v 7.572081 10.359627 42.550369
+vn -1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.0000 -0.9802 -0.1981
+vn 0.0000 0.9807 -0.1956
+vn 0.9815 0.0000 -0.1915
+vn -0.9815 0.0000 -0.1916
+vn 0.0000 0.9865 0.1637
+usemtl Material
+s off
+f 13//1 2//1 4//1 14//1
+f 14//2 4//2 8//2 15//2
+f 15//3 8//3 6//3 16//3
+f 16//4 6//4 2//4 13//4
+f 3//5 7//5 5//5 1//5
+f 8//6 4//6 2//6 6//6
+f 5//4 12//4 9//4 1//4
+f 7//2 11//2 17//2 18//2
+f 3//2 10//2 11//2 7//2
+f 3//5 1//5 22//5 21//5
+f 12//4 16//4 13//4 9//4
+f 11//3 15//3 16//3 12//3
+f 10//2 14//2 15//2 11//2
+f 9//1 13//1 14//1 10//1
+f 18//7 17//7 20//7 19//7
+f 11//4 12//4 26//4 25//4
+f 12//4 5//4 19//4 20//4
+f 5//5 7//5 18//5 19//5
+f 22//8 24//8 23//8 21//8
+f 10//2 3//2 21//2 23//2
+f 1//4 9//4 24//4 22//4
+f 9//9 10//9 23//9 24//9
+f 25//9 26//9 28//9 27//9
+f 20//4 17//4 27//4 28//4
+f 12//4 20//4 28//4 26//4
+f 17//4 11//4 25//4 27//4
+o Cube.001
+v 11.583948 13.485515 39.883606
+v 11.906063 14.021890 39.606476
+v 6.736403 13.489851 34.257599
+v 7.058517 14.026227 33.980465
+v 15.056230 9.853043 36.888981
+v 15.378345 10.389419 36.611847
+v 10.208684 9.857378 31.262970
+v 10.530799 10.393755 30.985840
+v 11.906063 14.021890 39.606476
+v 7.058517 14.026227 33.980465
+v 10.530799 10.393755 30.985840
+v 15.378345 10.389419 36.611847
+v 11.906063 14.021890 39.606476
+v 7.058517 14.026227 33.980465
+v 10.530799 10.393755 30.985840
+v 15.378345 10.389419 36.611847
+v 11.906063 14.021890 39.606476
+v 7.058517 14.026227 33.980465
+v 10.530799 10.393755 30.985840
+v 15.378345 10.389419 36.611847
+vn -0.5936 0.6210 0.5119
+vn -0.6527 0.0006 -0.7576
+vn 0.5936 -0.6210 -0.5119
+vn 0.6528 -0.0006 0.7576
+vn -0.4707 -0.7838 0.4050
+vn 0.0000 0.0000 1.0000
+vn 0.4707 0.7838 -0.4050
+usemtl Material
+s off
+f 29//10 30//10 32//10 31//10
+f 31//11 32//11 36//11 35//11
+f 35//12 36//12 34//12 33//12
+f 33//13 34//13 30//13 29//13
+f 31//14 35//14 33//14 29//14
+f 32//15 30//15 37//15 38//15
+f 37//15 40//15 44//15 41//15
+f 30//15 34//15 40//15 37//15
+f 36//15 32//15 38//15 39//15
+f 34//15 36//15 39//15 40//15
+f 44//15 43//15 47//15 48//15
+f 39//15 38//15 42//15 43//15
+f 40//15 39//15 43//15 44//15
+f 38//15 37//15 41//15 42//15
+f 47//16 46//16 45//16 48//16
+f 42//15 41//15 45//15 46//15
+f 41//15 44//15 48//15 45//15
+f 43//15 42//15 46//15 47//15
+o Cube
+v 1.000000 -1.000000 -12.931417
+v 1.000000 -1.000000 9.096548
+v -3.086592 -1.000000 9.096546
+v -3.086592 -1.000000 -12.931418
+v 1.000000 -0.459774 -12.931417
+v 0.999999 1.201059 9.096548
+v -3.086593 1.201059 9.096546
+v -3.086592 -0.459774 -12.931417
+v 1.000000 -1.000000 5.762017
+v -3.086592 -1.000000 5.762017
+v 1.000000 -0.459774 5.762018
+v -3.086593 -0.459774 5.762017
+v 1.000000 -1.000000 -12.931417
+v 1.000000 -1.000000 5.762017
+v 1.702863 -1.000000 5.762017
+v 1.702863 -1.000000 9.096548
+v 1.702863 -1.000000 -12.931417
+v 1.702863 -0.459774 -12.931417
+v 1.702862 1.201059 9.096548
+v 1.702863 -0.459774 5.762018
+v 0.999998 4.187265 4.668787
+v 0.999998 5.848098 8.003319
+v 0.999999 4.187265 -14.024648
+v 1.702861 4.187265 4.668787
+v 1.702861 5.848098 8.003319
+v 1.702862 4.187265 -14.024648
+v -4.006415 2.378540 20.164524
+v -4.006415 3.526768 20.164524
+v -3.216172 2.378540 17.287867
+v -3.216172 3.526768 17.287867
+v 1.477752 2.378540 20.164524
+v 1.477752 3.526768 20.164524
+v 1.477752 2.378540 17.287867
+v 1.477752 3.526768 17.287867
+v -4.006415 2.378540 23.110689
+v -4.661135 3.526768 23.110689
+v 1.477752 3.526768 23.110689
+v 1.477752 2.378540 23.110689
+v 1.477752 4.731099 20.164524
+v -4.006415 4.731099 20.164524
+v 1.477752 4.731099 23.110689
+v -4.661135 4.731099 23.110689
+v 1.477752 3.526768 26.170633
+v -4.661135 3.526768 26.170633
+v 1.477752 4.731099 26.170633
+v -5.553786 4.731099 26.170633
+v 1.477752 5.758842 23.110689
+v -4.661135 5.758842 23.110689
+v 1.477752 5.758842 26.170633
+v -5.553786 5.758842 26.170633
+v 1.477752 4.731099 28.809587
+v -6.308297 4.731099 28.809587
+v 1.477752 5.758842 28.809587
+v -6.308297 5.758842 28.809587
+v 1.477752 6.775424 26.170633
+v -5.553786 6.775424 26.170633
+v 1.477752 6.775424 28.809587
+v -6.308297 6.775424 28.809587
+v -22.522087 -10.397825 49.177940
+v -22.524323 -8.435893 49.566292
+v -23.097097 -5.360754 23.727613
+v -23.099329 -3.398821 24.115965
+v 8.939487 -10.227962 48.500732
+v 8.937256 -8.266029 48.889084
+v 8.364480 -5.190889 23.050409
+v 8.362247 -3.228957 23.438761
+v -7.221142 12.244795 24.516268
+v -7.221142 12.864130 24.516268
+v -4.610221 11.532987 14.274043
+v -4.610221 12.864130 14.274043
+v 2.037407 12.244795 24.516268
+v 2.037407 12.864130 24.516268
+v 2.037407 11.532987 14.274043
+v 2.037407 12.864130 14.274043
+v -2.058972 15.083646 9.056669
+v -2.058972 14.826284 9.056669
+v 3.969099 14.826284 9.056669
+v 3.969099 15.083646 9.056669
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 0.8951 -0.4458
+vn -0.0000 -0.0000 1.0000
+vn -1.0000 -0.0000 -0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 -0.2290 -0.9734
+vn 0.0000 1.0000 -0.0000
+vn 1.0000 0.0000 -0.0000
+vn 0.0000 0.2290 0.9734
+vn -0.9643 0.0000 -0.2649
+vn -0.9562 -0.2726 -0.1063
+vn -0.9762 0.0000 -0.2169
+vn -0.9290 -0.3443 -0.1355
+vn -0.9600 0.0000 -0.2800
+vn -0.9615 0.0000 -0.2749
+vn -0.9998 -0.0054 0.0215
+vn -0.0222 0.1941 -0.9807
+vn 0.9998 0.0054 -0.0215
+vn 0.0222 -0.1941 0.9807
+vn 0.0011 -0.9810 -0.1942
+vn -0.0011 0.9810 0.1942
+vn -0.9690 0.0000 -0.2470
+vn 0.0000 -0.8456 -0.5338
+vn 0.0000 -0.9976 0.0693
+vn 0.0000 0.9202 0.3915
+vn -0.8983 0.0000 -0.4393
+vn 0.9378 0.0000 0.3472
+usemtl Material
+s off
+f 57//17 50//17 51//17 58//17
+f 59//18 60//18 55//18 54//18
+f 57//17 49//17 65//17 63//17
+f 50//19 54//19 55//19 51//19
+f 58//20 60//20 56//20 52//20
+f 53//21 49//21 52//21 56//21
+f 51//20 55//20 60//20 58//20
+f 66//22 53//22 71//22 74//22
+f 53//23 56//23 60//23 59//23
+f 49//17 57//17 58//17 52//17
+f 57//19 49//19 61//19 62//19
+f 63//24 68//24 67//24 64//24
+f 65//24 66//24 68//24 63//24
+f 53//20 59//20 69//20 71//20
+f 54//19 50//19 64//19 67//19
+f 49//21 53//21 66//21 65//21
+f 50//17 57//17 63//17 64//17
+f 71//23 69//23 72//23 74//23
+f 69//18 70//18 73//18 72//18
+f 59//20 54//20 70//20 69//20
+f 68//24 66//24 74//24 72//24
+f 67//24 68//24 72//24 73//24
+f 54//25 67//25 73//25 70//25
+f 75//26 76//26 78//26 77//26
+f 77//21 78//21 82//21 81//21
+f 81//24 82//24 80//24 79//24
+f 80//21 76//21 88//21 87//21
+f 77//17 81//17 79//17 75//17
+f 82//23 78//23 76//23 80//23
+f 86//19 85//19 84//19 83//19
+f 79//24 80//24 85//24 86//24
+f 76//27 75//27 83//27 84//27
+f 75//17 79//17 86//17 83//17
+f 87//23 88//23 90//23 89//23
+f 76//28 84//28 90//28 88//28
+f 85//24 80//24 87//24 89//24
+f 85//24 89//24 93//24 91//24
+f 92//19 91//19 93//19 94//19
+f 94//17 93//17 99//17 100//17
+f 84//17 85//17 91//17 92//17
+f 90//29 84//29 92//29 94//29
+f 95//23 96//23 98//23 97//23
+f 90//30 94//30 98//30 96//30
+f 89//21 90//21 96//21 95//21
+f 93//24 89//24 95//24 97//24
+f 100//19 99//19 101//19 102//19
+f 93//24 97//24 101//24 99//24
+f 98//31 94//31 100//31 102//31
+f 98//31 102//31 106//31 104//31
+f 103//23 104//23 106//23 105//23
+f 102//19 101//19 105//19 106//19
+f 101//24 97//24 103//24 105//24
+f 97//21 98//21 104//21 103//21
+f 107//32 108//32 110//32 109//32
+f 109//33 110//33 114//33 113//33
+f 113//34 114//34 112//34 111//34
+f 111//35 112//35 108//35 107//35
+f 109//36 113//36 111//36 107//36
+f 114//37 110//37 108//37 112//37
+f 115//38 116//38 118//38 117//38
+f 121//39 117//39 124//39 125//39
+f 121//24 122//24 120//24 119//24
+f 119//19 120//19 116//19 115//19
+f 117//40 121//40 119//40 115//40
+f 122//23 118//23 116//23 120//23
+f 124//21 123//21 126//21 125//21
+f 118//41 122//41 126//41 123//41
+f 117//42 118//42 123//42 124//42
+f 122//43 121//43 125//43 126//43

scenes/level.tscn

@@ -0,0 +1,151 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://scenes/objective.tscn" type="PackedScene" id=1]
+
+[sub_resource type="SphereShape" id=1]
+
+radius = 1.0
+
+[sub_resource type="SphereMesh" id=2]
+
+radius = 1.0
+height = 2.0
+radial_segments = 64
+rings = 32
+is_hemisphere = false
+
+[sub_resource type="DynamicFontData" id=3]
+
+font_path = "res://assets/DejaVuSansMono.ttf"
+
+[sub_resource type="DynamicFont" id=4]
+
+size = 16
+use_mipmaps = false
+use_filter = false
+font_data = SubResource( 3 )
+_sections_unfolded = [ "Font", "Resource" ]
+
+[node name="Level" type="Spatial"]
+
+[node name="DirectionalLight" type="DirectionalLight" parent="." index="0"]
+
+transform = Transform( 0.784405, 0.193347, -0.589343, 0.315866, 0.693208, 0.647836, 0.533794, -0.694319, 0.482684, -7.6643, 1.97737, 0 )
+layers = 1
+light_color = Color( 1, 1, 1, 1 )
+light_energy = 1.0
+light_indirect_energy = 1.0
+light_negative = false
+light_specular = 0.5
+light_bake_mode = 1
+light_cull_mask = -1
+shadow_enabled = false
+shadow_color = Color( 0, 0, 0, 1 )
+shadow_bias = 0.1
+shadow_contact = 0.0
+shadow_reverse_cull_face = false
+editor_only = false
+directional_shadow_mode = 2
+directional_shadow_split_1 = 0.1
+directional_shadow_split_2 = 0.2
+directional_shadow_split_3 = 0.5
+directional_shadow_blend_splits = false
+directional_shadow_normal_bias = 0.8
+directional_shadow_bias_split_scale = 0.25
+directional_shadow_depth_range = 0
+directional_shadow_max_distance = 200.0
+
+[node name="Players" type="Spatial" parent="." index="1"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.4634, 0 )
+_sections_unfolded = [ "Transform", "Visibility" ]
+
+[node name="Ball" type="RigidBody" parent="." index="2"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.4344, 6.09969, 4.40885 )
+input_ray_pickable = true
+input_capture_on_drag = false
+collision_layer = 1
+collision_mask = 1
+mode = 0
+mass = 1.0
+friction = 1.0
+bounce = 0.0
+gravity_scale = 1.0
+custom_integrator = false
+continuous_cd = false
+contacts_reported = 0
+contact_monitor = false
+sleeping = false
+can_sleep = true
+axis_lock_linear_x = false
+axis_lock_linear_y = false
+axis_lock_linear_z = false
+axis_lock_angular_x = false
+axis_lock_angular_y = false
+axis_lock_angular_z = false
+linear_velocity = Vector3( 0, 0, 0 )
+linear_damp = -1.0
+angular_velocity = Vector3( 0, 0, 0 )
+angular_damp = -1.0
+_sections_unfolded = [ "Collision", "Pause", "Transform", "Visibility" ]
+
+[node name="CollisionShape" type="CollisionShape" parent="Ball" index="0"]
+
+shape = SubResource( 1 )
+disabled = false
+_sections_unfolded = [ "Transform", "Visibility" ]
+
+[node name="MeshInstance" type="MeshInstance" parent="Ball" index="1"]
+
+layers = 1
+material_override = null
+cast_shadow = 1
+extra_cull_margin = 0.0
+use_in_baked_light = false
+lod_min_distance = 0.0
+lod_min_hysteresis = 0.0
+lod_max_distance = 0.0
+lod_max_hysteresis = 0.0
+mesh = SubResource( 2 )
+skeleton = NodePath("..")
+material/0 = null
+_sections_unfolded = [ "Geometry", "Transform", "material" ]
+
+[node name="FullObjective" parent="." index="3" instance=ExtResource( 1 )]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -17.3706, 2.0316, 4.06596 )
+_sections_unfolded = [ "Transform" ]
+
+[node name="Debug" type="Label" parent="." index="4"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 831.0
+margin_top = 27.0
+margin_right = 1004.0
+margin_bottom = 94.0
+grow_horizontal = 0
+rect_pivot_offset = Vector2( 0, 0 )
+mouse_filter = 2
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 4
+custom_fonts/font = SubResource( 4 )
+percent_visible = 1.0
+lines_skipped = 0
+max_lines_visible = -1
+_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Material", "Mouse", "Pause", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ]
+
+[node name="LeftSpawn" type="Spatial" parent="." index="5"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.96426, 9.36109 )
+_sections_unfolded = [ "Transform" ]
+
+[node name="RightSpawn" type="Spatial" parent="." index="6"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.87156, 0 )
+
+

scripts/heroes/1.gd

@@ -43,7 +43,7 @@ slave func slave_place_wall(tf):
 # Creates wall, adds to world, and returns the node
 func add_wall():
 	var wall = preload("res://scenes/wall.tscn").instance()
-	get_node("/root/world").add_child(wall)
+	get_node("/root/Level").add_child(wall)
 	return wall
 
 func finalize_wall(wall, tf=null):

scripts/lobby.gd

@@ -128,7 +128,7 @@ remote func pre_configure_game():
 	var self_peer_id = get_tree().get_network_unique_id()
 
 	get_node("/root/Control").queue_free()
-	var world = load("res://scenes/levels/1.tscn").instance()
+	var world = load("res://scenes/levels/0.tscn").instance()
 	get_node("/root").add_child(world)
 
 	# Load all players (including self)
@@ -138,7 +138,7 @@ remote func pre_configure_game():
 		player.set_name(str(p))
 		player.set_network_master(p)
 		player.player_info = player_info[p]
-		get_node("/root/world/players").call_deferred("add_child", player)
+		get_node("/root/Level/Players").call_deferred("add_child", player)
 
 	rpc_id(1, "done_preconfiguring", self_peer_id)
 

scripts/player.gd

@@ -35,7 +35,7 @@ func _ready():
 	# Capture mouse once game is started:
 	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 
-	debug_node = get_node("/root/world/Debug")
+	debug_node = get_node("/root/Level/Debug")
 
 	if is_network_master():
 		get_node("Yaw/Pitch/Camera").make_current()
@@ -49,9 +49,9 @@ func spawn():
 	var y_varies = 20
 	# No Z, because that's the left-right question
 	if player_info.is_right_team:
-		placement = get_node("/root/world/RightSpawn").get_translation()
+		placement = get_node("/root/Level/RightSpawn").get_translation()
 	else:
-		placement = get_node("/root/world/LeftSpawn").get_translation()
+		placement = get_node("/root/Level/LeftSpawn").get_translation()
 	# So we don't all spawn on top of each other
 	placement.x += rand_range(0, x_varies)
 	placement.y += rand_range(0, y_varies)
@@ -194,7 +194,7 @@ sync func switch_hero(hero):
 	new_hero.set_name("%d" % net_id)
 	new_hero.set_network_master(net_id)
 	new_hero.player_info = player_info
-	get_node("/root/world/players").call_deferred("add_child", new_hero)
+	get_node("/root/Level/Players").call_deferred("add_child", new_hero)
 	# We must wait until after _ready is called, so that we don't end up at spawn
 	new_hero.call_deferred("set_status", get_status())
 	queue_free()