Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-06-01 04:06:10 +00:00
parent d960aa3bee
commit 29749ceaa8
36 changed files with 82 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

48
Makefile.in
View File

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

4
conf/readme.txt
View File

@ -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 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 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? 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 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. make my life as a managed server runer better.
Semi-guide by Ajarn Semi-guide by Ajarn

2
doc/packet_struct_notation.txt
View File

@ -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; 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) first two letters of the AEGIS name specify origin (first letter)
and destination (second letter) of the packet. If the packet's name 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 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 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 location dependent (if the description is copied to different server

10
npc/custom/breeder.txt
View File

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

2
npc/custom/etc/bank.txt
View File

@ -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."; mes "Very well... come again soon.";
close; close;
} }
} // EOF }

2
npc/custom/etc/mvp_arena.txt
View File

@ -319,4 +319,4 @@ pvp_n_4-5 mapflag pvp_nightmaredrop off
pvp_n_5-5 mapflag pvp_nightmaredrop off pvp_n_5-5 mapflag pvp_nightmaredrop off
pvp_n_6-5 mapflag pvp_nightmaredrop off pvp_n_6-5 mapflag pvp_nightmaredrop off
pvp_n_7-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

12
npc/custom/healer.txt
View File

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

4
npc/custom/itemmall.txt
View File

@ -5,7 +5,7 @@
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 [Masao] //= 1.0 [Masao]
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= Any rA SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= A Shopstreet in Prontera where players can buy some Equipment. //= 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,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,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,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

2
npc/custom/resetnpc.txt
View File

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

2
npc/custom/stylist.txt
View File

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

2
npc/custom/warper.txt
View File

@ -382,4 +382,4 @@ veins,214,123,4 duplicate(Warper) Warper#43 811
dewata,194,178,6 duplicate(Warper) Warper#44 811 dewata,194,178,6 duplicate(Warper) Warper#44 811
eclage,107,37,4 duplicate(Warper) Warper#45 811 eclage,107,37,4 duplicate(Warper) Warper#45 811
malaya,210,205,4 duplicate(Warper) Warper#46 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

2
npc/merchants/advanced_refiner.txt
View File

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

2
npc/merchants/enchan_arm.txt
View File

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

2
npc/merchants/gemstone.txt
View File

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

2
npc/other/books.txt
View File

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

2
npc/quests/gunslinger_quests.txt
View File

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

2
npc/quests/newgears/2006_headgear.txt
View File

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

2
npc/quests/ninja_quests.txt
View File

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

1
npc/scripts_main.conf
View File

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

4
npc/warps/cities/dewata.txt
View File

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

4
npc/warps/cities/dicastes.txt
View File

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

4
npc/warps/cities/eclage.txt
View File

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

4
npc/warps/cities/malangdo.txt
View File

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

4
npc/warps/cities/malaya.txt
View File

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

4
npc/warps/dungeons/dic_dun.txt
View File

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

4
npc/warps/dungeons/ecl_dun.txt
View File

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

4
npc/warps/fields/bif_fild.txt
View File

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

4
npc/warps/fields/dic_fild.txt
View File

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

4
npc/warps/other/paradise.txt
View File

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

4
npc/warps/other/s_workshop.txt
View File

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

2
runserver-sql.bat
View File

@ -1,5 +1,5 @@
@echo off @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 It will also keep the map server OPEN after it crashes to that errors may be
rem more easily identified rem more easily identified
rem Writen by Jbain rem Writen by Jbain

2
sql-files/convert_engine_innodb.sql
View File

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

2
sql-files/convert_engine_myisam.sql
View File

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

2
sql-files/upgrade_svn12975_view.sql
View File

@ -1,6 +1,6 @@
-- The statements below will create a 'view' (virtual table) that mimics -- 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 -- 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: 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 -- 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. -- you'll have to either modify its code or do some table renaming.

7
src/map/atcommand.c
View File

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