diff --git a/include/browserquest.hrl b/include/bqs.hrl similarity index 100% rename from include/browserquest.hrl rename to include/bqs.hrl diff --git a/init.sh b/init.sh index d9a2a46..046fa3d 100755 --- a/init.sh +++ b/init.sh @@ -1 +1 @@ -erl -pa deps/*/ebin -pa ebin -eval "application:start(crypto), application:start(compiler), application:start(syntax_tools), application:start(lager), application:start(cowboy), application:start(browserquest_srv)." +erl -pa deps/*/ebin -pa ebin -eval "application:start(crypto), application:start(compiler), application:start(syntax_tools), application:start(lager), application:start(cowboy), application:start(bqs)." diff --git a/src/browserquest_srv.app.src b/src/bqs.app.src similarity index 77% rename from src/browserquest_srv.app.src rename to src/bqs.app.src index f680b7c..2fd79c4 100644 --- a/src/browserquest_srv.app.src +++ b/src/bqs.app.src @@ -1,6 +1,6 @@ -{application, browserquest_srv, +{application, bqs, [ - {description, "Backend server for browserquest"}, + {description, "Backend server for bqs"}, {vsn, "0.1.0"}, {registered, []}, {applications, [ @@ -12,7 +12,7 @@ crypto, syntax_tools ]}, - {mod, { browserquest_srv_app, []}}, + {mod, { bqs_app, []}}, {env, [ {world_map, "world_map.json"}, {riak_ip, "127.0.0.1"}, diff --git a/src/browserquest_srv_app.erl b/src/bqs_app.erl similarity index 79% rename from src/browserquest_srv_app.erl rename to src/bqs_app.erl index c790b2a..711dc59 100644 --- a/src/browserquest_srv_app.erl +++ b/src/bqs_app.erl @@ -1,4 +1,4 @@ --module(browserquest_srv_app). +-module(bqs_app). -behaviour(application). @@ -26,19 +26,19 @@ start(_StartType, _StartArgs) -> end, Dispatch = [{'_', [ - {'_', browserquest_srv_handler, []} + {'_', bqs_handler, []} ]}], -%% lager:debug("Starting browserquest_srv on port ~p", [ListeningPort]), +%% lager:debug("Starting bqs on port ~p", [ListeningPort]), %% Name, NbAcceptors, Transport, TransOpts, Protocol, ProtoOpts %% Listen in 10100/tcp for http connections. - ranch:start_listener(browserquest_srv_handler, 100, + ranch:start_listener(bqs_handler, 100, cowboy_tcp_transport, [{port, ListeningPort}], cowboy_http_protocol, [{dispatch, Dispatch}] ), - browserquest_srv_sup:start_link(). + bqs_sup:start_link(). stop(_State) -> ok. diff --git a/src/browserquest_srv_entity_handler.erl b/src/bqs_entity_handler.erl similarity index 97% rename from src/browserquest_srv_entity_handler.erl rename to src/bqs_entity_handler.erl index 5a7e5a1..4cd312e 100644 --- a/src/browserquest_srv_entity_handler.erl +++ b/src/bqs_entity_handler.erl @@ -6,11 +6,11 @@ %%% @end %%% Created : 8 Jul 2012 by Niclas Axelsson %%%------------------------------------------------------------------- --module(browserquest_srv_entity_handler). +-module(bqs_entity_handler). -behaviour(gen_server). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). %% API -export([ start_link/0, @@ -94,7 +94,7 @@ move_zone(OldZone, NewZone) -> %% @end %%-------------------------------------------------------------------- init([]) -> - Args = [fun add_mob/1, browserquest_srv_map:get_attribute("mobAreas")], + Args = [fun add_mob/1, bqs_map:get_attribute("mobAreas")], erlang:spawn(lists, foreach, Args), {ok, #state{zones = dict:new(), targets = dict:new()}}. @@ -237,4 +237,4 @@ calculate_dmg(TargetArmor, SourceWeapon) -> end. add_mob(#mobarea{type = Type, x = X, y = Y}) -> - browserquest_srv_mob_sup:add_child(Type, X, Y). + bqs_mob_sup:add_child(Type, X, Y). diff --git a/src/browserquest_srv_handler.erl b/src/bqs_handler.erl similarity index 84% rename from src/browserquest_srv_handler.erl rename to src/bqs_handler.erl index 085b319..912b13c 100644 --- a/src/browserquest_srv_handler.erl +++ b/src/bqs_handler.erl @@ -5,13 +5,13 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_handler). +-module(bqs_handler). -compile(export_all). -behaviour(cowboy_http_handler). -behaviour(cowboy_websocket_handler). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). % Behaviour cowboy_http_handler -export([init/3, handle/2, terminate/3]). @@ -22,7 +22,7 @@ websocket_info/3, websocket_terminate/3 ]). --define(APP, browserquest_srv). +-define(APP, bqs). -record(state, { riak, @@ -80,7 +80,7 @@ websocket_handle({text, Msg}, Req, State) -> % With this callback we can handle other kind of % messages, like binary. websocket_handle(_Any, Req, State) -> - browserquest_srv_util:unexpected_info( + bqs_util:unexpected_info( ?MODULE,"websocket binary received", State), {ok, Req, State}. @@ -94,7 +94,7 @@ websocket_info(<<"tick">>, Req, State = #state{player = undefined}) -> {ok, Req, State}; websocket_info(<<"tick">>, Req, State = #state{player = Player}) -> - case browserquest_srv_player:get_surrondings(Player) of + case bqs_player:get_surrondings(Player) of [] -> ok; ActionList -> @@ -114,7 +114,7 @@ websocket_info(Msg, Req, State) -> websocket_terminate(_Reason, _Req, #state{player = Player}) -> lager:debug("Connection closed"), - browserquest_srv_player:stop(Player), + bqs_player:stop(Player), ok. %%%=================================================================== @@ -122,21 +122,21 @@ websocket_terminate(_Reason, _Req, #state{player = Player}) -> %%%=================================================================== parse_action([?HELLO, Name, Armor, Weapon], State) -> %% This is a player call - {ok, Player} = browserquest_srv_player:start_link(Name, Armor, Weapon), - {ok, Status} = browserquest_srv_player:get_status(Player), + {ok, Player} = bqs_player:start_link(Name, Armor, Weapon), + {ok, Status} = bqs_player:get_status(Player), {json, [?WELCOME|Status], State#state{player = Player}}; parse_action([?MOVE, X, Y], State = #state{player = Player}) -> - {ok, Status} = browserquest_srv_player:move(Player, X, Y), + {ok, Status} = bqs_player:move(Player, X, Y), lager:debug("MOVED ~p ~p", [X, Y]), {json, [?MOVE|Status], State}; parse_action([?ATTACK, Target], State = #state{player = Player}) -> - ok = browserquest_srv_player:attack(Player, Target), + ok = bqs_player:attack(Player, Target), {ok, [], State}; parse_action([?HIT, Target], State = #state{player = Player}) -> - {ok, Return} = browserquest_srv_player:hit(Player, Target), + {ok, Return} = bqs_player:hit(Player, Target), {json, Return, State}; @@ -144,26 +144,26 @@ parse_action([?DAMAGE, _Target], State = #state{player = _Player}) -> {ok, [], State}; parse_action([?HURT, Attacker], State = #state{player = Player}) -> - {ok, Status} = browserquest_srv_player:hurt(Player, Attacker), + {ok, Status} = bqs_player:hurt(Player, Attacker), {json, Status, State}; parse_action([?AGGRO, _Target], State = #state{player = _Player}) -> {ok, [], State}; parse_action([?CHAT, Message], State = #state{player = Player}) -> - {ok, Return} = browserquest_srv_player:chat(Player, Message), + {ok, Return} = bqs_player:chat(Player, Message), {json, Return, State}; parse_action([?TELEPORT, X, Y], State = #state{player = Player}) -> - {ok, Status} = browserquest_srv_player:move(Player, X, Y), + {ok, Status} = bqs_player:move(Player, X, Y), {json, [?TELEPORT|Status], State}; parse_action([?CHECK, Value], State = #state{player = Player}) -> - browserquest_srv_player:set_checkpoint(Player, Value), + bqs_player:set_checkpoint(Player, Value), {ok, [], State}; parse_action([?ZONE], State = #state{player = Player}) -> - browserquest_srv_player:update_zone(Player), + bqs_player:update_zone(Player), {ok, [], State}; parse_action(ActionList, _State) -> diff --git a/src/browserquest_srv_item.erl b/src/bqs_item.erl similarity index 87% rename from src/browserquest_srv_item.erl rename to src/bqs_item.erl index fa3da3f..247cc84 100644 --- a/src/browserquest_srv_item.erl +++ b/src/bqs_item.erl @@ -5,11 +5,11 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_item). +-module(bqs_item). -behaviour(gen_server). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). %% API -export([create/4, start_link/4]). @@ -38,24 +38,24 @@ pickup(ItemPid, PlayerState) -> %%% gen_server callbacks %%%=================================================================== init([Zone, Item, Id, SpawnInfo]) -> - browserquest_srv_entity_handler:register(Zone, Item, Id, SpawnInfo), + bqs_entity_handler:register(Zone, Item, Id, SpawnInfo), {ok, #state{id = Item, zone = Zone}}. handle_call({pickup, PlayerState}, _From, State = #state{id = Id, zone = Zone}) -> - browserquest_srv_entity_handler:unregister(Zone), + bqs_entity_handler:unregister(Zone), {stop, normal, new_player_state(Id, PlayerState), State}; handle_call(Request, From, State) -> - browserquest_srv_util:unexpected_call(?MODULE, Request, From, State), + bqs_util:unexpected_call(?MODULE, Request, From, State), Reply = ok, {reply, Reply, State}. handle_cast(Msg, State) -> - browserquest_srv_util:unexpected_cast(?MODULE, Msg, State), + bqs_util:unexpected_cast(?MODULE, Msg, State), {noreply, State}. handle_info(Info, State) -> - browserquest_srv_util:unexpected_info(?MODULE, Info, State), + bqs_util:unexpected_info(?MODULE, Info, State), {noreply, State}. terminate(_Reason, _State) -> diff --git a/src/browserquest_srv_map.erl b/src/bqs_map.erl similarity index 94% rename from src/browserquest_srv_map.erl rename to src/bqs_map.erl index 2a7216d..2178f55 100644 --- a/src/browserquest_srv_map.erl +++ b/src/bqs_map.erl @@ -5,11 +5,11 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_map). +-module(bqs_map). -behaviour(gen_server). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). %% API -export([start_link/1]). @@ -46,7 +46,7 @@ tileid_to_pos(TileId) -> %%% gen_server callbacks %%%=================================================================== init([MapName]) -> - File = code:priv_dir(browserquest_srv) ++ "/maps/" ++ MapName, + File = code:priv_dir(bqs) ++ "/maps/" ++ MapName, {ok, FileBin} = file:read_file(File), Json = mochijson3:decode(FileBin), Height = get_json_value("height", Json), @@ -95,16 +95,16 @@ handle_call({tileid_to_pos, TileId}, _From, #map{attributes = PL} = Map) -> TileToPos = proplists:get_value("tiletopos", PL), {reply, tileid_to_pos(TileId, TileToPos), Map}; handle_call(Request, From, State) -> - browserquest_srv_util:unexpected_call(?MODULE, Request, From, State), + bqs_util:unexpected_call(?MODULE, Request, From, State), Reply = ok, {reply, Reply, State}. handle_cast(Msg, State) -> - browserquest_srv_util:unexpected_cast(?MODULE, Msg, State), + bqs_util:unexpected_cast(?MODULE, Msg, State), {noreply, State}. handle_info(Info, State) -> - browserquest_srv_util:unexpected_info(?MODULE, Info, State), + bqs_util:unexpected_info(?MODULE, Info, State), {noreply, State}. terminate(_Reason, _State) -> diff --git a/src/browserquest_srv_mob.erl b/src/bqs_mob.erl similarity index 89% rename from src/browserquest_srv_mob.erl rename to src/bqs_mob.erl index 4e45ee1..48ce350 100644 --- a/src/browserquest_srv_mob.erl +++ b/src/bqs_mob.erl @@ -5,11 +5,11 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_mob). +-module(bqs_mob). -behaviour(gen_server). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). %% API -export([start_link/3, receive_damage/2, get_stats/1]). @@ -32,14 +32,14 @@ start_link(Type, X, Y) -> receive_damage(Pid, Amount) when is_pid(Pid) -> gen_server:cast(Pid, {receive_damage, Amount}); receive_damage(Target, Amount) -> - {ok, Pid} = browserquest_srv_entity_handler:get_target(Target), + {ok, Pid} = bqs_entity_handler:get_target(Target), receive_damage(Pid, Amount). get_stats(Pid) when is_pid(Pid) -> lager:debug("Trying to get stats from Pid: ~p", [Pid]), gen_server:call(Pid, {get_stats}); get_stats(Target) -> - {ok, Pid} = browserquest_srv_entity_handler:get_target(Target), + {ok, Pid} = bqs_entity_handler:get_target(Target), get_stats(Pid). @@ -47,9 +47,9 @@ get_stats(Target) -> %%% gen_server callbacks %%%=================================================================== init([BinType, X, Y]) -> - Id = browserquest_srv_entity_handler:generate_id("1"), - Zone = browserquest_srv_entity_handler:make_zone(X, Y), - Type = browserquest_srv_util:type_to_internal(BinType), + Id = bqs_entity_handler:generate_id("1"), + Zone = bqs_entity_handler:make_zone(X, Y), + Type = bqs_util:type_to_internal(BinType), Orientation = random:uniform(4), State = do_init( Type, @@ -58,7 +58,7 @@ init([BinType, X, Y]) -> orientation = Orientation} ), - browserquest_srv_entity_handler:register(Zone, Type, Id, {action, [false, + bqs_entity_handler:register(Zone, Type, Id, {action, [false, ?SPAWN, Id, Type, X, Y]}), {ok, State#mob_state{zone = Zone, id = Id, type = Type}}. @@ -67,7 +67,7 @@ handle_call({get_stats}, _From, State = #mob_state{id = Id, weapon = Weapon, arm {reply, {ok, {Id, Weapon, Armor}}, State}; handle_call(Request, From, State) -> - browserquest_srv_util:unexpected_call(?MODULE, Request, From, State), + bqs_util:unexpected_call(?MODULE, Request, From, State), {reply, ok, State}. handle_cast({tick}, State = #mob_state{hate = _Hate, hitpoints = HP}) -> @@ -96,7 +96,7 @@ handle_cast({event, _From, ?WARRIOR, {action, [?MOVE, _Id, ?WARRIOR, _X, _Y, _Na handle_cast({event, _From, ?WARRIOR, {action, [?ATTACK, Id]}}, State) -> %% Hates on for you lager:debug("RETALIATE!", [State#mob_state.id, Id]), - browserquest_srv_entity_handler:event(State#mob_state.zone, + bqs_entity_handler:event(State#mob_state.zone, State#mob_state.type, {action, [?ATTACK, State#mob_state.id]}), {noreply, State}; @@ -114,7 +114,7 @@ handle_cast({event, From, ?WARRIOR, case erlang:integer_to_list(Id) of Target -> %% I'm gonna KILL you - browserquest_srv_entity_handler:event( + bqs_entity_handler:event( Zone, Type, {action, [?ATTACK, Id]}), {noreply, State#mob_state{hate = [From]}}; _ -> @@ -129,9 +129,9 @@ handle_cast({receive_damage, Amount}, NewState = State#mob_state{hitpoints = Total}, case Total =< 0 of true -> - browserquest_srv_entity_handler:event( + bqs_entity_handler:event( Zone, Type, {action, [?DESPAWN, Id]}), - browserquest_srv_entity_handler:unregister(Zone), + bqs_entity_handler:unregister(Zone), drop_item(Item, X, Y), {stop, normal, NewState}; false -> @@ -139,11 +139,11 @@ handle_cast({receive_damage, Amount}, end; handle_cast(Msg, State) -> - browserquest_srv_util:unexpected_cast(?MODULE, Msg, State), + bqs_util:unexpected_cast(?MODULE, Msg, State), {noreply, State}. handle_info(Info, State) -> - browserquest_srv_util:unexpected_info(?MODULE, Info, State), + bqs_util:unexpected_info(?MODULE, Info, State), {noreply, State}. terminate(_Reason, _State) -> @@ -158,11 +158,11 @@ code_change(_OldVsn, State, _Extra) -> %%%=================================================================== drop_item(Item, X, Y) -> %% Items start with 9 - Id = browserquest_srv_entity_handler:generate_id("9"), - Zone = browserquest_srv_entity_handler:make_zone(X,Y), + Id = bqs_entity_handler:generate_id("9"), + Zone = bqs_entity_handler:make_zone(X,Y), SpawnInfo = [?SPAWN, Id, Item, X, Y], %% Remove apply, spawn item gen_server, call register from it - Fun = fun() -> browserquest_srv_item:create(Zone, Item, Id, SpawnInfo) end, + Fun = fun() -> bqs_item:create(Zone, Item, Id, SpawnInfo) end, spawn(Fun), ok. diff --git a/src/browserquest_srv_mob_sup.erl b/src/bqs_mob_sup.erl similarity index 90% rename from src/browserquest_srv_mob_sup.erl rename to src/bqs_mob_sup.erl index d1e8465..d021e89 100644 --- a/src/browserquest_srv_mob_sup.erl +++ b/src/bqs_mob_sup.erl @@ -6,7 +6,7 @@ %%% Created : 8 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_mob_sup). +-module(bqs_mob_sup). -behaviour(supervisor). @@ -47,7 +47,7 @@ add_child(MobType, X, Y) -> Mob = {erlang:make_ref(), - {browserquest_srv_mob, start_link, [MobType, X, Y]}, - Restart, Shutdown, ChildType, [browserquest_srv_mob]}, + {bqs_mob, start_link, [MobType, X, Y]}, + Restart, Shutdown, ChildType, [bqs_mob]}, {ok, Pid} = supervisor:start_child(?SERVER, Mob), Pid. diff --git a/src/browserquest_srv_player.erl b/src/bqs_player.erl similarity index 83% rename from src/browserquest_srv_player.erl rename to src/bqs_player.erl index f0c8a62..40f1b11 100644 --- a/src/browserquest_srv_player.erl +++ b/src/bqs_player.erl @@ -5,11 +5,11 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_player). +-module(bqs_player). -behaviour(gen_server). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). %% API -export([ @@ -34,7 +34,7 @@ -compile(export_all). -define(CALC_HP(ArmorLevel), 80 + ((ArmorLevel - 1) * 30)). --define(APP, browserquest_srv). +-define(APP, bqs). %%%=================================================================== %%% API @@ -79,14 +79,14 @@ stop(Pid) -> %%% gen_server callbacks %%%=================================================================== init([Name, Armor, Weapon]) -> - Id = browserquest_srv_entity_handler:generate_id("5"), + Id = bqs_entity_handler:generate_id("5"), Hitpoints = ?CALC_HP(get_armor_lvl(Armor)), - CPs = browserquest_srv_map:get_attribute("startingAreas"), + CPs = bqs_map:get_attribute("startingAreas"), random:seed(erlang:now()), #cp{x = PosX, y = PosY} = lists:nth(random:uniform(length(CPs)), CPs), - Zone = browserquest_srv_entity_handler:make_zone(PosX, PosY), + Zone = bqs_entity_handler:make_zone(PosX, PosY), lager:debug("Player zone: ~p", [Zone]), {ok, #player_state{ @@ -109,18 +109,18 @@ handle_call({get_status}, _From, armor = Armor, weapon = Weapon}) -> Action = {action, [true, ?SPAWN, Id, ?WARRIOR, X, Y, Name, ?DOWN, Armor, Weapon]}, - browserquest_srv_entity_handler:register(Zone, ?WARRIOR, Id, Action), + bqs_entity_handler:register(Zone, ?WARRIOR, Id, Action), {reply, {ok, [Id, Name, X, Y, HP]}, State}; handle_call({move, X, Y}, _From, State = #player_state{pos_x = OldX, pos_y = OldY, id = Id, zone = Zone}) -> - case browserquest_srv_map:is_out_of_bounds(X, Y) of + case bqs_map:is_out_of_bounds(X, Y) of true -> lager:debug("Moved to ~p ~p", [X, Y]), {reply, {ok, [Id, OldX, OldY]}, State}; _ -> - browserquest_srv_entity_handler:event( + bqs_entity_handler:event( Zone, ?WARRIOR, {action, [?MOVE, Id, X, Y]}), {reply, {ok, [Id, X, Y]}, State#player_state{pos_x = X, pos_y = Y}} end; @@ -133,11 +133,11 @@ handle_call({update_zone}, _From, armor = Armor, weapon = Weapon, pos_x = X, pos_y = Y}) -> %% Delete old zone and insert the new one - NewZone = browserquest_srv_entity_handler:make_zone(X, Y), - browserquest_srv_entity_handler:unregister(OldZone), + NewZone = bqs_entity_handler:make_zone(X, Y), + bqs_entity_handler:unregister(OldZone), Action = {action, [true, ?SPAWN, Id, ?WARRIOR, X, Y, Name, ?DOWN, Armor, Weapon]}, - browserquest_srv_entity_handler:register(NewZone, ?WARRIOR, Id, Action), + bqs_entity_handler:register(NewZone, ?WARRIOR, Id, Action), {reply, ok, State#player_state{zone = NewZone}}; handle_call({get_zone}, _From, State = #player_state{zone = Zone}) -> @@ -149,7 +149,7 @@ handle_call({get_surrondings}, _From, handle_call({chat, Message}, _From, State = #player_state{id = Id, zone = Zone}) -> Action = [?CHAT, Id, Message], - browserquest_srv_entity_handler:event(Zone, ?WARRIOR, {action, Action}), + bqs_entity_handler:event(Zone, ?WARRIOR, {action, Action}), {reply, {ok, Action}, State}; handle_call({attack, Target}, _From, State = #player_state{zone = Zone}) -> @@ -161,29 +161,29 @@ handle_call({attack, Target}, _From, State = #player_state{zone = Zone}) -> [?ATTACK, Target] end, - browserquest_srv_entity_handler:event(Zone, ?WARRIOR, {action, Action}), + bqs_entity_handler:event(Zone, ?WARRIOR, {action, Action}), {reply, ok, State}; handle_call({hit, Target}, _From, State = #player_state{local_cache = {Target, {Id, _, Armor}}, weapon = Weapon}) -> - Dmg = browserquest_srv_entity_handler:calculate_dmg( + Dmg = bqs_entity_handler:calculate_dmg( get_armor_lvl(Armor), get_weapon_lvl(Weapon)), - browserquest_srv_mob:receive_damage(Target, Dmg), + bqs_mob:receive_damage(Target, Dmg), {reply, {ok, [?DAMAGE, Id, Dmg]}, State}; handle_call({hit, Target}, _From, State = #player_state{weapon = Weapon}) -> - {ok, {Id, TargetWeapon, TargetArmor}} = browserquest_srv_mob:get_stats(Target), - Dmg = browserquest_srv_entity_handler:calculate_dmg( + {ok, {Id, TargetWeapon, TargetArmor}} = bqs_mob:get_stats(Target), + Dmg = bqs_entity_handler:calculate_dmg( get_armor_lvl(TargetArmor), get_weapon_lvl(Weapon)), - browserquest_srv_mob:receive_damage(Target, Dmg), + bqs_mob:receive_damage(Target, Dmg), {reply, {ok, [?DAMAGE, Id, Dmg]}, State#player_state{local_cache = {Target, {Id, TargetWeapon, TargetArmor}}}}; handle_call({hurt, Attacker}, _From, State = #player_state{armor = Armor, hitpoints = HP, local_cache = {_Target, {Attacker, TargetWeapon, _}}}) -> - Dmg = browserquest_srv_entity_handler:calculate_dmg( + Dmg = bqs_entity_handler:calculate_dmg( get_weapon_lvl(TargetWeapon), get_armor_lvl(Armor)), lager:debug("Received ~p damage. Have totally ~p", [Dmg, HP]), case HP-Dmg of @@ -195,8 +195,8 @@ handle_call({hurt, Attacker}, _From, handle_call({hurt, Attacker}, _From, State = #player_state{armor = Armor, hitpoints = HP}) -> - {ok, {Id, TargetWeapon, TargetArmor}} = browserquest_srv_mob:get_stats(Attacker), - Dmg = browserquest_srv_entity_handler:calculate_dmg( + {ok, {Id, TargetWeapon, TargetArmor}} = bqs_mob:get_stats(Attacker), + Dmg = bqs_entity_handler:calculate_dmg( get_weapon_lvl(TargetWeapon), get_armor_lvl(Armor)), lager:debug("Received ~p damage. Have totally ~p", [Dmg, HP]), case HP-Dmg of @@ -207,7 +207,7 @@ handle_call({hurt, Attacker}, _From, end; handle_call(Request, From, State) -> - browserquest_srv_util:unexpected_call(?MODULE, Request, From, State), + bqs_util:unexpected_call(?MODULE, Request, From, State), Reply = ok, {reply, Reply, State}. @@ -242,15 +242,15 @@ handle_cast({event, _From, _Type, {action, AC}}, {noreply, State#player_state{actionlist = [AC|ActionList]}}; handle_cast(Msg, State) -> - browserquest_srv_util:unexpected_cast(?MODULE, Msg, State), + bqs_util:unexpected_cast(?MODULE, Msg, State), {noreply, State}. handle_info(Info, State) -> - browserquest_srv_util:unexpected_info(?MODULE, Info, State), + bqs_util:unexpected_info(?MODULE, Info, State), {noreply, State}. terminate(_Reason, #player_state{zone = Zone}) -> - browserquest_srv_entity_handler:unregister(Zone), + bqs_entity_handler:unregister(Zone), ok. code_change(_OldVsn, State, _Extra) -> diff --git a/src/browserquest_srv_server.erl b/src/bqs_server.erl similarity index 85% rename from src/browserquest_srv_server.erl rename to src/bqs_server.erl index a8c799c..a207517 100644 --- a/src/browserquest_srv_server.erl +++ b/src/bqs_server.erl @@ -5,7 +5,7 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_server). +-module(bqs_server). -behaviour(gen_server). @@ -35,16 +35,16 @@ init([]) -> {ok, #state{}}. handle_call(Request, From, State) -> - browserquest_srv_util:unexpected_call(?MODULE, Request, From, State), + bqs_util:unexpected_call(?MODULE, Request, From, State), Reply = ok, {reply, Reply, State}. handle_cast(Msg, State) -> - browserquest_srv_util:unexpected_cast(?MODULE, Msg, State), + bqs_util:unexpected_cast(?MODULE, Msg, State), {noreply, State}. handle_info(Info, State) -> - browserquest_srv_util:unexpected_info(?MODULE, Info, State), + bqs_util:unexpected_info(?MODULE, Info, State), {noreply, State}. terminate(_Reason, _State) -> diff --git a/src/browserquest_srv_sup.erl b/src/bqs_sup.erl similarity index 81% rename from src/browserquest_srv_sup.erl rename to src/bqs_sup.erl index d06fd3a..8f90c34 100644 --- a/src/browserquest_srv_sup.erl +++ b/src/bqs_sup.erl @@ -6,7 +6,7 @@ %%% @end %%% Created : 7 Jul 2012 by Niclas Axelsson %%%------------------------------------------------------------------- --module(browserquest_srv_sup). +-module(bqs_sup). -behaviour(supervisor). @@ -61,19 +61,19 @@ init([]) -> Type = worker, {ok, MapFile} = application:get_env(world_map), Map = - {browserquest_srv_map, - {browserquest_srv_map, start_link, [MapFile]}, - Restart, Shutdown, Type, [browserquest_srv_map]}, + {bqs_map, + {bqs_map, start_link, [MapFile]}, + Restart, Shutdown, Type, [bqs_map]}, MobSup = - {browserquest_srv_mob_sup, - {browserquest_srv_mob_sup, start_link, []}, - Restart, Shutdown, Type, [browserquest_srv_mob_sup]}, + {bqs_mob_sup, + {bqs_mob_sup, start_link, []}, + Restart, Shutdown, Type, [bqs_mob_sup]}, EntityHandler = - {browserquest_srv_entity_handler, - {browserquest_srv_entity_handler, start_link, []}, - Restart, Shutdown, Type, [browserquest_srv_entity_handler]}, + {bqs_entity_handler, + {bqs_entity_handler, start_link, []}, + Restart, Shutdown, Type, [bqs_entity_handler]}, {ok, {SupFlags, [Map, MobSup, EntityHandler]}}. diff --git a/src/browserquest_srv_util.erl b/src/bqs_util.erl similarity index 97% rename from src/browserquest_srv_util.erl rename to src/bqs_util.erl index 427da8e..a1041e1 100644 --- a/src/browserquest_srv_util.erl +++ b/src/bqs_util.erl @@ -5,9 +5,9 @@ %%% @end %%% Created : 7 July 2012 by %%%------------------------------------------------------------------- --module(browserquest_srv_util). +-module(bqs_util). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). -compile(export_all). diff --git a/test/browserquest_srv_mob_tests.erl b/test/bqs_mob_tests.erl similarity index 63% rename from test/browserquest_srv_mob_tests.erl rename to test/bqs_mob_tests.erl index f663a98..3ebd61a 100644 --- a/test/browserquest_srv_mob_tests.erl +++ b/test/bqs_mob_tests.erl @@ -1,11 +1,11 @@ --module(browserquest_srv_mob_tests). +-module(bqs_mob_tests). -include_lib("eunit/include/eunit.hrl"). --include("../include/browserquest.hrl"). +-include("../include/bqs.hrl"). handle_call_get_stats_test() -> State = #mob_state{id = id, weapon = weapon, armor = armor}, ?assertEqual({reply, {ok, {id, weapon, armor}}, State}, - browserquest_srv_mob:handle_call({get_stats}, from, State)). + bqs_mob:handle_call({get_stats}, from, State)).