- Removed security check since source level patch is applied. Reverted select(), created prompt().

modified   Changelog-Trunk.txt
modified   npc/airports/airships.txt
modified   npc/cities/amatsu.txt
modified   npc/cities/gonryun.txt
modified   npc/cities/hugel.txt
modified   npc/cities/lighthalzen.txt
modified   npc/cities/niflheim.txt
modified   npc/cities/valkyrie.txt
modified   npc/custom/eAAC_Scripts/disguiser.txt
modified   npc/custom/eAAC_Scripts/quest_warper.txt
modified   npc/custom/jobs/jobmaster.txt
modified   npc/events/idul_fitri.txt
modified   npc/jobs/1-1e/gunslinger.txt
modified   npc/jobs/1-1e/ninja.txt
modified   npc/jobs/novice/novice.txt
modified   npc/merchants/kunai_maker.txt
modified   npc/merchants/novice_exchange.txt
modified   npc/merchants/refine.txt
modified   npc/other/comodo_gambling.txt
modified   npc/other/dts_warper.txt
modified   npc/other/marriage.txt
modified   npc/other/powernpc.txt
modified   npc/quests/Lvl4_weapon_quest.txt
modified   npc/quests/gunslinger_quests.txt
modified   npc/quests/quests_ein.txt
modified   npc/quests/quests_umbala.txt
modified   npc/sample/monster_controller.cpp
modified   src/map/script.c



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

4 files changed, 3 insertions, 30 deletions

diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt
index d99868e1e..b3183c526 100644
--- a/npc/quests/Lvl4_weapon_quest.txt
+++ b/npc/quests/Lvl4_weapon_quest.txt
@@ -150,9 +150,7 @@ L4_0_1:
 			mes "By the way, don't you want to know how evil the city of the dead will be?";

 			mes "I do since that city influences so much of this village";

 			mes "with it's mysterious power, you know.";

-			break;

-		default:

-			end;			

+			break;			

 	}	

 	close;

 	

diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index ef769dc87..cb2823a88 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -95,9 +95,6 @@ que_ng.gat,182,85,3	script	Mr.Garrison	109,{
 			mes "will never part from his";

 			mes "favorite gun, heh.";

 			close;

-

-		default:

-			end;

 	}

 

 L_Slot:

@@ -165,8 +162,6 @@ L_Slot:
 			mes "Okay, come back when you";

 			mes "changed your mind.";

 			close;

-		default:

-			end;

 	}

 

 L_Already:

@@ -252,8 +247,6 @@ que_ng.gat,187,163,3	script	Ingrid	744,{
 			mes "Probably a good choice.";

 			mes "It's really dangerous.";

 			close;

-		default:

-			end;

 	}

 }

 

@@ -329,8 +322,6 @@ que_ng.gat,185,180,3	script	Vanessa	726,{
 			mes @npcname$;

 			mes "Oh well, your loss.";

 			close;

-		default:

-			end;

 	}

 }

 

@@ -410,7 +401,5 @@ que_ng.gat,149,178,5	script	N.A	744,{
 			mes @npcname$;

 			mes "Oh well, your loss.";

 			close;

-		default:

-			end;

 	}

 }
\ No newline at end of file
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 75eedb1e1..7d0421bc7 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -213,8 +213,6 @@ ein_in01.gat,231,163,1	script	Sick Old Man	849,6,6,{
 				mes "you'll figure something out.";

 				set Shinokas_Quest,7;

 				close;

-			default:

-				end;

 			}

 		}

 	}

@@ -343,8 +341,6 @@ ein_in01.gat,231,163,1	script	Sick Old Man	849,6,6,{
 			if(@shinqst2)set @shinqst2,0;

 			next;

 			break;

-		default:

-			end;

 		}

 	}

 	

@@ -594,14 +590,11 @@ einbroch.gat,51,52,1	script	lab_warp	45,2,2{
 			mes "the security system";

 			mes "will initiate lockout.";

 			close;

-		case 255:

 		case 3: //cancel

 			mes "[Security System]";

 			mes "You have canceled";

 			mes "the ID security check.";

 			close;

-		default:

-			end;

 	}

 	//ID check:

 	mes "[Security System]";

@@ -770,7 +763,7 @@ ein_in01.gat,254,35,1	script	Scientist	749,{
 	mes "..............";

 	mes "*Grumble grumble*";

 	next;

-	if(select("What's wrong?:Catch you later.")!=1){

+	if(select("What's wrong?:Catch you later.")==2){

 		 mes "[Scientist]";

 		 mes "Right.";

 		 mes "Yeah.";

@@ -949,7 +942,7 @@ L_Apples:
 	mes "Hahaha! Th-thank you~";

 	mes "^111111*Hic-hic-hiccup!*^000000";

 	next;

-	if(select("So what was that about Ymir's Heart?:Hehe, you're welcome.")!=1){

+	if(select("So what was that about Ymir's Heart?:Hehe, you're welcome.")==2){

 		 mes "[Drunken Man]";

 		 mes "Hahahaha!";

 		 mes "You're great!";

diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index eb783eaa7..b4a539b81 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -695,8 +695,6 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					set .@gain,992;

 				}

 				break;

-			default:

-				end;

 		}

 		if(.@need == 0) {

 			next;

@@ -835,8 +833,6 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					set .@gain,992;

 				}

 				break;

-			default:

-				end;

 		}

 		next;

 		if(.@need == 0) {

@@ -916,13 +912,10 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 		mes "good use.";

 		close;

 	case 3:

-	case 255:

 		mes "[Putsuchiritan]";

 		mes "If you don't wish my help at the moment,";

 		mes "that's fine.  When you do, please come";

 		mes "by again.";

 		close;

-	default:

-		end;

 	}

 }
\ No newline at end of file