Bläddra i källkod

Corrected script for some item #1 (#6523)

Implementations + corrections of a bunch of items
idk-whoami 3 år sedan
förälder
incheckning
464fd81dd6
4 ändrade filer med 1279 tillägg och 21 borttagningar
  1. 430 1
      db/re/item_combos.yml
  2. 778 19
      db/re/item_db_equip.yml
  3. 62 1
      db/re/item_db_etc.yml
  4. 9 0
      db/re/item_db_usable.yml

+ 430 - 1
db/re/item_combos.yml

@@ -20927,7 +20927,7 @@ Body:
           - aegis_310655
           - Release_Of_Magic
     Script: |
-      autobonus "{ bonus bFlee2,100; bonus2 bMagicAddClass,Class_Boss,100; }",50,10000,BF_MAGIC,"{ active_transform 1639,10000 }";
+      autobonus "{ bonus bFlee2,100; bonus2 bMagicAddClass,Class_Boss,100; }",50,10000,BF_MAGIC,"{ active_transform 1639,10000; }";
       /*Unknow Rate*/
   - Combos:
       - Combo:
@@ -23606,3 +23606,432 @@ Body:
       bonus bSmatk,2;
       bonus2 bAddClass,Class_All,10;
       bonus bMatkRate,10;
+  - Combos:
+      - Combo:
+          - RingOfThought_TW     # 32245
+          - B_Seyren_Card     # 4357
+    Script: |
+      bonus bCritical,15;
+      bonus2 bAddSize,Size_All,6;
+  - Combos:
+      - Combo:
+          - RingOfThought_TW     # 32245
+          - B_Eremes_Card     # 4359
+    Script: |
+      bonus bFlee,20;
+      skill "TF_HIDING",1;
+      bonus2 bSkillUseSP,"TF_HIDING",-250;
+  - Combos:
+      - Combo:
+          - RingOfThought_TW     # 32245
+          - B_Harword_Card     # 4361
+    Script: |
+      bonus bAspd,2;
+      bonus3 bAutoSpell,"RG_STRIPHELM",3,60;
+  - Combos:
+      - Combo:
+          - RingOfThought_TW     # 32245
+          - B_Magaleta_Card     # 4363
+    Script: |
+      bonus bDef,20;
+      bonus2 bSubEle,Ele_All,6;
+  - Combos:
+      - Combo:
+          - RingOfThought_TW     # 32245
+          - B_Katrinn_Card     # 4365
+    Script: |
+      bonus bMdef,20;
+      bonus2 bMagicAtkEle,Ele_All,6;
+  - Combos:
+      - Combo:
+          - RingOfThought_TW     # 32245
+          - B_Shecil_Card     # 4367
+    Script: |
+      bonus bHit,20;
+      bonus bSPDrainValue,1;
+  - Combos:
+      - Combo:
+          - Tatenasi_Armor_     # 15137
+          - Cornutus_Card     # 4061
+    Script: |
+      bonus bVit,15;
+  - Combos:
+      - Combo:
+          - Tatenasi_Armor_     # 15137
+          - Rsx_0806_Card     # 4342
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus bVit,5*.@r;
+      bonus bMaxHPrate,5*.@r;
+  - Combos:
+      - Combo:
+          - Tatenasi_Helmet     # 18884
+          - Tatenasi_Armor_     # 15137
+    Script: |
+      bonus bDef,15*(getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_HEAD_TOP));
+  - Combos:
+      - Combo:
+          - Tatenasi_Armor_TW     # 15215
+          - Cornutus_Card     # 4061
+    Script: |
+      bonus bVit,15;
+  - Combos:
+      - Combo:
+          - Tatenasi_Armor_TW     # 15215
+          - Rsx_0806_Card     # 4342
+    Script: |
+      .@r = min(10,getequiprefinerycnt(EQI_ARMOR));
+      bonus bVit,5*.@r;
+      bonus bMaxHPrate,5*.@r;
+  - Combos:
+      - Combo:
+          - Tatenasi_Armor_TW     # 15215
+          - Tatenasi_Helmet_TW     # 19298
+    Script: |
+      bonus bDef,15*(min(10,getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_HEAD_TOP)));
+  - Combos:
+      - Combo:
+          - Tatenasi_Armor     # 15136
+          - Waste_Stove_Card     # 4332
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r==5)
+         bonus bDefEle,Ele_Earth;
+      else if (.@r==6)
+         bonus bDefEle,Ele_Water;
+      else if (.@r==7)
+         bonus bDefEle,Ele_Wind;
+      else if (.@r==8)
+         bonus bDefEle,Ele_Fire;
+      else if (.@r==9)
+         bonus bDefEle,Ele_Dark;
+      else if (.@r>=10)
+         bonus bDefEle,Ele_Holy;
+  - Combos:
+      - Combo:
+          - Yellow_Scarf     # 5917
+          - YDragon_SkyWing     # 19104
+    Script: |
+      if (BaseClass == Job_Archer)
+         bonus bLongAtkDef,-10;
+  - Combos:
+      - Combo:
+          - Yellow_Scarf     # 5917
+          - Yellow_Bandana     # 5277
+      - Combo:
+          - Yellow_Scarf     # 5917
+          - Yellow_Ribbon     # 5278
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (.@r>=5)
+         bonus bLongAtkDef,3;
+      if (.@r>=7)
+         bonus bLongAtkDef,4;
+  - Combos:
+      - Combo:
+          - Space_shoes_JP     # 22203
+          - Dark_Lord_Card     # 4168
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "SA_VOLCANO",5;
+      if (BaseLevel >= 100)
+         autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,10*.@r; }",30,15000,BF_WEAPON;
+      else if (BaseLevel <= 99)
+        autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,5*.@r; }",30,15000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Space_shoes_JP     # 22203
+          - Sealed_D_Lord_Card     # 4488
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "SA_VOLCANO",1;
+      if (BaseLevel >= 100)
+         autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,5*.@r; }",30,15000,BF_WEAPON;
+      else if (BaseLevel <= 99)
+        autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,2*.@r; }",30,15000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Space_shoes_JP_     # 22245
+          - Dark_Lord_Card     # 4168
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "WZ_METEOR",10;
+      bonus3 bAutoSpellWhenHit,"WZ_METEOR",5,-100;
+      if (BaseLevel >= 100)
+         autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,8*.@r; bonus2 bMagicAtkEle,Ele_Dark,8*.@r; bonus2 bMagicAtkEle,Ele_Neutral,8*.@r; }",30,15000,BF_WEAPON;
+      else if (BaseLevel <= 99)
+         autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,3*.@r; bonus2 bMagicAtkEle,Ele_Dark,3*.@r; bonus2 bMagicAtkEle,Ele_Neutral,3*.@r; }",30,15000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Space_shoes_JP_     # 22245
+          - Sealed_D_Lord_Card     # 4488
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "SA_VOLCANO",1;
+      bonus3 bAutoSpellWhenHit,"WZ_METEOR",5,-100;
+      if (BaseLevel >= 100)
+         autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,10*.@r; }",30,15000,BF_WEAPON;
+      else if (BaseLevel <= 99)
+         autobonus2 "{ bonus2 bMagicAtkEle,Ele_Fire,5*.@r; }",30,15000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Space_shoes_JP_     # 22245
+          - Runaway_Magic     # 4876
+    Script: |
+      bonus bDelayrate,-70;
+      bonus bSPDrainValue,5;
+  - Combos:
+      - Combo:
+          - Triad_God_Mail_J_     # 15421
+          - Ktullanux_Card     # 4419
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus2 bResEff,Eff_Freeze,10000;
+      autobonus2 "{ bonus2 bResEff,Eff_Crystalize,10000; bonus2 bResEff,Eff_Freezing,10000; bonus2 bSubEle,Ele_Water,100; }",100,3000,BF_WEAPON|BF_MAGIC;
+      bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,-20,BF_WEAPON|BF_MAGIC,0;
+      bonus2 bAddEle,Ele_Fire,5*.@r;
+  - Combos:
+      - Combo:
+          - Triad_God_Mail_J_     # 15421
+          - Sealed_Ktullanux_Card     # 4481
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus2 bResEff,Eff_Freeze,10000;
+      autobonus2 "{ bonus2 bResEff,Eff_Crystalize,10000; bonus2 bResEff,Eff_Freezing,10000; bonus2 bSubEle,Ele_Water,100; }",100,3000,BF_WEAPON|BF_MAGIC;
+      bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,-20,BF_WEAPON|BF_MAGIC,0;
+      bonus2 bAddEle,Ele_Fire,3*.@r;
+  - Combos:
+      - Combo:
+          - Triad_God_Mail_J__     # 450158
+          - Ktullanux_Card     # 4419
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus2 bResEff,Eff_Freeze,10000;
+      autobonus2 "{ bonus2 bResEff,Eff_Crystalize,10000; bonus2 bResEff,Eff_Freezing,10000; bonus2 bSubEle,Ele_Water,100; }",100,3000,BF_WEAPON|BF_MAGIC;
+      bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,-20,BF_WEAPON|BF_MAGIC,0;
+      bonus2 bAddEle,Ele_Fire,8*.@r;
+  - Combos:
+      - Combo:
+          - Triad_God_Mail_J__     # 450158
+          - Sealed_Ktullanux_Card     # 4481
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus2 bResEff,Eff_Freeze,10000;
+      autobonus2 "{ bonus2 bResEff,Eff_Crystalize,10000; bonus2 bResEff,Eff_Freezing,10000; bonus2 bSubEle,Ele_Water,100; }",100,3000,BF_WEAPON|BF_MAGIC;
+      bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,-20,BF_WEAPON|BF_MAGIC,0;
+      bonus2 bAddEle,Ele_Fire,5*.@r;
+  - Combos:
+      - Combo:
+          - aegis_450163     # 450163
+          - Grave_Amon_Ra_Card     # 4652
+    Script: |
+      bonus2 bMagicAtkEle,Ele_Holy,15;
+      bonus2 bResEff,Eff_Freeze,10000;
+      skill "AB_JUDEX",3;
+  - Combos:
+      - Combo:
+          - aegis_450163     # 450163
+          - aegis_300348     # 300348
+    Script: |
+      bonus2 bMagicAtkEle,Ele_Holy,5;
+      bonus2 bResEff,Eff_Freeze,10000;
+      skill "AB_JUDEX",1;
+  - Combos:
+      - Combo:
+          - aegis_450181     # 450181
+          - Grave_Amon_Ra_Card     # 4652
+    Script: |
+      .@r = min(10,getequiprefinerycnt(EQI_ARMOR));
+      bonus2 bMagicAtkEle,Ele_Holy,50;
+      bonus2 bResEff,Eff_Freeze,10000;
+      skill "AB_JUDEX",.@r;
+  - Combos:
+      - Combo:
+          - aegis_450181     # 450181
+          - aegis_300348     # 300348
+    Script: |
+      .@r = min(10,getequiprefinerycnt(EQI_ARMOR));
+      bonus2 bMagicAtkEle,Ele_Holy,15;
+      bonus2 bResEff,Eff_Freeze,10000;
+      skill "AB_JUDEX",.@r;
+  - Combos:
+      - Combo:
+          - Awakening_Nergal_Shoes     # 470047
+          - Moonlight_Flower_Card     # 4131
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "AL_HEAL",10;
+      if (BaseLevel >= 100) {
+         bonus bInt,10*.@r;
+         bonus bMdef,10*.@r;
+      } else {
+         bonus bInt,3*.@r;
+         bonus bMdef,5*.@r;
+      }
+  - Combos:
+      - Combo:
+          - Awakening_Nergal_Shoes     # 470047
+          - Sealed_M_Flower_Card_J     # 300139
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "AL_HEAL",10;
+      if (BaseLevel >= 100) {
+         bonus bMatk,15*.@r;
+         bonus bMdef,10*.@r;
+      } else {
+         bonus bMatk,5*.@r;
+         bonus bMdef,5*.@r;
+      }
+  - Combos:
+      - Combo:
+          - Nergal_Shoes     # 22132
+          - Moonlight_Flower_Card     # 4131
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "AL_HEAL",10;
+      if (BaseLevel >= 100) {
+         bonus bMatk,15*.@r;
+         bonus bMdef,10*.@r;
+      } else {
+         bonus bMatk,5*.@r;
+         bonus bMdef,5*.@r;
+      }
+  - Combos:
+      - Combo:
+          - Nergal_Shoes     # 22132
+          - Sealed_M_Flower_Card_J     # 300139
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      skill "AL_HEAL",10;
+      if (BaseLevel >= 100) {
+         bonus bMatk,10*.@r;
+         bonus bMdef,6*.@r;
+      } else {
+         bonus bMatk,3*.@r;
+         bonus bMdef,3*.@r;
+      }
+  - Combos:
+      - Combo:
+          - aegis_32295     # 32295
+          - Strong_Blow1     # 29366
+      - Combo:
+          - aegis_32295     # 32295
+          - Strong_Blow2     # 29367
+      - Combo:
+          - aegis_32295     # 32295
+          - Strong_Blow3     # 29368
+      - Combo:
+          - aegis_32295     # 32295
+          - Strong_Blow4     # 29369
+      - Combo:
+          - aegis_32295     # 32295
+          - Strong_Blow5     # 29370
+      - Combo:
+          - aegis_32296     # 32296
+          - Strong_Blow1     # 29366
+      - Combo:
+          - aegis_32296     # 32296
+          - Strong_Blow2     # 29367
+      - Combo:
+          - aegis_32296     # 32296
+          - Strong_Blow3     # 29368
+      - Combo:
+          - aegis_32296     # 32296
+          - Strong_Blow4     # 29369
+      - Combo:
+          - aegis_32296     # 32296
+          - Strong_Blow5     # 29370
+    Script: |
+      if (BaseClass == Job_Novice || BaseClass == Job_Swordman || BaseClass == Job_Archer || BaseClass == Job_Acolyte || BaseClass == Job_Archer || BaseClass == Job_Merchant || BaseClass == Job_Taekwon || BaseClass == Job_Gunslinger || BaseClass == Job_Summoner) {
+         bonus2 bAddRace,RC_All,10;
+         bonus bPerfectHitAddRate,30;
+      }
+  - Combos:
+      - Combo:
+          - aegis_480161     # 480161
+          - Old_Camo_RabbitHood     # 18984
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkRate,2*(.@r/2);
+      bonus2 bSkillAtk,"RA_ARROWSTORM",5*(.@r/2);
+      if (.@r>=12)
+         bonus2 bSkillCooldown,"RA_ARROWSTORM",-500;
+  - Combos:
+      - Combo:
+          - aegis_480161     # 480161
+          - Old_Shadow_Handicraft     # 18975
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bDelayrate,-1*(.@r/2);
+      bonus2 bSkillAtk,"SC_FEINTBOMB",15*(.@r/2);
+      if (.@r>=12)
+         bonus2 bSkillCooldown,"SC_FEINTBOMB",-1800;
+  - Combos:
+      - Combo:
+          - aegis_480161     # 480161
+          - Old_Midas_Whisper     # 18977
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkRate,2*(.@r/2);
+      bonus2 bSkillAtk,"GN_CARTCANNON",2*(.@r/2);
+      if (.@r>=12)
+         bonus2 bAddSize,Size_All,5;
+  - Combos:
+      - Combo:
+          - aegis_480161     # 480161
+          - Old_Protect_Of_Crown     # 18983
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkRate,2*(.@r/2);
+      bonus2 bSkillAtk,"LG_BANISHINGPOINT",3*(.@r/2);
+      if (.@r>=12)
+         bonus2 bAddSize,Size_All,5;
+  - Combos:
+      - Combo:
+          - aegis_480161     # 480161
+          - Old_Driver_Band_Y     # 18974
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"NC_PILEBUNKER",15*(.@r/2);
+      bonus2 bSkillAtk,"NC_VULCANARM",15*(.@r/2);
+      if (.@r>=12)
+         bonus2 bSkillCooldown,"NC_SELFDESTRUCTION",-30000;
+  - Combos:
+      - Combo:
+          - aegis_480166     # 480166
+          - Old_Minstrel_Song_Hat     # 18976
+      - Combo:
+          - aegis_480166     # 480166
+          - Old_Dying_Swan     # 18981
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"WM_METALICSOUND",15*(.@r/2);
+      if (.@r>=12)
+         bonus2 bSkillCooldown,"WM_METALICSOUND",-1000;
+  - Combos:
+      - Combo:
+          - aegis_480166     # 480166
+          - Old_Wind_Whisper     # 18980
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bMagicAddSize,Size_All,(.@r/2);
+      if (.@r>=12)
+         bonus2 bSkillCooldown,"SO_VARETYR_SPEAR",-1000;
+  - Combos:
+      - Combo:
+          - aegis_480166     # 480166
+          - Old_Magic_Stone_Hat     # 18978
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bMagicAddSize,Size_All,(.@r/2);
+      if (.@r>=12)
+         bonus2 bMagicAddClass,Class_Boss,15;
+  - Combos:
+      - Combo:
+          - aegis_480166     # 480166
+          - Old_Mitra     # 18972
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkDef,2*(.@r/2);
+      if (.@r>=12)
+         bonus2 bSubRace,RC_All,15;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 778 - 19
db/re/item_db_equip.yml


