From c023f84bdfa9dda15f73ea4c1be6a71dc06e9b65 Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Tue, 9 Sep 2025 18:20:57 -0500
Subject: [PATCH 1/3] Animals Update

- [ADD] Added skittering hopper, vorpal bunny, white wolf,
- [ADD] Added animals aos/lbr dfn's
---
 data/dfndata/npc/animals.dfn             | 1231 ++++++++++++----------
 data/dfndata/npc/npc_aos/animals_aos.dfn |  806 ++++++++++++++
 data/dfndata/npc/npc_lbr/animals_lbr.dfn |  600 +++++++++++
 3 files changed, 2058 insertions(+), 579 deletions(-)
 create mode 100644 data/dfndata/npc/npc_aos/animals_aos.dfn
 create mode 100644 data/dfndata/npc/npc_lbr/animals_lbr.dfn

diff --git a/data/dfndata/npc/animals.dfn b/data/dfndata/npc/animals.dfn
index 2106d9615..02912a653 100644
--- a/data/dfndata/npc/animals.dfn
+++ b/data/dfndata/npc/animals.dfn
@@ -7,32 +7,13 @@ NPCWANDER=4
 FX2=20
 }
 
-//------------------------------------------------------------------------------------------------//
-
-[brownbear]
+[base_brownbear]
 {
+GET=base_animals
 NAME=#//a bear
 ID=0x00a7
-DIRECTION=RND
-BACKPACK
-STR=76 100
-DEX=26 45
-INT=23 47
-MANAMAX=0
-FAME=450
-MAGICRESISTANCE=200 400
-PARRYING=250 450
-TACTICS=400 600
-WRESTLING=400 600
-DAMAGE=2 12
-DEF=8
-TOPROV=296
-TOPEACE=296 5
-TOTAME=459
 TAMEDHUNGER=600 30
 FOOD=bear
-NPCWANDER=4
-FX2=30
 CARVE=3
 RUNS
 RACE=8
@@ -40,42 +21,55 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[blackbear]
+[brownbear]
+{
+GETUO=brownbear_lbr
+GETT2A=brownbear_lbr
+GETUOR=brownbear_lbr
+GETTD=brownbear_lbr
+GETLBR=brownbear_lbr
+GETAOS=brownbear_aos
+GETSE=brownbear_aos
+GETML=brownbear_aos
+GETSA=brownbear_aos
+GETHS=brownbear_aos
+GETTOL=brownbear_aos
+}
+
+[base_blackbear]
 {
-GET=brownbear
+GET=base_animals
 NAME=#//a bear
 ID=0x00d3
-DEX=56 75
-INT=11 14
-DAMAGE=2 12
-DEF=8
-TOPROV=310
-TOPEACE=310 5
-TOTAME=351
+TAMEDHUNGER=600 30
+FOOD=bear
+CARVE=3
+RUNS
+RACE=8
+NPCAI=6
+CONTROLSLOTS=1
 }
 
-[boar]
+[blackbear]
 {
+GETUO=blackbear_lbr
+GETT2A=blackbear_lbr
+GETUOR=blackbear_lbr
+GETTD=blackbear_lbr
+GETLBR=blackbear_lbr
+GETAOS=blackbear_aos
+GETSE=blackbear_aos
+GETML=blackbear_aos
+GETSA=blackbear_aos
+GETHS=blackbear_aos
+GETTOL=blackbear_aos
+}
+
+[base_boar]
+{
+GET=base_animals
 NAME=#//a boar
 ID=0x0122
-DIRECTION=RND
-BACKPACK
-STR=25
-DEX=15
-INT=5
-MANAMAX=0
-FAME=300
-MAGICRESISTANCE=900
-PARRYING=950
-TACTICS=500
-WRESTLING=500
-DAMAGE=3 6
-DEF=5
-NPCWANDER=4
-FX2=30
-TOPROV=75
-TOPEACE=75 5
-TOTAME=291
 TAMEDHUNGER=600 30
 FOOD=boar
 CARVE=4
@@ -83,29 +77,27 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[bull]
+[boar]
+{
+GETUO=boar_lbr
+GETT2A=boar_lbr
+GETUOR=boar_lbr
+GETTD=boar_lbr
+GETLBR=boar_lbr
+GETAOS=boar_aos
+GETSE=boar_aos
+GETML=boar_aos
+GETSA=boar_aos
+GETHS=boar_aos
+GETTOL=boar_aos
+}
+
+[base_bull]
 {
+GET=base_animals
 NAME=#//a bull
 ID=0x00e8
 SKINLIST=13
-DIRECTION=RND
-BACKPACK
-STR=77 111
-DEX=56 75
-INT=47 75
-MANAMAX=0
-FAME=600
-MAGICRESISTANCE=180 250
-PARRYING=430 550
-TACTICS=680 850
-WRESTLING=400 58
-DAMAGE=4 9
-DEF=14
-NPCWANDER=4
-FX2=30
-TOPROV=358
-TOPEACE=358 5
-TOTAME=711
 TAMEDHUNGER=600 30
 FOOD=hay
 CARVE=5
@@ -113,29 +105,27 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[bullfrog]
+[bull]
 {
+GETUO=bull_lbr
+GETT2A=bull_lbr
+GETUOR=bull_lbr
+GETTD=bull_lbr
+GETLBR=bull_lbr
+GETAOS=bull_aos
+GETSE=bull_aos
+GETML=bull_aos
+GETSA=bull_aos
+GETHS=bull_aos
+GETTOL=bull_aos
+}
+
+[base_bullfrog]
+{
+GET=base_animals
 NAME=#//a bullfrog
 ID=0x0051
 SKIN=0000
-DIRECTION=RND
-BACKPACK
-STR=46 70
-DEX=6 25
-INT=11 20
-MANAMAX=0
-FAME=350
-MAGICRESISTANCE=250 400
-PARRYING=380 730
-TACTICS=400 600
-WRESTLING=400 600
-DAMAGE=1 2
-DEF=3
-NPCWANDER=4
-FX2=30
-TOPROV=292
-TOPEACE=292 5
-TOTAME=231
 TAMEDHUNGER=600 30
 FOOD=carnivore
 CARVE=6
@@ -144,29 +134,27 @@ CONTROLSLOTS=1
 ORIGIN=t2a
 }
 
-[cat]
+[bullfrog]
 {
+GETUO=bullfrog_lbr
+GETT2A=bullfrog_lbr
+GETUOR=bullfrog_lbr
+GETTD=bullfrog_lbr
+GETLBR=bullfrog_lbr
+GETAOS=bullfrog_aos
+GETSE=bullfrog_aos
+GETML=bullfrog_aos
+GETSA=bullfrog_aos
+GETHS=bullfrog_aos
+GETTOL=bullfrog_aos
+}
+
+[base_cat]
+{
+GET=base_animals
 NAME=#//a cat
 ID=0x00c9
 SKINLIST=13
-DIRECTION=RND
-BACKPACK
-STR=9
-DEX=35
-INT=5
-MANAMAX=0
-HIDING=150 350
-MAGICRESISTANCE=500
-PARRYING=250
-TACTICS=400
-WRESTLING=500
-DAMAGE=1
-DEF=4
-NPCWANDER=4
-FX2=30
-TOPROV=60
-TOPEACE=60 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=carnivore
 RUNS
@@ -176,29 +164,26 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[cougar]
+[cat]
+{
+GETUO=cat_lbr
+GETT2A=cat_lbr
+GETUOR=cat_lbr
+GETTD=cat_lbr
+GETLBR=cat_lbr
+GETAOS=cat_aos
+GETSE=cat_aos
+GETML=cat_aos
+GETSA=cat_aos
+GETHS=cat_aos
+GETTOL=cat_aos
+}
+
+[base_cougar]
 {
+GET=base_animals
 NAME=#//a cougar
 ID=0x003f
-DIRECTION=RND
-BACKPACK
-STR=56 80
-DEX=66 85
-INT=26 50
-MANAMAX=0
-FAME=450
-HIDING=50 150
-MAGICRESISTANCE=150 300
-PARRYING=550 650
-TACTICS=450 600
-WRESTLING=450 600
-DAMAGE=2 12
-DEF=8
-NPCWANDER=4
-FX2=30
-TOPROV=333
-TOPEACE=333 5
-TOTAME=411
 TAMEDHUNGER=600 30
 FOOD=carnivore
 RUNS
@@ -208,28 +193,26 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[cow]
+[cougar]
+{
+GETUO=cougar_lbr
+GETT2A=cougar_lbr
+GETUOR=cougar_lbr
+GETTD=cougar_lbr
+GETLBR=cougar_lbr
+GETAOS=cougar_aos
+GETSE=cougar_aos
+GETML=cougar_aos
+GETSA=cougar_aos
+GETHS=cougar_aos
+GETTOL=cougar_aos
+}
+
+[base_cow]
 {
+GET=base_animals
 NAME=#//a cow
 ID=0x00d8
-DIRECTION=RND
-BACKPACK
-STR=30
-DEX=15
-INT=5
-MANAMAX=0
-FAME=300
-MAGICRESISTANCE=550
-PARRYING=550
-TACTICS=550
-WRESTLING=550
-DAMAGE=1 4
-DEF=5
-NPCWANDER=4
-FX2=30
-TOPROV=66
-TOPEACE=66 5
-TOTAME=111
 TAMEDHUNGER=600 30
 FOOD=cow
 CARVE=10
@@ -238,29 +221,27 @@ SCRIPT=3200
 CONTROLSLOTS=1
 }
 
-[dog]
+[cow]
 {
+GETUO=cow_lbr
+GETT2A=cow_lbr
+GETUOR=cow_lbr
+GETTD=cow_lbr
+GETLBR=cow_lbr
+GETAOS=cow_aos
+GETSE=cow_aos
+GETML=cow_aos
+GETSA=cow_aos
+GETHS=cow_aos
+GETTOL=cow_aos
+}
+
+[base_dog]
+{
+GET=base_animals
 NAME=#//a dog
 ID=0x00d9
 SKINLIST=13
-DIRECTION=RND
-BACKPACK
-STR=27 37
-DEX=28 43
-INT=29 37
-MANAMAX=0
-FAME=300
-MAGICRESISTANCE=220 470
-PARRYING=280 530
-TACTICS=190 310
-FENCING=190 310
-DAMAGE=4 7
-DEF=6
-NPCWANDER=4
-FX2=30
-TOPROV=187
-TOPEACE=187 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=meat
 RUNS
@@ -270,28 +251,26 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[goat]
+[dog]
 {
+GETUO=dog_lbr
+GETT2A=dog_lbr
+GETUOR=dog_lbr
+GETTD=dog_lbr
+GETLBR=dog_lbr
+GETAOS=dog_aos
+GETSE=dog_aos
+GETML=dog_aos
+GETSA=dog_aos
+GETHS=dog_aos
+GETTOL=dog_aos
+}
+
+[base_goat]
+{
+GET=base_animals
 NAME=#//a goat
 ID=0x00d1
-DIRECTION=RND
-BACKPACK
-STR=19
-DEX=15
-INT=5
-MANAMAX=0
-FAME=150
-MAGICRESISTANCE=500
-PARRYING=500
-TACTICS=500
-WRESTLING=500
-DAMAGE=3 4
-DEF=5
-NPCWANDER=4
-FX2=30
-TOPROV=54
-TOPEACE=54 5
-TOTAME=111
 TAMEDHUNGER=600 30
 FOOD=goat
 CARVE=20
@@ -299,28 +278,26 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[gorilla]
+[goat]
 {
+GETUO=goat_lbr
+GETT2A=goat_lbr
+GETUOR=goat_lbr
+GETTD=goat_lbr
+GETLBR=goat_lbr
+GETAOS=goat_aos
+GETSE=goat_aos
+GETML=goat_aos
+GETSA=goat_aos
+GETHS=goat_aos
+GETTOL=goat_aos
+}
+
+[base_gorilla]
+{
+GET=base_animals
 NAME=#//a gorilla
 ID=0x001d
-DIRECTION=RND
-BACKPACK
-STR=53 95
-DEX=36 55
-INT=36 60
-MANAMAX=0
-FAME=450
-MAGICRESISTANCE=450 600
-PARRYING=430 530
-TACTICS=430 580
-WRESTLING=430 580
-DAMAGE=2 12
-DEF=10
-NPCWANDER=4
-FX2=30
-TOPROV=311
-TOPEACE=311 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=gorilla
 CARVE=21
@@ -329,31 +306,27 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[greywolf]
+[gorilla]
 {
+GETUO=gorilla_lbr
+GETT2A=gorilla_lbr
+GETUOR=gorilla_lbr
+GETTD=gorilla_lbr
+GETLBR=gorilla_lbr
+GETAOS=gorilla_aos
+GETSE=gorilla_aos
+GETML=gorilla_aos
+GETSA=gorilla_aos
+GETHS=gorilla_aos
+GETTOL=gorilla_aos
+}
+
+[base_greywolf]
+{
+GET=base_animals
 NAME=#//a grey wolf
 ID=0x0019
 SKIN=0x03e6
-DIRECTION=RND
-BACKPACK
-STR=56 80
-DEX=56 75
-INT=31 55
-MANAMAX=0
-KARMA=0
-FAME=450
-HIDING=450 600
-MAGICRESISTANCE=200 350
-PARRYING=450 550
-TACTICS=450 600
-WRESTLING=450 600
-DAMAGE=2 8
-DEF=9
-NPCWANDER=4
-FX2=30
-TOPROV=302
-TOPEACE=302 5
-TOTAME=531
 TAMEDHUNGER=600 30
 FOOD=meat
 RUNS
@@ -363,33 +336,31 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
+[greywolf]
+{
+GETUO=greywolf_lbr
+GETT2A=greywolf_lbr
+GETUOR=greywolf_lbr
+GETTD=greywolf_lbr
+GETLBR=greywolf_lbr
+GETAOS=greywolf_aos
+GETSE=greywolf_aos
+GETML=greywolf_aos
+GETSA=greywolf_aos
+GETHS=greywolf_aos
+GETTOL=greywolf_aos
+}
+
 [graywolf]
 {
-get=greywolf
+GET=greywolf
 }
 
-[grizbear]
+[base_grizbear]
 {
+GET=base_animals
 NAME=#//a grizzly bear
 ID=0x00D4
-DIRECTION=RND
-BACKPACK
-STR=126 155
-DEX=81 105
-INT=16 40
-MANAMAX=0
-FAME=1000
-MAGICRESISTANCE=250 400
-PARRYING=700 850
-TACTICS=700 1000
-WRESTLING=450 700
-DAMAGE=6 15
-DEF=12
-NPCWANDER=4
-FX2=30
-TOPROV=474
-TOPEACE=474 5
-TOTAME=591
 TAMEDHUNGER=600 30
 FOOD=bear
 CARVE=24
@@ -399,28 +370,31 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[hart]
+[grizbear]
+{
+GETUO=grizbear_lbr
+GETT2A=grizbear_lbr
+GETUOR=grizbear_lbr
+GETTD=grizbear_lbr
+GETLBR=grizbear_lbr
+GETAOS=grizbear_aos
+GETSE=grizbear_aos
+GETML=grizbear_aos
+GETSA=grizbear_aos
+GETHS=grizbear_aos
+GETTOL=grizbear_aos
+}
+
+[grizzlybear]
+{
+GET=grizbear
+}
+
+[base_hart]
 {
+GET=base_animals
 NAME=#//a great hart
 ID=0x00ea
-DIRECTION=RND
-BACKPACK
-STR=41 71
-DEX=47 77
-INT=27 57
-MANAMAX=0
-FAME=300
-MAGICRESISTANCE=270 450
-PARRYING=250 430
-TACTICS=30 48
-WRESTLING=30 48
-DAMAGE=4 10
-DEF=12
-NPCWANDER=4
-FX2=30
-TOPROV=273
-TOPEACE=273 5
-TOTAME=591
 TAMEDHUNGER=600 30
 FOOD=deer
 RUNS
@@ -429,29 +403,37 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[hind]
+[hart]
+{
+GETUO=hart_lbr
+GETT2A=hart_lbr
+GETUOR=hart_lbr
+GETTD=hart_lbr
+GETLBR=hart_lbr
+GETAOS=hart_aos
+GETSE=hart_aos
+GETML=hart_aos
+GETSA=hart_aos
+GETHS=hart_aos
+GETTOL=hart_aos
+}
+
+[greathart]
 {
+GET=hart
+}
+
+[whitehart]
+{
+GET=hart
+NAME=a white hart
+}
+
+[base_hind]
+{
+GET=base_animals
 NAME=#//a hind
 ID=0x00ed
-DIRECTION=RND
-BACKPACK
-STR=21 51
-DEX=47 77
-INT=17 47
-MANAMAX=0
-FAME=300
-HIDING=100 300
-MAGICRESISTANCE=150
-PARRYING=220
-TACTICS=190
-WRESTLING=260
-DAMAGE=4 4
-DEF=4
-NPCWANDER=4
-FX2=30
-TOPROV=182
-TOPEACE=182 5
-TOTAME=231
 TAMEDHUNGER=600 30
 FOOD=deer
 RUNS
@@ -461,63 +443,69 @@ NPCAI=12
 CONTROLSLOTS=1
 }
 
-[jackrabbit]
+[hind]
 {
-GET=rabbit
+GETUO=hind_lbr
+GETT2A=hind_lbr
+GETUOR=hind_lbr
+GETTD=hind_lbr
+GETLBR=hind_lbr
+GETAOS=hind_aos
+GETSE=hind_aos
+GETML=hind_aos
+GETSA=hind_aos
+GETHS=hind_aos
+GETTOL=hind_aos
+}
+
+[base_jackrabbit]
+{
+GET=base_animals
 NAME=5004//a jack rabbit
-STR=15
-DEX=25
-INT=5
-MANAMAX=0
-HIDING=450 600
-DAMAGE=1 2
-DEF=2
-TOPROV=59
-TOPEACE=59 5
 }
 
-[mountaingoat]
+[jackrabbit]
 {
-GET=goat
+GETUO=jackrabbit_lbr
+GETT2A=jackrabbit_lbr
+GETUOR=jackrabbit_lbr
+GETTD=jackrabbit_lbr
+GETLBR=jackrabbit_lbr
+GETAOS=jackrabbit_aos
+GETSE=jackrabbit_aos
+GETML=jackrabbit_aos
+GETSA=jackrabbit_aos
+GETHS=jackrabbit_aos
+GETTOL=jackrabbit_aos
+}
+
+[base_mountaingoat]
+{
+GET=base_animals
 NAME=#//a mountain goat
 ID=0x0058
-STR=22 64
-DEX=56 75
-INT=16 30
-MANAMAX=0
-FAME=300
-DAMAGE=3 7
-DEF=8
-MAGICRESISTANCE=250 300
-PARRYING=450 550
-TACTICS=290 440
-WRESTLING=290 440
-TOPROV=260
-TOPEACE=260 5
 }
 
-[packhorse]
+[mountaingoat]
 {
+GETUO=mountaingoat_lbr
+GETT2A=mountaingoat_lbr
+GETUOR=mountaingoat_lbr
+GETTD=mountaingoat_lbr
+GETLBR=mountaingoat_lbr
+GETAOS=mountaingoat_aos
+GETSE=mountaingoat_aos
+GETML=mountaingoat_aos
+GETSA=mountaingoat_aos
+GETHS=mountaingoat_aos
+GETTOL=mountaingoat_aos
+}
+
+[base_packhorse]
+{
+GET=base_animals
 NAME=#//a pack horse
 ID=0x0123
-DIRECTION=RND
-BACKPACK
-STR=44 120
-DEX=36 55
-INT=6 10
-MANAMAX=0
-STAMINAMAX=81 100
-KARMA=200
-MAGICRESISTANCE=250 300
-PARRYING=350 450
-TACTICS=290 440
-WRESTLING=290 440
-DAMAGE=4 12
-DEF=9
-FX2=30
-TOPROV=329
-TOPEACE=329 5
-TOTAME=291
 TAMEDHUNGER=600 30
 FOOD=horse
 RUNS
@@ -526,28 +514,26 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[packllama]
+[packhorse]
+{
+GETUO=packhorse_lbr
+GETT2A=packhorse_lbr
+GETUOR=packhorse_lbr
+GETTD=packhorse_lbr
+GETLBR=packhorse_lbr
+GETAOS=packhorse_aos
+GETSE=packhorse_aos
+GETML=packhorse_aos
+GETSA=packhorse_aos
+GETHS=packhorse_aos
+GETTOL=packhorse_aos
+}
+
+[base_packllama]
 {
+GET=base_animals
 NAME=#//a pack llama
 ID=0x0124
-DIRECTION=RND
-BACKPACK
-STR=52 80
-DEX=36 55
-INT=16 30
-MANAMAX=0
-STAMINAMAX=86 105
-KARMA=200
-MAGICRESISTANCE=150 200
-PARRYING=350 450
-TACTICS=190 290
-WRESTLING=190 290
-DAMAGE=2 6
-DEF=8
-FX2=30
-TOPROV=242
-TOPEACE=242 5
-TOTAME=291
 TAMEDHUNGER=600 30
 FOOD=horse
 RUNS
@@ -556,29 +542,26 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[panther]
+[packllama]
 {
+GETUO=packllama_lbr
+GETT2A=packllama_lbr
+GETUOR=packllama_lbr
+GETTD=packllama_lbr
+GETLBR=packllama_lbr
+GETAOS=packllama_aos
+GETSE=packllama_aos
+GETML=packllama_aos
+GETSA=packllama_aos
+GETHS=packllama_aos
+GETTOL=packllama_aos
+}
+
+[base_panther]
+{
+GET=base_animals
 NAME=#//a panther
 ID=0x00d6
-DIRECTION=RND
-BACKPACK
-STR=61 85
-DEX=86 105
-INT=26 50
-MANAMAX=0
-FAME=450
-HIDING=150 250
-MAGICRESISTANCE=150 300
-PARRYING=550 650
-TACTICS=500 650
-WRESTLING=500 650
-DAMAGE=2 14
-DEF=8
-NPCWANDER=4
-FX2=30
-TOPROV=365
-TOPEACE=365 5
-TOTAME=531
 TAMEDHUNGER=600 30
 FOOD=carnivore
 RUNS
@@ -588,28 +571,26 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[pig]
+[panther]
+{
+GETUO=panther_lbr
+GETT2A=panther_lbr
+GETUOR=panther_lbr
+GETTD=panther_lbr
+GETLBR=panther_lbr
+GETAOS=panther_aos
+GETSE=panther_aos
+GETML=panther_aos
+GETSA=panther_aos
+GETHS=panther_aos
+GETTOL=panther_aos
+}
+
+[base_pig]
 {
+GET=base_animals
 NAME=#//a pig
 ID=0x00cb
-DIRECTION=RND
-BACKPACK
-STR=20
-DEX=20
-INT=5
-MANAMAX=0
-FAME=150
-MAGICRESISTANCE=500
-PARRYING=500
-TACTICS=500
-WRESTLING=500
-DAMAGE=2 4
-DEF=6
-NPCWANDER=4
-FX2=30
-TOPROV=59
-TOPEACE=59 5
-TOTAME=111
 TAMEDHUNGER=600 30
 FOOD=boar
 CARVE=35
@@ -617,28 +598,26 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[polarbear]
+[pig]
+{
+GETUO=pig_lbr
+GETT2A=pig_lbr
+GETUOR=pig_lbr
+GETTD=pig_lbr
+GETLBR=pig_lbr
+GETAOS=pig_aos
+GETSE=pig_aos
+GETML=pig_aos
+GETSA=pig_aos
+GETHS=pig_aos
+GETTOL=pig_aos
+}
+
+[base_polarbear]
 {
+GET=base_animals
 NAME=#//a polar bear
 ID=0x00d5
-DIRECTION=RND
-BACKPACK
-STR=116 140
-DEX=81 105
-INT=26 50
-MANAMAX=0
-FAME=1500
-MAGICRESISTANCE=450 600
-PARRYING=100 250
-TACTICS=600 900
-WRESTLING=450 700
-DAMAGE=5 14
-DEF=9
-NPCWANDER=4
-FX2=30
-TOPROV=389
-TOPEACE=389 5
-TOTAME=351
 TAMEDHUNGER=600 30
 FOOD=bear
 CARVE=36
@@ -648,31 +627,27 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[rabbit]
+[polarbear]
 {
+GETUO=polarbear_lbr
+GETT2A=polarbear_lbr
+GETUOR=polarbear_lbr
+GETTD=polarbear_lbr
+GETLBR=polarbear_lbr
+GETAOS=polarbear_aos
+GETSE=polarbear_aos
+GETML=polarbear_aos
+GETSA=polarbear_aos
+GETHS=polarbear_aos
+GETTOL=polarbear_aos
+}
+
+[base_rabbit]
+{
+GET=base_animals
 NAME=#//a rabbit
 ID=0x00cd
 SKINLIST=13
-DIRECTION=RND
-BACKPACK
-STR=6 10
-DEX=26 38
-INT=6 14
-MANAMAX=0
-FAME=150
-HIDING=250 450
-MAGICRESISTANCE=500
-PARRYING=500
-TACTICS=500
-WRESTLING=500
-DAMAGE=1
-DEF=3
-NPCWANDER=4
-FX2=30
-RUNS
-TOPROV=60
-TOPEACE=60 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=rabbit
 CARVE=37
@@ -681,29 +656,32 @@ CONTROLSLOTS=1
 NPCAI=12
 }
 
-[rat]
+[rabbit]
 {
+GETUO=rabbit_lbr
+GETT2A=rabbit_lbr
+GETUOR=rabbit_lbr
+GETTD=rabbit_lbr
+GETLBR=rabbit_lbr
+GETAOS=rabbit_aos
+GETSE=rabbit_aos
+GETML=rabbit_aos
+GETSA=rabbit_aos
+GETHS=rabbit_aos
+GETTOL=rabbit_aos
+}
+
+[easterbunny]
+{
+GET=rabbit
+NAME=a easter bunny
+}
+
+[base_rat]
+{
+GET=base_animals
 NAME=#//a rat
 ID=0x00ee
-DIRECTION=RND
-BACKPACK
-STR=9
-DEX=35
-INT=5
-MANAMAX=0
-KARMA=-150
-FAME=150
-MAGICRESISTANCE=400
-PARRYING=400
-TACTICS=400
-WRESTLING=400
-DAMAGE=1 2
-DEF=3
-NPCWANDER=4
-FX2=20
-TOPROV=60
-TOPEACE=60 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=rat
 CARVE=44
@@ -711,28 +689,32 @@ RACE=23
 CONTROLSLOTS=1
 }
 
-[sheep]
+[rat]
+{
+GETUO=rat_lbr
+GETT2A=rat_lbr
+GETUOR=rat_lbr
+GETTD=rat_lbr
+GETLBR=rat_lbr
+GETAOS=rat_aos
+GETSE=rat_aos
+GETML=rat_aos
+GETSA=rat_aos
+GETHS=rat_aos
+GETTOL=rat_aos
+}
+
+[townrat]
 {
+GET=rat
+NAME=a town rat
+}
+
+[base_sheep]
+{
+GET=base_animals
 NAME=#//a sheep
 ID=0x00cf
-DIRECTION=RND
-BACKPACK
-STR=19
-DEX=25
-INT=5
-MANAMAX=0
-FAME=300
-MAGICRESISTANCE=500
-PARRYING=500
-TACTICS=600
-WRESTLING=500
-DAMAGE=1 2
-DEF=3
-NPCWANDER=4
-FX2=30
-TOPROV=65
-TOPEACE=65 5
-TOTAME=111
 TAMEDHUNGER=600 30
 FOOD=sheep
 CARVE=42
@@ -741,30 +723,27 @@ RACE=9
 CONTROLSLOTS=1
 }
 
-[snowleopard]
+[sheep]
 {
+GETUO=sheep_lbr
+GETT2A=sheep_lbr
+GETUOR=sheep_lbr
+GETTD=sheep_lbr
+GETLBR=sheep_lbr
+GETAOS=sheep_aos
+GETSE=sheep_aos
+GETML=sheep_aos
+GETSA=sheep_aos
+GETHS=sheep_aos
+GETTOL=sheep_aos
+}
+
+[base_snowleopard]
+{
+GET=base_animals
 NAME=#//a snow leopard
 ID=0x0040
 SKIN=0x048
-DIRECTION=RND
-BACKPACK
-STR=56 80
-DEX=66 85
-INT=26 50
-MANAMAX=0
-FAME=450
-HIDING=50 250
-MAGICRESISTANCE=250 350
-PARRYING=550 650
-TACTICS=450 600
-WRESTLING=400 500
-DAMAGE=2 10
-DEF=12
-NPCWANDER=4
-FX2=30
-TOPROV=343
-TOPEACE=343 5
-TOTAME=531
 TAMEDHUNGER=600 30
 FOOD=carnivore
 RUNS
@@ -774,29 +753,26 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[timberwolf]
+[snowleopard]
+{
+GETUO=snowleopard_lbr
+GETT2A=snowleopard_lbr
+GETUOR=snowleopard_lbr
+GETTD=snowleopard_lbr
+GETLBR=snowleopard_lbr
+GETAOS=snowleopard_aos
+GETSE=snowleopard_aos
+GETML=snowleopard_aos
+GETSA=snowleopard_aos
+GETHS=snowleopard_aos
+GETTOL=snowleopard_aos
+}
+
+[base_timberwolf]
 {
+GET=base_animals
 NAME=#//a timber wolf
 ID=0x00e1
-DIRECTION=RND
-BACKPACK
-STR=56 80
-DEX=56 75
-INT=11 25
-MANAMAX=0
-FAME=450
-HIDING=50 100
-MAGICRESISTANCE=280 450
-PARRYING=430 550
-TACTICS=300 500
-WRESTLING=400 600
-DAMAGE=4 10
-DEF=9
-NPCWANDER=4
-FX2=30
-TOPROV=294
-TOPEACE=294 5
-TOTAME=231
 TAMEDHUNGER=600 30
 FOOD=meat
 RUNS
@@ -806,30 +782,27 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[whitewolf]
+[timberwolf]
+{
+GETUO=timberwolf_lbr
+GETT2A=timberwolf_lbr
+GETUOR=timberwolf_lbr
+GETTD=timberwolf_lbr
+GETLBR=timberwolf_lbr
+GETAOS=timberwolf_aos
+GETSE=timberwolf_aos
+GETML=timberwolf_aos
+GETSA=timberwolf_aos
+GETHS=timberwolf_aos
+GETTOL=timberwolf_aos
+}
+
+[base_whitewolf]
 {
+GET=base_animals
 NAME=#//a white wolf
 ID=0x0025
 SKIN=0x038a
-DIRECTION=RND
-BACKPACK
-STR=56 80
-DEX=56 75
-INT=31 55
-MANAMAX=0
-FAME=450
-HIDING=50 200
-MAGICRESISTANCE=200 350
-PARRYING=450 550
-TACTICS=450 600
-WRESTLING=450 600
-DAMAGE=2 8
-DEF=8
-NPCWANDER=4
-FX2=30
-TOPROV=323
-TOPEACE=323 5
-TOTAME=651
 TAMEDHUNGER=600 30
 FOOD=meat
 RUNS
@@ -839,58 +812,55 @@ NPCAI=6
 CONTROLSLOTS=1
 }
 
-[silverwolf]
+[whitewolf]
+{
+GETUO=whitewolf_lbr
+GETT2A=whitewolf_lbr
+GETUOR=whitewolf_lbr
+GETTD=whitewolf_lbr
+GETLBR=whitewolf_lbr
+GETAOS=whitewolf_aos
+GETSE=whitewolf_aos
+GETML=whitewolf_aos
+GETSA=whitewolf_aos
+GETHS=whitewolf_aos
+GETTOL=whitewolf_aos
+}
+
+[base_silverwolf]
 {
+GET=base_animals
 NAME=#//a silver wolf
 ID=0x0064
-DIRECTION=RND
-BACKPACK
-STR=96 120
-DEX=81 105
-INT=36 60
-KARMA=2500
-FAME=2500
-HIDING=50 150
-MAGICRESISTANCE=580 750
-PARRYING=630 750
-TACTICS=500 700
-WRESTLING=600 800
-DAMAGE=6 22
-DEF=11
-NPCAI=5
-NPCWANDER=4
-FX2=30
-TOPROV=503
-TOPEACE=503 5
-TOTAME=831
 TAMEDHUNGER=600 30
 FOOD=meat
 RUNS
 CARVE=12
 RACE=8
-FLAG=NEUTRAL
+NPCAI=5
 CONTROLSLOTS=1
 }
 
-[squirrel]
+[silverwolf]
 {
+GETUO=silverwolf_lbr
+GETT2A=silverwolf_lbr
+GETUOR=silverwolf_lbr
+GETTD=silverwolf_lbr
+GETLBR=silverwolf_lbr
+GETAOS=silverwolf_aos
+GETSE=silverwolf_aos
+GETML=silverwolf_aos
+GETSA=silverwolf_aos
+GETHS=silverwolf_aos
+GETTOL=silverwolf_aos
+}
+
+[base_squirrel]
+{
+GET=base_animals
 NAME=#//a squirrel
 ID=0x0116
-DIRECTION=RND
-BACKPACK
-STR=44 50
-DEX=35
-INT=5
-MAGICRESISTANCE=40
-PARRYING=40
-TACTICS=40
-WRESTLING=40
-DAMAGE=1 2
-NPCWANDER=4
-FX2=30
-TOPROV=150
-TOPEACE=150 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=fruit
 RUNS
@@ -900,26 +870,26 @@ NPCAI=12
 ORIGIN=ml
 }
 
-[ferret]
+[squirrel]
+{
+GETUO=squirrel_lbr
+GETT2A=squirrel_lbr
+GETUOR=squirrel_lbr
+GETTD=squirrel_lbr
+GETLBR=squirrel_lbr
+GETAOS=squirrel_aos
+GETSE=squirrel_aos
+GETML=squirrel_aos
+GETSA=squirrel_aos
+GETHS=squirrel_aos
+GETTOL=squirrel_aos
+}
+
+[base_ferret]
 {
+GET=base_animals
 NAME=#//a ferret
 ID=0x0117
-DIRECTION=RND
-BACKPACK
-STR=41 48
-DEX=55
-INT=75
-MAGICRESISTANCE=40
-PARRYING=40
-TACTICS=40
-WRESTLING=40
-DAMAGE=7 9
-DEF=1
-NPCWANDER=4
-FX2=30
-TOPROV=150
-TOPEACE=150 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=fruit
 RUNS
@@ -929,6 +899,21 @@ NPCAI=12
 ORIGIN=ml
 }
 
+[ferret]
+{
+GETUO=ferret_lbr
+GETT2A=ferret_lbr
+GETUOR=ferret_lbr
+GETTD=ferret_lbr
+GETLBR=ferret_lbr
+GETAOS=ferret_aos
+GETSE=ferret_aos
+GETML=ferret_aos
+GETSA=ferret_aos
+GETHS=ferret_aos
+GETTOL=ferret_aos
+}
+
 //crane - Base NPC with shared DFN tags
 [base_crane]
 {
@@ -975,4 +960,92 @@ GETML=gaman_se
 GETSA=gaman_se
 GETHS=gaman_se
 GETTOL=gaman_se
+}
+
+[base_vorpalbunny]
+{
+GET=base_animals
+NAME=a vorpal bunny
+ID=0x00cd
+SKIN=0x480
+TAMEDHUNGER=600 30
+FOOD=rabbit
+CARVE=37
+RACE=9
+RUNS
+CONTROLSLOTS=1
+NPCAI=12
+}
+
+[vorpalbunny]
+{
+GETUO=vorpalbunny_aos
+GETT2A=vorpalbunny_aos
+GETUOR=vorpalbunny_aos
+GETTD=vorpalbunny_aos
+GETLBR=vorpalbunny_aos
+GETAOS=vorpalbunny_aos
+GETSE=vorpalbunny_aos
+GETML=vorpalbunny_aos
+GETSA=vorpalbunny_aos
+GETHS=vorpalbunny_aos
+GETTOL=vorpalbunny_aos
+}
+
+[base_whitewolf]
+{
+GET=base_animals
+NAME=a white wolf
+ID=0x0034
+TAMEDHUNGER=600 30
+FOOD=meat
+RUNS
+CARVE=12
+RACE=8
+NPCAI=5
+CONTROLSLOTS=1
+}
+
+[whitewolf]
+{
+GETUO=whitewolf_aos
+GETT2A=whitewolf_aos
+GETUOR=whitewolf_aos
+GETTD=whitewolf_aos
+GETLBR=whitewolf_aos
+GETAOS=whitewolf_aos
+GETSE=whitewolf_aos
+GETML=whitewolf_aos
+GETSA=whitewolf_aos
+GETHS=whitewolf_aos
+GETTOL=whitewolf_aos
+}
+
+[base_skitteringhopper]
+{
+GET=base_animals
+NAME=a skittering hopper
+ID=0x012E
+TAMEDHUNGER=600 30
+FOOD=meat
+RUNS
+CARVE=12
+RACE=8
+NPCAI=5
+CONTROLSLOTS=1
+}
+
+[skitteringhopper]
+{
+GETUO=skitteringhopper_aos
+GETT2A=skitteringhopper_aos
+GETUOR=skitteringhopper_aos
+GETTD=skitteringhopper_aos
+GETLBR=skitteringhopper_aos
+GETAOS=skitteringhopper_aos
+GETSE=skitteringhopper_aos
+GETML=skitteringhopper_aos
+GETSA=skitteringhopper_aos
+GETHS=skitteringhopper_aos
+GETTOL=skitteringhopper_aos
 }
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_aos/animals_aos.dfn b/data/dfndata/npc/npc_aos/animals_aos.dfn
new file mode 100644
index 000000000..cc43aaa2c
--- /dev/null
+++ b/data/dfndata/npc/npc_aos/animals_aos.dfn
@@ -0,0 +1,806 @@
+[brownbear_aos]
+{
+GET=base_brownbear
+STR=76 100
+DEX=26 45
+INT=23 47
+HPMAX=46 60
+MANAMAX=0
+FAME=450
+WRESTLING=400 600
+TACTICS=400 600
+MAGICRESISTANCE=200 400
+DAMAGE=9 19
+DEF=20 30
+RESISTFIRE=0 0
+RESISTCOLD=15 29
+RESISTPOISON=10 15
+RESISTLIGHTNING=0 0
+TOPROV=296
+TOPEACE=296 5
+TOTAME=411
+}
+
+[blackbear_aos]
+{
+GET=base_blackbear
+STR=76 100
+DEX=56 75
+INT=11 14
+HPMAX=46 60
+MANAMAX=0
+FAME=450
+WRESTLING=400 600
+TACTICS=400 600
+MAGICRESISTANCE=200 400
+DAMAGE=6 16
+DEF=20 30
+RESISTFIRE=0 0
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=0 0
+TOPROV=310
+TOPEACE=310 5
+TOTAME=351
+}
+
+[boar_aos]
+{
+GET=base_boar
+STR=25
+DEX=15
+INT=5
+HPMAX=15 15
+MANAMAX=0
+FAME=300
+WRESTLING=500
+TACTICS=500
+MAGICRESISTANCE=900
+DAMAGE=3 7
+DEF=10 15
+RESISTFIRE=5 10
+RESISTCOLD=0 0
+RESISTPOISON=5 10
+RESISTLIGHTNING=0 0
+TOPROV=75
+TOPEACE=75 5
+TOTAME=291
+}
+
+[bull_aos]
+{
+GET=base_bull
+STR=77 111
+DEX=56 75
+INT=47 75
+HPMAX=50 64
+MANAMAX=0
+FAME=600
+WRESTLING=400 58
+TACTICS=680 850
+MAGICRESISTANCE=180 250
+DAMAGE=7 17
+DEF=25 30
+RESISTFIRE=0 0
+RESISTCOLD=10 15
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=358
+TOPEACE=358 5
+TOTAME=711
+}
+
+[bullfrog_aos]
+{
+GET=base_bullfrog
+STR=46 70
+DEX=6 25
+INT=11 20
+HPMAX=28 42
+MANAMAX=0
+FAME=350
+WRESTLING=400 600
+TACTICS=400 600
+MAGICRESISTANCE=250 400
+ANATOMY=0 1
+DAMAGE=1 3
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=292
+TOPEACE=292 5
+TOTAME=231
+}
+
+[cat_aos]
+{
+GET=base_cat
+STR=9
+DEX=35
+INT=5
+HPMAX=6 6
+MANAMAX=0
+WRESTLING=500
+TACTICS=400
+MAGICRESISTANCE=500
+ANATOMY=0 1
+DAMAGE=1 1
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=60
+TOPEACE=60 5
+TOTAME=0
+}
+
+[cougar_aos]
+{
+GET=base_cougar
+STR=56 80
+DEX=66 85
+INT=26 50
+HPMAX=34 48
+MANAMAX=0
+FAME=450
+WRESTLING=450 600
+TACTICS=450 600
+MAGICRESISTANCE=150 300
+ANATOMY=0 1
+DAMAGE=6 16
+DEF=20 25
+RESISTFIRE=5 10
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=0 0
+TOPROV=333
+TOPEACE=333 5
+TOTAME=411
+}
+
+[cow_aos]
+{
+GET=base_cow
+STR=30
+DEX=15
+INT=5
+HPMAX=18 18
+MANAMAX=0
+FAME=300
+WRESTLING=550
+TACTICS=550
+MAGICRESISTANCE=550
+ANATOMY=0 1
+DAMAGE=1 4
+DEF=5 15
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=66
+TOPEACE=66 5
+TOTAME=111
+}
+
+[dog_aos]
+{
+GET=base_dog
+STR=27 37
+DEX=28 43
+INT=29 37
+HPMAX=17 22
+MANAMAX=0
+FAME=300
+WRESTLING=192 310
+TACTICS=192 310
+MAGICRESISTANCE=220 470
+ANATOMY=0 1
+DAMAGE=5 9
+DEF=10 15
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=187
+TOPEACE=187 5
+TOTAME=0
+}
+
+[goat_aos]
+{
+GET=base_goat
+STR=19
+DEX=15
+INT=5
+HPMAX=12 12
+MANAMAX=0
+FAME=150
+WRESTLING=500 500
+TACTICS=500 500
+MAGICRESISTANCE=500 500
+ANATOMY=0 1
+DAMAGE=3 4
+DEF=5 15
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=54
+TOPEACE=54 5
+TOTAME=111
+}
+
+[gorilla_aos]
+{
+GET=base_gorilla
+STR=53 95
+DEX=36 55
+INT=36 60
+HPMAX=38 51
+MANAMAX=0
+FAME=450
+WRESTLING=430 580
+TACTICS=430 580
+MAGICRESISTANCE=450 600
+ANATOMY=0 1
+DAMAGE=6 16
+DEF=20 25
+RESISTFIRE=5 10
+RESISTCOLD=10 15
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=311
+TOPEACE=311 5
+TOTAME=0
+}
+
+[greywolf_aos]
+{
+GET=base_greywolf
+STR=56 80
+DEX=56 75
+INT=31 55
+HPMAX=34 48
+MANAMAX=0
+KARMA=0
+FAME=450
+WRESTLING=450 600
+TACTICS=450 600
+MAGICRESISTANCE=200 350
+ANATOMY=0 1
+DAMAGE=4 10
+DEF=15 20
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=10 15
+RESISTLIGHTNING=10 15
+TOPROV=302
+TOPEACE=302 5
+TOTAME=531
+}
+
+[grizbear_aos]
+{
+GET=base_grizbear
+STR=126 155
+DEX=81 105
+INT=16 40
+HPMAX=76 93
+MANAMAX=0
+FAME=1000
+WRESTLING=450 700
+TACTICS=700 1000
+MAGICRESISTANCE=250 400
+ANATOMY=0 1
+DAMAGE=16 26
+DEF=25 35
+RESISTFIRE=0 0
+RESISTCOLD=15 25
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=474
+TOPEACE=474 5
+TOTAME=591
+}
+
+[hart_aos]
+{
+GET=base_hart
+STR=41 71
+DEX=47 77
+INT=27 57
+HPMAX=27 41
+MANAMAX=0
+FAME=300
+WRESTLING=30 48
+TACTICS=30 48
+MAGICRESISTANCE=270 450
+ANATOMY=0 1
+DAMAGE=7 13
+DEF=20 25
+RESISTFIRE=0 0
+RESISTCOLD=5 10
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=273
+TOPEACE=273 5
+TOTAME=591
+}
+
+[hind_aos]
+{
+GET=base_hind
+STR=21 51
+DEX=47 77
+INT=17 47
+HPMAX=15 29
+MANAMAX=0
+FAME=300
+WRESTLING=260
+TACTICS=190
+MAGICRESISTANCE=150
+ANATOMY=0 1
+DAMAGE=4 5
+DEF=5 15
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=182
+TOPEACE=182 5
+TOTAME=231
+}
+
+[jackrabbit_aos]
+{
+GET=base_jackrabbit
+STR=15
+DEX=25
+INT=5
+HPMAX=9 9
+MANAMAX=0
+FAME=150
+WRESTLING=500
+TACTICS=500
+MAGICRESISTANCE=500
+ANATOMY=0 1
+DAMAGE=1 2
+DEF=2 5
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=59
+TOPEACE=59 5
+TOTAME=0
+}
+
+[mountaingoat_aos]
+{
+GET=base_mountaingoat
+STR=22 64
+DEX=56 75
+INT=16 30
+HPMAX=20 33
+MANAMAX=0
+FAME=300
+WRESTLING=290 440
+TACTICS=290 440
+MAGICRESISTANCE=250 300
+ANATOMY=0 1
+DAMAGE=4 9
+DEF=10 20
+RESISTFIRE=5 10
+RESISTCOLD=10 20
+RESISTPOISON=10 15
+RESISTLIGHTNING=10 15
+TOPROV=260
+TOPEACE=260 5
+TOTAME=0
+}
+
+[packhorse_aos]
+{
+GET=base_packhorse
+STR=44 120
+DEX=36 55
+INT=6 10
+HPMAX=61 80
+MANAMAX=0
+STAMINAMAX=81 100
+KARMA=200
+WRESTLING=290 440
+TACTICS=290 440
+MAGICRESISTANCE=250 300
+ANATOMY=0 1
+DAMAGE=7 16
+DEF=20 25
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=10 15
+RESISTLIGHTNING=10 15
+TOPROV=329
+TOPEACE=329 5
+TOTAME=291
+}
+
+[packllama_aos]
+{
+GET=base_packllama
+STR=52 80
+DEX=36 55
+INT=16 30
+HPMAX=50 50
+MANAMAX=0
+STAMINAMAX=86 105
+KARMA=200
+WRESTLING=190 290
+TACTICS=190 290
+MAGICRESISTANCE=150 200
+ANATOMY=0 1
+DAMAGE=2 8
+DEF=8 10
+RESISTFIRE=5 10
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=242
+TOPEACE=242 5
+TOTAME=291
+}
+
+[panther_aos]
+{
+GET=base_panther
+STR=61 85
+DEX=86 105
+INT=26 50
+HPMAX=37 51
+MANAMAX=0
+FAME=450
+WRESTLING=500 650
+TACTICS=500 650
+MAGICRESISTANCE=150 300
+ANATOMY=0 1
+DAMAGE=6 19
+DEF=20 25
+RESISTFIRE=5 10
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=0 0
+TOPROV=365
+TOPEACE=365 5
+TOTAME=531
+}
+
+[pig_aos]
+{
+GET=base_pig
+STR=20
+DEX=20
+INT=5
+HPMAX=12 12
+MANAMAX=0
+FAME=150
+WRESTLING=500
+TACTICS=500
+MAGICRESISTANCE=500
+ANATOMY=0 1
+DAMAGE=2 4
+DEF=10 15
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=59
+TOPEACE=59 5
+TOTAME=111
+}
+
+[polarbear_aos]
+{
+GET=base_polarbear
+STR=116 140
+DEX=81 105
+INT=26 50
+HPMAX=70 84
+MANAMAX=0
+FAME=1500
+WRESTLING=450 700
+TACTICS=600 900
+MAGICRESISTANCE=450 600
+ANATOMY=0 1
+DAMAGE=13 23
+DEF=25 35
+RESISTFIRE=0 0
+RESISTCOLD=60 80
+RESISTPOISON=15 25
+RESISTLIGHTNING=10 15
+TOPROV=389
+TOPEACE=389 5
+TOTAME=351
+}
+
+[rabbit_aos]
+{
+GET=base_rabbit
+STR=6 10
+DEX=26 38
+INT=6 14
+HPMAX=6 6
+MANAMAX=0
+FAME=150
+WRESTLING=500
+TACTICS=500
+MAGICRESISTANCE=500
+ANATOMY=0 1
+DAMAGE=1
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=60
+TOPEACE=60 5
+TOTAME=0
+}
+
+[rat_aos]
+{
+GET=base_rat
+STR=9
+DEX=35
+INT=5
+HPMAX=6 6
+MANAMAX=0
+KARMA=-150
+FAME=150
+WRESTLING=400
+TACTICS=400
+MAGICRESISTANCE=400
+ANATOMY=0 1
+DAMAGE=1 2
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=60
+TOPEACE=60 5
+TOTAME=0
+}
+
+[sheep_aos]
+{
+GET=base_sheep
+STR=19
+DEX=25
+INT=5
+HPMAX=12 12
+MANAMAX=0
+FAME=300
+WRESTLING=500
+TACTICS=600
+MAGICRESISTANCE=500
+ANATOMY=0 1
+DAMAGE=1 2
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=65
+TOPEACE=65 5
+TOTAME=111
+}
+
+[snowleopard_aos]
+{
+GET=base_snowleopard
+STR=56 80
+DEX=66 85
+INT=26 50
+HPMAX=34 48
+MANAMAX=0
+FAME=450
+WRESTLING=400 500
+TACTICS=450 600
+MAGICRESISTANCE=250 350
+ANATOMY=0 1
+DAMAGE=4 14
+DEF=20 25
+RESISTFIRE=5 10
+RESISTCOLD=30 40
+RESISTPOISON=10 20
+RESISTLIGHTNING=20 30
+TOPROV=343
+TOPEACE=343 5
+TOTAME=531
+}
+
+[timberwolf_aos]
+{
+GET=base_timberwolf
+STR=56 80
+DEX=56 75
+INT=11 25
+HPMAX=34 48
+MANAMAX=0
+FAME=450
+WRESTLING=400 600
+TACTICS=300 500
+MAGICRESISTANCE=280 450
+ANATOMY=0 1
+DAMAGE=6 13
+DEF=15 20
+RESISTFIRE=5 10
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=294
+TOPEACE=294 5
+TOTAME=231
+}
+
+[whitewolf_aos]
+{
+GET=base_whitewolf
+STR=56 80
+DEX=56 75
+INT=31 55
+MANAMAX=0
+FAME=450
+MAGICRESISTANCE=200 350
+TACTICS=450 600
+WRESTLING=450 600
+DAMAGE=2 8
+DEF=15 20
+RESISTFIRE=5 10
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=323
+TOPEACE=323 5
+TOTAME=651
+}
+
+[silverwolf_aos]
+{
+GET=base_silverwolf
+STR=96 120
+DEX=81 105
+INT=36 60
+HPMAX=58 72
+KARMA=2500
+FAME=2500
+WRESTLING=600 800
+TACTICS=500 700
+MAGICRESISTANCE=580 750
+ANATOMY=0 1
+DAMAGE=20 32
+DEF=20 25
+RESISTFIRE=10 20
+RESISTCOLD=5 10
+RESISTPOISON=5 10
+RESISTLIGHTNING=10 15
+TOPROV=503
+TOPEACE=503 5
+TOTAME=831
+}
+
+[squirrel_aos]
+{
+GET=base_squirrel
+STR=44 50
+DEX=35
+INT=5
+HPMAX=40 50
+WRESTLING=40
+TACTICS=40
+MAGICRESISTANCE=40
+DAMAGE=1 2
+DEF=45 50
+RESISTFIRE=10 15
+RESISTCOLD=34 40
+RESISTPOISON=20 25
+RESISTLIGHTNING=20 25
+TOPROV=150
+TOPEACE=150 5
+TOTAME=0
+}
+
+[ferret_aos]
+{
+GET=base_ferret
+STR=41 48
+DEX=55
+INT=75
+HPMAX=40 50
+WRESTLING=40
+TACTICS=40
+MAGICRESISTANCE=40
+DAMAGE=7 9
+DEF=45 50
+RESISTFIRE=10 15
+RESISTCOLD=34 40
+RESISTPOISON=20 25
+RESISTLIGHTNING=20 25
+TOPROV=150
+TOPEACE=150 5
+TOTAME=0
+}
+
+[vorpalbunny_aos]
+{
+GET=base_vorpalbunny
+GOLD=1100 1250
+STR=15 15
+DEX=2000 2000
+INT=1000 1000
+HPMAX=2000 2000
+STAMINAMAX=500 500
+MANAMAX=0
+FAME=1000
+WRESTLING=500
+TACTICS=500
+MAGICRESISTANCE=500
+ANATOMY=0 1
+DAMAGE=1 1
+DEF=2 5
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=1580
+TOPEACE=1580 5
+TOTAME=2000
+}
+
+[whitewolf_aos]
+{
+GET=base_whitewolf
+STR=56 80
+DEX=56 75
+INT=31 55
+HPMAX=34 48
+FAME=450
+WRESTLING=600 800
+TACTICS=500 700
+MAGICRESISTANCE=580 750
+ANATOMY=0 1
+DAMAGE=4 10
+DEF=15 20
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=10 15
+RESISTLIGHTNING=10 15
+TOPROV=323
+TOPEACE=323 5
+TOTAME=651
+}
+
+[skitteringhopper_aos]
+{
+GET=base_skitteringhopper
+GOLD=50 100
+STR=41 65
+DEX=91 115
+INT=26 50
+HPMAX=31 45
+WRESTLING=401 600
+TACTICS=451 700
+MAGICRESISTANCE=301 450
+ANTOMY=0 1
+DAMAGE=4 7
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=10 20
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=380
+TOPEACE=380 5
+TOTAME=0
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_lbr/animals_lbr.dfn b/data/dfndata/npc/npc_lbr/animals_lbr.dfn
new file mode 100644
index 000000000..0db03894f
--- /dev/null
+++ b/data/dfndata/npc/npc_lbr/animals_lbr.dfn
@@ -0,0 +1,600 @@
+[brownbear_lbr]
+{
+GET=base_brownbear
+STR=76 100
+DEX=26 45
+INT=23 47
+MANAMAX=0
+FAME=450
+MAGICRESISTANCE=200 400
+PARRYING=250 450
+TACTICS=400 600
+WRESTLING=400 600
+DAMAGE=2 12
+DEF=8
+TOPROV=296
+TOPEACE=296 5
+TOTAME=459
+}
+
+[blackbear_lbr]
+{
+GET=base_blackbear
+DEX=56 75
+INT=11 14
+MANAMAX=0
+FAME=450
+MAGICRESISTANCE=200 400
+PARRYING=250 450
+TACTICS=400 600
+WRESTLING=400 600
+DAMAGE=2 12
+DEF=8
+TOPROV=310
+TOPEACE=310 5
+TOTAME=351
+}
+
+[boar_lbr]
+{
+GET=base_boar
+STR=25
+DEX=15
+INT=5
+MANAMAX=0
+FAME=300
+MAGICRESISTANCE=900
+PARRYING=950
+TACTICS=500
+WRESTLING=500
+DAMAGE=3 6
+DEF=5
+TOPROV=75
+TOPEACE=75 5
+TOTAME=291
+}
+
+[bull_lbr]
+{
+GET=base_bull
+STR=77 111
+DEX=56 75
+INT=47 75
+MANAMAX=0
+FAME=600
+MAGICRESISTANCE=180 250
+PARRYING=430 550
+TACTICS=680 850
+WRESTLING=400 58
+DAMAGE=4 9
+DEF=14
+TOPROV=358
+TOPEACE=358 5
+TOTAME=711
+}
+
+[bullfrog_lbr]
+{
+GET=base_bullfrog
+STR=46 70
+DEX=6 25
+INT=11 20
+MANAMAX=0
+FAME=350
+MAGICRESISTANCE=250 400
+PARRYING=380 730
+TACTICS=400 600
+WRESTLING=400 600
+DAMAGE=1 2
+DEF=3
+TOPROV=292
+TOPEACE=292 5
+TOTAME=231
+}
+
+[cat_lbr]
+{
+GET=base_cat
+STR=9
+DEX=35
+INT=5
+MANAMAX=0
+HIDING=150 350
+MAGICRESISTANCE=500
+PARRYING=250
+TACTICS=400
+WRESTLING=500
+DAMAGE=1
+DEF=4
+TOPROV=60
+TOPEACE=60 5
+TOTAME=0
+}
+
+[cougar_lbr]
+{
+GET=base_cougar
+STR=56 80
+DEX=66 85
+INT=26 50
+MANAMAX=0
+FAME=450
+HIDING=50 150
+MAGICRESISTANCE=150 300
+PARRYING=550 650
+TACTICS=450 600
+WRESTLING=450 600
+DAMAGE=2 12
+DEF=8
+TOPROV=333
+TOPEACE=333 5
+TOTAME=411
+}
+
+[cow_lbr]
+{
+GET=base_cow
+STR=30
+DEX=15
+INT=5
+MANAMAX=0
+FAME=300
+MAGICRESISTANCE=550
+PARRYING=550
+TACTICS=550
+WRESTLING=550
+DAMAGE=1 4
+DEF=5
+TOPROV=66
+TOPEACE=66 5
+TOTAME=111
+}
+
+[dog_lbr]
+{
+GET=base_dog
+STR=27 37
+DEX=28 43
+INT=29 37
+MANAMAX=0
+FAME=300
+MAGICRESISTANCE=220 470
+PARRYING=280 530
+TACTICS=190 310
+FENCING=190 310
+DAMAGE=4 7
+DEF=6
+TOPROV=187
+TOPEACE=187 5
+TOTAME=0
+}
+
+[goat_lbr]
+{
+GET=base_goat
+STR=19
+DEX=15
+INT=5
+MANAMAX=0
+FAME=150
+MAGICRESISTANCE=500
+PARRYING=500
+TACTICS=500
+WRESTLING=500
+DAMAGE=3 4
+DEF=5
+TOPROV=54
+TOPEACE=54 5
+TOTAME=111
+}
+
+[gorilla_lbr]
+{
+GET=base_gorilla
+STR=53 95
+DEX=36 55
+INT=36 60
+MANAMAX=0
+FAME=450
+MAGICRESISTANCE=450 600
+PARRYING=430 530
+TACTICS=430 580
+WRESTLING=430 580
+DAMAGE=2 12
+DEF=10
+TOPROV=311
+TOPEACE=311 5
+TOTAME=0
+}
+
+[greywolf_lbr]
+{
+GET=base_greywolf
+STR=56 80
+DEX=56 75
+INT=31 55
+MANAMAX=0
+KARMA=0
+FAME=450
+HIDING=450 600
+MAGICRESISTANCE=200 350
+PARRYING=450 550
+TACTICS=450 600
+WRESTLING=450 600
+DAMAGE=2 8
+DEF=9
+TOPROV=302
+TOPEACE=302 5
+TOTAME=531
+}
+
+[grizbear_lbr]
+{
+GET=base_grizbear
+STR=126 155
+DEX=81 105
+INT=16 40
+MANAMAX=0
+FAME=1000
+MAGICRESISTANCE=250 400
+PARRYING=700 850
+TACTICS=700 1000
+WRESTLING=450 700
+DAMAGE=6 15
+DEF=12
+TOPROV=474
+TOPEACE=474 5
+TOTAME=591
+}
+
+[hart_lbr]
+{
+GET=base_hart
+STR=41 71
+DEX=47 77
+INT=27 57
+MANAMAX=0
+FAME=300
+MAGICRESISTANCE=270 450
+PARRYING=250 430
+TACTICS=30 48
+WRESTLING=30 48
+DAMAGE=4 10
+DEF=12
+TOPROV=273
+TOPEACE=273 5
+TOTAME=591
+}
+
+[hind_lbr]
+{
+GET=base_hind
+STR=21 51
+DEX=47 77
+INT=17 47
+MANAMAX=0
+FAME=300
+HIDING=100 300
+MAGICRESISTANCE=150
+PARRYING=220
+TACTICS=190
+WRESTLING=260
+DAMAGE=4 4
+DEF=4
+TOPROV=182
+TOPEACE=182 5
+TOTAME=231
+}
+
+[jackrabbit_lbr]
+{
+GET=base_jackrabbit
+STR=15
+DEX=25
+INT=5
+MANAMAX=0
+FAME=150
+HIDING=250 450
+MAGICRESISTANCE=500
+PARRYING=500
+TACTICS=500
+WRESTLING=500
+HIDING=450 600
+DAMAGE=1 2
+DEF=2
+TOPROV=59
+TOPEACE=59 5
+}
+
+[mountaingoat_lbr]
+{
+GET=base_mountaingoat
+STR=22 64
+DEX=56 75
+INT=16 30
+MANAMAX=0
+FAME=300
+DAMAGE=3 7
+DEF=8
+MAGICRESISTANCE=250 300
+PARRYING=450 550
+TACTICS=290 440
+WRESTLING=290 440
+DAMAGE=3 4
+DEF=5
+TOPROV=260
+TOPEACE=260 5
+}
+
+[packhorse_lbr]
+{
+GET=base_packhorse
+STR=44 120
+DEX=36 55
+INT=6 10
+MANAMAX=0
+STAMINAMAX=81 100
+KARMA=200
+MAGICRESISTANCE=250 300
+PARRYING=350 450
+TACTICS=290 440
+WRESTLING=290 440
+DAMAGE=4 12
+DEF=9
+TOPROV=329
+TOPEACE=329 5
+TOTAME=291
+}
+
+[packllama_lbr]
+{
+GET=base_packllama
+STR=52 80
+DEX=36 55
+INT=16 30
+MANAMAX=0
+STAMINAMAX=86 105
+KARMA=200
+MAGICRESISTANCE=150 200
+PARRYING=350 450
+TACTICS=190 290
+WRESTLING=190 290
+DAMAGE=2 6
+DEF=8
+TOPROV=242
+TOPEACE=242 5
+TOTAME=291
+}
+
+[panther_lbr]
+{
+GET=base_panther
+STR=61 85
+DEX=86 105
+INT=26 50
+MANAMAX=0
+FAME=450
+HIDING=150 250
+MAGICRESISTANCE=150 300
+PARRYING=550 650
+TACTICS=500 650
+WRESTLING=500 650
+DAMAGE=2 14
+DEF=8
+TOPROV=365
+TOPEACE=365 5
+TOTAME=531
+}
+
+[pig_lbr]
+{
+GET=base_pig
+STR=20
+DEX=20
+INT=5
+MANAMAX=0
+FAME=150
+MAGICRESISTANCE=500
+PARRYING=500
+TACTICS=500
+WRESTLING=500
+DAMAGE=2 4
+DEF=6
+TOPROV=59
+TOPEACE=59 5
+TOTAME=111
+}
+
+[polarbear_lbr]
+{
+GET=base_polarbear
+STR=116 140
+DEX=81 105
+INT=26 50
+MANAMAX=0
+FAME=1500
+MAGICRESISTANCE=450 600
+PARRYING=100 250
+TACTICS=600 900
+WRESTLING=450 700
+DAMAGE=5 14
+DEF=9
+TOPROV=389
+TOPEACE=389 5
+TOTAME=351
+}
+
+[rabbit_lbr]
+{
+GET=base_rabbit
+STR=6 10
+DEX=26 38
+INT=6 14
+MANAMAX=0
+FAME=150
+HIDING=250 450
+MAGICRESISTANCE=500
+PARRYING=500
+TACTICS=500
+WRESTLING=500
+DAMAGE=1
+DEF=3
+NPCWANDER=4
+FX2=30
+RUNS
+TOPROV=60
+TOPEACE=60 5
+TOTAME=0
+}
+
+[rat_lbr]
+{
+GET=base_rat
+STR=9
+DEX=35
+INT=5
+MANAMAX=0
+KARMA=-150
+FAME=150
+MAGICRESISTANCE=400
+PARRYING=400
+TACTICS=400
+WRESTLING=400
+DAMAGE=1 2
+DEF=3
+TOPROV=60
+TOPEACE=60 5
+TOTAME=0
+}
+
+[sheep_lbr]
+{
+GET=base_sheep
+STR=19
+DEX=25
+INT=5
+MANAMAX=0
+FAME=300
+MAGICRESISTANCE=500
+PARRYING=500
+TACTICS=600
+WRESTLING=500
+DAMAGE=1 2
+DEF=3
+TOPROV=65
+TOPEACE=65 5
+TOTAME=111
+}
+
+[snowleopard_lbr]
+{
+GET=base_snowleopard
+STR=56 80
+DEX=66 85
+INT=26 50
+MANAMAX=0
+FAME=450
+HIDING=50 250
+MAGICRESISTANCE=250 350
+PARRYING=550 650
+TACTICS=450 600
+WRESTLING=400 500
+DAMAGE=2 10
+DEF=12
+TOPROV=343
+TOPEACE=343 5
+TOTAME=531
+}
+
+[timberwolf_lbr]
+{
+GET=base_timberwolf
+STR=56 80
+DEX=56 75
+INT=11 25
+MANAMAX=0
+FAME=450
+HIDING=50 100
+MAGICRESISTANCE=280 450
+PARRYING=430 550
+TACTICS=300 500
+WRESTLING=400 600
+DAMAGE=4 10
+DEF=9
+TOPROV=294
+TOPEACE=294 5
+TOTAME=231
+}
+
+[whitewolf_lbr]
+{
+GET=base_whitewolf
+STR=56 80
+DEX=56 75
+INT=31 55
+MANAMAX=0
+FAME=450
+HIDING=50 200
+MAGICRESISTANCE=200 350
+PARRYING=450 550
+TACTICS=450 600
+WRESTLING=450 600
+DAMAGE=2 8
+DEF=8
+TOPROV=323
+TOPEACE=323 5
+TOTAME=651
+}
+
+[silverwolf_lbr]
+{
+GET=base_silverwolf
+STR=96 120
+DEX=81 105
+INT=36 60
+KARMA=2500
+FAME=2500
+HIDING=50 150
+MAGICRESISTANCE=580 750
+PARRYING=630 750
+TACTICS=500 700
+WRESTLING=600 800
+DAMAGE=6 22
+DEF=11
+TOPROV=503
+TOPEACE=503 5
+TOTAME=831
+}
+
+[squirrel_lbr]
+{
+GET=base_squirrel
+STR=44 50
+DEX=35
+INT=5
+MAGICRESISTANCE=40
+PARRYING=40
+TACTICS=40
+WRESTLING=40
+DAMAGE=1 2
+TOPROV=150
+TOPEACE=150 5
+TOTAME=0
+}
+
+[ferret_lbr]
+{
+GET=base_ferret
+STR=41 48
+DEX=55
+INT=75
+MAGICRESISTANCE=40
+PARRYING=40
+TACTICS=40
+WRESTLING=40
+DAMAGE=7 9
+DEF=1
+TOPROV=150
+TOPEACE=150 5
+TOTAME=0
+}
\ No newline at end of file

From 2b3d705f9fad5a698a02413b05bc2fdeb74fe06e Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Wed, 10 Sep 2025 22:18:22 -0500
Subject: [PATCH 2/3] Update animals_lbr.dfn

---
 data/dfndata/npc/npc_lbr/animals_lbr.dfn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dfndata/npc/npc_lbr/animals_lbr.dfn b/data/dfndata/npc/npc_lbr/animals_lbr.dfn
index 0db03894f..a121a03fc 100644
--- a/data/dfndata/npc/npc_lbr/animals_lbr.dfn
+++ b/data/dfndata/npc/npc_lbr/animals_lbr.dfn
@@ -161,7 +161,7 @@ FAME=300
 MAGICRESISTANCE=220 470
 PARRYING=280 530
 TACTICS=190 310
-FENCING=190 310
+WRESTLING=190 310
 DAMAGE=4 7
 DEF=6
 TOPROV=187

From f5d85e4a28f2dfd4347deaca669ecb033991e9bf Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Thu, 19 Feb 2026 18:04:45 -0600
Subject: [PATCH 3/3] update

---
 data/dfndata/npc/animals.dfn             |  31 +++++
 data/dfndata/npc/npc_aos/animals_aos.dfn | 147 ++---------------------
 2 files changed, 44 insertions(+), 134 deletions(-)

diff --git a/data/dfndata/npc/animals.dfn b/data/dfndata/npc/animals.dfn
index 02912a653..7c80bf03f 100644
--- a/data/dfndata/npc/animals.dfn
+++ b/data/dfndata/npc/animals.dfn
@@ -19,6 +19,7 @@ RUNS
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [brownbear]
@@ -48,6 +49,7 @@ RUNS
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [blackbear]
@@ -75,6 +77,7 @@ FOOD=boar
 CARVE=4
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [boar]
@@ -103,6 +106,7 @@ FOOD=hay
 CARVE=5
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [bull]
@@ -162,6 +166,7 @@ CARVE=7
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [cat]
@@ -191,6 +196,7 @@ CARVE=9
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [cougar]
@@ -219,6 +225,7 @@ CARVE=10
 RACE=9
 SCRIPT=3200
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [cow]
@@ -249,6 +256,7 @@ CARVE=13
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [dog]
@@ -276,6 +284,7 @@ FOOD=goat
 CARVE=20
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [goat]
@@ -304,6 +313,7 @@ CARVE=21
 RUNS
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [gorilla]
@@ -334,6 +344,7 @@ CARVE=23
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [greywolf]
@@ -368,6 +379,7 @@ RUNS
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [grizbear]
@@ -401,6 +413,7 @@ RUNS
 CARVE=22
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [hart]
@@ -441,6 +454,7 @@ CARVE=25
 RACE=9
 NPCAI=12
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [hind]
@@ -462,6 +476,7 @@ GETTOL=hind_aos
 {
 GET=base_animals
 NAME=5004//a jack rabbit
+ORIGIN=uo
 }
 
 [jackrabbit]
@@ -484,6 +499,7 @@ GETTOL=jackrabbit_aos
 GET=base_animals
 NAME=#//a mountain goat
 ID=0x0058
+ORIGIN=uo
 }
 
 [mountaingoat]
@@ -512,6 +528,7 @@ RUNS
 CARVE=32
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [packhorse]
@@ -540,6 +557,7 @@ RUNS
 CARVE=33
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [packllama]
@@ -569,6 +587,7 @@ CARVE=34
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [panther]
@@ -596,6 +615,7 @@ FOOD=boar
 CARVE=35
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [pig]
@@ -625,6 +645,7 @@ RUNS
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [polarbear]
@@ -654,6 +675,7 @@ CARVE=37
 RACE=9
 CONTROLSLOTS=1
 NPCAI=12
+ORIGIN=uo
 }
 
 [rabbit]
@@ -687,6 +709,7 @@ FOOD=rat
 CARVE=44
 RACE=23
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [rat]
@@ -721,6 +744,7 @@ CARVE=42
 RUNS
 RACE=9
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [sheep]
@@ -751,6 +775,7 @@ CARVE=46
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [snowleopard]
@@ -780,6 +805,7 @@ CARVE=23
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [timberwolf]
@@ -810,6 +836,7 @@ CARVE=50
 RACE=8
 NPCAI=6
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [whitewolf]
@@ -839,6 +866,7 @@ CARVE=12
 RACE=8
 NPCAI=5
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [silverwolf]
@@ -975,6 +1003,7 @@ RACE=9
 RUNS
 CONTROLSLOTS=1
 NPCAI=12
+ORIGIN=se
 }
 
 [vorpalbunny]
@@ -1004,6 +1033,7 @@ CARVE=12
 RACE=8
 NPCAI=5
 CONTROLSLOTS=1
+ORIGIN=uo
 }
 
 [whitewolf]
@@ -1033,6 +1063,7 @@ CARVE=12
 RACE=8
 NPCAI=5
 CONTROLSLOTS=1
+ORIGIN=aos
 }
 
 [skitteringhopper]
diff --git a/data/dfndata/npc/npc_aos/animals_aos.dfn b/data/dfndata/npc/npc_aos/animals_aos.dfn
index cc43aaa2c..71402f833 100644
--- a/data/dfndata/npc/npc_aos/animals_aos.dfn
+++ b/data/dfndata/npc/npc_aos/animals_aos.dfn
@@ -5,17 +5,14 @@ STR=76 100
 DEX=26 45
 INT=23 47
 HPMAX=46 60
-MANAMAX=0
 FAME=450
 WRESTLING=400 600
 TACTICS=400 600
-MAGICRESISTANCE=200 400
-DAMAGE=9 19
+MAGICRESISTANCE=250 350
+DAMAGE=6 12
 DEF=20 30
-RESISTFIRE=0 0
 RESISTCOLD=15 29
 RESISTPOISON=10 15
-RESISTLIGHTNING=0 0
 TOPROV=296
 TOPEACE=296 5
 TOTAME=411
@@ -28,17 +25,14 @@ STR=76 100
 DEX=56 75
 INT=11 14
 HPMAX=46 60
-MANAMAX=0
 FAME=450
 WRESTLING=400 600
 TACTICS=400 600
 MAGICRESISTANCE=200 400
-DAMAGE=6 16
-DEF=20 30
-RESISTFIRE=0 0
+DAMAGE=4 10
+DEF=20 25
 RESISTCOLD=10 15
 RESISTPOISON=5 10
-RESISTLIGHTNING=0 0
 TOPROV=310
 TOPEACE=310 5
 TOTAME=351
@@ -51,7 +45,6 @@ STR=25
 DEX=15
 INT=5
 HPMAX=15 15
-MANAMAX=0
 FAME=300
 WRESTLING=500
 TACTICS=500
@@ -59,9 +52,7 @@ MAGICRESISTANCE=900
 DAMAGE=3 7
 DEF=10 15
 RESISTFIRE=5 10
-RESISTCOLD=0 0
 RESISTPOISON=5 10
-RESISTLIGHTNING=0 0
 TOPROV=75
 TOPEACE=75 5
 TOTAME=291
@@ -74,17 +65,13 @@ STR=77 111
 DEX=56 75
 INT=47 75
 HPMAX=50 64
-MANAMAX=0
 FAME=600
 WRESTLING=400 58
 TACTICS=680 850
 MAGICRESISTANCE=180 250
-DAMAGE=7 17
+DAMAGE=4 9
 DEF=25 30
-RESISTFIRE=0 0
 RESISTCOLD=10 15
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=358
 TOPEACE=358 5
 TOTAME=711
@@ -97,18 +84,12 @@ STR=46 70
 DEX=6 25
 INT=11 20
 HPMAX=28 42
-MANAMAX=0
 FAME=350
 WRESTLING=400 600
 TACTICS=400 600
 MAGICRESISTANCE=250 400
-ANATOMY=0 1
 DAMAGE=1 3
 DEF=5 10
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=292
 TOPEACE=292 5
 TOTAME=231
@@ -121,17 +102,11 @@ STR=9
 DEX=35
 INT=5
 HPMAX=6 6
-MANAMAX=0
 WRESTLING=500
 TACTICS=400
 MAGICRESISTANCE=500
-ANATOMY=0 1
 DAMAGE=1 1
 DEF=5 10
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=60
 TOPEACE=60 5
 TOTAME=0
@@ -144,18 +119,15 @@ STR=56 80
 DEX=66 85
 INT=26 50
 HPMAX=34 48
-MANAMAX=0
 FAME=450
 WRESTLING=450 600
 TACTICS=450 600
 MAGICRESISTANCE=150 300
-ANATOMY=0 1
-DAMAGE=6 16
+DAMAGE=4 10
 DEF=20 25
 RESISTFIRE=5 10
 RESISTCOLD=10 15
 RESISTPOISON=5 10
-RESISTLIGHTNING=0 0
 TOPROV=333
 TOPEACE=333 5
 TOTAME=411
@@ -168,18 +140,12 @@ STR=30
 DEX=15
 INT=5
 HPMAX=18 18
-MANAMAX=0
 FAME=300
 WRESTLING=550
 TACTICS=550
 MAGICRESISTANCE=550
-ANATOMY=0 1
 DAMAGE=1 4
 DEF=5 15
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=66
 TOPEACE=66 5
 TOTAME=111
@@ -192,18 +158,12 @@ STR=27 37
 DEX=28 43
 INT=29 37
 HPMAX=17 22
-MANAMAX=0
 FAME=300
 WRESTLING=192 310
 TACTICS=192 310
 MAGICRESISTANCE=220 470
-ANATOMY=0 1
 DAMAGE=5 9
 DEF=10 15
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=187
 TOPEACE=187 5
 TOTAME=0
@@ -216,18 +176,12 @@ STR=19
 DEX=15
 INT=5
 HPMAX=12 12
-MANAMAX=0
 FAME=150
 WRESTLING=500 500
 TACTICS=500 500
 MAGICRESISTANCE=500 500
-ANATOMY=0 1
 DAMAGE=3 4
 DEF=5 15
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=54
 TOPEACE=54 5
 TOTAME=111
@@ -240,7 +194,6 @@ STR=53 95
 DEX=36 55
 INT=36 60
 HPMAX=38 51
-MANAMAX=0
 FAME=450
 WRESTLING=430 580
 TACTICS=430 580
@@ -250,8 +203,6 @@ DAMAGE=6 16
 DEF=20 25
 RESISTFIRE=5 10
 RESISTCOLD=10 15
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=311
 TOPEACE=311 5
 TOTAME=0
@@ -264,14 +215,11 @@ STR=56 80
 DEX=56 75
 INT=31 55
 HPMAX=34 48
-MANAMAX=0
-KARMA=0
 FAME=450
 WRESTLING=450 600
 TACTICS=450 600
 MAGICRESISTANCE=200 350
-ANATOMY=0 1
-DAMAGE=4 10
+DAMAGE=3 7
 DEF=15 20
 RESISTFIRE=10 15
 RESISTCOLD=20 25
@@ -289,15 +237,12 @@ STR=126 155
 DEX=81 105
 INT=16 40
 HPMAX=76 93
-MANAMAX=0
 FAME=1000
 WRESTLING=450 700
 TACTICS=700 1000
 MAGICRESISTANCE=250 400
-ANATOMY=0 1
-DAMAGE=16 26
+DAMAGE=8 13
 DEF=25 35
-RESISTFIRE=0 0
 RESISTCOLD=15 25
 RESISTPOISON=5 10
 RESISTLIGHTNING=5 10
@@ -313,18 +258,13 @@ STR=41 71
 DEX=47 77
 INT=27 57
 HPMAX=27 41
-MANAMAX=0
 FAME=300
 WRESTLING=30 48
 TACTICS=30 48
 MAGICRESISTANCE=270 450
-ANATOMY=0 1
 DAMAGE=7 13
 DEF=20 25
-RESISTFIRE=0 0
 RESISTCOLD=5 10
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=273
 TOPEACE=273 5
 TOTAME=591
@@ -337,18 +277,12 @@ STR=21 51
 DEX=47 77
 INT=17 47
 HPMAX=15 29
-MANAMAX=0
 FAME=300
 WRESTLING=260
 TACTICS=190
 MAGICRESISTANCE=150
-ANATOMY=0 1
 DAMAGE=4 5
 DEF=5 15
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=182
 TOPEACE=182 5
 TOTAME=231
@@ -361,18 +295,12 @@ STR=15
 DEX=25
 INT=5
 HPMAX=9 9
-MANAMAX=0
 FAME=150
 WRESTLING=500
 TACTICS=500
 MAGICRESISTANCE=500
-ANATOMY=0 1
 DAMAGE=1 2
 DEF=2 5
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=59
 TOPEACE=59 5
 TOTAME=0
@@ -385,12 +313,10 @@ STR=22 64
 DEX=56 75
 INT=16 30
 HPMAX=20 33
-MANAMAX=0
 FAME=300
 WRESTLING=290 440
 TACTICS=290 440
 MAGICRESISTANCE=250 300
-ANATOMY=0 1
 DAMAGE=4 9
 DEF=10 20
 RESISTFIRE=5 10
@@ -409,13 +335,11 @@ STR=44 120
 DEX=36 55
 INT=6 10
 HPMAX=61 80
-MANAMAX=0
 STAMINAMAX=81 100
 KARMA=200
 WRESTLING=290 440
 TACTICS=290 440
 MAGICRESISTANCE=250 300
-ANATOMY=0 1
 DAMAGE=7 16
 DEF=20 25
 RESISTFIRE=10 15
@@ -434,13 +358,11 @@ STR=52 80
 DEX=36 55
 INT=16 30
 HPMAX=50 50
-MANAMAX=0
 STAMINAMAX=86 105
 KARMA=200
 WRESTLING=190 290
 TACTICS=190 290
 MAGICRESISTANCE=150 200
-ANATOMY=0 1
 DAMAGE=2 8
 DEF=8 10
 RESISTFIRE=5 10
@@ -459,18 +381,15 @@ STR=61 85
 DEX=86 105
 INT=26 50
 HPMAX=37 51
-MANAMAX=0
 FAME=450
 WRESTLING=500 650
 TACTICS=500 650
 MAGICRESISTANCE=150 300
-ANATOMY=0 1
 DAMAGE=6 19
 DEF=20 25
 RESISTFIRE=5 10
 RESISTCOLD=10 15
 RESISTPOISON=5 10
-RESISTLIGHTNING=0 0
 TOPROV=365
 TOPEACE=365 5
 TOTAME=531
@@ -483,18 +402,12 @@ STR=20
 DEX=20
 INT=5
 HPMAX=12 12
-MANAMAX=0
 FAME=150
 WRESTLING=500
 TACTICS=500
 MAGICRESISTANCE=500
-ANATOMY=0 1
 DAMAGE=2 4
 DEF=10 15
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=59
 TOPEACE=59 5
 TOTAME=111
@@ -507,15 +420,12 @@ STR=116 140
 DEX=81 105
 INT=26 50
 HPMAX=70 84
-MANAMAX=0
 FAME=1500
 WRESTLING=450 700
 TACTICS=600 900
 MAGICRESISTANCE=450 600
-ANATOMY=0 1
-DAMAGE=13 23
+DAMAGE=7 12
 DEF=25 35
-RESISTFIRE=0 0
 RESISTCOLD=60 80
 RESISTPOISON=15 25
 RESISTLIGHTNING=10 15
@@ -531,18 +441,12 @@ STR=6 10
 DEX=26 38
 INT=6 14
 HPMAX=6 6
-MANAMAX=0
 FAME=150
 WRESTLING=500
 TACTICS=500
 MAGICRESISTANCE=500
-ANATOMY=0 1
 DAMAGE=1
 DEF=5 10
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=60
 TOPEACE=60 5
 TOTAME=0
@@ -555,7 +459,6 @@ STR=9
 DEX=35
 INT=5
 HPMAX=6 6
-MANAMAX=0
 KARMA=-150
 FAME=150
 WRESTLING=400
@@ -564,10 +467,6 @@ MAGICRESISTANCE=400
 ANATOMY=0 1
 DAMAGE=1 2
 DEF=5 10
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=60
 TOPEACE=60 5
 TOTAME=0
@@ -580,7 +479,6 @@ STR=19
 DEX=25
 INT=5
 HPMAX=12 12
-MANAMAX=0
 FAME=300
 WRESTLING=500
 TACTICS=600
@@ -588,10 +486,6 @@ MAGICRESISTANCE=500
 ANATOMY=0 1
 DAMAGE=1 2
 DEF=5 10
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=65
 TOPEACE=65 5
 TOTAME=111
@@ -604,12 +498,10 @@ STR=56 80
 DEX=66 85
 INT=26 50
 HPMAX=34 48
-MANAMAX=0
 FAME=450
 WRESTLING=400 500
 TACTICS=450 600
 MAGICRESISTANCE=250 350
-ANATOMY=0 1
 DAMAGE=4 14
 DEF=20 25
 RESISTFIRE=5 10
@@ -628,13 +520,11 @@ STR=56 80
 DEX=56 75
 INT=11 25
 HPMAX=34 48
-MANAMAX=0
 FAME=450
 WRESTLING=400 600
 TACTICS=300 500
-MAGICRESISTANCE=280 450
-ANATOMY=0 1
-DAMAGE=6 13
+MAGICRESISTANCE=270 450
+DAMAGE=5 9
 DEF=15 20
 RESISTFIRE=5 10
 RESISTCOLD=10 15
@@ -651,12 +541,12 @@ GET=base_whitewolf
 STR=56 80
 DEX=56 75
 INT=31 55
-MANAMAX=0
+HPMAX=34 48
 FAME=450
 MAGICRESISTANCE=200 350
 TACTICS=450 600
 WRESTLING=450 600
-DAMAGE=2 8
+DAMAGE=3 7
 DEF=15 20
 RESISTFIRE=5 10
 RESISTCOLD=10 15
@@ -679,7 +569,6 @@ FAME=2500
 WRESTLING=600 800
 TACTICS=500 700
 MAGICRESISTANCE=580 750
-ANATOMY=0 1
 DAMAGE=20 32
 DEF=20 25
 RESISTFIRE=10 20
@@ -742,7 +631,6 @@ DEX=2000 2000
 INT=1000 1000
 HPMAX=2000 2000
 STAMINAMAX=500 500
-MANAMAX=0
 FAME=1000
 WRESTLING=500
 TACTICS=500
@@ -750,10 +638,6 @@ MAGICRESISTANCE=500
 ANATOMY=0 1
 DAMAGE=1 1
 DEF=2 5
-RESISTFIRE=0 0
-RESISTCOLD=0 0
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=1580
 TOPEACE=1580 5
 TOTAME=2000
@@ -770,7 +654,6 @@ FAME=450
 WRESTLING=600 800
 TACTICS=500 700
 MAGICRESISTANCE=580 750
-ANATOMY=0 1
 DAMAGE=4 10
 DEF=15 20
 RESISTFIRE=10 15
@@ -793,13 +676,9 @@ HPMAX=31 45
 WRESTLING=401 600
 TACTICS=451 700
 MAGICRESISTANCE=301 450
-ANTOMY=0 1
 DAMAGE=4 7
 DEF=5 10
-RESISTFIRE=0 0
 RESISTCOLD=10 20
-RESISTPOISON=0 0
-RESISTLIGHTNING=0 0
 TOPROV=380
 TOPEACE=380 5
 TOTAME=0