- Fixed a bug in some Gunslinger skills, when weapon ids changed

- Little cleanup in and a bug fix in guild2 scripts.

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

11 files changed, 25 insertions, 26 deletions

diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index 10468e6c6..33742c64f 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -406,10 +406,10 @@
 514,0,0,11:12:13:14:15,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_PIERCINGSHOT
 515,0,0,22:24:26:28:30:32:34:36:38:40,0,0,0,17,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_RAPIDSHOWER
 516,0,0,32:34:36:38:40:42:44:46:48:50,0,0,0,17,3,10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DESPERADO
-517,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,20,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GATLINGFEVER
-518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,19,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DUST
-519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,19,3,2:2:4:4:6:6:8:8:10:10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FULLBUSTER
-520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,19,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_SPREADATTACK
+517,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,19,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GATLINGFEVER
+518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DUST
+519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,20,3,2:2:4:4:6:6:8:8:10:10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FULLBUSTER
+520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,20,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_SPREADATTACK
 521,0,0,4:8:12:16:20:24:28:32:36:40,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GROUNDDRIFT
 523,0,0,2,0,0,0,99,6,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_SYURIKEN
 524,0,0,30:25:20:15:10,0,0,0,99,7,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KUNAI
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 35eb6c276..cadc91a67 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -109,7 +109,6 @@ OnClock0001:
 		monster "arug_cas01",251,369,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied";
 		monster "arug_cas01",251,369,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied";
 		monster "arug_cas01",253,369,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied";
-		if (.@Treasure < 4) end;
 		monster "arug_cas01",254,369,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied";
 		if (.@Treasure < 5) end;
 		monster "arug_cas01",255,368,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied";
@@ -400,9 +399,9 @@ OnInit:
 
 arug_cas01,1,1,0	script	#aru01_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas01",3);
+	set .@defence,GetCastleData("arug_cas01",3);
 	guardian "arug_cas01",233,83,"Guardian",1899,"#aru01_gard01::OnGuardianDied"; //0;
-	if ((.@Defence > 10) && (.@Defence < 31)) {
+	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
 		guardian "arug_cas01",252,81,"Guardian",1899,"#aru01_gard01::OnGuardianDied"; //1;
 	}
@@ -478,7 +477,7 @@ Onreset:
 
 arug_cas01,1,2,0	script	#aru01_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas01",3);
+	set .@defence,GetCastleData("arug_cas01",3);
 	guardian "arug_cas01",294,210,"Guardian",1899,"#aru01_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index b3c5f3473..0e7718d5c 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -398,7 +398,7 @@ OnInit:
 
 arug_cas02,1,1,0	script	#aru02_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas02",3);
+	set .@defence,GetCastleData("arug_cas02",3);
 	guardian "arug_cas02",104,32,"Guardian",1899,"#aru02_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -476,7 +476,7 @@ Onreset:
 
 arug_cas02,1,2,0	script	#aru02_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas02",3);
+	set .@defence,GetCastleData("arug_cas02",3);
 	guardian "arug_cas02",175,31,"Guardian",1899,"#aru02_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 1129f6285..05597ce9d 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -399,7 +399,7 @@ OnInit:
 
 arug_cas03,1,1,0	script	#aru03_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas03",3);
+	set .@defence,GetCastleData("arug_cas03",3);
 	guardian "arug_cas03",130,60,"Guardian",1899,"#aru03_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -477,7 +477,7 @@ Onreset:
 
 arug_cas03,1,2,0	script	#aru03_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas03",3);
+	set .@defence,GetCastleData("arug_cas03",3);
 	guardian "arug_cas03",156,101,"Guardian",1899,"#aru03_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index e718e48ad..26544d27b 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -398,7 +398,7 @@ OnInit:
 
 arug_cas04,1,1,0	script	#aru04_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas04",3);
+	set .@defence,GetCastleData("arug_cas04",3);
 	guardian "arug_cas04",130,60,"Guardian",1899,"#aru04_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -476,7 +476,7 @@ Onreset:
 
 arug_cas04,1,2,0	script	#aru04_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas04",3);
