- Follow up r17296

-- capped CAMOUFLAGE effect, (defs should be lower then 0, atk bonus max 300, fix cri bonus  (base is 1000 not 100))
-- fix bugreport:7601 and add new mapflad for clif_maptypeproperty2 (nomineeffect, nolockon, noitemconsumption, nousecart, nosumstarmiracle) still investgating full effect
-- harmonize script_ref source


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17297 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/const.txt

@@ -368,6 +368,12 @@ mf_monster_noteleport	49
 mf_pvp_nocalcrank	50
 mf_battleground	51
 mf_reset	52
+mf_channoautojoin	53
+mf_nousecart	54
+mf_noitemconsumption	55
+mf_sumstartmiracle	56
+mf_nomineeffect	57
+mf_nolockon	58
 
 cell_walkable	0
 cell_shootable	1

npc/battleground/bg_common.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Battleground NPCs:
 //= - Generals and Aides
 //= - Battleground Warper

npc/battleground/flavius/flavius01.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Flavius Battleground.
 //= - Winning Team: 9 badges
 //= - Losing Team: 3 badge

npc/battleground/flavius/flavius02.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Flavius Battleground.
 //= - Winning Team: 9 badges
 //= - Losing Team: 3 badge

npc/battleground/flavius/flavius_enter.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Flavius Battleground Entrance NPCs
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.

npc/battleground/kvm/kvm01.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground for levels 80 to 99
 //= - Winning Team: 5 points
 //= - Losing Team: 1 point

npc/battleground/kvm/kvm02.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground for levels 1 to 59
 //= - Winning Team: 1 point
 //= - Losing Team: 0 points

npc/battleground/kvm/kvm03.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground for levels 60 to 80
 //= - Winning Team: 2 points
 //= - Losing Team: 1 point

npc/battleground/kvm/kvm_enter.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground Entrance NPCs
 //= Original NPCs scrapped from bg_common.
 //===== Additional Comments: ================================= 

npc/battleground/kvm/kvm_item_pay.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground Point redemption NPC
 //= * NOTE * 
 //= KvM Does NOT use items, but a character variable to

npc/battleground/tierra/tierra01.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Tierra Gorge Battleground.
 //= - Winning Team: 3 badges
 //= - Losing Team: 1 badge

npc/battleground/tierra/tierra02.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Second Tierra Gorge Battleground.
 //= - Winning Team: 3 badges
 //= - Losing Team: 1 badge

npc/battleground/tierra/tierra_enter.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= [Official Conversion]
 //= Tierra Gorge Battleground Entrance NPCs
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.

npc/cities/aldebaran.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Al De Baran Town NPCs
 //===== Additional Comments: ================================= 
 //= v1.1 Added RS125 NPC.  Added another Kafra Reserve points agent.

npc/cities/amatsu.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Amatsu Town Script
 //===== Additional Comments: ================================= 
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]

npc/cities/ayothaya.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Ayotaya Town Script
 //===== Additional Comments: ================================= 
 //= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/cities/geffen.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Geffen Town NPCs
 //===== Additional Comments: ================================= 
 //= Fully working

npc/cities/gonryun.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Kunlun Town Script
 //===== Additional Comments: ================================= 
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/cities/izlude.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Izlude town NPCs
 //===== Additional Comments: ================================= 
 //= Fully working

npc/cities/louyang.txt

@@ -12,7 +12,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Louyang Town Script
 //===== Additional Comments: ================================= 
 //= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]

npc/cities/manuk.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Town-specific NPCs for Manuk.
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.

npc/cities/niflheim.txt

@@ -6,7 +6,7 @@
 //===== Current Version: ===================================== 
 //= 1.5
 //===== Compatible With: ===================================== 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= rAthena SVN; Niflheim Required
 //===== Description: ========================================= 
 //= Official NPC's for Niflheim

npc/cities/prontera.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= NPCs in Prontera
 //===== Additional Comments: ================================= 
 //= Fully working

npc/cities/rachel.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Partial Aegis Conversion]
+//= [Partial Official Conversion]
 //= Arunafeltz NPCs
 //===== Additional Comments: =================================
 //= 0.5 Text translated from Korean > English, incomplete, 

