Prechádzať zdrojové kódy

Removed duplicate of canParticipateSiegeTE
Added some mapflag
Corrected typo in god quest

Atemo 9 rokov pred
rodič
commit
bb66035048

+ 0 - 8
doc/script_commands.txt

@@ -4126,14 +4126,6 @@ job (for example, if you try to get the baby version of a Taekwon class).
 
 ---------------------------------------
 
-*canParticipateSiegeTE([<char_id>]);
-
-Returns 1 if player is allowed to participate in Siege/WOE TE.
-Player with 3rd classes, Kagerou/Oboro, and Rebellion cannot participate,
-the return value is 0.
-
----------------------------------------
-
 *changebase <job ID number>{,<account ID>};
 
 This command will change a character's appearance to that of the specified job

+ 2 - 0
npc/re/mapflag/nobranch.txt

@@ -93,6 +93,8 @@ izlude_c	mapflag	nobranch
 izlude_d	mapflag	nobranch
 
 // WOE:TE Maps ===================
+te_alde_gld	mapflag	nobranch
+te_alde_prt	mapflag	nobranch
 te_prtcas01	mapflag	nobranch
 te_prtcas02	mapflag	nobranch
 te_prtcas03	mapflag	nobranch

+ 4 - 4
npc/re/quests/woe_te/te_goditem_alde1.txt

@@ -77,7 +77,7 @@ te_aldecas1,226,34,3	script	Blacksmith Cano#tegod01	4_M_RACHMAN1,{
 					mes "... yeah, there were some girls..";
 					mes "I had to run away because of them...";
 					donpcevent "#tequest_master_alde01::OnCommandOn";
-					mapannounce "te_aldecas1","A girl's voice: Hey, were you talking about us? It's Cano, right? I can't believe you ran away to a place like this.",bc_map,"0x00FF00",FW_BOLD,20,0,40;
+					mapannounce "te_aldecas1","A girl's voice: Hey, were you talking about us? It's "+ .@npc_name$ +", right? I can't believe you ran away to a place like this.",bc_map,"0x00FF00",FW_BOLD,20,0,40;
 					next;
 					mes "["+ .@npc_name$ +"]";
 					mes "Oh, no... !";
@@ -87,8 +87,8 @@ te_aldecas1,226,34,3	script	Blacksmith Cano#tegod01	4_M_RACHMAN1,{
 					mes "Leave it to me.";
 					next;
 					mes "^4d4dff!- Instruction -!";
-					mes "Soon, 7 girls that are after Cano will try to invade the fortress.";
-					mes "You have to protect Cano for 1 hour.^000000";
+					mes "Soon, 7 girls that are after "+ .@npc_name$ +" will try to invade the fortress.";
+					mes "You have to protect "+ .@npc_name$ +" for 1 hour.^000000";
 					next;
 					mes "^4d4dff!- Instruction -!";
 					mes "When the actual attack starts, the doorway of Emperium region will be blocked up for protection.^000000";
@@ -227,7 +227,7 @@ te_aldecas1,226,34,3	script	Blacksmith Cano#tegod01	4_M_RACHMAN1,{
 				mes "I was so overwhelmed that it felt as short as a moment.";
 				next;
 				mes "Jormungand, a powerful weapon and collection of all traces in myths, is finally made";
-				mes "at the hands of Cano.";
+				mes "at the hands of "+ .@npc_name$ +".";
 				delitem 6603,4;// Skin_Of_Hraesvelg
 				delitem 6599,1;// Spirit_Of_Hugin
 				delitem 6598,1;// Rib_Of_Jormungand

+ 6 - 6
npc/re/quests/woe_te/te_goditem_prt01.txt

@@ -15,7 +15,7 @@ te_prtcas01,204,204,3	script	Blacksmith Kai#tegod01	4_M_RACHMAN2,{
 
 	.@guild_id = getcastledata( "te_prtcas01",1 );
 	.@economy = getcastledata( "te_prtcas01",2 );
-	.@npc_name$ = "Cano";
+	.@npc_name$ = "Kai";
 
 	mes "["+ .@npc_name$ +"]";
 	if (.@guild_id != getcharid(2)) {
@@ -77,7 +77,7 @@ te_prtcas01,204,204,3	script	Blacksmith Kai#tegod01	4_M_RACHMAN2,{
 					mes "... yeah, there were some girls..";
 					mes "I had to run away because of them...";
 					donpcevent "#tequest_master_prt01::OnCommandOn";
-					mapannounce "te_prtcas01","A girl's voice: Hey, were you talking about us? It's Cano, right? I can't believe you ran away to a place like this.",bc_map,"0x00FF00",FW_BOLD,20,0,40;
+					mapannounce "te_prtcas01","A girl's voice: Hey, were you talking about us? It's "+ .@npc_name$ +", right? I can't believe you ran away to a place like this.",bc_map,"0x00FF00",FW_BOLD,20,0,40;
 					next;
 					mes "["+ .@npc_name$ +"]";
 					mes "Oh, no... !";
@@ -87,8 +87,8 @@ te_prtcas01,204,204,3	script	Blacksmith Kai#tegod01	4_M_RACHMAN2,{
 					mes "Leave it to me.";
 					next;
 					mes "^4d4dff!- Instruction -!";
-					mes "Soon, 7 girls that are after Kai will try to invade the fortress.";
-					mes "You have to protect Kai for 1 hour.^000000";
+					mes "Soon, 7 girls that are after "+ .@npc_name$ +" will try to invade the fortress.";
+					mes "You have to protect "+ .@npc_name$ +" for 1 hour.^000000";
 					next;
 					mes "^4d4dff!- Instruction -!";
 					mes "When the actual attack starts, the doorway of Emperium region will be blocked up for protection.^000000";
@@ -227,7 +227,7 @@ te_prtcas01,204,204,3	script	Blacksmith Kai#tegod01	4_M_RACHMAN2,{
 				mes "I was so overwhelmed that it felt as short as a moment.";
 				next;
 				mes "Hervor, a shield that Blacksmith Velund made for his wife Hervor, is finally made";
-				mes "at the hands of Kai.";
+				mes "at the hands of "+ .@npc_name$ +".";
 				delitem 6595,2;// Hammer_Of_Velund
 				delitem 6596,1;// Anvil_Of_Velund
 				delitem 6594,4;// Magic_Bronze_Bullion
@@ -238,7 +238,7 @@ te_prtcas01,204,204,3	script	Blacksmith Kai#tegod01	4_M_RACHMAN2,{
 				delitem 2115,1;// Valkyrja's_Shield
 				$@2012_tegod_gloria = 5;
 				getitem 2181,1;// Hervor
-				mapannounce "te_prtcas01","Velund's gift [ Hervor ] is introduced to this world by ["+ getguildname(.@guild_id) +"] of ["+ strcharinfo(0) +"] Guild.",bc_map,"0x70dbdb",FW_NORMAL,12;
+				mapannounce "te_prtcas01","Velund's gift [ Hervor ] is introduced to this world by ["+ strcharinfo(0) +"] of ["+ getguildname(.@guild_id) +"] Guild.",bc_map,"0x70dbdb",FW_NORMAL,12;
 				if (.@economy > 20)
 					setcastledata "te_prtcas01",2,(.@economy-20);
 				else