summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt17
-rw-r--r--db/item_noequip.txt73
-rw-r--r--db/mob_skill_db.txt40
-rw-r--r--db/packet_db.txt2
-rw-r--r--db/skill_cast_db.txt2
-rw-r--r--db/skill_nocast_db.txt36
6 files changed, 111 insertions, 59 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 4883369e4..23b652d21 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -19,12 +19,29 @@
* Added Rune Knight skills to skill_cast_db
* Updated Rune Knight skills, and Arch Bishop skills.
* Updated SP requirements in skill_require_db.
+2011/09/27
+ * Rev. 14963 Updated item_noequip.txt examples to reflect recent changes (follow up to r14961). [Ai4rei]
2011/08/26
* Rev. 14941 Several updates in relation to 3rd jobs. [L0ne_W0lf]
2011/08/10
* Rev. 14931 Added Brasilis database updates from trunk r14928. [L0ne_W0lf]
+2011/08/09
+ * Rev. 14928 Added remaining database modifications for Brasilis.
+ - Added the skills for the Brasilis monsters.
+ - Added remaining entries for Bathroom Ghost quest.
+ - Added stats for the Suspicious Hydra monsters.
+ - Corrected the capture rate for Suspicious Hydra.
2011/08/07
* Rev. 14927 Merged database changes from trunk r14927. [L0ne_W0lf]
+ * Rev. 14926 Minor item-related updates, and a couple quest database updates. [L0ne_W0lf]
+2011/07/11
+ * Rev. 14901 Lots of updates. :] [L0ne_W0lf]
+ - Added several missing items to the item database, updated others.
+ - Raised level 10 Dec. AGI to be level 48, when used by mobs.
+ - Added missing mercenaries to the mercenary DB, and skills.
+ - Added missing monster_chat_db entries for Nydhoggr's Shadow.
+ - Added Brasilis pets to the pet DB, these pets are unhatchable on purpose.
+ - Added additional quests to the quest_db, mostly for RE.
2011/04/16
* Rev. 14797 Added Archangel Wings (2573) and their respective Box (16998) item based on client-side kRO description. [Ai4rei]
2011/03/19
diff --git a/db/item_noequip.txt b/db/item_noequip.txt
index e73c7089d..6e8b65309 100644
--- a/db/item_noequip.txt
+++ b/db/item_noequip.txt
@@ -2,42 +2,59 @@
// here you define which items may not be used at PvP / GvG
// format: <item id>,<mode>
// mode
-// 1- restricted in PVP
-// 2- restricted in GVG
-// 3- restricted in both PvP and GvG
+// 1 - restricted in normal maps
+// 2 - restricted in PVP
+// 4 - restricted in GVG
+// 8 - restricted in Battlegrounds
// Restricted zones - they're configured by 'restricted <number>' mapflag
-// 4 - restricted in zone 1
-// 8 - restricted in zone 2
-// 16 - restricted in zone 3
-// 32 - restricted in zone 4
-// 64 - restricted in zone 5
-// 128 - restricted in zone 6
-// 256 - restricted in zone 7
+// 32 - restricted in zone 1
+// 64 - restricted in zone 2
+// 128 - restricted in zone 3
+// 256 - restricted in zone 4
+// 512 - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
//Examples:
-//1201,1 you can't use KNIFE(ID 1201) on PvP and GvG
-//608,3 you can't use Yggdrasil Seed(ID 608) on both PvP & GvG & WoE Castles
-//4174,3 Forbid Deviling Card in every PVP or GVG map, and during woes.
-//501,4 you can't use Red Potion on map marked as 'restricted zone 1'
-//502,8 you can't use Orange Potion on map marked as 'restricted zone 2'
-//503,16 you can't use Yellow Potion on map marked as 'restricted zone 3'
+//1201,1 you can't use KNIFE(ID 1201) on normal maps
+//608,4 you can't use Yggdrasil Seed(ID 608) on both GvG and WoE Castles
+//4174,6 Forbid Deviling Card in every PVP or GVG map, and during woes.
+//501,32 you can't use Red Potion on map marked as 'restricted zone 1'
+//502,64 you can't use Orange Potion on map marked as 'restricted zone 2'
+//503,128 you can't use Yellow Potion on map marked as 'restricted zone 3'
// you can even mix modes
-//519,41 (32+8+1) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4'
+//519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4'
+
+//PVP
+14529,2 //Greed Scroll
+
+//GVG
+12218,4 //LV5 Assumptio Scroll
+14529,4 //Greed Scroll
+14590,4 //Party Assumptio 5 Scroll
+
+//BATTLEGROUND
+12218,8 //LV5 Assumptio Scroll
+14590,8 //Party Assumptio 5 Scroll
//Zone 1 - Aldebaran Turbo Track
-601,4 //Fly Wing
-506,4 //Green Potion
-525,4 //Panacea
+601,32 //Fly Wing
+605,32 //Anodyne
+506,32 //Green Potion
+525,32 //Panacea
//Zone 2 - Jail
-601,8 //Fly Wing - not really needed here but ...
-602,8 //Butterfly Wing - also not needed
-12212,8 //Giant Fly Wing
-14582,8
-14583,8
-14584,8
-14585,8
+601,64 //Fly Wing - not really needed here but ...
+602,64 //Butterfly Wing - also not needed
+12212,64 //Giant Fly Wing
+14582,64
+14583,64
+14584,64
+14585,64
//Zone 3 - Izlude Battle Arena
-601,16 //Fly Wing
+601,128 //Fly Wing
+
+//Zone 7 - Towns
+14529,2048 //Greed Scroll
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 57b16f0c7..ba0bd9028 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -250,8 +250,8 @@
1046,Doppelganger@NPC_CRITICALSLASH,attack,170,1,2000,0,5000,yes,target,always,0,,,,,,,
1046,Doppelganger@CR_AUTOGUARD,attack,249,10,2000,500,300000,no,self,always,0,,,,,,29,
1046,Doppelganger@CR_AUTOGUARD,chase,249,10,2000,500,300000,no,self,longrangeattacked,,,,,,,29,
-1046,Doppelganger@AL_DECAGI,attack,30,11,500,0,20000,no,target,always,0,,,,,,5,
-1046,Doppelganger@AL_DECAGI,chase,30,11,500,0,20000,no,target,always,0,,,,,,5,
+1046,Doppelganger@AL_DECAGI,attack,30,48,500,0,20000,no,target,always,0,,,,,,5,
+1046,Doppelganger@AL_DECAGI,chase,30,48,500,0,20000,no,target,always,0,,,,,,5,
1046,Doppelganger@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,1427,,,,,,
1046,Doppelganger@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,1427,,,,,,
1046,Doppelganger@BS_HAMMERFALL,chase,110,11,10000,0,5000,yes,target,skillused,18,,,,,,,
@@ -399,7 +399,7 @@
1086,Golden Thief Bug@NPC_SUMMONSLAVE,idle,196,10,10000,0,0,no,self,onspawn,0,1054,,,,,,
1086,Golden Thief Bug@TF_HIDING,attack,51,1,1000,0,5000,no,self,myhpltmaxrate,20,,,,,,19,
1086,Golden Thief Bug@AL_HEAL,idle,28,11,10000,0,5000,yes,self,mystatuson,hiding,,,,,,,
-1087,Orc Hero@AL_DECAGI,chase,30,11,2000,0,300000,no,target,always,0,,,,,,6,
+1087,Orc Hero@AL_DECAGI,chase,30,48,2000,0,300000,no,target,always,0,,,,,,6,
1087,Orc Hero@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1087,Orc Hero@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
1087,Orc Hero@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -551,7 +551,7 @@
1111,Drainliar@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
1111,Drainliar@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
1111,Drainliar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-1112,Drake@AL_DECAGI,chase,30,11,2000,0,60000,no,target,always,0,,,,,,29,
+1112,Drake@AL_DECAGI,chase,30,48,2000,0,60000,no,target,always,0,,,,,,29,
1112,Drake@NPC_ARMORBRAKE,attack,344,10,2000,0,60000,no,target,always,0,,,,,,,
1112,Drake@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1112,Drake@BS_MAXIMIZE,attack,114,1,500,0,5000,no,self,always,0,,,,,,,
@@ -1151,7 +1151,7 @@
1251,Stormy Knight@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,21,
1251,Stormy Knight@WZ_STORMGUST,chase,89,10,10000,500,5000,no,target,skillused,18,,,,,,21,
1251,Stormy Knight@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1252,Garm@AL_DECAGI,chase,30,11,2000,0,300000,no,target,always,0,,,,,,6,
+1252,Garm@AL_DECAGI,chase,30,48,2000,0,300000,no,target,always,0,,,,,,6,
1252,Garm@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1252,Garm@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
1252,Garm@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -1618,7 +1618,7 @@
1372,Goat@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x1089,,,,,
1372,Goat@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
1372,Goat@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
-1373,Lord of Death@AL_DECAGI,chase,30,11,2000,0,60000,no,target,always,0,,,,,,,
+1373,Lord of Death@AL_DECAGI,chase,30,48,2000,0,60000,no,target,always,0,,,,,,,
1373,Lord of Death@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1373,Lord of Death@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
1373,Lord of Death@NPC_HELLJUDGEMENT,chase,662,10,10000,1000,10000,no,self,always,0,,,,,,36,
@@ -1774,7 +1774,7 @@
1388,Arc Angeling@NPC_SUMMONSLAVE,attack,196,7,10000,700,60000,no,self,slavele,3,1443,1246,1742,1743,1744,18,
1388,Arc Angeling@NPC_SUMMONSLAVE,idle,196,7,10000,700,60000,no,self,slavele,3,1443,1246,1742,1743,1744,18,
1388,Arc Angeling@RG_INTIMIDATE,attack,219,5,2000,0,5000,yes,target,always,0,,,,,,,
-1389,Dracula@AL_DECAGI,chase,30,11,2000,0,5000,no,target,always,0,,,,,,,
+1389,Dracula@AL_DECAGI,chase,30,48,2000,0,5000,no,target,always,0,,,,,,,
1389,Dracula@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1389,Dracula@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
1389,Dracula@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -2882,7 +2882,7 @@
1637,Margaretha Sorin@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
1637,Margaretha Sorin@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
1637,Margaretha Sorin@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1637,Margaretha Sorin@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1637,Margaretha Sorin@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1637,Margaretha Sorin@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
1637,Margaretha Sorin@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
1637,Margaretha Sorin@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3031,7 +3031,7 @@
1643,High Priest Margaretha@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
1643,High Priest Margaretha@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
1643,High Priest Margaretha@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1643,High Priest Margaretha@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1643,High Priest Margaretha@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1643,High Priest Margaretha@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
1643,High Priest Margaretha@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
1643,High Priest Margaretha@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3196,7 +3196,7 @@
1649,High Priest Margaretha@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
1649,High Priest Margaretha@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
1649,High Priest Margaretha@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1649,High Priest Margaretha@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1649,High Priest Margaretha@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1649,High Priest Margaretha@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
1649,High Priest Margaretha@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
1649,High Priest Margaretha@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3382,8 +3382,8 @@
1661,Errende Ebecee@AL_HEAL,chase,28,11,10000,500,5000,yes,self,myhpltmaxrate,30,,,,,,3,
1661,Errende Ebecee@NPC_HOLYATTACK,attack,189,3,1000,0,5000,yes,target,always,0,,,,,,,
1661,Errende Ebecee@NPC_SILENCEATTACK,attack,178,4,1000,700,5000,no,target,always,0,,,,,,,
-1661,Errende Ebecee@AL_DECAGI,attack,30,11,500,1000,5000,no,target,always,0,,,,,,29,
-1661,Errende Ebecee@AL_DECAGI,chase,30,11,500,1000,5000,no,target,always,0,,,,,,29,
+1661,Errende Ebecee@AL_DECAGI,attack,30,48,500,1000,5000,no,target,always,0,,,,,,29,
+1661,Errende Ebecee@AL_DECAGI,chase,30,48,500,1000,5000,no,target,always,0,,,,,,29,
1662,Kavach Icarus@AC_DOUBLE,attack,46,10,500,1000,5000,no,target,always,0,,,,,,,
1662,Kavach Icarus@AC_DOUBLE,attack,46,10,10000,1000,1000,no,target,skillused,46,,,,,,,
1662,Kavach Icarus@AC_DOUBLE,chase,46,10,2000,1000,5000,no,target,always,0,,,,,,,
@@ -3674,8 +3674,8 @@
1707,Thanatos Dolor@NPC_MENTALBREAKER,chase,159,2,500,0,5000,yes,target,always,0,,,,,,30,
1707,Thanatos Dolor@NPC_DARKTHUNDER,attack,341,9,500,1000,5000,no,target,always,0,,,,,,,
1707,Thanatos Dolor@NPC_DARKTHUNDER,chase,341,9,500,1000,5000,no,target,always,0,,,,,,,
-1707,Thanatos Dolor@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
-1707,Thanatos Dolor@AL_DECAGI,attack,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1707,Thanatos Dolor@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
+1707,Thanatos Dolor@AL_DECAGI,attack,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1707,Thanatos Dolor@AL_HEAL,attack,28,8,1000,0,5000,yes,friend,friendhpltmaxrate,40,,,,,,3,
1707,Thanatos Dolor@AL_HEAL,attack,28,8,1000,0,5000,yes,self,myhpltmaxrate,40,,,,,,3,
1707,Thanatos Dolor@AL_HEAL,idle,28,8,1000,0,5000,yes,friend,friendhpltmaxrate,40,,,,,,3,
@@ -3740,8 +3740,8 @@
1712,Thanatos Dolor@NPC_MENTALBREAKER,chase,159,2,500,1000,10000,no,target,always,0,,,,,,,
1712,Thanatos Dolor@NPC_DARKTHUNDER,attack,341,9,500,1000,5000,no,target,always,0,,,,,,,
1712,Thanatos Dolor@NPC_DARKTHUNDER,chase,341,9,500,1000,5000,no,target,always,0,,,,,,,
-1712,Thanatos Dolor@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
-1712,Thanatos Dolor@AL_DECAGI,attack,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1712,Thanatos Dolor@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
+1712,Thanatos Dolor@AL_DECAGI,attack,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1712,Thanatos Dolor@AL_HEAL,attack,28,11,1000,0,5000,yes,friend,friendhpltmaxrate,70,,,,,,3,
1712,Thanatos Dolor@AL_HEAL,attack,28,11,1000,0,5000,yes,self,myhpltmaxrate,70,,,,,,3,
1712,Thanatos Dolor@AL_HEAL,idle,28,9,1000,0,5000,yes,friend,friendhpltmaxrate,70,,,,,,3,
@@ -3982,8 +3982,8 @@
1754,Skeggiold@AL_HEAL,idle,28,9,5000,500,5000,no,self,myhpltmaxrate,30,,,,,,18,
1754,Skeggiold@MG_THUNDERSTORM,attack,21,7,1000,1500,10000,no,target,always,0,,,,,,,
1754,Skeggiold@MG_THUNDERSTORM,chase,21,7,1000,1500,10000,no,target,always,0,,,,,,,
-1754,Skeggiold@AL_DECAGI,attack,30,11,500,0,30000,no,target,always,0,,,,,,29,
-1754,Skeggiold@AL_DECAGI,chase,30,11,500,0,30000,no,target,always,0,,,,,,29,
+1754,Skeggiold@AL_DECAGI,attack,30,48,500,0,30000,no,target,always,0,,,,,,29,
+1754,Skeggiold@AL_DECAGI,chase,30,48,500,0,30000,no,target,always,0,,,,,,29,
1754,Skeggiold@NPC_PETRIFYATTACK,attack,180,2,500,500,5000,no,target,always,0,,,,,,3,
1754,Skeggiold@NPC_PETRIFYATTACK,chase,180,2,500,500,5000,no,target,always,0,,,,,,3,
1754,Skeggiold@RG_STRIPARMOR,attack,217,3,500,0,5000,yes,target,always,0,,,,,,6,
@@ -4116,7 +4116,7 @@
1769,Agav@MG_SAFETYWALL,attack,12,10,2000,0,5000,yes,self,always,0,,,,,,,
1769,Agav@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,0,,,,,,30,
1769,Agav@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,0,,,,,,30,
-1769,Agav@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1769,Agav@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1769,Agav@PR_LEXDIVINA,attack,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
1769,Agav@PR_LEXDIVINA,chase,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
1769,Agav@PR_LEXDIVINA,attack,76,1,5000,0,5000,yes,target,casttargeted,0,,,,,,36,
@@ -4275,7 +4275,7 @@
1786,Agav@MG_SAFETYWALL,attack,12,10,2000,0,5000,yes,self,always,0,,,,,,,
1786,Agav@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,0,,,,,,30,
1786,Agav@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,0,,,,,,30,
-1786,Agav@AL_DECAGI,chase,30,11,2000,0,10000,yes,target,always,0,,,,,,,
+1786,Agav@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
1786,Agav@PR_LEXDIVINA,attack,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
1786,Agav@PR_LEXDIVINA,chase,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
1786,Agav@PR_LEXDIVINA,attack,76,1,5000,0,5000,yes,target,casttargeted,0,,,,,,36,
diff --git a/db/packet_db.txt b/db/packet_db.txt
index cc3bcc353..34c488295 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -909,7 +909,7 @@ packet_ver: 20
0x0285,6
0x0286,4
0x0287,-1
-0x0288,6
+0x0288,6,cashshopbuy,2:4
0x0289,8
0x028a,18
0x028b,-1
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index d2fe73298..3b694d8a1 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -88,7 +88,7 @@
//-- AL_HOLYWATER
31,800,400,500,0,0,0,0
//-- AL_CRUCIS
-32,350,150,2000,0,0,0,0
+32,350,150,2000,0,60000,0
//-- AL ANGELUS
33,350,150,3500,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
//-- AL_BLESSING
diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index 47ec1226b..fe7702560 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -21,29 +21,39 @@
// Example:
// 8,6 = Endure cannot be used in PvP and GvG maps (2+4)
+//PVP
+1013,2 //BS_GREED
+
//GVG
26,4 //AL_TELEPORT
27,4 //AL_WARP
87,4 //WZ_ICEWALL
150,4 //TF_BACKSLIDING
-290,4 //SA_ABRACADABRA
+219,4 //RG_INTIMIDATE
+336,4 //WE_CALLPARTNER
361,4 //HP_ASSUMPTIO
362,4 //HP_BASILICA
395,4 //CG_MOONLIT
+409,4 //WE_CALLPARENT
+410,4 //WE_CALLBABY
491,4 //CR_CULTIVATION
530,4 //NJ_KIRIKAGE
691,4 //CASH_ASSUMPTIO
+1013,2048 //BS_GREED
//BATTLEGROUND
26,8 //AL_TELEPORT
27,8 //AL_WARP
87,8 //WZ_ICEWALL
150,8 //TF_BACKSLIDING
+219,8 //RG_INTIMIDATE
264,8 //MO_BODYRELOCATION
+336,8 //WE_CALLPARTNER
361,8 //HP_ASSUMPTIO
362,8 //HP_BASILICA
395,8 //CG_MOONLIT
-396,8 //CG_MARIONETTE
+409,8 //WE_CALLPARENT
+410,8 //WE_CALLBABY
491,8 //CR_CULTIVATION
411,8 //TK_RUN
426,8 //TK_HIGHJUMP
@@ -72,19 +82,20 @@
79,16 //PR_MAGNUS
//Zone 1 - Aldebaran Turbo Track
-219,32 //RG_INTIMIDATE
+8,32 //SM_ENDURE
26,32 //AL_TELEPORT
27,32 //AL_WARP
-51,32 //TF_HIDING
-135,32 //AS_CLOAKING
-389,32 //ST_CHASEWALK
35,32 //AL_CURE
+51,32 //TF_HIDING
87,32 //WZ_ICEWALL
+135,32 //AS_CLOAKING
+219,32 //RG_INTIMIDATE
+264,32 //MO_BODYRELOCATION
+357,32 //LK_CONCENTRATION
359,32 //LK_BERSERK
362,32 //HP_BASILICA
+389,32 //ST_CHASEWALK
395,32 //CG_MOONLIT
-357,32 //LK_CONCENTRATION
-264,32 //MO_BODYRELOCATION
//Zone 2 - Jail
421,64 //TK_JUMPKICK
@@ -96,6 +107,7 @@
//Zone 4 - WoE:SE
426,256 //TK_HIGHJUMP
+290,256 //SA_ABRACADABRA
//Zone 5 - Sealed Shrine
12,512 //MG_SAFETYWALL
@@ -104,9 +116,15 @@
361,512 //HP_ASSUMPTIO
691,512 //CASH_ASSUMPTIO
-//Zone 6 -Endless Tower
+//Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
26,1024 //AL_TELEPORT
87,1024 //WZ_ICEWALL
219,1024 //RG_INTIMIDATE
405,1024 //PF_SPIDERWEB
674,1024 //NPC_EXPULSION
+
+//Zone 7 - Towns
+232,2048 //AM_CANNIBALIZE
+233,2048 //AM_SPHEREMINE
+491,2048 //CR_CULTIVATION
+1013,2048 //BS_GREED