update

1 files changed, 89 insertions, 15 deletions

diff --git a/stargate/stargate_gui.lua b/stargate/stargate_gui.lua
index 88894ac..829130f 100644
--- a/stargate/stargate_gui.lua
+++ b/stargate/stargate_gui.lua
@@ -62,6 +62,7 @@ minetest.register_on_joinplayer(function(player)
 	stargate_network["players"][player_name]["public_gates"]={}
 	stargate_network["players"][player_name]["public_gates_count"]=0
 	stargate_network["players"][player_name]["current_index"]=0
+	stargate_network["players"][player_name]["temp_gate"]={}
 end)
 
 stargate.registerGate = function(player_name,pos)
@@ -100,6 +101,7 @@ stargate.gateFormspecHandler = function(pos, node, clicker, itemstack)
 	stargate_network["players"][player_name]["own_gates"]={}
 	stargate_network["players"][player_name]["public_gates"]={}
 	local own_gates_count=0
+	print(dump(stargate_network[player_name]))
 	for __,gates in ipairs(stargate_network[player_name]) do
 		if gates["pos"].x==pos.x and gates["pos"].y==pos.y and gates["pos"].z==pos.z then
 			current_gate=gates
@@ -114,6 +116,21 @@ stargate.gateFormspecHandler = function(pos, node, clicker, itemstack)
 		return nil
 	end
 	stargate_network["players"][player_name]["current_index"]=0
+	stargate_network["players"][player_name]["temp_gate"]["type"]=current_gate["type"]
+	stargate_network["players"][player_name]["temp_gate"]["description"]=current_gate["description"]
+	stargate_network["players"][player_name]["temp_gate"]["pos"]={}
+	stargate_network["players"][player_name]["temp_gate"]["pos"].x=current_gate["pos"].x
+	stargate_network["players"][player_name]["temp_gate"]["pos"].y=current_gate["pos"].y
+	stargate_network["players"][player_name]["temp_gate"]["pos"].z=current_gate["pos"].z
+	if current_gate["destination"] then 
+		stargate_network["players"][player_name]["temp_gate"]["destination_description"]=current_gate["destination_description"]
+		stargate_network["players"][player_name]["temp_gate"]["destination"]={}
+		stargate_network["players"][player_name]["temp_gate"]["destination"].x=current_gate["destination"].x
+		stargate_network["players"][player_name]["temp_gate"]["destination"].y=current_gate["destination"].y
+		stargate_network["players"][player_name]["temp_gate"]["destination"].z=current_gate["destination"].z
+	else
+		stargate_network["players"][player_name]["temp_gate"]["destination"]=nil
+	end
 	stargate_network["players"][player_name]["current_gate"]=current_gate
 	stargate_network["players"][player_name]["dest_type"]="own"
 	local formspec=stargate.get_formspec(player_name,"main")
@@ -125,27 +142,36 @@ end
 stargate.get_formspec = function(player_name,page)
 	if player_name==nil then return nil end
 	stargate_network["players"][player_name]["current_page"]=page
-	local current_gate=stargate_network["players"][player_name]["current_gate"]
+	local temp_gate=stargate_network["players"][player_name]["temp_gate"]
 	local formspec = "size[14,10]"
 	--background
 	formspec = formspec .."background[-0.19,-0.2,;14.38,10.55;ui_form_bg.png]"
-	formspec = formspec.."label[0,0.0;Stargate]"
-	formspec = formspec.."label[0,.5;Position: ("..current_gate["pos"].x..","..current_gate["pos"].y..","..current_gate["pos"].z..")]"
+	formspec = formspec.."label[0,0.0;Stargate DHD]"
+	formspec = formspec.."label[0,.5;Position: ("..temp_gate["pos"].x..","..temp_gate["pos"].y..","..temp_gate["pos"].z..")]"
 	formspec = formspec.."image_button[3.5,.6;.6,.6;toggle_icon.png;toggle_type;]"
