From 5795eee87863dbdcc4133cd7e0a63d4fb5337bde Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sun, 27 May 2007 16:12:14 +0000 Subject: * Guild flag update. - Guild flags in town by default will no longer show dialog. (changeable) - Updated several guild flag positions and rotations, and removed some others all together. - Added the second set of Payon town guild flags in the northern section - Updated novice WoE flags with the new argument. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10632 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild/prtg/prtg_flags.txt | 195 +++++++++++++++++++++++++----------------- 1 file changed, 118 insertions(+), 77 deletions(-) (limited to 'npc/guild/prtg') diff --git a/npc/guild/prtg/prtg_flags.txt b/npc/guild/prtg/prtg_flags.txt index f3268bbf0..a46762f54 100644 --- a/npc/guild/prtg/prtg_flags.txt +++ b/npc/guild/prtg/prtg_flags.txt @@ -4,7 +4,7 @@ //= jAthena - kalen (1.0) //= 1.1 by Akaru, ho|yAnge|X, and Valaris //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -13,6 +13,7 @@ //= v1.2 Optimized with functions.[kobra_k88] //= v1.3 Changed to iRO castle names [DracoRPG] //= v1.4 Can now only flag in from outside the castle [Kayla] +//= V1.5 Town flags no longer show dialog, and fixed various flags. [L0ne__W0lf] //============================================================ @@ -20,7 +21,7 @@ // Castle 1 //================================================================================// prontera,155,190,4 script Kriemhild#p1-1::Kriemhild 722,{ - callfunc "F_Flags","Prontera","prtg_cas01",97,174,0; + callfunc "F_Flags","Prontera","prtg_cas01",97,174,0,0; close; OnRecvCastlePt01: @@ -29,7 +30,16 @@ OnRecvCastlePt01: } prt_gld,131,60,6 script Kriemhild#p1-2::Kriemhild2 722,{ - callfunc "F_Flags","Prontera","prtg_cas01",97,174,1; + callfunc "F_Flags","Prontera","prtg_cas01",97,174,1,1; + close; + +OnRecvCastlePt01: + FlagEmblem GetCastleData("prtg_cas01",1); + end; +} + +prtg_cas01,58,56,4 script Kriemhild#p1-3::Kriemhild3 722,{ + callfunc "F_Flags","Prontera","prtg_cas01",97,174,0,1; close; OnRecvCastlePt01: @@ -37,20 +47,19 @@ OnRecvCastlePt01: end; } // In Guild =========================================== -prt_gld,138,68,6 duplicate(Kriemhild2) Kriemhild#p1-3 722 -prt_gld,138,60,6 duplicate(Kriemhild2) Kriemhild#p1-4 722 -prt_gld,135,60,6 duplicate(Kriemhild2) Kriemhild#p1-5 722 +prt_gld,138,68,6 duplicate(Kriemhild2) Kriemhild#p1-4 722 +prt_gld,138,60,6 duplicate(Kriemhild2) Kriemhild#p1-5 722 +prt_gld,135,60,6 duplicate(Kriemhild2) Kriemhild#p1-6 722 // In Castle ============================================= -prtg_cas01,58,56,4 duplicate(Kriemhild) Kriemhild#p1-6 722 -prtg_cas01,64,56,4 duplicate(Kriemhild) Kriemhild#p1-7 722 -prtg_cas01,76,32,4 duplicate(Kriemhild) Kriemhild#p1-8 722 -prtg_cas01,84,32,4 duplicate(Kriemhild) Kriemhild#p1-9 722 -prtg_cas01,94,39,4 duplicate(Kriemhild) Kriemhild#p1-10 722 -prtg_cas01,94,24,4 duplicate(Kriemhild) Kriemhild#p1-11 722 -prtg_cas01,73,14,4 duplicate(Kriemhild) Kriemhild#p1-12 722 -prtg_cas01,73,6,4 duplicate(Kriemhild) Kriemhild#p1-13 722 -prtg_cas01,55,46,4 duplicate(Kriemhild) Kriemhild#p1-14 722 -prtg_cas01,45,46,4 duplicate(Kriemhild) Kriemhild#p1-15 722 +prtg_cas01,64,56,4 duplicate(Kriemhild3) Kriemhild#p1-7 722 +prtg_cas01,76,32,4 duplicate(Kriemhild3) Kriemhild#p1-8 722 +prtg_cas01,84,32,4 duplicate(Kriemhild3) Kriemhild#p1-9 722 +prtg_cas01,94,39,4 duplicate(Kriemhild3) Kriemhild#p1-10 722 +prtg_cas01,94,24,4 duplicate(Kriemhild3) Kriemhild#p1-11 722 +prtg_cas01,73,14,4 duplicate(Kriemhild3) Kriemhild#p1-12 722 +prtg_cas01,73,6,4 duplicate(Kriemhild3) Kriemhild#p1-13 722 +prtg_cas01,55,46,4 duplicate(Kriemhild3) Kriemhild#p1-14 722 +prtg_cas01,45,46,4 duplicate(Kriemhild3) Kriemhild#p1-15 722 @@ -58,7 +67,7 @@ prtg_cas01,45,46,4 duplicate(Kriemhild) Kriemhild#p1-15 722 // Castle 2 //================================================================================// prontera,146,194,3 script Swanhild#p2-1::Swanhild 722,{ - callfunc "F_Flags","Prontera","prtg_cas02",71,36,0; + callfunc "F_Flags","Prontera","prtg_cas02",71,36,0,0; close; OnRecvCastlePt02: @@ -67,7 +76,16 @@ OnRecvCastlePt02: } prt_gld,244,126,8 script Swanhild#p2-2::Swanhild2 722,{ - callfunc "F_Flags","Prontera","prtg_cas02",71,36,1; + callfunc "F_Flags","Prontera","prtg_cas02",71,36,1,1; + close; + +OnRecvCastlePt02: + FlagEmblem GetCastleData("prtg_cas02",1); + end; +} + +prtg_cas02,40,227,4 script Swanhild#p2-3::Swanhild3 722,{ + callfunc "F_Flags","Prontera","prtg_cas02",71,36,0,1; close; OnRecvCastlePt02: @@ -75,22 +93,21 @@ OnRecvCastlePt02: end; } // In Guild =========================================== -prt_gld,244,128,8 duplicate(Swanhild2) Swanhild#p2-3 722 -prt_gld,236,126,8 duplicate(Swanhild2) Swanhild#p2-4 722 -prt_gld,236,128,8 duplicate(Swanhild2) Swanhild#p2-5 722 +prt_gld,244,128,8 duplicate(Swanhild2) Swanhild#p2-4 722 +prt_gld,236,126,8 duplicate(Swanhild2) Swanhild#p2-5 722 +prt_gld,236,128,8 duplicate(Swanhild2) Swanhild#p2-6 722 // In Castle ============================================= -prtg_cas02,40,227,4 duplicate(Swanhild) Swanhild#p2-6 722 -prtg_cas02,46,227,4 duplicate(Swanhild) Swanhild#p2-7 722 -prtg_cas02,11,219,4 duplicate(Swanhild) Swanhild#p2-8 722 -prtg_cas02,11,214,4 duplicate(Swanhild) Swanhild#p2-9 722 -prtg_cas02,20,219,4 duplicate(Swanhild) Swanhild#p2-10 722 -prtg_cas02,20,214,4 duplicate(Swanhild) Swanhild#p2-11 722 -prtg_cas02,79,227,8 duplicate(Swanhild) Swanhild#p2-12 722 -prtg_cas02,70,227,8 duplicate(Swanhild) Swanhild#p2-13 722 -prtg_cas02,38,189,8 duplicate(Swanhild) Swanhild#p2-14 722 -prtg_cas02,34,189,8 duplicate(Swanhild) Swanhild#p2-15 722 -prtg_cas02,153,161,4 duplicate(Swanhild) Swanhild#p2-16 722 -prtg_cas02,162,161,4 duplicate(Swanhild) Swanhild#p2-17 722 +prtg_cas02,46,227,4 duplicate(Swanhild3) Swanhild#p2-7 722 +prtg_cas02,11,219,4 duplicate(Swanhild3) Swanhild#p2-8 722 +prtg_cas02,11,214,4 duplicate(Swanhild3) Swanhild#p2-9 722 +prtg_cas02,20,219,4 duplicate(Swanhild3) Swanhild#p2-10 722 +prtg_cas02,20,214,4 duplicate(Swanhild3) Swanhild#p2-11 722 +prtg_cas02,79,227,8 duplicate(Swanhild3) Swanhild#p2-12 722 +prtg_cas02,70,227,8 duplicate(Swanhild3) Swanhild#p2-13 722 +prtg_cas02,38,189,8 duplicate(Swanhild3) Swanhild#p2-14 722 +prtg_cas02,34,189,8 duplicate(Swanhild3) Swanhild#p2-15 722 +prtg_cas02,153,161,4 duplicate(Swanhild3) Swanhild#p2-16 722 +prtg_cas02,162,161,4 duplicate(Swanhild3) Swanhild#p2-17 722 @@ -99,7 +116,7 @@ prtg_cas02,162,161,4 duplicate(Swanhild) Swanhild#p2-17 722 // Castle 3 //================================================================================// prontera,143,203,2 script Fadhgridh#p3-1::Fadhgridh 722,{ - callfunc "F_Flags","Prontera","prtg_cas03",45,99,0; + callfunc "F_Flags","Prontera","prtg_cas03",45,99,0,0; close; OnRecvCastlePt03: @@ -108,7 +125,16 @@ OnRecvCastlePt03: } prt_gld,147,140,4 script Fadhgridh#p3-2::Fadhgridh2 722,{ - callfunc "F_Flags","Prontera","prtg_cas03",45,99,1; + callfunc "F_Flags","Prontera","prtg_cas03",45,99,1,1; + close; + +OnRecvCastlePt03: + FlagEmblem GetCastleData("prtg_cas03",1); + end; +} + +prtg_cas03,168,28,4 script Fadhgridh#p3-3::Fadhgridh3 722,{ + callfunc "F_Flags","Prontera","prtg_cas03",45,99,0,1; close; OnRecvCastlePt03: @@ -116,20 +142,19 @@ OnRecvCastlePt03: end; } // In Guild =========================================== -prt_gld,147,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-3 722 -prt_gld,158,140,4 duplicate(Fadhgridh2) Fadhgridh#p3-4 722 -prt_gld,158,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-5 722 +prt_gld,147,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-4 722 +prt_gld,158,140,4 duplicate(Fadhgridh2) Fadhgridh#p3-5 722 +prt_gld,158,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-6 722 // In Castle ============================================ -prtg_cas03,168,28,4 duplicate(Fadhgridh) Fadhgridh#p3-6 722 -prtg_cas03,182,28,4 duplicate(Fadhgridh) Fadhgridh#p3-7 722 -prtg_cas03,43,50,4 duplicate(Fadhgridh) Fadhgridh#p3-8 722 -prtg_cas03,48,50,4 duplicate(Fadhgridh) Fadhgridh#p3-9 722 -prtg_cas03,43,58,4 duplicate(Fadhgridh) Fadhgridh#p3-10 722 -prtg_cas03,48,58,4 duplicate(Fadhgridh) Fadhgridh#p3-11 722 -prtg_cas03,158,210,4 duplicate(Fadhgridh) Fadhgridh#p3-12 722 -prtg_cas03,169,210,4 duplicate(Fadhgridh) Fadhgridh#p3-13 722 -prtg_cas03,162,201,4 duplicate(Fadhgridh) Fadhgridh#p3-14 722 -prtg_cas03,165,201,4 duplicate(Fadhgridh) Fadhgridh#p3-15 722 +prtg_cas03,182,28,4 duplicate(Fadhgridh3) Fadhgridh#p3-7 722 +prtg_cas03,43,50,4 duplicate(Fadhgridh3) Fadhgridh#p3-8 722 +prtg_cas03,48,50,4 duplicate(Fadhgridh3) Fadhgridh#p3-9 722 +prtg_cas03,43,58,4 duplicate(Fadhgridh3) Fadhgridh#p3-10 722 +prtg_cas03,48,58,4 duplicate(Fadhgridh3) Fadhgridh#p3-11 722 +prtg_cas03,158,210,4 duplicate(Fadhgridh3) Fadhgridh#p3-12 722 +prtg_cas03,169,210,4 duplicate(Fadhgridh3) Fadhgridh#p3-13 722 +prtg_cas03,162,201,4 duplicate(Fadhgridh3) Fadhgridh#p3-14 722 +prtg_cas03,165,201,4 duplicate(Fadhgridh3) Fadhgridh#p3-15 722 @@ -137,7 +162,7 @@ prtg_cas03,165,201,4 duplicate(Fadhgridh) Fadhgridh#p3-15 722 // Castle 4 //================================================================================// prontera,167,203,6 script Skoegul#p4-1::Skoegul 722,{ - callfunc "F_Flags","Prontera","prtg_cas04",259,265,0; + callfunc "F_Flags","Prontera","prtg_cas04",259,265,0,0; close; OnRecvCastlePt04: @@ -146,7 +171,16 @@ OnRecvCastlePt04: } prt_gld,120,243,6 script Skoegul#p4-2::Skoegul2 722,{ - callfunc "F_Flags","Prontera","prtg_cas04",259,265,1; + callfunc "F_Flags","Prontera","prtg_cas04",259,265,1,1; + close; + +OnRecvCastlePt04: + FlagEmblem GetCastleData("prtg_cas04",1); + end; +} + +prtg_cas04,82,29,4 script Skoegul#p4-3::Skoegul3 722,{ + callfunc "F_Flags","Prontera","prtg_cas04",259,265,0,1; close; OnRecvCastlePt04: @@ -154,20 +188,19 @@ OnRecvCastlePt04: end; } // In Guild =========================================== -prt_gld,120,236,6 duplicate(Skoegul2) Skoegul#p4-3 722 -prt_gld,122,243,6 duplicate(Skoegul2) Skoegul#p4-4 722 -prt_gld,122,246,6 duplicate(Skoegul2) Skoegul#p4-5 722 -// In Castle ============================================= -prtg_cas04,82,29,4 duplicate(Skoegul) Skoegul#p4-6 722 -prtg_cas04,75,29,4 duplicate(Skoegul) Skoegul#p4-7 722 -prtg_cas04,75,27,4 duplicate(Skoegul) Skoegul#p4-8 722 -prtg_cas04,82,27,4 duplicate(Skoegul) Skoegul#p4-9 722 -prtg_cas04,59,29,4 duplicate(Skoegul) Skoegul#p4-10 722 -prtg_cas04,67,29,4 duplicate(Skoegul) Skoegul#p4-11 722 -prtg_cas04,258,25,4 duplicate(Skoegul) Skoegul#p4-12 722 -prtg_cas04,258,20,4 duplicate(Skoegul) Skoegul#p4-13 722 -prtg_cas04,263,20,4 duplicate(Skoegul) Skoegul#p4-14 722 -prtg_cas04,263,27,4 duplicate(Skoegul) Skoegul#p4-15 722 +prt_gld,120,236,6 duplicate(Skoegul2) Skoegul#p4-4 722 +prt_gld,122,243,6 duplicate(Skoegul2) Skoegul#p4-5 722 +prt_gld,122,236,6 duplicate(Skoegul2) Skoegul#p4-6 722 +// In Castle ========================================== +prtg_cas04,75,29,4 duplicate(Skoegul3) Skoegul#p4-7 722 +prtg_cas04,75,27,4 duplicate(Skoegul3) Skoegul#p4-8 722 +prtg_cas04,82,27,4 duplicate(Skoegul3) Skoegul#p4-9 722 +prtg_cas04,59,29,4 duplicate(Skoegul3) Skoegul#p4-10 722 +prtg_cas04,67,29,4 duplicate(Skoegul3) Skoegul#p4-11 722 +prtg_cas04,258,25,4 duplicate(Skoegul3) Skoegul#p4-12 722 +prtg_cas04,258,20,4 duplicate(Skoegul3) Skoegul#p4-13 722 +prtg_cas04,263,20,4 duplicate(Skoegul3) Skoegul#p4-14 722 +prtg_cas04,263,27,4 duplicate(Skoegul3) Skoegul#p4-15 722 @@ -176,7 +209,7 @@ prtg_cas04,263,27,4 duplicate(Skoegul) Skoegul#p4-15 722 // Castle 5 //================================================================================// prontera,165,194,5 script Gondul#p5-1::Gondul 722,{ - callfunc "F_Flags","Prontera","prtg_cas05",34,30,0; + callfunc "F_Flags","Prontera","prtg_cas05",34,30,0,0; close; OnRecvCastlePt05: @@ -185,7 +218,16 @@ OnRecvCastlePt05: } prt_gld,199,243,2 script Gondul#p5-2::Gondul2 722,{ - callfunc "F_Flags","Prontera","prtg_cas05",34,30,1; + callfunc "F_Flags","Prontera","prtg_cas05",34,30,1,1; + close; + +OnRecvCastlePt05: + FlagEmblem GetCastleData("prtg_cas05",1); + end; +} + +prtg_cas05,19,247,4 script Gondul#p5-3::Gondul3 722,{ + callfunc "F_Flags","Prontera","prtg_cas05",34,30,0,1; close; OnRecvCastlePt05: @@ -193,15 +235,14 @@ OnRecvCastlePt05: end; } // In Guild =========================================== -prt_gld,199,236,2 duplicate(Gondul2) Gondul#p5-3 722 -prt_gld,197,243,2 duplicate(Gondul2) Gondul#p5-4 722 -prt_gld,197,236,2 duplicate(Gondul2) Gondul#p5-5 722 +prt_gld,199,236,2 duplicate(Gondul2) Gondul#p5-4 722 +prt_gld,197,243,2 duplicate(Gondul2) Gondul#p5-5 722 +prt_gld,197,236,2 duplicate(Gondul2) Gondul#p5-6 722 // In Castle ============================================= -prtg_cas05,19,247,4 duplicate(Gondul) Gondul#p5-6 722 -prtg_cas05,19,243,4 duplicate(Gondul) Gondul#p5-7 722 -prtg_cas05,26,247,4 duplicate(Gondul) Gondul#p5-8 722 -prtg_cas05,26,243,4 duplicate(Gondul) Gondul#p5-9 722 -prtg_cas05,249,289,4 duplicate(Gondul) Gondul#p5-10 722 -prtg_cas05,256,289,4 duplicate(Gondul) Gondul#p5-11 722 -prtg_cas05,253,271,4 duplicate(Gondul) Gondul#p5-12 722 -prtg_cas05,273,257,4 duplicate(Gondul) Gondul#p5-13 722 +prtg_cas05,19,243,4 duplicate(Gondul3) Gondul#p5-7 722 +prtg_cas05,26,247,4 duplicate(Gondul3) Gondul#p5-8 722 +prtg_cas05,26,243,4 duplicate(Gondul3) Gondul#p5-9 722 +prtg_cas05,249,289,4 duplicate(Gondul3) Gondul#p5-10 722 +prtg_cas05,256,289,4 duplicate(Gondul3) Gondul#p5-11 722 +prtg_cas05,253,271,4 duplicate(Gondul3) Gondul#p5-12 722 +prtg_cas05,273,257,4 duplicate(Gondul3) Gondul#p5-13 722 -- cgit v1.2.3-70-g09d2