diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml
index 6d7b29491d..ad7d5f9ae8 100644
--- a/db/re/item_combos.yml
+++ b/db/re/item_combos.yml
@@ -35943,14 +35943,14 @@ Body:
       bonus bVariableCastrate,-5;
   - Combos:
       - Combo:
-          - aegis_300457   # 300457
+          - Grey_Icewind_Card
           - aegis_300455   # 300455
     Script: |
       .@r_shoes = getequiprefinerycnt(EQI_SHOES);
       bonus2 bAddSize,Size_Large,10+3*(.@r_shoes/2);
   - Combos:
       - Combo:
-          - aegis_300458   # 300458
+          - Icewind_Card
           - aegis_300455   # 300455
     Script: |
       .@r_shoes = getequiprefinerycnt(EQI_SHOES);
diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml
index bd272aa036..7aa1d2ad9b 100644
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
@@ -57867,15 +57867,15 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 9145
-    AegisName: aegis_9145
+    AegisName: Copo_Egg
     Name: Copo Egg
     Type: PetEgg
   - Id: 9146
-    AegisName: aegis_9146
+    AegisName: Grey_Icewind_Egg
     Name: Gray Icewind Egg
     Type: PetEgg
   - Id: 9147
-    AegisName: aegis_9147
+    AegisName: Icewind_Egg
     Name: Icewind Egg
     Type: PetEgg
   - Id: 9148
diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml
index fa4fbf6a33..24ee86c1fd 100644
--- a/db/re/item_db_etc.yml
+++ b/db/re/item_db_etc.yml
@@ -52363,7 +52363,7 @@ Body:
          }
       }
   - Id: 300457
-    AegisName: aegis_300457
+    AegisName: Grey_Icewind_Card
     Name: Gray Icewind Card
     Type: Card
     Weight: 10
@@ -52382,7 +52382,7 @@ Body:
          bonus bCon,3;
       }
   - Id: 300458
-    AegisName: aegis_300458
+    AegisName: Icewind_Card
     Name: Icewind Card
     Type: Card
     Weight: 10
@@ -82114,7 +82114,7 @@ Body:
     Type: Etc
     Weight: 1
   - Id: 1000889
-    AegisName: aegis_1000889
+    AegisName: Mixed_Fruits_Juice
     Name: Compound Fruit Juice
     Type: Etc
     Weight: 10
@@ -83802,7 +83802,7 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 1001244
-    AegisName: aegis_1001244
+    AegisName: Ep20_Huge_Feather_G
     Name: Large Gray Feather    # !todo check english name
     Type: Etc
     Buy: 1260
@@ -83810,7 +83810,7 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 1001245
-    AegisName: aegis_1001245
+    AegisName: Ep20_Huge_Feather_W
     Name: Large White Feather    # !todo check english name
     Type: Etc
     Buy: 1710
@@ -83818,7 +83818,7 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 1001246
-    AegisName: aegis_1001246
+    AegisName: Ep20_Copo_Head_F
     Name: Copo's Head Feather    # !todo check english name
     Type: Etc
     Buy: 1170
@@ -83826,7 +83826,7 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 1001247
-    AegisName: aegis_1001247
+    AegisName: Ep20_Copo_Egg_Shell
     Name: Kkopo Eggshell Fragment    # !todo check english name
     Type: Etc
     Buy: 945
diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml
index 66f4713a93..15f1787568 100644
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml
@@ -8992,7 +8992,7 @@ Body:
     Flags:
       BuyingStore: true
     Script: |
-      pet 1519;
+      pet 1631;
   - Id: 12396
     AegisName: Fools_Day_Box
     Name: Gift Box?
@@ -65315,6 +65315,15 @@ Body:
     Type: Healing
     Script: |
       percentheal 30,30;
+  - Id: 101331
+    AegisName: Fruits_Set_Trap
+    Name: Fruit Set Trap
+    Type: Usable
+    Weight: 10
+    Flags:
+      BuyingStore: true
+    Script: |
+      pet 1005;
   - Id: 101336
     AegisName: aegis_101336
     Name: "[Scroll] DEX Biscuit Stick"
@@ -66752,6 +66761,20 @@ Body:
       Container: true
     Script: |
       getgroupitem(IG_Enchant_Stone_Box30);
+  - Id: 102202
+    AegisName: Ep20_Fatty_Icegangu
+    Name: Chubby Ice Steel Ball    # !todo check english name
+    Type: Usable
+    Weight: 50
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      pet 21965;
   - Id: 102213
     AegisName: Hero_Weapon_Up_S_Box
     Name: Hero's Weapon Mod Selection Box    # !todo check english name
diff --git a/db/re/pet_db.yml b/db/re/pet_db.yml
index 0a531898e5..30c6033452 100644
--- a/db/re/pet_db.yml
+++ b/db/re/pet_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2024 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -66,12 +66,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bLuk,3;
-        bonus bCritical,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bLuk,2;
-        bonus bCritical,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritical,1;
+         bonus bLuk,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritical,1;
+         bonus bLuk,3;
       }
     Evolution:
       - Target: MASTERING
@@ -80,7 +81,6 @@ Body:
             Amount: 10
           - Item: Unripe_Apple
             Amount: 3
-
   - Mob: DROPS
     TameItem: Orange_Juice
     EggItem: Drops_Egg
@@ -92,12 +92,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHit,5;
-        bonus bAtk,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHit,3;
-        bonus bAtk,3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bBaseAtk,3;
+         bonus bHit,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bBaseAtk,5;
+         bonus bHit,5;
       }
     Evolution:
       - Target: DR_EGGRING
@@ -131,12 +132,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bLuk,3;
-        bonus2 bSubEle,Ele_Poison,15;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bLuk,2;
-        bonus2 bSubEle,Ele_Poison,10;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubEle,Ele_Poison,10;
+         bonus bLuk,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubEle,Ele_Poison,15;
+         bonus bLuk,3;
       }
   - Mob: LUNATIC
     TameItem: Rainbow_Carrot
@@ -150,16 +152,17 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bCritical,3;
-        bonus bAtk,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bCritical,2;
-        bonus bAtk,2;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritical,2;
+         bonus bBaseAtk,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritical,3;
+         bonus bBaseAtk,3;
       }
     Evolution:
       - Target: DR_LUNATIC
-        ItemRequirements: 
+        ItemRequirements:
           - Item: Great_Leaf
             Amount: 100
           - Item: Clover
@@ -179,12 +182,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bStr,2;
-        bonus bAtk,8;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bStr,1;
-        bonus bAtk,5;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bBaseAtk,5;
+         bonus bStr,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bBaseAtk,8;
+         bonus bStr,2;
       }
   - Mob: CHONCHON
     TameItem: Rotten_Fish
@@ -197,12 +201,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAgi,2;
-        bonus bFlee,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAgi,1;
-        bonus bFlee,2;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bAgi,1;
+         bonus bFlee,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bAgi,2;
+         bonus bFlee,3;
       }
   - Mob: STEEL_CHONCHON
     TameItem: Lusty_Iron
@@ -215,10 +220,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bFlee,9;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bFlee,6;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bFlee,6;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bFlee,9;
       }
   - Mob: HUNTER_FLY
     TameItem: Monster_Juice
@@ -231,11 +237,12 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bFlee2,2;
-        bonus bHit,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bFlee2,2;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bFlee2,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bFlee2,2;
+         bonus bHit,1;
       }
   - Mob: SAVAGE_BABE
     TameItem: Sweet_Milk
@@ -249,12 +256,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bVit,2;
-        bonus bMaxHP,75;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bVit,1;
-        bonus bMaxHP,50;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bVit,1;
+         bonus bMaxHP,50;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bVit,2;
+         bonus bMaxHP,75;
       }
     Evolution:
       - Target: SAVAGE
@@ -279,13 +287,25 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bInt,2;
-        bonus bMaxSP,75;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bInt,1;
-        bonus bMaxSP,50;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bInt,1;
+         bonus bMaxSP,50;
       }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bInt,2;
