汇总合并 rAthena 官方最新代码 - 2024年01月31日

PandasWS · May 25, 2024 · 0122d3f · 0122d3f
2 parents 4d4d944 + fc41781
commit 0122d3f
Show file tree

Hide file tree

Showing 39 changed files with 4,450 additions and 1,768 deletions.
diff --git a/db/pre-re/statpoint.yml b/db/pre-re/statpoint.yml
@@ -532,3 +532,23 @@ Body:
     Points: 4545
   - Level: 250
     Points: 4545
+  - Level: 251
+    Points: 4545
+  - Level: 252
+    Points: 4545
+  - Level: 253
+    Points: 4545
+  - Level: 254
+    Points: 4545
+  - Level: 255
+    Points: 4545
+  - Level: 256
+    Points: 4545
+  - Level: 257
+    Points: 4545
+  - Level: 258
+    Points: 4545
+  - Level: 259
+    Points: 4545
+  - Level: 260
+    Points: 4545
diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml
@@ -40827,7 +40827,7 @@ Body:
       Assassin: true
       Priest: true
     Locations:
-      Head_Low: true
+      Head_Top: true
     ArmorLevel: 1
     EquipLevelMin: 70
     View: 180
@@ -48957,6 +48957,7 @@ Body:
     Weight: 500
     Defense: 5
     Locations:
+      Head_Low: true
       Head_Mid: true
       Head_Top: true
     ArmorLevel: 1
@@ -49901,7 +49902,6 @@ Body:
     Weight: 500
     Defense: 5
     Locations:
-      Head_Low: true
       Head_Mid: true
       Head_Top: true
     ArmorLevel: 1
@@ -49959,6 +49959,7 @@ Body:
     Type: Armor
     Defense: 5
     Locations:
+      Head_Mid: true
       Head_Top: true
     ArmorLevel: 1
     Refineable: true
@@ -64053,7 +64054,7 @@ Body:
       KagerouOboro: true
       Ninja: true
     Locations:
-      Right_Hand: true
+      Both_Hand: true
     WeaponLevel: 3
     EquipLevelMin: 40
     Refineable: true
@@ -78196,7 +78197,7 @@ Body:
       .@d = readparam(bInt)/18;
       .@e = readparam(bDex)/18;
       .@f = readparam(bLuk)/18;
-      skill "MC_IDENTIFY",1,0;
+      skill "MC_IDENTIFY",1;
       bonus bHit,2*.@a;
       bonus bMaxHPrate,2*.@a;
       bonus bFlee,2*.@b;
@@ -84118,6 +84119,7 @@ Body:
     Defense: 10
     Slots: 1
     Locations:
+      Head_Mid: true
       Head_Top: true
     ArmorLevel: 1
     EquipLevelMin: 70
@@ -96939,7 +96941,7 @@ Body:
     EquipLevelMin: 100
     View: 1093
     Script: |
-      skill "MC_IDENTIFY",1,0;
+      skill "MC_IDENTIFY",1;
       .@a = readparam(bStr);
       .@b = readparam(bAgi);
       .@c = readparam(bVit);
@@ -96971,7 +96973,7 @@ Body:
     ArmorLevel: 1
     EquipLevelMin: 100
     Script: |
-      skill "MC_IDENTIFY",1,0;
+      skill "MC_IDENTIFY",1;
       .@a = readparam(bStr);
       .@b = readparam(bAgi);
       .@c = readparam(bVit);
@@ -98820,6 +98822,7 @@ Body:
     Type: Armor
     Locations:
       Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 528
@@ -102407,8 +102410,6 @@ Body:
     Type: Armor
     Locations:
       Costume_Head_Top: true
-      Costume_Head_Mid: true
-      Costume_Head_Low: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 636
@@ -103236,6 +103237,7 @@ Body:
     Type: Armor
     Locations:
       Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 175
@@ -103669,7 +103671,7 @@ Body:
     Name: Costume Prayer Cherry Blossom
     Type: Armor
     Locations:
-      Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 1223
@@ -107006,6 +107008,7 @@ Body:
     Type: Armor
     Locations:
       Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 634
@@ -107903,7 +107906,7 @@ Body:
     Name: Costume Unidentified Flying Poring
     Type: Armor
     Locations:
-      Costume_Head_Top: true
+      Costume_Head_Low: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 1017
@@ -108180,7 +108183,7 @@ Body:
     Name: Costume Blessings Of Soul
     Type: Armor
     Locations:
-      Costume_Head_Low: true
+      Costume_Garment: true
     ArmorLevel: 1
     EquipLevelMin: 1
     Script: |
@@ -147592,7 +147595,6 @@ Body:
     Type: Armor
     Locations:
       Costume_Head_Top: true
-      Costume_Head_Mid: true
       Costume_Head_Low: true
     ArmorLevel: 1
     EquipLevelMin: 1
@@ -148489,6 +148491,7 @@ Body:
     Type: Armor
     Locations:
       Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 223
@@ -149039,7 +149042,7 @@ Body:
     Name: Costume War Princess Ribbon
     Type: Armor
     Locations:
-      Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 1583
@@ -154559,7 +154562,7 @@ Body:
     Name: Costume Savage Shoulder Bebe
     Type: Armor
     Locations:
-      Costume_Head_Top: true
+      Costume_Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 1
     View: 1915
@@ -172213,8 +172216,8 @@ Body:
     Trade:
       NoDrop: true
       NoTrade: true
+      NoSell: true
       NoCart: true
-      NoStorage: true
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
@@ -172229,8 +172232,8 @@ Body:
     Trade:
       NoDrop: true
       NoTrade: true
+      NoSell: true
       NoCart: true
-      NoStorage: true
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
@@ -174929,7 +174932,7 @@ Body:
     View: 666
     Weight: 100
     Locations:
-      Head_Top: true
+      Head_Low: true
       Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 99
@@ -174944,7 +174947,7 @@ Body:
     View: 693
     Weight: 100
     Locations:
-      Head_Top: true
+      Head_Low: true
       Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 99
@@ -174960,7 +174963,7 @@ Body:
     Weight: 100
     Defense: 3
     Locations:
-      Head_Top: true
+      Head_Low: true
       Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 99
@@ -174977,7 +174980,7 @@ Body:
     Defense: 3
     Slots: 1
     Locations:
-      Head_Top: true
+      Head_Low: true
       Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 99
@@ -174993,7 +174996,7 @@ Body:
     Weight: 100
     Slots: 1
     Locations:
-      Head_Top: true
+      Head_Low: true
       Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 99
@@ -175009,7 +175012,7 @@ Body:
     Weight: 100
     Slots: 1
     Locations:
-      Head_Top: true
+      Head_Low: true
       Head_Mid: true
     ArmorLevel: 1
     EquipLevelMin: 99
@@ -225890,7 +225893,7 @@ Body:
       All_Third: true
       Fourth: true
     Locations:
-      Right_Hand: true
+      Both_Hand: true
     WeaponLevel: 4
     EquipLevelMin: 150
     Refineable: true

diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml
@@ -41749,6 +41749,7 @@ Body:
     Buy: 20
     Weight: 10
     Locations:
+      Head_Low: true
       Head_Mid: true
       Head_Top: true
     Flags:
@@ -41763,6 +41764,7 @@ Body:
     Buy: 20
     Weight: 10
     Locations:
+      Head_Low: true
       Head_Mid: true
       Head_Top: true
     Flags:
@@ -51300,6 +51302,8 @@ Body:
     Type: Card
     Weight: 10
     Locations:
+      Head_Low: true
+      Head_Mid: true
       Head_Top: true
     Flags:
       BuyingStore: true
@@ -63337,42 +63341,42 @@ Body:
     Type: Card
     SubType: Enchant
     Script: |
