Parcourir la source

Corrected script for some item (#7091)

Fixed #7073
idk-whoami il y a 2 ans
Parent
commit
b2feb2e9b0

+ 41 - 35
db/re/item_combos.yml

@@ -355,17 +355,21 @@ Body:
       bonus bAspdRate,getequiprefinerycnt(EQI_HAND_R);
   - Combos:
       - Combo:
-          - Principles_Of_Magic
-          - Librarian_Glove
-          - Pocket_Watch_
+          - Principles_Of_Magic    # 1572
+          - Librarian_Glove    # 2716
+          - Pocket_Watch__    # 2971
       - Combo:
-          - Ancient_Magic
-          - Librarian_Glove
-          - Pocket_Watch_
+          - Ancient_Magic    # 1573
+          - Librarian_Glove    # 2716
+          - Pocket_Watch__    # 2971
       - Combo:
-          - Ancient_Magic
-          - Librarian_Glove
-          - Pocket_Watch
+          - Ancient_Magic    # 1573
+          - Librarian_Glove    # 2716
+          - Pocket_Watch_    # 2717
+      - Combo:
+          - Principles_Of_Magic    # 1572
+          - Librarian_Glove    # 2716
+          - Pocket_Watch_    # 2717
     Script: |
       bonus bInt,5;
       bonus bMaxHP,700;
@@ -1061,37 +1065,37 @@ Body:
       }
   - Combos:
       - Combo:
-          - Memorize_Book
-          - One_Eyed_Glass
-          - Pocket_Watch
+          - Memorize_Book    # 2109
+          - One_Eyed_Glass    # 2239
+          - Pocket_Watch_    # 2717
       - Combo:
-          - Memorize_Book
-          - One_Eyed_Glass
-          - Pocket_Watch_
+          - Memorize_Book    # 2109
+          - One_Eyed_Glass    # 2239
+          - Pocket_Watch__    # 2971
       - Combo:
-          - Memorize_Book
-          - Pocket_Watch_
-          - One_Eyed_Glass_
+          - Memorize_Book    # 2109
+          - One_Eyed_Glass_    # 18874
+          - Pocket_Watch_    # 2717
       - Combo:
-          - Memorize_Book
-          - Pocket_Watch
-          - One_Eyed_Glass_
+          - Memorize_Book    # 2109
+          - One_Eyed_Glass_    # 18874
+          - Pocket_Watch__    # 2971
       - Combo:
-          - Memorize_Book_
-          - One_Eyed_Glass
-          - Pocket_Watch
+          - Memorize_Book_    # 2121
+          - One_Eyed_Glass    # 2239
+          - Pocket_Watch_    # 2717
       - Combo:
-          - Memorize_Book_
-          - One_Eyed_Glass
-          - Pocket_Watch_
+          - Memorize_Book_    # 2121
+          - One_Eyed_Glass    # 2239
+          - Pocket_Watch__    # 2971
       - Combo:
-          - Memorize_Book_
-          - Pocket_Watch_
-          - One_Eyed_Glass_
+          - Memorize_Book_    # 2121
+          - One_Eyed_Glass_    # 18874
+          - Pocket_Watch_    # 2717
       - Combo:
-          - Memorize_Book_
-          - Pocket_Watch
-          - One_Eyed_Glass_
+          - Memorize_Book_    # 2121
+          - One_Eyed_Glass_    # 18874
+          - Pocket_Watch__    # 2971
     Script: |
       bonus bHPrecovRate,15;
       bonus bSPrecovRate,15;
@@ -4820,13 +4824,15 @@ Body:
       bonus2 bSPLossRate,6,6000;
   - Combos:
       - Combo:
-          - White_Knightage_Card
-          - Khaliz_Knightage_Card
+          - White_Knightage_Card    # 4608
+          - Khaliz_Knightage_Card    # 4609
     Script: |
       bonus2 bAddSize,Size_Medium,15;
       bonus2 bAddSize,Size_Large,15;
       bonus2 bSubSize,Size_Medium,5;
       bonus2 bSubSize,Size_Large,5;
