- Updated cast times of Kaupe and Kaahi.

- Some small code cleanups.
- Sma has cast-dex reducable now.


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

8 files changed, 7 insertions, 11 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index db2f82b73..d23518ed7 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -27,6 +27,8 @@
 

 =========================

 05/12

+	* Updated cast times of Kaupe and Kaahi. [Skotlex]

+	* SMA has dex reducable casttime now. [Skotlex]

 	* Updating drops to Aegis X.2 [Playtester]

 	- progress 35%

 05/11

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index b7d116966..5bfef5c23 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -743,9 +743,9 @@
 //-- SL_KAIZEL

 462,4500:4000:3500:3000:2500:2000:1500,0,0,1800000,2000

 //-- SL_KAAHI

-463,0,0,0,1800000,500

+463,0,500,0,1800000,500

 //-- SL_KAUPE

-464,500,0,0,600000,0

+464,500,500,0,600000,0

 //-- SL_KAITE

 465,6000:5500:5000:4500:4000:3500:3000,0,0,60000:120000:180000:240000:300000:360000:600000,0

 //-- SL_STIN

diff --git a/db/skill_castnodex_db.txt b/db/skill_castnodex_db.txt
index f4d7f6964..d8d2bc590 100644
--- a/db/skill_castnodex_db.txt
+++ b/db/skill_castnodex_db.txt
@@ -20,7 +20,6 @@
 462,1 //SL_KAIZEL

 467,1 //SL_STIN

 468,1 //SL_STUN

-469,1 //SL_SMA

 1014,1	//PR_REDEMPTIO

 10010,3	//GD_BATTLEORDER

 10011,3	//GD_REGENERATION

diff --git a/src/map/battle.c b/src/map/battle.c
index e3f479e2f..bbbd75f82 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3871,7 +3871,6 @@ static const struct battle_data_short {
 	{ "sg_miracle_skill_ratio",				&battle_config.sg_miracle_skill_ratio },

 	{ "autospell_stacking", 				&battle_config.autospell_stacking },

 	{ "override_mob_names", 				&battle_config.override_mob_names },

-

 };

 

 static const struct battle_data_int {

diff --git a/src/map/clif.c b/src/map/clif.c
index 75f374abf..bb7ba3287 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5830,7 +5830,7 @@ int clif_party_join_info(struct party *p, struct map_session_data *sd)
 	WBUFL(buf,6)= 0; //Apparently setting this to 1 makes you adoptable.

 	WBUFW(buf,10)=sd->bl.x;

 	WBUFW(buf,12)=sd->bl.y;

-	WBUFB(buf,14)=0; //Uncomfirmed byte.

+	WBUFB(buf,14)=0; //Unconfirmed byte.

 	memcpy(WBUFP(buf,15), p->name, NAME_LENGTH);

 	memcpy(WBUFP(buf,39), sd->status.name, NAME_LENGTH);

 	memcpy(WBUFP(buf,63), mapindex_id2name(sd->mapindex), MAP_NAME_LENGTH);

diff --git a/src/map/mob.c b/src/map/mob.c
index ca0690049..d6f68afac 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1952,9 +1952,8 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
 				drop_rate = (int)(drop_rate*1.25); // pk_mode increase drops if 20 level difference [Valaris]

 

 //			if (10000 < rand()%10000+drop_rate) { //May be better if MAX_RAND is too low?

-			if (drop_rate < rand() % 10000 + 1) { //fixed 0.01% impossible drops bug [Lupus]

+			if (drop_rate < rand() % 10000 + 1) //fixed 0.01% impossible drops bug [Lupus]

 				continue;

-			}

 

 			ditem = mob_setdropitem(md->db->dropitem[i].nameid, 1);

 

@@ -3289,7 +3288,7 @@ static int mob_readdb(void)
 			}

 

 			if (mob_db_data[class_]->max_hp <= 0) {

-				ShowWarning ("Mob %d (%s) has no HP, using poring data for it\n", class_, mob_db_data[class_]->name);

+				ShowWarning ("Mob %d (%s) has no HP, using poring data for it\n", class_, mob_db_data[class_]->sprite);

 				mob_makedummymobdb(class_);

 			}

 		}

diff --git a/src/map/script.c b/src/map/script.c
index dc7fa0153..19fd7a50d 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7988,7 +7988,6 @@ int buildin_petloot(struct script_state *st)
 		pd->loot = (struct pet_loot *)aMalloc(sizeof(struct pet_loot));

 

 	pd->loot->item = (struct item *)aCalloc(max,sizeof(struct item));

-	//memset(pd->loot->item,0,max * sizeof(struct item));

 	

 	pd->loot->max=max;

 	pd->loot->count = 0;

diff --git a/src/map/skill.c b/src/map/skill.c
index 45bf21ecf..5d00a0617 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1731,7 +1731,6 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 	lv=(flag>>20)&0xf;

 	dmg=battle_calc_attack(attack_type,src,bl,skillid,skilllv,flag&0xff );

 

-

 	//Skotlex: Adjusted to the new system

 	if(src->type==BL_PET && (struct pet_data *)src)

 	{ // [Valaris]

@@ -6446,7 +6445,6 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid,
 		break;

 	}

 

-	

 	nullpo_retr(NULL, group=skill_initunitgroup(src,(count > 0 ? count : layout->count),

 		skillid,skilllv,skill_get_unit_id(skillid,flag&1), limit, interval));

 	group->val1=val1;