warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Removes BodyValue and fixes modifying Body and BodyMod in props gump. (#743)

Browse source 
* Removes BodyValue
* Removes BodyPicker gump
* Fixes setting Body and BodyMod in props gump
* Props will now look for an `implicit cast` in order to find a way to allow you to modify values with the props gump.
* Fixed `[self set body 0x190` so it works too.
This commit is contained in:
Kamron Batman 2021-08-28 22:56:00 -07:00 • committed by GitHub
parent 244fc6a136
commit bf20800382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 175 additions and 1477 deletions
Download patch file Download diff file Expand all files Collapse all files

862
Distribution/Data/models.txt
View file

@ -1,862 +0,0 @@
#Body Type Model
400 Human h_male
401 Human h_female
402 Human player_ghost
403 Human player_ghost
991 Human character_blackthorn
994 Human character_dupre
990 Equipment character_lord_british
970 Equipment H_Male_Robe_Deathshroud
1970 Equipment H_Female_Robe_Deathshroud
183 Human H_Savage_Male
184 Human H_Savage_Female
185 Human H_SavageRider_Male
186 Human H_SavageShaman_Female
##Necromancy Transformed Player Models
#Body Type Model
744 Human h_male
745 Human h_female
746 Monsters four_armed_demon
747 Monsters wailingbanshee
748 Monsters spirits_ghost
749 Monsters liche_liche_retro
##Male Wearables
#Body Type Model
750 Human H_Savage_Male
465 Equipment H_Male_Apron_Full
466 Equipment H_Male_Apron_Half
554 Equipment H_Male_Armor_Bone_Breastpiece
557 Equipment H_Male_Armor_Bone_Gloves
562 Equipment H_Male_Armor_Bone_Helm
555 Equipment H_Male_Armor_Bone_Leggings
556 Equipment H_Male_Armor_Bone_Sleeves
561 Equipment H_Male_Armor_Chain_Coif
540 Equipment H_Male_Armor_Chain_Leggings
538 Equipment H_Male_Armor_Chain_Shirt
680 Equipment H_Male_Armor_Dragon_Breastpiece
681 Equipment H_Male_Armor_Dragon_Gloves
682 Equipment H_Male_Armor_Dragon_Head_Helm
683 Equipment H_Male_Armor_Dragon_Leggings
679 Equipment H_Male_Armor_Dragon_Sleeves
929 Equipment H_Male_Armor_Head_Bascinet
928 Equipment H_Male_Armor_Head_Close_Helm
565 Equipment H_Male_Armor_Head_Helmet
564 Equipment H_Male_Armor_Head_Norse_Helm
973 Equipment H_Male_Armor_Head_Orc_Helm
743 Equipment H_Male_Armor_Head_Winged_Helmet
675 Equipment H_Male_Armor_Japanese_Do-Maru
694 Equipment H_Male_Armor_Japanese_Hachimaki
678 Equipment H_Male_Armor_Japanese_Haidate
695 Equipment H_Male_Armor_Japanese_Haramaki-Do
672 Equipment H_Male_Armor_Japanese_Kabuto
674 Equipment H_Male_Armor_Japanese_Kabuto_Mempo
698 Equipment H_Male_Armor_Japanese_Kobakama
677 Equipment H_Male_Armor_Japanese_Kote_Gloves
676 Equipment H_Male_Armor_Japanese_Kote_Sleeves
697 Equipment H_Male_Armor_Japanese_Kote2_Gloves
696 Equipment H_Male_Armor_Japanese_Kote2_Sleeves
699 Equipment H_Male_Armor_Japanese_Waraji
560 Equipment H_Male_Armor_Leather_Cap
545 Equipment H_Male_Armor_Leather_Gloves
546 Equipment H_Male_Armor_Leather_Gorget
543 Equipment H_Male_Armor_Leather_Leggings
544 Equipment H_Male_Armor_Leather_Sleeves
524 Equipment H_Male_Armor_Leather_Studded_Gloves
525 Equipment H_Male_Armor_Leather_Studded_Gorget
522 Equipment H_Male_Armor_Leather_Studded_Leggings
523 Equipment H_Male_Armor_Leather_Studded_Sleeves
521 Equipment H_Male_Armor_Leather_Studded_Tunic
542 Equipment H_Male_Armor_Leather_Tunic
527 Equipment H_Male_Armor_Plate_Breastpiece
530 Equipment H_Male_Armor_Plate_Gauntlets
531 Equipment H_Male_Armor_Plate_Gorget
563 Equipment H_Male_Armor_Plate_Helm
529 Equipment H_Male_Armor_Plate_Leggings
528 Equipment H_Male_Armor_Plate_Sleeves
549 Equipment H_Male_Armor_Ring_Leggings
550 Equipment H_Male_Armor_Ring_Sleeves
548 Equipment H_Male_Armor_Ring_Tunic
477 Equipment H_Male_Boots
476 Equipment H_Male_Boots_Thigh
495 Equipment H_Male_Bracelet_Gold
508 Equipment H_Male_Bracelet_Silver
468 Equipment H_Male_Cloak
448 Equipment H_Male_Dress_Fancy
687 Equipment H_Male_Dress_Fancy_2
688 Equipment H_Male_Dress_Fancy_3
447 Equipment H_Male_Dress_Long
496 Equipment H_Male_Ear_Ring_Gold
509 Equipment H_Male_Ear_Ring_Silver
900 Equipment H_Male_Hair_Curly
800 Equipment H_Male_Hair_Facial_Gotee
906 Equipment H_Male_Hair_Facial_Gotee_2
801 Equipment H_Male_Hair_Facial_Long_Beard
905 Equipment H_Male_Hair_Facial_Long_Beard_2
803 Equipment H_Male_Hair_Facial_Mustache
802 Equipment H_Male_Hair_Facial_Short_Beard
904 Equipment H_Male_Hair_Facial_Short_Beard_2
701 Equipment H_Male_Hair_Long
703 Equipment H_Male_Hair_Mohawk
710 Equipment H_Male_Hair_Pageboy
902 Equipment H_Male_Hair_Pig_Tails
702 Equipment H_Male_Hair_Ponytail
901 Equipment H_Male_Hair_Receding
700 Equipment H_Male_Hair_Short
903 Equipment H_Male_Hair_Topknot
492 Equipment H_Male_Hat_Bandana
410 Equipment H_Male_Hat_Bonnet
406 Equipment H_Male_Hat_Cap
411 Equipment H_Male_Hat_Feathered
742 Equipment H_Male_Hat_Feathers_Leaves
404 Equipment H_Male_Hat_Floppy
413 Equipment H_Male_Hat_Jester
740 Equipment H_Male_Hat_Robin_Hood
419 Equipment H_Male_Hat_Skullcap
408 Equipment H_Male_Hat_Straw
407 Equipment H_Male_Hat_Straw_Tall
412 Equipment H_Male_Hat_Tricorner
405 Equipment H_Male_Hat_Wide_Brim
409 Equipment H_Male_Hat_Wizard
455 Equipment H_Male_Kilt
690 Equipment H_Male_Kimono
414 Equipment H_Male_Mask_Bear
415 Equipment H_Male_Mask_Deer
713 Equipment H_Male_Mask_Feathered
692 Equipment H_Male_Mask_Ninja
416 Equipment H_Male_Mask_Orc
417 Equipment H_Male_Mask_Tribal_1
418 Equipment H_Male_Mask_Tribal_2
493 Equipment H_Male_Necklace_Bead
497 Equipment H_Male_Necklace_Gold
494 Equipment H_Male_Necklace_Gold_Bead
510 Equipment H_Male_Necklace_Silver
507 Equipment H_Male_Necklace_Silver_Bead
715 Equipment H_Male_Pants_Jester
431 Equipment H_Male_Pants_Long
693 Equipment H_Male_Pants_Ninja
430 Equipment H_Male_Pants_Short
498 Equipment H_Male_Ring_Gold
511 Equipment H_Male_Ring_Silver
469 Equipment H_Male_Robe_CowlDown
732 Equipment H_Male_Robe_CowlUp
731 Equipment H_Male_Robe_Deathshroud
987 Equipment H_Male_Robe_GM
490 Equipment H_Male_Sash
733 Equipment H_Male_Shirt_1
734 Equipment H_Male_Shirt_2
735 Equipment H_Male_Shirt_5
736 Equipment H_Male_Shirt_6
911 Equipment H_Male_Shirt_Checkered
913 Equipment H_Male_Shirt_Doublet
435 Equipment H_Male_Shirt_Fancy
912 Equipment H_Male_Shirt_Jester
691 Equipment H_Male_Shirt_Ninja
434 Equipment H_Male_Shirt_Sleeveless
910 Equipment H_Male_Shirt_Surcoat
909 Equipment H_Male_Shirt_Tunic
480 Equipment H_Male_Shoes
716 Equipment H_Male_Shoes_Jester
479 Equipment H_Male_Shoes_Sandals
449 Equipment H_Male_Skirt_Long
971 Equipment H_Male_Skirt_Medium
759 Equipment H_Male_Cloak_Arcane
760 Equipment H_Male_Gloves_Arcane
761 Equipment H_Male_Robe_Arcane
762 Equipment H_Male_Boots_Arcane
##Female wearables for polyorph from female to male
#Body Type Model
924 Equipment H_Female_Armor_Female_Bustier_Leather
925 Equipment H_Female_Armor_Female_Bustier_Studded
923 Equipment H_Female_Armor_Female_Leather
922 Equipment H_Female_Armor_Female_Plate
927 Equipment H_Female_Armor_Female_Shorts_Spiked
926 Equipment H_Female_Armor_Female_Skirt_Leather
921 Equipment H_Female_Armor_Female_Studded
##Transition female only armor
#Body Type Model
2604 Equipment H_Female_Armor_Female_Bustier_Leather_OLD
2605 Equipment H_Female_Armor_Female_Bustier_Studded_OLD
2603 Equipment H_Female_Armor_Female_Leather_OLD
2602 Equipment H_Female_Armor_Female_Plate_OLD
2606 Equipment H_Female_Armor_Female_Skirt_Leather_OLD
2601 Equipment H_Female_Armor_Female_Studded_OLD
3601 Equipment H_Female_Armor_Female_Studded_OLD
3602 Equipment H_Female_Armor_Female_Plate_OLD
3603 Equipment H_Female_Armor_Female_Leather_OLD
3604 Equipment H_Female_Armor_Female_Bustier_Leather_OLD
3605 Equipment H_Female_Armor_Female_Bustier_Studded_OLD
3606 Equipment H_Female_Armor_Female_Skirt_Leather_OLD
##Female Wearables
#Body Type Model
751 Human H_Savage_Female
1465 Equipment H_Female_Apron_Full
1466 Equipment H_Female_Apron_Half
1554 Equipment H_Female_Armor_Bone_Breastpiece
1557 Equipment H_Female_Armor_Bone_Gloves
1562 Equipment H_Female_Armor_Bone_Helm
1555 Equipment H_Female_Armor_Bone_Leggings
1556 Equipment H_Female_Armor_Bone_Sleeves
1561 Equipment H_Female_Armor_Chain_Coif
1540 Equipment H_Female_Armor_Chain_Leggings
1538 Equipment H_Female_Armor_Chain_Shirt
1680 Equipment H_Female_Armor_Dragon_Breastpiece
1681 Equipment H_Female_Armor_Dragon_Gloves
1682 Equipment H_Female_Armor_Dragon_Head_Helm
1683 Equipment H_Female_Armor_Dragon_Leggings
1679 Equipment H_Female_Armor_Dragon_Sleeves
1924 Equipment H_Female_Armor_Female_Bustier_Leather
1925 Equipment H_Female_Armor_Female_Bustier_Studded
1923 Equipment H_Female_Armor_Female_Leather
1922 Equipment H_Female_Armor_Female_Plate
1927 Equipment H_Female_Armor_Female_Shorts_Spiked
1926 Equipment H_Female_Armor_Female_Skirt_Leather
1921 Equipment H_Female_Armor_Female_Studded
1929 Equipment H_Female_Armor_Head_Bascinet
1928 Equipment H_Female_Armor_Head_Close_Helm
1565 Equipment H_Female_Armor_Head_Helmet
1564 Equipment H_Female_Armor_Head_Norse_Helm
1973 Equipment H_Female_Armor_Head_Orc_Helm
1743 Equipment H_Female_Armor_Head_Winged_Helmet
1675 Equipment H_Female_Armor_Japanese_Do-Maru
1694 Equipment H_Female_Armor_Japanese_Hachimaki
1678 Equipment H_Female_Armor_Japanese_Haidate
1695 Equipment H_Female_Armor_Japanese_Haramaki-Do
1672 Equipment H_Female_Armor_Japanese_Kabuto
1674 Equipment H_Female_Armor_Japanese_Kabuto_Mempo
1698 Equipment H_Female_Armor_Japanese_Kobakama
1677 Equipment H_Female_Armor_Japanese_Kote_Gloves
1676 Equipment H_Female_Armor_Japanese_Kote_Sleeves
1697 Equipment H_Female_Armor_Japanese_Kote2_Gloves
1696 Equipment H_Female_Armor_Japanese_Kote2_Sleeves
1699 Equipment H_Female_Armor_Japanese_Waraji
1560 Equipment H_Female_Armor_Leather_Cap
1545 Equipment H_Female_Armor_Leather_Gloves
1546 Equipment H_Female_Armor_Leather_Gorget
1543 Equipment H_Female_Armor_Leather_Leggings
1544 Equipment H_Female_Armor_Leather_Sleeves
1524 Equipment H_Female_Armor_Leather_Studded_Gloves
1525 Equipment H_Female_Armor_Leather_Studded_Gorget
1522 Equipment H_Female_Armor_Leather_Studded_Leggings
1523 Equipment H_Female_Armor_Leather_Studded_Sleeves
1521 Equipment H_Female_Armor_Leather_Studded_Tunic
1542 Equipment H_Female_Armor_Leather_Tunic
1527 Equipment H_Female_Armor_Plate_Breastpiece
1530 Equipment H_Female_Armor_Plate_Gauntlets
1531 Equipment H_Female_Armor_Plate_Gorget
1563 Equipment H_Female_Armor_Plate_Helm
1529 Equipment H_Female_Armor_Plate_Leggings
1528 Equipment H_Female_Armor_Plate_Sleeves
1549 Equipment H_Female_Armor_Ring_Leggings
1550 Equipment H_Female_Armor_Ring_Sleeves
1548 Equipment H_Female_Armor_Ring_Tunic
1477 Equipment H_Female_Boots
1476 Equipment H_Female_Boots_Thigh
1495 Equipment H_Female_Bracelet_Gold
1508 Equipment H_Female_Bracelet_Silver
1468 Equipment H_Female_Cloak
1448 Equipment H_Female_Dress_Fancy
1687 Equipment H_Female_Dress_Fancy_2
1688 Equipment H_Female_Dress_Fancy_3
1447 Equipment H_Female_Dress_Long
1496 Equipment H_Female_Ear_Ring_Gold
1509 Equipment H_Female_Ear_Ring_Silver
1712 Equipment H_Female_Hair_Buns
1900 Equipment H_Female_Hair_Curly
1701 Equipment H_Female_Hair_Long
1703 Equipment H_Female_Hair_Mohawk
1710 Equipment H_Female_Hair_Pageboy
1902 Equipment H_Female_Hair_Pig_Tails
1702 Equipment H_Female_Hair_Ponytail
1901 Equipment H_Female_Hair_Receding
1700 Equipment H_Female_Hair_Short
1903 Equipment H_Female_Hair_Topknot
1492 Equipment H_Female_Hat_Bandana
1410 Equipment H_Female_Hat_Bonnet
1406 Equipment H_Female_Hat_Cap
1411 Equipment H_Female_Hat_Feathered
1742 Equipment H_Female_Hat_Feathers_Leaves
1404 Equipment H_Female_Hat_Floppy
1413 Equipment H_Female_Hat_Jester
1740 Equipment H_Female_Hat_Robin_Hood
1419 Equipment H_Female_Hat_Skullcap
1408 Equipment H_Female_Hat_Straw
1407 Equipment H_Female_Hat_Straw_Tall
1412 Equipment H_Female_Hat_Tricorner
1405 Equipment H_Female_Hat_Wide_Brim
1409 Equipment H_Female_Hat_Wizard
1455 Equipment H_Female_Kilt
1690 Equipment H_Female_Kimono
1414 Equipment H_Female_Mask_Bear
1415 Equipment H_Female_Mask_Deer
1713 Equipment H_Female_Mask_Feathered
1692 Equipment H_Female_Mask_Ninja
1416 Equipment H_Female_Mask_Orc
1417 Equipment H_Female_Mask_Tribal_1
1418 Equipment H_Female_Mask_Tribal_2
1493 Equipment H_Female_Necklace_Bead
1497 Equipment H_Female_Necklace_Gold
1494 Equipment H_Female_Necklace_Gold_Bead
1510 Equipment H_Female_Necklace_Silver
1507 Equipment H_Female_Necklace_Silver_Bead
1715 Equipment H_Female_Pants_Jester
1431 Equipment H_Female_Pants_Long
1693 Equipment H_Female_Pants_Ninja
1430 Equipment H_Female_Pants_Short
1498 Equipment H_Female_Ring_Gold
1511 Equipment H_Female_Ring_Silver
1469 Equipment H_Female_Robe_CowlDown
1732 Equipment H_Female_Robe_CowlUp
1731 Equipment H_Female_Robe_Deathshroud
1987 Equipment H_Female_Robe_GM
1490 Equipment H_Female_Sash
1733 Equipment H_Female_Shirt_1
1734 Equipment H_Female_Shirt_2
1735 Equipment H_Female_Shirt_5
1736 Equipment H_Female_Shirt_6
1911 Equipment H_Female_Shirt_Checkered
1913 Equipment H_Female_Shirt_Doublet
1435 Equipment H_Female_Shirt_Fancy
1912 Equipment H_Female_Shirt_Jester
1691 Equipment H_Female_Shirt_Ninja
1434 Equipment H_Female_Shirt_Sleeveless
1910 Equipment H_Female_Shirt_Surcoat
1909 Equipment H_Female_Shirt_Tunic
1480 Equipment H_Female_Shoes
1716 Equipment H_Female_Shoes_Jester
1479 Equipment H_Female_Shoes_Sandals
1449 Equipment H_Female_Skirt_Long
1971 Equipment H_Female_Skirt_Medium
1759 Equipment H_Female_Cloak_Arcane
1760 Equipment H_Female_Gloves_Arcane
1761 Equipment H_Female_Robe_Arcane
1762 Equipment H_Female_Boots_Arcane
##Carryables
#Body Type Model
584 Equipment Weapon_daemon_sword
585 Equipment Weapon_ettin_hammer
586 Equipment Weapon_liche_staff
587 Equipment Weapon_lizard_man_mace
588 Equipment Weapon_lizard_man_spear
589 Equipment Weapon_ogre_club
590 Equipment Weapon_Ophidian_mage_staff
591 Equipment Weapon_Ophidian_warrior_bardiche
592 Equipment Weapon_orc_club
593 Equipment Weapon_ratman_axe
594 Equipment Weapon_ratman_sword
595 Equipment Weapon_skeleton_axe
596 Equipment Weapon_skeleton_scimitar
597 Equipment Weapon_Terathen_mage_staff
744 Equipment Weapon_Terathen_Avenger_mace
598 Equipment Weapon_Terathen_Avenger_spear
599 Equipment Weapon_troll_axe
600 Equipment Weapon_troll_maul
601 Equipment Weapon_frost_troll_club
602 Equipment Weapon_orc_lord_battle_axe
603 Equipment Weapon_orc_shaman_staff
604 Equipment Weapon_skeleton_mage_staff
972 Equipment Fishing_Rod
502 Equipment Light_Candle_Lit
505 Equipment Light_Candle_Unlit
500 Equipment Light_Lantern_Lit
503 Equipment Light_Lantern_Unlit
501 Equipment Light_Torch_Lit
504 Equipment Light_Torch_Unlit
577 Equipment Shield_Bronze
579 Equipment Shield_Buckler
993 Equipment Shield_Chaos
581 Equipment Shield_Heater
992 Equipment Shield_Order
582 Equipment Shield_Roman
576 Equipment Shield_Round
578 Equipment Shield_Wooden
580 Equipment Shield_Wooden_Kite
985 Equipment Spell_book_1
984 Equipment Spell_book_2
668 Equipment Staff_Magic_1
669 Equipment Staff_Magic_2
670 Equipment Staff_Magic_3
671 Equipment Staff_Magic_4
980 Equipment Wand_1
981 Equipment Wand_2
982 Equipment Wand_3
983 Equipment Wand_4
653 Equipment Weapon_Axe
611 Equipment Weapon_Axe_2H
634 Equipment Weapon_Axe_Double
614 Equipment Weapon_Bardiche
615 Equipment Weapon_Battle_Axe
617 Equipment Weapon_Black_Staff
649 Equipment Weapon_Bow
629 Equipment Weapon_Butcher_Knife
619 Equipment Weapon_Cleaver
620 Equipment Weapon_Club
621 Equipment Weapon_Crook
651 Equipment Weapon_Crossbow
616 Equipment Weapon_Crossbow_Heavy
623 Equipment Weapon_Cutlass
622 Equipment Weapon_Dagger
613 Equipment Weapon_Executioner_Axe
628 Equipment Weapon_Gnarled_Staff
624 Equipment Weapon_Halberd
640 Equipment Weapon_Hammer_Sledge
745 Equipment Weapon_Hammer_Smyth
625 Equipment Weapon_Hammer_Pick
654 Equipment Weapon_Hatchet
661 Equipment Weapon_Japanese_Longbow
626 Equipment Weapon_Javelin
627 Equipment Weapon_Katana
630 Equipment Weapon_Kryss
612 Equipment Weapon_Large_Battle_Axe
631 Equipment Weapon_Mace
655 Equipment Weapon_Magic_Sword_1
656 Equipment Weapon_Magic_Sword_2
657 Equipment Weapon_Magic_Sword_3
658 Equipment Weapon_Magic_Sword_4
633 Equipment Weapon_Maul
659 Equipment Weapon_Naginata
660 Equipment Weapon_No-Dachi
662 Equipment Weapon_Pick
635 Equipment Weapon_Pickaxe
636 Equipment Weapon_Pitch_Fork
648 Equipment Weapon_Quarter_Staff
637 Equipment Weapon_Scimitar
638 Equipment Weapon_Skinning_Knife
641 Equipment Weapon_Spear
663 Equipment Weapon_Spear_2
639 Equipment Weapon_Spear_Short
664 Equipment Weapon_Sword
618 Equipment Weapon_Sword_Broad
665 Equipment Weapon_Sword_Long
666 Equipment Weapon_Sword_Short
643 Equipment Weapon_Sword_Viking
644 Equipment Weapon_War_Axe
645 Equipment Weapon_War_Fork
646 Equipment Weapon_War_Hammer
642 Equipment Weapon_War_Mace
##Creatures
#Body Type Model
187 Animals ridgeback_ridgeback
193 Animals ridgeback_ridgeback_ethereal
188 Animals ridgeback_savage
787 Monsters ant_lion
157 Monsters arachnids_spider_black_widow
173 Monsters arachnids_spider_black_widow
11 Monsters arachnids_spider_dread
19 Monsters arachnids_spider_dread
20 Monsters arachnids_spider_frost
28 Monsters arachnids_spider_giant
28 Monsters arachnids_spider_giant
28 Monsters arachnids_spider_giant
779 Monsters bogling
780 Monsters bog_thing
232 Animals bovines_bull_brown
233 Animals bovines_bull_spotted
216 Animals bovines_cow_brown
231 Animals bovines_cow_spotted
211 Animals bruins_bear_black
211 Animals bruins_bear_black
167 Animals bruins_bear_brown
212 Animals bruins_bear_grizzly
212 Animals bruins_bear_grizzly
213 Animals bruins_bear_polar
213 Animals bruins_bear_polar
217 Animals canines_dog_hound
97 Animals canines_hell_hound
98 Animals canines_hell_hound
225 Animals canines_wolf_timber
99 Animals canines_wolf_dark
23 Animals canines_wolf_dire
25 Animals canines_wolf_grey
27 Animals canines_wolf_grey
100 Animals canines_wolf_silver
34 Animals canines_wolf_white
37 Animals canines_wolf_white
101 Monsters centaurs_centaur
792 Monsters chaos_demon
786 Monsters chariot
756 Monsters clockwork_overseer
757 Monsters clockwork_minion
763 Monsters clockwork_minion
75 Monsters cyclops_cyclops
9 Monsters daemons_daemon
10 Monsters daemons_daemon
9 Monsters daemons_daemon
9 Monsters daemons_daemon
38 Monsters daemons_daemon_black_gate
40 Monsters daemons_daemon_elder
102 Monsters daemons_daemon_exodus
43 Monsters daemons_daemon_ice_fiend
774 Monsters Dawn_Girl
237 Animals deer_doe
237 Animals deer_doe
234 Animals deer_stag
234 Animals deer_stag
151 Sea dolphins_dolphin
103 Monsters dragons_dragon_asian
12 Monsters dragons_dragon_retro_grey
172 Monsters dragons_dragon_retro_red
59 Monsters dragons_dragon_retro_red
49 Monsters dragons_wyrm_retro_white
180 Monsters dragons_wyrm_retro_white
60 Monsters dragons_dragon_retro_grey
61 Monsters dragons_dragon_retro_red
105 Monsters dragons_wyrm_ancient
46 Monsters Mf_Dragon_Rust
106 Monsters dragons_wyrm_shadow
104 Monsters dragons_dragon_skeletal
62 Monsters dragons_wyvern
14 Monsters elementals_earth_elemental
14 Monsters elementals_earth_elemental
107 Monsters elementals_agapite_elemental
108 Monsters elementals_bronze_elemental
109 Monsters elementals_copper_elemental
110 Monsters elementals_copper_dull_elemental
166 Monsters elementals_gold_elemental
111 Monsters elementals_iron_elemental
112 Monsters elementals_valorite_elemental
113 Monsters elementals_verite_elemental
158 Monsters elementals_acid_elemental
13 Monsters elementals_air_elemental
13 Monsters elementals_air_elemental
13 Monsters elementals_air_elemental
159 Monsters elementals_blood_elemental
160 Monsters elementals_blood_elemental
15 Monsters elementals_fire_elemental
15 Monsters elementals_fire_elemental
15 Monsters elementals_fire_elemental
161 Monsters elementals_ice_elemental
162 Monsters elementals_poison_elemental
163 Monsters elementals_snow_elemental
16 Monsters elementals_water_elemental
16 Monsters elementals_water_elemental
164 Monsters ethereals_energy_vortex
165 Monsters ethereals_wisp
58 Monsters ethereals_wisp
58 Monsters ethereals_wisp
200 Animals equines_horse_dappled_brown
200 Animals equines_horse_dappled_brown
190 Animals equines_horse_firesteed
820 Animals equines_horse_dappled_brown
291 Animals equines_horse_dappled_brown_pack
226 Animals equines_horse_dappled_grey
226 Animals equines_horse_dappled_grey
226 Animals equines_horse_dappled_grey
846 Animals equines_horse_dappled_grey
204 Animals equines_horse_dark_brown
204 Animals equines_horse_dark_brown
824 Animals equines_horse_dark_brown
228 Animals equines_horse_tan
228 Animals equines_horse_tan
848 Animals equines_horse_tan
114 Animals equines_horse_dark_steed
115 Animals equines_horse_ethereal
116 Animals equines_horse_nightmare
177 Animals equines_horse_nightmare
178 Animals equines_horse_nightmare
179 Animals equines_horse_nightmare
117 Animals equines_horse_silver_steed
118 Animals equines_horse_war_brittanian
119 Animals equines_horse_war_mage_council
120 Animals equines_horse_war_minax
121 Animals equines_horse_war_shadowlord
122 Animals equines_unicorn
192 Animals equines_unicorn_ethereal
123 Monsters ethereal_warriors_male
175 Monsters ethereal_warriors_male
2 Monsters ettins_ettin
18 Monsters ettins_ettin
63 Animals felines_cougar
64 Animals felines_leopard_snow
65 Animals felines_leopard_snow
214 Animals felines_panther
127 Animals felines_predator_hellcat
128 Monsters fey_race_pixie
176 Monsters fey_race_pixie
781 Monsters fire_ant_worker
782 Monsters fire_ant_warrior
783 Monsters fire_ant_queen
804 Monsters fire_ant_matriarch
805 Monsters black_ant_worker
806 Monsters black_ant_warrior
807 Monsters black_ant_queen
808 Monsters black_ant_matriarch
8 Monsters flails_corpser
47 Monsters flails_reaper
66 Monsters flails_swamp_tentacles
129 Monsters flails_swamp_tentacles
80 Monsters frogs_frog_giant
4 Monsters gargoyles_gargoyle
130 Monsters gargoyles_gargoyle_blistering
67 Monsters gargoyles_gargoyle_stone
753 Monsters gargoyles_gargoyle_slave
754 Monsters gargoyles_gargoyle_enforcer
755 Monsters gargoyles_gargoyle_guard
758 Monsters gargoyles_gargoyle_shopkeeper
22 Monsters gazers_gazer
68 Monsters gazers_gazer_elder
69 Monsters gazers_gazer_elder
131 Monsters genies_efreet
791 Animals giant_beetle
195 Animals giant_beetle_ethereal
752 Monsters golem_iron
29 Animals gorillas_silverback
29 Animals gorillas_silverback
30 Monsters harpies_harpy
73 Monsters harpies_harpy_stone
31 Monsters headless_headless
776 Monsters horde_demon
795 Monsters horde_demon
796 Monsters horde_demon
74 Monsters imps_imp
168 Monsters imps_shadow_fiend
764 Monsters Juka_Warrior
765 Monsters Juka_Mage
768 Monsters Juggernaut
132 Animals kirin_kirin
191 Animals kirin_kirin_ethereal
998 Monsters kirin_kirin
77 Monsters krakens_kraken
24 Monsters liche_liche_retro
24 Monsters liche_liche_retro
78 Monsters liche_liche_lord_retro
79 Monsters liche_liche_lord_retro
82 Monsters liche_liche_lord_retro
33 Monsters lizard_race_lizardman
35 Monsters lizard_race_lizardman
36 Monsters lizard_race_lizardman
202 Animals lizards_alligator_brown
202 Animals lizards_alligator_brown
133 Animals lizards_alligator_small
134 Animals lizards_komodo_dragon
206 Monsters lizards_lava_lizard
220 Animals llamas_llama
828 Animals llamas_llama
828 Animals llamas_llama
828 Animals llamas_llama
170 Animals llamas_llama_ethereal
292 Animals llamas_llama_pack
124 Monsters mages_evil_mage
125 Monsters mages_evil_mage_master
126 Monsters mages_evil_mage_master
770 Monsters Meer_Mage
771 Monsters Meer_Warrior
797 Monsters mf_dragon_fire
798 Monsters mf_dragon_rust
39 Monsters mongbats_mongbat
39 Monsters mongbats_mongbat
39 Monsters mongbats_mongbat
39 Monsters mongbats_mongbat
766 Monsters NPC_Kabur
767 Monsters NPC_Blackthorn_Cohort
769 Monsters NPC_Blackthorn
772 Monsters NPC_Adranath
773 Monsters NPC_Cpt_Dasha
1 Monsters ogres_ogre
1 Monsters ogres_ogre
83 Monsters ogres_ogre_lord
84 Monsters ogres_ogre_lord
135 Monsters ogres_ogre_lord_arctic
136 Monsters ophidians_ophidian_archmage
137 Monsters ophidians_ophidian_knight
85 Monsters ophidians_ophidian_mage
87 Monsters ophidians_ophidian_queen
86 Monsters ophidians_ophidian_warrior
17 Monsters orcs_orc
41 Monsters orcs_orc
7 Monsters orcs_orc_captain
7 Monsters orcs_orc_captain
7 Monsters orcs_orc_captain
138 Monsters orcs_orc_lord
139 Monsters orcs_orc_lord
140 Monsters orcs_orc_shaman
181 Monsters orcs_orc_scout
182 Monsters orcs_orc_bomber
189 Monsters orcs_orc_lord
210 Animals ostards_ostard_desert
825 Animals ostards_ostard_desert
218 Animals ostards_ostard_forest
826 Animals ostards_ostard_forest
219 Animals ostards_ostard_frenzied
827 Animals ostards_ostard_frenzied
171 Animals ostards_ostard_ethereal
141 Monsters paladins_paladin
775 Monsters plague_beast
290 Animals porcines_boar
203 Animals porcines_pig
203 Animals porcines_pig
42 Monsters rat_race_ratman
44 Monsters rat_race_ratman
45 Monsters rat_race_ratman
142 Monsters rat_race_ratman
143 Monsters rat_race_shaman
215 Monsters rodents_rat_giant
215 Monsters rodents_rat_giant
839 Animals ridgeback_ridgeback
840 Animals ridgeback_giant
841 Animals ridgeback_flame
842 Animals ridgeback_hatchling
209 Animals ruminants_goat_billy
88 Animals ruminants_goat_mountain
207 Animals ruminants_sheep
223 Animals ruminants_sheep_shorn
790 Monsters sand_vortex
48 Monsters scorpions_giant
48 Monsters scorpions_giant
144 Sea sea_horse_sea_horse
150 Sea sea_serpents_sea_serpent
145 Sea sea_serpents_sea_serpent
21 Monsters serpents_snake_giant
21 Monsters serpents_snake_giant
89 Monsters serpents_snake_giant_ice
90 Monsters serpents_snake_giant_lava
91 Monsters serpents_snake_giant_silver
92 Monsters serpents_snake_giant_silver
93 Monsters serpents_snake_giant_silver
146 Monsters shadowlords_shadowlord
793 Animals skeletal_mount
50 Monsters skeletons_skeleton
56 Monsters skeletons_skeleton
57 Monsters skeletons_skeleton
147 Monsters skeletons_skeleton_knight
148 Monsters skeletons_skeleton_mage
51 Monsters slimes_slime
51 Monsters slimes_slime
94 Monsters slimes_slime_frost
96 Monsters slimes_slime_frost
574 Monsters spirits_blade_spirit
26 Monsters spirits_ghost
26 Monsters spirits_ghost
26 Monsters spirits_ghost
149 Monsters succubi_succubus
174 Monsters succubi_succubus
794 Animals swamp_dragon
194 Animals swamp_dragon_ethereal
799 Animals swamp_dragon_armor
778 Monsters swarm
152 Monsters terathan_terathan_avenger
71 Monsters terathan_terathan_drone
72 Monsters terathan_terathan_queen
70 Monsters terathan_terathan_warrior
76 Monsters titans_titan
53 Monsters trolls_troll
54 Monsters trolls_troll
55 Monsters trolls_troll_frost
153 Monsters walking_dead_ghoul
154 Monsters walking_dead_mummy
155 Monsters walking_dead_rotting_corpse
3 Monsters walking_dead_zombie
3 Monsters walking_dead_zombie
221 Animals walrus_walrus_male
221 Animals walrus_walrus_male
##New 3D Critters (Replaces 2D Bitmaps)
#Body Type Model
5 Animals birds_eagle
5 Animals birds_eagle
6 Animals birds_generic
6 Animals birds_generic
6 Animals birds_generic
6 Animals birds_generic
831 Animals birds_parrot
832 Animals birds_pheonix
833 Animals birds_turkey
834 Animals felines_hellcat
201 Animals felines_housecat
208 Animals fowl_normal_hen
208 Animals fowl_normal_hen
81 Animals frogs_bullfrog
205 Animals rodents_rabbit_cottontail
835 Animals rodents_rabbit_jack
205 Animals rodents_rabbit_cottontail
238 Animals rodents_rat_sewer
843 Animals rodents_rat_town
52 Animals serpents_snake
837 Animals serpents_snake_ice
838 Animals serpents_snake_lava
##Age of Shadows Stuff
#Body Type Model
300 Monsters crystal_elemental
301 Monsters treefellow
302 Monsters skittering_hopper
303 Monsters devourer
304 Monsters flesh_golem
305 Monsters gore_fiend
306 Monsters impaler
307 Monsters gibberling
308 Monsters bonedemon
309 Monsters patchskeleton
310 Monsters wailingbanshee
311 Monsters shadow_knight
312 Monsters abysmal_horror
313 Monsters Darknight_Creeper
314 Monsters ravager
315 Monsters flesh_renderer
316 Monsters wander
317 Monsters vampire_bat
318 Monsters demon_knight
319 Monsters mound_of_maggots
777 Monsters doppleganger
784 Monsters arcane_demon
785 Monsters four_armed_demon
788 Monsters sphinx
789 Monsters quagmire
930 Equipment Weapon_Scythe
931 Equipment Weapon_Bone_Harvester
932 Equipment Weapon_Scepter
933 Equipment Weapon_Bladed_Staff
934 Equipment Weapon_Pike
935 Equipment Weapon_Double_Bladed_Staff
936 Equipment Weapon_Lance
937 Equipment Weapon_Crescent_Blade
938 Equipment Weapon_Composite_Bow
939 Equipment Weapon_Repeating_Crossbow
940 Equipment Weapon_Paladin_Sword
##Japanese Wearables Contest Stuff
#Body Type Model
481 Equipment H_Male_Hat_Bandana
482 Equipment H_Male_Boots
483 Equipment H_Male_Cloak
484 Equipment H_Male_Kilt
485 Equipment H_Male_Dress_Fancy
486 Equipment H_Male_Shirt_Tunic
1481 Equipment H_Female_Hat_Bandana
1482 Equipment H_Female_Boots
1483 Equipment H_Female_Cloak
1484 Equipment H_Female_Kilt
1485 Equipment H_Female_Dress_Fancy
1486 Equipment H_Female_Shirt_Tunic

5
Projects/Server/Attributes.cs
View file

@ -9,11 +9,6 @@ namespace Server
{ {
} }
[AttributeUsage(AttributeTargets.Property)]
public class BodyAttribute : Attribute
{
}
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)] [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
public class PropertyObjectAttribute : Attribute public class PropertyObjectAttribute : Attribute
{ {

21
Projects/Server/Items/Item.cs
View file

@ -1051,6 +1051,11 @@ namespace Server
} }
} }
public void MoveToWorld(WorldLocation worldLocation)
{
MoveToWorld(worldLocation.Location, worldLocation.Map);
}
/// <summary> /// <summary>
/// Moves the Item to a given <paramref name="location" /> and <paramref name="map" />. /// Moves the Item to a given <paramref name="location" /> and <paramref name="map" />.
/// </summary> /// </summary>
@ -2306,18 +2311,12 @@ namespace Server
doubled = false; doubled = false;
if (m_Amount <= 1) itemID = m_Amount switch
{ {
itemID = coinBase; <= 1 => coinBase,
} <= 5 => coinBase + 1,
else if (m_Amount <= 5) _ => coinBase + 2
{ };
itemID = coinBase + 1;
}
else // m_Amount > 5
{
itemID = coinBase + 2;
}
} }
var bounds = ItemBounds.Table[itemID & 0x3FFF]; var bounds = ItemBounds.Table[itemID & 0x3FFF];

