- Increased max number of tries to find a random spot in maps to 1000 since some maps have so many non-walkable tiles it's hard to find one in just 100 tries.

- Reduced Stun duration of multiple skills to 3 secs. Skills affected: Meteor Storm, Land Mine, Bash (fatal blow), Throw Stone, NPC_LICK, Raid, shield Charge, Cart Termination.
- status_set_viewdata will remove the Wedding Option status when you set a class that is not wedding. 
- Removed the Job_Novice range check in pcdb_checkid since it's causing warnings when checking versus vd->class_ (and when will we use a negative value class anyway?)


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

4 files changed, 6 insertions, 6 deletions

diff --git a/src/map/map.c b/src/map/map.c
index 4b1ab4dc5..41aa35d7e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1478,7 +1478,7 @@ int map_search_freecell(struct block_list *src, int m, short *x,short *y, int rx
 		tries = rx2*ry2;
 		if (tries > 100) tries = 100;
 	} else
-		tries = 100;
+		tries = 1000; //Must retry a lot for maps with many non-walkable tiles.
 	
 	while(tries--) {
 		*x = (rx >= 0)?(rand()%rx2-rx+bx):(rand()%(map[m].xs-2)+1);
diff --git a/src/map/pc.h b/src/map/pc.h
index 9513bd176..6cf8ca0b2 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -61,7 +61,7 @@ enum {
 #define pc_stop_walking(sd, type) { if (sd->ud.walktimer!=-1) unit_stop_walking(&sd->bl, type); }

 

 //Checks if the given class value corresponds to a player class. [Skotlex]

-#define pcdb_checkid(class_) ((class_ >= JOB_NOVICE && class_ <= JOB_XMAS) || (class_ >= JOB_NOVICE_HIGH && class_ <= JOB_SOUL_LINKER))

+#define pcdb_checkid(class_) (class_ <= JOB_XMAS || (class_ >= JOB_NOVICE_HIGH && class_ <= JOB_SOUL_LINKER))

 

 int pc_isGM(struct map_session_data *sd);

 int pc_iskiller(struct map_session_data *src, struct map_session_data *target); // [MouseJstr]

diff --git a/src/map/skill.c b/src/map/skill.c
index 9a49196ec..3d2fa7d9f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1101,7 +1101,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 		break;

 

 	case TF_THROWSTONE:		/* ?ﾎ投げ */

-		sc_start(bl,SC_STUN,3,skilllv,skill_get_time2(skillid,skilllv));

+		sc_start(bl,SC_STUN,3,skilllv,skill_get_time(skillid,skilllv));

 		sc_start(bl,SC_BLIND,3,skilllv,skill_get_time2(skillid,skilllv));

 		break;

 

@@ -1139,7 +1139,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 		break;

 

 	case RG_RAID:		/* サプライズアタック */

-		sc_start(bl,SC_STUN,(10+3*skilllv),skilllv,skill_get_time2(skillid,skilllv));

+		sc_start(bl,SC_STUN,(10+3*skilllv),skilllv,skill_get_time(skillid,skilllv));

 		sc_start(bl,SC_BLIND,(10+3*skilllv),skilllv,skill_get_time2(skillid,skilllv));

 		break;

 

diff --git a/src/map/status.c b/src/map/status.c
index 18d10bd0a..74b7422d7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3355,10 +3355,10 @@ void status_set_viewdata(struct block_list *bl, int class_)
 					class_ = JOB_BABY_CRUSADER2;

 					break;

 				}

-				if (sd->vd.class_ == JOB_WEDDING)

-					sd->sc.option&=~OPTION_WEDDING;

 				if (class_ == JOB_WEDDING)

 					sd->sc.option|=OPTION_WEDDING;

+				else if (sd->sc.option&OPTION_WEDDING)

+					sd->sc.option&=~OPTION_WEDDING; //If not going to display it, then remove the option.

 				sd->vd.class_ = class_;

 				clif_get_weapon_view(sd, &sd->vd.weapon, &sd->vd.shield);

 				sd->vd.head_top = sd->status.head_top;