Browse Source

Corrected MagicAttack in item DB (#8758)

* Corrected according to equipmentproperties.lub
* Updated doc item_db.txt
Atemo 6 months ago
parent
commit
62c9d6d7b7
3 changed files with 94 additions and 69 deletions
  1. 12 4
      db/re/item_combos.yml
  2. 81 65
      db/re/item_db_equip.yml
  3. 1 0
      doc/item_db.txt

+ 12 - 4
db/re/item_combos.yml

@@ -49550,18 +49550,26 @@ Body:
           - aegis_300519   # 300519
           - aegis_300519   # 300519
           - aegis_300506   # 300506
           - aegis_300506   # 300506
     Script: |
     Script: |
+      bonus2 bAddSize,Size_All,15;
       if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_WEAPONLEVEL)==5) {
       if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_WEAPONLEVEL)==5) {
-         bonus2 bAddSize,Size_All,25+15;
-         bonus bPAtk,5;
+         .@i = getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_VIEW);
+         if (.@i == W_2HSWORD || .@i == W_2HSPEAR || .@i == W_2HSTAFF || .@i == W_2HAXE || .@i == W_KATAR || .@i == W_BOW || .@i == W_HUUMA || .@i == W_REVOLVER || .@i == W_RIFLE || .@i == W_GATLING || .@i == W_SHOTGUN || .@i == W_GRENADE) {
+            bonus2 bAddSize,Size_All,25;
+            bonus bPAtk,5;
+         }
       }
       }
   - Combos:
   - Combos:
       - Combo:
       - Combo:
           - aegis_300520   # 300520
           - aegis_300520   # 300520
           - aegis_300507   # 300507
           - aegis_300507   # 300507
     Script: |
     Script: |
+      bonus2 bMagicAddSize,Size_All,15;
       if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_WEAPONLEVEL)==5) {
       if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_WEAPONLEVEL)==5) {
-         bonus2 bMagicAddSize,Size_All,25+15;
-         bonus bSMatk,5;
+         .@i = getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_VIEW);
+         if (.@i == W_2HSWORD || .@i == W_2HSPEAR || .@i == W_2HSTAFF || .@i == W_2HAXE || .@i == W_KATAR || .@i == W_BOW || .@i == W_HUUMA || .@i == W_REVOLVER || .@i == W_RIFLE || .@i == W_GATLING || .@i == W_SHOTGUN || .@i == W_GRENADE) {
+            bonus2 bMagicAddSize,Size_All,25;
+            bonus bSMatk,5;
+         }
       }
       }
   - Combos:
   - Combos:
       - Combo:
       - Combo:

File diff suppressed because it is too large
+ 81 - 65
db/re/item_db_equip.yml


+ 1 - 0
doc/item_db.txt

@@ -101,6 +101,7 @@ Attack: Weapon's attack.
 ---------------------------------------
 ---------------------------------------
 
 
 MagicAttack: Weapon's magic attack. (Renewal only)
 MagicAttack: Weapon's magic attack. (Renewal only)
+             Unlike matk bonus from equipment, MagicAttack is taken into account in weapon variance calculation on Renewal.
 
 
 ---------------------------------------
 ---------------------------------------
 
 

Some files were not shown because too many files changed in this diff