From 3a558ff83b7b7224501adf6eafb2c5a59a870003 Mon Sep 17 00:00:00 2001 From: Atemo Date: Mon, 4 Apr 2016 20:35:58 +0200 Subject: [PATCH] Rename canParticipateSiegeTE into getpermissionwoete --- doc/script_commands.txt | 2 +- npc/re/merchants/te_merchant.txt | 2 +- npc/re/quests/woe_te/te_mission_main.txt | 2 +- npc/re/warps/guildcastles.txt | 2 +- npc/re/woe_te/main_TE.txt | 2 +- src/map/script.c | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 6908e1a780..15b769b9a5 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6674,7 +6674,7 @@ Theses commands behave identically to gvgon/gvgoff, but apply GVG_TE mapflag. --------------------------------------- -*canParticipateSiegeTE {}; +*getpermissionwoete({}); Return 1 if player can participate in WOE:TE, 0 otherwise. Currently third class, Kagerou/Oboro and Rebellion class can't participate in WOE:TE. diff --git a/npc/re/merchants/te_merchant.txt b/npc/re/merchants/te_merchant.txt index 95ae1542d6..f0ca877aac 100644 --- a/npc/re/merchants/te_merchant.txt +++ b/npc/re/merchants/te_merchant.txt @@ -15,7 +15,7 @@ te_alde_gld,215,184,4 duplicate(TE Potion Merchant#prt) TE Potion Merchant#alde //======================================= - script rental_woe_TE -1,{ mes "[Rental Items Manager]"; - if (canParticipateSiegeTE() == 1) { + if (getpermissionwoete() == 1) { .@list01$ = "[Shield] [Armor] [Garment]"; .@list02$ = "[Helmet] [Accessory] [Shoes]"; .@list03$ = "[Sword] [Spear] [Axe] [Katar]"; diff --git a/npc/re/quests/woe_te/te_mission_main.txt b/npc/re/quests/woe_te/te_mission_main.txt index 58d818361d..8882c76ae3 100644 --- a/npc/re/quests/woe_te/te_mission_main.txt +++ b/npc/re/quests/woe_te/te_mission_main.txt @@ -160,7 +160,7 @@ S_Coord: 7509,"30 Small Wooden Boxes" ); } mes "["+ .@npc_name$ +"]"; - if (canParticipateSiegeTE() == 0) { + if (getpermissionwoete() == 0) { mes "Ah... you..."; mes "based on TE rules, I won't be ordering you or asking you favors unfortunately."; next; diff --git a/npc/re/warps/guildcastles.txt b/npc/re/warps/guildcastles.txt index 89aaa0dcec..a5df75f98d 100644 --- a/npc/re/warps/guildcastles.txt +++ b/npc/re/warps/guildcastles.txt @@ -78,7 +78,7 @@ OnTouch: end; S_Warp: - if (canParticipateSiegeTE() == 0) { + if (getpermissionwoete() == 0) { mes "3rd and expansion job level can't enter in WoE TE."; close; } diff --git a/npc/re/woe_te/main_TE.txt b/npc/re/woe_te/main_TE.txt index 17d62edf14..208bee0455 100644 --- a/npc/re/woe_te/main_TE.txt +++ b/npc/re/woe_te/main_TE.txt @@ -1063,7 +1063,7 @@ function script F_flag_woe_TE { mes "Do you wish to return with honor?"; next; if (select( "Return to the fortress.","Forget it." ) == 1) { - if (canParticipateSiegeTE() == 0) { + if (getpermissionwoete() == 0) { mes "Tertiary job class and users with expanded levels are not allowed to participate in Siege Battles TE."; close; } diff --git a/src/map/script.c b/src/map/script.c index 180ec591d1..917ab73903 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -21495,11 +21495,11 @@ BUILDIN_FUNC(getguildalliance) } /** - * canParticipateSiegeTE([]); + * getpermissionwoete([]); * Check if player can participate in WOE:TE * @param char_id Player's CharID (optional) **/ -BUILDIN_FUNC(canParticipateSiegeTE) { +BUILDIN_FUNC(getpermissionwoete) { TBL_PC *sd = NULL; if (!script_charid2sd(2, sd)) { @@ -22092,7 +22092,7 @@ struct script_function buildin_func[] = { BUILDIN_DEF(agitcheck3,""), BUILDIN_DEF(gvgon3,"s"), BUILDIN_DEF(gvgoff3,"s"), - BUILDIN_DEF(canParticipateSiegeTE,"?"), + BUILDIN_DEF(getpermissionwoete,"?"), #include "../custom/script_def.inc"