summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaylor Locke <kisuka@kisuka.com>2015-12-21 13:16:15 -0800
committerTaylor Locke <kisuka@kisuka.com>2015-12-21 13:56:17 -0800
commit2a16362eed204dde33e5b0638373d67d1c6828ee (patch)
tree8b8d72d27fc4904178a0d05601caa3aa1a2ee88d
parenta9889e8229f6ea7c5f5bf484cd9b8f7d0c2532ff (diff)
downloadhercules-2a16362eed204dde33e5b0638373d67d1c6828ee.tar.gz
hercules-2a16362eed204dde33e5b0638373d67d1c6828ee.tar.bz2
hercules-2a16362eed204dde33e5b0638373d67d1c6828ee.tar.xz
hercules-2a16362eed204dde33e5b0638373d67d1c6828ee.zip
Follow-up to fd78190a5ec4f19f10027f7a7ebe0e6ce023f672.
-rw-r--r--db/re/item_combo_db.txt2
-rw-r--r--db/re/item_db.conf6
-rw-r--r--db/re/map_zone_db.conf15
-rw-r--r--npc/mapflag/zone.txt16
4 files changed, 35 insertions, 4 deletions
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 7734a1584..c0435c7cc 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -202,7 +202,7 @@
2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; }
2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
-2950:15067:20709:22012,{ bonus2 bExpAddClass,Class_All,10; }
+2950:15067:20709:22012,{ bonus2 bExpAddRace,RC_All,10; }
2963:15073,{ bonus bAspdRate,5; }
2963:15074,{ bonus bDelayrate,-5; bonus2 bAddRaceTolerance,RC_DemiPlayer,5; }
2964:15073,{ bonus bDelayrate,-5; bonus2 bAddRaceTolerance,RC_DemiPlayer,5; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 999c1a6d6..83c7d75a9 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -19570,7 +19570,7 @@ item_db: (
Script: <"
bonus bInt,25;
bonus bDex,25;
- bonus5 bAutoSpell,"AB_SILENTIUM",1,100,BF_MAGIC,1;
+ bonus5 bAutoSpell,AB_SILENTIUM,1,100,BF_MAGIC,1;
bonus3 bAddEff,Eff_Poison,100,ATF_SKILL;
bonus2 bAddEffWhenHit,Eff_Silence,10000;
bonus bUnbreakableWeapon,0;
@@ -21115,7 +21115,7 @@ item_db: (
bonus bVit,20;
bonus bMdef,10;
bonus2 bAddRaceTolerance,RC_All,30;
- bonus3 bAutoSpellWhenHit,"ALL_RAY_OF_PROTECTION",1,50;
+ /* TODO: bonus3 bAutoSpellWhenHit,"ALL_RAY_OF_PROTECTION",1,50; */
bonus bUnbreakableShield,1;
">
},
@@ -33656,7 +33656,7 @@ item_db: (
Refine: false
Script: <"
bonus bMaxSP,30;
- skill "ECL_SNOWFLIP",1;
+ skill ECL_SNOWFLIP,1;
">
},
{
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 553602a33..df223d139 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -115,6 +115,8 @@ zones: (
Woe_Violet_Potion: true
Woe_White_Potion: true
Woe_Blue_Potion: true
+ TE_White_Potion: true
+ TE_White_Slim_Potion: true
Siege_Plate: true
Siege_Suits: true
Siege_Robe: true
@@ -323,6 +325,8 @@ zones: (
Woe_Violet_Potion: true
Woe_White_Potion: true
Woe_Blue_Potion: true
+ TE_White_Potion: true
+ TE_White_Slim_Potion: true
Siege_Plate: true
Siege_Suits: true
Siege_Robe: true
@@ -419,6 +423,15 @@ zones: (
}
},
{
+ name: "WoE TE"
+ inherit: ( "GvG" ) /* will import all gvg has */
+
+ disabled_items: {
+ TE_White_Potion: false
+ TE_White_Slim_Potion: false
+ }
+},
+{
name: "Sealed Shrine"
disabled_skills: {
@@ -488,6 +501,8 @@ zones: (
Woe_Violet_Potion: true
Woe_White_Potion: true
Woe_Blue_Potion: true
+ TE_White_Potion: true
+ TE_White_Slim_Potion: true
Siege_Plate: true
Siege_Suits: true
Siege_Robe: true
diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt
index a405934a2..1b3ddc76f 100644
--- a/npc/mapflag/zone.txt
+++ b/npc/mapflag/zone.txt
@@ -131,3 +131,19 @@ umbala mapflag zone Towns
veins mapflag zone Towns
xmas mapflag zone Towns
yuno mapflag zone Towns
+
+// WoE:TE
+te_prt_gld mapflag zone WoE TE
+te_prtcas01 mapflag zone WoE TE
+te_prtcas02 mapflag zone WoE TE
+te_prtcas03 mapflag zone WoE TE
+te_prtcas04 mapflag zone WoE TE
+te_prtcas05 mapflag zone WoE TE
+te_alde_gld mapflag zone WoE TE
+te_aldecas1 mapflag zone WoE TE
+te_aldecas2 mapflag zone WoE TE
+te_aldecas3 mapflag zone WoE TE
+te_aldecas4 mapflag zone WoE TE
+te_aldecas5 mapflag zone WoE TE
+teg_dun01 mapflag zone WoE TE
+teg_dun02 mapflag zone WoE TE