summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-29 18:45:41 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-29 18:45:41 +0000
commit44bcfd5a90d1ce0d279f951054a2c7cf464436d7 (patch)
tree50cf42dd533c7b49c2a6650812e4d351e709d945
parent641f0c27624a0d9c6ebfd4280824bf7f594f868c (diff)
downloadhercules-44bcfd5a90d1ce0d279f951054a2c7cf464436d7.tar.gz
hercules-44bcfd5a90d1ce0d279f951054a2c7cf464436d7.tar.bz2
hercules-44bcfd5a90d1ce0d279f951054a2c7cf464436d7.tar.xz
hercules-44bcfd5a90d1ce0d279f951054a2c7cf464436d7.zip
WTF was I doing?
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9595 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--npc/warps/cities/prontera.txt8
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/skill.c4
4 files changed, 7 insertions, 10 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cbb022e92..7d3efc38c 100644
--- a/Changelog-Trunk.txt
+++ b/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.
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index d3ef1aa6b..5d780bbe2 100644
--- a/npc/warps/cities/prontera.txt
+++ b/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
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 83e816cc1..a621c8dfd 100644
--- a/src/map/atcommand.c
+++ b/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;
diff --git a/src/map/skill.c b/src/map/skill.c
index d66c1ab67..0655990c8 100644
--- a/src/map/skill.c
+++ b/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;
}