npc/cities/splendide.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Town-specific NPCs for Splendide.
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.

npc/cities/umbala.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN; RO Episode XX
 //===== Description: =========================================
-//- [Aegis Conversion]
+//- [Official Conversion]
 //= Umbala Town Npcs
 //===== Additional Comments: =================================
 //= 1.0 - Done By jAthena (dunno Who)

npc/cities/veins.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Veins Town Npcs
 //===== Additional Comments: =================================
 //= 1.0 First version [L0ne_W0lf]

npc/cities/yuno.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= NPCs for the City of Juno
 //===== Additional Comments: ================================= 
 //= Added additional npcs.  Added Metto quest. [kobra_k88]

npc/events/children_week.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Indian Ro: Children Week Event
 //===== Additional Comments: =================================
 //= 1.1 First Beta. [Samuray22]

npc/events/christmas_2005.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Event 1: Louise's Kim creates Louise's Santa Hat.
 //= Event 2: Enjoy Happymerry Chistmas Event summons monsters.
 //= Event 3: Oholy requires you to hunt Deviruchi NPCs.

npc/events/god_se_festival.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Post-God Item SE Creation Summoning Event 
 //= Second Sister is a cusotm translation.
 //===== Additional Comments: ================================= 

npc/events/halloween_2006.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Event 1: Redeem "Pumpkin Mojo" for pumpkin headgear.
 //= Event 2: Create "Pumpkin Pie" item.
 //===== Additional Comments: =================================

npc/guild/agit_main.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [ Aegis Conversion]
+//= [ Official Conversion]
 //= ----------------------------------------------------------
 //= - THIS FILE IS REQUIRED FOR GUILD CASTLES TO FUNCTION.
 //= ----------------------------------------------------------

npc/merchants/advanced_refiner.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.
 //= After a conversation with Doddler, it's been established that
 //= the advanced refiner works similar the the "Bubble Gum" item.
@@ -158,4 +158,4 @@ S_RefineValidate:
 	mes "Yeah... There's no need to rush.";
 	mes "Take your time.";
 	close;
-}
+}

npc/merchants/cashheadgear_dye.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Change headgear's color. Cost is a Mysterious Dyestuff
 //===== Additional Comments: =================================
 //= v1.0 First / Optimized Version
@@ -116,4 +116,4 @@ prt_in,253,168,4	script	Alora	862,{
 	delitem .@myHG,1;  // Your headgear
 	getitem .@dyHG,1;  // Dyed headgear
 	close;
-}
+}

npc/merchants/dye_maker.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //===== Additional Comments: ================================= 
 //= 1.0 Fully working [kobra_k88]
 //= 1.1 Spell Checked [Nexon] 

npc/merchants/elemental_trader.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade impure types of elemental stones for pure ones.
 //===== Additional Comments: ================================= 
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
@@ -157,4 +157,4 @@ ama_in02,61,27,7	script	Alchemist#ama	749,{
 	mes "Bring me stones! You said you are going to help me!";
 	mes "Keep your promises! Kehehehkehkeh...";
 	close;
-}
+}

npc/merchants/enchan_arm.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
@@ -148,4 +148,4 @@ S_EnchantArmor:
 		mes "Please come back with just ONE equipment to be enchanted.";
 		close;
 	}
-}
+}

npc/merchants/gemstone.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade various colors of gemstones for other color gemstones.
 //===== Additional Comments: ================================= 
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/merchants/hair_style.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Allows you to change your hairstyle.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to the Aegis 10.3 Standards. [Samuray22]

npc/merchants/milk_trader.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trades bottles for milk
 //===== Additional Comments: =================================
 //= Fully working

