From 1d3a6afb81d390c76e8fcb7b7f4669b5e9e13218 Mon Sep 17 00:00:00 2001 From: Emistry Haoyan Date: Sun, 3 Sep 2017 22:19:35 +0800 Subject: Update F_GetArmorType() - update missing equip types. --- npc/other/Global_Functions.txt | 19 ++++++++++++++++--- 1 file 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; } -- cgit v1.2.3-60-g2f50