+         bonus bMaxSP,75;
+      }
+    Evolution:
+      - Target: DESERT_WOLF
+        ItemRequirements:
+          - Item: Well_Dried_Bone
+            Amount: 3
+          - Item: Desert_Wolf_Card
+            Amount: 1
+          - Item: Claw_Of_Desert_Wolf
+            Amount: 300
+          - Item: Animal's_Skin
+            Amount: 20
   - Mob: ROCKER
     TameItem: Singing_Flower
     EggItem: Rocker_Egg
@@ -298,12 +318,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHPrecovRate,6;
-        bonus bMaxHP,38;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHPrecovRate,5;
-        bonus bMaxHP,25;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bHPrecovRate,5;
+         bonus bMaxHP,25;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bHPrecovRate,8;
+         bonus bMaxHP,38;
       }
     Evolution:
       - Target: METALLER
@@ -328,10 +349,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHit,8;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHit,5;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bHit,5;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bHit,8;
       }
   - Mob: POISON_SPORE
     TameItem: Deadly_Noxious_Herb
@@ -345,12 +367,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bStr,2;
-        bonus bInt,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bStr,1;
-        bonus bInt,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bStr,1;
+         bonus bInt,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bStr,2;
+         bonus bInt,2;
       }
   - Mob: PECOPECO
     TameItem: Fatty_Chubby_Earthworm
@@ -363,10 +386,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHP,200;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHP,150;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMaxHP,150;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMaxHP,200;
       }
     Evolution:
       - Target: GRAND_PECO
@@ -392,12 +416,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAgi,2;
-        bonus bFlee2,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAgi,1;
-        bonus bFlee2,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bFlee2,1;
+         bonus bAgi,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bFlee2,1;
+         bonus bAgi,2;
       }
   - Mob: YOYO
     TameItem: Tropical_Banana
@@ -410,10 +435,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bCritical,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bCritical,3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritical,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritical,5;
       }
     Evolution:
       - Target: CHOCO
@@ -437,10 +463,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAtk,15;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAtk,10;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bBaseAtk,10;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bBaseAtk,15;
       }
     Evolution:
       - Target: HIGH_ORC
@@ -467,12 +494,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bInt,2;
-        bonus bDef,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bInt,1;
-        bonus bDef,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bDef,1;
+         bonus bInt,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bDef,2;
+         bonus bInt,2;
       }
   - Mob: DOKEBI
     TameItem: Old_Broom
@@ -486,10 +514,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMatkRate,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMatkRate,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMatkRate,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMatkRate,2;
       }
     Evolution:
       - Target: AM_MUT
@@ -514,12 +543,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bStr,2;
-        bonus bDex,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bStr,1;
-        bonus bDex,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bStr,1;
+         bonus bDex,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bStr,2;
+         bonus bDex,2;
       }
   - Mob: ISIS
     TameItem: Armlet_Of_Obedience
@@ -533,22 +563,23 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAtkRate,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAtkRate,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddClass,Class_All,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddClass,Class_All,2;
       }
     Evolution:
       - Target: LITTLE_ISIS
         ItemRequirements:
           - Item: Armlet_Of_Obedience
             Amount: 3
-          - Item: Crystal_Jewel__
-            Amount: 6
           - Item: Queen's_Hair_Ornament
             Amount: 1
           - Item: Shining_Scales
             Amount: 300
+          - Item: Crystal_Jewel__
+            Amount: 6
   - Mob: PETIT
     TameItem: Shining_Stone
     EggItem: Green_Petite_Egg
@@ -561,11 +592,12 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAgi,1;
-        bonus bAspdRate,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAspdRate,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bAspdRate,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bAspdRate,1;
+         bonus bAgi,1;
       }
     Evolution:
       - Target: DELETER_2
@@ -590,14 +622,15 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHPrate,1;
-        bonus bMaxSPrate,1;
-        bonus bMatkRate,1;
-        bonus bAtkRate,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMatkRate,1;
-        bonus bAtkRate,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddClass,Class_All,1;
+         bonus bMatkRate,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddClass,Class_All,1;
+         bonus bMatkRate,1;
+         bonus bMaxHPrate,1;
+         bonus bMaxSPrate,1;
       }
     Evolution:
       - Target: DIABOLIC2
@@ -622,15 +655,27 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bDef,2;
-        bonus bMdef,2;
-        bonus2 bResEff,Eff_Stun,-200;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bDef,1;
-        bonus bMdef,1;
-        bonus2 bResEff,Eff_Stun,-100;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bResEff,Eff_Stun,100;
+         bonus bMdef,1;
+         bonus bDef,1;
       }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bResEff,Eff_Stun,200;
+         bonus bMdef,2;
+         bonus bDef,2;
+      }
+#    Evolution:
+#      - Target: ILL_BAPHOMET_J
+#        ItemRequirements:
+#          - Item: Chaos_Ba_Jr_Card
+#            Amount: 1
+#          - Item: Evil_Horn
+#            Amount: 300
+#          - Item: Brigan
+#            Amount: 300
+#          - Item: Yellow_Herb
+#            Amount: 100
   - Mob: BON_GUN
     TameItem: Heart_Of_Her
     EggItem: Bongun_Egg
@@ -642,12 +687,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bVit,2;
-        bonus2 bResEff,Eff_Stun,200;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bVit,1;
-        bonus2 bResEff,Eff_Stun,100;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bResEff,Eff_Stun,100;
+         bonus bVit,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bResEff,Eff_Stun,200;
+         bonus bVit,2;
       }
     Evolution:
       - Target: HYEGUN
@@ -671,16 +717,17 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bAddRace,RC_Demihuman,3;
-        bonus2 bMagicAddRace,RC_DemiHuman,3;
-        bonus2 bAddRace,RC_Player_Human,3;
-        bonus2 bMagicAddRace,RC_Player_Human,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bAddRace,RC_Demihuman,2;
-        bonus2 bMagicAddRace,RC_DemiHuman,2;
-        bonus2 bAddRace,RC_Player_Human,2;
-        bonus2 bMagicAddRace,RC_Player_Human,2;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddRace,RC_DemiHuman,2;
+         bonus2 bMagicAddRace,RC_DemiHuman,2;
+         bonus2 bAddRace,RC_Player_Human,2;
+         bonus2 bMagicAddRace,RC_Player_Human,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddRace,RC_DemiHuman,3;
+         bonus2 bMagicAddRace,RC_DemiHuman,3;
+         bonus2 bAddRace,RC_Player_Human,3;
+         bonus2 bMagicAddRace,RC_Player_Human,3;
       }
   - Mob: ALICE
     TameItem: Sway_Apron
@@ -693,14 +740,15 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMdef,2;
-        bonus2 bSubRace,RC_DemiHuman,2;
-        bonus2 bSubRace,RC_Player_Human,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMdef,1;
-        bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player_Human,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubRace,RC_DemiHuman,1;
+         bonus2 bSubRace,RC_Player_Human,1;
+         bonus bMdef,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubRace,RC_DemiHuman,2;
+         bonus2 bSubRace,RC_Player_Human,2;
+         bonus bMdef,2;
       }
     Evolution:
       - Target: ALIZA
@@ -722,10 +770,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bSubEle,Ele_Neutral,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bSubEle,Ele_Neutral,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubEle,Ele_Neutral,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubEle,Ele_Neutral,2;
       }
   - Mob: GOBLINE_XMAS
     TameItem: Sweet_Candy_Striper
@@ -738,14 +787,15 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHP,45;
-        bonus2 bSubEle,Ele_Water,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHP,30;
-        bonus2 bSubEle,Ele_Water,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubEle,Ele_Water,1;
+         bonus bMaxHP,30;
       }
-  - Mob: CHUNG_E
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubEle,Ele_Water,2;
+         bonus bMaxHP,45;
+      }
+  - Mob: CHUNG_E_
     TameItem: Tantanmen
     EggItem: Chung_E_Egg
     FoodItem: Bun_
