- Re-added mapflags deleted in r10734

- Minor fix to the conf file headers

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10739 54d463be-8e91-2dee-dedb-b68131a5f0ec

9 files changed, 12 insertions, 8 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index 6811af2af..db04fdd0b 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/battle/items.conf b/conf-tmpl/battle/items.conf
index d2a43c232..bdd201d6f 100644
--- a/conf-tmpl/battle/items.conf
+++ b/conf-tmpl/battle/items.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/battle/misc.conf b/conf-tmpl/battle/misc.conf
index 977d81e8d..e58378bcb 100644
--- a/conf-tmpl/battle/misc.conf
+++ b/conf-tmpl/battle/misc.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/battle/monster.conf b/conf-tmpl/battle/monster.conf
index 5f4d5677d..c8f01be40 100644
--- a/conf-tmpl/battle/monster.conf
+++ b/conf-tmpl/battle/monster.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/battle/pet.conf b/conf-tmpl/battle/pet.conf
index f7fc12f26..40995cdc5 100644
--- a/conf-tmpl/battle/pet.conf
+++ b/conf-tmpl/battle/pet.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index c06945888..0c981d147 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/battle/status.conf b/conf-tmpl/battle/status.conf
index de54b6f39..8883b6802 100644
--- a/conf-tmpl/battle/status.conf
+++ b/conf-tmpl/battle/status.conf
@@ -19,7 +19,7 @@
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is not limited to 60k (see below)
 // Note 4: Value is a bit field. If no description is given,
-//         assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 // Other Information:
 // All values are limited to a number between 0 and 60k
 // (60000, 600%, 60secs, ...), unless otherwise specified.
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index cca0554e2..2e5993709 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -35,8 +35,12 @@ que_god01	mapflag	nosave	SavePoint
 que_god02	mapflag	nosave	SavePoint
 que_sign01	mapflag	nosave	SavePoint
 que_sign02	mapflag	nosave	SavePoint
+que_thor	mapflag	nosave	SavePoint
+que_ng		mapflag	nosave	SavePoint
 que_rachel	mapflag	nosave	SavePoint
 gon_test	mapflag	nosave	SavePoint
+kh_kiehl01	mapflag	nosave	SavePoint
+kh_kiehl02	mapflag	nosave	SavePoint
 que_bingo	mapflag	nosave	SavePoint
 
 // GvG Arenas ==========================
diff --git a/conf-tmpl/mapflag/nowarpto.txt b/conf-tmpl/mapflag/nowarpto.txt
index f1a0a3a35..cf4e65b93 100644
--- a/conf-tmpl/mapflag/nowarpto.txt
+++ b/conf-tmpl/mapflag/nowarpto.txt
@@ -41,4 +41,4 @@ lhz_dun03	mapflag	nowarpto
 ama_test	mapflag	nowarpto
 gon_test	mapflag	nowarpto
 que_rachel	mapflag	nowarpto
-que_san04	mapflag	nowarpto
\ No newline at end of file
+que_san04	mapflag	nowarpto