Hercules April 22 MEGA-ULTRA-LONG Patch~!

http://hercules.ws/board/topic/470-hercules-april-22-patch/
Signed-off-by: shennetsind <ind@henn.et>

11 files changed, 139 insertions, 69 deletions

diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf
new file mode 100644
index 000000000..381d898e0
--- /dev/null
+++ b/db/cashshop_db.conf
@@ -0,0 +1,55 @@
+//====================================================
+//=       _   _                     _           
+//=      | | | |                   | |          
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//=                                                  
+//=            http://hercules.ws/board/                        
+//====================================================
+//= http://hercules.ws/board/topic/367-introducing-cash-shop-support/
+
+cash_shop: (
+{
+	cat_0: { //New
+		Apple:100
+		ID531:250
+	}
+	
+	cat_1: { //Popular
+		ID513:100
+		Banana_Juice:250
+	}
+	
+	cat_2: { //Limited
+		Grape:100
+		ID533:250
+	}
+	
+	cat_3: { //Rental
+		ID515:100
+		Carrot_Juice:250
+	}
+	
+	cat_4: { //Permanent
+		Green_Herb:100
+		ID510:250
+	}
+	
+	cat_5: { //Scroll
+		ID501:100
+		ID502:250
+	}
+	
+	cat_6: { //Usable
+		White_Potion:150
+		Blue_Potion:500
+	}
+	
+	cat_7: { //Other
+		ID909:400
+		ID907:500
+	}
+}
+)
\ No newline at end of file
diff --git a/db/cashshop_db.txt b/db/cashshop_db.txt
deleted file mode 100644
index fc6a803c7..000000000
--- a/db/cashshop_db.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-// Hercules Cash Shop Database
-// Format: 
-// Tab ID or Tab Name, ItemID or Item Name, Price
-//
-// Tabs:
-// 0 = New
-// 1 = Popular
-// 2 = Limited
-// 3 = Rental
-// 4 = Permanent
-// 5 = Scroll
-// 6 = Usable
-// 7 = Other
-
-//New
-New,Apple,100
-0,531,250
-
-//Popular
-1,513,100
-Popular,Banana_Juice,250
-
-//Limited
-2,Grape,100
-Limited,533,250
-
-//Rental
-Rental,515,100
-3,Carrot_Juice,250
-
-//Permanent
-4,Green_Herb,100
-Permanent,510,250
-
-//Scroll
-5,501,100
-5,502,250
-
-//Usable
-usable,White_Potion,150
-usable,Blue_Potion,500
-
-//Other
-7,909,400
-7,907,500
\ No newline at end of file
diff --git a/db/const.txt b/db/const.txt
index d3d5991ab..ec051c4b0 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -333,8 +333,6 @@ mf_snow	16
 mf_fog	17
 mf_sakura	18
 mf_leaves	19
-mf_rain	20
-mf_nogo	22
 mf_clouds	23
 mf_clouds2	24
 mf_fireworks	25
diff --git a/db/pre-re/item_combo_db.txt b/db/pre-re/item_combo_db.txt
index c1eb3c039..f745d25b7 100644
--- a/db/pre-re/item_combo_db.txt
+++ b/db/pre-re/item_combo_db.txt
@@ -9,10 +9,10 @@
 1421:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; }
 1422:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; }
 1428:2115,{ bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5; }
-1472:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getrefine(); }
-1472:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getrefine(); }
-1473:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getrefine(); }
-1473:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getrefine(); }
+1472:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); }
+1472:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); }
+1473:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); }
+1473:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); }
 1474:2527,{ bonus2 bAddRace,RC_Dragon,5; }
 1477:2700,{ bonus2 bResEff,Eff_Confusion,9500; }
 1479:2700,{ bonus2 bResEff,Eff_Confusion,9500; }
@@ -23,11 +23,11 @@
 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
 1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; }
 1616:2515,{ bonus bSpeedRate,25; }
-1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; }
+1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_R)*3; }
 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; }
+1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_R)*3; }
 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getrefine(); }
+1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R); }
 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; }
 1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; }
 1723:2718,{ bonus bDex,1; bonus bMaxSP,50; bonus bSPrecovRate,10; }
diff --git a/db/pre-re/item_trade.txt b/db/pre-re/item_trade.txt
index b5fedbd62..84b0220f5 100644
--- a/db/pre-re/item_trade.txt
+++ b/db/pre-re/item_trade.txt
@@ -1,6 +1,6 @@
 //Item Trading Restrictions File
 //Specify here special rules for item trading.
-//Item ID, TradeMask, GM-Level Override
+//Item ID, TradeMask, Group-Level Override
 //Trading mask values:
 //1:Item can't be droped
 //2:Item can't be traded (nor vended)
@@ -13,7 +13,7 @@
 //256:Item can't be auctioned
 //Example:
 //1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),
-//only GMs of GM-level 50 and up can override the setting.
+//only groups of group-level 50 and up can override the setting.
 
 // Wedding Related items
 2634,507,100	// Wedding Ring
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 36689ac57..6fb18084b 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -16,11 +16,42 @@
 //= maps can be linked to a specific zone through the zone mapflag
 //= '<map name><tab>mapflag<tab>zone<tab><zone name>'
 //== available types for 'disabled_skills':
