Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected script for some item #25 (#7946)

Browse Source
This commit is contained in:
idk-whoami 2023-10-10 18:47:08 +07:00 committed by GitHub
parent 4547dc8e6a
commit 61311f5912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 6926 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1542
db/re/item_combos.yml
View File

File diff suppressed because it is too large Load Diff

4744
db/re/item_db_equip.yml
View File

File diff suppressed because it is too large Load Diff

239
db/re/item_db_etc.yml
View File

@ -35158,6 +35158,12 @@ Body:
Type: Etc
Buy: 20
Weight: 100
- Id: 25212
AegisName: Coagulated_Blood
Name: Condensed Magic Blood
Type: Etc
Buy: 20
Weight: 10
- Id: 25218
AegisName: Tree_Branches
Name: Tree Branch
@ -38258,8 +38264,7 @@ Body:
Script: |
bonus bDef,30;
bonus bMdef,10;
bonus2 bAddEff,Eff_Silence,900;
autobonus "{ bonus bIgnoreDefClass,Class_All; bonus bIgnoreMdefRace,RC_All; }",20,7000,BF_WEAPON|BF_MAGIC,"{ active_transform 3658,7000; }";
bonus3 bAddEffWhenHit,Eff_Silence,2000,ATF_WEAPON|ATF_MAGIC;
- Id: 27026
AegisName: Fire_Condor_Card
Name: Fire Condor Card
@ -46441,6 +46446,15 @@ Body:
SubType: Enchant
Script: |
skill "AL_BLESSING",10;
- Id: 29727
AegisName: aegis_29727
Name: Rumble Effect
Type: Card
SubType: Enchant
Script: |
hateffect HAT_EF_RESONATETAEGO,true;
UnEquipScript: |
hateffect HAT_EF_RESONATETAEGO,false;
- Id: 31000
AegisName: Rudo_Card_J
Name: Rudo Card
@ -46827,6 +46841,34 @@ Body:
bonus5 bAutoSpellWhenHit,"SO_ELECTRICWALK",5,80,BF_MAGIC,0;
autobonus "{ bonus bFlee,200; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_TEIHIT1; }";
autobonus "{ bonus bSpeedRate,25; }",25,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";
- Id: 101592
AegisName: Force_of_Fullmoon
Name: The Power of The Full Moon
Type: Etc
Trade:
NoDrop: true
Weight: 10
- Id: 101952
AegisName: SunShine_Sand
Name: Sunny Powder Sand
Type: Etc
Trade:
NoDrop: true
Weight: 10
- Id: 102038
AegisName: Dead_Soul_Aura
Name: The Evil Breath of The Dead
Type: Etc
Trade:
NoDrop: true
Weight: 10
- Id: 102354
AegisName: Battle_Aura_TW
Name: Fighting Spirit
Type: Etc
Trade:
NoDrop: true
Weight: 10
- Id: 300000
AegisName: IDTest_Card
Name: IDTest Card
@ -51243,6 +51285,28 @@ Body:
bonus2 bMagicAtkEle,Ele_Poison,100;
bonus2 bMagicAtkEle,Ele_Undead,100;
bonus2 bSubEle,Ele_All,-30;
- Id: 300383
AegisName: FightingSpirit_of_Veins
Name: Veins Fighting Spirit
Type: Card
SubType: Enchant
Script: |
bonus2 bAddEle,Ele_Fire,10;
bonus2 bMagicAddEle,Ele_Fire,10;
bonus2 bAddEle,Ele_Neutral,10;
bonus2 bMagicAddEle,Ele_Neutral,10;
- Id: 300384
AegisName: TheExorcist_Of_Veins
Name: Veins Exorcist
Type: Card
SubType: Enchant
Script: |
bonus2 bAddRace,RC_Demon,15;
bonus2 bMagicAddRace,RC_Demon,15;
bonus2 bAddRace,RC_Undead,15;
bonus2 bMagicAddRace,RC_Undead,15;
bonus2 bAddEle,Ele_Undead,15;
bonus2 bMagicAddEle,Ele_Undead,15;
- Id: 300385
AegisName: VF_Effect_TW
Name: Valhalla Effect Effect
@ -51564,6 +51628,15 @@ Body:
Script: |
.@r = getrefine();
bonus bMatk,10*.@r;
- Id: 300419
AegisName: aegis_300419
Name: Camellia Smoke Effect
Type: Card
SubType: Enchant
Script: |
hateffect HAT_EF_Camellia_Hair_Pin,true;
UnEquipScript: |
hateffect HAT_EF_Camellia_Hair_Pin,false;
- Id: 300420
AegisName: aegis_300420
Name: Labyrinth Berzebub Card
@ -52358,6 +52431,28 @@ Body:
Right_Hand: true
Flags:
DropEffect: CLIENT
- Id: 300484
AegisName: aegis_300484
Name: Very Miss Rabbit Card
Type: Card
Weight: 10
Locations:
Both_Accessory: true
Flags:
DropEffect: CLIENT
Script: |
bonus bMaxHPrate,15;
- Id: 300485
AegisName: aegis_300485
Name: Little Naught Dog Card
Type: Card
Weight: 10
Locations:
Both_Accessory: true
Flags:
DropEffect: CLIENT
Script: |
bonus bMaxSPrate,15;
- Id: 310000
AegisName: Ranger_Top2
Name: Sniper Stone II (Top)
@ -66645,6 +66740,50 @@ Body:
SubType: Enchant
Script: |
skill "ALL_ODINS_POWER",2;
- Id: 311419
AegisName: aegis_311419
Name: Magnum Break Lv5
Type: Card
SubType: Enchant
Script: |
skill "SM_MAGNUM",5;
- Id: 311420
AegisName: aegis_311420
Name: Fixed Cast Time - 70%
Type: Card
SubType: Enchant
Script: |
bonus bFixedCastrate,-70;
- Id: 311421
AegisName: aegis_311421
Name: Variable Cast Time - 15%
Type: Card
SubType: Enchant
Script: |
bonus bVariableCastrate,-15;
- Id: 311422
AegisName: aegis_311422
Name: Attack Speed + 15%
Type: Card
SubType: Enchant
Script: |
bonus bAspdRate,15;
- Id: 311423
AegisName: aegis_311423
Name: Pure Brightness
Type: Card
Locations:
Head_Low: true
Head_Mid: true
Head_Top: true
- Id: 311424
AegisName: aegis_311424
Name: Grain Rain
Type: Card
Locations:
Head_Low: true
Head_Mid: true
Head_Top: true
- Id: 311425
AegisName: aegis_311425
Name: Spell Stone (Dual)
@ -73373,7 +73512,7 @@ Body:
bonus bAspdRate,10;
- Id: 312418
AegisName: aegis_312418
Name: Prayer Bell
Name: Evening Bell of Prayer
Type: Card
SubType: Enchant
Script: |
@ -78300,14 +78439,68 @@ Body:
Name: Valhalla Effect (Middle)
Type: Etc
Weight: 100
- Id: 1000876
AegisName: Veins_Quest_Soup
Name: Veins Soup
Type: Etc
- Id: 1000877
AegisName: UK_Invention
Name: Unknown Invention
Type: Etc
Weight: 10
- Id: 1000878
AegisName: Soap_Base
Name: Soap Base
Type: Etc
Weight: 10
- Id: 1000879
AegisName: Appetite_Booster
Name: Appetite Booster
Type: Etc
Weight: 10
- Id: 1000880
AegisName: Kofte
Name: Kofte
Type: Etc
Weight: 10
- Id: 1000881
AegisName: Veins_Sealed_Letter
Name: Sealed Letter
Type: Etc
Weight: 5
- Id: 1000882
AegisName: aegis_1000882
Name: Electric Effect (Bottom)
Type: Etc
Weight: 100
- Id: 1000883
AegisName: Dangerous_Sacredness
Name: Dangerous Relic
Type: Etc
Weight: 20
- Id: 1000884
AegisName: Dangerous_Box
Name: Sealed Dangerous Box
Type: Etc
Weight: 40
- Id: 1000885
AegisName: VeinsQ_Violin
Name: Violin
Type: Etc
Weight: 800
- Id: 1000886
AegisName: Megaphone_Veins
Name: Megaphone
Type: Etc
Weight: 10
- Id: 1000888
AegisName: Veins_Coin
Name: Veins Coin
Type: Etc
Weight: 1
- Id: 1000889
AegisName: aegis_1000889
Name: Complex Fruit Juice
Name: Compound Fruit Juice
Type: Etc
Weight: 10
Flags:
@ -78337,19 +78530,19 @@ Body:
NoAuction: true
- Id: 1000897
AegisName: aegis_1000897
Name: Donor List Keias 1
Name: Donor List Chaos 1
Type: Etc
- Id: 1000898
AegisName: aegis_1000898
Name: Donor List Keias 2
Name: Donor List Chaos 2
Type: Etc
- Id: 1000899
AegisName: aegis_1000899
Name: Donor List Keias 3
Name: Donor List Chaos 3
Type: Etc
- Id: 1000900
AegisName: aegis_1000900
Name: Donor List Keias 4
Name: Donor List Chaos 4
Type: Etc
- Id: 1000901
AegisName: aegis_1000901
@ -79028,6 +79221,11 @@ Body:
Name: Power Stone (Dual)
Type: Etc
Weight: 100
- Id: 1001069
AegisName: aegis_1001069
Name: Camellia Smoke Effect Stone (Head)
Type: Etc
Weight: 10
- Id: 1001071
AegisName: aegis_1001071
Name: Niflheim Research Paper # !todo check english name
@ -80052,6 +80250,11 @@ Body:
Flags:
BuyingStore: true
DropEffect: CLIENT
- Id: 1001252
AegisName: aegis_1001252
Name: Rumble Effect Stone (Head)
Type: Etc
Weight: 10
- Id: 1001253
AegisName: S_Enchant_Essence
Name: Shadow Essence # !todo check english name
@ -80071,6 +80274,11 @@ Body:
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 1001256
AegisName: Ymir_Heart_P_TW
Name: Imela Heart Energy Fragments # !todo check english name
Type: Etc
Weight: 10
- Id: 1001258
AegisName: VIP_Black_Coin
Name: Premium Black Coin # !todo check english name
@ -80508,6 +80716,21 @@ Body:
Weight: 10
Flags:
BuyingStore: true
- Id: 1001355
AegisName: aegis_1001355
Name: Ancient Hero's Modification Coupon I
Type: Etc
Weight: 10
- Id: 1001356
AegisName: aegis_1001356
Name: Ancient Hero's Modification Coupon II
Type: Etc
Weight: 10
- Id: 1001357
AegisName: aegis_1001357
Name: Ancient Hero's Modification Coupon III
Type: Etc
Weight: 10
- Id: 1001359
AegisName: Unidentified_Bug
Name: Unidentified Bug # !todo check english name

