summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorevera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-20 01:37:01 +0000
committerevera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-20 01:37:01 +0000
commit7d322fb667d0b09f8ebd73ddea00a166c15020a5 (patch)
treef83a023960bec86dec52465b9460ad863f54eb8c
parent74365577c739c17540c90b8e9a08537cca7e4e61 (diff)
downloadhercules-7d322fb667d0b09f8ebd73ddea00a166c15020a5.tar.gz
hercules-7d322fb667d0b09f8ebd73ddea00a166c15020a5.tar.bz2
hercules-7d322fb667d0b09f8ebd73ddea00a166c15020a5.tar.xz
hercules-7d322fb667d0b09f8ebd73ddea00a166c15020a5.zip
added ayothaya to nopvp and nopenalty mapflags
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7261 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--conf-tmpl/mapflag/nopenalty.txt1
-rw-r--r--conf-tmpl/mapflag/nopvp.txt3
3 files changed, 4 insertions, 1 deletions
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