+ 62 - 1
db/re/item_db_etc.yml

@@ -36310,7 +36310,7 @@ Body:
     Weight: 10
   - Id: 25286
     AegisName: Octo_Octo_Fluid
-    Name: Octopus
+    Name: Octopus Octopus Liquid
     Type: Etc
   - Id: 25287
     AegisName: Mysterious_Feather
@@ -43491,6 +43491,41 @@ Body:
     Script: |
       skill "TF_DOUBLE",3;
       bonus bDoubleRate,15;
+  - Id: 29366
+    AegisName: Strong_Blow1
+    Name: Hard Blow 1
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bAddRace,RC_All,2*getrefine();
+  - Id: 29367
+    AegisName: Strong_Blow2
+    Name: Hard Blow 2
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bAddRace,RC_All,4*getrefine();
+  - Id: 29368
+    AegisName: Strong_Blow3
+    Name: Hard Blow 3
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bAddRace,RC_All,6*getrefine();
+  - Id: 29369
+    AegisName: Strong_Blow4
+    Name: Hard Blow 4
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bAddRace,RC_All,8*getrefine();
+  - Id: 29370
+    AegisName: Strong_Blow5
+    Name: Hard Blow 5
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bAddRace,RC_All,10*getrefine();
   - Id: 29371
     AegisName: Release_Of_Magic
     Name: Release of Truth
