Fix shadowing of "name" property + hidden rocks

Fixes #189.

Author: akien-mga

networking/multiplayer_bomber/bomb.gd

@@ -1,7 +1,7 @@
 extends Area2D
 
 var in_area = []
-var owner
+var from_player
 
 # Called from the animation
 func explode():
@@ -10,7 +10,7 @@ func explode():
 		return
 	for p in in_area:
 		if (p.has_method("exploded")):
-			p.rpc("exploded", owner) # Exploded has a master keyword, so it will only be received by the master
+			p.rpc("exploded", from_player) # Exploded has a master keyword, so it will only be received by the master
 
 func done():
 	queue_free()

networking/multiplayer_bomber/bomb.tscn

@@ -23,11 +23,13 @@ _data = [ Vector2( 0.00150494, 0.398437 ), 0.0, 0.0, 0, 0, Vector2( 0.0152287, 1
 
 [sub_resource type="CurveTexture" id=4]
 
+flags = 4
 width = 2048
 curve = SubResource( 3 )
 
 [sub_resource type="ParticlesMaterial" id=5]
 
+render_priority = 0
 trail_divisor = 1
 emission_shape = 2
 emission_box_extents = Vector3( 80, 1, 1 )
@@ -76,6 +78,7 @@ tracks/0/path = NodePath("sprite:self_modulate")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/keys = {
 "times": PoolRealArray( 0, 0.4, 0.6, 0.8, 1.1, 1.3, 1.5, 1.8, 1.9, 2, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 3 ),
 "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
@@ -87,6 +90,7 @@ tracks/1/path = NodePath(".")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/imported = false
+tracks/1/enabled = true
 tracks/1/keys = {
 "times": PoolRealArray( 2.8, 3.4 ),
 "transitions": PoolRealArray( 1, 1 ),
@@ -103,6 +107,7 @@ tracks/2/path = NodePath("explosion1:emitting")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/imported = false
+tracks/2/enabled = true
 tracks/2/keys = {
 "times": PoolRealArray( 0, 2.8 ),
 "transitions": PoolRealArray( 1, 1 ),
@@ -114,6 +119,7 @@ tracks/3/path = NodePath("explosion2:emitting")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/imported = false
+tracks/3/enabled = true
 tracks/3/keys = {
 "times": PoolRealArray( 0, 2.8 ),
 "transitions": PoolRealArray( 1, 1 ),
@@ -132,23 +138,23 @@ audio_bus_override = false
 audio_bus_name = "Master"
 script = ExtResource( 1 )
 
-[node name="sprite" type="Sprite" parent="."]
+[node name="sprite" type="Sprite" parent="." index="0"]
 
 position = Vector2( -2.92606, -2.92606 )
 texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 144, 0, 48, 48 )
 _sections_unfolded = [ "Region" ]
 
-[node name="shape1" type="CollisionShape2D" parent="."]
+[node name="shape1" type="CollisionShape2D" parent="." index="1"]
 
 shape = SubResource( 1 )
 
-[node name="shape2" type="CollisionShape2D" parent="."]
+[node name="shape2" type="CollisionShape2D" parent="." index="2"]
 
 shape = SubResource( 2 )
 
-[node name="explosion1" type="Particles2D" parent="."]
+[node name="explosion1" type="Particles2D" parent="." index="3"]
 
 emitting = false
 amount = 8
@@ -170,7 +176,7 @@ h_frames = 1
 v_frames = 1
 _sections_unfolded = [ "Process Material", "Textures", "Time" ]
 
-[node name="explosion2" type="Particles2D" parent="."]
+[node name="explosion2" type="Particles2D" parent="." index="4"]
 
 rotation = 1.57162
 emitting = false
@@ -193,14 +199,14 @@ h_frames = 1
 v_frames = 1
 _sections_unfolded = [ "Process Material", "Textures", "Time" ]
 
-[node name="anim" type="AnimationPlayer" parent="."]
+[node name="anim" type="AnimationPlayer" parent="." index="5"]
 
+root_node = NodePath("..")
+autoplay = "anim"
 playback_process_mode = 1
 playback_default_blend_time = 0.0
-root_node = NodePath("..")
+playback_speed = 1.0
 anims/anim = SubResource( 6 )
-playback/active = true
-playback/speed = 1.0
 blend_times = [  ]
 autoplay = "anim"
 

networking/multiplayer_bomber/gamestate.gd

@@ -56,15 +56,15 @@ func _connected_fail():
 
 # Lobby management functions
 
-remote func register_player(id, name):
+remote func register_player(id, new_player_name):
 	if (get_tree().is_network_server()):
 		# If we are the server, let everyone know about the new player
 		rpc_id(id, "register_player", 1, player_name) # Send myself to new dude
 		for p_id in players: # Then, for each remote player
 			rpc_id(id, "register_player", p_id, players[p_id]) # Send player to new dude
-			rpc_id(p_id, "register_player", id, name) # Send new dude to player
+			rpc_id(p_id, "register_player", id, new_player_name) # Send new dude to player
 
-	players[id] = name
+	players[id] = new_player_name
 	emit_signal("player_list_changed")
 
 remote func unregister_player(id):
@@ -124,14 +124,14 @@ remote func ready_to_start(id):
 			rpc_id(p, "post_start_game")
 		post_start_game()
 
-func host_game(name):
-	player_name = name
+func host_game(new_player_name):
+	player_name = new_player_name
 	var host = NetworkedMultiplayerENet.new()
 	host.create_server(DEFAULT_PORT, MAX_PEERS)
 	get_tree().set_network_peer(host)
 
-func join_game(ip, name):
-	player_name = name
+func join_game(ip, new_player_name):
+	player_name = new_player_name
 	var host = NetworkedMultiplayerENet.new()
 	host.create_client(ip, DEFAULT_PORT)
 	get_tree().set_network_peer(host)

networking/multiplayer_bomber/lobby.gd

@@ -17,8 +17,8 @@ func _on_host_pressed():
 	get_node("players").show()
 	get_node("connect/error_label").text=""
 
-	var name = get_node("connect/name").text
-	gamestate.host_game(name)
+	var player_name = get_node("connect/name").text
+	gamestate.host_game(player_name)
 	refresh_lobby()
 
 func _on_join_pressed():
@@ -35,8 +35,8 @@ func _on_join_pressed():
 	get_node("connect/host").disabled=true
 	get_node("connect/join").disabled=true
 
-	var name = get_node("connect/name").text
-	gamestate.join_game(ip, name)
+	var player_name = get_node("connect/name").text
+	gamestate.join_game(ip, player_name)
 	# refresh_lobby() gets called by the player_list_changed signal
 
 func _on_connection_success():
@@ -56,7 +56,7 @@ func _on_game_ended():
 	get_node("connect/join").disabled
 
 func _on_game_error(errtxt):
-	get_node("error").text=errtxt
+	get_node("error").dialog_text = errtxt
 	get_node("error").popup_centered_minsize()
 
 func refresh_lobby():