From 7d322fb667d0b09f8ebd73ddea00a166c15020a5 Mon Sep 17 00:00:00 2001 From: evera Date: Tue, 20 Jun 2006 01:37:01 +0000 Subject: added ayothaya to nopvp and nopenalty mapflags git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7261 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + conf-tmpl/mapflag/nopenalty.txt | 1 + conf-tmpl/mapflag/nopvp.txt | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 635d7892c..a2c7ea9ed 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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/06/19 + * Added Ayothaya to nopenalty and nopvp mapflags. [Evera] * Combo-used Skills with State "move_enable" will now override the "can't move delay". Fixes Break-Fall -> Jump-Kick. [Skotlex] * Some more cleanups of battle_calc_damage to account for absorbed damage diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt index a8829945c..ee4a7f314 100644 --- a/conf-tmpl/mapflag/nopenalty.txt +++ b/conf-tmpl/mapflag/nopenalty.txt @@ -94,6 +94,7 @@ kh_mansion.gat mapflag nopenalty kh_rossi.gat mapflag nopenalty kh_school.gat mapflag nopenalty kh_vila.gat mapflag nopenalty +ayothaya.gat mapflag nopenalty // Job Quests ======================== sword_1-1.gat mapflag nopenalty diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt index 68d22a579..4331e4405 100644 --- a/conf-tmpl/mapflag/nopvp.txt +++ b/conf-tmpl/mapflag/nopvp.txt @@ -76,4 +76,5 @@ airplane.gat mapflag pvp off airport.gat mapflag pvp off einbech.gat mapflag pvp off einbroch.gat mapflag pvp off -ein_in01.gat mapflag pvp off \ No newline at end of file +ein_in01.gat mapflag pvp off +ayothaya.gat mapflag pvp off \ No newline at end of file -- cgit v1.2.3-70-g09d2