fix okey game

apps/face/src/index.erl

@@ -31,7 +31,7 @@ event(init) ->
 event({chat,Pid}) ->
     GamePid = get(game_session),
     game_session:process_request(GamePid,"Web Site",#session_attach{token=?TEST_TOKEN}), 
-    game_session:process_request(GamePid,"Web Site",#join_game{game=1000002}),
+    game_session:process_request(GamePid,"Web Site",#join_game{game=1000001}),
     error_logger:info_msg("Chat Pid: ~p",[Pid]),
     Username = wf:user(),
     Message = wf:q(message),

apps/server/include/settings.hrl

@@ -1,8 +1,8 @@
--define(LOBBY_TIMEOUT, begin {ok, X}   = nsm_db:get(config,"games/lobby_timeout", 60000), X end).
--define(REMATCH_TIMEOUT, begin {ok, X} = nsm_db:get(config,"games/rematch_timeout", 45000), X end).
--define(ROBOT_DELAY, begin {ok, X}     = nsm_db:get(config,"games/okey/robot_delay", 500), X end).
--define(SKILL_SEED, begin {ok, X}      = nsm_db:get(config, "games/okey/skill_seed", 500), X end). %% skill value for new player
--define(IS_TEST, begin {ok, X}         = nsm_db:get(config,"debug/is_test", false), X end). %% determines if code is executed in test
+-define(LOBBY_TIMEOUT, begin {ok, X}   = kvs:get(config,"games/lobby_timeout", 60000), X end).
+-define(REMATCH_TIMEOUT, begin {ok, X} = kvs:get(config,"games/rematch_timeout", 45000), X end).
+-define(ROBOT_DELAY, begin {ok, X}     = kvs:get(config,"games/okey/robot_delay", 500), X end).
+-define(SKILL_SEED, begin {ok, X}      = kvs:get(config, "games/okey/skill_seed", 500), X end). %% skill value for new player
+-define(IS_TEST, begin {ok, X}         = kvs:get(config,"debug/is_test", false), X end). %% determines if code is executed in test
 -define(ALL_SESSIONS, <<"all_sessions_topic">>).
 -define(TEST_TOKEN, "EBAs6dg2Xw6XuCdg8qiPmlBLgYJ6N4Ti0P+oGpWgYz4NW4nBBUzTe/wAuLYtPnjFpsjCExxSpV78fipmsPxcf+NGy+QKIM6rmVJhpnIlKf0bpFNuGaAPjZAWthhGO8nZ0V8UnA==").
 -define(TEST_TOKEN2, "EBAs6dg2Xw6XuCdg8qiPmlBLgYJ6N4Ti0P+oGpWgYz4NW4nBBUzTe/wAuLYtPnjFpsjCExxSpV78fipmsPxcf+NGy+QKIM6rmVJhpnIlKf0bpFNuGaAPjZAWthhGO8nZ0V8Un2==").

apps/server/src/okey/game_okey_bot.erl

@@ -397,7 +397,7 @@ random_bool(Prob) ->
     Point = crypto:rand_uniform(0, 1000),
     Prob*1000 > Point.
 
-get_delay(fast) -> {ok, Val}   = nsm_db:get(config,"games/okey/robot_delay_fast", 6000), Val;
-get_delay(normal) -> {ok, Val} = nsm_db:get(config,"games/okey/robot_delay_normal", 9000), Val;
-get_delay(slow) -> {ok, Val}   = nsm_db:get(config,"games/okey/robot_delay_slow", 15000), Val.
+get_delay(fast) -> {ok, Val}   = kvs:get(config,"games/okey/robot_delay_fast", 6000), Val;
+get_delay(normal) -> {ok, Val} = kvs:get(config,"games/okey/robot_delay_normal", 9000), Val;
+get_delay(slow) -> {ok, Val}   = kvs:get(config,"games/okey/robot_delay_slow", 15000), Val.
 

apps/server/src/okey/game_okey_ng_table_trn.erl

@@ -1479,17 +1479,17 @@ desk_error_to_ext(E) -> {error, E}.
 
 %%===================================================================
 
-get_timeout(turn, fast) -> {ok, Val}   = nsm_db:get(config,"games/okey/turn_timeout_fast", 15000), Val;
-get_timeout(turn, normal) -> {ok, Val} = nsm_db:get(config,"games/okey/turn_timeout_normal", 30000), Val;
-get_timeout(turn, slow) -> {ok, Val}   = nsm_db:get(config,"games/okey/turn_timeout_slow", 60000), Val;
+get_timeout(turn, fast) -> {ok, Val}   = kvs:get(config,"games/okey/turn_timeout_fast", 15000), Val;
+get_timeout(turn, normal) -> {ok, Val} = kvs:get(config,"games/okey/turn_timeout_normal", 30000), Val;
+get_timeout(turn, slow) -> {ok, Val}   = kvs:get(config,"games/okey/turn_timeout_slow", 60000), Val;
 
-get_timeout(challenge, fast) ->  {ok, Val}   = nsm_db:get(config,"games/okey/challenge_timeout_fast", 5000), Val;
-get_timeout(challenge, normal) ->  {ok, Val} = nsm_db:get(config,"games/okey/challenge_timeout_normal", 10000), Val;
-get_timeout(challenge, slow) -> {ok, Val}    = nsm_db:get(config,"games/okey/challenge_timeout_slow", 20000), Val;
+get_timeout(challenge, fast) ->  {ok, Val}   = kvs:get(config,"games/okey/challenge_timeout_fast", 5000), Val;
+get_timeout(challenge, normal) ->  {ok, Val} = kvs:get(config,"games/okey/challenge_timeout_normal", 10000), Val;
+get_timeout(challenge, slow) -> {ok, Val}    = kvs:get(config,"games/okey/challenge_timeout_slow", 20000), Val;
 
-get_timeout(ready, fast) -> {ok, Val}   = nsm_db:get(config,"games/okey/ready_timeout_fast", 15000), Val;
-get_timeout(ready, normal) -> {ok, Val} = nsm_db:get(config,"games/okey/ready_timeout_normal", 25000), Val;
-get_timeout(ready, slow) -> {ok, Val}   = nsm_db:get(config,"games/okey/ready_timeout_slow", 45000), Val.
+get_timeout(ready, fast) -> {ok, Val}   = kvs:get(config,"games/okey/ready_timeout_fast", 15000), Val;
+get_timeout(ready, normal) -> {ok, Val} = kvs:get(config,"games/okey/ready_timeout_normal", 25000), Val;
+get_timeout(ready, slow) -> {ok, Val}   = kvs:get(config,"games/okey/ready_timeout_slow", 45000), Val.
 
 %%===================================================================