From cad0a578654f8461a2715f930641ba89491b9fa9 Mon Sep 17 00:00:00 2001 From: Euphy Date: Sat, 1 Mar 2014 15:42:49 -0500 Subject: [PATCH] Replaced 'getserverdef' command with 'script_hardcoded_constants' function in source. These constants can now be directly accessed in scripts. (Hercules 950e3eb) - Relocated 'Option_*' constants from 'db/const.txt' to source; added OPTION_COSTUME compound. (Hercules a5728fd) - Added MAX_CHAT_USERS define. (Hercules 950e3eb) - Follow-up ca9642a: applied 'Loc' changes to Pre-Renewal database. Signed-off-by: Euphy --- db/const.txt | 40 ------ db/pre-re/item_db.txt | 172 ++++++++++++------------- doc/script_commands.txt | 34 +++-- npc/battleground/bg_common.txt | 2 +- npc/events/bossnia.txt | 2 +- npc/kafras/cool_event_corp.txt | 2 +- npc/kafras/functions_kafras.txt | 2 +- npc/merchants/advanced_refiner.txt | 2 +- npc/merchants/refine.txt | 2 +- npc/other/marriage.txt | 4 +- npc/re/cities/brasilis.txt | 2 +- npc/re/cities/dewata.txt | 2 +- npc/re/instances/BakonawaLake.txt | 2 +- npc/re/instances/BangungotHospital.txt | 2 +- npc/re/jobs/3-1/archbishop.txt | 2 +- npc/re/jobs/3-1/guillotine_cross.txt | 4 +- npc/re/jobs/3-1/mechanic.txt | 2 +- npc/re/jobs/3-1/ranger.txt | 2 +- npc/re/jobs/3-1/rune_knight.txt | 2 +- npc/re/jobs/3-1/warlock.txt | 4 +- npc/re/jobs/3-2/genetic.txt | 2 +- npc/re/jobs/3-2/minstrel.txt | 2 +- npc/re/jobs/3-2/royal_guard.txt | 2 +- npc/re/jobs/3-2/shadow_chaser.txt | 2 +- npc/re/jobs/3-2/sorcerer.txt | 2 +- npc/re/jobs/3-2/sura.txt | 2 +- npc/re/jobs/3-2/wanderer.txt | 2 +- npc/re/jobs/novice/novice.txt | 8 +- npc/re/quests/quests_brasilis.txt | 8 +- npc/re/quests/quests_malaya.txt | 38 +++--- sql-files/item_db.sql | 172 ++++++++++++------------- src/map/chat.h | 4 +- src/map/clif.c | 8 +- src/map/script.c | 80 ++++++++---- src/map/script.h | 1 + src/map/status.h | 1 + 36 files changed, 303 insertions(+), 317 deletions(-) diff --git a/db/const.txt b/db/const.txt index 5a5d51d178..a2d3d1733b 100644 --- a/db/const.txt +++ b/db/const.txt @@ -302,33 +302,6 @@ EAJ_BABY_SURA 0x6204 EAJ_BABY_GENETIC 0x6205 EAJ_BABY_CHASER 0x6206 -Option_Nothing 0x00000000 -Option_Sight 0x00000001 -Option_Hide 0x00000002 -Option_Cloak 0x00000004 -Option_Falcon 0x00000010 -Option_Riding 0x00000020 -Option_Invisible 0x00000040 -Option_Orcish 0x00000800 -Option_Wedding 0x00001000 -Option_Ruwach 0x00002000 -Option_Chasewalk 0x00004000 -Option_Flying 0x00008000 -Option_Xmas 0x00010000 -Option_Transform 0x00020000 -Option_Summer 0x00040000 -Option_Dragon1 0x00080000 -Option_Wug 0x00100000 -Option_Wugrider 0x00200000 -Option_Madogear 0x00400000 -Option_Dragon2 0x00800000 -Option_Dragon3 0x01000000 -Option_Dragon4 0x02000000 -Option_Dragon5 0x04000000 -Option_Hanbok 0x08000000 -Option_Mounting 0x10000000 -Option_Oktoberfest 0x20000000 - bc_all 0 bc_map 1 bc_area 2 @@ -4547,18 +4520,5 @@ IT_AMMO 10 IT_DELAYCONSUME 11 IT_CASH 18 -VAR_PACKETVER 0 -VAR_MAX_LEVEL 1 -VAR_MAX_STORAGE 2 -VAR_MAX_INVENTORY 3 -VAR_MAX_ZENY 4 -VAR_MAX_PARTY 5 -VAR_MAX_GUILD 6 -VAR_MAX_GUILDLEVEL 7 -VAR_MAX_GUILD_STORAGE 8 -VAR_MAX_BG_MEMBERS 9 -VAR_VIP_SCRIPT 10 -VAR_MIN_STORAGE 11 - false 0 true 1 diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index 0b4a3ea847..604c86c9b6 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -2080,92 +2080,92 @@ 4453,Hilsrion_Card,Hillsrion Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,25; },{},{} // Armor Enchant System //=================================================================== -4700,Strength1,STR+1,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,1; },{},{} -4701,Strength2,STR+2,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,2; },{},{} -4702,Strength3,STR+3,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,3; },{},{} -4703,Strength4,STR+4,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,4; },{},{} -4704,Strength5,STR+5,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,5; },{},{} -4705,Strength6,STR+6,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,6; },{},{} -4706,Strength7,STR+7,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,7; },{},{} -4707,Strength8,STR+8,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,8; },{},{} -4708,Strength9,STR+9,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,9; },{},{} -4709,Strength10,STR+10,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,10; },{},{} -4710,Inteligence1,INT+1,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,1; },{},{} -4711,Inteligence2,INT+2,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,2; },{},{} -4712,Inteligence3,INT+3,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,3; },{},{} -4713,Inteligence4,INT+4,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,4; },{},{} -4714,Inteligence5,INT+5,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,5; },{},{} -4715,Inteligence6,INT+6,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,6; },{},{} -4716,Inteligence7,INT+7,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,7; },{},{} -4717,Inteligence8,INT+8,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,8; },{},{} -4718,Inteligence9,INT+9,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,9; },{},{} -4719,Inteligence10,INT+10,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,10; },{},{} -4720,Dexterity1,DEX+1,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,1; },{},{} -4721,Dexterity2,DEX+2,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,2; },{},{} -4722,Dexterity3,DEX+3,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,3; },{},{} -4723,Dexterity4,DEX+4,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,4; },{},{} -4724,Dexterity5,DEX+5,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,5; },{},{} -4725,Dexterity6,DEX+6,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,6; },{},{} -4726,Dexterity7,DEX+7,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,7; },{},{} -4727,Dexterity8,DEX+8,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,8; },{},{} -4728,Dexterity9,DEX+9,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,9; },{},{} -4729,Dexterity10,DEX+10,6,20,,10,,,,,,,,16,,,,,{ bonus bDex,10; },{},{} -4730,Agility1,AGI+1,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,1; },{},{} -4731,Agility2,AGI+2,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,2; },{},{} -4732,Agility3,AGI+3,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,3; },{},{} -4733,Agility4,AGI+4,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,4; },{},{} -4734,Agility5,AGI+5,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,5; },{},{} -4735,Agility6,AGI+6,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,6; },{},{} -4736,Agility7,AGI+7,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,7; },{},{} -4737,Agility8,AGI+8,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,8; },{},{} -4738,Agility9,AGI+9,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,9; },{},{} -4739,Agility10,AGI+10,6,20,,10,,,,,,,,16,,,,,{ bonus bAgi,10; },{},{} -4740,Vitality1,VIT+1,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,1; },{},{} -4741,Vitality2,VIT+2,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,2; },{},{} -4742,Vitality3,VIT+3,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,3; },{},{} -4743,Vitality4,VIT+4,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,4; },{},{} -4744,Vitality5,VIT+5,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,5; },{},{} -4745,Vitality6,VIT+6,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,6; },{},{} -4746,Vitality7,VIT+7,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,7; },{},{} -4747,Vitality8,VIT+8,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,8; },{},{} -4748,Vitality9,VIT+9,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,9; },{},{} -4749,Vitality10,VIT+10,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,10; },{},{} -4750,Luck1,LUK+1,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,1; },{},{} -4751,Luck2,LUK+2,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,2; },{},{} -4752,Luck3,LUK+3,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,3; },{},{} -4753,Luck4,LUK+4,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,4; },{},{} -4754,Luck5,LUK+5,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,5; },{},{} -4755,Luck6,LUK+6,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,6; },{},{} -4756,Luck7,LUK+7,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,7; },{},{} -4757,Luck8,LUK+8,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,8; },{},{} -4758,Luck9,LUK+9,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,9; },{},{} -4759,Luck10,LUK+10,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,10; },{},{} -4760,Magic_Attack1,MATK+1%,6,20,,10,,,,,,,,16,,,,,{ bonus bMatkRate,1; },{},{} -4761,Magic_Attack2,MATK+2%,6,20,,10,,,,,,,,16,,,,,{ bonus bMatkRate,2; },{},{} -4762,Evasion6,FLEE+6,6,20,,10,,,,,,,,16,,,,,{ bonus bFlee,6; },{},{} -4763,Evasion12,FLEE+12,6,20,,10,,,,,,,,16,,,,,{ bonus bFlee,12; },{},{} -4764,Critical5,CRI+5,6,20,,10,,,,,,,,16,,,,,{ bonus bCritical,5; },{},{} -4765,Critical7,CRI+7,6,20,,10,,,,,,,,16,,,,,{ bonus bCritical,7; },{},{} -4766,Atk2,ATK+2%,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddClass,Class_All,2; },{},{} -4767,Atk3,ATK+3%,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddClass,Class_All,3; },{},{} -4768,Str1_J,STR+1,6,20,,10,,,,,,,,16,,,,,{},{},{} -4769,Str2_J,STR+2,6,20,,10,,,,,,,,16,,,,,{},{},{} -4770,Str3_J,STR+3,6,20,,10,,,,,,,,16,,,,,{},{},{} -4771,Int1_J,INT+1,6,20,,10,,,,,,,,16,,,,,{},{},{} -4772,Int2_J,INT+2,6,20,,10,,,,,,,,16,,,,,{},{},{} -4773,Int3_J,INT+3,6,20,,10,,,,,,,,16,,,,,{},{},{} -4774,Vit1_J,VIT+1,6,20,,10,,,,,,,,16,,,,,{},{},{} -4775,Vit2_J,VIT+2,6,20,,10,,,,,,,,16,,,,,{},{},{} -4776,Vit3_J,VIT+3,6,20,,10,,,,,,,,16,,,,,{},{},{} -4777,Agi1_J,AGI+1,6,20,,10,,,,,,,,16,,,,,{},{},{} -4778,Agi2_J,AGI+2,6,20,,10,,,,,,,,16,,,,,{},{},{} -4779,Agi3_J,AGI+3,6,20,,10,,,,,,,,16,,,,,{},{},{} -4780,Dex1_J,DEX+1,6,20,,10,,,,,,,,16,,,,,{},{},{} -4781,Dex2_J,DEX+2,6,20,,10,,,,,,,,16,,,,,{},{},{} -4782,Dex3_J,DEX+3,6,20,,10,,,,,,,,16,,,,,{},{},{} -4783,Luk1_J,LUK+1,6,20,,10,,,,,,,,16,,,,,{},{},{} -4784,Luk2_J,LUK+2,6,20,,10,,,,,,,,16,,,,,{},{},{} -4785,Luk3_J,LUK+3,6,20,,10,,,,,,,,16,,,,,{},{},{} +4700,Strength1,STR+1,6,20,,10,,,,,,,,,,,,,{ bonus bStr,1; },{},{} +4701,Strength2,STR+2,6,20,,10,,,,,,,,,,,,,{ bonus bStr,2; },{},{} +4702,Strength3,STR+3,6,20,,10,,,,,,,,,,,,,{ bonus bStr,3; },{},{} +4703,Strength4,STR+4,6,20,,10,,,,,,,,,,,,,{ bonus bStr,4; },{},{} +4704,Strength5,STR+5,6,20,,10,,,,,,,,,,,,,{ bonus bStr,5; },{},{} +4705,Strength6,STR+6,6,20,,10,,,,,,,,,,,,,{ bonus bStr,6; },{},{} +4706,Strength7,STR+7,6,20,,10,,,,,,,,,,,,,{ bonus bStr,7; },{},{} +4707,Strength8,STR+8,6,20,,10,,,,,,,,,,,,,{ bonus bStr,8; },{},{} +4708,Strength9,STR+9,6,20,,10,,,,,,,,,,,,,{ bonus bStr,9; },{},{} +4709,Strength10,STR+10,6,20,,10,,,,,,,,,,,,,{ bonus bStr,10; },{},{} +4710,Inteligence1,INT+1,6,20,,10,,,,,,,,,,,,,{ bonus bInt,1; },{},{} +4711,Inteligence2,INT+2,6,20,,10,,,,,,,,,,,,,{ bonus bInt,2; },{},{} +4712,Inteligence3,INT+3,6,20,,10,,,,,,,,,,,,,{ bonus bInt,3; },{},{} +4713,Inteligence4,INT+4,6,20,,10,,,,,,,,,,,,,{ bonus bInt,4; },{},{} +4714,Inteligence5,INT+5,6,20,,10,,,,,,,,,,,,,{ bonus bInt,5; },{},{} +4715,Inteligence6,INT+6,6,20,,10,,,,,,,,,,,,,{ bonus bInt,6; },{},{} +4716,Inteligence7,INT+7,6,20,,10,,,,,,,,,,,,,{ bonus bInt,7; },{},{} +4717,Inteligence8,INT+8,6,20,,10,,,,,,,,,,,,,{ bonus bInt,8; },{},{} +4718,Inteligence9,INT+9,6,20,,10,,,,,,,,,,,,,{ bonus bInt,9; },{},{} +4719,Inteligence10,INT+10,6,20,,10,,,,,,,,,,,,,{ bonus bInt,10; },{},{} +4720,Dexterity1,DEX+1,6,20,,10,,,,,,,,,,,,,{ bonus bDex,1; },{},{} +4721,Dexterity2,DEX+2,6,20,,10,,,,,,,,,,,,,{ bonus bDex,2; },{},{} +4722,Dexterity3,DEX+3,6,20,,10,,,,,,,,,,,,,{ bonus bDex,3; },{},{} +4723,Dexterity4,DEX+4,6,20,,10,,,,,,,,,,,,,{ bonus bDex,4; },{},{} +4724,Dexterity5,DEX+5,6,20,,10,,,,,,,,,,,,,{ bonus bDex,5; },{},{} +4725,Dexterity6,DEX+6,6,20,,10,,,,,,,,,,,,,{ bonus bDex,6; },{},{} +4726,Dexterity7,DEX+7,6,20,,10,,,,,,,,,,,,,{ bonus bDex,7; },{},{} +4727,Dexterity8,DEX+8,6,20,,10,,,,,,,,,,,,,{ bonus bDex,8; },{},{} +4728,Dexterity9,DEX+9,6,20,,10,,,,,,,,,,,,,{ bonus bDex,9; },{},{} +4729,Dexterity10,DEX+10,6,20,,10,,,,,,,,,,,,,{ bonus bDex,10; },{},{} +4730,Agility1,AGI+1,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,1; },{},{} +4731,Agility2,AGI+2,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,2; },{},{} +4732,Agility3,AGI+3,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,3; },{},{} +4733,Agility4,AGI+4,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,4; },{},{} +4734,Agility5,AGI+5,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,5; },{},{} +4735,Agility6,AGI+6,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,6; },{},{} +4736,Agility7,AGI+7,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,7; },{},{} +4737,Agility8,AGI+8,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,8; },{},{} +4738,Agility9,AGI+9,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,9; },{},{} +4739,Agility10,AGI+10,6,20,,10,,,,,,,,,,,,,{ bonus bAgi,10; },{},{} +4740,Vitality1,VIT+1,6,20,,10,,,,,,,,,,,,,{ bonus bVit,1; },{},{} +4741,Vitality2,VIT+2,6,20,,10,,,,,,,,,,,,,{ bonus bVit,2; },{},{} +4742,Vitality3,VIT+3,6,20,,10,,,,,,,,,,,,,{ bonus bVit,3; },{},{} +4743,Vitality4,VIT+4,6,20,,10,,,,,,,,,,,,,{ bonus bVit,4; },{},{} +4744,Vitality5,VIT+5,6,20,,10,,,,,,,,,,,,,{ bonus bVit,5; },{},{} +4745,Vitality6,VIT+6,6,20,,10,,,,,,,,,,,,,{ bonus bVit,6; },{},{} +4746,Vitality7,VIT+7,6,20,,10,,,,,,,,,,,,,{ bonus bVit,7; },{},{} +4747,Vitality8,VIT+8,6,20,,10,,,,,,,,,,,,,{ bonus bVit,8; },{},{} +4748,Vitality9,VIT+9,6,20,,10,,,,,,,,,,,,,{ bonus bVit,9; },{},{} +4749,Vitality10,VIT+10,6,20,,10,,,,,,,,,,,,,{ bonus bVit,10; },{},{} +4750,Luck1,LUK+1,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,1; },{},{} +4751,Luck2,LUK+2,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,2; },{},{} +4752,Luck3,LUK+3,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,3; },{},{} +4753,Luck4,LUK+4,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,4; },{},{} +4754,Luck5,LUK+5,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,5; },{},{} +4755,Luck6,LUK+6,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,6; },{},{} +4756,Luck7,LUK+7,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,7; },{},{} +4757,Luck8,LUK+8,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,8; },{},{} +4758,Luck9,LUK+9,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,9; },{},{} +4759,Luck10,LUK+10,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,10; },{},{} +4760,Magic_Attack1,MATK+1%,6,20,,10,,,,,,,,,,,,,{ bonus bMatkRate,1; },{},{} +4761,Magic_Attack2,MATK+2%,6,20,,10,,,,,,,,,,,,,{ bonus bMatkRate,2; },{},{} +4762,Evasion6,FLEE+6,6,20,,10,,,,,,,,,,,,,{ bonus bFlee,6; },{},{} +4763,Evasion12,FLEE+12,6,20,,10,,,,,,,,,,,,,{ bonus bFlee,12; },{},{} +4764,Critical5,CRI+5,6,20,,10,,,,,,,,,,,,,{ bonus bCritical,5; },{},{} +4765,Critical7,CRI+7,6,20,,10,,,,,,,,,,,,,{ bonus bCritical,7; },{},{} +4766,Atk2,ATK+2%,6,20,,10,,,,,,,,,,,,,{ bonus2 bAddClass,Class_All,2; },{},{} +4767,Atk3,ATK+3%,6,20,,10,,,,,,,,,,,,,{ bonus2 bAddClass,Class_All,3; },{},{} +4768,Str1_J,STR+1,6,20,,10,,,,,,,,,,,,,{},{},{} +4769,Str2_J,STR+2,6,20,,10,,,,,,,,,,,,,{},{},{} +4770,Str3_J,STR+3,6,20,,10,,,,,,,,,,,,,{},{},{} +4771,Int1_J,INT+1,6,20,,10,,,,,,,,,,,,,{},{},{} +4772,Int2_J,INT+2,6,20,,10,,,,,,,,,,,,,{},{},{} +4773,Int3_J,INT+3,6,20,,10,,,,,,,,,,,,,{},{},{} +4774,Vit1_J,VIT+1,6,20,,10,,,,,,,,,,,,,{},{},{} +4775,Vit2_J,VIT+2,6,20,,10,,,,,,,,,,,,,{},{},{} +4776,Vit3_J,VIT+3,6,20,,10,,,,,,,,,,,,,{},{},{} +4777,Agi1_J,AGI+1,6,20,,10,,,,,,,,,,,,,{},{},{} +4778,Agi2_J,AGI+2,6,20,,10,,,,,,,,,,,,,{},{},{} +4779,Agi3_J,AGI+3,6,20,,10,,,,,,,,,,,,,{},{},{} +4780,Dex1_J,DEX+1,6,20,,10,,,,,,,,,,,,,{},{},{} +4781,Dex2_J,DEX+2,6,20,,10,,,,,,,,,,,,,{},{},{} +4782,Dex3_J,DEX+3,6,20,,10,,,,,,,,,,,,,{},{},{} +4783,Luk1_J,LUK+1,6,20,,10,,,,,,,,,,,,,{},{},{} +4784,Luk2_J,LUK+2,6,20,,10,,,,,,,,,,,,,{},{},{} +4785,Luk3_J,LUK+3,6,20,,10,,,,,,,,,,,,,{},{},{} // More Headgears //=================================================================== 5001,Headset,Headset,4,20,,200,,3,,0,0xFFFFFFFE,7,2,256,,1,1,87,{ bonus2 bResEff,Eff_Curse,1000; },{},{} diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 08525dcc3d..e6ebbf55ef 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Last Updated: ======================================== -//= 20140218 +//= 20140301 //===== Description: ========================================= //= A reference manual for the rAthena scripting language. //= Commands are sorted depending on their functionality. @@ -551,6 +551,20 @@ notable exception is Zeny, which you can and often will address directly - setting it will make the character own this number of Zeny. If you try to set Zeny to a negative number, the script will be terminated with an error. +Some source-end constants can also be accessed in scripts. This list is located in +'src/map/script.c' in the 'script_hardcoded_constants' function, which contains +constants such as server defines and status options: + + PACKETVER, MAX_LEVEL, MAX_STORAGE, MAX_INVENTORY, MAX_CART, MAX_ZENY, MAX_PARTY, + MAX_GUILD, MAX_GUILDLEVEL, MAX_GUILD_STORAGE, MAX_BG_MEMBERS, MAX_CHAT_USERS, + VIP_SCRIPT, MIN_STORAGE + + Option_Nothing, Option_Sight, Option_Hide, Option_Cloak, Option_Falcon, Option_Riding, + Option_Invisible, Option_Orcish, Option_Wedding, Option_Chasewalk, Option_Flying, + Option_Xmas, Option_Transform, Option_Summer, Option_Dragon1, Option_Wug, + Option_Wugrider, Option_Madogear, Option_Dragon2, Option_Dragon3, Option_Dragon4, + Option_Dragon5, Option_Hanbok, Option_Oktoberfest, Option_Dragon, Option_Costume + Assigning variables --------- --------- @@ -3559,24 +3573,6 @@ Available types are: 0 - version number (packet_db_ver) 1 - client date (YYYYMMDD) ---------------------------------------- - -*getserverdef() - -Returns a server definition. Valid types are listed in 'db/const.txt': - VAR_PACKETVER 0 - VAR_MAX_LEVEL 1 - VAR_MAX_STORAGE 2 - VAR_MAX_INVENTORY 3 - VAR_MAX_ZENY 4 - VAR_MAX_PARTY 5 - VAR_MAX_GUILD 6 - VAR_MAX_GUILDLEVEL 7 - VAR_MAX_GUILD_STORAGE 8 - VAR_MAX_BG_MEMBERS 9 - VAR_VIP_SCRIPT 10 - VAR_MIN_STORAGE 11 - --------------------------------------- \\ 3,1.- Item-related commands diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index 54db57e1fe..06e807db9a 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -607,7 +607,7 @@ function script F_BG_Badge { close2; // If the VIP system is enabled, VIP players receive an extra 2 badges. - if (getserverdef(VAR_VIP_SCRIPT) && vip_status(1)) + if (VIP_SCRIPT && vip_status(1)) set .@amount, .@amount+2; set .@medal_gap, 500 - countitem(.@badge); diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 5d7817cad3..5b0823e97d 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -66,7 +66,7 @@ prontera,132,125,4 script Bossnia Staff#1 908,{ // If the VIP system is enabled, players pay a Reset Stone for 5 entrances (with a choice of warps). // If it's disabled, players pay 5,000z per entrance. - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { mes "a grudge against me. It'll cost you 1 Reset Stone for 5 access."; next; mes "[Riss]"; diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt index 18bd1a2ee7..966fec4fe1 100644 --- a/npc/kafras/cool_event_corp.txt +++ b/npc/kafras/cool_event_corp.txt @@ -74,7 +74,7 @@ function script F_CoolEventCorp { mes "Please choose"; mes "your destination."; next; - if (getserverdef(VAR_VIP_SCRIPT) && !vip_status(1)) + if (VIP_SCRIPT && !vip_status(1)) set .@cost,4400; else set .@cost,2200; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 8eff86e16a..db4dbb969c 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -649,7 +649,7 @@ function script F_KafSet { } // VIP pricing varies across the regional servers; this is most practical. - if (getserverdef(VAR_VIP_SCRIPT) && !vip_status(1)) { + if (VIP_SCRIPT && !vip_status(1)) { for (set .@i, 0; .@i < getarraysize(@wrpD$); set .@i, .@i + 1) setd "@wrpP["+.@i+"]",getd("@wrpP["+.@i+"]") * 2; } diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 5e4ba90b66..9712987506 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -104,7 +104,7 @@ S_RefineValidate: set .@price, getarg(2); // If the VIP system is enabled, the prices for non-VIP players are considerably higher. - if (getserverdef(VAR_VIP_SCRIPT) && !vip_status(1)) { + if (VIP_SCRIPT && !vip_status(1)) { switch(getarg(0)){ case 0: set .@price, .@price * 10; break; case 1: set .@price, .@price * 40; break; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 6b540e95f7..87e87d3ea4 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -643,7 +643,7 @@ function script refinemain { } // If the VIP system is enabled, the prices for non-VIP players are considerably higher. - if (getserverdef(VAR_VIP_SCRIPT) && !vip_status(1)) { + if (VIP_SCRIPT && !vip_status(1)) { switch(getequipweaponlv(.@part)) { case 0: set .@price, .@price * 10; break; case 1: set .@price, .@price * 40; break; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 523d7a763f..b572f13fef 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -32,7 +32,7 @@ prt_church,97,100,4 script Wedding Staff#w 71,{ // If the VIP system is enabled: // - Non-VIP players must use a Marriage Covenant to get married. // - VIP players may either pay the Zeny fee or use a Marriage Covenant. - if (getserverdef(VAR_VIP_SCRIPT) && !vip_status(1)) { + if (VIP_SCRIPT && !vip_status(1)) { mes "[Marry Happy]"; mes "Sorry but you can't get married right now."; mes "The wedding is only available for subscribed players."; @@ -198,7 +198,7 @@ prt_church,97,100,4 script Wedding Staff#w 71,{ break; case 3: cutin "wedding_marry02",2; - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { mes "[Marry Happy]"; mes "^FF0000Wait!^000000"; mes "^FF0000If your account in not a premium, you must have a Marriage Covenant to get married.^000000"; diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 7a7591cf99..7cfef3b735 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -27,7 +27,7 @@ alberta,246,82,3 script Crewman#bra2 100,{ next; mes "[Crewman]"; mes "We recently found a new ocean route to get there easily."; - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { set .@cost, vip_status(1)?1000:10000; mes "It's just 10,000 zeny for a round trip, and 1,000 for VIP! So do you want to go?"; //custom translation (VIP) } else { diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 4e8a35719e..b100aa9558 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -23,7 +23,7 @@ alberta,212,202,4 script Dewata Sailor#alberta 536,{ mes "[Dewata Sailor]"; mes "Do you want to visit ^8B4513Dewata Island^000000?"; mes "With its dazzling waves and charming vistas it's a great place to relax."; - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { set .@cost, vip_status(1)?1000:10000; mes "The transit fee is 10,000 Zeny and 1,000 for VIP."; } else { diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 0525308053..a97f225d0c 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -479,7 +479,7 @@ OnMobSpawn: erasequest 12279; mes "[Taho]"; mes "This was found from Bakonawa's corpse. It would be better if you take this."; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6499,7; //Ancient_Grudge else getitem 6499,5; //Ancient_Grudge diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index 31d1c141c3..a9127bd417 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -161,7 +161,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 569,{ erasequest 9224; setquest 9223; getexp 500000,0; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6499,7; //Ancient_Grudge else getitem 6499,5; //Ancient_Grudge diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 031368e80d..3857d38e85 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -61,7 +61,7 @@ prt_church,103,88,3 script Praying Minister#arch 60,{ mes "You can't change jobs without using all your skill points. Please use all of your skill points before applying to change jobs~"; close; } - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_arch,1; setquest 2187; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 86fcad1aa0..fd1a0bddba 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -78,7 +78,7 @@ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ next; switch(select("I'll do it.:Give me time to think.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_3rd_gc, 3; setquest 7101; @@ -131,7 +131,7 @@ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ next; switch(select("I'll do it.:I'm not ready.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_3rd_gc, 3; setquest 7101; diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 9279b8fc6a..537882c4e4 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -218,7 +218,7 @@ yuno,129,156,3 script Chainheart 923,{ } if (BaseJob == Job_Blacksmith) { if (BaseLevel > 98 && JobLevel > 49 && SkillPoint == 0) { - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job__mechanic,1; setquest 10090; diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index b294b98111..a3dd14ea65 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -67,7 +67,7 @@ tur_dun01,156,36,5 script Survival Instructor#jr01 59,{ mes "It looks like you have"; mes "enough experience."; next; - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_ranger01,1; setquest 8254; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index a7e53281d0..33afacfb0f 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -79,7 +79,7 @@ prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{ mes "Of course, I would only accept you if you are one hundred percent sure of your conviction to become a Rune Knight."; close; case 2: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_rune_edq,1; setquest 3200; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 1e04843c03..77b5b26219 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -163,7 +163,7 @@ function script F_Warlock { next; switch(select("What do I need to do?:Cancel.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_wl,2; setquest 11106; @@ -587,7 +587,7 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{ next; switch(select("How can I be a Warlock?:Cancel.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_wl,2; setquest 11106; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index 23bb037a1c..ec20478441 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -53,7 +53,7 @@ alde_alche,35,186,5 script Alchemist Union Member 805,{ next; switch(select("Of course, I want to meet a Geneticist.:I don't want to meet a Geneticist.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_gen,1; setquest 2215; diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index 991da00317..feb014792e 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -117,7 +117,7 @@ alberta,196,133,4 script Bard#job_min 486,{ mes "See you later~"; close; } - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_min,1; setquest 11135; diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index bbca625dfb..490662ea96 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -110,7 +110,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 57,{ next; switch(select("I want to know more.:Stop talking.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_royal,1; setquest 12090; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index b620ae977f..35c7862113 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -195,7 +195,7 @@ in_rogue,379,101,3 script Scary Man#sc03 810,{ mes "I don't care for people like you. I just deal with the extraordinary."; close; } else if (job_sha == 1) { - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_sha,2; setquest 7160; diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index b15ee5c8f7..8f1a9e6e73 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -111,7 +111,7 @@ gef_tower,102,34,5 script Merito 742,{ next; switch(select("I will take the test.:I'll do it later.")) { case 1: - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_soc,2; setquest 12096; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index ff82613533..05ffdd0106 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -21,7 +21,7 @@ ve_in,237,125,0 script King Crab#job_shu 107,{ if (job_shu == 0) { if (BaseJob == Job_Monk && BaseLevel >= 99 && JobLevel >= 50) { set .@job_check,1; - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_shu,1; setquest 11155; diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index 1ca795e99a..1aff4cb896 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -266,7 +266,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{ mes "You are so cold-hearted...."; close; } - if (getserverdef(VAR_VIP_SCRIPT)) { + if (VIP_SCRIPT) { callfunc "VIP_Third_Class"; set job_wan,2; setquest 2218; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 56ef60760f..97f9c0f68b 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -949,18 +949,18 @@ L_Services: next; // VIP System messages. - if (getserverdef(VAR_MIN_STORAGE) != getserverdef(VAR_MAX_STORAGE)) { + if (MIN_STORAGE != MAX_STORAGE) { mes "[Kafra Employee]"; - mes "There are a maximum of "+getserverdef(VAR_MIN_STORAGE)+" Inventory Slots in Kafra Storage, meaning you can have up to "+getserverdef(VAR_MIN_STORAGE)+" different kinds of items in Storage."; + mes "There are a maximum of "+MIN_STORAGE+" Inventory Slots in Kafra Storage, meaning you can have up to "+MIN_STORAGE+" different kinds of items in Storage."; next; mes "[Kafra Employee]"; - mes "If you have a Premium Subscription, the maximum Inventory Slots in Kafra Storage is "+getserverdef(VAR_MAX_STORAGE)+"!"; + mes "If you have a Premium Subscription, the maximum Inventory Slots in Kafra Storage is "+MAX_STORAGE+"!"; mes "Remember though, that in the case of Equipment, each item takes up one Inventory Slot."; mes "The maximum number of items that can be placed in Kafra Storage is 30,000."; next; } else { mes "[Kafra Employee]"; - mes "There are a maximum of "+getserverdef(VAR_MAX_STORAGE)+" Inventory Slots in Kafra Storage, meaning you can have up to "+getserverdef(VAR_MAX_STORAGE)+" different kinds of items in Storage."; + mes "There are a maximum of "+MAX_STORAGE+" Inventory Slots in Kafra Storage, meaning you can have up to "+MAX_STORAGE+" different kinds of items in Storage."; next; } diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 2bd48ddb38..c9d81aadf5 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -51,7 +51,7 @@ brasilis,297,307,5 script Angelo#br 50,{ mes "Oh, thank you. You found all of 3 puppies."; mes "Thanks a lot."; mes "I hope this is useful to you. hoho."; - if (getserverdef(VAR_VIP_SCRIPT) && vip_status(1)) + if (VIP_SCRIPT && vip_status(1)) getexp 75000,0; else getexp 50000,0; @@ -455,7 +455,7 @@ brasilis,187,162,5 script Candy Maker 476,{ set brazil_gua,11; completequest 2200; getitem 12414,1; //Guarana_Candy - if (getserverdef(VAR_VIP_SCRIPT) && vip_status(1)) + if (VIP_SCRIPT && vip_status(1)) getexp 105000,15000; else getexp 70000,10000; @@ -1096,7 +1096,7 @@ brasilis,203,286,3 script Botanist Karmen#bra 893,{ mes "The water lily must truly be a lucky flower. hahaha"; set brazil_regia,10; completequest 2207; - if (getserverdef(VAR_VIP_SCRIPT) && vip_status(1)) + if (VIP_SCRIPT && vip_status(1)) getexp 75000,15000; else getexp 50000,10000; @@ -2807,7 +2807,7 @@ bra_in01,206,188,1 script Open Manhole#todunbra 844,{ set brazil_ghost,8; //completequest 2208; completequest 60355; - if (getserverdef(VAR_VIP_SCRIPT) && vip_status(1)) + if (VIP_SCRIPT && vip_status(1)) getexp 135000,0; else getexp 90000,0; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 02dd556b09..bbe4cb120b 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -153,7 +153,7 @@ malaya,266,76,3 script Rodel the Guard#malaya 570,4,4,{ next; mes "[Rodel the Guard]"; mes "I think there will be more Jejeling hunts in the future. Please join us again next time."; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -706,7 +706,7 @@ malaya,169,350,5 script Imelda#malaya 475,{ erasequest 7374; erasequest 7379; setquest 7375; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -744,7 +744,7 @@ malaya,169,350,5 script Imelda#malaya 475,{ delitem 6502, 6; // Silver_Cross erasequest 7380; setquest 7381; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -812,7 +812,7 @@ malaya,169,350,5 script Imelda#malaya 475,{ setquest 7375; erasequest 7374; erasequest 7379; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -1114,7 +1114,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 574,{ delitem 6503, 5; // Soul_Protection setquest 7378; erasequest 7377; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -1728,7 +1728,7 @@ malaya,295,171,3 script Collection Dealer Woeon 582,{ delitem 6498, countitem(6498); //Jejellopy setquest 7392; erasequest 7391; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -1962,7 +1962,7 @@ malaya,119,217,3 script Blacksmith Pandoi 538,{ delitem 6508, 10; //Silver_Bracelet setquest 7394; erasequest 7393; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -2374,7 +2374,7 @@ malaya,326,68,2 script Pedro the Sailor 100,{ set malaya_diwata, 6; erasequest 7399; setquest 7401; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -2437,7 +2437,7 @@ malaya,326,68,2 script Pedro the Sailor 100,{ mes "I think you kind of like doing it."; setquest 7401; erasequest 7403; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -2928,7 +2928,7 @@ ma_fild01,239,253,3 script Dhong the Guard 570,{ delitem 6505, 10; // Purified_Bone setquest 7408; erasequest 7407; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -3024,7 +3024,7 @@ ma_fild01,200,190,3 script Maries#malaya 579,{ mes "Thank you for delivering those precious shirts to my children."; setquest 7390; erasequest 7389; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -3263,7 +3263,7 @@ ma_fild02,241,39,5 script Good Capre Budidai 572,{ mes "This is a blessing for friends. Hey hey hey~"; setquest 7410; erasequest 7409; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497, 2; // Lesser_Agimat else getitem 6497, 1; // Lesser_Agimat @@ -4260,7 +4260,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "[Dog]"; mes "Woof woof woof!!!!"; set malaya_buwaya,14; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497,10; //Lesser_Agimat else getitem 6497,5; //Lesser_Agimat @@ -4696,7 +4696,7 @@ malaya,290,340,3 script Guard Leader#buwaya 571,{ mes "[Guard Leader]"; mes "Good work."; erasequest 2281; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497,10; //Lesser_Agimat else getitem 6497,5; //Lesser_Agimat @@ -5221,7 +5221,7 @@ malaya,285,332,4 script Old Legend Teller#bako1 574,{ mes "Please get rid of this monster for us."; erasequest 1179; set malaya_bakona1,7; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6499,5; //Ancient_Grudge else getitem 6499,3; //Ancient_Grudge @@ -5741,7 +5741,7 @@ malaya,283,265,4 script Village Chief#bako2 580,{ erasequest 1184; setquest 1185; set malaya_bakona2,6; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 12700,7; //Insideout_Shirt else getitem 12700,5; //Insideout_Shirt @@ -5847,7 +5847,7 @@ malaya,283,265,4 script Village Chief#bako2 580,{ erasequest 1193; set malaya_bakona2,15; getexp 1000000,600000; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 6497,7; //Lesser_Agimat else getitem 6497,5; //Lesser_Agimat @@ -6131,7 +6131,7 @@ malaya,289,364,4 script Young Fortune Teller 583,{ erasequest 1186; setquest 1187; set malaya_bakona2,8; - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) + if (!VIP_SCRIPT || vip_status(1)) getitem 12699,7; //Tikbalang_Belt else getitem 12699,5; //Tikbalang_Belt @@ -6749,7 +6749,7 @@ L_Warp: } L_Reward: - if (!getserverdef(VAR_VIP_SCRIPT) || vip_status(1)) { + if (!VIP_SCRIPT || vip_status(1)) { getitem 6499,5; //Ancient_Grudge getitem 6497,10; //Lesser_Agimat } else { diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index 59f1c1b4a8..cc6584e50f 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -2111,92 +2111,92 @@ REPLACE INTO `item_db` VALUES (4452,'Centipede_Larva_Card','Centipede Larva Card REPLACE INTO `item_db` VALUES (4453,'Hilsrion_Card','Hillsrion Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,25;',NULL,NULL); # Armor Enchant System #=================================================================== -REPLACE INTO `item_db` VALUES (4700,'Strength1','STR+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4701,'Strength2','STR+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4702,'Strength3','STR+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4703,'Strength4','STR+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,4;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4704,'Strength5','STR+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4705,'Strength6','STR+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4706,'Strength7','STR+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4707,'Strength8','STR+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,8;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4708,'Strength9','STR+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,9;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4709,'Strength10','STR+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bStr,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4710,'Inteligence1','INT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4711,'Inteligence2','INT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4712,'Inteligence3','INT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4713,'Inteligence4','INT+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,4;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4714,'Inteligence5','INT+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4715,'Inteligence6','INT+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4716,'Inteligence7','INT+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4717,'Inteligence8','INT+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,8;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4718,'Inteligence9','INT+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,9;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4719,'Inteligence10','INT+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4720,'Dexterity1','DEX+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4721,'Dexterity2','DEX+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4722,'Dexterity3','DEX+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4723,'Dexterity4','DEX+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,4;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4724,'Dexterity5','DEX+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4725,'Dexterity6','DEX+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4726,'Dexterity7','DEX+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4727,'Dexterity8','DEX+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,8;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4728,'Dexterity9','DEX+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,9;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4729,'Dexterity10','DEX+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDex,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4730,'Agility1','AGI+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4731,'Agility2','AGI+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4732,'Agility3','AGI+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4733,'Agility4','AGI+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,4;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4734,'Agility5','AGI+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4735,'Agility6','AGI+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4736,'Agility7','AGI+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4737,'Agility8','AGI+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,8;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4738,'Agility9','AGI+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,9;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4739,'Agility10','AGI+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bAgi,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4740,'Vitality1','VIT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4741,'Vitality2','VIT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4742,'Vitality3','VIT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4743,'Vitality4','VIT+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,4;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4744,'Vitality5','VIT+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4745,'Vitality6','VIT+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4746,'Vitality7','VIT+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4747,'Vitality8','VIT+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,8;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4748,'Vitality9','VIT+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,9;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4749,'Vitality10','VIT+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4750,'Luck1','LUK+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4751,'Luck2','LUK+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4752,'Luck3','LUK+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4753,'Luck4','LUK+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,4;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4754,'Luck5','LUK+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4755,'Luck6','LUK+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4756,'Luck7','LUK+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4757,'Luck8','LUK+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,8;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4758,'Luck9','LUK+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,9;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4759,'Luck10','LUK+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bLuk,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4760,'Magic_Attack1','MATK+1%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatkRate,1;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4761,'Magic_Attack2','MATK+2%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatkRate,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4762,'Evasion6','FLEE+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bFlee,6;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4763,'Evasion12','FLEE+12',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bFlee,12;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4764,'Critical5','CRI+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bCritical,5;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4765,'Critical7','CRI+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bCritical,7;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4766,'Atk2','ATK+2%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,2;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4767,'Atk3','ATK+3%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,3;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4768,'Str1_J','STR+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4769,'Str2_J','STR+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4770,'Str3_J','STR+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4771,'Int1_J','INT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4772,'Int2_J','INT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4773,'Int3_J','INT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4774,'Vit1_J','VIT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4775,'Vit2_J','VIT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4776,'Vit3_J','VIT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4777,'Agi1_J','AGI+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4778,'Agi2_J','AGI+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4779,'Agi3_J','AGI+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4780,'Dex1_J','DEX+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4781,'Dex2_J','DEX+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4782,'Dex3_J','DEX+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4783,'Luk1_J','LUK+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4784,'Luk2_J','LUK+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); -REPLACE INTO `item_db` VALUES (4785,'Luk3_J','LUK+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4700,'Strength1','STR+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4701,'Strength2','STR+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4702,'Strength3','STR+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4703,'Strength4','STR+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,4;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4704,'Strength5','STR+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4705,'Strength6','STR+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4706,'Strength7','STR+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4707,'Strength8','STR+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4708,'Strength9','STR+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,9;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4709,'Strength10','STR+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bStr,10;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4710,'Inteligence1','INT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4711,'Inteligence2','INT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4712,'Inteligence3','INT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4713,'Inteligence4','INT+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,4;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4714,'Inteligence5','INT+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4715,'Inteligence6','INT+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4716,'Inteligence7','INT+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4717,'Inteligence8','INT+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4718,'Inteligence9','INT+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,9;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4719,'Inteligence10','INT+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bInt,10;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4720,'Dexterity1','DEX+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4721,'Dexterity2','DEX+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4722,'Dexterity3','DEX+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4723,'Dexterity4','DEX+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,4;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4724,'Dexterity5','DEX+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4725,'Dexterity6','DEX+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4726,'Dexterity7','DEX+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4727,'Dexterity8','DEX+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4728,'Dexterity9','DEX+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,9;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4729,'Dexterity10','DEX+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDex,10;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4730,'Agility1','AGI+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4731,'Agility2','AGI+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4732,'Agility3','AGI+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4733,'Agility4','AGI+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,4;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4734,'Agility5','AGI+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4735,'Agility6','AGI+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4736,'Agility7','AGI+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4737,'Agility8','AGI+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4738,'Agility9','AGI+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,9;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4739,'Agility10','AGI+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAgi,10;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4740,'Vitality1','VIT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4741,'Vitality2','VIT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4742,'Vitality3','VIT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4743,'Vitality4','VIT+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,4;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4744,'Vitality5','VIT+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4745,'Vitality6','VIT+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4746,'Vitality7','VIT+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4747,'Vitality8','VIT+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4748,'Vitality9','VIT+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,9;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4749,'Vitality10','VIT+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVit,10;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4750,'Luck1','LUK+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4751,'Luck2','LUK+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4752,'Luck3','LUK+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4753,'Luck4','LUK+4',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,4;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4754,'Luck5','LUK+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4755,'Luck6','LUK+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4756,'Luck7','LUK+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4757,'Luck8','LUK+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4758,'Luck9','LUK+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,9;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4759,'Luck10','LUK+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,10;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4760,'Magic_Attack1','MATK+1%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,1;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4761,'Magic_Attack2','MATK+2%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4762,'Evasion6','FLEE+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee,6;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4763,'Evasion12','FLEE+12',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee,12;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4764,'Critical5','CRI+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,5;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4765,'Critical7','CRI+7',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,7;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4766,'Atk2','ATK+2%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,2;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4767,'Atk3','ATK+3%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,3;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4768,'Str1_J','STR+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4769,'Str2_J','STR+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4770,'Str3_J','STR+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4771,'Int1_J','INT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4772,'Int2_J','INT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4773,'Int3_J','INT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4774,'Vit1_J','VIT+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4775,'Vit2_J','VIT+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4776,'Vit3_J','VIT+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4777,'Agi1_J','AGI+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4778,'Agi2_J','AGI+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4779,'Agi3_J','AGI+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4780,'Dex1_J','DEX+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4781,'Dex2_J','DEX+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4782,'Dex3_J','DEX+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4783,'Luk1_J','LUK+1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4784,'Luk2_J','LUK+2',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +REPLACE INTO `item_db` VALUES (4785,'Luk3_J','LUK+3',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); # More Headgears #=================================================================== REPLACE INTO `item_db` VALUES (5001,'Headset','Headset',4,20,NULL,200,NULL,3,NULL,0,0xFFFFFFFE,7,2,256,NULL,1,1,87,'bonus2 bResEff,Eff_Curse,1000;',NULL,NULL); diff --git a/src/map/chat.h b/src/map/chat.h index 02aea4d10b..fd08e00678 100644 --- a/src/map/chat.h +++ b/src/map/chat.h @@ -13,6 +13,8 @@ extern "C" { struct map_session_data; struct chat_data; +#define MAX_CHAT_USERS 20 + struct chat_data { struct block_list bl; // data for this map object char title[CHATROOM_TITLE_SIZE]; // room title @@ -24,7 +26,7 @@ struct chat_data { uint32 zeny; // required zeny to join uint32 minLvl; // minimum base level to join uint32 maxLvl; // maximum base level allowed to join - struct map_session_data* usersd[20]; + struct map_session_data* usersd[MAX_CHAT_USERS]; struct block_list* owner; char npc_event[EVENT_NAME_LENGTH]; DBMap* kick_list; //DBMap of users who were kicked from this chat diff --git a/src/map/clif.c b/src/map/clif.c index fd920d9bc2..7f68584aaa 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -859,7 +859,7 @@ void clif_clearunit_delayed(struct block_list* bl, clr_type type, unsigned int t void clif_get_weapon_view(struct map_session_data* sd, unsigned short *rhand, unsigned short *lhand) { - if(sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER|OPTION_HANBOK|OPTION_OKTOBERFEST)) + if(sd->sc.option&OPTION_COSTUME) { *rhand = *lhand = 0; return; @@ -10230,7 +10230,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, if( pc_cant_act(sd) || sd->sc.option&OPTION_HIDE ) return; - if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER|OPTION_HANBOK|OPTION_OKTOBERFEST) ) + if( sd->sc.option&OPTION_COSTUME ) return; if( sd->sc.data[SC_BASILICA] || sd->sc.data[SC__SHADOWFORM] ) @@ -11251,7 +11251,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) } } - if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER|OPTION_HANBOK|OPTION_OKTOBERFEST) ) + if( sd->sc.option&OPTION_COSTUME ) return; if( sd->sc.data[SC_BASILICA] && (skill_id != HP_BASILICA || sd->sc.data[SC_BASILICA]->val4 != sd->bl.id) ) @@ -11335,7 +11335,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin } } - if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER|OPTION_HANBOK|OPTION_OKTOBERFEST) ) + if( sd->sc.option&OPTION_COSTUME ) return; if( sd->sc.data[SC_BASILICA] && (skill_id != HP_BASILICA || sd->sc.data[SC_BASILICA]->val4 != sd->bl.id) ) diff --git a/src/map/script.c b/src/map/script.c index 219286773e..681d80b859 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2258,6 +2258,58 @@ static void read_constdb(void) fclose(fp); } +/** + * Sets source-end constants for NPC scripts to access. + **/ +void script_hardcoded_constants(void) { + + /* server defines */ + script_set_constant("PACKETVER",PACKETVER,false); + script_set_constant("MAX_LEVEL",MAX_LEVEL,false); + script_set_constant("MAX_STORAGE",MAX_STORAGE,false); + script_set_constant("MAX_INVENTORY",MAX_INVENTORY,false); + script_set_constant("MAX_CART",MAX_INVENTORY,false); + script_set_constant("MAX_ZENY",MAX_ZENY,false); + script_set_constant("MAX_PARTY",MAX_PARTY,false); + script_set_constant("MAX_GUILD",MAX_GUILD,false); + script_set_constant("MAX_GUILDLEVEL",MAX_GUILDLEVEL,false); + script_set_constant("MAX_GUILD_STORAGE",MAX_GUILD_STORAGE,false); + script_set_constant("MAX_BG_MEMBERS",MAX_BG_MEMBERS,false); + script_set_constant("MAX_CHAT_USERS",MAX_CHAT_USERS,false); + script_set_constant("VIP_SCRIPT",VIP_SCRIPT,false); + script_set_constant("MIN_STORAGE",MIN_STORAGE,false); + + /* status options */ + script_set_constant("Option_Nothing",OPTION_NOTHING,false); + script_set_constant("Option_Sight",OPTION_SIGHT,false); + script_set_constant("Option_Hide",OPTION_HIDE,false); + script_set_constant("Option_Cloak",OPTION_CLOAK,false); + script_set_constant("Option_Falcon",OPTION_FALCON,false); + script_set_constant("Option_Riding",OPTION_RIDING,false); + script_set_constant("Option_Invisible",OPTION_INVISIBLE,false); + script_set_constant("Option_Orcish",OPTION_ORCISH,false); + script_set_constant("Option_Wedding",OPTION_WEDDING,false); + script_set_constant("Option_Chasewalk",OPTION_CHASEWALK,false); + script_set_constant("Option_Flying",OPTION_FLYING,false); + script_set_constant("Option_Xmas",OPTION_XMAS,false); + script_set_constant("Option_Transform",OPTION_TRANSFORM,false); + script_set_constant("Option_Summer",OPTION_SUMMER,false); + script_set_constant("Option_Dragon1",OPTION_DRAGON1,false); + script_set_constant("Option_Wug",OPTION_WUG,false); + script_set_constant("Option_Wugrider",OPTION_WUGRIDER,false); + script_set_constant("Option_Madogear",OPTION_MADOGEAR,false); + script_set_constant("Option_Dragon2",OPTION_DRAGON2,false); + script_set_constant("Option_Dragon3",OPTION_DRAGON3,false); + script_set_constant("Option_Dragon4",OPTION_DRAGON4,false); + script_set_constant("Option_Dragon5",OPTION_DRAGON5,false); + script_set_constant("Option_Hanbok",OPTION_HANBOK,false); + script_set_constant("Option_Oktoberfest",OPTION_OKTOBERFEST,false); + + /* status option compounds */ + script_set_constant("Option_Dragon",OPTION_DRAGON,false); + script_set_constant("Option_Costume",OPTION_COSTUME,false); +} + /*========================================== * Display emplacement line of script *------------------------------------------*/ @@ -2355,6 +2407,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o if(first){ add_buildin_func(); read_constdb(); + script_hardcoded_constants(); first=0; } @@ -18231,32 +18284,6 @@ BUILDIN_FUNC(is_clientver) { return SCRIPT_CMD_SUCCESS; } -/** Retrieves server definitions -* @param type: See in const.txt -*/ -BUILDIN_FUNC(getserverdef) { - int type = script_getnum(st,2); - switch(type){ - case 0: script_pushint(st,PACKETVER); break; - case 1: script_pushint(st,MAX_LEVEL); break; - case 2: script_pushint(st,MAX_STORAGE); break; - case 3: script_pushint(st,MAX_INVENTORY); break; - case 4: script_pushint(st,MAX_ZENY); break; - case 5: script_pushint(st,MAX_PARTY); break; - case 6: script_pushint(st,MAX_GUILD); break; - case 7: script_pushint(st,MAX_GUILDLEVEL); break; - case 8: script_pushint(st,MAX_GUILD_STORAGE); break; - case 9: script_pushint(st,MAX_BG_MEMBERS); break; - case 10: script_pushint(st,VIP_SCRIPT); break; - case 11: script_pushint(st,MIN_STORAGE); break; - default: - ShowWarning("buildin_getserverdef: unknown type %d.\n", type); - script_pushint(st,0); - break; - } - return SCRIPT_CMD_SUCCESS; -} - /** Returns various information about a player's VIP status. Need to enable VIP system * vip_status ,{""}; * @param type: Info type, 1: VIP status, 2: Expired date, 3: Remaining time @@ -19145,7 +19172,6 @@ struct script_function buildin_func[] = { BUILDIN_DEF(party_destroy,"i"), BUILDIN_DEF(is_clientver,"ii?"), - BUILDIN_DEF(getserverdef,"i"), BUILDIN_DEF2(montransform, "transform", "vii????"), // Monster Transform [malufett/Hercules] BUILDIN_DEF(vip_status,"i?"), BUILDIN_DEF(vip_time,"i?"), diff --git a/src/map/script.h b/src/map/script.h index 2f9235dfd3..ab78936fd0 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -181,6 +181,7 @@ void script_run_autobonus(const char *autobonus,int id, int pos); bool script_get_constant(const char* name, int* value); void script_set_constant(const char* name, int value, bool isparameter); +void script_hardcoded_constants(void); void script_cleararray_pc(struct map_session_data* sd, const char* varname, void* value); void script_setarray_pc(struct map_session_data* sd, const char* varname, uint8 idx, void* value, int* refcache); diff --git a/src/map/status.h b/src/map/status.h index 0a33db4c7c..1f19198410 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1618,6 +1618,7 @@ enum e_option { // compound constants OPTION_DRAGON = OPTION_DRAGON1|OPTION_DRAGON2|OPTION_DRAGON3|OPTION_DRAGON4|OPTION_DRAGON5, + OPTION_COSTUME = OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER|OPTION_HANBOK|OPTION_OKTOBERFEST, }; ///Defines for the manner system [Skotlex]