moved skill_nocast_db.txt to re / pre-re db path

moved item_noequip.txt to re / pre-re db path 

NOTE: 
 both files are now located in db/re/ (or db/pre-re/) folders
 depending on your build.





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

6 files changed, 195 insertions, 6 deletions

diff --git a/db/item_noequip.txt b/db/pre-re/item_noequip.txt
index 6e8b65309..6e8b65309 100644
--- a/db/item_noequip.txt
+++ b/db/pre-re/item_noequip.txt
diff --git a/db/skill_nocast_db.txt b/db/pre-re/skill_nocast_db.txt
index 34ea55706..34ea55706 100644
--- a/db/skill_nocast_db.txt
+++ b/db/pre-re/skill_nocast_db.txt
diff --git a/db/re/item_noequip.txt b/db/re/item_noequip.txt
new file mode 100644
index 000000000..6e8b65309
--- /dev/null
+++ b/db/re/item_noequip.txt
@@ -0,0 +1,60 @@
+// The equipment/items/cards restriction file 
+// here you define which items may not be used at PvP / GvG 
+// format: <item id>,<mode>
+// mode
+// 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
+// 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 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,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,32 //Fly Wing
+605,32 //Anodyne
+506,32 //Green Potion
+525,32 //Panacea
+
+//Zone 2 - Jail
+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,128 //Fly Wing
+
+//Zone 7 - Towns
+14529,2048 //Greed Scroll
diff --git a/db/re/skill_nocast_db.txt b/db/re/skill_nocast_db.txt
new file mode 100644
index 000000000..34ea55706
--- /dev/null
+++ b/db/re/skill_nocast_db.txt
@@ -0,0 +1,129 @@
+// Forbidden Skills Database
+//
+// Structure of Database:
+// SkillID,Flag
+//
+// Legend for 'Flag' field (bitmask):
+//  1 = Cannot be used in normal maps
+//  2 = Cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
+//  4 = Cannot be used in GvG maps
+//  8 = Cannot be used in Battleground maps
+//  16 = Cannot be cloned (clones will not copy this skill)
+//  Restricted zones - they're configured by 'restricted <number>' mapflag
+//  32 = Cannot be used in zone 1 maps
+//  64 = Cannot be used in zone 2 maps
+//  128 = Cannot be used in zone 3 maps
+//  256 = Cannot be used in zone 4 maps
+//  512 = Cannot be used in zone 5 maps
+//  1024 = Cannot be used in zone 6 maps
+//  2048 = Cannot be used in zone 7 maps
+//
+// 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
+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
+336,8	//WE_CALLPARTNER
+361,8	//HP_ASSUMPTIO
+362,8	//HP_BASILICA
+395,8	//CG_MOONLIT
+409,8	//WE_CALLPARENT
+410,8	//WE_CALLBABY
+491,8	//CR_CULTIVATION
+411,8	//TK_RUN
+426,8	//TK_HIGHJUMP
+427,8	//SG_FEEL
+428,8	//SG_SUN_WARM
+429,8	//SG_MOON_WARM
+430,8	//SG_STAR_WARM
+431,8	//SG_SUN_COMFORT
+432,8	//SG_MOON_COMFORT
+433,8	//SG_STAR_COMFORT
+434,8	//SG_HATE
+435,8	//SG_SUN_ANGER
+436,8	//SG_MOON_ANGER
+437,8	//SG_STAR_ANGER
+438,8	//SG_SUN_BLESS
+439,8	//SG_MOON_BLESS
+440,8	//SG_STAR_BLESS
+530,8	//NJ_KIRIKAGE
+691,8	//CASH_ASSUMPITO
+
+//mixed
+488,3	//CG_HERMODE
+
+//Clone Forbidden/pointless skills
+77,16	//PR_TURNUNDEAD
+79,16	//PR_MAGNUS
+
+//Zone 1 - Aldebaran Turbo Track
+8,32	//SM_ENDURE
+26,32	//AL_TELEPORT
+27,32	//AL_WARP
+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
+
+//Zone 2 - Jail
+421,64	//TK_JUMPKICK
+426,64	//TK_HIGHJUMP
+
+//Zone 3 - Izlude Battle Arena
+219,128 //RG_INTIMIDATE
+26,128	//AL_TELEPORT
+
+//Zone 4 - WoE:SE
+426,256 //TK_HIGHJUMP
+290,256	//SA_ABRACADABRA
+
+//Zone 5 - Sealed Shrine
+12,512	//MG_SAFETYWALL
+26,512	//AL_TELEPORT
+219,512	//RG_INTIMIDATE
+361,512	//HP_ASSUMPTIO
+691,512	//CASH_ASSUMPTIO
+
+//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
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index cce5a19dd..7059cbee7 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -1050,11 +1050,11 @@ static void itemdb_read(void)
 		itemdb_readdb();
 
 	itemdb_read_itemgroup();
-	sv_readdb(db_path, "item_avail.txt",   ',', 2, 2, -1,             &itemdb_read_itemavail);
-	sv_readdb(db_path, "item_noequip.txt", ',', 2, 2, -1,             &itemdb_read_noequip);
-	sv_readdb(db_path, DBPATH"item_trade.txt",   ',', 3, 3, -1,       &itemdb_read_itemtrade);
-	sv_readdb(db_path, "item_delay.txt",   ',', 2, 2, -1, &itemdb_read_itemdelay);
-	sv_readdb(db_path, "item_buyingstore.txt", ',', 1, 1, -1,         &itemdb_read_buyingstore);
+	sv_readdb(db_path, "item_avail.txt",   ',', 2, 2, -1,		&itemdb_read_itemavail);
+	sv_readdb(db_path, DBPATH"item_noequip.txt", ',', 2, 2, -1,	&itemdb_read_noequip);
+	sv_readdb(db_path, DBPATH"item_trade.txt",   ',', 3, 3, -1,	&itemdb_read_itemtrade);
+	sv_readdb(db_path, "item_delay.txt",   ',', 2, 2, -1,		&itemdb_read_itemdelay);
+	sv_readdb(db_path, "item_buyingstore.txt", ',', 1, 1, -1,	&itemdb_read_buyingstore);
 }
 
 /*==========================================
diff --git a/src/map/skill.c b/src/map/skill.c
index fa163c222..9a2e3ed6f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -16901,7 +16901,7 @@ static void skill_readdb(void)
 	sv_readdb(db_path, DBPATH"skill_castnodex_db.txt", ',',   2,  3, MAX_SKILL_DB, skill_parse_row_castnodexdb);
 	sv_readdb(db_path, DBPATH"skill_unit_db.txt"     , ',',   8,  8, MAX_SKILL_DB, skill_parse_row_unitdb);
 
-	sv_readdb(db_path, "skill_nocast_db.txt"   , ',',   2,  2, MAX_SKILL_DB, skill_parse_row_nocastdb);
+	sv_readdb(db_path, DBPATH"skill_nocast_db.txt"   , ',',   2,  2, MAX_SKILL_DB, skill_parse_row_nocastdb);
 
 	skill_init_unit_layout();
 	sv_readdb(db_path, "produce_db.txt"        , ',',   4,  4+2*MAX_PRODUCE_RESOURCE, MAX_SKILL_PRODUCE_DB, skill_parse_row_producedb);