+	set .@defence,GetCastleData("arug_cas04",3);
 	guardian "arug_cas04",156,101,"Guardian",1899,"#aru04_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 0a052f13a..77fd06846 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -398,7 +398,7 @@ OnInit:
 
 arug_cas05,1,1,0	script	#aru05_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas05",3);
+	set .@defence,GetCastleData("arug_cas05",3);
 	guardian "arug_cas05",130,60,"Guardian",1899,"#aru05_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -476,7 +476,7 @@ Onreset:
 
 arug_cas05,1,2,0	script	#aru05_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("arug_cas05",3);
+	set .@defence,GetCastleData("arug_cas05",3);
 	guardian "arug_cas05",156,101,"Guardian",1899,"#aru05_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index d116d7c61..352981ab1 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -400,7 +400,7 @@ OnInit:
 
 schg_cas01,1,1,0	script	#sch01_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas01",3);
+	set .@defence,GetCastleData("schg_cas01",3);
 	guardian "schg_cas01",111,18,"Guardian Soldier",1899,"#sch01_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -478,7 +478,7 @@ Onreset:
 
 schg_cas01,1,2,0	script	#sch01_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas01",3);
+	set .@defence,GetCastleData("schg_cas01",3);
 	guardian "schg_cas01",130,22,"Guardian Soldier",1899,"#sch01_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 34a17e80f..d42f0b8bb 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -401,7 +401,7 @@ OnInit:
 
 schg_cas02,1,1,0	script	#sch02_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas02",3);
+	set .@defence,GetCastleData("schg_cas02",3);
 	guardian "schg_cas02",326,83,"Guardian Soldier",1899,"#sch02_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -479,7 +479,7 @@ Onreset:
 
 schg_cas02,1,2,0	script	#sch02_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas02",3);
+	set .@defence,GetCastleData("schg_cas02",3);
 	guardian "schg_cas02",359,85,"Guardian Soldier",1899,"#sch02_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 33b3be12b..4e70bfc61 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -402,7 +402,7 @@ OnInit:
 
 schg_cas03,1,1,0	script	#sch03_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas03",3);
+	set .@defence,GetCastleData("schg_cas03",3);
 	guardian "schg_cas03",323,308,"Guardian",1899,"#sch03_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -480,7 +480,7 @@ Onreset:
 
 schg_cas03,1,2,0	script	#sch03_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas03",3);
+	set .@defence,GetCastleData("schg_cas03",3);
 	guardian "schg_cas03",338,309,"Guardian",1899,"#sch03_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index d55196830..597d26479 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -398,7 +398,7 @@ OnInit:
 
 schg_cas04,1,1,0	script	#sch04_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas04",3);
+	set .@defence,GetCastleData("schg_cas04",3);
 	guardian "schg_cas04",111,18,"Guardian Soldier",1899,"#sch04_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -476,7 +476,7 @@ Onreset:
 
 schg_cas04,1,2,0	script	#sch04_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas04",3);
+	set .@defence,GetCastleData("schg_cas04",3);
 	guardian "schg_cas04",130,22,"Guardian Soldier",1899,"#sch04_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index e1b9a5280..725cabe1d 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -398,7 +398,7 @@ OnInit:
 
 schg_cas05,1,1,0	script	#sch05_gard01	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas05",3);
+	set .@defence,GetCastleData("schg_cas05",3);
 	guardian "schg_cas05",111,18,"Guardian Soldier",1899,"#sch05_gard01::OnGuardianDied"; //0;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;
@@ -476,7 +476,7 @@ Onreset:
 
 schg_cas05,1,2,0	script	#sch05_gard02	-1,{
 OnEnable:
-	set .@Defence,GetCastleData("schg_cas05",3);
+	set .@defence,GetCastleData("schg_cas05",3);
 	guardian "schg_cas05",130,22,"Guardian Soldier",1899,"#sch05_gard02::OnGuardianDied"; //11;
 	if ((.@defence > 10) && (.@defence < 31)) {
 		set .MyMobCount,2;