diff --git a/src/egs_game.erl b/src/egs_game.erl index 734f208..7f676c1 100644 --- a/src/egs_game.erl +++ b/src/egs_game.erl @@ -191,7 +191,7 @@ counter_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> User = OldUser#users{quest=Quest, maptype=MapType, mapnumber=MapNumber, mapentry=MapEntry}, egs_db:users_insert(User), [{status, 1}, {char, Char}, {options, _}] = char_load(User#users.folder, User#users.charnumber), - [{name, CounterName}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = + [{name, AreaName}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = [{name, "LL counter"}, {quest, "data/lobby/counter.quest.nbl"}, {zone, "data/lobby/counter.zone.nbl"}, {entries, []}], try % 0c00 @@ -200,7 +200,7 @@ counter_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> egs_proto:send_zone_init(CSocket, GID, counter), egs_proto:send_zone(CSocket, ZoneFile), egs_proto:send_map(CSocket, Quest, MapType, MapNumber, MapEntry), - egs_proto:send_location(CSocket, GID, Quest, MapType, MapNumber, CounterName), + egs_proto:send_location(CSocket, GID, Quest, MapType, MapNumber, AreaName), % 0215 0215 020c 1202 1204 1206 1207 egs_proto:send_load_quest(CSocket, GID), send_packet_201(CSocket, GID, User, Char), @@ -220,7 +220,7 @@ lobby_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> User = OldUser#users{quest=Quest, maptype=MapType, mapnumber=MapNumber, mapentry=MapEntry}, egs_db:users_insert(User), [{status, 1}, {char, Char}, {options, Options}] = char_load(User#users.folder, User#users.charnumber), - [{name, _}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = proplists:get_value([Quest, MapType, MapNumber], ?MAPS, + [{name, AreaName}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = proplists:get_value([Quest, MapType, MapNumber], ?MAPS, [{name, "dammy"}, {quest, "data/lobby/colony.quest.nbl"}, {zone, "data/lobby/colony.zone.nbl"}, {entries, []}]), try % broadcast spawn to other people @@ -242,7 +242,8 @@ lobby_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> egs_proto:send_zone_init(CSocket, GID, lobby), egs_proto:send_zone(CSocket, ZoneFile), egs_proto:send_map(CSocket, Quest, MapType, MapNumber, MapEntry), - % 100e 020c + egs_proto:send_location(CSocket, GID, Quest, MapType, MapNumber, AreaName), + % 020c egs_proto:send_load_quest(CSocket, GID), send_packet_201(CSocket, GID, User, Char), send_packet_0a06(CSocket, GID), @@ -264,7 +265,7 @@ mission_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> User = OldUser#users{quest=Quest, maptype=MapType, mapnumber=MapNumber, mapentry=MapEntry}, egs_db:users_insert(User), [{status, 1}, {char, Char}, {options, _}] = char_load(User#users.folder, User#users.charnumber), - [{name, _}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = proplists:get_value([Quest, MapType, MapNumber], ?MAPS), + [{name, AreaName}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = proplists:get_value([Quest, MapType, MapNumber], ?MAPS), try % 0c00 egs_proto:send_quest(CSocket, QuestFile), @@ -272,7 +273,8 @@ mission_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> egs_proto:send_zone_init(CSocket, GID, mission), egs_proto:send_zone(CSocket, ZoneFile), egs_proto:send_map(CSocket, Quest, MapType, MapNumber, MapEntry), - % 100e 0215 0215 + egs_proto:send_location(CSocket, GID, Quest, MapType, MapNumber, AreaName), + % 0215 0215 egs_proto:send_trial_start(CSocket, GID), % 020c @@ -347,7 +349,7 @@ spaceport_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> User = OldUser#users{quest=Quest, maptype=MapType, mapnumber=MapNumber, mapentry=MapEntry}, egs_db:users_insert(User), [{status, 1}, {char, Char}, {options, _}] = char_load(User#users.folder, User#users.charnumber), - [{name, _}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = proplists:get_value([Quest, MapType, MapNumber], ?MAPS), + [{name, AreaName}, {quest, QuestFile}, {zone, ZoneFile}, {entries, _}] = proplists:get_value([Quest, MapType, MapNumber], ?MAPS), try % 0c00 egs_proto:send_quest(CSocket, QuestFile), @@ -355,7 +357,8 @@ spaceport_load(CSocket, GID, Quest, MapType, MapNumber, MapEntry) -> egs_proto:send_zone_init(CSocket, GID, spaceport), egs_proto:send_zone(CSocket, ZoneFile), egs_proto:send_map(CSocket, Quest, MapType, MapNumber, MapEntry), - % 100e 020c + egs_proto:send_location(CSocket, GID, Quest, MapType, MapNumber, AreaName), + % 020c send_packet_201(CSocket, GID, User, Char), % 0a06 egs_proto:send_loading_end(CSocket, GID),