- Firepillar's damage per hit is now 100% MATK (rather than 20%) when the skill level is above 10.

- Sorted out the item_data structure, getiteminfo should work correctly now.


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

4 files changed, 12 insertions, 7 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 4f81b16c9..090859844 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/05/15

+	* Firepillar's damage per hit is now 100% MATK (rather than 20%) when the

+	  skill level is above 10. [Skotlex]

+	* Sorted out the item_data structure, getiteminfo should work correctly

+	  now. [Skotlex]

 	* KA* skills can now be casted on other Soul Linkers as well without the

 	  Spirit requirement. [Skotlex]

 	* Soul Drain will now show the SP drained regardless of drain display

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 333565582..e50adda07 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4889,7 +4889,7 @@ and return the info set by TYPE argument.
 It will return -1 if there is no such item.

 

 Valid types are:

-	0 - Buy Price; 1 - Sell Price; 2 - Item Type; 3 - Allowed Classes;

+	0 - Buy Price; 1 - Sell Price; 2 - Item Type;

 	3 - maxchance (Max drop chance of this item e.g. 1 = 0.01% , etc..

 		if = 0, then monsters don't drop it at all (rare or a quest item)

 		if = 10000, then this item is sold in NPC shops only

diff --git a/src/map/battle.c b/src/map/battle.c
index bbbd75f82..5df3bdc0b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2530,7 +2530,8 @@ struct Damage battle_calc_magic_attack(
 						skillratio += (100+skill_lv*10)*2/3-100;

 						break;

 					case WZ_FIREPILLAR:

-						skillratio -= 80;

+						if (skill_lv <= 10)

+							skillratio -= 80;

 						break;

 					case WZ_SIGHTRASHER:

 						skillratio += 20*skill_lv;

diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 6e977766c..35ca82972 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -12,15 +12,11 @@ struct item_data {
 	char name[ITEM_NAME_LENGTH],jname[ITEM_NAME_LENGTH];

 	char prefix[NAME_LENGTH],suffix[NAME_LENGTH];

 	char cardillustname[64];

+	//Do not add stuff between value_buy and wlv (see how getiteminfo works)

 	int value_buy;

 	int value_sell;

 	int type;

 	int maxchance; //For logs, for external game info, for scripts: Max drop chance of this item (e.g. 0.01% , etc.. if it = 0, then monsters don't drop it) [Lupus]

-	struct {

-		unsigned short chance;

-		int id;

-	} mob[MAX_SEARCH]; //Holds the mobs that have the highest drop rate for this item. [Skotlex]

-

 	int sex;

 	int equip;

 	int weight;

@@ -35,6 +31,10 @@ struct item_data {
 //		some script commands should be revised as well...

 	unsigned int class_base[3];	//Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)

 	unsigned class_upper : 3; //Specifies if the upper-type can equip it (1: normal, 2: upper, 3: baby)

+	struct {

+		unsigned short chance;

+		int id;

+	} mob[MAX_SEARCH]; //Holds the mobs that have the highest drop rate for this item. [Skotlex]

 	unsigned char *script;	//Default script for everything.

 	unsigned char *equip_script;	//Script executed once when equipping.

 	unsigned char *unequip_script;//Script executed once when unequipping.