npc/merchants/novice_exchange.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Exchanges your Basic Monster drops for Red Potions.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[

npc/merchants/quivers.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Turns arrows into Arrow Quivers.
 // Breakdown of Subroutine "S_BuyQuiver"
 // arg(0): Type of Arrow to be packaged (item ID)

npc/merchants/socket_enchant.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: =================================
 //= 0.1a added missing L_No: to 2 funcs [Lupus]

npc/merchants/socket_enchant2.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.

npc/merchants/wander_pet_food.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade Broken Liquor Jars and alcohol for wanderer
 //= pet food, 'Spirit Liquor'
 //===== Additional Comments: =================================

npc/other/auction.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Auction house releated NPCs, and warps
 //===== Additional Comments: =================================
 //= 1.0 First version, place holders only. [L0ne_W0lf]

npc/other/books.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Various Books found in Prontera Library
 //===== Additional Comments: =================================
 //= 1.0 First Version, rescripted to Aegis 10.3 standard. [L0ne_W0lf]

npc/other/divorce.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Official Divorce script.
 //= Added isloggedin() check, even though Aegis doesn't do it;
 //= should be able to divorce even when the spouse is not online.

npc/other/guildpvp.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Guild Battle with PVP mechanics.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
@@ -53,4 +53,4 @@ pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
 	close2;
 	warp "guild_vs"+.@i,getd(".@map"+.@j+"X["+.@i+"]"),.@mapY[.@i];
 	end;
-}
+}

npc/other/gympass.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Exchange Gym Passes to learn "Enlarge Weight Limit"
 //= iRO NPC situated in Payon beside Kafra Shop.
 //===== Additional Comments: ================================= 

npc/other/mail.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Pickup and write mail from/to players in game.
 //===== Additional Comments: =================================
 //= 1.0 First version, place holders only. [L0ne_W0lf]

npc/other/marriage.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Official Marriage script.
 //= Added isloggedin() check, even though Aegis doesn't do it.
 //= Currently does not support same-sex marriages.

npc/other/monster_museum.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Juno Monster Museum - Non Player Character Locations
 //= - Information about various monsters
 //===== Additional Comments: ================================= 

npc/other/msg_boards.txt

@@ -6,7 +6,7 @@
 //===== Current Version: ===================================== 
 //= 1.6
 //===== Compatible With: ===================================== 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= rAthena 7.15 +
 //===== Description: ========================================= 
 //= Misc. Message Boards for:

npc/other/poring_war.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Poring War
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Kisuka][5511]

npc/other/powernpc.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= Athena SVN 9000+
 //===== Additional Comments: =================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.2 Cleaning. [Euphy]
 //============================================================

npc/other/resetskill.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis conversion]
+//= [Official Conversion]
 //= Permenent first class, base level 40 and under skill resetter.
 //= First Class characters and expanded classes only.
 //= Baby Classes and First Class trans can't use this service.

npc/pre-re/other/arena/arena_point.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Point exchanger: Turbo track points -> Arena Points
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]

npc/pre-re/quests/collection/quest_alligator.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Anolian Skins)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_caramel.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Porcupine Quills)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_coco.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Acorns)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_creamy.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests. (Dialog is semi-custom)
 //= Repeatable EXP Quest (Powder of Butterfly)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_demonpungus.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Bacillus)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_dokebi.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Dokebi Horns)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_dryad.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Sharp Leaves)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_fabre.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Fluffs)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_frilldora.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Frills)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_goat.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Antelope Horns)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_golem.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Stone Hearts)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_hode.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Earthworm Peelings)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_leafcat.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Huge Leaves)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_pecopeco.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Bill of Birds)
 //===== Additional Comments: =================================

npc/pre-re/quests/collection/quest_pupa.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Chrysalis)
 //===== Additional Comments: =================================

npc/pre-re/quests/mrsmile.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.

npc/pre-re/warps/fields/com_fild.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Comodo Fields
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]

npc/quests/bard_quest.txt

@@ -9,7 +9,7 @@
 //===== Description: ========================================= 
 //= Help the bard remember how his song goes.
 //===== Comments: ============================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Needs optimizing.
 //= Reconverted with iRO Dialogs.
 //= Possible NPC conflict with "Representative"

npc/quests/bunnyband.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quest to obtain a Bunny Band headgear.
 //===== Additional Comments: ================================= 
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/quests/cooking_quest.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Official Cooking Quest (10.3)
 //===== Additional Comments: ================================= 
 //= 1.1 Fixed wrong item ID, added missing ";, optimized [Lupus]

