diff options
| author | Haru <haru@dotalux.com> | 2017-11-12 00:43:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 00:43:51 +0100 |
| commit | 82da003c98d1525b6302cb7c753959a3b3e8c10d (patch) | |
| tree | 5f8cece6cc94a103eeb1889f72324574214dbf04 | |
| parent | 14ca1ab7a98d3c6df94b967159d4dd2df555d7e7 (diff) | |
| parent | 1d3a6afb81d390c76e8fcb7b7f4669b5e9e13218 (diff) | |
| download | hercules-82da003c98d1525b6302cb7c753959a3b3e8c10d.tar.gz hercules-82da003c98d1525b6302cb7c753959a3b3e8c10d.tar.bz2 hercules-82da003c98d1525b6302cb7c753959a3b3e8c10d.tar.xz hercules-82da003c98d1525b6302cb7c753959a3b3e8c10d.zip | |
Merge pull request #1836 from Emistry/script_F_GetArmorType
Update F_GetArmorType()
| -rw-r--r-- | npc/other/Global_Functions.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index bc19ff048..5a15ff1d2 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -269,17 +269,30 @@ function script F_GetWeaponType { // Determines equipment type by equip location function script F_GetArmorType { switch(getiteminfo(getarg(0),5)) { - case 001: return "Lower Headgear"; break; - case 2: return "Weapon"; break; + case 1: return "Lower Headgear"; break; + case 2: return callfunc("F_GetWeaponType", getarg(0)); break; case 4: return "Garment"; break; case 8: return "Accessory"; break; case 16: return "Armor"; break; case 32: return "Shield"; break; case 64: return "Shoes"; break; case 128: return "Accessory"; break; + case 136: return "Accessory"; break; case 256: return "Upper Headgear"; break; case 512: return "Middle Headgear"; break; - default: return "Unable to Determine Equip Location"; break; + case 1024: return "Costume Upper Headgear"; break; + case 2048: return "Costume Midle Headgear"; break; + case 4096: return "Costume Lower Headgear"; break; + case 8192: return "Costume Garment"; break; + case 32768: return "Ammo"; break; + case 65536: return "Shadow Armor"; break; + case 131072: return "Shadow Weapon"; break; + case 262144: return "Shadow Shield"; break; + case 524288: return "Shadow Shoes"; break; + case 1048576: return "Shadow Accessory"; break; + case 2097152: return "Shadow Accessory"; break; + case 3145728: return "Shadow Accessory"; break; + default: return "Unknown Equip Type"; break; } end; } |