+      bonus2 bMagicSubSize,Size_Medium,5;
+      bonus2 bMagicSubSize,Size_Large,5;
   - Combos:
       - Combo:
           - Sarah_Card

+ 3 - 6
db/re/item_db_equip.yml

@@ -38205,10 +38205,10 @@ Body:
     Script: |
       bonus bMatkRate,1;
   - Id: 2971
-    AegisName: Pocket_Watch
+    AegisName: Pocket_Watch__
     Name: Pocket Watch
     Type: Armor
-    Buy: 10
+    Buy: 20
     Weight: 200
     Defense: 1
     Slots: 1
@@ -38221,10 +38221,6 @@ Body:
       Both_Accessory: true
     ArmorLevel: 1
     EquipLevelMin: 80
-    Script: |
-      bonus bHPrecovRate,15;
-      bonus bSPrecovRate,15;
-      bonus bMatkRate,7;
   - Id: 2976
     AegisName: Red_Lantern
     Name: Red Lantern
@@ -68988,6 +68984,7 @@ Body:
     Refineable: true
     Script: |
       .@r = getrefine();
+      bonus bUnbreakableArmor;
       bonus2 bAddSize,Size_Medium,10;
       bonus2 bAddSize,Size_Large,10;
       bonus2 bMagicAddSize,Size_Medium,10;

+ 4 - 2
db/re/item_db_etc.yml

@@ -11459,6 +11459,8 @@ Body:
       bonus bDef,20;
       bonus2 bSubSize,Size_Medium,25;
       bonus2 bSubSize,Size_Large,25;
+      bonus2 bMagicSubSize,Size_Medium,25;
+      bonus2 bMagicSubSize,Size_Large,25;
   - Id: 4610
     AegisName: Sarah_Card
     Name: Sarah Card
@@ -27858,10 +27860,10 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 7513
-    AegisName: Pocket_Watch__
+    AegisName: Pocket_Watch
     Name: Pocket Watch
     Type: Etc
-    Buy: 3420
+    Buy: 2564
     Weight: 10
     Flags:
       BuyingStore: true

+ 2 - 2
db/re/item_group_db.yml

@@ -3403,7 +3403,7 @@ Body:
             Rate: 1
           - Item: Burnt_Parts
             Rate: 1
-          - Item: Pocket_Watch__
+          - Item: Pocket_Watch
             Rate: 1
           - Item: Ice_Heart
             Rate: 15
@@ -22791,7 +22791,7 @@ Body:
             Rate: 1
           - Item: Burnt_Parts
             Rate: 1
-          - Item: Pocket_Watch__
+          - Item: Pocket_Watch
             Rate: 1
           - Item: Ice_Heart
             Rate: 1

+ 3 - 3
db/re/laphine_synthesis.yml

@@ -2223,7 +2223,7 @@ Body:
     Requirements:
       - Item: Shadowdecon
         Amount: 10
-      - Item: Pocket_Watch__
+      - Item: Pocket_Watch
         Amount: 50
   - Item: Bs_Sha_M_S_17
     RewardGroup: BS_SHA_M_S_17
@@ -2367,7 +2367,7 @@ Body:
     Requirements:
       - Item: Zelunium
         Amount: 20
-      - Item: Pocket_Watch__
+      - Item: Pocket_Watch
         Amount: 150
   - Item: Bs_Item_M_S_39
     RewardGroup: BS_ITEM_M_S_39
@@ -2735,7 +2735,7 @@ Body:
     Requirements:
       - Item: Shadowdecon
         Amount: 25
-      - Item: Pocket_Watch__
+      - Item: Pocket_Watch
         Amount: 150
   - Item: Bs_Sha_M_S_25
     RewardGroup: BS_SHA_M_S_25

+ 1 - 1
db/re/mob_db.yml

@@ -29966,7 +29966,7 @@ Body:
       - Item: Old_Card_Album
         Rate: 2000
     Drops:
-      - Item: Pocket_Watch__
+      - Item: Pocket_Watch
         Rate: 1500
       - Item: Old_Violet_Box
         Rate: 1500