@@ -756,14 +806,15 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bDef,2;
-        bonus2 bSubRace,RC_DemiHuman,2;
-        bonus2 bSubRace,RC_Player_Human,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bDef,1;
-        bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player_Human,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubRace,RC_DemiHuman,1;
+         bonus2 bSubRace,RC_Player_Human,1;
+         bonus bDef,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubRace,RC_DemiHuman,2;
+         bonus2 bSubRace,RC_Player_Human,2;
+         bonus bDef,2;
       }
   - Mob: ECLIPSE_P
     EggItem: Spring_Rabbit_Egg
@@ -823,22 +874,23 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAgi,4;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAgi,3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bAgi,3;
       }
-#    Evolution:
-#      - Target: WANDER_MAN_H
-#        ItemRequirements:
-#          - Item: Skull
-#            Amount: 500
-#          - Item: Sacred_Marks
-#            Amount: 50
-#          - Item: Transparent_Cloth
-#            Amount: 100
-#          - Item: Wander_Man_Card
-#            Amount: 1
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bAgi,4;
+      }
+    Evolution:
+      - Target: WANDER_MAN_H
+        ItemRequirements:
+          - Item: Skull
+            Amount: 500
+          - Item: Sacred_Marks
+            Amount: 50
+          - Item: Transparent_Cloth
+            Amount: 100
+          - Item: Wander_Man_Card
+            Amount: 1
   - Mob: P_CHUNG_E
     EggItem: New_Year_Doll_Egg
     FoodItem: Mojji
@@ -858,11 +910,23 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHP,150;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHP,100;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMaxHP,100;
       }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMaxHP,150;
+      }
+    Evolution:
+      - Target: FIRE_GOLEM
+        ItemRequirements:
+          - Item: Stone_Heart
+            Amount: 500
+          - Item: Magical_Lithography
+            Amount: 3
+          - Item: Fire_Golem_Card
+            Amount: 1
+          - Item: Boody_Red
+            Amount: 20
   - Mob: MARIONETTE
     TameItem: Delicious_Shaved_Ice
     EggItem: Marionette_Egg
@@ -874,7 +938,7 @@ Body:
     SpecialPerformance: false
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         petautobonus "{ bonus2 bSubEle,Ele_Neutral,2; heal 100,0; }",100,5000,BF_SHORT|BF_NORMAL;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
@@ -892,12 +956,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bVit,2;
-        bonus2 bResEff,Eff_Stone,800;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bVit,1;
-        bonus2 bResEff,Eff_Stone,500;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bResEff,Eff_Stone,500;
+         bonus bVit,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bResEff,Eff_Stone,800;
+         bonus bVit,2;
       }
   - Mob: WHISPER
     TameItem: Fit_Pipe
@@ -909,14 +974,13 @@ Body:
     CaptureRate: 500
     SpecialPerformance: false
     Script: >
-      .@i = getpetinfo(PETINFO_INTIMATE);
-      
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bFlee,10;
-        skill "TF_HIDING",1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bFlee,7;
-        skill "TF_HIDING",1;
+      if (getpetinfo(PETINFO_INTIMATE) == PET_INTIMATE_LOYAL) {
+         skill "TF_HIDING",1;
+         bonus bFlee,10;
+      }
+      else {
+         skill "TF_HIDING",1;
+         bonus bFlee,7;
       }
   - Mob: GOBLIN_LEADER
     TameItem: Staff_Of_Leader
@@ -930,12 +994,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bAddRace,RC_DemiHuman,5;
-        bonus2 bAddRace,RC_Player_Human,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bAddRace,RC_DemiHuman,3;
-        bonus2 bAddRace,RC_Player_Human,3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddRace,RC_DemiHuman,3;
+         bonus2 bAddRace,RC_Player_Human,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddRace,RC_DemiHuman,5;
+         bonus2 bAddRace,RC_Player_Human,5;
       }
   - Mob: SUCCUBUS
     TameItem: Boy's_Naivety
@@ -949,11 +1014,12 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bHPDrainRate,30,5;
-        bonus bMaxHPrate,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bHPDrainRate,30,5;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bHPDrainRate,30,5;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bHPDrainRate,30,5;
+         bonus bMaxHPrate,1;
       }
   - Mob: INCUBUS
     TameItem: Gril's_Naivety
@@ -965,14 +1031,13 @@ Body:
     CaptureRate: 50
     SpecialPerformance: false
     Script: >
-      .@i = getpetinfo(PETINFO_INTIMATE);
-      
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxSPRate,5;
-        bonus2 bSPDrainRate,30,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxSPRate,3;
-        bonus2 bSPDrainRate,30,1;
+      if (getpetinfo(PETINFO_INTIMATE) == PET_INTIMATE_LOYAL) {
+         bonus2 bSPDrainRate,30,1;
+         bonus bMaxSPrate,5;
+      }
+      else {
+         bonus2 bSPDrainRate,30,1;
+         bonus bMaxSPrate,3;
       }
   - Mob: NIGHTMARE_TERROR
     TameItem: Hell_Contract
@@ -986,23 +1051,23 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bResEff,Eff_Sleep,10000;
-        bonus bInt,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bResEff,Eff_Sleep,10000;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bResEff,Eff_Sleep,10000;
       }
-#    Evolution:
-#      - Target: NIGHTMARE_TERROR_H
-#        ItemRequirements:
-#          - Item: Burning_Horse_Shoe
-#            Amount: 500
-#          - Item: Blue_Herb
-#            Amount: 100
-#          - Item: Shell
-#            Amount: 100
-#          - Item: Nightmare_Card
-#            Amount: 1
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bInt,1;
+      }
+    Evolution:
+      - Target: NIGHTMARE_TERROR_H
+        ItemRequirements:
+          - Item: Burning_Horse_Shoe
+            Amount: 500
+          - Item: Blue_Herb
+            Amount: 100
+          - Item: Shell
+            Amount: 100
+          - Item: Nightmare_Terror_Card
+            Amount: 1
   - Mob: SHINOBI
     TameItem: Kuloren
     EggItem: Shinobi_Egg
@@ -1015,10 +1080,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAgi,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAgi,2;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bAgi,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bAgi,3;
       }
   - Mob: MIYABI_NINGYO
     TameItem: Gril_Doll
@@ -1032,12 +1098,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bInt,2;
-        bonus bCastrate,-5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bInt,1;
-        bonus bCastrate,-3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bVariableCastrate,-3;
+         bonus bInt,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bVariableCastrate,-5;
+         bonus bInt,2;
       }
   - Mob: WICKED_NYMPH
     TameItem: Charming_Lotus
@@ -1051,13 +1118,25 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxSP,45;
-        bonus bSPrecovRate,8;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxSP,30;
-        bonus bSPrecovRate,5;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bSPrecovRate,5;
+         bonus bMaxSP,30;
       }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bSPrecovRate,8;
+         bonus bMaxSP,45;
+      }
+#    Evolution:
+#      - Target: BACSOJIN2
+#        ItemRequirements:
+#          - Item: Mightysoul_Essence
+#            Amount: 30
+#          - Item: Civil_Servant_Card
+#            Amount: 10
+#          - Item: Li_Me_Mang_Ryang_Card
+#            Amount: 10
+#          - Item: Dancing_Dragon_Card
+#            Amount: 10
   - Mob: STONE_SHOOTER
     TameItem: Oilpalm_Coconut
     EggItem: Stone_Shooter_Egg
@@ -1070,10 +1149,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bSubEle,Ele_Fire,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bSubEle,Ele_Fire,3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubEle,Ele_Fire,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubEle,Ele_Fire,5;
       }
   - Mob: DULLAHAN
     TameItem: Luxury_Whisky_Bottle
@@ -1087,10 +1167,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bCritAtkRate,8;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bCritAtkRate,5;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritAtkRate,5;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritAtkRate,8;
       }
   - Mob: LOLI_RURI
     TameItem: Very_Red_Juice
@@ -1104,13 +1185,25 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHPRate,5;
-        bonus3 bAutoSpellWhenHit,"AL_HEAL",2,10;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHPRate,3;
-        bonus3 bAutoSpellWhenHit,"AL_HEAL",1,10;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus3 bAutoSpellWhenHit,"AL_HEAL",1,10;
+         bonus bMaxHPrate,3;
       }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus3 bAutoSpellWhenHit,"AL_HEAL",2,10;