201
db/re/item_db_usable.yml
View File

@ -2314,7 +2314,7 @@ Body:
getgroupitem(IG_E_LIMITPOWERBOOSTER);
- Id: 9610
AegisName: E_Mysterious_Water
Name: "[Event]Mysterious Water"
Name: "[Event] Mysterious Water"
Type: Healing
Weight: 10
Trade:
@ -2391,6 +2391,24 @@ Body:
Script: |
specialeffect2 EF_POTION_BERSERK;
sc_start SC_LIMIT_POWER_BOOSTER,1800000,30;
- Id: 9908
AegisName: DF_Mental_Potion
Name: "[Scroll] Mental Potion"
Type: Usable
Weight: 10
NoUse:
Sitting: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
sc_start SC_INCREASE_MAXSP,1800000,10;
sc_start SC_SPCOST_RATE,1800000,10;
- Id: 9909
AegisName: DF_Ex_Def_Potion
Name: "[Scroll] Ex Def Potion"
@ -51131,6 +51149,21 @@ Body:
Container: true
Script: |
/* TODO */
- Id: 22668
AegisName: Guyak_Pudding_20_Box
Name: Guyak Pudding Box
Type: Usable
Weight: 100
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getitem 12710,20;
- Id: 22669
AegisName: HALLOWEEN_G_BOX
Name: Halloween Box
@ -53276,7 +53309,7 @@ Body:
getgroupitem(IG_IMPROVED_WOODENBOX);
- Id: 23012
AegisName: Comp_Small_Mana_Potion
Name: "[Sale] Small Mana Potion"
Name: "[Not For Sale] Small Mana Potion"
Type: Usable
Weight: 10
Trade:
@ -54509,7 +54542,7 @@ Body:
getgroupitem(IG_KAFRA_SCROLL);
- Id: 23177
AegisName: Comp_Kafra_Card
Name: Kafra Card
Name: "[Not For Sale] Kafra Card"
Type: Usable
Buy: 2
Weight: 10
@ -54700,7 +54733,7 @@ Body:
sc_start2 SC_S_MANAPOTION,600000,-5,5;
- Id: 23204
AegisName: M_DEFScroll
Name: Brilliant Protection Scroll
Name: Shining Defense Scroll
Type: Usable
Weight: 10
NoUse:
@ -54715,7 +54748,7 @@ Body:
NoAuction: true
Script: |
specialeffect2 EF_HEAL3;
sc_start SC_M_DEFSCROLL,600000,0;
sc_start2 SC_M_DEFSCROLL,600000,500,200;
- Id: 23205
AegisName: New_Hat_Scroll2
Name: New Hat Scroll II
@ -55631,7 +55664,7 @@ Body:
getgroupitem(IG_CAT_SCROLL);
- Id: 23307
AegisName: Comp_M_DEFScroll
Name: "[Sale] Shining Defense Scroll"
Name: "[Not for Sale] Shining Defense Scroll"
Type: Usable
Weight: 10
Trade:
@ -55644,7 +55677,7 @@ Body:
NoAuction: true
Script: |
specialeffect2 EF_HEAL3;
sc_start SC_M_DEFSCROLL,600000,0;
sc_start2 SC_M_DEFSCROLL,600000,500,200;
- Id: 23308
AegisName: Booster_Amplifier
Name: Booster Amplifier
@ -59095,14 +59128,14 @@ Body:
sc_start SC_SPEEDUP0,600000,25;
- Id: 100006
AegisName: G_M_DEFScroll
Name: True Brilliant Protection Scroll
Name: True Shining Defense Scroll
Type: Usable
Weight: 10
NoUse:
Sitting: true
Script: |
specialeffect2 EF_HEAL3;
sc_start SC_M_DEFSCROLL,3600000,0;
sc_start2 SC_M_DEFSCROLL,3600000,500,200;
sc_start SC_SPEEDUP0,600000,25;
- Id: 100007
AegisName: G_Limit_Power_Booster
@ -59844,6 +59877,13 @@ Body:
NoAuction: true
Script: |
getgroupitem(IG_BOARDING_HALTER_BOX30_Z);
- Id: 100098
AegisName: RTC_EnergyDrink_TW
Name: Vitality Stimulant
Type: Usable
Weight: 10
Script: |
sc_start SC_INCALLSTATUS,300000,20;
- Id: 100100
AegisName: Temporal_Manteau_Box
Name: Temporal Manteau Box
@ -60122,7 +60162,7 @@ Body:
bonus_script "{ bonus2 bAddRace2,RC2_EP172BATH,15; }",900,1,0,EFST_BATH_FOAM_C;
- Id: 100151
AegisName: Skill_Sha_M_S_Weapon
Name: Skill Shadow Weapon Combination Scroll
Name: Skill Shadow Weapon Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -63002,6 +63042,39 @@ Body:
NoAuction: true
Script: |
warp "rebel_in",100,40;
- Id: 100906
AegisName: E_All_In_One_Buff
Name: "[Not For Sale] 21st Anniversary All in One Potion"
Type: Usable
Trade:
NoDrop: true
NoTrade: true
NoCart: true
NoStorage: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
specialeffect2 EF_POTION_BERSERK;
sc_start2 SC_S_LIFEPOTION,3600000,-5,5;
sc_start2 SC_L_LIFEPOTION,3600000,-7,4;
sc_start2 SC_M_LIFEPOTION,3600000,-4,3;
sc_start2 SC_M_DEFSCROLL,3600000,500,200;
sc_start2 SC_S_MANAPOTION,3600000,-5,5;
sc_start SC_ALMIGHTY,3600000,10;
sc_start SC_INFINITY_DRINK,3600000,0;
sc_start SC_FOOD_STR_CASH,3600000,20;
sc_start SC_FOOD_AGI_CASH,3600000,20;
sc_start SC_FOOD_VIT_CASH,3600000,20;
sc_start SC_FOOD_INT_CASH,3600000,20;
sc_start SC_FOOD_DEX_CASH,3600000,20;
sc_start SC_FOOD_LUK_CASH,3600000,20;
sc_start SC_FLEEFOOD,3600000,30;
sc_start SC_HITFOOD,3600000,30;
sc_start SC_ATKPOTION,3600000,20;
sc_start SC_MATKPOTION,3600000,20;
sc_start SC_LIMIT_POWER_BOOSTER,3600000,30;
sc_start SC_SPEEDUP0,3600000,25;
- Id: 100908
AegisName: S_M_Piercing_Box
Name: Magic Piercing Shadow Box
@ -65431,7 +65504,7 @@ Body:
bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1;
- Id: 101340
AegisName: Bs_Item_M_S_52
Name: Blacksmith's Blessing Combination Scroll
Name: Blacksmith's Blessing Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65440,8 +65513,7 @@ Body:
laphine_synthesis();
- Id: 101341
AegisName: Bs_Item_M_S_53
# Name: Hollgrehenn's Shadow Refine Hammer Combination Scroll
Name: Hollgrehenn Combination Scroll
Name: Hollgrehenn's Shadow Refine Hammer Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65450,7 +65522,7 @@ Body:
laphine_synthesis();
- Id: 101342
AegisName: Bs_Item_M_S_54
Name: Powerful Soul Essence Combination Scroll
Name: Powerful Soul Essence Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65459,7 +65531,7 @@ Body:
laphine_synthesis();
- Id: 101343
AegisName: Bs_Item_M_S_55
Name: Powerful Dimension Essence Combination Scroll
Name: Powerful Dimension Essence Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65468,7 +65540,7 @@ Body:
laphine_synthesis();
- Id: 101344
AegisName: Bs_Item_M_S_56
Name: Enchantment Ticket Combination Scroll
Name: Enchantment Ticket Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65477,7 +65549,7 @@ Body:
laphine_synthesis();
- Id: 101345
AegisName: Bs_Item_M_S_57
Name: Beast's Leather Shoes Combination Scroll
Name: Beast's Leather Shoes Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65486,7 +65558,7 @@ Body:
laphine_synthesis();
- Id: 101346
AegisName: Bs_Item_M_S_58
Name: Pirate Captain's Coat Combination Scroll
Name: Pirate Captain's Coat Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65495,7 +65567,7 @@ Body:
laphine_synthesis();
- Id: 101347
AegisName: Bs_Item_M_S_59
Name: Phreeoni Wing Suit Combination Scroll
Name: Phreeoni Wing Suit Recipe
Type: DelayConsume
Weight: 10
Flags:
@ -65525,6 +65597,12 @@ Body:
Type: DelayConsume
Script: |
item_reform();
- Id: 101357
AegisName: BlessOfRabbit
Name: Rabbit's Blessed Egg
Type: Delayconsume
Script: |
itemskill "AL_BLESSING",10;
- Id: 101359
AegisName: MajorAutoSpell_Up
Name: Major Auto Spell Shadow Spellbook
@ -65597,6 +65675,23 @@ Body:
BuyingStore: true
Script: |
item_reform();
- Id: 101393
AegisName: aegis_101393
Name: Mugwort Rice Cake
Type: Healing
Weight: 10
Script: |
percentheal 0,20;
itemskill "PR_MAGNIFICAT",3;
- Id: 101394
AegisName: aegis_101394
Name: Azalea Wine
Type: Healing
Weight: 10
Script: |
percentheal 10,0;
skilleffect "AL_INCAGI",0;
sc_start SC_INCREASEAGI,60000,3;
- Id: 101416
AegisName: aegis_101416
Name: Costume Enchant Stone Box 27
@ -66417,6 +66512,15 @@ Body:
NoAuction: true
Script: |
getitem 101947,10;
- Id: 101954
AegisName: Intake_Hair_Box
Name: Intake Hair Gift Box
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
getgroupitem(IG_Intake_Hair_Box);
- Id: 102017
AegisName: Mocadas_Refine_Box
Name: Smelting Mocadas Equipment 9~10 # !todo check english name
@ -66737,6 +66841,14 @@ Body:
BuyingStore: true
Script: |
item_reform();
- Id: 102121
AegisName: aegis_102121
Name: "[Scroll] AGI Biscuit Stick"
Type: Usable
Weight: 10
Script: |
sc_start SC_FOOD_AGI_CASH,1800000,15;
sc_start SC_FLEEFOOD,600000,rand(11,33);
- Id: 102124
AegisName: F_Ein_Weapon_Hammer
Name: Flush Weapon Smelting Hammer # !todo check english name
@ -66831,7 +66943,7 @@ Body:
laphine_synthesis();
- Id: 102308
AegisName: Bs_Item_M_S_61
Name: Beelzebub's Crown Combination Scroll # !todo check english name
Name: Beelzebub's Crown Recipe
Type: DelayConsume
Weight: 10
EquipLevelMin: 240
@ -66841,7 +66953,7 @@ Body:
laphine_synthesis();
- Id: 102310
AegisName: Bs_Item_M_S_62
Name: Vesper Headgear Combination Scroll # !todo check english name
Name: Vesper Headgear Recipe
Type: DelayConsume
Weight: 10
EquipLevelMin: 240
@ -66926,12 +67038,50 @@ Body:
Type: DelayConsume
Script: |
item_reform();
- Id: 102404
AegisName: Maya_Scroll_TW
Name: Maya Purple Scroll (Egg)
Type: Usable
Weight: 10
Flags:
BuyingStore: true
NoUse:
Sitting: true
Script: |
sc_start SC_Intravision,60000,0;
- Id: 102413
AegisName: aegis_102413
Name: Ancient Hero Box 2
Type: Usable
Weight: 200
Flags:
Container: true
Script: |
getgroupitem(IG_Ancient_Hero_Box_2);
- Id: 102414
AegisName: aegis_102414
Name: Ancient Hero Box 3
Type: Usable
Weight: 200
Flags:
Container: true
Script: |
getgroupitem(IG_Ancient_Hero_Box_3);
- Id: 102440
AegisName: R_Ep17_Box
Name: Rune Tablet Engraving # !todo check english name
Type: DelayConsume
Script: |
item_reform();
- Id: 102441
AegisName: aegis_102441
Name: Costume Enchant Stone Box 32
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
getgroupitem(IG_Enchant_Stone_Box32);
- Id: 102482
AegisName: FateSin_Boots_Hammer
Name: Boots of Good and Evil Smelting Hammer # !todo check english name
@ -66941,6 +67091,15 @@ Body:
BuyingStore: true
Script: |
item_reform();
- Id: 102580
AegisName: aegis_102580
Name: Ponytail Gift Box
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
getgroupitem(IG_Ponytail_Hair_Box);
- Id: 200003
AegisName: LI_HD_Oridecon_Box2
Name: (Limited) HD Oridecon Box(Blacksmith)(30)