-      autobonus "{ bonus bAtkRate,25; bonus bVit,50; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bAtkRate,25; bonus bVit,50; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
   - Id: 311121
     AegisName: Ice_F_Orb_Sp_Int
     Name: Ice Magic Orb (Spell Buster)
     Type: Card
     SubType: Enchant
     Script: |
-      autobonus "{ bonus bMatkRate,25; bonus bInt,50; }",30,10000,BF_MAGIC;
+      autobonus "{ bonus bMatkRate,25; bonus bInt,50; }",30,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";
   - Id: 311122
     AegisName: Ice_F_Orb_Fi_Dex
     Name: Ice Magic Orb (Firing Shot)
     Type: Card
     SubType: Enchant
     Script: |
-      autobonus "{ bonus bLongAtkRate,15; bonus bDex,50; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bLongAtkRate,15; bonus bDex,50; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
   - Id: 311123
     AegisName: Ice_F_Orb_Ov_Str
     Name: Ice Magic Orb (Overpower)
     Type: Card
     SubType: Enchant
     Script: |
-      autobonus "{ bonus bShortAtkRate,15; bonus bStr,50; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bShortAtkRate,15; bonus bStr,50; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
   - Id: 311124
     AegisName: Ice_F_Orb_Fa_Agi
     Name: Ice Magic Orb (Fatal Flash)
     Type: Card
     SubType: Enchant
     Script: |
-      autobonus "{ bonus bCritAtkRate,25; bonus bAgi,50; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bCritAtkRate,25; bonus bAgi,50; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
   - Id: 311125
     AegisName: Ice_F_Orb_Lu_Luk
     Name: Ice Magic Orb (Lucky Strike)
     Type: Card
     SubType: Enchant
     Script: |
-      autobonus "{ bonus2 bMagicAtkEle,Ele_All,15; bonus bLuk,50; }",30,10000,BF_MAGIC;
+      autobonus "{ bonus2 bMagicAtkEle,Ele_All,15; bonus bLuk,50; }",30,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";
   - Id: 311126
     AegisName: Ice_F_Orb_A_Delay
     Name: Ice Magic Orb (Delay After Attack)
@@ -70933,9 +70937,9 @@ Body:
     SubType: Enchant
     Script: |
       .@g = getenchantgrade();
-      bonus bMaxHPrate,-5;
+      bonus bMaxHPrate,-5; 
       bonus bMaxSPrate,-5;
-      autobonus "{ bonus bStr,50; bonus bPow,15; bonus bSta,15; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bStr,50; bonus bPow,15; bonus bSta,15; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
       if (.@g>=ENCHANTGRADE_D) {
          bonus bLongAtkRate,5;
          bonus bShortAtkRate,5;
@@ -70953,7 +70957,7 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxHPrate,-5;
       bonus bMaxSPrate,-5;
-      autobonus "{ bonus bInt,50; bonus bWis,15; bonus bSpl,15; }",30,10000,BF_MAGIC;
+      autobonus "{ bonus bInt,50; bonus bWis,15; bonus bSpl,15; }",30,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";
       if (.@g>=ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,5;
          if (.@g>=ENCHANTGRADE_C) {
@@ -70969,7 +70973,7 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxHPrate,-5;
       bonus bMaxSPrate,-5;
-      autobonus "{ bonus bDex,50; bonus bCon,15; bonus bCrt,15; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bDex,50; bonus bCon,15; bonus bCrt,15; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
       if (.@g>=ENCHANTGRADE_D) {
          bonus bLongAtkRate,5;
          bonus bShortAtkRate,5;
@@ -78734,6 +78738,7 @@ Body:
     Trade:
       NoDrop: true
       NoTrade: true
+      NoSell: true
       NoCart: true
       NoStorage: true
       NoGuildStorage: true
@@ -78746,6 +78751,7 @@ Body:
     Trade:
       NoDrop: true
       NoTrade: true
+      NoSell: true
       NoCart: true
       NoStorage: true
       NoGuildStorage: true