* Fixed minor issues in Guillotine Cross job change quest (bugreport:7145).

* Fixed misplaced line in 13-2 quests (bugreport:7136).
* Fixed mistakes in script_commands.txt (bugreport:7140).
* Added 'nowarpto' and 'nomemo' mapflags to bossnia_0* maps (bugreport:7118).

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

5 files changed, 19 insertions, 9 deletions

diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index a35dac295..12321f7c1 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -776,3 +776,9 @@ moc_prydn2	mapflag	nomemo
 // Poring War ====================
 poring_w01	mapflag	nomemo
 poring_w02	mapflag	nomemo
+
+// Bossnia (custom) ==============
+bossnia_01	mapflag	nomemo
+bossnia_02	mapflag	nomemo
+bossnia_03	mapflag	nomemo
+bossnia_04	mapflag	nomemo
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index db47fa1b0..0f9734799 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -150,3 +150,9 @@ spl_in01	mapflag	nowarpto
 // Poring War ====================
 poring_w01	mapflag	nowarpto
 poring_w02	mapflag	nowarpto
+
+// Bossnia (custom) ==============
+bossnia_01	mapflag	nowarpto
+bossnia_02	mapflag	nowarpto
+bossnia_03	mapflag	nowarpto
+bossnia_04	mapflag	nowarpto
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 77a6a32a0..2b1aa5d59 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3808,10 +3808,10 @@ Warps a guild to specified map and coordinate given the guild id, which you can
 getcharid(2). You can also request another guild id given the member's name with getcharid(2,<player_name>).
  
 You can use the following "map names" for special warping behavior:
-Random:       All party members are randomly warped in their current map (as if they
+Random:       All guild members are randomly warped in their current map (as if they
               all used a fly wing)
-SavePointAll: All party members are warped to their respective save point.
-SavePoint:    All party members are warped to the save point of the currently
+SavePointAll: All guild members are warped to their respective save point.
+SavePoint:    All guild members are warped to the save point of the currently
               attached player (will fail if there's no player attached).
 
 Example:
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 8ae078dfb..f2c64d2d8 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -4832,10 +4832,10 @@ man_in01,372,221,5	script	Scientist#lifeguard	449,{
 				delitem 6077,.@stone_chk; //Rough_Mineral
 				delitem 6078,.@stoneelse_chk; //Stone_Fragments
 				delitem 6076,1; //Portable_Toolbox
-				set ep13_2_tre,100;
 				getitem 6080,2; //Manuk_Coin
 				getexp 0,70000;
 				changequest 2179+(ep13_2_tre-2),2182;
+				set ep13_2_tre,100;
 				close;
 			}
 			else {
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 8fe6512ac..4f350460a 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.0b
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN r16945+
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 Adapted from original script. [Euphy]
 //= 1.0a Added 'npcskill' command. [Euphy]
 //= 1.0b Moved warps to separate file. [Euphy]
+//= 1.1 Fixed some minor bugs. [Euphy]
 //============================================================
 
 que_job01,75,96,3	script	Guild Member#3rdgc01	997,{
@@ -720,7 +721,6 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			close;
 		}
 	} else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) {
-		mes "[Daora]";
 		if (Sex) {
 			mes "Oh~ you're good-looking~!";
 			mes "It's worthwhile to open a pub~";
@@ -780,12 +780,10 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 		}
 	} else {
 		if (Sex == 1) {
-			mes "[Daora]";
 			mes "Oh~ you're good-looking!";
 			mes "So, what do you want?";
 		}
 		else {
-			mes "[Daora]";
 			mes "Hum...you're a girl.";
 			mes "Ok pick up whatever you want.";
 		}
@@ -2681,8 +2679,8 @@ ve_fild05,327,308,3	script	Girl#3rdgc14	466,{
 		switch(select("I got it.:I'll be ready.")) {
 		case 1:
 			if ($@3rdgc_room02 == 0) {
-				set job_3rd_gc, 17;
 				erasequest ((job_3rd_gc == 17)?7110:7109);
+				set job_3rd_gc, 17;
 				setquest 7110;
 				set $@3rdgc_room02, 1;
 				warp "job3_guil03",22,70;