From 60cfb9545fbfa1301d147ba242a8048a0fbde758 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Mon, 22 Apr 2013 22:15:23 -0300 Subject: Little fix to start_items. Thanks to lighta! Signed-off-by: Matheus Macabu --- src/char/char.c | 4 ++-- src/common/mmo.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/char/char.c b/src/char/char.c index ae65caa56..204397dd3 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -125,7 +125,7 @@ int max_connect_user = -1; int gm_allow_group = -1; int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; int start_zeny = 0; -int start_items[64]; //32 starting items allowed [mkbu95] +int start_items[MAX_START_ITEMS*2]; int guild_exp_rate = 100; //Custom limits for the fame lists. [Skotlex] @@ -4790,7 +4790,7 @@ int char_config_read(const char* cfgName) i = 0; split = strtok(w2, ","); - while (split != NULL) { + while (split != NULL && i < MAX_START_ITEMS) { split2 = split; split = strtok(NULL, ","); start_items[i] = atoi(split2); diff --git a/src/common/mmo.h b/src/common/mmo.h index c0842bac2..e19c8f94d 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -100,6 +100,7 @@ #define MAX_GUARDIANS 8 //Local max per castle. [Skotlex] #define MAX_QUEST_DB 2400 //Max quests that the server will load #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest +#define MAX_START_ITEMS 32 //Max number of items allowed to be given to a char whenever it's created. [mkbu95] // for produce #define MIN_ATTRIBUTE 0 -- cgit v1.2.3-70-g09d2 From 038174e232c03519474f86e5738cecac34bbdee3 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Mon, 22 Apr 2013 22:23:14 -0300 Subject: Also fixed a behavior of npcwalkto, which was capped by walkpath limit. Signed-off-by: Matheus Macabu --- src/char/char.c | 2 +- src/map/unit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/char/char.c b/src/char/char.c index 204397dd3..b91a3a984 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -4790,7 +4790,7 @@ int char_config_read(const char* cfgName) i = 0; split = strtok(w2, ","); - while (split != NULL && i < MAX_START_ITEMS) { + while (split != NULL && i < MAX_START_ITEMS*2) { split2 = split; split = strtok(NULL, ","); start_items[i] = atoi(split2); diff --git a/src/map/unit.c b/src/map/unit.c index 15421019b..952b1a20e 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -330,7 +330,7 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag) && wpd.path_len > 14 ) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] return 0; #endif - if( battle_config.max_walk_path < wpd.path_len ) + if( (battle_config.max_walk_path < wpd.path_len) && (bl->type != BL_NPC) ) return 0; if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 && -- cgit v1.2.3-70-g09d2 From 3a6517e14649805db47b332934f4cad972d00e95 Mon Sep 17 00:00:00 2001 From: Streusel Date: Tue, 23 Apr 2013 00:24:54 -0700 Subject: -Added missing 0 to KG_KAGEMUSYA cast time, thanks to Shakto for seeing it --- db/re/skill_cast_db.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 677d06f57..ef34d230a 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1681,7 +1681,7 @@ //-- KG_KYOMU 3024,0,0,0,10000:15000:20000:25000:30000,0,0,-1 //-- KG_KAGEMUSYA -3025,0,0,0,60000:90000:120000:15000:180000,0,0,-1 +3025,0,0,0,60000:90000:120000:150000:180000,0,0,-1 //-- OB_ZANGETSU 3026,0,0,0,60000:75000:90000:105000:120000,0,0,-1 //-- OB_OBOROGENSOU -- cgit v1.2.3-70-g09d2 From 4ec9ddf5a8bf6ce6dcffe5c49f6d84ab5ca4c601 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 23 Apr 2013 22:54:21 +0200 Subject: Delete some athena words from files char_athena.conf to char-server.conf --- README.md | 2 +- README.txt | 2 +- conf/groups.conf | 2 +- conf/messages.conf | 2 +- doc/atcommands.txt | 2 +- doc/md5_hashcheck.txt | 2 +- src/char/char.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5b7aac287..0070c6300 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Examples: [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. [Notice]: Please edit your 'login' table to create a proper inter-server user/pa ssword (gender 'S') - [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo + [Notice]: and then edit your user/password in conf/map-server.conf (or conf/impo rt/map_conf.txt) Relax. This is just indicating that you're using the default username and password. To diff --git a/README.txt b/README.txt index 25ba050e9..d259744b5 100644 --- a/README.txt +++ b/README.txt @@ -117,7 +117,7 @@ Examples: [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. [Notice]: Please edit your 'login' table to create a proper inter-server user/pa ssword (gender 'S') - [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo + [Notice]: and then edit your user/password in conf/map_server.conf (or conf/impo rt/map_conf.txt) Relax. This is just indicating that you're using the default username and password. To diff --git a/conf/groups.conf b/conf/groups.conf index 879361387..d3bd6a514 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -41,7 +41,7 @@ Command names must not be aliases. Boolean value. If true then all commands used by the group will be logged to atcommandlog. If setting is omitted in a group definition, false is assumed. -Requires 'log_commands' to be enabled in 'conf/log_athena.conf'. +Requires 'log_commands' to be enabled in 'conf/logs.conf'. A group of settings diff --git a/conf/messages.conf b/conf/messages.conf index 823a6eb65..79e33c885 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -833,7 +833,7 @@ // @reloadatcommand 1036: Error reading groups.conf, reload failed. -1037: Error reading atcommand_athena.conf, reload failed. +1037: Error reading atcommand.conf, reload failed. // @mapinfo 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> ). diff --git a/doc/atcommands.txt b/doc/atcommands.txt index fae920300..b31fe4cef 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -9,7 +9,7 @@ //============================================================ This file describes the usage of in-game commands and assumes that -'conf/atcommand_athena.conf' has the following: +'conf/atcommand.conf' has the following: atcommand_symbol : "@" charcommand_symbol: "#" diff --git a/doc/md5_hashcheck.txt b/doc/md5_hashcheck.txt index 10760a695..12681f367 100644 --- a/doc/md5_hashcheck.txt +++ b/doc/md5_hashcheck.txt @@ -17,7 +17,7 @@ server types, so a client diff is required to ensure the hash is sent. A link containing the required WeeDiffGen plugin can be found at: http://rathena.org/board/topic/70841-r16771-client-md5-hash-check/ -The settings for the hash check are located in conf\login_athena.conf: +The settings for the hash check are located in conf\login.conf: // Client MD5 hash check // If turned on, the login server will check if the client's hash matches diff --git a/src/char/char.c b/src/char/char.c index b91a3a984..be98af10e 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -4935,7 +4935,7 @@ int do_init(int argc, char **argv) if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n"); - ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n"); + ShowNotice("And then change the user/password to use in conf/char-server.conf (or conf/import/char_conf.txt)\n"); } inter_init_sql((argc > 2) ? argv[2] : inter_cfgName); // inter server configuration -- cgit v1.2.3-70-g09d2 From 9437541b47da33d4e6111d5f6e1edb89c1216d4d Mon Sep 17 00:00:00 2001 From: Streusel Date: Tue, 23 Apr 2013 23:59:30 -0700 Subject: -Insignificant --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index d259744b5..81867a4b3 100644 --- a/README.txt +++ b/README.txt @@ -117,7 +117,7 @@ Examples: [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. [Notice]: Please edit your 'login' table to create a proper inter-server user/pa ssword (gender 'S') - [Notice]: and then edit your user/password in conf/map_server.conf (or conf/impo + [Notice]: and then edit your user/password in conf/map-server.conf (or conf/impo rt/map_conf.txt) Relax. This is just indicating that you're using the default username and password. To -- cgit v1.2.3-70-g09d2