42
Projects/Server/Mobiles/Body.cs
View file

@ -14,7 +14,8 @@ namespace Server
Equipment Equipment
} }
public readonly struct Body : IEquatable<object>, IEquatable<Body>, IEquatable<int> [Parsable]
public readonly struct Body : IEquatable<object>, IEquatable<Body>, IEquatable<int>, IComparable<int>, IComparable<Body>
{ {
private static readonly BodyType[] m_Types = Array.Empty<BodyType>(); private static readonly BodyType[] m_Types = Array.Empty<BodyType>();
@ -70,38 +71,13 @@ namespace Server
&& BodyID != 695 && BodyID != 695
&& BodyID != 970; && BodyID != 970;
public bool IsGargoyle => BodyID == 666 public bool IsGargoyle => BodyID is 666 or 667 or 694 or 695;
|| BodyID == 667
|| BodyID == 694
|| BodyID == 695;
public bool IsMale => BodyID == 183 public bool IsMale => BodyID is 183 or 185 or 400 or 402 or 605 or 607 or 666 or 694 or 750;
|| BodyID == 185
|| BodyID == 400
|| BodyID == 402
|| BodyID == 605
|| BodyID == 607
|| BodyID == 666
|| BodyID == 694
|| BodyID == 750;
public bool IsFemale => BodyID == 184 public bool IsFemale => BodyID is 184 or 186 or 401 or 403 or 606 or 608 or 667 or 695 or 751;
|| BodyID == 186
|| BodyID == 401
|| BodyID == 403
|| BodyID == 606
|| BodyID == 608
|| BodyID == 667
|| BodyID == 695
|| BodyID == 751;
public bool IsGhost => BodyID == 402 public bool IsGhost => BodyID is 402 or 403 or 607 or 608 or 694 or 695 or 970;
|| BodyID == 403
|| BodyID == 607
|| BodyID == 608
|| BodyID == 694
|| BodyID == 695
|| BodyID == 970;
public bool IsMonster => BodyID >= 0 public bool IsMonster => BodyID >= 0
&& BodyID < m_Types.Length && BodyID < m_Types.Length
@ -151,5 +127,11 @@ namespace Server
public static bool operator <(Body l, Body r) => l.BodyID < r.BodyID; public static bool operator <(Body l, Body r) => l.BodyID < r.BodyID;
public static bool operator <=(Body l, Body r) => l.BodyID <= r.BodyID; public static bool operator <=(Body l, Body r) => l.BodyID <= r.BodyID;
public int CompareTo(Body other) => BodyID.CompareTo(other.BodyID);
public int CompareTo(int other) => BodyID.CompareTo(other);
public static Body Parse(string value) => Utility.ToInt32(value);
} }
} }

