- updated (more or less) the sql-files/item_db2.sql file.

- Some insignificant cleanups.


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

4 files changed, 15 insertions, 18 deletions

diff --git a/db/item_db2.txt b/db/item_db2.txt
index ca0510b0d..721832c8a 100644
--- a/db/item_db2.txt
+++ b/db/item_db2.txt
@@ -9,4 +9,3 @@
 //7951,Token_Bag,Token Bag,3,,10,10,,,,,,,,,,,,,{},{},{}

 //1998,Jeramiah's_Jur,Jeramiah's Jur,3,,10,10,,,,,,,,,,,,,{},{},{}

 //1999,Zed's_Staff,Zed's Staff,3,,10,10,,,,,,,,,,,,,{},{},{}

-                                 
\ No newline at end of file
diff --git a/sql-files/item_db2.sql b/sql-files/item_db2.sql
index 5eeba132c..3beca7310 100755
--- a/sql-files/item_db2.sql
+++ b/sql-files/item_db2.sql
@@ -1,6 +1,6 @@
---

--- Table structure for table `item_db2`

---

+#

+# Table structure for table `item_db2`

+#

 

 DROP TABLE IF EXISTS `item_db2`;

 CREATE TABLE `item_db2` (

@@ -29,12 +29,14 @@ CREATE TABLE `item_db2` (
   PRIMARY KEY  (`id`)

 ) TYPE=MyISAM;

 

--- ID,'Name','Name','Type','Price','Sell','Weight','ATK','DEF','Range','Slot','Job','Upper','Gender','Loc','wLV','eLV','Refineable','View',' Script ','OnEquip_Script','OnUnequip_Script');

--- =============================================================

--- THQ Quest Items

--- =============================================================

-REPLACE INTO `item_db2` VALUES (7950,'THG_Membership','THG Membership',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

-REPLACE INTO `item_db2` VALUES (7951,'Token_Bag','Token Bag',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

-REPLACE INTO `item_db2` VALUES (1998,'Jeramiah\'s_Jur','Jeramiah\'s Jur',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

-REPLACE INTO `item_db2` VALUES (1999,'Zed\'s_Staff','Zed\'s Staff',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

-

+# // Items Additional Database - Custom Items go here

+# //

+# // Structure of Database:

+# // ID,Name,Name,Type,Price,Sell,Weight,ATK,DEF,Range,Slot,Job,Upper,Gender,Loc,wLV,eLV,Refineable,View,{ Script },{ OnEquip_Script },{ OnUnequip_Script }

+# //

+# // THQ Quest Items

+# //=============================================================

+# REPLACE INTO `item_db2` VALUES (7950,'THG_Membership','THG Membership',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

+# REPLACE INTO `item_db2` VALUES (7951,'Token_Bag','Token Bag',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

+# REPLACE INTO `item_db2` VALUES (1998,'Jeramiah\'s_Jur','Jeramiah\'s Jur',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

+# REPLACE INTO `item_db2` VALUES (1999,'Zed\'s_Staff','Zed\'s Staff',3,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 4e372d633..28b096a0f 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9505,9 +9505,7 @@ atcommand_charkillableid(
   			clif_displaymessage(fd, msg_txt(290));

    }

    else

-   {

       clif_displaymessage(fd,msg_txt(3));

-   }

    //printf("Session_id = %d, cid = %d\n",session_id,cid);

    return 0;

 }

@@ -9546,9 +9544,7 @@ atcommand_charkillableid2(
         clif_displaymessage(fd, msg_txt(290));

    }

    else

-   {

       clif_displaymessage(fd,msg_txt(3));

-   }

    //printf("Session_id = %d, aid = %d\n",session_id,aid);

    return 0;

 }

diff --git a/src/map/script.c b/src/map/script.c
index 79cdb517a..8408e8546 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5299,7 +5299,7 @@ int buildin_getnameditem(struct script_state *st)
 	item_tmp.nameid=nameid;
 	item_tmp.amount=1;
 	item_tmp.identify=1;
-	item_tmp.card[0]=254; //we don't use 255! because for example SIGNED WEAPON shouldn't get TOP10 BS Fame bonus [Lupus]
+	item_tmp.card[0]=CARD0_CREATE; //we don't use 255! because for example SIGNED WEAPON shouldn't get TOP10 BS Fame bonus [Lupus]
 	item_tmp.card[2]=tsd->status.char_id;
 	item_tmp.card[3]=tsd->status.char_id >> 16;
 	if(pc_additem(sd,&item_tmp,1)) {