-	formspec = formspec.."label[4,.5;Type: "..current_gate["type"].."]"
+	formspec = formspec.."label[4,.5;Type: "..temp_gate["type"].."]"
 	formspec = formspec.."image_button[6.5,.6;.6,.6;pencil_icon.png;edit_desc;]"
 	formspec = formspec.."label[0,1.1;Destination: ]"
+	if temp_gate["destination"] then 
+		formspec = formspec.."label[2.5,1.1;("..temp_gate["destination"].x..","
+											  ..temp_gate["destination"].y..","
+											  ..temp_gate["destination"].z..") "
+											  ..temp_gate["destination_description"].."]"
+		formspec = formspec.."image_button[2,1.2;.6,.6;cancel_icon.png;remove_dest;]"
+	else
+	formspec = formspec.."label[2,1.1;Not connected]"
+	end
 	formspec = formspec.."label[0,1.7;Aviable destinations:]"
 	formspec = formspec.."image_button[3.5,1.8;.6,.6;toggle_icon.png;toggle_dest_type;]"
 	formspec = formspec.."label[4,1.7;Filter: "..stargate_network["players"][player_name]["dest_type"].."]"
 
 	if page=="main" then
 	formspec = formspec.."image_button[6.5,.6;.6,.6;pencil_icon.png;edit_desc;]"
-	formspec = formspec.."label[7,.5;Description: "..current_gate["description"].."]"
+	formspec = formspec.."label[7,.5;Description: "..temp_gate["description"].."]"
 	end
 	if page=="edit_desc" then
 	formspec = formspec.."image_button[6.5,.6;.6,.6;ok_icon.png;save_desc;]"
-	formspec = formspec.."field[7.3,.7;5,1;desc_box;Edit gate description:;"..current_gate["description"].."]"
+	formspec = formspec.."field[7.3,.7;5,1;desc_box;Edit gate description:;"..temp_gate["description"].."]"
 	end
 	
 	local list_index=stargate_network["players"][player_name]["current_index"]
@@ -156,9 +182,9 @@ stargate.get_formspec = function(player_name,page)
 	for x=0,2,1 do
 		local gate_temp=stargate_network["players"][player_name]["own_gates"][list_index+1]
 		if gate_temp then
-			formspec = formspec.."image_button["..(x*4.5)..","..(2.5+y*.9)..";.6,.6;stargate_icon.png;list_button"..list_index..";]"
-			formspec = formspec.."label["..(x*4.5+.5)..","..(2.3+y*.9)..";("..gate_temp["pos"].x..","..gate_temp["pos"].y..","..gate_temp["pos"].z..") "..gate_temp["type"].."]"
-			formspec = formspec.."label["..(x*4.5+.5)..","..(2.7+y*.9)..";"..gate_temp["description"].."]"
+			formspec = formspec.."image_button["..(x*4.5)..","..(2.5+y*.87)..";.6,.6;stargate_icon.png;list_button"..list_index..";]"
+			formspec = formspec.."label["..(x*4.5+.5)..","..(2.3+y*.87)..";("..gate_temp["pos"].x..","..gate_temp["pos"].y..","..gate_temp["pos"].z..") "..gate_temp["type"].."]"
+			formspec = formspec.."label["..(x*4.5+.5)..","..(2.7+y*.87)..";"..gate_temp["description"].."]"
 		end
 		print(dump(list_index))
 		list_index=list_index+1
@@ -167,6 +193,8 @@ stargate.get_formspec = function(player_name,page)
 	formspec = formspec.."image_button[6.5,1.8;.6,.6;left_icon.png;page_left;]"
 	formspec = formspec.."image_button[6.9,1.8;.6,.6;right_icon.png;page_right;]"
 	formspec=formspec.."label[7.5,1.7;Page: "..page.." of "..pagemax.."]"
+	formspec = formspec.."image_button_exit[6.1,9.3;.8,.8;ok_icon.png;save_changes;]"
+	formspec = formspec.."image_button_exit[7.1,9.3;.8,.8;cancel_icon.png;discard_changes;]"
 	return formspec
 end
 