224
db/re/item_group_db.yml
View File

@ -50058,3 +50058,227 @@ Body:
Rate: 400
- Item: Critical_Stone_Bottom
Rate: 400
- Group: ENCHANT_STONE_BOX32
SubGroups:
- SubGroup: 1
List:
- Item: Range_Stone_Robe_D
Rate: 10
- Item: Melee_Stone_Robe_D
Rate: 10
- Item: Magic_Stone_Robe_D
Rate: 10
- Item: SmatkStone_Robe
Rate: 10
- Item: M_PATKStone_Robe
Rate: 10
- Item: R_PATKStone_Robe
Rate: 10
- Item: ResistDefStone_Robe
Rate: 10
- Item: StaminaWISStone_Robe_D
Rate: 10
- Item: POWStone_Robe_D
Rate: 10
- Item: SplStone_Robe_D
Rate: 10
- Item: ConStone_Robe_D
Rate: 10
- Item: CrtStone_Robe_D
Rate: 10
- Item: MinorCastStone_Robe_D
Rate: 20
- Item: SkyEmperorStone_Robe
Rate: 40
- Item: MeisterStone_Robe
Rate: 80
- Item: ElementalStone_Robe
Rate: 80
- Item: ReloadStone_Robe_D
Rate: 80
- Item: CriticalStone_Robe_D
Rate: 80
- Item: DoubleAttack_Stone
Rate: 80
- Item: Critical_Stone_Robe
Rate: 80
- Item: CastStone_Robe_D
Rate: 80
- Item: SPdrainStone_Robe_D
Rate: 80
- Item: HPdrainStone_Robe_D
Rate: 80
- Item: ASPDStone_Robe_D
Rate: 80
- Item: CastStone_Robe
Rate: 80
- Item: StarStone_Top3
Rate: 80
- Item: StarStone_Middle3
Rate: 80
- Item: StarStone_Bottom3
Rate: 150
- Item: GeneticStone_Top3
Rate: 150
- Item: GeneticStone_Middle3
Rate: 150
- Item: GeneticStone_Bottom3
Rate: 150
- Item: SorcererStone_Top3
Rate: 190
- Item: SorcererStone_Middle3
Rate: 190
- Item: SorcererStone_Bottom3
Rate: 200
- Item: Stone_Robe_Box
Rate: 200
- Item: aegis_102333
Rate: 200
- Item: Magic_Stone_Top
Rate: 200
- Item: Magic_Stone_Middle
Rate: 200
- Item: Magic_Stone_Bottom
Rate: 200
- Item: Range_Stone_Top
Rate: 200
- Item: Range_Stone
Rate: 200
- Item: Range_Stone_Bottom
Rate: 200
- Item: Melee_Stone_Top
Rate: 200
- Item: Melee_Stone_Middle
Rate: 200
- Item: Melee_Stone_Bottom
Rate: 200
- Item: DefenseStone_Top
Rate: 200
- Item: DefenseStone_Middle
Rate: 200
- Item: DefenseStone_Bottom
Rate: 200
- Item: ReloadStone_Top
Rate: 400
- Item: ReloadStone_Middle
Rate: 400
- Item: ReloadStone_Bottom
Rate: 400
- Item: EXPStone_Middle
Rate: 400
- Item: EXPStone_Bottom
Rate: 400
- Item: EXPStone_Top
Rate: 400
- Item: Stone_Top_Box
Rate: 400
- Item: Stone_Top2_Box
Rate: 400
- Item: Stone_Middle_Box
Rate: 400
- Item: Stone_Middle2_Box
Rate: 400
- Item: Stone_Bottom_Box
Rate: 400
- Item: Stone_Bottom2_Box
Rate: 400
- Group: ANCIENT_HERO_BOX_2
SubGroups:
- SubGroup: 1
List:
- Item: Dragonic_Slayer
Rate: 100
- Item: Meteor_Striker
Rate: 100
- Item: Light_Blade
Rate: 100
- Item: Slate_Sword
Rate: 100
- Item: Trumpet_Shell_K
Rate: 100
- Item: Barb_Wire_K
Rate: 100
- Item: Saint_Hall
Rate: 100
- Item: Ray_Knuckle
Rate: 100
- Item: Blade_Katar
Rate: 100
- Item: Fatalist
Rate: 100
- Item: Scalet_Dragon_L_Bow
Rate: 100
- Item: Blue_Crystal_Staff
Rate: 100
- Item: Freezing_Rod
Rate: 100
- Group: ANCIENT_HERO_BOX_3
SubGroups:
- SubGroup: 1
List:
- Item: OneSkyOneSun
Rate: 100
- Item: SoulWeight
Rate: 100
- Item: MeawFoxtail
Rate: 100
- Item: Master_Soul_Rifle
Rate: 100
- Item: Crimson_Rose
Rate: 100
- Item: Demon_S_Shot
Rate: 100
- Item: Golden_L_Launcher
Rate: 100
- Item: The_Black_Gatling
Rate: 100
- Item: Sharp_Wind_Sword
Rate: 100
- Item: Fog_Dew_Sword
Rate: 100
- Item: Humma_Clear
Rate: 100
- Item: Freedom_Stick
Rate: 100
- Item: Blessed_Knife
Rate: 100
- Group: INTAKE_HAIR_BOX
SubGroups:
- SubGroup: 1
List:
- Item: C_Intake_WH
Rate: 100
- Item: C_Intake_RD
Rate: 100
- Item: C_Intake_PP
Rate: 100
- Item: C_Intake_GN
Rate: 100
- Item: C_Intake_BU
Rate: 100
- Item: C_Intake_OM
Rate: 100
- Item: C_Intake_YL
Rate: 100
- Item: C_Intake_BL
Rate: 100
- Group: PONYTAIL_HAIR_BOX
SubGroups:
- SubGroup: 1
List:
- Item: C_AB_Hair_WH
Rate: 100
- Item: C_AB_Hair_LPP
Rate: 100
- Item: C_AB_Hair_RD
Rate: 100
- Item: C_AB_Hair_PP
Rate: 100
- Item: C_AB_Hair_GN
Rate: 100
- Item: C_AB_Hair_BU
Rate: 100
- Item: C_AB_Hair_YL
Rate: 100
- Item: C_AB_Hair_BL
Rate: 100