-//= PLAYER, HOMUN, MERCENARY, MONSTER, ALL and NONE
+//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, ALL and NONE
 //== More on
 //= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
 zones: (
 {
+	/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
+	name: "All" /* changing this name requires MAP_ZONE_ALL_NAME to also be changed in src/map/map.h file */
+
+	disabled_skills: {
+		//both examples below disable napalm beat (id 11) to players
+		//MG_NAPALMBEAT: "PLAYER"
+		//ID11: "PLAYER"
+	}
+
+	disabled_items: {
+		//Both examples below disable apple (id 501)
+		//Apple: true
+		//ID501: true
+	}
+	
+	mapflags: ( )
+	
+	/* "command:min-group-lv-to-override" e.g. "heal: 70" */
+	disabled_commands: {
+		//Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
+		//heal: 70
+	}
+	skill_damage_cap: {
+		//Exemple Below caps firebolt damage in maps within this zone to a maximum 50 damage,
+		// (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
+		// to players and monsters.
+		//MG_FIREBOLT: (50,"PLAYER | MONSTER")
+	}
+},
+{
 	/* Normal zone is applied to all maps that are not pkable (where players cant fight each other)  */
 	/* However, it wont be applied to maps with its own zones (specified thru mapflag) */
 	name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
@@ -37,6 +68,7 @@ zones: (
 	
 	}
 	mapflags: ( )
+	
 },
 {
 	/* PvP zone is applied to all maps with a pvp mapflag */
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index 806bb4d11..df52ec439 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -38,7 +38,6 @@
 //    0x1000- disable usage on enemies (for non-offensive skills).
 //    0x2000- skill ignores land protector (e.g. arrow shower)
 //    0x4000- chorus skill
-//    0x8000- skill wont be passed to clones
 // 13 maxcount: max amount of skill instances to place on the ground when
 //    player_land_skill_limit/monster_land_skill_limit is enabled. For skills
 //    that attack using a path, this is the path length to be used.
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index d921689c3..26b955d9b 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -12,10 +12,10 @@
 1422:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; }
 1428:2115,{ bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5; }
 1433:2153,{ bonus2 bSkillAtk,"CR_GRANDCROSS",10; bonus2 bSkillAtk,"LG_RAYOFGENESIS",10; }
-1472:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getrefine(); }
-1472:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getrefine(); }
-1473:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getrefine(); }
-1473:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getrefine(); }
+1472:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getequiprefinerycnt(EQI_HAND_R); }
+1472:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getequiprefinerycnt(EQI_HAND_R); }
+1473:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getequiprefinerycnt(EQI_HAND_R); }
+1473:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bVariableCastrate,-getequiprefinerycnt(EQI_HAND_R); }
 1474:2527,{ bonus2 bAddRace,RC_Dragon,5; }
 1477:2700,{ bonus2 bResEff,Eff_Confusion,9500; }
 1479:2700,{ bonus2 bResEff,Eff_Confusion,9500; }
@@ -26,11 +26,11 @@
 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
 1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
 1616:2515,{ bonus bSpeedRate,25; }
-1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; }
+1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_R)*3; }
 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; }
+1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_R)*3; }
 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getrefine(); }
+1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R); }
 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; }
 1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
 1657:2471:2569:15029,{ bonus bHealPower,25; }
diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt
index 9ad2a8c65..c6faa991b 100644
--- a/db/re/item_trade.txt
+++ b/db/re/item_trade.txt
@@ -1,6 +1,6 @@
 //Item Trading Restrictions File
 //Specify here special rules for item trading.
-//Item ID, TradeMask, GM-Level Override
+//Item ID, TradeMask, Group-Level Override
 //Trading mask values:
 //1:Item can't be droped
 //2:Item can't be traded (nor vended)
@@ -13,7 +13,7 @@
 //256:Item can't be auctioned
 //Example:
 //1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),
-//only GMs of GM-level 50 and up can override the setting.
+//only groups of group-level 50 and up can override the setting.
 
 // Wedding Related items
 2634,507,100	// Wedding Ring
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 36689ac57..6fb18084b 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -16,11 +16,42 @@
 //= maps can be linked to a specific zone through the zone mapflag
 //= '<map name><tab>mapflag<tab>zone<tab><zone name>'
 //== available types for 'disabled_skills':
-//= PLAYER, HOMUN, MERCENARY, MONSTER, ALL and NONE
+//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, ALL and NONE
 //== More on
 //= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
 zones: (
 {
+	/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
+	name: "All" /* changing this name requires MAP_ZONE_ALL_NAME to also be changed in src/map/map.h file */
+
+	disabled_skills: {
+		//both examples below disable napalm beat (id 11) to players
+		//MG_NAPALMBEAT: "PLAYER"
+		//ID11: "PLAYER"
+	}
+
+	disabled_items: {
+		//Both examples below disable apple (id 501)
+		//Apple: true
+		//ID501: true
+	}
+	
+	mapflags: ( )
+	
+	/* "command:min-group-lv-to-override" e.g. "heal: 70" */
+	disabled_commands: {
+		//Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
+		//heal: 70
+	}
+	skill_damage_cap: {
+		//Exemple Below caps firebolt damage in maps within this zone to a maximum 50 damage,
+		// (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
+		// to players and monsters.
+		//MG_FIREBOLT: (50,"PLAYER | MONSTER")
+	}
+},
+{
 	/* Normal zone is applied to all maps that are not pkable (where players cant fight each other)  */
 	/* However, it wont be applied to maps with its own zones (specified thru mapflag) */
 	name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
@@ -37,6 +68,7 @@ zones: (
 	
 	}
 	mapflags: ( )
+	
 },
 {
 	/* PvP zone is applied to all maps with a pvp mapflag */
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index ed4671c00..0bb63d7e9 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -38,7 +38,6 @@
 //    0x1000- disable usage on enemies (for non-offensive skills).
 //    0x2000- skill ignores land protector (e.g. arrow shower)
 //    0x4000- chorus skill
-//    0x8000- skill wont be passed to clones
 // 13 maxcount: max amount of skill instances to place on the ground when
 //    player_land_skill_limit/monster_land_skill_limit is enabled. For skills
 //    that attack using a path, this is the path length to be used.