npc/quests/counteragent_mixture.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Counteragent and Mixtures for making dyes & Alchemist Job Quest
 //===== Additional Comments: ================================= 
 //= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/quests/doomed_swords.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Doomed Swords Quest:
 //= - Quest for Doomed Swords: Grimtooth, Mysteltain, Executioner.
 //=   Although this quest is enabled on iRO, the Mysteltainn

npc/quests/doomed_swords_quest.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= - Creation of Doomed Swords: Grimtooth, Mysteltain, and
 //=   Executioner.
 //= - Continuation of the Comodo Quest

npc/quests/eye_of_hellion.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quest for getting a Nile Rose
 //= There are two versions of this quest.
 //= Version 1 (Not implemented) was used on iRO as an event
@@ -18,7 +18,7 @@
 //=	Tracking variable is not backwards compatable meaning
 //=     you can again repeat this quest from the start.
 //= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf]
-//= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf]
+//= 1.7 Corrected reminants from Official Conversion. [L0en_w0lf]
 //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.9 Removed duplicate text. [Kisuka]
 //= 2.0 Updated EXP rewards.

npc/quests/guildrelay.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Guild Relay Quest.
 //= Quest designed for multiple users at once.
 //= Variable in use: guildrelay_q (Max: ??)

npc/quests/juice_maker.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Learn where to turn apples, bananas, carrots, and grapes
 //= into juice.
 //= Condition if done: (MISC_QUEST & 1)

npc/quests/lvl4_weapon_quest.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Grade A and Grade S weapon quests
 //===== Additional Comments: ================================= 
 //= 1.0 First Version, Credits goes to Vicious_Pucca for converting [MasterOfMuppets]

npc/quests/mrsmile.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/quests/newgears/2004_headgears.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= 2004 New Headgears. Official Quests
 //= 1) Black Cat Ears (payon 115 131)
 //= 2) X Hairpin, Band Aid, Flower Hairpin (geffen 129 148)

npc/quests/newgears/2005_headgears.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= 2005 Headgears Official Quest.
 //===== Additional Comments: =================================
 //= 1.0 First version, converted from the official aegis script. [MasterOfMuppets]

npc/quests/newgears/2006_headgears.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Censor Bar, Feather Beret, Valk. Helm, Hahoe Mask,
 //= Mythical Lion Mask, Bride Mask, Magistrate Hat and Ayam
 //===== Additional Comments: =================================

npc/quests/newgears/2008_headgears.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: =====================================
 //= SVN rA
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cats Footprint, Cute Ribbon Dyer and Brides Corolla.
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]

npc/quests/obb_quest.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-// [Aegis Conversion]
+// [Official Conversion]
 //= Old Blue Box quest (?)
 //= Officially this quest gave an OBB in exhange for a the
 //= required items unlimitedly, however this was changed by

npc/quests/partyrelay.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Party Relay Quest.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]

npc/quests/quests_13_2.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cat Hand Addition. (Leads to 13.2 areas)
 //= Two Tribes
 //= Monster Suppression

npc/quests/quests_amatsu.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Momotaro Event
 //= Sushi Quest
 //= Dungeon Quest

npc/quests/quests_ayothaya.txt

@@ -7,7 +7,7 @@
 //===== Compatible With ======================================
 //= rAthena SVN
 //===== Description ==========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Ayothaya Ring Quest
 //= Ayothaya Dungeon Quest
 //= Tom Yum Goong Quest

npc/quests/quests_comodo.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= Headgear Quests 1 [Aegis Conversion]:
+//= Headgear Quests 1 [Official Conversion]:
 //= - 'Cross Hat', 'Bulb Hairband'
 //= - 'Striped Hairband', 'Blue Hairband'
 //= Headgear Quests 2:

npc/quests/quests_ein.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis conversion]
+//= [Official Conversion]
 //= Oridecon/Mineral Quest
 //= - Variable in use: ein_gear1 (max 2)
 //= - Variable in use: $ein_amano (max 60)

npc/quests/quests_gonryun.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Broken Sword Quest (Kept old mechanics)
 //= Lost Knife Quest
 //===== Additional Comments: =================================