From 1260d294ed795011b5b73284e308a6a01d9eef9e Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 9 Apr 2011 09:09:35 +0000 Subject: * Merged changes from trunk [14742:14782/trunk]. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/Changelog.txt | 2 ++ conf/battle/client.conf | 2 +- conf/battle/monster.conf | 2 +- conf/mapflag/nobranch.txt | 6 +++++- conf/mapflag/noicewall.txt | 4 ++++ conf/mapflag/nomemo.txt | 4 ++++ conf/mapflag/nopenalty.txt | 3 +++ conf/mapflag/nosave.txt | 4 ++++ conf/mapflag/noteleport.txt | 5 +++++ conf/mapflag/nowarp.txt | 4 ++++ conf/mapflag/nowarpto.txt | 4 ++++ 11 files changed, 37 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 3a1121934..a890c1252 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2011/03/15 + * Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei] 2011/03/06 * Rev. 14732 Added search store info related settings. [Ai4rei] 2011/02/23 diff --git a/conf/battle/client.conf b/conf/battle/client.conf index 143505a36..6a6c58d13 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -48,7 +48,7 @@ min_chat_delay: 0 // valid range of dye's and styles on the client min_hair_style: 0 -max_hair_style: 25 +max_hair_style: 27 min_hair_color: 0 max_hair_color: 8 min_cloth_color: 0 diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf index ada628a37..a4c985055 100644 --- a/conf/battle/monster.conf +++ b/conf/battle/monster.conf @@ -51,7 +51,7 @@ monster_max_aspd: 199 // have players on them, instead of only for mobs who are in the vecinity // of players. // 0x040: When set, when the mob's target changes map, the mob will walk towards -// any npc-warps in it's sight of view (use with mob_npc_warp below) +// any npc-warps in it's sight of view (use with mob_warp below) // 0x100: When set, a mob will pick a random skill from it's list and start from // that instead of checking skills in orders (when unset, if a mob has too // many skills, the ones near the end will rarely get selected) diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index 3e91263da..0684fbe74 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -335,4 +335,8 @@ jupe_core2 mapflag nobranch brasilis mapflag nobranch bra_in01 mapflag nobranch -//evt_zombie mapflag nobranch \ No newline at end of file +//evt_zombie mapflag nobranch + +// Poring War ================== +poring_w01 mapflag nobranch +poring_w02 mapflag nobranch \ No newline at end of file diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt index 13af8e2f4..ae64cc3c0 100644 --- a/conf/mapflag/noicewall.txt +++ b/conf/mapflag/noicewall.txt @@ -141,3 +141,7 @@ nguild_prt mapflag noicewall 4@tower mapflag noicewall 5@tower mapflag noicewall 6@tower mapflag noicewall + +// Poring War ==================== +poring_w01 mapflag noicewall +poring_w02 mapflag noicewall diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index 6e57620c9..e7aea26b6 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -681,3 +681,7 @@ spl_in01 mapflag nomemo 2@nyd mapflag nomemo //evt_zombie mapflag nomemo + +// Poring War ==================== +poring_w01 mapflag nomemo +poring_w02 mapflag nomemo \ No newline at end of file diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt index 0d22861aa..3c7d781a4 100644 --- a/conf/mapflag/nopenalty.txt +++ b/conf/mapflag/nopenalty.txt @@ -251,3 +251,6 @@ bat_a01 mapflag nopenalty bat_a02 mapflag nopenalty //evt_zombie mapflag nopenalty + +// Poring War ================== +poring_w02 mapflag nopenalty \ No newline at end of file diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt index 7c254eee2..5296b049a 100644 --- a/conf/mapflag/nosave.txt +++ b/conf/mapflag/nosave.txt @@ -269,3 +269,7 @@ arug_dun01 mapflag nosave SavePoint schg_dun01 mapflag nosave SavePoint //evt_zombie mapflag nosave SavePoint + +// Poring War ==================== +poring_w01 mapflag nosave SavePoint +poring_w02 mapflag nosave SavePoint \ No newline at end of file diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index 10672aea9..15bd644f0 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -391,3 +391,8 @@ nyd_dun02 mapflag noteleport 2@nyd mapflag monster_noteleport //evt_zombie mapflag noteleport + +// Poring War ==================== +poring_w01 mapflag noteleport +poring_w02 mapflag noteleport +poring_w02 mapflag monster_noteleport \ No newline at end of file diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt index 63c9aaaae..853dcf586 100644 --- a/conf/mapflag/nowarp.txt +++ b/conf/mapflag/nowarp.txt @@ -65,3 +65,7 @@ bat_b01 mapflag nowarp bat_b02 mapflag nowarp bat_a01 mapflag nowarp bat_a02 mapflag nowarp + +// Poring War ================== +poring_w01 mapflag nowarp +poring_w02 mapflag nowarp \ No newline at end of file diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index ca81f6d35..3fc30624b 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -139,3 +139,7 @@ spl_in01 mapflag nowarpto // Nidhoggr's Instance =========== 1@nyd mapflag nowarpto 2@nyd mapflag nowarpto + +// Poring War ==================== +poring_w01 mapflag nowarpto +poring_w02 mapflag nowarpto \ No newline at end of file -- cgit v1.2.3-70-g09d2