From 19b8cbb835e867febb597b34187f6bbca48cbe7b Mon Sep 17 00:00:00 2001 From: shennetsind Date: Mon, 22 Apr 2013 18:28:18 -0300 Subject: Hercules April 22 MEGA-ULTRA-LONG Patch~! http://hercules.ws/board/topic/470-hercules-april-22-patch/ Signed-off-by: shennetsind --- db/re/item_combo_db.txt | 14 +++++++------- db/re/item_trade.txt | 4 ++-- db/re/map_zone_db.conf | 34 +++++++++++++++++++++++++++++++++- db/re/skill_db.txt | 1 - 4 files changed, 42 insertions(+), 11 deletions(-) (limited to 'db/re') 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,10 +16,41 @@ //= maps can be linked to a specific zone through the zone mapflag //= 'mapflagzone' //== 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) */ @@ -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. -- cgit v1.2.3-70-g09d2