From f8b383232b70fed22ef95a4397aa1fec9e5319d8 Mon Sep 17 00:00:00 2001 From: Kallfaktorn Date: Tue, 26 Apr 2011 16:13:56 +0200 Subject: [PATCH 1/2] players are actually doing something --- games/pong_bot_e/ggs_network.erl | 1 + games/pong_bot_e/pong_bot.erl | 42 ++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/games/pong_bot_e/ggs_network.erl b/games/pong_bot_e/ggs_network.erl index 343465f..b2506cb 100644 --- a/games/pong_bot_e/ggs_network.erl +++ b/games/pong_bot_e/ggs_network.erl @@ -3,6 +3,7 @@ -export([read/2, send_command/3]). connect() -> + %{ok,Socket} = gen_tcp:connect("ggs.jeena.net", 9000,[{active, false}]), {ok,Socket} = gen_tcp:connect("localhost", 9000,[{active, false}]), Socket. diff --git a/games/pong_bot_e/pong_bot.erl b/games/pong_bot_e/pong_bot.erl index 585022c..48c2104 100644 --- a/games/pong_bot_e/pong_bot.erl +++ b/games/pong_bot_e/pong_bot.erl @@ -68,14 +68,15 @@ ggsNetworkReceivedCommandWithArgs(Command, Args, Ref) -> end. welcome(Who_am_I, Ref) -> - case Who_am_I of - "1" -> - Me = gen_server:call({global, {pong_bot, Ref}}, player1), - gen_server:cast({global, {pong_bot, Ref}}, {me, Me}); - "2" -> - Me = gen_server:call({global, {pong_bot, Ref}}, player2), - gen_server:cast({global, {pong_bot, Ref}}, {me, Me}) - end. + gen_server:cast({global, {pong_bot, Ref}}, {me, Who_am_I}). + %case Who_am_I of + % "1" -> + % Me = gen_server:call({global, {pong_bot, Ref}}, player1), + % gen_server:cast({global, {pong_bot, Ref}}, {me, Me}); + % "2" -> + % Me = gen_server:call({global, {pong_bot, Ref}}, player2), + % gen_server:cast({global, {pong_bot, Ref}}, {me, Me}) + %end. @@ -101,14 +102,27 @@ gameTick(Ref) -> Ball = gen_server:call({global, {pong_bot, Ref}}, ball), {_, BallY} = Ball, Me = gen_server:call({global, {pong_bot, Ref}}, me), - {_, MeY} = Me, + case Me of + "1" -> + PlayerMe = gen_server:call({global, {pong_bot, Ref}}, player1); + "2" -> + PlayerMe = gen_server:call({global, {pong_bot, Ref}}, player2) + end, + + {_, MeY} = PlayerMe, - case BallY < (MeY - 5) of + case ((BallY - MeY) < 0) of true -> - ggs_network:send_command("up", "", Ref); - _ -> case BallY > ( MeY - 5) of + ggs_network:send_command("up", "", Ref), + io:format("Player down sent to server~n"), + io:format("Ball: ~B~n", [BallY]), + io:format("Player: ~B~n", [MeY]); + _ -> case ((BallY - MeY) > 0) of true -> - ggs_network:send_command("down", "", Ref); + ggs_network:send_command("down", "", Ref), + io:format("Player up sent to server~n"), + io:format("Ball: ~B~n", [BallY]), + io:format("Player: ~B~n", [MeY]); _ -> ok end end @@ -126,10 +140,12 @@ ball(Pos_s, Ref) -> player1_y(YStr, Ref) -> Y = list_to_integer(YStr), + io:format("Player1_y~n~n~n~n"), gen_server:cast({global, {pong_bot, Ref}}, {player1_y, Y}). player2_y(YStr, Ref) -> Y = list_to_integer(YStr), + io:format("Player2_y~n~n~n~n"), gen_server:cast({global, {pong_bot, Ref}}, {player2_y, Y}). game(WaitOrStart, Ref) -> From 68e97023c61d0d79d4d7a163a76c6ec3088fcb8a Mon Sep 17 00:00:00 2001 From: Kallfaktorn Date: Tue, 26 Apr 2011 16:28:44 +0200 Subject: [PATCH 2/2] pong_bots smarter and starting with ggs.jeena.net --- games/pong_bot_e/ggs_network.erl | 4 ++-- games/pong_bot_e/pong_bot.erl | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/games/pong_bot_e/ggs_network.erl b/games/pong_bot_e/ggs_network.erl index b2506cb..c97c776 100644 --- a/games/pong_bot_e/ggs_network.erl +++ b/games/pong_bot_e/ggs_network.erl @@ -3,8 +3,8 @@ -export([read/2, send_command/3]). connect() -> - %{ok,Socket} = gen_tcp:connect("ggs.jeena.net", 9000,[{active, false}]), - {ok,Socket} = gen_tcp:connect("localhost", 9000,[{active, false}]), + {ok,Socket} = gen_tcp:connect("ggs.jeena.net", 9000,[{active, false}]), + %{ok,Socket} = gen_tcp:connect("localhost", 9000,[{active, false}]), Socket. read(Socket, Ref) -> diff --git a/games/pong_bot_e/pong_bot.erl b/games/pong_bot_e/pong_bot.erl index 48c2104..4006303 100644 --- a/games/pong_bot_e/pong_bot.erl +++ b/games/pong_bot_e/pong_bot.erl @@ -61,8 +61,10 @@ ggsNetworkReceivedCommandWithArgs(Command, Args, Ref) -> "game" -> game(Args, Ref); "player1_points" -> + %io:format("Player1 win~n"), new_round(Ref); "player2_points" -> + %io:format("Player2 win~n"), new_round(Ref); _ -> ok end. @@ -113,16 +115,16 @@ gameTick(Ref) -> case ((BallY - MeY) < 0) of true -> - ggs_network:send_command("up", "", Ref), - io:format("Player down sent to server~n"), - io:format("Ball: ~B~n", [BallY]), - io:format("Player: ~B~n", [MeY]); + ggs_network:send_command("up", "", Ref); + %io:format("Player down sent to server~n"), + %io:format("Ball: ~B~n", [BallY]), + %io:format("Player: ~B~n", [MeY]); _ -> case ((BallY - MeY) > 0) of true -> - ggs_network:send_command("down", "", Ref), - io:format("Player up sent to server~n"), - io:format("Ball: ~B~n", [BallY]), - io:format("Player: ~B~n", [MeY]); + ggs_network:send_command("down", "", Ref); + %io:format("Player up sent to server~n"), + %io:format("Ball: ~B~n", [BallY]), + %io:format("Player: ~B~n", [MeY]); _ -> ok end end @@ -140,12 +142,12 @@ ball(Pos_s, Ref) -> player1_y(YStr, Ref) -> Y = list_to_integer(YStr), - io:format("Player1_y~n~n~n~n"), + %io:format("Player1_y~n~n~n~n"), gen_server:cast({global, {pong_bot, Ref}}, {player1_y, Y}). player2_y(YStr, Ref) -> Y = list_to_integer(YStr), - io:format("Player2_y~n~n~n~n"), + %io:format("Player2_y~n~n~n~n"), gen_server:cast({global, {pong_bot, Ref}}, {player2_y, Y}). game(WaitOrStart, Ref) ->