diff options
| -rw-r--r-- | Changelog.txt | 3 | ||||
| -rw-r--r-- | Dev/bugs.txt | 11 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/jail.txt | 4 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/nobranch.txt | 8 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/noicewall.txt | 4 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/nomemo.txt | 23 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/nopenalty.txt | 4 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/nopvp.txt | 3 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/nosave.txt | 5 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/noteleport.txt | 14 |
10 files changed, 66 insertions, 13 deletions
diff --git a/Changelog.txt b/Changelog.txt index 822aaf02d..f9333ca44 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,7 @@ Date Added +12/23 + * Updated mapflags (added missing payon_in03,ayo_in01,ayo_in02, que_god01, que_god02) [Lupus] + 12/22 * Eliminated skill tree mapping since we have entries for all the classes in the skill_tree.txt files [MouseJstr] diff --git a/Dev/bugs.txt b/Dev/bugs.txt index 36b0fb87f..b051540af 100644 --- a/Dev/bugs.txt +++ b/Dev/bugs.txt @@ -159,3 +159,14 @@ Note: An example of this would be to make the last line of your NPC you right c Problem: Berserk disallows you to talk and never turns off Assigned: N/A Progress: 0% + +Problem: Auto Berserk doesn't automatically start when you get < 25% HP +Assigned: N/A +Progress: 0% + +Problem: When you change JOB, you don't lose skills in DB. It means if you were Merchant once + you can buy/sell with discount being Mage, etc. + Those skills aren't being shown in the skilltree, but they do work. +Assigned: N/A +Progress: 0% + diff --git a/conf-tmpl/mapflag/jail.txt b/conf-tmpl/mapflag/jail.txt index 5e497b911..4ccf63e8c 100644 --- a/conf-tmpl/mapflag/jail.txt +++ b/conf-tmpl/mapflag/jail.txt @@ -36,10 +36,10 @@ sec_pri.gat mapflag nowarp //Uncomment following maps to let your prisoners fight with other prisoners // PvP =================================== -//sec_pri.gat mapflag pvp +sec_pri.gat mapflag pvp // No Party ============================== -//sec_pri.gat mapflag pvp_noparty +sec_pri.gat mapflag pvp_noparty //Nightmare Equipment Drops PVP ========== sec_pri.gat mapflag pvp_nightmaredrop random,equip,300 diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt index d37e055f5..c2906259a 100644 --- a/conf-tmpl/mapflag/nobranch.txt +++ b/conf-tmpl/mapflag/nobranch.txt @@ -2,9 +2,12 @@ //= Map flags that disable dead branching //===== By: ================================================== //= eAthena Dev Team +//= 1.1 [Lupus] //===== Current Version: ===================================== // Cities ================>\\ +ayo_in01.gat mapflag nobranch +ayo_in02.gat mapflag nobranch alb_ship.gat mapflag nobranch alberta_in.gat mapflag nobranch aldeba_in.gat mapflag nobranch @@ -30,6 +33,7 @@ new_1-4.gat mapflag nobranch nif_in.gat mapflag nobranch payon_in01.gat mapflag nobranch payon_in02.gat mapflag nobranch +payon_in03.gat mapflag nobranch prt_castle.gat mapflag nobranch prt_church.gat mapflag nobranch prt_in.gat mapflag nobranch @@ -62,6 +66,10 @@ monk_in.gat mapflag nobranch in_rogue.gat mapflag nobranch job_sage.gat mapflag nobranch +// Special Quests Places ========= +que_god01.gat mapflag noteleport +que_god02.gat mapflag noteleport + // Guild Castles ================== //alde_gld.gat mapflag nobranch aldeg_cas01.gat mapflag nobranch diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt index 08f46877d..7843c6413 100644 --- a/conf-tmpl/mapflag/noicewall.txt +++ b/conf-tmpl/mapflag/noicewall.txt @@ -5,8 +5,11 @@ //============================================================= //= noicewall: Disables Icewall skill. //= To disable Icewall on a specific map add the mapname here. +//= 1.1 [Lupus] //============================================================ +ayo_in01.gat mapflag noicewall +ayo_in02.gat mapflag noicewall alberta_in.gat mapflag noicewall alberta.gat mapflag noicewall alde_alche.gat mapflag noicewall @@ -34,6 +37,7 @@ morocc_in.gat mapflag noicewall morocc.gat mapflag noicewall payon_in01.gat mapflag noicewall payon_in02.gat mapflag noicewall +payon_in03.gat mapflag noicewall payon.gat mapflag noicewall pay_arche.gat mapflag noicewall prt_are_in.gat mapflag noicewall diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt index ada95176b..e28d7aa69 100644 --- a/conf-tmpl/mapflag/nomemo.txt +++ b/conf-tmpl/mapflag/nomemo.txt @@ -2,10 +2,13 @@ //= Map flags that disable warp portal memory //===== By: ================================================== //= eAthena Dev Team +//= 1.1 [Lupus] //===== Current Version: ===================================== -// Towns ==================>\\ +// Towns ==================== +ayo_in01.gat mapflag nomemo +ayo_in02.gat mapflag nomemo alb2trea.gat mapflag nomemo alb_ship.gat mapflag nomemo alberta_in.gat mapflag nomemo @@ -40,6 +43,7 @@ new_1-4.gat mapflag nomemo pay_fild05.gat mapflag nomemo payon_in01.gat mapflag nomemo payon_in02.gat mapflag nomemo +payon_in03.gat mapflag nomemo prt_castle.gat mapflag nomemo prt_church.gat mapflag nomemo prt_in.gat mapflag nomemo @@ -54,7 +58,7 @@ yuno_in02.gat mapflag nomemo yuno_in03.gat mapflag nomemo -// Job quests =================== +// Job quests ================ sword_1-1.gat mapflag nomemo sword_2-1.gat mapflag nomemo sword_3-1.gat mapflag nomemo @@ -76,6 +80,11 @@ monk_in.gat mapflag nomemo in_rogue.gat mapflag nomemo job_sage.gat mapflag nomemo +// Special Quests Places ===== +que_god01.gat mapflag nomemo +que_god02.gat mapflag nomemo + + // Dungeons ================= alde_dun01.gat mapflag nomemo alde_dun02.gat mapflag nomemo @@ -201,10 +210,10 @@ um_dun02.gat mapflag nomemo // Toy Factory --------------- xmas_dun01.gat mapflag nomemo xmas_dun02.gat mapflag nomemo -// Yggdrasil Tree Dun ------- +// Yggdrasil Tree Dun -------- yggdrasil01.gat mapflag nomemo -// Guild Castles =============== +// Guild Castles ============= //alde_gld.gat mapflag nomemo aldeg_cas01.gat mapflag nomemo aldeg_cas02.gat mapflag nomemo @@ -234,14 +243,14 @@ gefg_cas03.gat mapflag nomemo gefg_cas04.gat mapflag nomemo gefg_cas05.gat mapflag nomemo -// GvG Arenas ================= +// GvG Arenas ================ guild_vs1.gat mapflag nomemo guild_vs2.gat mapflag nomemo guild_vs3.gat mapflag nomemo guild_vs4.gat mapflag nomemo guild_vs5.gat mapflag nomemo -// Arenas ====================>\\ +// Arenas ==================== arena_room.gat mapflag nomemo force_1-1.gat mapflag nomemo force_1-2.gat mapflag nomemo @@ -281,7 +290,7 @@ wizard_1-1.gat mapflag nomemo wizard_2-1.gat mapflag nomemo wizard_3-1.gat mapflag nomemo -// PvP Arenas =================== +// PvP Arenas ================ pvp_y_room.gat mapflag nomemo pvp_y_1-1.gat mapflag nomemo pvp_y_1-2.gat mapflag nomemo diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt index 604653527..f0f1df1bd 100644 --- a/conf-tmpl/mapflag/nopenalty.txt +++ b/conf-tmpl/mapflag/nopenalty.txt @@ -2,10 +2,13 @@ //= Map flags that disable exp. penalty on death. //===== By: ================================================== //= eAthena Dev Team +//= 1.1 [Lupus] //===== Current Version: ===================================== // Towns ====================>\\ +ayo_in01.gat mapflag nopenalty +ayo_in02.gat mapflag nopenalty alb_ship.gat mapflag nopenalty alberta.gat mapflag nopenalty alberta_in.gat mapflag nopenalty @@ -44,6 +47,7 @@ nif_in.gat mapflag nopenalty payon.gat mapflag nopenalty payon_in01.gat mapflag nopenalty payon_in02.gat mapflag nopenalty +payon_in03.gat mapflag nopenalty prontera.gat mapflag nopenalty prt_are_in.gat mapflag nopenalty prt_are01.gat mapflag nopenalty diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt index ecddb854a..34f9a75c0 100644 --- a/conf-tmpl/mapflag/nopvp.txt +++ b/conf-tmpl/mapflag/nopvp.txt @@ -3,6 +3,8 @@ //= To disable PvP mode on a specific map add the mapname here. //============================================================ +ayo_in01.gat mapflag nopvp +ayo_in02.gat mapflag nopvp alberta_in.gat mapflag nopvp alberta.gat mapflag nopvp alde_alche.gat mapflag nopvp @@ -55,4 +57,3 @@ yuno_in04.gat mapflag nopvp yuno_in05.gat mapflag nopvp yuno.gat mapflag nopvp gon_test.gat mapflag nopvp - diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt index c12a2df2e..cccdb6473 100644 --- a/conf-tmpl/mapflag/nosave.txt +++ b/conf-tmpl/mapflag/nosave.txt @@ -2,6 +2,7 @@ //= Map flags that disable auto saving //===== By: ================================================== //= eAthena Dev Team +//= 1.1 [Lupus] //===== Current Version: ===================================== // Job Quests ==================== @@ -26,6 +27,10 @@ monk_in.gat mapflag nosave SavePoint in_rogue.gat mapflag nosave SavePoint job_sage.gat mapflag nosave SavePoint +// Special Quests Places ===== +que_god01.gat mapflag nosave SavePoint +que_god02.gat mapflag nosave SavePoint + // GvG Arenas ========================== guild_vs1.gat mapflag nosave SavePoint guild_vs2.gat mapflag nosave SavePoint diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt index bd6f6d8fa..5dc350eae 100644 --- a/conf-tmpl/mapflag/noteleport.txt +++ b/conf-tmpl/mapflag/noteleport.txt @@ -2,9 +2,12 @@ //= Map flags that disable use of fly/butterfly wings //===== By: ================================================== //= eAthena Dev Team +//= 1.1 [Lupus] //===== Current Version: ===================================== -// Cities ===============>\\ +// Cities ======================== +ayo_in01.gat mapflag noteleport +ayo_in02.gat mapflag noteleport alb_ship.gat mapflag noteleport alberta_in.gat mapflag noteleport aldeba_in.gat mapflag noteleport @@ -30,6 +33,7 @@ new_1-4.gat mapflag noteleport nif_in.gat mapflag noteleport payon_in01.gat mapflag noteleport payon_in02.gat mapflag noteleport +payon_in03.gat mapflag noteleport prt_are_in.gat mapflag noteleport prt_are01.gat mapflag noteleport prt_castle.gat mapflag noteleport @@ -42,7 +46,7 @@ yuno_in03.gat mapflag noteleport yuno_in04.gat mapflag noteleport yuno_in05.gat mapflag noteleport -// Job Quests ========================= +// Job Quests ==================== sword_1-1.gat mapflag noteleport sword_2-1.gat mapflag noteleport sword_3-1.gat mapflag noteleport @@ -64,7 +68,11 @@ monk_in.gat mapflag noteleport in_rogue.gat mapflag noteleport job_sage.gat mapflag noteleport -// Guild Castles ==================== +// Special Quests Places ========= +que_god01.gat mapflag noteleport +que_god02.gat mapflag noteleport + +// Guild Castles ================= aldeg_cas01.gat mapflag noteleport aldeg_cas02.gat mapflag noteleport aldeg_cas03.gat mapflag noteleport |