From def5e240def548bdd4fa6e3ba424d03c883b5bc1 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 10 Apr 2008 03:36:33 +0000 Subject: Some preliminary code for the questlog system (clif packet functions and basic data structures). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12544 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 + src/common/mmo.h | 24 ++++++++++ src/map/clif.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/map/clif.h | 3 ++ src/map/pc.h | 5 +++ 5 files changed, 159 insertions(+) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 739e349a7..7cc87b6ac 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/04/09 + * Clif functions and basic data structures for questlog system. (r12544) [Kevin] 2008/04/08 * Fixed party invitation ack messages not displaying (bugreport:1308) * Modified PACKETVER for recent clients to use a YYYYMMDD date format diff --git a/src/common/mmo.h b/src/common/mmo.h index d246fd02c..9a8da3fad 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -50,6 +50,8 @@ #define MAX_GUILDCASTLE 34 // Updated to include new entries for WoE:SE. [L0ne_W0lf] #define MAX_GUILDLEVEL 50 #define MAX_GUARDIANS 46 //Local max per castle. [Skotlex] +#define MAX_QUEST 25 //Max quests for a PC +#define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest #define MIN_HAIR_STYLE battle_config.min_hair_style #define MAX_HAIR_STYLE battle_config.max_hair_style @@ -123,6 +125,27 @@ enum item_types { IT_MAX }; + +//Questlog system [Kevin] +typedef enum quest_state { Q_NONE, Q_ACTIVE, Q_INACTIVE } quest_state; + +struct quest_objective { + + char * name; + int count; + +}; + +struct quest { + + int quest_id; + quest_state state; + int num_objectives; + int time; + struct quest_objective objectives[MAX_QUEST_OBJECTIVES]; + +}; + struct item { int id; short nameid; @@ -248,6 +271,7 @@ struct mmo_charstatus { struct point last_point,save_point,memo_point[MAX_MEMOPOINTS]; struct item inventory[MAX_INVENTORY],cart[MAX_CART]; struct skill skill[MAX_SKILL]; + struct quest quest_log[MAX_QUEST]; struct s_friend friends[MAX_FRIENDS]; //New friend system [Skotlex] #ifdef HOTKEY_SAVING diff --git a/src/map/clif.c b/src/map/clif.c index 80edb3952..21d246cfa 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7968,6 +7968,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) mail_clear(sd); #endif + //Send quest log [Kevin] + clif_send_questlog(sd); + if(map[sd->bl.m].flag.loadevent) // Lance npc_script_event(sd, NPCE_LOADMAP); @@ -12132,6 +12135,128 @@ void clif_parse_EquipTick(int fd, struct map_session_data* sd) clif_equiptickack(sd, flag); } +/*========================================== + * Questlog System [Kevin] + * 02B5 .W .L { }.10B* <-- UNKOWN PACKET + * 02B7 .L .B + *------------------------------------------*/ + +void clif_parse_questStateAck(int fd, struct map_session_data * sd) +{ + +} + +//Send simple list of quests upon login +//* 02B1 .W .L { .L .B }.5B* +void clif_send_questlog(struct map_session_data * sd) +{ + int fd = sd->fd; + int i; + + WFIFOHEAD(fd,sd->num_quests*5+8); + WFIFOW(fd, 0) = 0x02B1; + WFIFOW(fd, 2) = sd->num_quests*5+8; + + for(i=0; iquest_log[i].quest_id) + continue; + + + WFIFOL(fd, i*5+8) = sd->quest_log[i].quest_id; + WFIFOB(fd, i*5+12) = sd->quest_log[i].state; + + } + + WFIFOSET(fd, WFIFOW(fd, 2)); + +} + +//Send objective info on login +//* 02B2 .W .L { .L .L