- Modified and simplified the random item group format. It now is <GroupID>,<ItemID>,<Rate>, where Rate normally is 1, greater numbers is the equivalent of adding the line multiple times.

- Added constants to identify all groups to db/const.txt
- Cleaned up and updated item_db to use these new constants (warning: item_db.sql needs to be updated!)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6275 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 87 insertions, 179 deletions

diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 5f5c21c16..cdb724ef3 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -15,18 +15,12 @@
 #include "script.h"

 #include "pc.h"

 

-#define MAX_RANDITEM	10000

-#define MAX_ITEMGROUP	32

 // ** ITEMDB_OVERRIDE_NAME_VERBOSE **

 //   定義すると、itemdb.txtとgrfで名前が異なる場合、表示します.

 //#define ITEMDB_OVERRIDE_NAME_VERBOSE	1

 

 static struct dbt* item_db;

 

-static struct random_item_data blue_box[MAX_RANDITEM], violet_box[MAX_RANDITEM], card_album[MAX_RANDITEM], gift_box[MAX_RANDITEM], scroll[MAX_RANDITEM], finding_ore[MAX_RANDITEM], cookie_bag[MAX_RANDITEM];

-static int blue_box_count=0, violet_box_count=0, card_album_count=0, gift_box_count=0, scroll_count=0, finding_ore_count = 0, cookie_bag_count=0;

-static int blue_box_default=0, violet_box_default=0, card_album_default=0, gift_box_default=0, scroll_default=0, finding_ore_default = 0, cookie_bag_default=0;

-

 static struct item_group itemgroup_db[MAX_ITEMGROUP];

 

 struct item_data *dummy_item=NULL; //This is the default dummy item used for non-existant items. [Skotlex]

@@ -102,56 +96,19 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str)
  * 箱系アイテム検索

  *------------------------------------------

  */

-int itemdb_searchrandomid(int flags)

