* Added warg checks to Falcon Renter, bugreport:6546 (merchants\renters.txt)

* Follow-up r16695, finished documentating.

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

3 files changed, 23 insertions, 3 deletions

diff --git a/db/pre-re/mob_skill_db.txt b/db/pre-re/mob_skill_db.txt
index ece83243f..d8370a17e 100644
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -49,7 +49,10 @@
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /
 //	    poison / curse / silence / confusion / blind / hiding / sight (unhidden)
 //
-// Note: if a negative MobID is provided, the skill will be treated as 'global' and added for all mobs.
+// Note: if a negative MobID is provided, the skill will be treated as 'global':
+//	-1: added for all boss types.
+//	-2: added for all normal types.
+//	-4: added for all mobs.
 
 1001,Scorpion@NPC_FIREATTACK,attack,186,1,2000,0,5000,yes,target,always,0,,,,,,,
 1001,Scorpion@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index c36c5c4a2..83e2b7b93 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -49,7 +49,10 @@
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /
 //	    poison / curse / silence / confusion / blind / hiding / sight (unhidden)
 //
-// Note: if a negative MobID is provided, the skill will be treated as 'global' and added for all mobs.
+// Note: if a negative MobID is provided, the skill will be treated as 'global':
+//	-1: added for all boss types.
+//	-2: added for all normal types.
+//	-4: added for all mobs.
 
 1001,Scorpion@NPC_FIREATTACK,attack,186,1,2000,0,5000,yes,target,always,0,,,,,,,
 1001,Scorpion@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index 0b7cafdd4..922aa088d 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88, mod by Lupus
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -23,6 +23,7 @@
 //= 1.9 Enabled Gryphon Renter NPC and added Mado Gear NPC. [Masao]
 //= 2.0 Fixed problems with third classes and new mounts. [Euphy]
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
+//= 2.2 Added warg checks. [Euphy]
 //============================================================ 
 
 // PecoPeco Breeder (for Knights)-------------------------------------------
@@ -158,6 +159,12 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 
 	mes "[Falcon Breeder]";
 	if (BaseJob == Job_Hunter) {
+		if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) {
+			mes "Um...";
+			mes "You can't rent a Falcon";
+			mes "untill you dismiss your warg first!";
+			close;
+		}
 		mes "Do you need a Falcon?";
 		mes "You can rent your own";
 		mes "trusty bird of prey for a";
@@ -165,6 +172,13 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 		next;
 		switch(select("Rent Falcon:Cancel")) {
 		case 1:
+			if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) {
+				mes "[Falcon Breeder]";
+				mes "Um...";
+				mes "You can't rent a Falcon";
+				mes "untill you dismiss your warg first!";
+				close;
+			}
 			if (zeny < .@price) {
 				mes "[Falcon Breeder]";
 				mes "What is this?";