From a06e53479131c25ce2343c431c688c57b3bfa2c0 Mon Sep 17 00:00:00 2001 From: Michieru Date: Fri, 29 Aug 2014 17:51:30 +0200 Subject: Fix status def calculation (bug:8306) Updated script command 'sc_start' to allow for more variables and options rAthena 17326 (bug:8217) Fix Cart Tornado damage to official elemental crashing/memory error (thanks to Ind) --- db/pre-re/item_db.conf | 34 +++++++++++++++++----------------- db/re/item_db.conf | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) (limited to 'db') diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 0207b8184..77551e042 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; - if(rand(1000)<250) sc_start SC_FREEZE,10000,0; + sc_start SC_FREEZE,10000,0,2500,0; "> }, { @@ -545,7 +545,7 @@ item_db: ( BuyingStore: true Script: <" itemheal rand(50,100),0; - if(rand(1000)<150) sc_start SC_STUN,3000,0; + sc_start SC_STUN,3000,0,1500,0; "> }, { @@ -597,7 +597,7 @@ item_db: ( Script: <" itemheal rand(105,145),0; sc_start SC_STUN,3000,0; - if(rand(1000)<150) sc_start SC_BLIND,2000,0; + sc_start SC_BLIND,2000,0,1500,0; "> }, { @@ -1858,7 +1858,7 @@ item_db: ( Weight: 300 BuyingStore: true Script: <" - if(rand(1000)<100) sc_start SC_DPOISON,10000,0; + sc_start SC_DPOISON,10000,0,1000,0; sc_start SC_POISON,50000,0; "> }, @@ -61832,7 +61832,7 @@ item_db: ( } Script: <" percentheal 9,0; - if(rand(1000)<300) sc_start SC_CURSE,30000,0; + sc_start SC_CURSE,30000,0,3000,0; "> }, { @@ -61926,7 +61926,7 @@ item_db: ( } Script: <" percentheal 0,9; - if(rand(1000)<300) sc_start SC_SILENCE,30000,0; + sc_start SC_SILENCE,30000,0,3000,0; "> }, { @@ -63140,7 +63140,7 @@ item_db: ( Weight: 30 Script: <" percentheal 50,50; - if(rand(100)>=90)sc_start SC_CONFUSION,10000,0; + sc_start SC_CONFUSION,10000,0,1000,0; "> }, { @@ -64657,7 +64657,7 @@ item_db: ( Buy: 20 Weight: 100 Script: <" - if(rand(1000)<100) sc_start SC_DPOISON,10000,0; + sc_start SC_DPOISON,10000,0,1000,0; sc_start SC_POISON,50000,0; "> }, @@ -64669,7 +64669,7 @@ item_db: ( Buy: 20 Weight: 100 Script: <" - if(rand(1000)<100) sc_start SC_DPOISON,10000,0; + sc_start SC_DPOISON,10000,0,1000,0; sc_start SC_POISON,50000,0; "> }, @@ -69085,7 +69085,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_PARALYSE,300000,0; "> + Script: <" sc_start SC_PARALYSE,300000,0,10,2; "> }, { Id: 12718 @@ -69095,7 +69095,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_LEECHESEND,300000,0; "> + Script: <" sc_start SC_LEECHESEND,300000,0,10,2; "> }, { Id: 12719 @@ -69105,7 +69105,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_OBLIVIONCURSE,300000,0; "> + Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,2; "> }, { Id: 12720 @@ -69115,7 +69115,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_DEATHHURT,300000,0; "> + Script: <" sc_start SC_DEATHHURT,300000,0,10,2; "> }, { Id: 12721 @@ -69125,7 +69125,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_TOXIN,300000,0; "> + Script: <" sc_start SC_TOXIN,300000,0,10,2; "> }, { Id: 12722 @@ -69135,7 +69135,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_PYREXIA,300000,0; "> + Script: <" sc_start SC_PYREXIA,300000,0,10,2; "> }, { Id: 12723 @@ -69145,7 +69145,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_MAGICMUSHROOM,300000,0; "> + Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,2; "> }, { Id: 12724 @@ -69155,7 +69155,7 @@ item_db: ( Buy: 2 Weight: 100 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_VENOMBLEED,15000,0; "> + Script: <" sc_start SC_VENOMBLEED,15000,0,10,2; "> }, // Rune Knight's Rune Stones { diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 7f9f9d306..00e2e645d 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; - if(rand(1000)<250) sc_start SC_FREEZE,10000,0; + sc_start SC_FREEZE,10000,0,2500,0; "> }, { @@ -588,7 +588,7 @@ item_db: ( BuyingStore: true Script: <" itemheal rand(50,100),0; - if(rand(1000)<150) sc_start SC_STUN,3000,0; + sc_start SC_STUN,3000,0,1500,0; "> }, { @@ -645,7 +645,7 @@ item_db: ( Script: <" itemheal rand(105,145),0; sc_start SC_STUN,3000,0; - if(rand(1000)<150) sc_start SC_BLIND,2000,0; + sc_start SC_BLIND,2000,0,1500,0; "> }, { @@ -2020,7 +2020,7 @@ item_db: ( Upper: 63 BuyingStore: true Script: <" - if(rand(1000)<100) sc_start SC_DPOISON,10000,0; + sc_start SC_DPOISON,10000,0,1000,0; sc_start SC_POISON,50000,0; "> }, @@ -74669,7 +74669,7 @@ item_db: ( } Script: <" percentheal 9,0; - if(rand(1000)<300) sc_start SC_CURSE,30000,0; + sc_start SC_CURSE,30000,0,3000,0; "> }, { @@ -74770,7 +74770,7 @@ item_db: ( } Script: <" percentheal 0,9; - if(rand(1000)<300) sc_start SC_SILENCE,30000,0; + sc_start SC_SILENCE,30000,0,3000,0; "> }, { @@ -76084,7 +76084,7 @@ item_db: ( Upper: 63 Script: <" percentheal 50,50; - if(rand(100)>=90)sc_start SC_CONFUSION,10000,0; + sc_start SC_CONFUSION,10000,0,1000,0; "> }, { @@ -77702,7 +77702,7 @@ item_db: ( Weight: 100 Upper: 63 Script: <" - if(rand(1000)<100) sc_start SC_DPOISON,10000,0; + sc_start SC_DPOISON,10000,0,1000,0; sc_start SC_POISON,50000,0; "> }, @@ -77715,7 +77715,7 @@ item_db: ( Weight: 100 Upper: 63 Script: <" - if(rand(1000)<100) sc_start SC_DPOISON,10000,0; + sc_start SC_DPOISON,10000,0,1000,0; sc_start SC_POISON,50000,0; "> }, @@ -83574,7 +83574,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_PARALYSE,300000,0; "> + Script: <" sc_start SC_PARALYSE,300000,0,10,2; "> }, { Id: 12718 @@ -83585,7 +83585,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_LEECHESEND,300000,0; "> + Script: <" sc_start SC_LEECHESEND,300000,0,10,2; "> }, { Id: 12719 @@ -83596,7 +83596,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_OBLIVIONCURSE,300000,0; "> + Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,2; "> }, { Id: 12720 @@ -83607,7 +83607,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_DEATHHURT,300000,0; "> + Script: <" sc_start SC_DEATHHURT,300000,0,10,2; "> }, { Id: 12721 @@ -83618,7 +83618,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_TOXIN,300000,0; "> + Script: <" sc_start SC_TOXIN,300000,0,10,2; "> }, { Id: 12722 @@ -83629,7 +83629,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_PYREXIA,300000,0; "> + Script: <" sc_start SC_PYREXIA,300000,0,10,2; "> }, { Id: 12723 @@ -83640,7 +83640,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_MAGICMUSHROOM,300000,0; "> + Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,2; "> }, { Id: 12724 @@ -83651,7 +83651,7 @@ item_db: ( Weight: 20 Upper: 63 BuyingStore: true - Script: <" if(rand(10000)<10) sc_start SC_VENOMBLEED,15000,0; "> + Script: <" sc_start SC_VENOMBLEED,15000,0,10,2; "> }, // Rune Knight's Rune Stones { -- cgit v1.2.3-70-g09d2