+int itemdb_searchrandomid(int group)

 {

-	int nameid=0,i,index,count;

-	struct random_item_data *list=NULL;

-

-	static struct {

-		int nameid,count;

-		struct random_item_data *list;

-	} data[8];

-

-	if (flags == 0) { //Initialize.

-		memset(data, 0, sizeof(data));

-		data[1].nameid = blue_box_default;

-	  	data[1].count = blue_box_count;

-	  	data[1].list = blue_box;

-		data[2].nameid = violet_box_default;

-	  	data[2].count = violet_box_count;

-	  	data[2].list = violet_box;

-		data[3].nameid = card_album_default;

-	  	data[3].count = card_album_count;

-	  	data[3].list = card_album;

-		data[4].nameid = gift_box_default;

-	  	data[4].count = gift_box_count;

-	  	data[4].list = gift_box;

-		data[5].nameid = scroll_default;

-	  	data[5].count = scroll_count;

-		data[5].list = scroll;

-		data[6].nameid = finding_ore_default;

-		data[6].count = finding_ore_count;

-		data[6].list = finding_ore;

-		data[7].nameid = cookie_bag_default;

-		data[7].count = cookie_bag_count;

-		data[7].list = cookie_bag;

-	}

-	if(flags>=1 && flags<=7){

-		nameid=data[flags].nameid;

-		count=data[flags].count;

-		list=data[flags].list;

-

-		if(count > 0) {

-			for(i=0;i<1000;i++) {

-				index = rand()%count;

-				if(rand()%1000000 < list[index].per) {

-					nameid = list[index].nameid;

-					break;

-				}

-			}

-		}

+	if(group<1 || group>=MAX_ITEMGROUP) {

+		if (battle_config.error_log)

+			ShowError("itemdb_searchrandomid: Invalid group id %d\n", group);

+		return 512; //Return apple?

 	}

-	return nameid;

+	if (itemgroup_db[group].qty)

+		return itemgroup_db[group].nameid[rand()%itemgroup_db[group].qty];

+	

+	if (battle_config.error_log)

+		ShowError("itemdb_searchrandomid: No item entries for group id %d\n", group);

+	return 512;

 }

 

 /*==========================================

@@ -162,21 +119,13 @@ int itemdb_group (int nameid)
 {

 	int i, j;

 	for (i=0; i < MAX_ITEMGROUP; i++) {

-		for (j=0; j < itemgroup_db[i].qty && itemgroup_db[i].id[j]; j++) {

+		for (j=0; j < itemgroup_db[i].qty; j++) {

 			if (itemgroup_db[i].id[j] == nameid)

 				return i;

 		}

 	}

 	return -1;

 }

-int itemdb_searchrandomgroup (int groupid)

-{

-	if (groupid < 0 || groupid >= MAX_ITEMGROUP ||

-		itemgroup_db[groupid].qty == 0 || itemgroup_db[groupid].id[0] == 0)

-		return 0;

-	

-	return itemgroup_db[groupid].id[ rand()%itemgroup_db[groupid].qty ];

-}

 

 /*==========================================

  * DBの存在確認

@@ -382,90 +331,6 @@ int itemdb_isequip3(int nameid)
 }

 

 /*==========================================

- * ランダムアイテム出現データの読み込み

- *------------------------------------------

- */

-static int itemdb_read_randomitem(void)

-{

-	FILE *fp;

-	char line[1024];

-	int nameid,i,j;

-	char *str[10],*p;

-

-	const struct {

-		char filename[64];

-		struct random_item_data *pdata;

-		int *pcount,*pdefault;

-	} data[] = {

-		{"item_bluebox.txt",		blue_box,	&blue_box_count, &blue_box_default		},

-		{"item_violetbox.txt",	violet_box,	&violet_box_count, &violet_box_default	},

-		{"item_cardalbum.txt",	card_album,	&card_album_count, &card_album_default	},

-		{"item_giftbox.txt",		gift_box,	&gift_box_count, &gift_box_default	},

-		{"item_scroll.txt",		scroll,		&scroll_count, &scroll_default	},

-		{"item_findingore.txt",	finding_ore,&finding_ore_count, &finding_ore_default	},

-		{"item_cookie_bag.txt",	cookie_bag,&cookie_bag_count, &cookie_bag_default	},

-	};

-

-	for(i=0;i<sizeof(data)/sizeof(data[0]);i++){

-		struct random_item_data *pd=data[i].pdata;

-		int *pc=data[i].pcount;

-		int *pdefault=data[i].pdefault;

-		char *fn=(char *) data[i].filename;

-

-		*pdefault = 0;

-		*pc = 0; //zero the count in case we are reloading. [Skotlex]

-		

-		sprintf(line, "%s/%s", db_path, fn);

-		if( (fp=fopen(line,"r"))==NULL ){

-			ShowError("can't read %s\n",line);

-			continue;

-		}

-

-		while(fgets(line,1020,fp)){

-			if(line[0]=='/' && line[1]=='/')

-				continue;

-			memset(str,0,sizeof(str));

-			for(j=0,p=line;j<3 && p;j++){

-				str[j]=p;

-				p=strchr(p,',');

-				if(p) *p++=0;

-			}

-

-			if(str[0]==NULL)

-				continue;

-

-			nameid=atoi(str[0]);

-			if(nameid<0 || nameid>=20000)

-				continue;

-			if(nameid == 0) {

-				if(str[2])

-					*pdefault = atoi(str[2]);

-				continue;

-			}

-

-			if(str[2]){

-				pd[ *pc   ].nameid = nameid;

-				pd[(*pc)++].per = atoi(str[2]);

-			}

-

-			if(*pc >= MAX_RANDITEM)

-			{

-				if (battle_config.error_log)

-					ShowWarning("Reached limit of random items [%d] in file [%s]\n", MAX_RANDITEM, data[i].filename);

-				break;

-			}

-		}

-		fclose(fp);

-		if (*pc > 0) {

-			ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",*pc,fn);

-		}

-	}

-

-	itemdb_searchrandomid(0); //Initialize values.

-	return 0;

-}

-

-/*==========================================

  * アイテム使用可能フラグのオーバーライド

  *------------------------------------------

  */

@@ -514,62 +379,106 @@ static int itemdb_read_itemavail (void)
  * read item group data

  *------------------------------------------

  */

-static int itemdb_read_itemgroup(void)

+static void itemdb_read_itemgroup_sub(const char* filename)

 {

 	FILE *fp;

 	char line[1024];

 	int ln=0;

-	int groupid,j,k;

-	char *str[31],*p;

-

-	sprintf(line, "%s/item_group_db.txt", db_path);

-	if( (fp=fopen(line,"r"))==NULL ){

+	int groupid,j,k,nameid;

+	char *str[3],*p;

+	char w1[1024], w2[1024];

+	

+	if( (fp=fopen(filename,"r"))==NULL ){

 		ShowError("can't read %s\n", line);

-		return -1;

+		return;

 	}

 

 	while(fgets(line,1020,fp)){

+		ln++;

 		if(line[0]=='/' && line[1]=='/')

 			continue;

+		if(strstr(line,"import")) {

+			if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) == 2 &&

+				strcmpi(w1, "import") == 0) {

+				itemdb_read_itemgroup_sub(w2);

+				continue;

+			}

+		}

 		memset(str,0,sizeof(str));

-		for(j=0,p=line;j<31 && p;j++){

+		for(j=0,p=line;j<3 && p;j++){

 			str[j]=p;

 			p=strchr(p,',');

 			if(p) *p++=0;

 		}

 		if(str[0]==NULL)

 			continue;

-

+		if (j<3)

+			continue;

 		groupid = atoi(str[0]);

-		if (groupid < 0 || groupid >= MAX_ITEMGROUP)

+		if (groupid < 0 || groupid >= MAX_ITEMGROUP) {

+			ShowWarning("itemdb_read_itemgroup: Invalid group %d in %s:%d\n", groupid, filename, ln);

 			continue;

-

-		for (j=1; j<=30; j++) {

-			if (!str[j])

-				break;

-			k=atoi(str[j]);

-			if (k < 0 || k >= 20000 || !itemdb_exists(k))

-				continue;

-			//printf ("%d[%d] = %d\n", groupid, j-1, k);

-			itemgroup_db[groupid].id[j-1] = k;

-			itemgroup_db[groupid].qty=j;

 		}

-		for (j=1; j<30; j++) { //Cleanup the contents. [Skotlex]

-			if (itemgroup_db[groupid].id[j-1] == 0 &&

-				itemgroup_db[groupid].id[j] != 0) 

-			{

-				itemgroup_db[groupid].id[j-1] = itemgroup_db[groupid].id[j];

-				itemgroup_db[groupid].id[j] = 0;

-				itemgroup_db[groupid].qty = j;

-			}

+		nameid = atoi(str[1]);

+		if (!itemdb_exists(nameid)) {

+			ShowWarning("itemdb_read_itemgroup: Non-existant item %d in %s:%d\n", nameid, filename, ln);

+			continue;

 		}

-		ln++;

+		k = atoi(str[2]);

+		if (itemgroup_db[groupid].qty+k > MAX_RANDITEM) {

+			ShowWarning("itemdb_read_itemgroup: Group %d is full (%d entries) in %s:%d\n", groupid, MAX_RANDITEM, filename, ln);

+			continue;

+		}

+		for(j=0;j<k;j++)

+			itemgroup_db[groupid].nameid[itemgroup_db[groupid].qty++] = nameid;

 	}

 	fclose(fp);

-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,"item_group_db.txt");

-	return 0;

+	return;

 }

 

+static void itemdb_read_itemgroup(void)

+{

+	char path[256];

+	int i;

+	const char* groups[] = {

+		"Blue Box",

+		"Violet Box",

+		"Card Album",

+		"Gift Box",

+		"Scroll Box",

+		"Finding Ore",

+		"Cookie Bag",

+		"Potion",

+		"Herbs",

+		"Fruits",

+		"Meat",

+		"Candy",

+		"Juice",

+		"Fish",

+		"Boxes",

+		"Gemstone",

+		"Jellopy",

+		"Ore",

+		"Food",

+		"Recovery",

+		"Minerals",

+		"Taming",

+		"Scrolls",

+		"Quivers",

+		"Masks",

+		"Accesory",

+		"Jewels",

+	};

+	memset(&itemgroup_db, 0, sizeof(itemgroup_db));

+	snprintf(path, 255, "%s/item_group_db.txt", db_path);

+	itemdb_read_itemgroup_sub(path);

+	ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","item_group_db.txt");

+	if (battle_config.etc_log) {

+		for (i = 1; i < MAX_ITEMGROUP; i++)

+			ShowInfo("Group %s: %d entries.\n", groups[i-1], itemgroup_db[i].qty);

+	}

+	return;

+}

 /*==========================================

  * アイテムの名前テーブルを読み込む

  *------------------------------------------

@@ -1188,7 +1097,6 @@ static void itemdb_read(void)
 		itemdb_readdb();

 

 	itemdb_read_itemgroup();

-	itemdb_read_randomitem();

 	itemdb_read_itemavail();

 	itemdb_read_noequip();

 	itemdb_read_itemtrade();