split wip

Author: MarvelWild

.gitignore

@@ -1,2 +1,3 @@
 RL2/res/music/
 RL2/res/_musicsrc/
+RL2/client/res/music/

RL2/c1.cmd

@@ -0,0 +1 @@
+CLIENT_SAVE_DIR="client_save/"

RL2/client/client.lua RL2/client/client/client.lua

@@ -9,11 +9,14 @@ _.lastPlace.item=nil
 local pageNumber=1
 -- pop on activate
 local maxPages=nil
+local isLoading=false
+local editorItems=nil
+
 
 local getCurrentItem=function()
 	local registryPos = (C.editorCurrentRow-1)*C.editorCols+C.editorCurrentCol
 	-- todo: read from server
-	return Registry.editorItems[registryPos]
+	return editorItems[registryPos]
 end
 
 
@@ -58,7 +61,7 @@ local moveFocus=function(dx,dy)
 	end
 
 	local registryPos = (nextY-1)*C.editorCols+nextX
-	local nextItem=Registry.editorItems[registryPos]
+	local nextItem=editorItems[registryPos]
 	if nextItem~=nil then
 		C.editorCurrentCol=nextX
 		C.editorCurrentRow=nextY
@@ -129,11 +132,20 @@ end
 
 
 
+local onEditorItemsReceived=function(response)
+	log("Editor items received")
+	isLoading=false
+	editorItems=response.editorItems
+end
+
 
 _.activate=function()
 	--инпут идёт по цепочке стейтов, начиная с дочерних
 	--table.insert(S.keyPressedListeners, onKeyPressed)
 	_.parentstate.isDrawUi=false
+	isLoading=true
+	local command={cmd="editor_items_get"}
+	Client.send(command, onEditorItemsReceived)
 end
 
 _.deactivate=function()
@@ -172,21 +184,24 @@ _.startItemIndex=1
 _.draw=function()
 --	local line1="Editor coords:"..W.player.x..","..W.player.y
 --	LG.print(line1,Ui.rightbox.x+10,Ui.rightbox.y+5+100)
+
+	if isLoading or editorItems==nil then
+		LG.print("Loading")
+		return
+	end
 
-	local itemsCount = #Registry.editorItems
-	
-	if itemsCount==0 then return end
 
 	local itemIndex=_.startItemIndex
-	local nextItem = Registry.editorItems[itemIndex]
+	local nextItem = editorItems[itemIndex]
+	if nextItem==nil then return end
 
 	for y=1,C.editorRows do
 		for x=1,C.editorCols do
 			if nextItem==nil then break end
 			drawItem(nextItem,x,y)
 
 			itemIndex=itemIndex+1
-			nextItem = Registry.editorItems[itemIndex]
+			nextItem = editorItems[itemIndex]
 		end
 		if nextItem==nil then break end
 	end

RL2/client/component/log.lua RL2/client/client/component/log.lua

@@ -2,29 +2,42 @@ local _={}
 
 _.client=nil
 
+local isLoading=false
+local presets=nil
+
 local onPresetPicked=function()
 	_.client.switchToEnterNameState()
 end
 
+local onPresetsReceived=function(response)
+	log("presets received")
+	isLoading=false
+	presets=response.presets
+	
+end
+
+
 
 local onKeyPressed=function(key)
 	local pick=tonumber(key)
 	if pick==nil then return end
 
 	-- log("Key:"..key.." tonumber:"..pick)
 
-	local option=Registry.playerPresets[pick]
-	if option==nil then return end
+	if isLoading then return false end
+	local option=presets[pick]
+	if option==nil then return false end
 
 	-- log("Picked option:"..TSerial.pack(option))
 
 	_.client.send({cmd="preset_picked", pick=pick}, onPresetPicked)
-	
 end
 
 
 _.activate=function()
 	subscribe(S.keyPressedListeners, onKeyPressed)
+	_.client.send({cmd="players_presets_get"}, onPresetsReceived)
+	isLoading=true
 end
 
 _.deactivate=function()
@@ -40,11 +53,15 @@ end
 _.draw=function()
 	LG.print("New player")
 
+	if isLoading then 
+		LG.print("loading..",0,20) 
+		return
+	end
+	
 	local y=40
 	local yStep=40
 	local x=10
-	for k,preset in pairs(Registry.playerPresets) do
-		
+	for k,preset in pairs(presets) do
 		local sprite=Img[preset.spriteName]
 
 		LG.print(k,x,y)

RL2/client/client/data/const.lua

@@ -66,21 +66,17 @@ local dispatchCommand=function(command, isLocking, callback)
 	end
 end
 
-_.enterEditorMode=function()
-	-- if S.isEditor then return end
-	
-	S.isEditor=true
-	
-	-- логичней это сделать в сабстейте редактора - на будущее
+local onEnteredEditorMode=function()
+	unlock()
 	local editorSubstate=require "client/editor_substate"
-	
-	-- todo: после разрешения от сервера
 	_.addSubstate(editorSubstate)
-	
-	dispatchCommand({cmd="enter_editor_mode"}, true, unlock)
 end
 
--- 
+
+_.enterEditorMode=function()
+	S.isEditor=true
+	dispatchCommand({cmd="enter_editor_mode"}, true, onEnteredEditorMode)
+end
 
 
 local commandMove=function(x,y)

RL2/client/editor_substate.lua RL2/client/client/editor_substate.lua

@@ -74,6 +74,7 @@ end
 local addActionsForItem=function(item)
 	if item.type=="seed" then
 		addAction({name="Plant", code="plant"})
+	else if item.type==""
 	end
 
 	addAction({name="Drop", code="drop"})

RL2/client/game_ui.lua RL2/client/client/game_ui.lua

@@ -0,0 +1 @@
+CLIENT_SAVE_DIR="client_save/"