+         bonus bMaxHPrate,3;
+      }
+#    Evolution:
+#      - Target: BLUEMOON_LOLI_RURI2
+#        ItemRequirements:
+#          - Item: Bat_Cage
+#            Amount: 500
+#          - Item: Blue_Herb
+#            Amount: 50
+#          - Item: Loki's_Whispers
+#            Amount: 1
+#          - Item: Loli_Ruri_Card
+#            Amount: 10
   - Mob: CIVIL_SERVANT
     TameItem: Fan_Of_Wind
     EggItem: Civil_Servant_Egg
@@ -1123,10 +1216,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxSP,15;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxSP,10;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMaxSP,10;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMaxSP,15;
       }
   - Mob: LEAF_CAT
     TameItem: Very_Soft_Plant
@@ -1140,13 +1234,25 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bSubRace,RC_Brute,5;
-        bonus2 bSubRace,RC_Player_Doram,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bSubRace,RC_Brute,3;
-        bonus2 bSubRace,RC_Player_Doram,3;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bSubRace,RC_Brute,3;
+         bonus2 bSubRace,RC_Player_Doram,3;
       }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bSubRace,RC_Brute,5;
+         bonus2 bSubRace,RC_Player_Doram,5;
+      }
+#    Evolution:
+#      - Target: WILD_ROSE3
+#        ItemRequirements:
+#          - Item: Great_Leaf
+#            Amount: 500
+#          - Item: Black_Kitty_Doll
+#            Amount: 200
+#          - Item: Fish_Tail
+#            Amount: 200
+#          - Item: Leaf_Cat_Card
+#            Amount: 10
   - Mob: BACSOJIN_
     TameItem: Shiny_Wing_Gown
     EggItem: Bacsojin_Egg
@@ -1168,12 +1274,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus2 bSubEle,Ele_Fire,3;
-        bonus2 bAddEle,Ele_Fire,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus2 bSubEle,Ele_Fire,2;
-        bonus2 bAddEle,Ele_Fire,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddEle,Ele_Fire,1;
+         bonus2 bSubEle,Ele_Fire,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddEle,Ele_Fire,2;
+         bonus2 bSubEle,Ele_Fire,3;
       }
   - Mob: E_CRAMP
     TameItem: Leaf_Cat_Ball
@@ -1211,7 +1318,7 @@ Body:
     CaptureRate: 0
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_CORDIAL) {
         /* bonus2 bExpAddRace,RC_All,5; */
         bonus bMatkRate,2;
@@ -1225,7 +1332,7 @@ Body:
     CaptureRate: 1000
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus2 bAddDamageClass,2317,10;
         bonus2 bAddDamageClass,2318,10;
@@ -1270,10 +1377,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHPrecovRate,75;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHPrecovRate,50;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bHPrecovRate,50;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bHPrecovRate,75;
       }
   - Mob: NINE_TAIL
     TameItem: Sap_Jelly
@@ -1285,12 +1393,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bCritical,3;
-        bonus bHit,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bCritical,2;
-        bonus bHit,2;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritical,2;
+         bonus bHit,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritical,3;
+         bonus bHit,3;
       }
     Evolution:
       - Target: CAT_O_NINE_TAIL
@@ -1313,12 +1422,13 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus Dex,2;
-        bonus bHit,1;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bDex,1;
-        bonus bHit,1;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bHit,1;
+         bonus bDex,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bHit,1;
+         bonus bDex,2;
       }
     Evolution:
       - Target: HODREMLIN
@@ -1341,10 +1451,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHit,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHit,4;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bHit,4;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bHit,5;
       }
     Evolution:
       - Target: ANCIENT_MUMMY
@@ -1367,10 +1478,11 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxSP,150;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxSP,100;
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMaxSP,50;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMaxSP,100;
       }
     Evolution:
       - Target: XM_TEDDY_BEAR
@@ -1403,8 +1515,6 @@ Body:
             Amount: 50
           - Item: Teddy_Bear_Card
             Amount: 1
-
-  # Pet Evolution
   - Mob: MASTERING
     EggItem: Mastering_Egg
     FoodItem: Pet_Food
@@ -1417,18 +1527,21 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bLuk,3;
-        bonus bCritical,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bLuk,3;
-        bonus bCritical,2;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bLuk,3;
-        bonus bCritical,1;
-      } else {
-        bonus bLuk,2;
-        bonus bCritical,1;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bCritical,1;
+         bonus bLuk,2;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bCritical,1;
+         bonus bLuk,3;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritical,2;
+         bonus bLuk,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritical,3;
+         bonus bLuk,3;
       }
     Evolution:
       - Target: ANGELING
@@ -1453,22 +1566,25 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHPrecovRate,20;
-        bonus bMaxHP,70;
-        bonus2 bAddRace,RC_Plant,6;
-        bonus2 bMagicAddRace,RC_Plant,6;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHPrecovRate,15;
-        bonus bMaxHP,55;
-        bonus2 bAddRace,RC_Plant,3;
-        bonus2 bMagicAddRace,RC_Plant,3;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bHPrecovRate,10;
-        bonus bMaxHP,38;
-      } else {
-        bonus bHPrecovRate,5;
-        bonus bMaxHP,25;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bHPrecovRate,5;
+         bonus bMaxHP,25;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bHPrecovRate,10;
+         bonus bMaxHP,38;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddRace,RC_Plant,3;
+         bonus2 bMagicAddRace,RC_Plant,3;
+         bonus bHPrecovRate,15;
+         bonus bMaxHP,55;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddRace,RC_Plant,6;
+         bonus2 bMagicAddRace,RC_Plant,6;
+         bonus bHPrecovRate,20;
+         bonus bMaxHP,70;
       }
   - Mob: ANGELING
     EggItem: Angeling_Egg
@@ -1482,18 +1598,21 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHPrate,2;
-        bonus bHealPower,8;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHPrate,2;
-        bonus bHealPower,6;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bMaxHPrate,1;
-        bonus bHealPower,4;
-      } else {
-        bonus bMaxHPrate,1;
-        bonus bHealPower,2;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bMaxHPrate,1;
+         bonus bHealPower,2;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bMaxHPrate,1;
+         bonus bHealPower,4;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMaxHPrate,2;
+         bonus bHealPower,6;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMaxHPrate,2;
+         bonus bHealPower,8;
       }
   - Mob: MOONLIGHT
     EggItem: Moonlight_Egg
@@ -1506,7 +1625,7 @@ Body:
     AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bCritical,6;
         bonus bHit,6;
@@ -1535,18 +1654,21 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHP,200;
-        bonus bVit,2;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHP,100;
-        bonus bVit,2;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bMaxHP,50;
-        bonus bVit,2;
-      } else {
-        bonus bMaxHP,50;
-        bonus bVit,1;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bVit,1;
+         bonus bMaxHP,50;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bVit,2;
+         bonus bMaxHP,50;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bVit,2;
+         bonus bMaxHP,100;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bVit,2;
+         bonus bMaxHP,200;
       }
   - Mob: HIGH_ORC
     EggItem: High_Orc_Egg
@@ -1560,14 +1682,17 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAtk,25;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAtk,20;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bAtk,15;
-      } else {
-        bonus bAtk,10;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bBaseAtk,10;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bBaseAtk,15;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bBaseAtk,20;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bBaseAtk,25;
       }
 #    Evolution:
 #      - Target: ORK_HERO2
@@ -1576,7 +1701,7 @@ Body:
 #            Amount: 30
 #          - Item: Orc_Warrior_Card
 #            Amount: 10
-#          - Item: Orc_Baby_Card
+#          - Item: Orc_Baby_Card_Card
 #            Amount: 10
 #          - Item: Voucher_Of_Orcish_Hero
 #            Amount: 10
