- Replaced more -> rAthena (follow up to r15251).

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

CMakeLists.txt

@@ -15,7 +15,7 @@
 #   HAVE_*   : internal variable indicating if we have and are using something
 #
 # Maintainer: Flávio J. Saraiva (feel free to send complaints or suggestions)
-#   flaviojs @ eAthena forum/irc
+#   flaviojs @ rAthena forum/irc
 #   flaviojs2005 \A-T/ gmail <D.o,T> com
 #
 #####################################################################

Makefile.in

@@ -118,33 +118,33 @@ no_plugins:
 
 install:	conf/%.conf conf/%.txt
 	$(shell read -p "WARNING: This target does not work properly yet. Press Ctrl+C to cancel or Enter to continue.")
-	$(shell mkdir -p /opt/eathena/bin/)
-	$(shell mkdir -p /opt/eathena/etc/eathena/)
-	$(shell mkdir -p /opt/eathena/var/log/eathena/)
-	$(shell mv save /opt/eathena/etc/eathena/save)
-	$(shell mv db /opt/eathena/etc/eathena/db)
-	$(shell mv conf /opt/eathena/etc/eathena/conf)
-	$(shell mv npc /opt/eathena/etc/eathena/npc)
-	$(shell mv log/* /opt/eathena/var/log/eathena/)
-	$(shell cp *-server* /opt/eathena/bin/)
-	$(shell ln -s /opt/eathena/etc/eathena/save/ /opt/eathena/bin/)
-	$(shell ln -s /opt/eathena/etc/eathena/db/ /opt/eathena/bin/)
-	$(shell ln -s /opt/eathena/etc/eathena/conf/ /opt/eathena/bin/)
-	$(shell ln -s /opt/eathena/etc/eathena/npc/ /opt/eathena/bin/)
-	$(shell ln -s /opt/eathena/var/log/eathena/ /opt/eathena/bin/log)
+	$(shell mkdir -p /opt/rathena/bin/)
+	$(shell mkdir -p /opt/rathena/etc/rathena/)
+	$(shell mkdir -p /opt/rathena/var/log/rathena/)
+	$(shell mv save /opt/rathena/etc/rathena/save)
+	$(shell mv db /opt/rathena/etc/rathena/db)
+	$(shell mv conf /opt/rathena/etc/rathena/conf)
+	$(shell mv npc /opt/rathena/etc/rathena/npc)
+	$(shell mv log/* /opt/rathena/var/log/rathena/)
+	$(shell cp *-server* /opt/rathena/bin/)
+	$(shell ln -s /opt/rathena/etc/rathena/save/ /opt/rathena/bin/)
+	$(shell ln -s /opt/rathena/etc/rathena/db/ /opt/rathena/bin/)
+	$(shell ln -s /opt/rathena/etc/rathena/conf/ /opt/rathena/bin/)
+	$(shell ln -s /opt/rathena/etc/rathena/npc/ /opt/rathena/bin/)
+	$(shell ln -s /opt/rathena/var/log/rathena/ /opt/rathena/bin/log)
 
 bin-clean:
-	$(shell rm /opt/eathena/bin/login-server*)
-	$(shell rm /opt/eathena/bin/char-server*)
-	$(shell rm /opt/eathena/bin/map-server*)
+	$(shell rm /opt/rathena/bin/login-server*)
+	$(shell rm /opt/rathena/bin/char-server*)
+	$(shell rm /opt/rathena/bin/map-server*)
 
 uninstall:
 	$(shell read -p "WARNING: This target does not work properly yet. Press Ctrl+C to cancel or Enter to continue.")
 	bin-clean
-	$(shell rm /opt/eathena/bin/save)
-	$(shell rm /opt/eathena/bin/db)
-	$(shell rm /opt/eathena/bin/conf)
-	$(shell rm /opt/eathena/bin/npc)
-	$(shell rm /opt/eathena/bin/log)
-	$(shell rm -rf /opt/eathena/etc/eathena)
-	$(shell rm -rf /opt/eathena/var/log/eathena)
+	$(shell rm /opt/rathena/bin/save)
+	$(shell rm /opt/rathena/bin/db)
+	$(shell rm /opt/rathena/bin/conf)
+	$(shell rm /opt/rathena/bin/npc)
+	$(shell rm /opt/rathena/bin/log)
+	$(shell rm -rf /opt/rathena/etc/rathena)
+	$(shell rm -rf /opt/rathena/var/log/rathena)

conf/readme.txt

@@ -5,7 +5,7 @@ what you ever did without it.
 
 The main thing it does, is provide a way for you to change your config settings without
 having to update the files every time you update your server. You store your changes, and 
-the rest are updated with eA (usually though SVN).
+the rest are updated with rAthena (usually though SVN).
 
 How does this work?
 
@@ -30,4 +30,4 @@ this file everytime you update, and your setting will always be there. Neat, isn
 So, yeah, that's what the import folder is for. I hope to see a lot more people use it, to 
 make my life as a managed server runer better.
 
-Semi-guide by Ajarn
+Semi-guide by Ajarn

doc/packet_struct_notation.txt

@@ -31,7 +31,7 @@ The first line contain a brief description of what the packet does,
 or what it is good for, followed by it's AEGIS name in parentheses;
 first two letters of the AEGIS name specify origin (first letter)
 and destination (second letter) of the packet. If the packet's name
-is not known or is not applicable (eAthena server-server packets),
+is not known or is not applicable (rAthena server-server packets),
 specify at least these two letters to indicate the direction of the
 packet. Do not use S(end)/R(ecv) for this, as it is inaccurate and
 location dependent (if the description is copied to different server

npc/custom/breeder.txt

@@ -25,29 +25,27 @@ prontera,124,201,1	script	Universal Rental Npc	726,{
 	case 1:
 		if((BaseClass == Job_Merchant || BaseJob == Job_SuperNovice) && checkcart() == 0 && getskilllv("MC_PUSHCART")>0) {
 			setcart;
-			close;
 		} else {
 			mes "[Universal Rental Npc]";
 			mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
-			close;
 		}
+		break;
 	case 2:
 		if(BaseJob != Job_Archer && BaseClass == Job_Archer && checkfalcon() == 0 && getskilllv("HT_FALCON")>0) {
 			setfalcon;
-			close;
 		} else {
 			mes "[Universal Rental Npc]";
 			mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
-			close;
 		}
+		break;
 	case 3:
 		if (BaseJob != Job_Swordman && BaseClass == Job_Swordman && checkriding() == 0 && getskilllv("KN_RIDING")>0) {
 			setriding;
-			close;
 		} else {
 			mes "[Universal Rental Npc]";
 			mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
-			close;
 		}
+		break;
 	}
+	close;
 }

npc/custom/etc/bank.txt

@@ -116,4 +116,4 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 		mes "Very well... come again soon.";
 		close;
 	}
-} // EOF
+}

npc/custom/etc/mvp_arena.txt

@@ -319,4 +319,4 @@ pvp_n_4-5	mapflag	pvp_nightmaredrop	off
 pvp_n_5-5	mapflag	pvp_nightmaredrop	off
 pvp_n_6-5	mapflag	pvp_nightmaredrop	off
 pvp_n_7-5	mapflag	pvp_nightmaredrop	off
-pvp_n_8-5	mapflag	pvp_nightmaredrop	off
+pvp_n_8-5	mapflag	pvp_nightmaredrop	off

npc/custom/healer.txt

@@ -16,19 +16,21 @@
 	set .@Buffs,0;	// Also buff players? (1: yes / 0: no)
 	set .@Delay,0;	// Heal delay, in seconds
 
+	callfunc "F_ClearGarbage",0;
 	if (@HD > gettimetick(2)) end;
 	if (.@Price) {
 		message strcharinfo(0),"Healing costs "+.@Price+" Zeny.";
 		if (Zeny < .@Price) end;
 		if(select("^0055FFHeal^000000:^777777Cancel^000000")==2) close;
-		set Zeny, Zeny-.@Price; }
+		set Zeny, Zeny-.@Price;
+	}
 	specialeffect2 313; percentheal 100,100;
 	if (.@Buffs) {
 		specialeffect2 37; sc_start SC_INCREASEAGI,240000,10;
-		specialeffect2 42; sc_start SC_BLESSING,240000,10; }
+		specialeffect2 42; sc_start SC_BLESSING,240000,10;
+	}
 	if (.@Delay) set @HD, gettimetick(2)+.@Delay;
-	if (.@Price) close;
-	end;
+	close;
 }
 
 alberta,185,144,5	duplicate(Healer)	Healer#alb	742
@@ -46,4 +48,4 @@ payon,180,105,5	duplicate(Healer)	Healer#pay	742
 prontera,150,184,5	duplicate(Healer)	Healer#pront	742
 umbala,94,162,5	duplicate(Healer)	Healer#umb	742
 xmas,149,136,5	duplicate(Healer)	Healer#xmas	742
-yuno,152,186,5	duplicate(Healer)	Healer#yuno	742
+yuno,152,186,5	duplicate(Healer)	Healer#yuno	742

npc/custom/itemmall.txt

@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.0 [Masao]
 //===== Compatible With: =====================================
-//= Any rA SVN
+//= rAthena SVN
 //===== Description: =========================================
 //= A Shopstreet in Prontera where players can buy some Equipment.
 //============================================================
@@ -41,4 +41,4 @@ prontera,164,238,4	shop	Headgear 05	832,5340:50000,5341:50000,5342:50000,5343:50
 prontera,151,284,4	shop	Ammunition	880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
 prontera,153,284,4	shop	Alchemist Dealer	880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7136:500,7137:500,7138:500,7139:500
 prontera,155,284,4	shop	Street Dealer	880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
-prontera,157,284,4	shop	Sheepy Gonzales	895,12028:1000,12262:500,12016:750
+prontera,157,284,4	shop	Sheepy Gonzales	895,12028:1000,12262:500,12016:750

npc/custom/resetnpc.txt

@@ -59,4 +59,4 @@ prontera,150,193,4	script	Reset Girl	124,{
 	case 4:
 		close;
 	}
-}
+}

npc/custom/stylist.txt

@@ -30,4 +30,4 @@ prontera,170,180,1	script	Stylist#custom_stylist	122,{
 				break;
 			case 4: set .@Style, .@Revert; setlook .@Look[.@s], .@Revert; break; }
 	} end;
-}
+}

npc/custom/warper.txt

@@ -382,4 +382,4 @@ veins,214,123,4	duplicate(Warper)	Warper#43	811
 dewata,194,178,6	duplicate(Warper)	Warper#44	811
 eclage,107,37,4	duplicate(Warper)	Warper#45	811
 malaya,210,205,4	duplicate(Warper)	Warper#46	811
-malangdo,220,188,6	duplicate(Warper)	Warper#47	811
+malangdo,220,188,6	duplicate(Warper)	Warper#47	811

npc/merchants/advanced_refiner.txt

@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Compatible With: =====================================
-//= Eathena SVN
+//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.

npc/merchants/enchan_arm.txt

@@ -5,7 +5,7 @@
 //===== Current Version: ===================================== 
 //= 1.1
 //===== Compatible With: ===================================== 
-//= eAhena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Add a +1, 2, or 3, of a random stat to specified armor.

npc/merchants/gemstone.txt

@@ -5,7 +5,7 @@
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
-//= eAhena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Trade various colors of gemstones for other color gemstones.

npc/other/books.txt

@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= Eathena SVN
+//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Various Books found in Prontera Library

npc/quests/gunslinger_quests.txt

@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.6c
 //===== Compatible With: =====================================
-//= SVN eA
+//= rAthena SVN
 //===== Description: =========================================
 //= Gunslinger guns and bullet quests
 //===== Additional Comments: =================================

npc/quests/newgears/2006_headgear.txt

@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Compatible With: =====================================
-//= SVN eA
+//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Censor Bar, Feather Beret, Valk. Helm, Hahoe Mask,

npc/quests/ninja_quests.txt

@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Compatible With: =====================================
-//= SVN eA
+//= rAthena SVN
 //===== Description: =========================================
 //= Ninja quests
 //===== Additional Comments: =================================

npc/scripts_main.conf

@@ -33,5 +33,4 @@ import: npc/scripts_jobs.conf
 import: npc/scripts_guild.conf
 // -- Your NPCs go in this file!
 import: npc/scripts_custom.conf
-// -- eAAC Scripts
 // --------------------------------------------------------------

npc/warps/cities/dewata.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Dewata Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Dewata
 //===== Additional Comments: =================================

npc/warps/cities/dicastes.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= El Dicastes Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for El Dicastes
 //===== Additional Comments: =================================

npc/warps/cities/eclage.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Eclage Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Eclage
 //===== Additional Comments: =================================

npc/warps/cities/malangdo.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Malangdo Island Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Malangdo Island
 //===== Additional Comments: =================================

npc/warps/cities/malaya.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Malaya Port Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Malaya Port
 //===== Additional Comments: =================================

npc/warps/dungeons/dic_dun.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Scaraba Hole Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Scaraba Hole
 //===== Additional Comments: =================================

npc/warps/dungeons/ecl_dun.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Eclage Dungeon Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Eclage Dungeon
 //===== Additional Comments: =================================

npc/warps/fields/bif_fild.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Bifrost Field Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Bifrost Field
 //===== Additional Comments: =================================

npc/warps/fields/dic_fild.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= El Dicastes Field Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for El Dicastes Field
 //===== Additional Comments: =================================

npc/warps/other/paradise.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Paradise Group Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version;
+//= rAthena SVN;
 //===== Description: =========================================
 //= Warp Points for Paradise Group
 //===== Additional Comments: =================================

npc/warps/other/s_workshop.txt

@@ -1,11 +1,11 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
 //= Shadow Workshop Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Shadow Workshop
 //===== Additional Comments: =================================

runserver-sql.bat

@@ -1,5 +1,5 @@
 @echo off
-rem This is and auto-restart script for the eAthena Ragnarok Online Server Emulator.
+rem This is and auto-restart script for the rAthena Ragnarok Online Server Emulator.
 rem It will also keep the map server OPEN after it crashes to that errors may be
 rem more easily identified
 rem Writen by Jbain

sql-files/convert_engine_innodb.sql

@@ -1,5 +1,5 @@
 --
--- eAthena Database Converter ( MyISAM -> InnoDB )
+-- rAthena Database Converter ( MyISAM -> InnoDB )
 --
 
 ALTER TABLE `auction` ENGINE = InnoDB;

sql-files/convert_engine_myisam.sql

@@ -1,5 +1,5 @@
 --
--- eAthena Database Converter ( InnoDB -> MyISAM )
+-- rAthena Database Converter ( InnoDB -> MyISAM )
 --
 
 ALTER TABLE `auction` ENGINE = MyISAM;

sql-files/upgrade_svn12975_view.sql

@@ -1,6 +1,6 @@
 -- The statements below will create a 'view' (virtual table) that mimics
 -- the previous `login` table layout. You can use this hack to make your db
--- compatible with older eathena servers or control panels.
+-- compatible with older *Athena servers or control panels.
 -- Note: also adjust the account.sql.account_db setting in login_athena.conf.
 -- Note: if your CP does not have a config setting for the `login` table name
 --       you'll have to either modify its code or do some table renaming.

src/map/atcommand.c

@@ -3944,9 +3944,8 @@ ACMD_FUNC(reloadmotd)
 ACMD_FUNC(reloadscript)
 {
 	nullpo_retr(-1, sd);
-	//atcommand_broadcast( fd, sd, "@broadcast", "eAthena Server is Rehashing..." );
+	//atcommand_broadcast( fd, sd, "@broadcast", "Server is reloading scripts..." );
 	//atcommand_broadcast( fd, sd, "@broadcast", "You will feel a bit of lag at this point !" );
-	//atcommand_broadcast( fd, sd, "@broadcast", "Reloading NPCs..." );
 
 	flush_fifos();
 	script_reload();
@@ -6650,7 +6649,7 @@ ACMD_FUNC(mail)
 
 /*==========================================
  * Show Monster DB Info   v 1.0
- * originally by [Lupus] eAthena
+ * originally by [Lupus]
  *------------------------------------------*/
 ACMD_FUNC(mobinfo)
 {
@@ -7112,7 +7111,7 @@ ACMD_FUNC(homshuffle)
 
 /*==========================================
  * Show Items DB Info   v 1.0
- * originally by [Lupus] eAthena
+ * originally by [Lupus]
  *------------------------------------------*/
 ACMD_FUNC(iteminfo)
 {