- Clarified the comment about spaces in 'server_name' config. (bugreport:2656)

- Grouped all the log file/table settings together, follow up to r15253 (ea:15042).
- Added "DROP TABLE" statements to the mob_skill_db SQL files. (bugreport:5284)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15629 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 30 insertions, 38 deletions

diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 1b5e96a16..498e406f9 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -9,8 +9,10 @@ userid: s1
 passwd: p1
 
 // Server name, use alternative character such as ASCII 160 for spaces.
-// NOTE: Do not use spaces in the name, or guild emblems won't work client-side!
-server_name: RAthena
+// NOTE: Do not use spaces or any of these characters which are not allowed in 
+//       Windows filenames \/:*?"<>|
+//       ... or else guild emblems won't work client-side!
+server_name: rAthena
 
 // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
 wisp_server_name: Server
diff --git a/conf/log_athena.conf b/conf/log_athena.conf
index 13174a018..16430884c 100644
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -110,36 +110,24 @@ log_chat: 0
 // Disable chat logging when WoE is running? (Note 1)
 log_chat_woe_disable: no
 
-// Logging tables/files
+// Logging files/tables
 // Following settings specify where to log to. If 'sql_logs' is
 // enabled, SQL tables are assumed, otherwise flat files.
 
-// Dead Branch Log
+log_gm_db: log/atcommandlog.log
 log_branch_db: log/branchlog.log
-//log_branch_db: branchlog
-
-// Drops & Pickups
-log_pick_db: log/picklog.log
-//log_pick_db: picklog
-
-// Zeny
-log_zeny_db: log/zenylog.log
-//log_zeny_db: zenylog
-
-// MVP Drops
+log_chat_db: log/chatlog.log
 log_mvpdrop_db: log/mvplog.log
-//log_mvpdrop_db: mvplog
-
-// GM Log
-log_gm_db: log/atcommandlog.log
-//log_gm_db: atcommandlog
-
-// NPC Log
 log_npc_db: log/npclog.log
-//log_npc_db: npclog
+log_pick_db: log/picklog.log
+log_zeny_db: log/zenylog.log
 
-// CHAT Log
-log_chat_db: log/chatlog.log
-//log_chat_db: chatlog
+// log_gm_db: atcommandlog
+// log_branch_db: branchlog
+// log_chat_db: chatlog
+// log_mvpdrop_db: mvplog
+// log_npc_db: npclog
+// log_pick_db: picklog
+// log_zeny_db: zenylog
 
 import: conf/import/log_conf.txt
diff --git a/npc/custom/jobs/reset.txt b/npc/custom/jobs/reset.txt
index 8d69650df..2b185b958 100644
--- a/npc/custom/jobs/reset.txt
+++ b/npc/custom/jobs/reset.txt
@@ -14,45 +14,45 @@
 //============================================================
 
 prontera,150,193,4	script	Reset Girl	124,{
-	set @rskill,5000; // Set value in zeny for skill reset here
-	set @rstat,5000; // Set value in zeny for stat reset here
-	set @rboth,9000; // Set value for "package deal" (i.e.: reseting both) here.
+	set .rskill,5000; // Set value in zeny for skill reset here
+	set .rstat,5000; // Set value in zeny for stat reset here
+	set .rboth,9000; // Set value for "package deal" (i.e.: reseting both) here.
 	mes "[Reset Girl]";
 	mes "I am a Reset Girl.";
-	mes "Reset Stats: "+ @rstat +"z";
-	mes "Reset Skills: "+ @rskill +"z";
-	mes "Reset Both: "+ @rboth +"z";
+	mes "Reset Stats: "+ .rstat +"z";
+	mes "Reset Skills: "+ .rskill +"z";
+	mes "Reset Both: "+ .rboth +"z";
 	mes "Please select the service you want:";
 	next;
 	switch(select("^FF3355Reset Skills:Reset Stats:Reset Both^000000:Quit")) {
 	case 1:
 		mes "[Reset Girl]";
-		if (Zeny < @rskill) {
+		if (Zeny < .rskill) {
 			mes "Sorry, you don't have enough Zeny.";
 			close;
 		}
 		mes "Alright, here we go now.. Remember, changes won't take effect until you log back on!";
-		set Zeny,Zeny-@rskill;
+		set Zeny,Zeny-.rskill;
 		ResetSkill;
 		close;
 	case 2:
 		mes "[Reset Girl]";
-		if (Zeny < @rstat) {
+		if (Zeny < .rstat) {
 			mes "Sorry, you don't have enough Zeny.";
 			close;
 		}
 		mes "Alright, here we go now.. Remember, changes won't take effect until you log back on!";
-		set Zeny,Zeny-@rstat;
+		set Zeny,Zeny-.rstat;
 		ResetStatus;
 		close;
 	case 3:
 		mes "[Reset Girl]";
-		if (Zeny < @rboth) {
+		if (Zeny < .rboth) {
 			mes "Sorry, you don't have enough Zeny.";
 			close;
 		}
 		mes "Alright, here we go now.. Remember, changes won't take effect until you log back on!";
-		set Zeny,Zeny-@rboth;
+		set Zeny,Zeny-.rboth;
 		ResetSkill;
 		ResetStatus;
 		close;
diff --git a/sql-files/mob_skill_db.sql b/sql-files/mob_skill_db.sql
index 87b15888d..a06bd271d 100644
--- a/sql-files/mob_skill_db.sql
+++ b/sql-files/mob_skill_db.sql
@@ -2,6 +2,7 @@
 #  Table structure for table `mob_skill_db`
 #
 
+DROP TABLE IF EXISTS `mob_skill_db`;
 CREATE TABLE IF NOT EXISTS `mob_skill_db` (
   `MOB_ID` smallint(6) NOT NULL,
   `INFO` text NOT NULL,
diff --git a/sql-files/mob_skill_db2.sql b/sql-files/mob_skill_db2.sql
index 70680eb06..b44ad3225 100644
--- a/sql-files/mob_skill_db2.sql
+++ b/sql-files/mob_skill_db2.sql
@@ -2,6 +2,7 @@
 #  Table structure for table `mob_skill_db2`
 #
 
+DROP TABLE IF EXISTS `mob_skill_db2`;
 CREATE TABLE IF NOT EXISTS `mob_skill_db2` (
   `MOB_ID` smallint(6) NOT NULL,
   `INFO` text NOT NULL,