@@ -1592,17 +1717,20 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bCritical,9;
-        bonus bLongAtkRate,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bCritical,7;
-        bonus bLongAtkRate,2;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bCritical,5;
-        bonus bLongAtkRate,1;
-      } else {
-        bonus bCritical,3;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bCritical,3;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bLongAtkRate,1;
+         bonus bCritical,5;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bLongAtkRate,2;
+         bonus bCritical,7;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bLongAtkRate,3;
+         bonus bCritical,9;
       }
   - Mob: ANCIENT_MUMMY
     EggItem: Ancient_Mummy_Egg
@@ -1616,18 +1744,21 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHit,6;
-        bonus2 bAddClass,Class_Dragon,6;
-        bonus2 bMagicAddClass,Class_Dragon,6;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHit,6;
-        bonus2 bAddClass,Class_Dragon,3;
-        bonus2 bMagicAddClass,Class_Dragon,3;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bHit,5;
-      } else {
-        bonus bHit,4;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bHit,4;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bHit,5;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddRace,RC_Dragon,3;
+         bonus2 bMagicAddRace,RC_Dragon,3;
+         bonus bHit,6;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddRace,RC_Dragon,6;
+         bonus2 bMagicAddRace,RC_Dragon,6;
+         bonus bHit,6;
       }
   - Mob: AM_MUT
     EggItem: Ammut_Egg
@@ -1641,14 +1772,17 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMatkRate,4;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMatkRate,3;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bMatkRate,2;
-      } else {
-        bonus bMatkRate,1;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bMatkRate,1;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bMatkRate,2;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMatkRate,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMatkRate,4;
       }
   - Mob: CAT_O_NINE_TAIL
     EggItem: Cat_O_Nine_Tail_Egg
@@ -1661,7 +1795,7 @@ Body:
     AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bCritical,5;
         bonus bHit,5;
@@ -1677,17 +1811,17 @@ Body:
         bonus bCritical,2;
         bonus bHit,2;
       }
-    Evolution:
-      - Target: MOONLIGHT
-        ItemRequirements:
-          - Item: Mightysoul_Essence
-            Amount: 30
-          - Item: Nine_Tail_Card
-            Amount: 10
-          - Item: Sohee_Card
-            Amount: 10
-          - Item: Munak_Card
-            Amount: 10
+#    Evolution:
+#      - Target: MOONLIGHT2
+#        ItemRequirements:
+#          - Item: Mightysoul_Essence
+#            Amount: 30
+#          - Item: Nine_Tail_Card
+#            Amount: 10
+#          - Item: Sohee_Card
+#            Amount: 10
+#          - Item: Munak_Card
+#            Amount: 10
   - Mob: GRAND_PECO
     EggItem: Grand_Peco_Egg
     FoodItem: Pet_Food
@@ -1700,15 +1834,17 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMaxHP,400;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMaxHP,300;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bMaxHP,200;
-      } else {
-        bonus bMaxHP,150;
-        bonus bMaxSP,-10;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bMaxHP,150;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bMaxHP,200;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMaxHP,300;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMaxHP,400;
       }
   - Mob: HYEGUN
     EggItem: Hyegun_Egg
@@ -1721,7 +1857,7 @@ Body:
     AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bVit,4;
         bonus2 bResEff,Eff_Stun,400;
@@ -1749,21 +1885,35 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bDex,2;
-        bonus bHit,2;
-        bonus bCritAtkRate,9;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bDex,2;
-        bonus bHit,2;
-        bonus bCritAtkRate,7;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bDex,2;
-        bonus bHit,1;
-      } else {
-        bonus bDex,1;
-        bonus bHit,1;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bHit,1;
+         bonus bDex,1;
       }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bHit,1;
+         bonus bDex,2;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritAtkRate,7;
+         bonus bHit,2;
+         bonus bDex,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritAtkRate,9;
+         bonus bHit,2;
+         bonus bDex,2;
+      }
+#    Evolution:
+#      - Target: GLOOMUNDERNIGHT2
+#        ItemRequirements:
+#          - Item: Hodremlin_Card
+#            Amount: 10
+#          - Item: Isilla_Card
+#            Amount: 10
+#          - Item: Agav_Card
+#            Amount: 10
+#          - Item: Mightysoul_Essence
+#            Amount: 30
   - Mob: XM_TEDDY_BEAR
     EggItem: Xm_Teddybear_Egg
     FoodItem: Pet_Food
@@ -1775,7 +1925,7 @@ Body:
     AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bMaxSP,150;
         petautobonus "{ bonus2 bSPRegenRate,40,1000; }",30,5000,BF_MAGIC;
@@ -1799,18 +1949,21 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bHit,9;
-        bonus bAtk,9;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bHit,7;
-        bonus bAtk,7;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bHit,5;
-        bonus bAtk,5;
-      } else {
-        bonus bHit,3;
-        bonus bAtk,3;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bBaseAtk,3;
+         bonus bHit,3;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bBaseAtk,5;
+         bonus bHit,5;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bBaseAtk,7;
+         bonus bHit,7;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bBaseAtk,9;
+         bonus bHit,9;
       }
   - Mob: DR_LUNATIC
     EggItem: Leaf_Lunatic_Egg
@@ -1824,22 +1977,25 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bCritical,5;
-        bonus bAtk,5;
-        bonus2 bAddRace,RC_Formless,6;
-        bonus2 bMagicAddRace,RC_Formless,6;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bCritical,4;
-        bonus bAtk,4;
-        bonus2 bAddRace,RC_Formless,3;
-        bonus2 bMagicAddRace,RC_Formless,3;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bCritical,3;
-        bonus bAtk,3;
-      } else {
-        bonus bCritical,2;
-        bonus bAtk,2;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bCritical,2;
+         bonus bBaseAtk,2;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bCritical,3;
+         bonus bBaseAtk,3;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddRace,RC_Formless,3;
+         bonus2 bMagicAddRace,RC_Formless,3;
+         bonus bCritical,4;
+         bonus bBaseAtk,4;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddRace,RC_Formless,6;
+         bonus2 bMagicAddRace,RC_Formless,6;
+         bonus bCritical,5;
+         bonus bBaseAtk,5;
       }
   - Mob: LITTLE_ISIS
     EggItem: Littleisis_Egg
@@ -1853,16 +2009,20 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAtkRate,4;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAtkRate,3;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bAtkRate,2;
-      } else {
-        bonus bAtkRate,1;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus2 bAddClass,Class_All,1;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus2 bAddClass,Class_All,2;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bAddClass,Class_All,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bAddClass,Class_All,4;
       }
   - Mob: DIABOLIC2
+    TameItem: Red_Burning_Stone
     EggItem: Diabolic_Egg2
     FoodItem: Pet_Food
     Fullness: 2
@@ -1873,7 +2033,7 @@ Body:
     AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bAtkRate,2;
         bonus bMatkRate,2;
@@ -1907,17 +2067,20 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAspdRate,3;
-        bonus bAgi,3;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAspdRate,2;
-        bonus bAgi,2;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bAspdRate,1;
-        bonus bAgi,1;
-      } else {
-        bonus bAspdRate,1;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bAspdRate,1;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bAspdRate,1;
+         bonus bAgi,1;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bAspdRate,2;
+         bonus bAgi,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bAspdRate,3;
+         bonus bAgi,3;
       }
   - Mob: SWEETS_DROPS
     EggItem: Sweets_Drops_Egg
@@ -1930,61 +2093,67 @@ Body:
     AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
-      
+
       if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus2 bExpAddClass,Class_All,1;
       }