28
db/re/mob_db.yml
View File

@ -25573,6 +25573,8 @@ Body:
ChaseRange: 12
Size: Large
Race: Demon
RaceGroups:
Rachel_Sanctuary: true
Element: Dark
ElementLevel: 2
WalkSpeed: 140
@ -25620,6 +25622,8 @@ Body:
ChaseRange: 12
Size: Small
Race: Formless
RaceGroups:
Rachel_Sanctuary: true
Element: Wind
ElementLevel: 2
WalkSpeed: 190
@ -31172,6 +31176,8 @@ Body:
ChaseRange: 12
Size: Large
Race: Formless
RaceGroups:
Rachel_Sanctuary: true
Element: Ghost
ElementLevel: 3
WalkSpeed: 200
@ -31228,6 +31234,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 300
@ -31275,6 +31283,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 250
@ -31322,6 +31332,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 250
@ -31369,6 +31381,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 300
@ -31416,6 +31430,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demon
RaceGroups:
Rachel_Sanctuary: true
Element: Dark
ElementLevel: 3
WalkSpeed: 140
@ -31465,6 +31481,8 @@ Body:
ChaseRange: 12
Size: Small
Race: Formless
RaceGroups:
Rachel_Sanctuary: true
Element: Wind
ElementLevel: 3
WalkSpeed: 190
@ -60651,6 +60669,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 187
@ -68263,6 +68283,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 300
@ -68734,6 +68756,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demon
RaceGroups:
Rachel_Sanctuary: true
Element: Dark
ElementLevel: 3
WalkSpeed: 140
@ -70573,6 +70597,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 250
@ -73816,6 +73842,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Rachel_Sanctuary: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 225

