diff options
| -rw-r--r-- | Changelog-Trunk.txt | 6 | ||||
| -rw-r--r-- | conf-tmpl/char_athena.conf | 4 | ||||
| -rw-r--r-- | conf-tmpl/login_athena.conf | 4 | ||||
| -rw-r--r-- | conf-tmpl/map_athena.conf | 3 | ||||
| -rw-r--r-- | conf-tmpl/msg_athena.conf | 5 | ||||
| -rw-r--r-- | npc/scripts_main.conf | 4 | ||||
| -rw-r--r-- | src/map/clif.c | 7 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
8 files changed, 32 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7c6916211..97be47f08 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,12 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/11
+ * Added a comment explaining what a comment is to login/char/map config
+ files, as well as the main script config file. [Skotlex]
+ * Modified SG_FEEL so that it works the same way that in Aegis
+ (packet-wise) [Skotlex]
+ * Added a comment to explain how to "remove" a string variable from the
+ msg_athena entries. [Skotlex]
* Summoned and slave mobs won't show up on @showmobs anymore. [Skotlex]
* Moved Spider Web damage bonus from battle_calc_damage to battle_attr_fix,
so that damage will be doubled based on the actual attack element.
diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf index 0fc0410d5..797bd6905 100644 --- a/conf-tmpl/char_athena.conf +++ b/conf-tmpl/char_athena.conf @@ -1,5 +1,9 @@ // Athena Character configuration file.
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
+
// Server Communication username and password.
userid: s1
passwd: p1
diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf index b61d37eec..c04dac984 100644 --- a/conf-tmpl/login_athena.conf +++ b/conf-tmpl/login_athena.conf @@ -1,6 +1,10 @@ // Athena Login Server configuration file.
// Translated by Peter Kieser <pfak@telus.net>
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
+
// The login server listens on the interface with this IP address.
// NOTE: This allows you to run multiple servers on multiple interfaces
// while using the same ports for each server.
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf index e74dd1eee..ee9fc4ae8 100644 --- a/conf-tmpl/map_athena.conf +++ b/conf-tmpl/map_athena.conf @@ -14,6 +14,9 @@ //eAthena Map-Server Configuration File
//--------------------------------------------------------------
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
//--------------------------------------------------------------
// Configuration Info
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf index 3d08b070a..e168c057b 100644 --- a/conf-tmpl/msg_athena.conf +++ b/conf-tmpl/msg_athena.conf @@ -9,6 +9,11 @@ // 0-499: reserved for GM commands
// 500-999 reserved for others
+// To disable a string (%s) field, make it's max length 0:
+// eg:
+// 270: *%s %s* (@me format)
+// 270: *%.0s%s* (remove the character's name from it)
+
// Messages of GM commands
// -----------------------
diff --git a/npc/scripts_main.conf b/npc/scripts_main.conf index e1b771388..a809f5d71 100644 --- a/npc/scripts_main.conf +++ b/npc/scripts_main.conf @@ -11,6 +11,10 @@ // Thanks,
// Ancyker and the rest of the eAthena Team
//
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
+//
// --------------------------------------------------------------
// --------------------------------------------------------------
// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! -
diff --git a/src/map/clif.c b/src/map/clif.c index 73ab29e6b..569359049 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11514,18 +11514,19 @@ void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd) return;
i = sd->menuskill_lv-1;
if (i<0 || i > 2) return; //Bug?
+
sd->feel_map[i].index = map[sd->bl.m].index;
sd->feel_map[i].m = sd->bl.m;
pc_setglobalreg(sd,feel_var[i],map[sd->bl.m].index);
-
+
+ clif_misceffect2(&sd->bl, 0x1b0);
+ clif_misceffect2(&sd->bl, 0x21f);
WFIFOHEAD(fd,packet_len_table[0x20e]);
WFIFOW(fd,0)=0x20e;
memcpy(WFIFOP(fd,2),map[sd->bl.m].name, MAP_NAME_LENGTH);
WFIFOL(fd,26)=sd->bl.id;
WFIFOW(fd,30)=i;
WFIFOSET(fd, packet_len_table[0x20e]);
-
- clif_skill_nodamage(&sd->bl,&sd->bl,sd->menuskill_id,sd->menuskill_lv,1);
sd->menuskill_lv = sd->menuskill_id = 0;
}
diff --git a/src/map/skill.c b/src/map/skill.c index 92ad67ecd..78ef53fb5 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5404,12 +5404,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break; case SG_FEEL: + //AuronX reported you CAN memorize the same map as all three. [Skotlex] if (sd) { - if(!sd->feel_map[skilllv-1].index) { - //AuronX reported you CAN memorize the same map as all three. [Skotlex] - clif_skill_nodamage(src,bl,skillid,skilllv,1); + if(!sd->feel_map[skilllv-1].index) clif_parse_ReqFeel(sd->fd,sd, skilllv); - } else clif_feel_info(sd, skilllv-1); } |