diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | conf/Changelog.txt | 2 | ||||
| -rw-r--r-- | conf/mapflag/restricted.txt | 20 | ||||
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/castle_db.txt | 23 | ||||
| -rw-r--r-- | db/skill_nocast_db.txt | 4 | ||||
| -rw-r--r-- | doc/quest_variables.txt | 10 | ||||
| -rw-r--r-- | src/common/mmo.h | 2 |
8 files changed, 44 insertions, 20 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5c0ed5066..a3c9f0d57 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. 2008/04/02 + * Rev. 12462 Updated MAX_GUILDCASTLE to support new castles. [L0ne_W0lf] * Added SV_KEEP_TERMINATOR option to not split the line terminator. * Added sv_split to strlib.c/h (similar to sv_parse). [FlavioJS] 2008/03/31 diff --git a/conf/Changelog.txt b/conf/Changelog.txt index e24f97ea1..019000c43 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2008/04/02 + * Rev. 12462 Uncommented restricted map entryies for WoESE maps. [L0ne_W0lf] 2008/03/07 * Added config settings mob_active_time and boss_active_time, what they do is specify a duration during which monsters will keep running their active diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt index bd6931749..faf542c66 100644 --- a/conf/mapflag/restricted.txt +++ b/conf/mapflag/restricted.txt @@ -31,13 +31,13 @@ force_1-3 mapflag restricted 3 prt_are_in mapflag restricted 3 //WoE:SE Maps -//schg_cas01 mapflag restricted 4 -//schg_cas02 mapflag restricted 4 -//schg_cas03 mapflag restricted 4 -//schg_cas04 mapflag restricted 4 -//schg_cas05 mapflag restricted 4 -//arug_cas01 mapflag restricted 4 -//arug_cas02 mapflag restricted 4 -//arug_cas03 mapflag restricted 4 -//arug_cas04 mapflag restricted 4 -//arug_cas05 mapflag restricted 4 +schg_cas01 mapflag restricted 4 +schg_cas02 mapflag restricted 4 +schg_cas03 mapflag restricted 4 +schg_cas04 mapflag restricted 4 +schg_cas05 mapflag restricted 4 +arug_cas01 mapflag restricted 4 +arug_cas02 mapflag restricted 4 +arug_cas03 mapflag restricted 4 +arug_cas04 mapflag restricted 4 +arug_cas05 mapflag restricted 4 diff --git a/db/Changelog.txt b/db/Changelog.txt index 2c814f42c..0f6638bf6 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -44,6 +44,8 @@ ======================= 2008/04/02 + * Rev. 12462 Added new castles to castle database. [L0ne_W0lf] + * Added new restriction for new castle maps to skill_nocast_db. * Rev. 12460 Updated Anubis drops to official. [L0ne_W0lf] 2008/03/27 * Added constants for the cell checking script function [ultramage] diff --git a/db/castle_db.txt b/db/castle_db.txt index 110d9edd7..ae0a0587c 100644 --- a/db/castle_db.txt +++ b/db/castle_db.txt @@ -22,12 +22,17 @@ 17,prtg_cas03,Fadhgridh,Agit_Pt03,1 // kRO : Lazrigees 18,prtg_cas04,Skoegul,Agit_Pt04,1 // kRO : Squagul 19,prtg_cas05,Gondul,Agit_Pt05,1 // kRO : Guindull -20,nguild_alde,Novice Castle 1,Agit_N01,2 -21,nguild_gef,Novice Castle 2,Agit_N02,2 -22,nguild_pay,Novice Castle 3,Agit_N03,2 -23,nguild_prt,Novice Castle 4,Agit_N04,2 -//24,schg_cas01,Schwaltzvalt Castle,Agit_sc01,1 // kRO : Schwaltzvalt Castle -//25,schg_cas02,Schwaltzvalt Castle,Agit_sc02,1 // kRO : Schwaltzvalt Castle -//26,schg_cas03,Schwaltzvalt Castle,Agit_sc03,1 // kRO : Schwaltzvalt Castle -//27,schg_cas04,Schwaltzvalt Castle,Agit_sc04,1 // kRO : Schwaltzvalt Castle -//28,schg_cas05,Schwaltzvalt Castle,Agit_sc05,1 // kRO : Schwaltzvalt Castle +20,nguild_alde,Earth,Agit_N01,2 +21,nguild_gef,Air,Agit_N02,2 +22,nguild_pay,Water,Agit_N03,2 +23,nguild_prt,Fire,Agit_N04,2 +24,schg_cas01,Himinn,Agit_Sc01,1 // kRO : Himinn +25,schg_cas02,Andlangr,Agit_Sc02,1 // kRO : Andlangr +26,schg_cas03,Viblainn,Agit_Sc03,1 // kRO : Viblainn +27,schg_cas04,Hljod,Agit_Sc04,1 // kRO : Hljod +28,schg_cas05,Skidbladnir,Agit_Sc05,1 // kRO : Skidbladnir +29,arug_cas01,Mardol,Agit_Ar01,1 // kRO : Mardol +30,arug_cas02,Cyr,Agit_Ar02,1 // kRO : Cyr +31,arug_cas03,Horn,Agit_Ar03,1 // kRO : Horn +32,arug_cas04,Gefn,Agit_Ar04,1 // kRO : Gefn +33,arug_cas05,Bandis,Agit_Ar05,1 // kRO : Bandis diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt index 36b89152e..a5d1f3a58 100644 --- a/db/skill_nocast_db.txt +++ b/db/skill_nocast_db.txt @@ -60,3 +60,7 @@ //Zone 3 - Izlude Battle Arena 219,128 //Snatch 26,128 //Teleport + +//Zone 4 - WoE:SE +264,256 //Snap +426,256 //High Jump diff --git a/doc/quest_variables.txt b/doc/quest_variables.txt index 1f2270dc1..5f9adff65 100644 --- a/doc/quest_variables.txt +++ b/doc/quest_variables.txt @@ -94,6 +94,16 @@ Info: Gained access to Rachel Santuary (yes/no) How to set: set MISC_QUEST,MISC_QUEST | 8192; How to check: if(MISC_QUEST & 8192){} +Quest: Message Delivery Quest +Info: Send a message to Elly, in Niflheim from Erious. +How to set: set MISC_QUEST,MISC_QUEST | 16384; +How to check: if(MISC_QUEST & 16384){} + +Quest: Umbala Domestic Dispute? +Info: Reward: 1 yggdrasil leaf. +How to set: set MISC_QUEST,MISC_QUEST | 32768; +How to check: if(MISC_QUEST & 32768){} + -------------------------------------------------------------- Variable: MISC_QUEST2 diff --git a/src/common/mmo.h b/src/common/mmo.h index 845b73a7b..18fda4bee 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -47,7 +47,7 @@ #define MAX_GUILDEXPULSION 32 #define MAX_GUILDALLIANCE 16 #define MAX_GUILDSKILL 15 // increased max guild skills because of new skills [Sara-chan] -#define MAX_GUILDCASTLE 29 // increased to include novice castles [Valaris] +#define MAX_GUILDCASTLE 34 // Updated to include new entries for WoE:SE. [L0ne_W0lf] #define MAX_GUILDLEVEL 50 #define MAX_GUARDIANS 8 //Local max per castle. [Skotlex] |