-#  - Mob: NIGHTMARE_TERROR_H
-#    EggItem: Rigid_Nightmare_Terror_Egg
-#    FoodItem: Pet_Food
-#    Fullness: 2
-#    HungryDelay: 120
-#    IntimacyFed: 15
-#    CaptureRate: 0
-#    SpecialPerformance: false
-#    AllowAutoFeed: true
-#    Script: >
-#      .@i = getpetinfo(PETINFO_INTIMATE);
-#      
-#      if (.@i >= PET_INTIMATE_LOYAL) {
-#        bonus bInt,4;
-#        bonus bMaxSPrate,3;
-#        bonus2 bResEff,Eff_Sleep,10000;
-#      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-#        bonus bInt,3;
-#        bonus bMaxSPrate,1;
-#        bonus2 bResEff,Eff_Sleep,10000;
-#      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-#        bonus bInt,3;
-#      } else {
-#        bonus bInt,1;
-#      }
-#  - Mob: WANDER_MAN_H
-#    EggItem: Contaminated_Wanderer_Egg
-#    FoodItem: Pet_Food
-#    Fullness: 2
-#    HungryDelay: 120
-#    IntimacyFed: 15
-#    CaptureRate: 0
-#    SpecialPerformance: false
-#    AllowAutoFeed: true
-#    Script: >
-#      .@i = getpetinfo(PETINFO_INTIMATE);
-#      
-#      if (.@i >= PET_INTIMATE_LOYAL) {
-#        bonus bAgi,4;
-#        bonus bCritical,3;
-#        bonus bCritAtkRate,7;
-#      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-#        bonus bAgi,4;
-#        bonus bCritical,2;
-#        bonus bCritAtkRate,5;
-#      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-#        bonus bAgi,4;
-#        bonus bCritical,1;
-#      } else {
-#        bonus bAgi,4;
-#      }
+  - Mob: NIGHTMARE_TERROR_H
+    EggItem: Nightmare_TerrorH_EGG
+    FoodItem: Pet_Food
+    Fullness: 2
+    HungryDelay: 120
+    IntimacyFed: 15
+    CaptureRate: 0
+    SpecialPerformance: false
+    AllowAutoFeed: true
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bInt,1;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bInt,2;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bResEff,Eff_Sleep,10000;
+         bonus bMaxSPrate,1;
+         bonus bInt,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bResEff,Eff_Sleep,10000;
+         bonus bMaxSPrate,3;
+         bonus bInt,4;
+      }
+  - Mob: WANDER_MAN_H
+    EggItem: Wanderer_H_EGG
+    FoodItem: Pet_Food
+    Fullness: 2
+    HungryDelay: 120
+    IntimacyFed: 15
+    CaptureRate: 0
+    SpecialPerformance: false
+    AllowAutoFeed: true
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bAgi,4;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bCritical,1;
+         bonus bAgi,4;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bCritAtkRate,5;
+         bonus bCritical,2;
+         bonus bAgi,4;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bCritAtkRate,7;
+         bonus bCritical,3;
+         bonus bAgi,4;
+      }
   - Mob: ALIOT
     EggItem: Aliot_EGG
     FoodItem: Pet_Food
@@ -1997,18 +2166,32 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bAspdRate,5;
-        bonus bHit,12;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bAspdRate,4;
-        bonus bHit,9;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bAspdRate,3;
-        bonus bHit,6;
-      } else {
-        bonus bAspdRate,2;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bAspdRate,2;
       }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bAspdRate,3;
+         bonus bHit,6;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bAspdRate,4;
+         bonus bHit,9;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bAspdRate,5;
+         bonus bHit,12;
+      }
+#    Evolution:
+#      - Target: KIEL_D_01_2
+#        ItemRequirements:
+#          - Item: Alicel_Card
+#            Amount: 10
+#          - Item: Aliza_Card
+#            Amount: 10
+#          - Item: Aliot_Card
+#            Amount: 10
+#          - Item: Mightysoul_Essence
+#            Amount: 30
   - Mob: ALICEL
     EggItem: Alicel_EGG
     FoodItem: Pet_Food
@@ -2021,16 +2204,19 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bVariableCastrate,-5;
-        bonus2 bMagicAtkEle,Ele_Neutral,5;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bVariableCastrate,-4;
-        bonus2 bMagicAtkEle,Ele_Neutral,3;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bVariableCastrate,-3;
-      } else {
-        bonus bVariableCastrate,-2;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bVariableCastrate,-2;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bVariableCastrate,-3;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bMagicAtkEle,Ele_Neutral,3;
+         bonus bVariableCastrate,-4;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bMagicAtkEle,Ele_Neutral,5;
+         bonus bVariableCastrate,-5;
       }
   - Mob: ALIZA
     EggItem: Aliza_EGG
@@ -2044,20 +2230,23 @@ Body:
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
       
-      if (.@i >= PET_INTIMATE_LOYAL) {
-        bonus bMdef,7;
-        bonus bHealPower,6;
-      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-        bonus bMdef,6;
-        bonus bHealPower,4;
-      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-        bonus bMdef,5;
-        bonus bHealPower,2;
-      } else {
-        bonus bMdef,4;
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bMdef,4;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bMdef,5;
+         bonus bHealPower,2;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bMdef,6;
+         bonus bHealPower,4;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bMdef,7;
+         bonus bHealPower,6;
       }
 #  - Mob: BACSOJIN2
-#    EggItem: Bacsojin2_Egg_
+#    EggItem: Bacsojin_Egg2
 #    FoodItem: High_Class_Pet_food
 #    Fullness: 7
 #    IntimacyFed: 10
@@ -2067,20 +2256,24 @@ Body:
 #    Script: >
 #      .@i = getpetinfo(PETINFO_INTIMATE);
 #      
-#      if (.@i >= PET_INTIMATE_LOYAL) {
-#        bonus bMaxSPRate,5;
-#        bonus bDelayrate,-3;
-#      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-#        bonus bMaxSPRate,4;
-#        bonus bDelayrate,-2;
-#      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-#        bonus bMaxSPRate,3;
-#        bonus bDelayrate,-1;
-#      } else {
-#        bonus bMaxSPRate,2;
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bMaxSPrate,2;
 #      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bDelayrate,-1;
+#         bonus bMaxSPrate,3;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bDelayrate,-2;
+#         bonus bMaxSPrate,4;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bDelayrate,-3;
+#         bonus bMaxSPrate,5;
+#      }
+#
 #  - Mob: ORK_HERO2
-#    EggItem: Orc_Hero_Egg_
+#    EggItem: Ork_Hero_EGG
 #    FoodItem: High_Class_Pet_food
 #    Fullness: 2
 #    HungryDelay: 120
@@ -2091,17 +2284,21 @@ Body:
 #    Script: >
 #      .@i = getpetinfo(PETINFO_INTIMATE);
 #      
-#      if (.@i >= PET_INTIMATE_LOYAL) {
-#        bonus bAtkRate,7;
-#        bonus bCritAtkRate,3;
-#      } else if (.@i >= PET_INTIMATE_CORDIAL) {
-#        bonus bAtkRate,4;
-#        bonus bCritAtkRate,1;
-#      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
-#        bonus bAtkRate,2;
-#      } else {
-#        bonus bAtkRate,1;
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bAtkRate,1;
 #      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bAtkRate,2;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bCritAtkRate,1;
+#         bonus bAtkRate,4;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bCritAtkRate,3;
+#         bonus bAtkRate,7;
+#      }
+#
 #  - Mob: PHREEONI2
 #    EggItem: Phreeoni_Egg
 #    FoodItem: High_Class_Pet_food
@@ -2109,34 +2306,37 @@ Body:
 #    HungryDelay: 120   # unknown
 #    IntimacyFed: 15   # unknown
 #    CaptureRate: 0   # unknown
-#    SpecialPerformance: false   # unknown
+#    SpecialPerformance: false    unknown
 #    AllowAutoFeed: true
 #    Script: >
-#      .@intimate = getpetinfo(PETINFO_INTIMATE);
-#      if (.@intimate == PET_INTIMATE_AWKWARD || .@intimate == PET_INTIMATE_SHY) {
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
 #         bonus bHit,6;
 #      }
-#      if (.@intimate == PET_INTIMATE_NEUTRAL) {
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
 #         bonus bHit,10;
 #         bonus bPerfectHitRate,5;
 #      }
-#      if (.@intimate == PET_INTIMATE_CORDIAL) {
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
 #         bonus bHit,14;
 #         bonus bPerfectHitRate,10;
 #      }
-#      if (.@intimate == PET_INTIMATE_LOYAL) {
+#      else if (.@i == PET_INTIMATE_LOYAL) {
 #         bonus bHit,18;
 #         bonus bPerfectHitRate,15;
 #      }
+#
   - Mob: EP17_2_CHILD_ADMIN1