9
Projects/Server/Mobiles/Mobile.cs
View file

@ -1702,7 +1702,6 @@ namespace Server
} }
} }
[Body]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public Body Body public Body Body
{ {
@ -1721,14 +1720,6 @@ namespace Server
} }
} }
[Body]
[CommandProperty(AccessLevel.GameMaster)]
public int BodyValue
{
get => Body.BodyID;
set => Body = value;
}
[CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)] [CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)]
public Point3D LogoutLocation { get; set; } public Point3D LogoutLocation { get; set; }

2
Projects/Server/Network/Packets/OutgoingEntityPackets.cs
View file

@ -119,7 +119,7 @@ namespace Server.Network
else if (entity is Mobile mobile) else if (entity is Mobile mobile)
{ {
type = 1; type = 1;
gfx = mobile.BodyValue; gfx = mobile.Body;
hue = mobile.Hue; hue = mobile.Hue;
flags = mobile.GetPacketFlags(true); flags = mobile.GetPacketFlags(true);
} }

2
Projects/UOContent/Engines/Factions/Mobiles/Vendors/BaseFactionVendor.cs
View file

@ -13,7 +13,7 @@ namespace Server.Factions
Frozen = true; Frozen = true;
CantWalk = true; CantWalk = true;
Female = false; Female = false;
BodyValue = 400; Body = 400;
Name = NameList.RandomName("male"); Name = NameList.RandomName("male");
RangeHome = 0; RangeHome = 0;

