From 615feed2d6705499e930a0e310ef83600fd4e3d2 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 17 Nov 2015 16:20:02 +0100 Subject: Revert "Item DB Updates:" This reverts commit 912578159c8ccca9545e3c7dce9f7ce2b92bee2e. This will be re-committed in a more atomic form. --- db/const.txt | 14 ------------ db/pre-re/item_db.conf | 61 +++++++++++++++++++++++++++++++++++--------------- db/re/item_db.conf | 61 +++++++++++++++++++++++++++++--------------------- db/sc_config.txt | 17 ++------------ 4 files changed, 80 insertions(+), 73 deletions(-) (limited to 'db') diff --git a/db/const.txt b/db/const.txt index dea8e37cf..8cd614ff9 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1285,20 +1285,6 @@ SC_MTF_HITFLEE 587 SC_LJOSALFAR 588 SC_MERMAID_LONGING 589 -SC_TIME_ACCESSORY 590 - -// Geffen Scrolls -SC_SKELSCROLL 591 -SC_DISTRUCTIONSCROLL 592 -SC_ROYALSCROLL 593 -SC_IMMUNITYSCROLL 594 -SC_MYSTICSCROLL 595 -SC_BATTLESCROLL 596 -SC_ARMORSCROLL 597 -SC_FREYJASCROLL 598 -SC_SOULSCROLL 599 - -SC_TARGET_ASPD 600 e_gasp 0 e_what 1 diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 0f8ea3163..b66b1198c 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -69525,7 +69525,16 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_SKELSCROLL,1800000,5; "> + Trade: { + nodrop: true + notrade: true + noselltonpc: true + nocart: true + nostorage: true + nogstorage: true + nomail: true + noauction: true + } }, { Id: 12746 @@ -69534,7 +69543,20 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_DISTRUCTIONSCROLL,1800000,5; "> + Trade: { + nodrop: true + notrade: true + nocart: true + nostorage: true + nogstorage: true + nomail: true + noauction: true + } + Script: <" + autobonus "{bonus2 bAddRace,RC_Boss,5}",10000,1800000; + autobonus "{bonus2 bAddRace,RC_Angel,5;}",10000,1800000; + autobonus "{bonus2 bAddEle,Ele_Holy,5;}",10000,1800000; + "> }, { Id: 12747 @@ -69543,7 +69565,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_ROYALSCROLL,1800000,5; "> + Script: <" autobonus "{bonus2 bSubRace,RC_Boss,5;}",10000,1800000; "> }, { Id: 12748 @@ -69552,7 +69574,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_IMMUNITYSCROLL,1800000,5; "> + Script: <" autobonus "{bonus2 bAddEle,Ele_Neutral,-5;}",10000,1800000; "> }, { Id: 12749 @@ -69561,7 +69583,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_MYSTICSCROLL,1800000,0; "> + Script: <" sc_start SC_PLUSMAGICPOWER,180000,5; "> }, { Id: 12750 @@ -69570,7 +69592,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_BATTLESCROLL,1800000,0; "> + Script: <" + sc_start SC_ATTHASTE_POTION3,1800000,5; + sc_start SC_PLUSATTACKPOWER,1800000,5; + "> }, { Id: 12751 @@ -69579,7 +69604,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_ARMORSCROLL,1800000,0; "> + Script: <" + sc_start SC_PROTECT_DEF,1800000,5; + sc_start SC_FOOD_BASICAVOIDANCE,1800000,10; + "> }, { Id: 12752 @@ -69588,7 +69616,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_FREYJASCROLL,1800000,0; "> + Script: <" + sc_start SC_PROTECT_MDEF,1800000,5; + sc_start SC_INCFLEE2,1800000,10; + "> }, { Id: 12753 @@ -69597,7 +69628,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_SOULSCROLL,1800000,5; "> + Script: <" + sc_start SC_INCMHPRATE,1800000,5; + sc_start SC_INCMSPRATE,1800000,5; + "> }, { Id: 12754 @@ -69615,7 +69649,6 @@ item_db: ( nomail: true noauction: true } - Script: <" percentheal 50,50; "> }, { Id: 12755 @@ -87897,17 +87930,9 @@ item_db: ( Weight: 10 Trade: { nodrop: true - notrade: true noselltonpc: true - nocart: true nogstorage: true - nomail: true - noauction: true } - Script: <" - specialeffect2 EF_SPELLBREAKER; - sc_start SC_TARGET_ASPD,1800000,10; - "> }, { Id: 14601 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 00d05b76d..2b0f70489 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -85204,11 +85204,20 @@ item_db: ( { Id: 12745 AegisName: "Skull_Scroll" - Name: "Skull Scroll" + Name: "Vivid Notation" Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_SKELSCROLL,1800000,5; "> + Trade: { + nodrop: true + notrade: true + noselltonpc: true + nocart: true + nostorage: true + nogstorage: true + nomail: true + noauction: true + } }, { Id: 12746 @@ -85217,7 +85226,11 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_DISTRUCTIONSCROLL,1800000,5; "> + Script: <" + autobonus "{bonus2 bAddRace,RC_Boss,5;}",10000,1800000; + autobonus "{bonus2 bAddRace,RC_Angel,5;}",10000,1800000; + autobonus "{bonus2 bAddEle,Ele_Holy,5;}",10000,1800000; + "> }, { Id: 12747 @@ -85226,7 +85239,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_ROYALSCROLL,1800000,5; "> + Script: <" autobonus "{bonus2 bSubRace,RC_Boss,5;}",10000,1800000; "> }, { Id: 12748 @@ -85235,7 +85248,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_IMMUNITYSCROLL,1800000,5; "> + Script: <" autobonus "{bonus2 bAddEle,Ele_Neutral,-5;}",10000,1800000; "> }, { Id: 12749 @@ -85244,7 +85257,7 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_MYSTICSCROLL,1800000,5; "> + Script: <" sc_start SC_PLUSMAGICPOWER,180000,5; "> }, { Id: 12750 @@ -85253,7 +85266,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_BATTLESCROLL,1800000,5; "> + Script: <" + sc_start SC_ATTHASTE_POTION3,1800000,5; + sc_start SC_PLUSATTACKPOWER,1800000,5; + "> }, { Id: 12751 @@ -85262,7 +85278,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_ARMORSCROLL,1800000,0; "> + Script: <" + sc_start SC_PROTECT_DEF,1800000,5; + sc_start SC_FOOD_BASICAVOIDANCE,1800000,10; + "> }, { Id: 12752 @@ -85271,7 +85290,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_FREYJASCROLL,1800000,0; "> + Script: <" + sc_start SC_PROTECT_MDEF,1800000,5; + sc_start SC_INCFLEE2,1800000,10; + "> }, { Id: 12753 @@ -85280,7 +85302,10 @@ item_db: ( Type: 2 Buy: 20 Weight: 10 - Script: <" sc_start SC_SOULSCROLL,1800000,5; "> + Script: <" + sc_start SC_INCMHPRATE,1800000,5; + sc_start SC_INCMSPRATE,1800000,5; + "> }, { Id: 12754 @@ -85289,16 +85314,6 @@ item_db: ( Type: 2 Buy: 0 Weight: 10 - Trade: { - nodrop: true - notrade: true - nocart: true - nostorage: true - nogstorage: true - nomail: true - noauction: true - } - Script: <" percentheal 50,50; "> }, { Id: 12755 @@ -110554,10 +110569,6 @@ item_db: ( nomail: true noauction: true } - Script: <" - specialeffect2 EF_SPELLBREAKER; - sc_start SC_TARGET_ASPD,1800000,10; - "> }, { Id: 14601 @@ -130824,8 +130835,6 @@ item_db: ( Type: 5 Loc: 2048 View: 1309 - OnEquipScript: <" sc_start SC_TIME_ACCESSORY,-1,0; "> - OnUnequipScript: <" sc_end SC_TIME_ACCESSORY; "> }, { Id: 20247 diff --git a/db/sc_config.txt b/db/sc_config.txt index e2b2491e7..650409f6c 100644 --- a/db/sc_config.txt +++ b/db/sc_config.txt @@ -398,18 +398,8 @@ SC_MTF_CRIDAMAGE, 12 SC_FULL_THROTTLE, 18 SC_REBOUND, 18 SC_TELEKINESIS_INTENSE,18 -SC_SKELSCROLL, 90 -SC_DISTRUCTIONSCROLL, 90 -SC_ROYALSCROLL, 90 -SC_IMMUNITYSCROLL, 90 -SC_MYSTICSCROLL, 90 -SC_BATTLESCROLL, 90 -SC_ARMORSCROLL, 90 -SC_FREYJASCROLL, 90 -SC_SOULSCROLL, 90 -SC_TARGET_ASPD, 92 -// Guild Auras should not be saved +//Guild Auras should not be saved SC_LEADERSHIP,78 SC_GLORYWOUNDS,78 SC_SOULCOLD,78 @@ -449,9 +439,6 @@ SC_MOONSTAR, 207 SC_SUPER_STAR, 207 SC_STRANGELIGHTS, 207 SC_DECORATION_OF_MUSIC, 207 -SC_LJOSALFAR, 207 -SC_MERMAID_LONGING, 207 -SC_TIME_ACCESSORY, 207 -// Cant Clear +//Cant Clear SC_ALL_RIDING, 141 -- cgit v1.2.3-70-g09d2