summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog.txt3
-rw-r--r--conf-tmpl/mapflag/water.txt54
-rw-r--r--conf-tmpl/mapflag/water_height.txt2
-rw-r--r--conf-tmpl/water.txt54
-rw-r--r--conf-tmpl/water_height.txt68
-rw-r--r--npc/npcs_athena.conf3
6 files changed, 6 insertions, 178 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 73940bf61..accf32895 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,9 @@
Date Added
01/26
+ * Removed WATER.TXT (this file wasn't used at all. There's no such mapflag as WATER even). [Lupus]
+ * Added Water Height of New Yuno Fileds 9 and 11.
+ Now Water Ball works there as should. Wizards could levelup on sleepers, too. [Lupus]
* libGC isn't ready to be the default quite yet... [MouseJstr]
Enough people have asked so... Once you grab a copy of the
diff --git a/conf-tmpl/mapflag/water.txt b/conf-tmpl/mapflag/water.txt
deleted file mode 100644
index 71f98470d..000000000
--- a/conf-tmpl/mapflag/water.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// 水の設定。
-// waterは水ありでall_waterは全て水だと判断するマップ。
-
-mjolnir_12.gat mapflag water
-mjolnir_02.gat mapflag water
-glast_01.gat mapflag water
-gef_fild04.gat mapflag water
-prt_fild02.gat mapflag water
-prt_fild01.gat mapflag water
-prt_fild00.gat mapflag water
-gef_fild00.gat mapflag water
-gef_fild07.gat mapflag water
-gef_fild13.gat mapflag water
-gef_fild09.gat mapflag water
-gef_fild01.gat mapflag water
-prt_fild05.gat mapflag water
-gef_fild03.gat mapflag water
-gef_fild10.gat mapflag water
-prt_fild10.gat mapflag water
-pay_arche.gat mapflag water
-moc_ruins.gat mapflag water
-comodo.gat mapflag water
-cmd_fild01.gat mapflag water
-cmd_fild02.gat mapflag water
-cmd_fild03.gat mapflag water
-cmd_fild04.gat mapflag water
-cmd_fild05.gat mapflag water
-moc_fild11.gat mapflag water
-ama_fild01.gat mapflag water
-
-iz_dun00.gat mapflag water
-iz_dun01.gat mapflag water
-iz_dun02.gat mapflag water
-//iz_dun03.gat mapflag all_water
-//iz_dun04.gat mapflag all_water
-treasure01.gat mapflag water
-treasure02.gat mapflag water
-mjo_dun01.gat mapflag water
-orcsdun02.gat mapflag water
-pay_dun01.gat mapflag water
-pay_dun02.gat mapflag water
-pay_dun03.gat mapflag water
-prt_sewb2.gat mapflag water
-prt_sewb3.gat mapflag water
-gl_prison1.gat mapflag water
-alde_dun03.gat mapflag water
-alde_dun04.gat mapflag water
-beach_dun.gat mapflag water
-beach_dun2.gat mapflag water
-beach_dun3.gat mapflag water
-tur_dun01.gat mapflag water
-gld_dun02.gat mapflag water
-gld_dun03.gat mapflag water
-gld_dun04.gat mapflag water
diff --git a/conf-tmpl/mapflag/water_height.txt b/conf-tmpl/mapflag/water_height.txt
index 9a89e29c0..5b89290bb 100644
--- a/conf-tmpl/mapflag/water_height.txt
+++ b/conf-tmpl/mapflag/water_height.txt
@@ -66,3 +66,5 @@ gefg_cas05.gat 5
prtg_cas05.gat 13
tur_dun01.gat -65
ama_fild01.gat 5
+yuno_fild09.gat 10
+yuno_fild11.gat -19
diff --git a/conf-tmpl/water.txt b/conf-tmpl/water.txt
deleted file mode 100644
index 3844802db..000000000
--- a/conf-tmpl/water.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// 水の設定。
-// waterは水ありでall_waterは全て水だと判断するマップ。
-
-mjolnir_12.gat mapflag water
-mjolnir_02.gat mapflag water
-glast_01.gat mapflag water
-gef_fild04.gat mapflag water
-prt_fild02.gat mapflag water
-prt_fild01.gat mapflag water
-prt_fild00.gat mapflag water
-gef_fild00.gat mapflag water
-gef_fild07.gat mapflag water
-gef_fild13.gat mapflag water
-gef_fild09.gat mapflag water
-gef_fild01.gat mapflag water
-prt_fild05.gat mapflag water
-gef_fild03.gat mapflag water
-gef_fild10.gat mapflag water
-prt_fild10.gat mapflag water
-pay_arche.gat mapflag water
-moc_ruins.gat mapflag water
-comodo.gat mapflag water
-cmd_fild01.gat mapflag water
-cmd_fild02.gat mapflag water
-cmd_fild03.gat mapflag water
-cmd_fild04.gat mapflag water
-cmd_fild05.gat mapflag water
-moc_fild11.gat mapflag water
-ama_fild01.gat mapflag water
-
-iz_dun00.gat mapflag water
-iz_dun01.gat mapflag water
-iz_dun02.gat mapflag water
-//iz_dun03.gat mapflag all_water
-//iz_dun04.gat mapflag all_water
-treasure01.gat mapflag water
-treasure02.gat mapflag water
-mjo_dun01.gat mapflag water
-orcsdun02.gat mapflag water
-pay_dun01.gat mapflag water
-pay_dun02.gat mapflag water
-pay_dun03.gat mapflag water
-prt_sewb2.gat mapflag water
-prt_sewb3.gat mapflag water
-gl_prison1.gat mapflag water
-alde_dun03.gat mapflag water
-alde_dun04.gat mapflag water
-beach_dun.gat mapflag water
-beach_dun2.gat mapflag water
-beach_dun3.gat mapflag water
-tur_dun01.gat mapflag water
-gld_dun02.gat mapflag water
-gld_dun03.gat mapflag water
-gld_dun04.gat mapflag water
diff --git a/conf-tmpl/water_height.txt b/conf-tmpl/water_height.txt
deleted file mode 100644
index 9a89e29c0..000000000
--- a/conf-tmpl/water_height.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-// 水場の高さを設定
-//water_height.txt＠AthenaDB計画 2004/03/31 18:52:09 +0900 (JST)
-
-xmas.gat 3
-mjolnir_01.gat 0
-mjolnir_02.gat -19
-mjolnir_12.gat 15
-prt_fild00.gat 11
-prt_fild01.gat 25
-prt_fild02.gat 42
-prt_fild04.gat 14
-prt_fild05.gat 14
-prt_fild10.gat 40
-gef_fild00.gat 10
-gef_fild01.gat 14
-gef_fild03.gat 82
-gef_fild04.gat 14
-gef_fild07.gat 19
-gef_fild09.gat 11
-gef_fild10.gat 24
-moc_fild01.gat 26
-moc_fild11.gat 9
-iz_dun00.gat 5
-iz_dun01.gat 5
-iz_dun02.gat -58
-mjo_dun01.gat 7
-orcsdun02.gat 3
-pay_dun01.gat 8
-pay_dun02.gat 5
-pay_dun03.gat 10
-prt_sewb2.gat 5
-prt_sewb3.gat 5
-treasure01.gat -4
-treasure02.gat -1
-moc_ruins.gat 6
-pay_arche.gat 8
-glast_01.gat 8
-alde_dun03.gat 2
-alde_dun04.gat 0
-gl_prison1.gat 35
-gl_sew01.gat 56
-gl_sew02.gat 12
-gl_sew03.gat 15
-gl_sew04.gat 70
-comodo.gat 14
-cmd_fild01.gat 46
-cmd_fild02.gat 4
-cmd_fild03.gat 0
-cmd_fild04.gat 4
-cmd_fild05.gat 46
-beach_dun2.gat 6
-beach_dun3.gat 0
-beach_dun.gat 9
-gef_fild13.gat 19
-gld_dun02.gat 5
-gld_dun03.gat 14
-gld_dun04.gat 3
-aldeg_cas01.gat 40
-aldeg_cas02.gat 35
-aldeg_cas03.gat 16
-aldeg_cas04.gat 31
-aldeg_cas05.gat 25
-gefg_cas02.gat 8
-gefg_cas04.gat 15
-gefg_cas05.gat 5
-prtg_cas05.gat 13
-tur_dun01.gat -65
-ama_fild01.gat 5
diff --git a/npc/npcs_athena.conf b/npc/npcs_athena.conf
index 5c82acb2b..c503dc65b 100644
--- a/npc/npcs_athena.conf
+++ b/npc/npcs_athena.conf
@@ -21,8 +21,7 @@ npc: conf/mapflag/nowarp.txt
npc: conf/mapflag/nowarpto.txt
npc: conf/mapflag/pvp.txt
npc: conf/mapflag/pvp_noparty.txt
-// Water Flag
-npc: conf/mapflag/water.txt
+
// How high is the water in maps?
water_height: conf/mapflag/water_height.txt
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 05:31:52 +0000