8
Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs
View file

@ -101,7 +101,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Apprentice Necromancer"; Title = "the Apprentice Necromancer";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83FD; Hue = 0x83FD;
HairItemID = 0x2048; HairItemID = 0x2048;
HairHue = 0x463; HairHue = 0x463;
@ -146,7 +146,7 @@ namespace Server.Engines.MLQuests.Definitions
public Frederic() public Frederic()
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
BodyValue = 0x1A; Body = 0x1A;
Hue = 0x455; Hue = 0x455;
Frozen = true; Frozen = true;
@ -184,7 +184,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Alchemist"; Title = "the Alchemist";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -226,7 +226,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Blacksmith"; Title = "the Blacksmith";
BodyValue = 0x190; Body = 0x190;
Hue = 0x8409; Hue = 0x8409;
FacialHairItemID = 0x2041; FacialHairItemID = 0x2041;
FacialHairHue = 0x45E; FacialHairHue = 0x45E;

6
Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs
View file

@ -75,7 +75,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the student"; Title = "the student";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -119,7 +119,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the cook"; Title = "the cook";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -171,7 +171,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the student"; Title = "the student";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

2
Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs
View file

@ -114,7 +114,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Architect's Daughter"; Title = "the Architect's Daughter";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

96
Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs
View file

@ -2013,7 +2013,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the guard"; Title = "the guard";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2079,7 +2079,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the guard"; Title = "the guard";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2146,7 +2146,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the guard"; Title = "the guard";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2211,7 +2211,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the soil nurturer"; Title = "the soil nurturer";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2277,7 +2277,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2342,7 +2342,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the arcanist"; Title = "the arcanist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2405,7 +2405,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the arborist"; Title = "the arborist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2476,7 +2476,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the arborist"; Title = "the arborist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2539,7 +2539,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the expeditionist"; Title = "the expeditionist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2616,7 +2616,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2675,7 +2675,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2738,7 +2738,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the soil nurturer"; Title = "the soil nurturer";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2799,7 +2799,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the expeditionist"; Title = "the expeditionist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2875,7 +2875,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the expeditionist"; Title = "the expeditionist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -2958,7 +2958,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the guard"; Title = "the guard";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3025,7 +3025,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the grape tender"; Title = "the grape tender";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3094,7 +3094,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the grape tender"; Title = "the grape tender";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3156,7 +3156,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the trinket weaver"; Title = "the trinket weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3225,7 +3225,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the trinket weaver"; Title = "the trinket weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3288,7 +3288,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the bark weaver"; Title = "the bark weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3350,7 +3350,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the bark weaver"; Title = "the bark weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3399,7 +3399,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the bowcrafter"; Title = "the bowcrafter";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3471,7 +3471,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the bowcrafter"; Title = "the bowcrafter";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3533,7 +3533,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the metal weaver"; Title = "the metal weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3602,7 +3602,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the metal weaver"; Title = "the metal weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3666,7 +3666,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the cloth weaver"; Title = "the cloth weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3729,7 +3729,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the cloth weaver"; Title = "the cloth weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3791,7 +3791,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the expeditionist"; Title = "the expeditionist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3854,7 +3854,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the expeditionist"; Title = "the expeditionist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3915,7 +3915,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -3959,7 +3959,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4016,7 +4016,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4059,7 +4059,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4107,7 +4107,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4152,7 +4152,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4197,7 +4197,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the healer"; Title = "the healer";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4240,7 +4240,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the healer"; Title = "the healer";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4283,7 +4283,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the thaumaturgist"; Title = "the thaumaturgist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4327,7 +4327,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the arcanist"; Title = "the arcanist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4377,7 +4377,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4420,7 +4420,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the arborist"; Title = "the arborist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4472,7 +4472,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the arborist"; Title = "the arborist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4528,7 +4528,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4579,7 +4579,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4643,7 +4643,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the thaumaturgist"; Title = "the thaumaturgist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4698,7 +4698,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4752,7 +4752,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -4807,7 +4807,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

