From b0006317e5cc4a48cd5b8a501b94813cd3b93670 Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 20 Sep 2014 15:16:56 +0200 Subject: Replaced hardcoded values with constants for status_change_start's flag - Please use the values from enum scstart_flag when calling status_change_start or related functions. - This also applies to the sc_start script commands. Signed-off-by: Haru --- db/const.txt | 8 ++++++++ db/pre-re/item_db.conf | 34 +++++++++++++++++----------------- db/re/item_db.conf | 34 +++++++++++++++++----------------- 3 files changed, 42 insertions(+), 34 deletions(-) (limited to 'db') diff --git a/db/const.txt b/db/const.txt index 8023fc30f..dcabf6d45 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3354,3 +3354,11 @@ PC_NAME 0 PC_PARTY 1 PC_GUILD 2 PC_MAP 3 + +// sc_start +SCFLAG_NONE 0x00 +SCFLAG_NOAVOID 0x01 +SCFLAG_FIXEDTICK 0x02 +SCFLAG_LOADED 0x04 +SCFLAG_FIXEDRATE 0x08 +SCFLAG_NOICON 0x10 diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index e4346a6ae..ea08825cb 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -415,7 +415,7 @@ item_db: ( BuyingStore: true Script: <" itemheal rand(105,145),0; - sc_start SC_FREEZE,10000,0,2500,0; + sc_start SC_FREEZE,10000,0,2500,SCFLAG_NONE; "> }, { @@ -545,7 +545,7 @@ item_db: ( BuyingStore: true Script: <" itemheal rand(50,100),0; - sc_start SC_STUN,3000,0,1500,0; + sc_start SC_STUN,3000,0,1500,SCFLAG_NONE; "> }, { @@ -597,7 +597,7 @@ item_db: ( Script: <" itemheal rand(105,145),0; sc_start SC_STUN,3000,0; - sc_start SC_BLIND,2000,0,1500,0; + sc_start SC_BLIND,2000,0,1500,SCFLAG_NONE; "> }, { @@ -1858,7 +1858,7 @@ item_db: ( Weight: 300 BuyingStore: true Script: <" - sc_start SC_DPOISON,10000,0,1000,0; + sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE; sc_start SC_POISON,50000,0; "> }, @@ -61832,7 +61832,7 @@ item_db: ( } Script: <" percentheal 9,0; - sc_start SC_CURSE,30000,0,3000,0; + sc_start SC_CURSE,30000,0,3000,SCFLAG_NONE; "> }, { @@ -61926,7 +61926,7 @@ item_db: ( } Script: <" percentheal 0,9; - sc_start SC_SILENCE,30000,0,3000,0; + sc_start SC_SILENCE,30000,0,3000,SCFLAG_NONE; "> }, { @@ -63140,7 +63140,7 @@ item_db: ( Weight: 30 Script: <" percentheal 50,50; - sc_start SC_CONFUSION,10000,0,1000,0; + sc_start SC_CONFUSION,10000,0,1000,SCFLAG_NONE; "> }, { @@ -64657,7 +64657,7 @@ item_db: ( Buy: 20 Weight: 100 Script: <" - sc_start SC_DPOISON,10000,0,1000,0; + sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE; sc_start SC_POISON,50000,0; "> }, @@ -64669,7 +64669,7 @@ item_db: ( Buy: 20 Weight: 100 Script: <" - sc_start SC_DPOISON,10000,0,1000,0; + sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE; sc_start SC_POISON,50000,0; "> }, @@ -69085,7 +69085,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_PARALYSE,300000,0,10,2; "> + Script: <" sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12718 @@ -69095,7 +69095,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_LEECHESEND,300000,0,10,2; "> + Script: <" sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12719 @@ -69105,7 +69105,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,2; "> + Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12720 @@ -69115,7 +69115,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_DEATHHURT,300000,0,10,2; "> + Script: <" sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12721 @@ -69125,7 +69125,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_TOXIN,300000,0,10,2; "> + Script: <" sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12722 @@ -69135,7 +69135,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_PYREXIA,300000,0,10,2; "> + Script: <" sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12723 @@ -69145,7 +69145,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,2; "> + Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12724 @@ -69155,7 +69155,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" sc_start SC_VENOMBLEED,15000,0,10,2; "> + Script: <" sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK; "> }, // Rune Knight's Rune Stones { diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 86c92652b..ff779399f 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -449,7 +449,7 @@ item_db: ( BuyingStore: true Script: <" itemheal rand(105,145),0; - sc_start SC_FREEZE,10000,0,2500,0; + sc_start SC_FREEZE,10000,0,2500,SCFLAG_NONE; "> }, { @@ -588,7 +588,7 @@ item_db: ( BuyingStore: true Script: <" itemheal rand(50,100),0; - sc_start SC_STUN,3000,0,1500,0; + sc_start SC_STUN,3000,0,1500,SCFLAG_NONE; "> }, { @@ -645,7 +645,7 @@ item_db: ( Script: <" itemheal rand(105,145),0; sc_start SC_STUN,3000,0; - sc_start SC_BLIND,2000,0,1500,0; + sc_start SC_BLIND,2000,0,1500,SCFLAG_NONE; "> }, { @@ -2020,7 +2020,7 @@ item_db: ( Upper: 63 BuyingStore: true Script: <" - sc_start SC_DPOISON,10000,0,1000,0; + sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE; sc_start SC_POISON,50000,0; "> }, @@ -74670,7 +74670,7 @@ item_db: ( } Script: <" percentheal 9,0; - sc_start SC_CURSE,30000,0,3000,0; + sc_start SC_CURSE,30000,0,3000,SCFLAG_NONE; "> }, { @@ -74771,7 +74771,7 @@ item_db: ( } Script: <" percentheal 0,9; - sc_start SC_SILENCE,30000,0,3000,0; + sc_start SC_SILENCE,30000,0,3000,SCFLAG_NONE; "> }, { @@ -76085,7 +76085,7 @@ item_db: ( Upper: 63 Script: <" percentheal 50,50; - sc_start SC_CONFUSION,10000,0,1000,0; + sc_start SC_CONFUSION,10000,0,1000,SCFLAG_NONE; "> }, { @@ -77703,7 +77703,7 @@ item_db: ( Weight: 100 Upper: 63 Script: <" - sc_start SC_DPOISON,10000,0,1000,0; + sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE; sc_start SC_POISON,50000,0; "> }, @@ -77716,7 +77716,7 @@ item_db: ( Weight: 100 Upper: 63 Script: <" - sc_start SC_DPOISON,10000,0,1000,0; + sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE; sc_start SC_POISON,50000,0; "> }, @@ -83575,7 +83575,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_PARALYSE,300000,0,10,2; "> + Script: <" sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12718 @@ -83586,7 +83586,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_LEECHESEND,300000,0,10,2; "> + Script: <" sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12719 @@ -83597,7 +83597,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,2; "> + Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12720 @@ -83608,7 +83608,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_DEATHHURT,300000,0,10,2; "> + Script: <" sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12721 @@ -83619,7 +83619,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_TOXIN,300000,0,10,2; "> + Script: <" sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12722 @@ -83630,7 +83630,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_PYREXIA,300000,0,10,2; "> + Script: <" sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12723 @@ -83641,7 +83641,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,2; "> + Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK; "> }, { Id: 12724 @@ -83652,7 +83652,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" sc_start SC_VENOMBLEED,15000,0,10,2; "> + Script: <" sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK; "> }, // Rune Knight's Rune Stones { -- cgit v1.2.3-70-g09d2