19
db/re/pet_db.yml
View File

@ -1568,7 +1568,6 @@ Body:
bonus bAtk,15;
} else {
bonus bAtk,10;
bonus bDef,-3;
}
# Evolution:
# - Target: ORK_HERO2
@ -1987,7 +1986,7 @@ Body:
# bonus bAgi,4;
# }
- Mob: ALIOT
EggItem: Aliot_Egg
EggItem: Aliot_EGG
FoodItem: Pet_Food
Fullness: 2
HungryDelay: 120
@ -2011,7 +2010,7 @@ Body:
bonus bAspdRate,2;
}
- Mob: ALICEL
EggItem: Alicel_Egg
EggItem: Alicel_EGG
FoodItem: Pet_Food
Fullness: 2
HungryDelay: 120
@ -2023,18 +2022,18 @@ Body:
.@i = getpetinfo(PETINFO_INTIMATE);
if (.@i >= PET_INTIMATE_LOYAL) {
bonus bCastrate,-5;
bonus2 bMagicAddEle,Ele_Neutral,5;
bonus bVariableCastrate,-5;
bonus2 bMagicAtkEle,Ele_Neutral,5;
} else if (.@i >= PET_INTIMATE_CORDIAL) {
bonus bCastrate,-4;
bonus2 bMagicAddEle,Ele_Neutral,3;
bonus bVariableCastrate,-4;
bonus2 bMagicAtkEle,Ele_Neutral,3;
} else if (.@i >= PET_INTIMATE_NEUTRAL) {
bonus bCastrate,-3;
bonus bVariableCastrate,-3;
} else {
bonus bCastrate,-2;
bonus bVariableCastrate,-2;
}
- Mob: ALIZA
EggItem: Aliza_Egg
EggItem: Aliza_EGG
FoodItem: Pet_Food
Fullness: 2
HungryDelay: 120

