Browse Source

WTF was I doing?

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9595 54d463be-8e91-2dee-dedb-b68131a5f0ec
Lance 18 years ago
parent
commit
b319b03eba
4 changed files with 7 additions and 10 deletions
  1. 0 1
      Changelog-Trunk.txt
  2. 4 4
      npc/warps/cities/prontera.txt
  3. 2 2
      src/map/atcommand.c
  4. 1 3
      src/map/skill.c

+ 0 - 1
Changelog-Trunk.txt

@@ -6,7 +6,6 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2006/12/29
 	* Skill use is now cancelled when you use it while cloaking, and the
 	  uncloaking process warps you. [Skotlex]
-	* Small fix in TK_MISSION from 1/101 to 1/100 probability. (Valaris) [Lance]
 2006/12/28
 	* Reapplied Skotlex's socket.c changes from r9587 and r9582. :S
 	* Part 3 of TheUltraMage's socket cleanup.

+ 4 - 4
npc/warps/cities/prontera.txt

@@ -49,11 +49,11 @@ prt_in.gat,254,113,0	warp	prt16	3,2,prt_in.gat,256,134
 prt_in.gat,256,131,0	warp	prt16-1	2,2,prt_in.gat,254,110
 prt_in.gat,263,163,0	warp	prt17	1,3,prt_in.gat,276,163
 prt_in.gat,274,163,0	warp	prt17-1	1,3,prt_in.gat,261,163
-prt_in.gat,280,68,0	warp	w472	6,6,prontera.gat,147,287
-prt_in.gat,281,36,0	warp	w473	6,6,prontera.gat,147,287
-prt_in.gat,282,100,0	warp	w471	6,6,prontera.gat,147,287
+//prt_in.gat,280,68,0	warp	w472	6,6,prontera.gat,147,287
+//prt_in.gat,281,36,0	warp	w473	6,6,prontera.gat,147,287
+//prt_in.gat,282,100,0	warp	w471	6,6,prontera.gat,147,287
 prt_in.gat,282,179,0	warp	prt14	3,1,prontera.gat,87,91
-prt_in.gat,285,130,0	warp	w470	6,6,prontera.gat,147,287
+//prt_in.gat,285,130,0	warp	w470	6,6,prontera.gat,147,287
 prt_in.gat,37,65,0	warp	prt18	1,3,prt_in.gat,51,65
 prt_in.gat,47,29,0	warp	prt10-1	2,1,prontera.gat,46,67
 prt_in.gat,48,65,0	warp	prt18-1	1,3,prt_in.gat,34,65

+ 2 - 2
src/map/atcommand.c

@@ -1342,10 +1342,10 @@ int atcommand_rura(
 		return -1;
 	}
 
-	if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS)) {
+	/*if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS)) {
 		clif_displaymessage(fd, msg_txt(2));
 		x = y = 0; //Invalid cell, use random spot.
-	}
+	}*/
 	if (map[m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
 		clif_displaymessage(fd, msg_txt(247));
 		return -1;

+ 1 - 3
src/map/skill.c

@@ -3830,7 +3830,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 	case TK_MISSION:
 		if (sd) {
 			int id;
-			if (sd->mission_mobid && (sd->mission_count || rand()%99)) { //Cannot change target when already have one
+			if (sd->mission_mobid && (sd->mission_count || rand()%100)) { //Cannot change target when already have one
 				clif_mission_info(sd, sd->mission_mobid, sd->mission_count);
 				clif_skill_fail(sd,skillid,0,0);
 				break;
@@ -7834,8 +7834,6 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
 		sd->skillitem = sd->skillitemlv = 0;
 		//Need to do arrow state check.
 		sd->state.arrow_atk = skill_get_ammotype(skill)?1:0; 
-		//Need to do Spiritball check.
-		sd->spiritball_old = sd->spiritball;
 		return 1;
 	}