@@ -174,13 +202,14 @@ end
 minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if not formname == "stargate_main" then return "" end
 	local player_name = player:get_player_name()
+	local temp_gate=stargate_network["players"][player_name]["temp_gate"]
 	local current_gate=stargate_network["players"][player_name]["current_gate"]
 	local formspec
 
 	if fields.toggle_type then
-		if current_gate["type"] == "private" then 
-			current_gate["type"] = "public"
-		else current_gate["type"] = "private" end
+		if temp_gate["type"] == "private" then 
+			temp_gate["type"] = "public"
+		else temp_gate["type"] = "private" end
 		formspec= stargate.get_formspec(player_name,"main")
 		stargate_network["players"][player_name]["formspec"] = formspec
 		minetest.show_formspec(player_name, "stargate_main", formspec)
@@ -207,7 +236,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
 
 	if fields.save_desc then
-		current_gate["description"]=fields.desc_box
+		temp_gate["description"]=fields.desc_box
 		formspec= stargate.get_formspec(player_name,"main")
 		stargate_network["players"][player_name]["formspec"]=formspec
 		minetest.show_formspec(player_name, "stargate_main", formspec)
@@ -242,18 +271,63 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			minetest.show_formspec(player_name, "stargate_main", formspec)
 		end
 	end
+
+	if fields.remove_dest then
+		minetest.sound_play("click", {to_player=player_name, gain = 0.5})
+		temp_gate["destination"]=nil
+		temp_gate["destination_description"]=nil
+		formspec = stargate.get_formspec(player_name,"main")
+		stargate_network["players"][player_name]["formspec"] = formspec
+		minetest.show_formspec(player_name, "stargate_main", formspec)
+	end
+
+	if fields.save_changes then
+		minetest.sound_play("click", {to_player=player_name, gain = 0.5})
+		current_gate["type"]=temp_gate["type"]
+		current_gate["description"]=temp_gate["description"]
+		current_gate["pos"]={}
+		current_gate["pos"].x=temp_gate["pos"].x
+		current_gate["pos"].y=temp_gate["pos"].y
+		current_gate["pos"].z=temp_gate["pos"].z
+		if temp_gate["destination"] then 
+			current_gate["destination_description"]=temp_gate["destination_description"]
+			current_gate["destination"]={}
+			current_gate["destination"].x=temp_gate["destination"].x
+			current_gate["destination"].y=temp_gate["destination"].y
+			current_gate["destination"].z=temp_gate["destination"].z
+		else
+			current_gate["destination"]=nil
+		end
+		if current_gate["destination"] then 
+			activateGate (player,current_gate["pos"])
+		else
+			deactivateGate (player,current_gate["pos"])
+		end
+		if stargate.save_data(player_name)==nil then
+			print ("[stargate] Couldnt update network file!")
+		end
+	end
+
+	if fields.discard_changes then
+		minetest.sound_play("click", {to_player=player_name, gain = 0.5})
+	end
+
 	local list_index=stargate_network["players"][player_name]["current_index"]
 	local i
 	for i=0,23,1 do
 	local button="list_button"..i+list_index
 	if fields[button] then 
-		local gate=stargate_network["players"][player_name]["current_gate"]
+		minetest.sound_play("gateSpin", {to_player=player_name, gain = 1.0})
+		local gate=stargate_network["players"][player_name]["temp_gate"]
 		local dest_gate=stargate_network["players"][player_name]["own_gates"][list_index+i+1]
 		gate["destination"]={}
 		gate["destination"].x=dest_gate["pos"].x
 		gate["destination"].y=dest_gate["pos"].y
 		gate["destination"].z=dest_gate["pos"].z
-		activateGate (player,gate["pos"])
+		gate["destination_description"]=dest_gate["description"]
+		formspec = stargate.get_formspec(player_name,"main")
+		stargate_network["players"][player_name]["formspec"] = formspec
+		minetest.show_formspec(player_name, "stargate_main", formspec)
 	end
 	end
 end)