2
doc/item_bonus.txt
View File

@ -31,7 +31,7 @@ This list contains all available constants referenced in the 'bonus' commands.
RC2_Bio5_Swordman_Thief, RC2_Bio5_Acolyte_Merchant, RC2_Bio5_Mage_Archer, RC2_Bio5_MVP,
RC2_Clocktower, RC2_Thanatos, RC2_Faceworm, RC2_Hearthunter, RC2_Rockridge, RC2_Werner_Lab,
RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo, RC2_EP172ALPHA, RC2_EP172BETA, RC2_EP172BATH,
RC2_Illusion_Turtle
RC2_Illusion_Turtle, RC2_Rachel_Sanctuary
* Class (c)
Class_Normal, Class_Boss, Class_Guardian, Class_All

1
sql-files/mob_db.sql
View File

@ -61,6 +61,7 @@ CREATE TABLE `mob_db` (
`racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

1
sql-files/mob_db2.sql
View File

@ -61,6 +61,7 @@ CREATE TABLE `mob_db2` (
`racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

1
sql-files/mob_db2_re.sql
View File

@ -63,6 +63,7 @@ CREATE TABLE `mob_db2_re` (
`racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

1
sql-files/mob_db_re.sql
View File

@ -63,6 +63,7 @@ CREATE TABLE `mob_db_re` (
`racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

12
sql-files/upgrades/upgrade_20230927.sql Normal file
View File

@ -0,0 +1,12 @@
ALTER TABLE `mob_db`
ADD COLUMN `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL
;
ALTER TABLE `mob_db2`
ADD COLUMN `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL
;
ALTER TABLE `mob_db_re`
ADD COLUMN `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL
;
ALTER TABLE `mob_db2_re`
ADD COLUMN `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL
;

5
src/map/itemdb.hpp
View File

@ -1835,6 +1835,11 @@ enum e_random_item_group {
IG_CLASS_SHADOW_EA_CUBE,
IG_ENCHANT_STONE_BOX30,
IG_ENCHANT_STONE_BOX31,
IG_ENCHANT_STONE_BOX32,
IG_ANCIENT_HERO_BOX_2,
IG_ANCIENT_HERO_BOX_3,
IG_INTAKE_HAIR_BOX,
IG_PONYTAIL_HAIR_BOX,
IG_MAX,
};

1
src/map/map.hpp
View File

@ -364,6 +364,7 @@ enum e_race2 : uint8{
RC2_EP172BETA,
RC2_EP172BATH,
RC2_ILLUSION_TURTLE,
RC2_RACHEL_SANCTUARY,
RC2_MAX
};

2
src/map/mob.cpp
View File

@ -5276,7 +5276,7 @@ static int mob_read_sqldb(void)
for( uint8 fi = 0; fi < ARRAYLENGTH(mob_db_name); ++fi ) {
// retrieve all rows from the mob database
if( SQL_ERROR == Sql_Query(mmysql_handle, "SELECT `id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`sp`,`base_exp`,`job_exp`,`mvp_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,"
"`racegroup_goblin`,`racegroup_kobold`,`racegroup_orc`,`racegroup_golem`,`racegroup_guardian`,`racegroup_ninja`,`racegroup_gvg`,`racegroup_battlefield`,`racegroup_treasure`,`racegroup_biolab`,`racegroup_manuk`,`racegroup_splendide`,`racegroup_scaraba`,`racegroup_ogh_atk_def`,`racegroup_ogh_hidden`,`racegroup_bio5_swordman_thief`,`racegroup_bio5_acolyte_merchant`,`racegroup_bio5_mage_archer`,`racegroup_bio5_mvp`,`racegroup_clocktower`,`racegroup_thanatos`,`racegroup_faceworm`,`racegroup_hearthunter`,`racegroup_rockridge`,`racegroup_werner_lab`,`racegroup_temple_demon`,`racegroup_illusion_vampire`,`racegroup_malangdo`,`racegroup_ep172alpha`,`racegroup_ep172beta`,`racegroup_ep172bath`,`racegroup_illusion_turtle`,"
"`racegroup_goblin`,`racegroup_kobold`,`racegroup_orc`,`racegroup_golem`,`racegroup_guardian`,`racegroup_ninja`,`racegroup_gvg`,`racegroup_battlefield`,`racegroup_treasure`,`racegroup_biolab`,`racegroup_manuk`,`racegroup_splendide`,`racegroup_scaraba`,`racegroup_ogh_atk_def`,`racegroup_ogh_hidden`,`racegroup_bio5_swordman_thief`,`racegroup_bio5_acolyte_merchant`,`racegroup_bio5_mage_archer`,`racegroup_bio5_mvp`,`racegroup_clocktower`,`racegroup_thanatos`,`racegroup_faceworm`,`racegroup_hearthunter`,`racegroup_rockridge`,`racegroup_werner_lab`,`racegroup_temple_demon`,`racegroup_illusion_vampire`,`racegroup_malangdo`,`racegroup_ep172alpha`,`racegroup_ep172beta`,`racegroup_ep172bath`,`racegroup_illusion_turtle`,`racegroup_rachel_sanctuary`,"
"`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`damage_taken`,`ai`,`class`,"
"`mode_canmove`,`mode_looter`,`mode_aggressive`,`mode_assist`,`mode_castsensoridle`,`mode_norandomwalk`,`mode_nocast`,`mode_canattack`,`mode_castsensorchase`,`mode_changechase`,`mode_angry`,`mode_changetargetmelee`,`mode_changetargetchase`,`mode_targetweak`,`mode_randomtarget`,`mode_ignoremelee`,`mode_ignoremagic`,`mode_ignoreranged`,`mode_mvp`,`mode_ignoremisc`,`mode_knockbackimmune`,`mode_teleportblock`,`mode_fixeditemdrop`,`mode_detector`,`mode_statusimmune`,`mode_skillimmune`,"
"`mvpdrop1_item`,`mvpdrop1_rate`,`mvpdrop1_option`,`mvpdrop1_index`,`mvpdrop2_item`,`mvpdrop2_rate`,`mvpdrop2_option`,`mvpdrop2_index`,`mvpdrop3_item`,`mvpdrop3_rate`,`mvpdrop3_option`,`mvpdrop3_index`,"

6
src/map/script_constants.hpp
View File

@ -4222,6 +4222,7 @@
export_constant(RC2_EP172BETA);
export_constant(RC2_EP172BATH);
export_constant(RC2_ILLUSION_TURTLE);
export_constant(RC2_RACHEL_SANCTUARY);
export_constant(RC2_MAX);
/* monster ai */
@ -6778,6 +6779,11 @@
export_constant(IG_CLASS_SHADOW_EA_CUBE);
export_constant(IG_ENCHANT_STONE_BOX30);
export_constant(IG_ENCHANT_STONE_BOX31);
export_constant(IG_ENCHANT_STONE_BOX32);
export_constant(IG_ANCIENT_HERO_BOX_2);
export_constant(IG_ANCIENT_HERO_BOX_3);
export_constant(IG_INTAKE_HAIR_BOX);
export_constant(IG_PONYTAIL_HAIR_BOX);
/* unit stop walking */
export_constant(USW_NONE);

4
src/map/status.cpp
View File

@ -7685,7 +7685,7 @@ static defType status_calc_def(struct block_list *bl, status_change *sc, int def
if (sc->getSCE(SC_ATTACK_STANCE))
def -= sc->getSCE(SC_ATTACK_STANCE)->val2;
if (sc->getSCE(SC_M_DEFSCROLL))
def += 500;
def += sc->getSCE(SC_M_DEFSCROLL)->val1;
return (defType)cap_value(def,DEFTYPE_MIN,DEFTYPE_MAX);
}
@ -7819,7 +7819,7 @@ static defType status_calc_mdef(struct block_list *bl, status_change *sc, int md
if (sc->getSCE(SC_CLIMAX_CRYIMP))
mdef += 100;
if (sc->getSCE(SC_M_DEFSCROLL))
mdef += 200;
mdef += sc->getSCE(SC_M_DEFSCROLL)->val2;
return (defType)cap_value(mdef,DEFTYPE_MIN,DEFTYPE_MAX);
}