-    CaptureRate : 1000
     EggItem: Ep17_2_C_Admin1_Egg
     EquipItem: Ep_17_2_C_Admin1_Acc
     FoodItem: Cloud_Cotton
     Fullness: 2
     IntimacyFed: 20
+    CaptureRate: 1000
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus2 bAddRace2,RC2_EP172BETA,10;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
@@ -2147,21 +2347,23 @@ Body:
     Evolution:
       - Target: EP17_2_CHILD_ADMIN2
         ItemRequirements:
-          - Item: Mystery_Piece
-            Amount: 10
-          - Item: Broken_Steel_Piece
-            Amount: 50
           - Item: BarMealTicket
             Amount: 500
+          - Item: Broken_Steel_Piece
+            Amount: 50
+          - Item: Mystery_Piece
+            Amount: 10
   - Mob: EP17_2_CHILD_ADMIN2
-    CaptureRate : 1000
     EggItem: Ep17_2_C_Admin2_Egg
     EquipItem: Ep_17_2_C_Admin2_Acc
     FoodItem: Pet_Food
     Fullness: 2
     IntimacyFed: 20
+    CaptureRate: 1000
+    AllowAutoFeed: true
     Script: >
       .@i = getpetinfo(PETINFO_INTIMATE);
+
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus2 bAddRace2,RC2_EP172ALPHA,15;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
@@ -2169,3 +2371,733 @@ Body:
       } else if (.@i >= PET_INTIMATE_NEUTRAL) {
         bonus2 bAddRace2,RC2_EP172ALPHA,4;
       }
