diff options
| -rw-r--r-- | .tools/reapply.patch4 | 4 | ||||
| -rw-r--r-- | db/re/item_combo_db.conf | 256 | ||||
| -rw-r--r-- | db/re/item_combo_db.txt | 89 |
3 files changed, 260 insertions, 89 deletions
diff --git a/.tools/reapply.patch4 b/.tools/reapply.patch4 index bbf4098cd..df09e40a2 100644 --- a/.tools/reapply.patch4 +++ b/.tools/reapply.patch4 @@ -36,6 +36,10 @@ f4b5f645cac0e50c7dc3079d9a388eed0b62ad9b 7c88915931bd0ff80bba2db07848519cce92d514 6ea8e59e52e8046c5ea8d3a42f3a67d06564e1f7 +## Convert item combo db to use libconfig +ad7ebbedf81c54fdb43f4b4e41aed9fd48543e47 +e66f69797332dcaa0ca948287f4f58aad48f66f9 +548aa1263b69c2c5551d2c5f3d501ebc82d1e067 diff --git a/db/re/item_combo_db.conf b/db/re/item_combo_db.conf new file mode 100644 index 000000000..ecfb20279 --- /dev/null +++ b/db/re/item_combo_db.conf @@ -0,0 +1,256 @@ +//================= Hercules Database ===================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2019 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//================= Description =========================================== +// Configurations file for status effects +//========================================================================= + +combo_db: ( +/************************************************************************** + ************* Entry structure ******************************************** + ************************************************************************** +{ + // ================ Mandatory fields =============================== + Items: ["item_list"] (string, array) list of items + Script: <" + Script + (it can be multi-line) + "> +} +**************************************************************************/ +// Item Combos Database + +// This define set bonuses +// Quivers and Shields usually are not counted. +// A set should have 4 or 5 pieces of equipment. + +// Creased Set Bonus: +1 to all stats +{ + Items: ["CreasedShirt", "CreasedBoots", "CreasedGloves", "CreasedShorts"] + Script: <" + bonus bAllStats, 1; + "> +}, + +// Candor Set Bonus (excluding Bola): +1 to all stats, +1% HP +{ + Items: ["CandorShirt", "CandorBoots", "CandorGloves", "CandorShorts", "CandorHeadBand"] + Script: <" + bonus bAllStats, 1; + bonus bMaxHPrate, 1; + "> +}, + +// Cotton Set Bonus: +1 to all stats, +1% HP, +5% MP +{ + Items: ["CottonShirt", "CottonBoots", "CottonGloves", "CottonShorts"] + Script: <" + bonus bAllStats, 1; + bonus bMaxHPrate, 1; + bonus bMaxSPrate, 5; + "> +}, +{ + Items: ["CottonShirt", "CottonBoots", "CottonGloves", "CottonTrousers"] + Script: <" + bonus bAllStats, 1; + bonus bMaxHPrate, 1; + bonus bMaxSPrate, 5; + "> +}, +{ + Items: ["CottonShirt", "CottonBoots", "CottonGloves", "CottonSkirt"] + Script: <" + bonus bAllStats, 1; + bonus bMaxHPrate, 1; + bonus bMaxSPrate, 5; + "> +}, +{ + Items: ["CottonShirt", "CottonBoots", "CottonGloves", "MiniSkirt"] + Script: <" + bonus bAllStats, 1; + bonus bMaxHPrate, 1; + bonus bMaxSPrate, 5; + "> +}, + +// Miner Set Bonus: +1 to all stats, Vit +2 +{ + Items: ["MinerTankTop", "MinerGloves", "MinerHat", "MinerKnife"] + Script: <" + bonus bAllStats, 1; + bonus bVit, 2; + "> +}, +// Shirt, Gloves, Hat and Pickaxe: Luk +5 instead +{ + Items: ["MinerTankTop", "MinerGloves", "MinerHat", "Pickaxe"] + Script: <" + bonus bAllStats, 1; + bonus bLuk, 5; + "> +}, + +// Warlord Set +// Allstats +1, Blocking +2% + +// Normal +{ + Items: ["WarlordPlate", "WarlordBoots", "WarlordGloves", "WarlordPants", "WarlordHelmet"] + Script: <" + bonus bAllStats, 1; + bonus bFlee2, 2; + "> +}, +// Golden +{ + Items: ["GoldenWarlordPlate", "WarlordBoots", "WarlordGloves", "WarlordPants", "WarlordHelmet"] + Script: <" + bonus bAllStats, 1; + bonus bFlee2, 2; + "> +}, + +// Chainmail Set +// Blocking +1% +// Normal +{ + Items: ["Chainmail", "ChainmailSkirt"] + Script: <" + bonus bFlee2, 1; + "> +}, +// Golden +{ + Items: ["GoldenChainmail", "ChainmailSkirt"] + Script: <" + bonus bFlee2, 1; + "> +}, + +// Terranite Set +// Allstats +1, Int. MDef +30% +{ + Items: ["TerraniteArmor", "TerraniteBoots", "TerraniteGloves", "TerranitePants", "TerraniteMask"] + Script: <" + bonus bAllStats, 1; + bonus bMdef2Rate, 30; + "> +}, + +// Leather Set +// Allstats +2 +// Leather Quiver/Shield not considered +{ + Items: ["LeatherShirt", "LeatherBoots", "LeatherGloves", "LeatherTrousers"] + Script: <" + bonus bAllStats, 2; + "> +}, +{ + Items: ["LeatherShirt", "LeatherBoots", "LeatherGloves", "LeatherTrousers"] + Script: <" + bonus bAllStats, 2; + "> +}, + +// Assassin Set +// Allstats +1, Agi +5 +{ + Items: ["AssassinChest", "AssassinBoots", "AssassinGloves", "AssassinPants"] + Script: <" + bonus bAllStats, 1; + bonus bAgi, 5; + "> +}, + +// Savior Set +// Allstats +3 +// Note: Gloves/Helmet replaced with Shield (2705) temporaly +{ + Items: ["SaviorArmor", "SaviorBoots", "SaviorPants", "SaviorShield"] + Script: <" + bonus bAllStats, 3; + "> +}, + +// Mages Set +// MP Regen bonuses (smaller sets) +{ + Items: ["CottonBoots", "CottonGloves", "SilkRobe"] + Script: <" + bonus2 bSPRegenRate, 5, 2000; + "> +}, +{ + Items: ["CottonBoots", "SilkGloves", "SilkRobe"] + Script: <" + bonus2 bSPRegenRate, 5, 2000; + "> +}, +// Cotton Boots + Cotton/Silk Gloves + Sorcerer Robe - Silk Set (+6 mp/2s) + +{ + Items: ["CottonBoots", "CottonGloves", "SorcererRobe"] + Script: <" + bonus2 bSPRegenRate, 5, 2000; + "> +}, +{ + Items: ["CottonBoots", "SilkGloves", "SorcererRobe"] + Script: <" + bonus2 bSPRegenRate, 5, 2000; + "> +}, +// Wizard Mocassins + Cotton/Silk Gloves + Sorcerer Robe - Mage Set (+7 mp/2s) + +{ + Items: ["WizardMoccasins", "CottonGloves", "SorcererRobe"] + Script: <" + bonus2 bSPRegenRate, 7, 2000; + "> +}, +{ + Items: ["WizardMoccasins", "SilkGloves", "SorcererRobe"] + Script: <" + bonus2 bSPRegenRate, 7, 2000; + "> +}, +// W. Boots + Cotton/Silk Gloves + Sorcerer Robe - Mage Set (+7 mp/2s) + +{ + Items: ["WizardMoccasins", "CottonGloves", "SorcererRobe"] + Script: <" + bonus2 bSPRegenRate, 7, 2000; + "> +}, +{ + Items: ["WizardMoccasins", "SilkGloves", "SorcererRobe"] + Script: <" + bonus2 bSPRegenRate, 7, 2000; + "> +}, +) diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt deleted file mode 100644 index 5ca1d3017..000000000 --- a/db/re/item_combo_db.txt +++ /dev/null @@ -1,89 +0,0 @@ -// Item Combos Database -// -// Structure of Database: -// ID:ID:ID:ID,{ Script } -// This define set bonuses -// Quivers and Shields usually are not counted. -// A set should have 4 or 5 pieces of equipment. - -// Creased Set Bonus: +1 to all stats -// Shirt, Boots, Gloves and Shorts -1300:1816:2004:2200,{bonus bAllStats,1;} - -// Candor Set Bonus (excluding Bola): +1 to all stats, +1% HP -// Shirt, Boots, Gloves, Shorts and Headband -1321:1803:2016:2217:2939,{bonus bAllStats,1;bonus bMaxHPrate,1;} - -// Cotton Set Bonus: +1 to all stats, +1% HP, +5% MP -// Shirt, Boots, Gloves, Shorts -1332:1805:2005:2205,{bonus bAllStats,1;bonus bMaxHPrate,1;bonus bMaxSPrate,5;} -// Shirt, Boots, Gloves, Trousers -1332:1805:2005:2207,{bonus bAllStats,1;bonus bMaxHPrate,1;bonus bMaxSPrate,5;} -// Shirt, Boots, Gloves, Skirt -1332:1805:2005:2209,{bonus bAllStats,1;bonus bMaxHPrate,1;bonus bMaxSPrate,5;} -// Shirt, Boots, Gloves, Miniskirt -1332:1805:2005:2206,{bonus bAllStats,1;bonus bMaxHPrate,1;bonus bMaxSPrate,5;} - -// Miner Set Bonus: +1 to all stats, Vit +2 -// Shirt, Gloves, Hat and Knife -1338:2006:2991:3529,{bonus bAllStats,1;bonus bVit,2;} -// Shirt, Gloves, Hat and Pickaxe: Luk +5 instead -1338:2006:2991:3535,{bonus bAllStats,1;bonus bLuk,5;} - -// Warlord Set -// Allstats +1, Blocking +2% -// Shirt, Boots, Gloves, Pants, Helmet -// Normal -1306:1814:2012:2215:2920,{bonus bAllStats,1;bonus bFlee2,2;} -// Golden -1329:1814:2012:2215:2920,{bonus bAllStats,1;bonus bFlee2,2;} - -// Chainmail Set -// Blocking +1% -// Shirt, Pants -// Normal -1310:2211,{bonus bFlee2,1;} -// Golden -1327:2211,{bonus bFlee2,1;} - -// Terranite Set -// Allstats +1, Int. MDef +30% -// Shirt, Boots, Gloves, Pants, Helmet -1311:1813:2014:2210:3016,{bonus bAllStats,1;bonus bMdef2Rate,30;} - -// Leather Set -// Allstats +2 -// Leather Quiver/Shield not considered -// Shirt, Boots, Gloves, Pants -1314:1807:2008:2213,{bonus bAllStats,2;} -1314:1807:2008:2213,{bonus bAllStats,2;} - -// Assassin Set -// Allstats +1, Agi +5 -// Shirt, Boots, Gloves, Pants -1333:1801:2015:2202,{bonus bAllStats,1;bonus bAgi,5;} - -// Savior Set -// Allstats +3 -// Note: Gloves/Helmet replaced with Shield (2705) temporaly -// Shirt, Boots, Pants, Shield -1331:1815:2216:2705,{bonus bAllStats,3;} - -// Mages Set -// MP Regen bonuses (smaller sets) -// Cotton Boots + Cotton/Silk Gloves + Silk Robe - Silk Set (+5 mp/2s) -1805:2005:1316,{bonus2 bSPRegenRate,5,2000;} -1805:2007:1316,{bonus2 bSPRegenRate,5,2000;} - -// Cotton Boots + Cotton/Silk Gloves + Sorcerer Robe - Silk Set (+6 mp/2s) -1805:2005:1317,{bonus2 bSPRegenRate,5,2000;} -1805:2007:1317,{bonus2 bSPRegenRate,5,2000;} - -// Wizard Mocassins + Cotton/Silk Gloves + Sorcerer Robe - Mage Set (+7 mp/2s) -1810:2005:1317,{bonus2 bSPRegenRate,7,2000;} -1810:2007:1317,{bonus2 bSPRegenRate,7,2000;} - -// W. Boots + Cotton/Silk Gloves + Sorcerer Robe - Mage Set (+7 mp/2s) -1810:2005:1317,{bonus2 bSPRegenRate,7,2000;} -1810:2007:1317,{bonus2 bSPRegenRate,7,2000;} - |