diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/jobs/1-1e/gunslinger.txt | 9 | ||||
| -rw-r--r-- | npc/mobs/fields/morocc.txt | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt index 79f65b120..7d6b0a070 100644 --- a/npc/jobs/1-1e/gunslinger.txt +++ b/npc/jobs/1-1e/gunslinger.txt @@ -7,7 +7,7 @@ //= DON'T REMOVE THIS! (by request of him, he provided all //= the info regarding the quests and shops.) //===== Current Version: ===================================== -//= 2.1b +//= 2.1c //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -28,6 +28,7 @@ //= 2.1 Wise Bull Horn now deletes all items. Thanks to yyCC. [L0ne_W0lf] //= 2.1a Corrected a Typo error ";;". [Samuray22] //= 2.1b Corrected some typos errors. (bugreport:1549) [Samuray22] +//= 2.1c Fixed some missing/messed up item checks. (bugreport:2693) [Kisuka] //============================================================ que_ng,152,167,3 script Master Miller 901,{ @@ -301,7 +302,7 @@ payon,184,65,3 script The Wise Bull Horn 866,{ close; case 2: - if ((countitem(935) < 10) || (countitem(949) < 3) || (countitem(1019) < 1) || (countitem(912) < 3) || (countitem(511) < 3)) + if ((countitem(1013) < 3) || (countitem(935) < 10) || (countitem(949) < 3) || (countitem(1019) < 1) || (countitem(912) < 3) || (countitem(511) < 3)) { mes "["+ strcharinfo(0) +"]"; mes "-I'll need-"; @@ -320,7 +321,7 @@ payon,184,65,3 script The Wise Bull Horn 866,{ delitem 1019,1; delitem 912,3; delitem 511,3; - delitem 1013,3; //Colorful_Shell + delitem 1013,3; set GUNS_Q,3; close; @@ -378,7 +379,7 @@ payon,184,65,3 script The Wise Bull Horn 866,{ close; case 4: - if (countitem(519) < 0) + if (countitem(519) < 1) { mes "["+ strcharinfo(0) +"]"; mes "-Let's get a glass of Milk-"; diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt index f33d40d9d..a866a5dd2 100644 --- a/npc/mobs/fields/morocc.txt +++ b/npc/mobs/fields/morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= @@ -11,6 +11,7 @@ //= 1.2 More accurate spawns [Playtester] //= 1.3 Added Morroc field 20, 21, and 22 spawns, as [L0ne_W0lf] //= 1.4 Updated spawns to reflect episode 12.1. [L0ne_W0lf] +//= 1.5 Fixed Pheeroni spawn location. [Kisuka] //============================================================ //================================================== @@ -176,7 +177,6 @@ moc_fild13,0,0,0,0 monster Boa 1025,30,0,0,0 moc_fild13,0,0,0,0 monster Side Winder 1037,5,0,0,0 moc_fild13,0,0,0,0 monster Poporing 1031,20,0,0,0 moc_fild13,0,0,0,0 monster Drops 1113,10,0,0,0 -moc_fild13,0,0,0,0 monster Phreeoni 1159,1,7200000,3600000,1 moc_fild13,280,99,0,0 monster Red Mushroom 1085,1,180000,90000,1 moc_fild13,264,64,0,0 monster Red Mushroom 1085,1,180000,90000,1 moc_fild13,305,91,0,0 monster Red Mushroom 1085,1,180000,90000,1 @@ -256,6 +256,7 @@ moc_fild17,0,0,0,0 monster Magnolia 1138,15,0,0,0 moc_fild17,0,0,0,0 monster Frilldora 1119,25,0,0,0 moc_fild17,0,0,0,0 monster Ant Egg 1097,10,0,0,0 moc_fild17,0,0,0,0 monster Scorpion 1001,5,0,0,0 +moc_fild17,0,0,0,0 monster Phreeoni 1159,1,7200000,3600000,1 moc_fild17,40,258,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild17,144,151,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild17,243,138,0,0 monster Yellow Plant 1081,1,180000,90000,1 |