+#  - Mob: BLUE_UNICORN
+#    EggItem: Blue_Unicorn_Egg
+#    FoodItem: Blue_Herb
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#  - Mob: SCATLETON
+#    EggItem: Scatletoncarrier
+#    EquipItem: 10040
+#    FoodItem: Delicious_Fish
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    Script: >
+#      if (getpetinfo(PETINFO_INTIMATE) == PET_INTIMATE_LOYAL) {
+#         bonus bMatk,10;
+#         bonus bBaseAtk,10;
+#      }
+#
+#    Evolution:
+#      - Target: SKELION
+#        ItemRequirements:
+#          - Item: Memory_Of_Gyol
+#            Amount: 2
+#          - Item: Yummy_Meat
+#            Amount: 100
+#          - Item: Cookies_Bat
+#            Amount: 100
+  - Mob: WILOW
+    EggItem: Wilow_Egg
+    FoodItem: Tree_Of_Archer_1
+    Fullness: 2   # unknown
+    HungryDelay: 120   # unknown
+    IntimacyFed: 15   # unknown
+    CaptureRate: 0   # unknown
+    SpecialPerformance: false   # unknown
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus bInt,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus bInt,3;
+      }
+  - Mob: ROWEEN
+    EggItem: Roween_Egg
+    FoodItem: Rotten_Meat
+    Fullness: 2   # unknown
+    HungryDelay: 120   # unknown
+    IntimacyFed: 15   # unknown
+    CaptureRate: 0   # unknown
+    SpecialPerformance: false   # unknown
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bMagicAtkEle,Ele_Wind,2;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bMagicAtkEle,Ele_Wind,3;
+      }
+#  - Mob: SKELION
+#    EggItem: Roost_Of_Skelion
+#    EquipItem: 10042
+#    FoodItem: Yummy_Meat
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      if (getpetinfo(PETINFO_INTIMATE) == PET_INTIMATE_LOYAL) {
+#         bonus bMatk,20;
+#         bonus bBaseAtk,20;
+#      }
+#
+#  - Mob: GLOOMUNDERNIGHT2
+#    EggItem: Gloom_Under_Egg
+#    FoodItem: High_Class_Pet_food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bMatk,10;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bMatk,20;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus2 bMagicAtkEle,Ele_Fire,5;
+#         bonus2 bMagicAtkEle,Ele_Ghost,5;
+#         bonus bMatk,30;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus2 bMagicAtkEle,Ele_Fire,7;
+#         bonus2 bMagicAtkEle,Ele_Ghost,7;
+#         bonus bMatk,40;
+#      }
+#
+#  - Mob: WANDERING_DUCK
+#    EggItem: E_Duckling_Egg
+#    EquipItem: 10045
+#    FoodItem: Wad_Of_Cotton
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bPerfectHitRate,5;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bPerfectHitRate,10;
+#      }
+#
+#  - Mob: KIEL_D_01_2
+#    EggItem: Kiel_Egg
+#    FoodItem: High_Class_Pet_food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bAspdRate,4;
+#         bonus bHit,9;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bShortAtkRate,1;
+#         bonus bAspdRate,5;
+#         bonus bHit,12;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bShortAtkRate,3;
+#         bonus bAspdRate,6;
+#         bonus bHit,15;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bShortAtkRate,5;
+#         bonus bAspdRate,7;
+#         bonus bHit,18;
+#      }
+#
+  - Mob: DARK_PRIEST
+    EggItem: Dark_Priest_Egg
+    FoodItem: Evil_Water
+    Fullness: 2   # unknown
+    HungryDelay: 120   # unknown
+    IntimacyFed: 15   # unknown
+    CaptureRate: 0   # unknown
+    SpecialPerformance: false   # unknown
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bMagicAddEle,Ele_Holy,3;
+         bonus bInt,1;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bMagicAddEle,Ele_Holy,5;
+         bonus bInt,2;
+      }
+#    Evolution:
+#      - Target: DARK_ILLUSION2
+#        ItemRequirements:
+#          - Item: Skull
+#            Amount: 500
+#          - Item: Rosary
+#            Amount: 1
+#          - Item: Sacred_Marks
+#            Amount: 5
+#          - Item: Dark_Priest_Card
+#            Amount: 10
+  - Mob: DESERT_WOLF
+    EggItem: Desert_Wolf_Egg
+    FoodItem: Pet_Food
+    Fullness: 2   # unknown
+    HungryDelay: 120   # unknown
+    IntimacyFed: 15   # unknown
+    CaptureRate: 0   # unknown
+    SpecialPerformance: false   # unknown
+    AllowAutoFeed: true
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bInt,1;
+         bonus bMaxSP,50;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bInt,2;
+         bonus bMaxSP,75;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bMagicAtkEle,Ele_Earth,3;
+         bonus bInt,3;
+         bonus bMaxSP,105;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bMagicAtkEle,Ele_Earth,5;
+         bonus bInt,4;
+         bonus bMaxSP,130;
+      }
+#  - Mob: ILL_BAPHOMET_J
+#    EggItem: Chaos_Bapho_Jr_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bFlee,6;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bMaxSPrate,1;
+#         bonus bFlee,9;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bMaxSPrate,2;
+#         bonus bFlee,12;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bMaxSPrate,3;
+#         bonus bFlee,15;
+#      }
+#
+#    Evolution:
+#      - Target: BAPHOMET2
+#        ItemRequirements:
+#          - Item: Baphomet__Card
+#            Amount: 15
+#          - Item: Chaos_Ba_Jr_Card
+#            Amount: 15
+#          - Item: Mightysoul_Essence
+#            Amount: 30
+  - Mob: FIRE_GOLEM
+    EggItem: Fire_Golem_Egg
+    FoodItem: Pet_Food
+    Fullness: 2   # unknown
+    HungryDelay: 120   # unknown
+    IntimacyFed: 15   # unknown
+    CaptureRate: 0   # unknown
+    SpecialPerformance: false   # unknown
+    AllowAutoFeed: true
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+         bonus bMaxHP,200;
+      }
+      else if (.@i == PET_INTIMATE_NEUTRAL) {
+         bonus bMaxHP,300;
+      }
+      else if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bMagicAtkEle,Ele_Fire,3;
+         bonus bMaxHP,400;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bMagicAtkEle,Ele_Fire,5;
+         bonus bMaxHP,500;
+      }
+#  - Mob: KNIGHT_OF_ABYSS2
+#    EggItem: Abyss_Knight_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bAtkRate,2;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bAtkRate,3;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus2 bAddClass,Class_Boss,3;
+#         bonus bPAtk,1;
+#         bonus bAtkRate,4;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus2 bAddClass,Class_Boss,5;
+#         bonus bPAtk,2;
+#         bonus bAtkRate,5;
+#      }
+#
+#  - Mob: CWHITEKNIGHT
+#    EggItem: Change_W_Knight_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bMatkRate,1;
+#         bonus bAtkRate,1;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bMatkRate,2;
+#         bonus bAtkRate,2;
+#      }
+#
+#    Evolution:
+#      - Target: KNIGHT_OF_ABYSS2
+#        ItemRequirements:
+#          - Item: Piece_Of_Darkness
+#            Amount: 100
+#          - Item: Rune_Of_Darkness
+#            Amount: 100
+#          - Item: Sin_Fragment
+#            Amount: 200
+#          - Item: Knight_Of_Abyss_Card
+#            Amount: 5
+#      - Target: GH_WHITEKNIGHT
+#        ItemRequirements:
+#          - Item: Shining_Round_Shell
+#            Amount: 100
+#          - Item: EP19_Shiny_Seaweed
+#            Amount: 100
+#          - Item: Fate_Fragment
+#            Amount: 200
+#          - Item: White_Knightage_Card
+#            Amount: 2
+#  - Mob: GH_WHITEKNIGHT
+#    EggItem: White_Knight_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bMatkRate,2;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bMatkRate,3;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus2 bMagicAddClass,Class_Boss,3;
+#         bonus bSMatk,1;
+#         bonus bMatkRate,4;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus2 bMagicAddClass,Class_Boss,5;
+#         bonus bSMatk,2;
+#         bonus bMatkRate,5;
+#      }
+#
+#  - Mob: BAPHOMET2
+#    EggItem: Baphomet_Egg
+#    FoodItem: High_Class_Pet_food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bMaxSPrate,1;
+#         bonus bFlee,8;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bLongAtkRate,1;
+#         bonus bMaxSPrate,3;
+#         bonus bFlee,12;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bLongAtkRate,3;
+#         bonus bMaxSPrate,5;
+#         bonus bFlee,16;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bLongAtkRate,5;
+#         bonus bMaxSPrate,7;
+#         bonus bFlee,20;
+#      }
+#
+  - Mob: FARMILIAR
+    TameItem: Fruits_Set_Trap
+    EggItem: Farmiliar_Egg
+    FoodItem: Mixed_Fruits_Juice
+    Fullness: 2   # unknown
+    HungryDelay: 120   # unknown
+    IntimacyFed: 15   # unknown
+    CaptureRate: 2000   # unknown
+    SpecialPerformance: false   # unknown
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      
+      if (.@i == PET_INTIMATE_CORDIAL) {
+         bonus2 bResEff,Eff_Curse,1000;
+         bonus bInt,3;
+      }
+      else if (.@i == PET_INTIMATE_LOYAL) {
+         bonus2 bResEff,Eff_Curse,2000;
+         bonus bInt,5;
+      }
+#  - Mob: DARK_ILLUSION2
+#    EggItem: Dark_Illusion_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bVariableCastrate,-2;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bVariableCastrate,-3;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus2 bMagicAtkEle,Ele_Dark,3;
+#         bonus bVariableCastrate,-4;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus2 bMagicAtkEle,Ele_Dark,5;
+#         bonus bVariableCastrate,-5;
+#      }
+#
+#    Evolution:
+#      - Target: DARK_LORD2
+#        ItemRequirements:
+#          - Item: Dark_Illusion_Card
+#            Amount: 10
+#          - Item: Evil_Druid_Card
+#            Amount: 10
+#          - Item: Dark_Priest_Card
+#            Amount: 10
+#          - Item: Mightysoul_Essence
+#            Amount: 30
+#  - Mob: BLUEMOON_LOLI_RURI2
+#    EggItem: Blue_Moon_Loli_Ruri_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bMaxHPrate,1;
+#         bonus bVit,1;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bMaxHPrate,2;
+#         bonus bVit,2;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bMaxHPrate,3;
+#         bonus bVit,3;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bMaxHPrate,5;
+#         bonus bVit,4;
+#      }
+#
+#  - Mob: WILD_ROSE3
+#    EggItem: Wild_Rose_Egg2
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bCritical,2;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bCritical,3;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bAspdRate,3;
+#         bonus bCritical,5;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bAspdRate,5;
+#         bonus bCritical,7;
+#      }
+#
+#    Evolution:
+#      - Target: EDDGA3
+#        ItemRequirements:
+#          - Item: Leaf_Cat_Card
+#            Amount: 10
+#          - Item: Wild_Rose_Card
+#            Amount: 10
+#          - Item: Jaguar_Card
+#            Amount: 10
+#          - Item: Mightysoul_Essence
+#            Amount: 30
+#  - Mob: EDDGA3
+#    EggItem: Eddga_Egg2
+#    FoodItem: High_Class_Pet_food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bCritical,5;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bCritical,6;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bCRate,1;
+#         bonus bCritical,7;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bCRate,3;
+#         bonus bCritical,8;
+#      }
+#
+#  - Mob: LARVA_VIOLET
+#    EggItem: Larva_Violet_Egg
+#    FoodItem: Green_Herb
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bCritical,3;
+#         bonus bHit,5;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bCritical,5;
+#         bonus bHit,10;
+#      }
+#
+#  - Mob: EP20_COPO
+#    TameItem: Ep20_Fatty_Icegangu
+#    EggItem: Copo_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 2000   # unknown
+#    SpecialPerformance: false   # unknown
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bMatkRate,1;
+#         bonus bAtkRate,1;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bMatkRate,2;
+#         bonus bAtkRate,2;
+#      }
+#
+#    Evolution:
+#      - Target: EP20_ICEWIND1
+#        ItemRequirements:
+#          - Item: Ep20_Huge_Feather_G
+#            Amount: 200
+#          - Item: Ep20_Copo_Egg_Shell
+#            Amount: 150
+#          - Item: Ep20_Copo_Head_F
+#            Amount: 150
+#          - Item: Grey_Icewind_Card
+#            Amount: 1
+#      - Target: EP20_ICEWIND2
+#        ItemRequirements:
+#          - Item: Ep20_Huge_Feather_W
+#            Amount: 200
+#          - Item: Ep20_Copo_Egg_Shell
+#            Amount: 150
+#          - Item: Ep20_Copo_Head_F
+#            Amount: 150
+#          - Item: Icewind_Card
+#            Amount: 1
+#  - Mob: EP20_ICEWIND1
+#    EggItem: Grey_Icewind_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bAtkRate,1;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bAtkRate,2;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bAtkRate,2;
+#         bonus bPow,1;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bAtkRate,3;
+#         bonus bPow,2;
+#      }
+#
+#  - Mob: EP20_ICEWIND2
+#    EggItem: Icewind_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus bMatkRate,1;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus bMatkRate,2;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bMatkRate,2;
+#         bonus bSpl,1;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bMatkRate,3;
+#         bonus bSpl,2;
+#      }
+#
+#  - Mob: DARK_LORD2
+#    EggItem: Dark_Lord_Egg
+#    FoodItem: High_Class_Pet_food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_AWKWARD || .@i == PET_INTIMATE_SHY) {
+#         bonus2 bMagicAtkEle,Ele_Dark,3;
+#      }
+#      else if (.@i == PET_INTIMATE_NEUTRAL) {
+#         bonus2 bMagicAtkEle,Ele_Dark,5;
+#      }
+#      else if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus2 bMagicAtkEle,Ele_Dark,7;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus2 bMagicAtkEle,Ele_Dark,7;
+#         bonus bSpeedRate,25;
+#      }
+#
+#  - Mob: VR_CHAO
+#    EggItem: Sonic_Chao_Egg
+#    FoodItem: Pet_Food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    Script: >
+#      .@i = getpetinfo(PETINFO_INTIMATE);
+#      
+#      if (.@i == PET_INTIMATE_CORDIAL) {
+#         bonus bMaxHP,200;
+#         bonus bMaxSP,20;
+#      }
+#      else if (.@i == PET_INTIMATE_LOYAL) {
+#         bonus bMaxHP,300;
+#         bonus bMaxSP,30;
+#      }
+#