2
Projects/UOContent/Engines/ML Quests/Definitions/Heritage.cs
View file

@ -281,7 +281,7 @@ namespace Server.Engines.MLQuests.Definitions
public Enigma() public Enigma()
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
BodyValue = 788; Body = 788;
BaseSoundID = 0x3EE; BaseSoundID = 0x3EE;
InitStats(100, 100, 25); InitStats(100, 100, 25);

4
Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs
View file

@ -61,7 +61,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Beggar"; Title = "the Beggar";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -104,7 +104,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Noble"; Title = "the Noble";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

4
Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs
View file

@ -233,7 +233,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the trader"; Title = "the trader";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -283,7 +283,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the tinker"; Title = "the tinker";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

2
Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs
View file

@ -33,7 +33,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Fierce"; Title = "the Fierce";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

6
Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs
View file

@ -201,7 +201,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Mistress of Admissions"; Title = "the Mistress of Admissions";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -247,7 +247,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Mayor"; Title = "the Mayor";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -304,7 +304,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the necromancer"; Title = "the necromancer";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = 0x83E8; Hue = 0x83E8;
InitStats(100, 100, 25); InitStats(100, 100, 25);

48
Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs
View file

@ -648,7 +648,7 @@ namespace Server.Engines.MLQuests.Definitions
public Aelorn() public Aelorn()
{ {
Title = "the Chivalry Instructor"; Title = "the Chivalry Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x47D; HairHue = 0x47D;
@ -713,7 +713,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Wrestling Instructor"; Title = "the Wrestling Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203D; HairItemID = 0x203D;
HairHue = 0x455; HairHue = 0x455;
@ -772,7 +772,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Mace Fighting Instructor"; Title = "the Mace Fighting Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x455; HairHue = 0x455;
@ -849,7 +849,7 @@ namespace Server.Engines.MLQuests.Definitions
public Robyn() public Robyn()
{ {
Title = "the Archery Instructor"; Title = "the Archery Instructor";
BodyValue = 0x191; Body = 0x191;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x47D; HairHue = 0x47D;
@ -932,7 +932,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Fencer Instructor"; Title = "the Fencer Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x455; HairHue = 0x455;
@ -1016,7 +1016,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Tactics Instructor"; Title = "the Tactics Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203B; HairItemID = 0x203B;
HairHue = 0x44E; HairHue = 0x44E;
@ -1081,7 +1081,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Swordsmanship Instructor"; Title = "the Swordsmanship Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83FA; Hue = 0x83FA;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x8A7; HairHue = 0x8A7;
@ -1142,7 +1142,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Parrying Instructor"; Title = "the Parrying Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x8374; Hue = 0x8374;
HairItemID = 0; HairItemID = 0;
@ -1223,7 +1223,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Resisting Spells Instructor"; Title = "the Resisting Spells Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203D; HairItemID = 0x203D;
HairHue = 0x457; HairHue = 0x457;
@ -1279,7 +1279,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Meditation Instructor"; Title = "the Meditation Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83F5; Hue = 0x83F5;
HairItemID = 0x203B; HairItemID = 0x203B;
HairHue = 0x455; HairHue = 0x455;
@ -1361,7 +1361,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Inscription Instructor"; Title = "the Inscription Instructor";
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203D; HairItemID = 0x203D;
@ -1418,7 +1418,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Magery Instructor"; Title = "the Magery Instructor";
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
@ -1475,7 +1475,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Evaluating Intelligence Instructor"; Title = "the Evaluating Intelligence Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x455; HairHue = 0x455;
@ -1535,7 +1535,7 @@ namespace Server.Engines.MLQuests.Definitions
public AmeliaYoungstone() public AmeliaYoungstone()
{ {
Title = "the Tinkering Instructor"; Title = "the Tinkering Instructor";
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203D; HairItemID = 0x203D;
@ -1596,7 +1596,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Anatomy Instructor"; Title = "the Anatomy Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EC; Hue = 0x83EC;
HairItemID = 0x203C; HairItemID = 0x203C;
HairHue = 0x477; HairHue = 0x477;
@ -1656,7 +1656,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Healing Instructor"; Title = "the Healing Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203B; HairItemID = 0x203B;
HairHue = 0x477; HairHue = 0x477;
@ -1713,7 +1713,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Focus Instructor"; Title = "the Focus Instructor";
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
@ -1845,7 +1845,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Hiding Instructor"; Title = "the Hiding Instructor";
BodyValue = 0xF7; Body = 0xF7;
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1894,7 +1894,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Stealth Instructor"; Title = "the Stealth Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x8403; Hue = 0x8403;
HairItemID = 0x203B; HairItemID = 0x203B;
HairHue = 0x455; HairHue = 0x455;
@ -1954,7 +1954,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Tracking Instructor"; Title = "the Tracking Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203B; HairItemID = 0x203B;
HairHue = 0x47D; HairHue = 0x47D;
@ -2093,7 +2093,7 @@ namespace Server.Engines.MLQuests.Definitions
public Mulcivikh() public Mulcivikh()
{ {
Title = "the Necromancy Instructor"; Title = "the Necromancy Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203D; HairItemID = 0x203D;
HairHue = 0x457; HairHue = 0x457;
@ -2171,7 +2171,7 @@ namespace Server.Engines.MLQuests.Definitions
public Morganna() public Morganna()
{ {
Title = "the Spirit Speak Instructor"; Title = "the Spirit Speak Instructor";
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203C; HairItemID = 0x203C;
@ -2230,7 +2230,7 @@ namespace Server.Engines.MLQuests.Definitions
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
{ {
Title = "the Miner Instructor"; Title = "the Miner Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x2048; HairItemID = 0x2048;
HairHue = 0x44E; HairHue = 0x44E;
@ -2292,7 +2292,7 @@ namespace Server.Engines.MLQuests.Definitions
public GeorgeHephaestus() public GeorgeHephaestus()
{ {
Title = "the Blacksmith Instructor"; Title = "the Blacksmith Instructor";
BodyValue = 0x190; Body = 0x190;
Hue = 0x83EA; Hue = 0x83EA;
HairItemID = 0x203B; HairItemID = 0x203B;
HairHue = 0x47B; HairHue = 0x47B;

24
Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs
View file

@ -268,7 +268,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the archer trainer"; Title = "the archer trainer";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -346,7 +346,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the archer"; Title = "the archer";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -408,7 +408,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the chef"; Title = "the chef";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -468,7 +468,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the servant"; Title = "the servant";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -524,7 +524,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the blacksmith trainer"; Title = "the blacksmith trainer";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -592,7 +592,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the miner"; Title = "the miner";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -645,7 +645,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the carpenter"; Title = "the carpenter";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -703,7 +703,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the mage"; Title = "the mage";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -759,7 +759,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the tinker"; Title = "the tinker";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -804,7 +804,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the fisher"; Title = "the fisher";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -862,7 +862,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the courier"; Title = "the courier";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -922,7 +922,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Lumberjack"; Title = "the Lumberjack";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

20
Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs
View file

@ -767,7 +767,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the bowcrafter"; Title = "the bowcrafter";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -834,7 +834,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the metal weaver"; Title = "the metal weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -892,7 +892,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the cloth weaver"; Title = "the cloth weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -953,7 +953,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the guard"; Title = "the guard";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1025,7 +1025,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1082,7 +1082,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1150,7 +1150,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the cook"; Title = "the cook";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1213,7 +1213,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the thaumaturgist"; Title = "the thaumaturgist";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1274,7 +1274,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the bark weaver"; Title = "the bark weaver";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -1320,7 +1320,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the wise"; Title = "the wise";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25D; Body = 0x25D;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

2
Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs
View file

@ -104,7 +104,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the keeper of tradition"; Title = "the keeper of tradition";
Race = Race.Elf; Race = Race.Elf;
BodyValue = 0x25E; Body = 0x25E;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

4
Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs
View file

@ -92,7 +92,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Tortured Artist"; Title = "the Tortured Artist";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x190; Body = 0x190;
Female = false; Female = false;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);
@ -139,7 +139,7 @@ namespace Server.Engines.MLQuests.Definitions
{ {
Title = "the Bride"; Title = "the Bride";
Race = Race.Human; Race = Race.Human;
BodyValue = 0x191; Body = 0x191;
Female = true; Female = true;
Hue = Race.RandomSkinHue(); Hue = Race.RandomSkinHue();
InitStats(100, 100, 25); InitStats(100, 100, 25);

2
Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs
View file

@ -299,7 +299,7 @@ namespace Server.Mobiles
public void CloneBody(Mobile from) public void CloneBody(Mobile from)
{ {
Name = from.Name; Name = from.Name;
BodyValue = from.BodyValue; Body = from.Body;
Female = from.Female; Female = from.Female;
HairItemID = from.HairItemID; HairItemID = from.HairItemID;
FacialHairItemID = from.FacialHairItemID; FacialHairItemID = from.FacialHairItemID;

4
Projects/UOContent/Gumps/PlayerVendorGumps.cs
View file

@ -1019,12 +1019,12 @@ namespace Server.Gumps
{ {
if (m_Vendor.Female) if (m_Vendor.Female)
{ {
m_Vendor.BodyValue = 400; m_Vendor.Body = 400;
m_Vendor.Female = false; m_Vendor.Female = false;
} }
else else
{ {
m_Vendor.BodyValue = 401; m_Vendor.Body = 401;
m_Vendor.Female = true; m_Vendor.Female = true;
m_Vendor.FacialHairItemID = 0; m_Vendor.FacialHairItemID = 0;

21
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

@ -471,13 +471,32 @@ namespace Server.Gumps
private static bool HasAttribute(Type type, Type check, bool inherit) => private static bool HasAttribute(Type type, Type check, bool inherit) =>
type.GetCustomAttributes(check, inherit).Length > 0; type.GetCustomAttributes(check, inherit).Length > 0;
private static bool HasImplicitCastTo(Type type, Type check)
{
foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.Static))
{
if (method.Name != "op_Implicit" || !IsType(method.ReturnType, check))
{
continue;
}
var parameters = method.GetParameters();
if (parameters.Length == 1 && IsType(parameters[0].ParameterType, type))
{
return true;
}
}
return false;
}
private static bool IsType(Type type, Type check) => type == check || type.IsSubclassOf(check); private static bool IsType(Type type, Type check) => type == check || type.IsSubclassOf(check);
private static bool IsType(Type type, Type[] check) private static bool IsType(Type type, Type[] check)
{ {
for (var i = 0; i < check.Length; ++i) for (var i = 0; i < check.Length; ++i)
{ {
if (IsType(type, check[i])) if (IsType(type, check[i]) || HasImplicitCastTo(type, check[i]))
{ {
return true; return true;
} }

395
Projects/UOContent/Gumps/Props/SetBodyGump.cs
View file

@ -1,395 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Server.Commands;
using Server.Network;
namespace Server.Gumps
{
public enum ModelBodyType
{
Invalid = -1,
Monsters,
Sea,
Animals,
Human,
Equipment
}
public class SetBodyGump : Gump
{
private const int LabelColor32 = 0xFFFFFF;
private const int SelectedColor32 = 0x8080FF;
private const int TextColor32 = 0xFFFFFF;
private static List<InternalEntry> m_Monster, m_Animal, m_Sea, m_Human;
private readonly Mobile m_Mobile;
private readonly object m_Object;
private readonly List<InternalEntry> m_OurList;
private readonly int m_OurPage;
private readonly ModelBodyType m_OurType;
private readonly PropertyInfo m_Property;
private readonly PropertiesGump m_PropertiesGump;
public SetBodyGump(
PropertyInfo prop, Mobile mobile, object o, PropertiesGump propertiesGump,
int ourPage = 0, List<InternalEntry> ourList = null, ModelBodyType ourType = ModelBodyType.Invalid
)
: base(20, 30)
{
m_PropertiesGump = propertiesGump;
m_Property = prop;
m_Mobile = mobile;
m_Object = o;
m_OurPage = ourPage;
m_OurList = ourList;
m_OurType = ourType;
AddPage(0);
AddBackground(0, 0, 525, 328, 5054);
AddImageTiled(10, 10, 505, 20, 0xA40);
AddAlphaRegion(10, 10, 505, 20);
AddImageTiled(10, 35, 505, 283, 0xA40);
AddAlphaRegion(10, 35, 505, 283);
AddTypeButton(10, 10, 1, "Monster", ModelBodyType.Monsters);
AddTypeButton(130, 10, 2, "Animal", ModelBodyType.Animals);
AddTypeButton(250, 10, 3, "Marine", ModelBodyType.Sea);
AddTypeButton(370, 10, 4, "Human", ModelBodyType.Human);
AddImage(480, 12, 0x25EA);
AddImage(497, 12, 0x25E6);
if (ourList == null)
{
AddLabel(15, 40, 0x480, "Choose a body type above.");
}
else if (ourList.Count == 0)
{
AddLabel(15, 40, 0x480, "The server must have UO:3D installed to use this feature.");
}
else
{
for (int i = 0, index = ourPage * 12; i < 12 && index >= 0 && index < ourList.Count; ++i, ++index)
{
var entry = ourList[index];
var itemID = entry.ItemID;
var bounds = ItemBounds.Table[itemID & 0x3FFF];
var x = 15 + i % 4 * 125;
var y = 40 + i / 4 * 93;
AddItem(x + (120 - bounds.Width) / 2 - bounds.X, y + (69 - bounds.Height) / 2 - bounds.Y, itemID);
AddButton(x + 6, y + 66, 0x98D, 0x98D, 7 + index);
x += 6;
y += 67;
AddHtml(x + 0, y - 1, 108, 21, Center(entry.DisplayName));
AddHtml(x + 0, y + 1, 108, 21, Center(entry.DisplayName));
AddHtml(x - 1, y + 0, 108, 21, Center(entry.DisplayName));
AddHtml(x + 1, y + 0, 108, 21, Center(entry.DisplayName));
AddHtml(x + 0, y + 0, 108, 21, Color(Center(entry.DisplayName), TextColor32));
}
if (ourPage > 0)
{
AddButton(480, 12, 0x15E3, 0x15E7, 5);
}
if ((ourPage + 1) * 12 < ourList.Count)
{
AddButton(497, 12, 0x15E1, 0x15E5, 6);
}
}
}
public string Center(string text) => $"<CENTER>{text}</CENTER>";
public string Color(string text, int color) => $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
public void AddTypeButton(int x, int y, int buttonID, string text, ModelBodyType type)
{
var isSelection = m_OurType == type;
AddButton(x, y - 1, isSelection ? 4006 : 4005, 4007, buttonID);
AddHtml(x + 35, y, 200, 20, Color(text, isSelection ? SelectedColor32 : LabelColor32));
}
public override void OnResponse(NetState sender, RelayInfo info)
{
var index = info.ButtonID - 1;
if (index == -1)
{
m_PropertiesGump.SendPropertiesGump();
}
else if (index >= 0 && index < 4)
{
if (m_Monster == null)
{
LoadLists();
}
ModelBodyType type;
List<InternalEntry> list;
switch (index)
{
default:
type = ModelBodyType.Monsters;
list = m_Monster;
break;
case 1:
type = ModelBodyType.Animals;
list = m_Animal;
break;
case 2:
type = ModelBodyType.Sea;
list = m_Sea;
break;
case 3:
type = ModelBodyType.Human;
list = m_Human;
break;
}
m_Mobile.SendGump(new SetBodyGump(m_Property, m_Mobile, m_Object, m_PropertiesGump, 0, list, type));
}
else if (m_OurList != null)
{
index -= 4;
if (index == 0 && m_OurPage > 0)
{
m_Mobile.SendGump(
new SetBodyGump(
m_Property,
m_Mobile,
m_Object,
m_PropertiesGump,
m_OurPage - 1,
m_OurList,
m_OurType
)
);
}
else if (index == 1 && (m_OurPage + 1) * 12 < m_OurList.Count)
{
m_Mobile.SendGump(
new SetBodyGump(
m_Property,
m_Mobile,
m_Object,
m_PropertiesGump,
m_OurPage + 1,
m_OurList,
m_OurType
)
);
}
else
{
index -= 2;
if (index >= 0 && index < m_OurList.Count)
{
try
{
var entry = m_OurList[index];
CommandLogging.LogChangeProperty(m_Mobile, m_Object, m_Property.Name, entry.Body.ToString());
m_Property.SetValue(m_Object, entry.Body, null);
m_PropertiesGump.OnValueChanged(m_Object, m_Property);
}
catch
{
m_Mobile.SendMessage("An exception was caught. The property may not have changed.");
}
m_Mobile.SendGump(
new SetBodyGump(
m_Property,
m_Mobile,
m_Object,
m_PropertiesGump,
m_OurPage,
m_OurList,
m_OurType
)
);
}
}
}
}
public static List<BodyEntry> LoadBodies()
{
var list = new List<BodyEntry>();
var path = Path.Combine(Core.BaseDirectory, "Data/models.txt");
if (File.Exists(path))
{
using var ip = new StreamReader(path);
string line;
while ((line = ip.ReadLine()) != null)
{
line = line.Trim();
if (line.Length == 0 || line.StartsWithOrdinal("#"))
{
continue;
}
var split = line.Split('\t');
if (split.Length >= 9)
{
Body body = Utility.ToInt32(split[0]);
var type = (ModelBodyType)Utility.ToInt32(split[1]);
var name = split[8];
var entry = new BodyEntry(body, type, name);
if (!list.Contains(entry))
{
list.Add(entry);
}
}
}
}
return list;
}
private static void LoadLists()
{
m_Monster = new List<InternalEntry>();
m_Animal = new List<InternalEntry>();
m_Sea = new List<InternalEntry>();
m_Human = new List<InternalEntry>();
var entries = LoadBodies();
for (var i = 0; i < entries.Count; ++i)
{
var oldEntry = entries[i];
var bodyID = oldEntry.Body.BodyID;
if (((Body)bodyID).IsEmpty)
{
continue;
}
List<InternalEntry> list;
switch (oldEntry.BodyType)
{
default: continue;
case ModelBodyType.Monsters:
list = m_Monster;
break;
case ModelBodyType.Animals:
list = m_Animal;
break;
case ModelBodyType.Sea:
list = m_Sea;
break;
case ModelBodyType.Human:
list = m_Human;
break;
}
var itemID = ShrinkTable.Lookup(bodyID, -1);
if (itemID != -1)
{
list.Add(new InternalEntry(bodyID, itemID, oldEntry.Name));
}
}
m_Monster.Sort();
m_Animal.Sort();
m_Sea.Sort();
m_Human.Sort();
}
public class InternalEntry : IComparable<InternalEntry>
{
private static readonly string[] m_GroupNames =
{
"ogres_", "ettins_", "walking_dead_", "gargoyles_",
"orcs_", "flails_", "daemons_", "arachnids_",
"dragons_", "elementals_", "serpents_", "gazers_",
"liche_", "spirits_", "harpies_", "headless_",
"lizard_race_", "mongbat_", "rat_race_", "scorpions_",
"trolls_", "slimes_", "skeletons_", "ethereals_",
"terathan_", "imps_", "cyclops_", "krakens_",
"frogs_", "ophidians_", "centaurs_", "mages_",
"fey_race_", "genies_", "paladins_", "shadowlords_",
"succubi_", "lizards_", "rodents_", "birds_",
"bovines_", "bruins_", "canines_", "deer_",
"equines_", "felines_", "fowl_", "gorillas_",
"kirin_", "llamas_", "ostards_", "porcines_",
"ruminants_", "walrus_", "dolphins_", "sea_horse_",
"sea_serpents_", "character_", "h_", "titans_"
};
public InternalEntry(int body, int itemID, string name)
{
Body = body;
ItemID = itemID;
Name = name;
DisplayName = name.ToLower();
for (var i = 0; i < m_GroupNames.Length; ++i)
{
if (DisplayName.StartsWithOrdinal(m_GroupNames[i]))
{
DisplayName = DisplayName[m_GroupNames[i].Length..];
break;
}
}
DisplayName = DisplayName.Replace('_', ' ');
}
public int Body { get; }
public int ItemID { get; }
public string Name { get; }
public string DisplayName { get; }
public int CompareTo(InternalEntry comp)
{
var v = string.CompareOrdinal(Name, comp.Name);
return v == 0 ? Body.CompareTo(comp.Body) : v;
}
}
public record BodyEntry
{
public BodyEntry(Body body, ModelBodyType bodyType, string name)
{
Body = body;
BodyType = bodyType;
Name = name;
}
public Body Body { get; }
public ModelBodyType BodyType { get; }
public string Name { get; }
}
}
}

36
Projects/UOContent/Gumps/Props/SetGump.cs
View file

@ -19,7 +19,7 @@ namespace Server.Gumps
private readonly Mobile m_Mobile; private readonly Mobile m_Mobile;
private readonly object m_Object; private readonly object m_Object;
private readonly PropertyInfo m_Property; private readonly PropertyInfo m_Property;
private PropertiesGump m_PropertiesGump; private readonly PropertiesGump m_PropertiesGump;
public SetGump(PropertyInfo prop, Mobile from, object o, PropertiesGump propertiesGump) : base(GumpOffsetX, GumpOffsetY) public SetGump(PropertyInfo prop, Mobile from, object o, PropertiesGump propertiesGump) : base(GumpOffsetX, GumpOffsetY)
{ {
@ -30,7 +30,6 @@ namespace Server.Gumps
var canNull = !prop.PropertyType.IsValueType; var canNull = !prop.PropertyType.IsValueType;
var canDye = prop.IsDefined(typeof(HueAttribute), false); var canDye = prop.IsDefined(typeof(HueAttribute), false);
var isBody = prop.IsDefined(typeof(BodyAttribute), false);
var val = prop.GetValue(m_Object, null); var val = prop.GetValue(m_Object, null);
var initialText = val switch var initialText = val switch
@ -46,16 +45,14 @@ namespace Server.Gumps
0, 0,
0, 0,
BackWidth, BackWidth,
BackHeight + (canNull ? EntryHeight + OffsetSize : 0) + (canDye ? EntryHeight + OffsetSize : 0) + BackHeight + (canNull ? EntryHeight + OffsetSize : 0) + (canDye ? EntryHeight + OffsetSize : 0),
(isBody ? EntryHeight + OffsetSize : 0),
BackGumpID BackGumpID
); );
AddImageTiled( AddImageTiled(
BorderSize, BorderSize,
BorderSize, BorderSize,
TotalWidth - (OldStyle ? SetWidth + OffsetSize : 0), TotalWidth - (OldStyle ? SetWidth + OffsetSize : 0),
TotalHeight + (canNull ? EntryHeight + OffsetSize : 0) + (canDye ? EntryHeight + OffsetSize : 0) + TotalHeight + (canNull ? EntryHeight + OffsetSize : 0) + (canDye ? EntryHeight + OffsetSize : 0),
(isBody ? EntryHeight + OffsetSize : 0),
OffsetGumpID OffsetGumpID
); );
@ -118,23 +115,6 @@ namespace Server.Gumps
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3); AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3);
} }
if (isBody)
{
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
AddImageTiled(x, y, EntryWidth, EntryHeight, EntryGumpID);
AddLabelCropped(x + TextOffsetX, y, EntryWidth - TextOffsetX, EntryHeight, TextHue, "Body Picker");
x += EntryWidth + OffsetSize;
if (SetGumpID != 0)
{
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
}
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 4);
}
} }
@ -186,16 +166,6 @@ namespace Server.Gumps
m_Mobile.SendHuePicker(new InternalPicker(m_Property, m_Mobile, m_Object, m_PropertiesGump)); m_Mobile.SendHuePicker(new InternalPicker(m_Property, m_Mobile, m_Object, m_PropertiesGump));
break;
}
case 4: // Body Picker
{
toSet = null;
shouldSet = false;
shouldSend = false;
m_Mobile.SendGump(new SetBodyGump(m_Property, m_Mobile, m_Object, m_PropertiesGump));
break; break;
} }
default: default:

2
Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs
View file

@ -107,7 +107,7 @@ namespace Server.Engines.Events
} }
twin.Hue = m_From.Hue; twin.Hue = m_From.Hue;
twin.BodyValue = m_From.BodyValue; twin.Body = m_From.Body;
twin.Kills = m_From.Kills; twin.Kills = m_From.Kills;
var point = RandomPointOneAway(m_From.X, m_From.Y, m_From.Z, m_From.Map); var point = RandomPointOneAway(m_From.X, m_From.Y, m_From.Z, m_From.Map);

6
Projects/UOContent/Mobiles/Animals/Mounts/Nightmare.cs
View file

@ -56,19 +56,19 @@ namespace Server.Mobiles
{ {
case 0: case 0:
{ {
BodyValue = 116; Body = 116;
ItemID = 16039; ItemID = 16039;
break; break;
} }
case 1: case 1:
{ {
BodyValue = 178; Body = 178;
ItemID = 16041; ItemID = 16041;
break; break;
} }
case 2: case 2:
{ {
BodyValue = 179; Body = 179;
ItemID = 16055; ItemID = 16055;
break; break;
} }

4
Projects/UOContent/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -107,13 +107,13 @@ namespace Server.Mobiles
if (m_HasBarding) if (m_HasBarding)
{ {
Hue = CraftResources.GetHue(m_BardingResource); Hue = CraftResources.GetHue(m_BardingResource);
BodyValue = 0x31F; Body = 0x31F;
ItemID = 0x3EBE; ItemID = 0x3EBE;
} }
else else
{ {
Hue = 0x851; Hue = 0x851;
BodyValue = 0x31A; Body = 0x31A;
ItemID = 0x3EBD; ItemID = 0x3EBD;
} }

2
Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs
View file

@ -49,7 +49,7 @@ namespace Server.Mobiles
public override string CorpseName => "a pestilent bandage corpse"; public override string CorpseName => "a pestilent bandage corpse";
// Neither Stratics nor UOGuide have much description // Neither Stratics nor UOGuide have much description
// beyond being a "Grey Mummy". BodyValue, Sound and // beyond being a "Grey Mummy". Body, Sound and
// Hue are all guessed until they can be verified. // Hue are all guessed until they can be verified.
// Loot and Fame/Karma are also guesses at this point. // Loot and Fame/Karma are also guesses at this point.
// //

4
Projects/UOContent/Mobiles/Special/Harrower.cs
View file

@ -51,7 +51,7 @@ namespace Server.Mobiles
public Harrower() : base(AIType.AI_Mage, FightMode.Closest, 18, 1, 0.2, 0.4) public Harrower() : base(AIType.AI_Mage, FightMode.Closest, 18, 1, 0.2, 0.4)
{ {
Instances.Add(this); Instances.Add(this);
BodyValue = 146; Body = 146;
SetStr(900, 1000); SetStr(900, 1000);
SetDex(125, 135); SetDex(125, 135);
@ -145,7 +145,7 @@ namespace Server.Mobiles
m_TrueForm = true; m_TrueForm = true;
Name = "the true harrower"; Name = "the true harrower";
BodyValue = 780; Body = 780;
Hue = 0x497; Hue = 0x497;
Hits = HitsMax; Hits = HitsMax;

4
Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs
View file

@ -206,7 +206,7 @@ namespace Server.Mobiles
{ {
base.InitBody(); base.InitBody();
if (BodyValue == 0x340 || BodyValue == 0x402) if (Body == 0x340 || Body == 0x402)
{ {
Hue = 0; Hue = 0;
} }
@ -1050,7 +1050,7 @@ namespace Server.Mobiles
AddButton(130, 120, 4005, 4007, GetButtonID(5, 0)); AddButton(130, 120, 4005, 4007, GetButtonID(5, 0));
AddHtml(170, 120, 120, 20, "Title"); AddHtml(170, 120, 120, 20, "Title");
if (m_Barkeeper.BodyValue != 0x340 && m_Barkeeper.BodyValue != 0x402) if (m_Barkeeper.Body != 0x340 && m_Barkeeper.Body != 0x402)
{ {
AddButton(130, 200, 4005, 4007, GetButtonID(5, 1)); AddButton(130, 200, 4005, 4007, GetButtonID(5, 1));
AddHtml(170, 200, 120, 20, "Appearance"); AddHtml(170, 200, 120, 20, "Appearance");

1
Projects/UOContent/Utilities/Types.cs
View file

@ -79,7 +79,6 @@ namespace Server
OfByte OfByte
}; };
public static readonly Type[] ParseTypes = { OfString }; public static readonly Type[] ParseTypes = { OfString };
public static bool IsSerial(Type t) => t == OfSerial; public static bool IsSerial(Type t) => t == OfSerial;