@@ -46249,6 +46284,18 @@ Body:
     Weight: 10
     Locations:
       Right_Hand: true
+  - Id: 300139
+    AegisName: Sealed_M_Flower_Card_J
+    Name: Sealed Moonlight Flower Card
+    Type: Card
+    Weight: 10
+    Locations:
+      Shoes: true
+    Flags:
+      DropEffect: CLIENT
+    Script: |
+      bonus bSpeedRate,25;
+      bonus bHit,-50;
   - Id: 300140
     AegisName: ILL_Sropho_Card
     Name: Deep Sea Sropho Card
@@ -47834,6 +47881,20 @@ Body:
       bonus bUseSPrate,10;
       bonus bShortAtkRate,4*(.@r/3);
       bonus bLongAtkRate,4*(.@r/3);
+  - Id: 300348
+    AegisName: aegis_300348
+    Name: Sealed Nightmare Amon Ra Card
+    Type: Card
+    Weight: 10
+    Locations:
+      Armor: true
+    Flags:
+      DropEffect: CLIENT
+    Script: |
+      bonus2 bMagicAddRace,RC_Demon,5;
+      bonus2 bMagicAddRace,RC_Undead,5;
+      bonus2 bMagicAddEle,Ele_Dark,5;
+      bonus2 bMagicAddEle,Ele_Undead,5;
   - Id: 310000
     AegisName: Ranger_Top2
     Name: Sniper Stone II (Top)

+ 9 - 0
db/re/item_db_usable.yml

@@ -48943,6 +48943,15 @@ Body:
     Weight: 10
     Script: |
       /*upgradeui 23720;*/
+  - Id: 23766
+    AegisName: Overwhelm_Armor_Box
+    Name: Temporal Armor Box
+    Type: Usable
+    Weight: 2000
+    Flags:
+      Container: true
+    Script: |
+      getitem callfunc("F_Rand",15278,15279,15346,15347,15353,15354),1;
   - Id: 23770
     AegisName: Enchant_Stone_Box16
     Name: Costume Enchant Stone Box 16

Vissa filer visades inte eftersom för många filer har ändrats