summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-02 00:16:20 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-02 00:16:20 +0000
commit902ec73b47ca5a0521686be1e1fa2f08c075177d (patch)
tree65d40f8be2468f4d93b816c8d3066fb1e33d2b0a /npc
parent83525765407b5e43517dff05c06828cf5a55d4d8 (diff)
downloadhercules-902ec73b47ca5a0521686be1e1fa2f08c075177d.tar.gz
hercules-902ec73b47ca5a0521686be1e1fa2f08c075177d.tar.bz2
hercules-902ec73b47ca5a0521686be1e1fa2f08c075177d.tar.xz
hercules-902ec73b47ca5a0521686be1e1fa2f08c075177d.zip
- bugreport:2719 , bugreport:1963 , bugreport:2878 .
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15350 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/sign_your_items.txt8
-rw-r--r--npc/mobs/fields/prontera.txt2
-rw-r--r--npc/other/hugel_bingo.txt1
3 files changed, 10 insertions, 1 deletions
diff --git a/npc/custom/sign_your_items.txt b/npc/custom/sign_your_items.txt
index 769e62866..99ea97b70 100644
--- a/npc/custom/sign_your_items.txt
+++ b/npc/custom/sign_your_items.txt
@@ -173,6 +173,14 @@ L_CHECK2:
emotion e_sry;
goto M_MENU;
}
+ getinventorylist;
+ for (set .@i,0; .@i < @inventorylist_count; set .@i,.@i+1){
+ if(@inventorylist_expire[.@i] != 0) {
+ mes "Sorry, I don't sign rental items!";
+ emotion e_hmm;
+ goto M_MENU;
+ }
+ }
if(@ref)mes "It has been refined "+@ref+" times... Adding ^FF00005000z^000000 per time.";
mes "Give me ^0000803 gray Gift Boxes^000000";
diff --git a/npc/mobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt
index 23eee3625..c2c2d7852 100644
--- a/npc/mobs/fields/prontera.txt
+++ b/npc/mobs/fields/prontera.txt
@@ -77,7 +77,7 @@ prt_fild05,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1
prt_fild06,0,0,0,0 monster Fabre 1007,140,5000,0,0
prt_fild06,0,0,0,0 monster Poring 1002,30,5000,0,0
prt_fild06,0,0,0,0 monster Lunatic 1063,30,5000,0,0
-prt_fild06,222,30,40,10 monster Green Plant 1080,15,900000,450000,1
+//prt_fild06,222,30,40,10 monster Green Plant 1080,15,900000,450000,1 // Commented the Line since those Plants can't spawn anyway. Maybe Gravity will fix it someday... [Masao]
//==================================================
// prt_fild07 - Prontera Field
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index fa17d5fa7..acd5bad75 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -877,6 +877,7 @@ OnTimer5000:
disablenpc "end1e#bingo";
set $hu_bingoa,0;
donpcevent "Bingo Waiting Room::OnStart";
+ areawarp "que_bingo",69,108,30,135,"hugel",59,207;
end;
}