From 53e2367e866600ad2f85c263c62daf9c7e4fba81 Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Sun, 14 Sep 2025 00:50:25 -0500
Subject: [PATCH 1/3] Dragons and Daemons Split

---
 data/dfndata/npc/champions.dfn           |  97 -----
 data/dfndata/npc/daemons.dfn             | 528 ++++++++++++-----------
 data/dfndata/npc/dragons.dfn             | 448 +++++++++----------
 data/dfndata/npc/npc_aos/dragons_aos.dfn | 334 ++++++++++++++
 data/dfndata/npc/npc_lbr/daemons_lbr.dfn | 317 ++++++++++++++
 data/dfndata/npc/npc_lbr/dragons_lbr.dfn | 229 ++++++++++
 data/dfndata/npc/undead.dfn              |  49 +++
 7 files changed, 1417 insertions(+), 585 deletions(-)
 create mode 100644 data/dfndata/npc/npc_aos/dragons_aos.dfn
 create mode 100644 data/dfndata/npc/npc_lbr/daemons_lbr.dfn
 create mode 100644 data/dfndata/npc/npc_lbr/dragons_lbr.dfn

diff --git a/data/dfndata/npc/champions.dfn b/data/dfndata/npc/champions.dfn
index 1e2a9ab24..4df99d861 100644
--- a/data/dfndata/npc/champions.dfn
+++ b/data/dfndata/npc/champions.dfn
@@ -29,70 +29,6 @@ FLAG=NEUTRAL
 ORIGIN=ml
 }
 
-[abyssmalhorror]
-{
-NAME=#//an abyssmal horror
-ID=0x0138
-DIRECTION=RND
-BACKPACK
-GOLD=1600 2000
-STR=401 420
-DEX=81 90
-INT=401 420
-HPMAX=6000
-KARMA=-26000
-FAME=26000
-MAGICRESISTANCE=1176 1200
-TACTICS=1000
-WRESTLING=841 880
-MAGERY=1126 1175
-EVALUATINGINTEL=2000
-MEDITATION=2000
-DAMAGE=19 35
-DEF=20
-SPATTACK=8
-SPADELAY=5
-NPCAI=2
-NPCWANDER=4
-FX2=10
-POISONSTRENGTH=4
-RACE=18
-FLAG=NEUTRAL
-ORIGIN=aos
-}
-
-[bonedaemon]
-{
-NAME=#//a bone daemon
-ID=0x0134
-DIRECTION=RND
-BACKPACK
-GOLD=4000 5000
-STR=1000
-DEX=151 175
-INT=171 220
-HPMAX=3600
-KARMA=-20000
-FAME=20000
-MAGICRESISTANCE=501 750
-TACTICS=1000
-WRESTLING=1000
-MAGERY=776 875
-EVALUATINGINTEL=776 875
-MEDITATION=1000
-DAMAGE=82 88
-DEF=20
-SPATTACK=6
-SPADELAY=5
-NPCAI=2
-NPCWANDER=4
-FX2=10
-RACE=18
-RUNS
-FLAG=NEUTRAL
-ORIGIN=aos
-}
-
 [barracoon]
 {
 NAME=Barracoon
@@ -518,39 +454,6 @@ FLAG=NEUTRAL
 ORIGIN=se
 }
 
-[shadowknight]
-{
-NAME=#//a shadowknight
-NAMELIST=17
-TITLE=5018//the Shadow Knight
-ID=0x137
-DIRECTION=RND
-BACKPACK
-GOLD=1600 2000
-STR=250
-DEX=100
-INT=100
-HPMAX=2000
-KARMA=-25000
-FAME=25000
-MAGICRESISTANCE=1200
-TACTICS=1000
-WRESTLING=1000
-MAGERY=1000
-EVALUATINGINTEL=1000
-MEDITATION=1000
-SPATTACK=8
-SPADELAY=5
-DAMAGE=41 65
-DEF=20
-NPCAI=2
-NPCWANDER=4
-FX2=10
-RUNS
-FLAG=NEUTRAL
-ORIGIN=aos
-}
-
 [shimmeringeffusion]
 {
 NAME=5008//Shimmering Effusion
diff --git a/data/dfndata/npc/daemons.dfn b/data/dfndata/npc/daemons.dfn
index a3fa2fc84..ace5dec36 100644
--- a/data/dfndata/npc/daemons.dfn
+++ b/data/dfndata/npc/daemons.dfn
@@ -6,379 +6,405 @@ BACKPACK
 NPCWANDER=4
 FX2=20
 NPCAI=2
+RACE=10
 FLAG=NEUTRAL
 }
 
 //------------------------------------------------------------------------------------------------//
 
-[balron]
+[base_abyssmalhorror]
+{
+GET=base_daemons
+NAME=#//an abyssmal horror
+ID=0x0138
+SPATTACK=8
+SPADELAY=5
+RACE=18
+ORIGIN=aos
+}
+
+[abyssmalhorror]
+{
+GETUO=abyssmalhorror_lbr
+GETT2A=abyssmalhorror_lbr
+GETUOR=abyssmalhorror_lbr
+GETTD=abyssmalhorror_lbr
+GETLBR=abyssmalhorror_lbr
+GETAOS=abyssmalhorror_lbr
+GETSE=abyssmalhorror_lbr
+GETML=abyssmalhorror_lbr
+GETSA=abyssmalhorror_lbr
+GETHS=abyssmalhorror_lbr
+GETTOL=abyssmalhorror_lbr
+}
+
+[base_balron]
 {
+GET=base_daemons
 NAME=#//a balron
 NAMELIST=7
 ID=0x0028
 SKIN=0x096c
-DIRECTION=RND
-BACKPACK
-GOLD=800 1200
-LOOT=midlevelscrolls,5
-LOOT=highlevelscrolls,3
-LOOT=reagents,20
-LOOT=TreasureMapLvl5Loot
-STR=1000 1200
-DEX=175 255
-INT=151 250
-KARMA=-13000
-FAME=13000
-ANATOMY=250 500
-EVALUATINGINTEL=700 1000
-MAGERY=960 1000
-MEDITATION=250 500
-MAGICRESISTANCE=1010 1500
-PARRYING=900 1000
-TACTICS=900 1000
-WRESTLING=900 1000
-DAMAGE=18 33
-DEF=32 50
 SPATTACK=8
 SPADELAY=4
-NPCAI=2
-NPCWANDER=4
-FX2=20
 FLEEAT=-1
-TOPROV=1145
-TOPEACE=1145 5
 CARVE=52
 RUNS
-RACE=10
-FLAG=NEUTRAL
 CONTROLSLOTS=4
 SCRIPT=3300
 }
 
-[daemon]
+[balron]
 {
+GETUO=balron_lbr
+GETT2A=balron_lbr
+GETUOR=balron_lbr
+GETTD=balron_lbr
+GETLBR=balron_lbr
+GETAOS=balron_lbr
+GETSE=balron_lbr
+GETML=balron_lbr
+GETSA=balron_lbr
+GETHS=balron_lbr
+GETTOL=balron_lbr
+}
+
+[base_daemon]
+{
+GET=base_daemons
 NAME=#//a daemon
 NAMELIST=5
 ID=0x0009
 SKIN=0000
-DIRECTION=RND
-BACKPACK
-GOLD=400 800
-PACKITEM=0x13ba
-LOOT=midlevelscrolls,2
-LOOT=highlevelscrolls
-LOOT=randomgems,5
-LOOT=TreasureMapLvl4Loot
-STR=476 505
-DEX=76 95
-INT=301 325
-KARMA=-9000
-FAME=9000
-MAGERY=700 800
-MAGICRESISTANCE=850 950
-PARRYING=650 750
-TACTICS=600 800
-WRESTLING=700 800
-SPATTACK=7
-SPADELAY=5
-DAMAGE=3 18
-DEF=25 30
-NPCWANDER=4
-FX2=20
 FLEEAT=-1
 NPCAI=2
 TOPROV=898
 TOPEACE=898 5
 CARVE=55
 RUNS
-RACE=10
-FLAG=NEUTRAL
 SCRIPT=3300
 }
 
-[armeddaemon]
+[daemon]
+{
+GETUO=daemon_lbr
+GETT2A=daemon_lbr
+GETUOR=daemon_lbr
+GETTD=daemon_lbr
+GETLBR=daemon_lbr
+GETAOS=daemon_lbr
+GETSE=daemon_lbr
+GETML=daemon_lbr
+GETSA=daemon_lbr
+GETHS=daemon_lbr
+GETTOL=daemon_lbr
+}
+
+[base_armeddaemon]
 {
-GET=daemon
+GET=base_daemons
 NAMELIST=5
 ID=0x000a
+SKIN=0000
+FLEEAT=-1
+NPCAI=2
+TOPROV=898
+TOPEACE=898 5
+CARVE=55
+RUNS
+SCRIPT=3300
 }
 
-[exodus]
+[armeddaemon]
+{
+GETUO=armeddaemon_lbr
+GETT2A=armeddaemon_lbr
+GETUOR=armeddaemon_lbr
+GETTD=armeddaemon_lbr
+GETLBR=armeddaemon_lbr
+GETAOS=armeddaemon_lbr
+GETSE=armeddaemon_lbr
+GETML=armeddaemon_lbr
+GETSA=armeddaemon_lbr
+GETHS=armeddaemon_lbr
+GETTOL=armeddaemon_lbr
+}
+
+[base_bonedaemon]
+{
+GET=base_daemons
+NAME=#//a bone daemon
+ID=0x0134
+SPATTACK=6
+SPADELAY=5
+RACE=18
+RUNS
+ORIGIN=aos
+}
+
+[bonedaemon]
 {
-GET=balron
+GETUO=bonedaemon_lbr
+GETT2A=bonedaemon_lbr
+GETUOR=bonedaemon_lbr
+GETTD=bonedaemon_lbr
+GETLBR=bonedaemon_lbr
+GETAOS=bonedaemon_lbr
+GETSE=bonedaemon_lbr
+GETML=bonedaemon_lbr
+GETSA=bonedaemon_lbr
+GETHS=bonedaemon_lbr
+GETTOL=bonedaemon_lbr
+}
+
+[base_exodus]
+{
+GET=base_daemons
 NAME=#//Exodus
 ID=0x0066
 SKIN=0x096c
+SPATTACK=8
+SPADELAY=4
+FLEEAT=-1
+CARVE=52
+RUNS
+CONTROLSLOTS=4
+SCRIPT=3300
 }
 
-[icefiend]
+[exodus]
+{
+GETUO=exodus_lbr
+GETT2A=exodus_lbr
+GETUOR=exodus_lbr
+GETTD=exodus_lbr
+GETLBR=exodus_lbr
+GETAOS=exodus_lbr
+GETSE=exodus_lbr
+GETML=exodus_lbr
+GETSA=exodus_lbr
+GETHS=exodus_lbr
+GETTOL=exodus_lbr
+}
+
+[base_icefiend]
 {
+GET=base_daemons
 NAME=#//an ice fiend
 ID=0x002b
-SKIN=0x0480
-DIRECTION=RND
-BACKPACK
-GOLD=700 900
-LOOT=midlevelscrolls,4
-LOOT=TreasureMapLvl4Loot
-STR=376 405
-DEX=176 195
-INT=201 225
-KARMA=-7000
-FAME=7000
-EVALUATINGINTEL=160 400
-MAGERY=800 900
-MAGICRESISTANCE=750 850
-PARRYING=750 850
-TACTICS=800 900
-WRESTLING=800 1000
-DAMAGE=3 24
-DEF=30
+//SKIN=0x0480 Newer OSI client doesnt need this color
 SPATTACK=6
 SPADELAY=6
-NPCWANDER=4
-FX2=20
 FLEEAT=-1
-NPCAI=2
-TOPROV=893
-TOPEACE=893 5
 RUNS
-RACE=10
-FLAG=NEUTRAL
 ORIGIN=t2a
 }
 
-[imp]
+[icefiend]
 {
+GETUO=icefiend_lbr
+GETT2A=icefiend_lbr
+GETUOR=icefiend_lbr
+GETTD=icefiend_lbr
+GETLBR=icefiend_lbr
+GETAOS=icefiend_lbr
+GETSE=icefiend_lbr
+GETML=icefiend_lbr
+GETSA=icefiend_lbr
+GETHS=icefiend_lbr
+GETTOL=icefiend_lbr
+}
+
+[base_imp]
+{
+GET=base_daemons
 NAME=#//an imp
 NAMELIST=5
 ID=0x004a
 SKIN=0x0676
-DIRECTION=RND
-BACKPACK
-GOLD=0 50
-LOOT=lowlevelscrolls
-LOOT=random_useless_junk
-STR=76 100
-DEX=61 80
-INT=86 110
-KARMA=-1500
-FAME=1500
-ANATOMY=900
-MAGERY=400 600
-MAGICRESISTANCE=350 500
-PARRYING=500 600
-TACTICS=550 700
-WRESTLING=600 750
-DAMAGE=3 18
-DEF=15
 SPATTACK=7
 SPADELAY=7
-NPCWANDER=4
-FX2=20
 NPCAI=11
-TOPROV=700
-TOPEACE=700 5
-TOTAME=831
 TAMEDHUNGER=600 30
 FOOD=meat
 CARVE=68
 RUNS
-RACE=10
-FLAG=NEUTRAL
 CONTROLSLOTS=2
 ORIGIN=t2a
 }
 
-[mongbat]
+[imp]
+{
+GETUO=imp_lbr
+GETT2A=imp_lbr
+GETUOR=imp_lbr
+GETTD=imp_lbr
+GETLBR=imp_lbr
+GETAOS=imp_lbr
+GETSE=imp_lbr
+GETML=imp_lbr
+GETSA=imp_lbr
+GETHS=imp_lbr
+GETTOL=imp_lbr
+}
+
+[base_mongbat]
 {
+GET=base_daemons
 NAME=#//a mongbat
 ID=0x0027
-DIRECTION=RND
-BACKPACK
-LOOT=random_useless_junk
-STR=6 10
-DEX=26 38
-INT=6 14
-HPMAX=4 6
-MAXMANA=0
-KARMA=-150
-FAME=150
-MAGICRESISTANCE=50 140
-PARRYING=250 380
-TACTICS=50 100
-WRESTLING=50 100
-DAMAGE=1 2
-DEF=5
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=99
-TOPEACE=99 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=meat
 CARVE=2
 RUNS
-RACE=10
-FLAG=NEUTRAL
 CONTROLSLOTS=1
 }
 
-[greatermongbat]
+[mongbat]
+{
+GETUO=mongbat_lbr
+GETT2A=mongbat_lbr
+GETUOR=mongbat_lbr
+GETTD=mongbat_lbr
+GETLBR=mongbat_lbr
+GETAOS=mongbat_lbr
+GETSE=mongbat_lbr
+GETML=mongbat_lbr
+GETSA=mongbat_lbr
+GETHS=mongbat_lbr
+GETTOL=mongbat_lbr
+}
+
+[base_greatermongbat]
 {
-GET=mongbat
+GET=base_daemons
 NAME=5011//a greater mongbat
 ID=0x0027
-GOLD=0 50
-STR=56 80
-DEX=61 80
-INT=26 50
-HPMAX=34 48
-WRESTLING=201 350
-TACTICS=351 500
-MAGICRESISTANCE=151 300
-DAMAGE=3 9
-DEF=10
-TOPROV=313
-TOPEACE=313 5
-TOTAME=711
+TAMEDHUNGER=600 30
+FOOD=meat
+CARVE=2
+RUNS
+CONTROLSLOTS=1
 }
 
-//AoS Daemons
-
 [arcanedaemon]
 {
+GETUO=greatermongbat_lbr
+GETT2A=greatermongbat_lbr
+GETUOR=greatermongbat_lbr
+GETTD=greatermongbat_lbr
+GETLBR=greatermongbat_lbr
+GETAOS=greatermongbat_lbr
+GETSE=greatermongbat_lbr
+GETML=greatermongbat_lbr
+GETSA=greatermongbat_lbr
+GETHS=greatermongbat_lbr
+GETTOL=greatermongbat_lbr
+}
+
+[base_arcanedaemon]
+{
+GET=base_daemons
 NAME=#//an arcane daemon
 ID=0x0310
-DIRECTION=RND
-BACKPACK
-GOLD=250 300
-LOOT=randompotions,3
-LOOT=lowlevelscrolls,3
-LOOT=midlevelscrolls,3
-KARMA=-10000
-FAME=7000
-STR=131 150
-DEX=126 145
-INT=301 350
-EVALUATINGINTEL=701 800
-MAGERY=801 900
-MAGICRESISTANCE=851 950
-MEDITATION=701 800
-TACTICS=701 800
-WRESTLING=601 800
-DAMAGE=4 22
-DEF=20
 SPATTACK=6
 SPADELAY=6
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=880
-TOPEACE=880 5
 CARVE=52
 RUNS
-RACE=10
-FLAG=NEUTRAL
 ORIGIN=aos
 }
 
-[moloch]
+[arcanedaemon]
 {
+GETUO=arcanedaemon_lbr
+GETT2A=arcanedaemon_lbr
+GETUOR=arcanedaemon_lbr
+GETTD=arcanedaemon_lbr
+GETLBR=arcanedaemon_lbr
+GETAOS=arcanedaemon_lbr
+GETSE=arcanedaemon_lbr
+GETML=arcanedaemon_lbr
+GETSA=arcanedaemon_lbr
+GETHS=arcanedaemon_lbr
+GETTOL=arcanedaemon_lbr
+}
+
+[base_moloch]
+{
+GET=base_daemons
 NAME=#//a moloch
 ID=0x0311
-DIRECTION=RND
-BACKPACK
-GOLD=300 350
-LOOT=randompotions,3
-LOOT=lowlevelscrolls,2
-LOOT=midlevelscrolls,2
-KARMA=-7500
-FAME=7500
-STR=331 360
-DEX=66 85
-INT=41 65
-MAGICRESISTANCE=650 700
-TACTICS=750 900
-WRESTLING=700 900
-DAMAGE=7 13
-DEF=20
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=725
-TOPEACE=725 5
 CARVE=52
 RUNS
-RACE=10
-FLAG=NEUTRAL
 ORIGIN=aos
 }
 
-[chaosdaemon]
+[moloch]
 {
+GETUO=moloch_lbr
+GETT2A=moloch_lbr
+GETUOR=moloch_lbr
+GETTD=moloch_lbr
+GETLBR=moloch_lbr
+GETAOS=moloch_lbr
+GETSE=moloch_lbr
+GETML=moloch_lbr
+GETSA=moloch_lbr
+GETHS=moloch_lbr
+GETTOL=moloch_lbr
+}
+
+[base_chaosdaemon]
+{
+GET=base_daemons
 NAME=#//a chaos daemon
 ID=0x0318
-DIRECTION=RND
-BACKPACK
-LOOT=randompotions,2
-LOOT=lowlevelscrolls
-LOOT=midlevelscrolls
-GOLD=175 225
-KARMA=-4000
-FAME=3000
-STR=106 130
-DEX=171 200
-INT=56 80
-HPMAX=91 110
-MAGICRESISTANCE=851 950
-TACTICS=701 800
-WRESTLING=951 1000
-DAMAGE=7 13
-DEF=15
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=715
-TOPEACE=715 5
 CARVE=52
 RUNS
-RACE=10
-FLAG=NEUTRAL
 ORIGIN=aos
 }
 
-[shadowfiend]
+[chaosdaemon]
+{
+GETUO=chaosdaemon_lbr
+GETT2A=chaosdaemon_lbr
+GETUOR=chaosdaemon_lbr
+GETTD=chaosdaemon_lbr
+GETLBR=chaosdaemon_lbr
+GETAOS=chaosdaemon_lbr
+GETSE=chaosdaemon_lbr
+GETML=chaosdaemon_lbr
+GETSA=chaosdaemon_lbr
+GETHS=chaosdaemon_lbr
+GETTOL=chaosdaemon_lbr
+}
+
+[base_shadowfiend]
 {
 GET=base_daemons
 NAME=#//a shadow fiend
 ID=0x00a8
-DIRECTION=RND
-GOLD=0 50
-STR=46 55
-DEX=121 130
-INT=46 55
-KARMA=-1000
-FAME=1000
-MAGICRESISTANCE=200 300
-TACTICS=200 300
-WRESTLING=200 300
-DAMAGE=3 12
-DEF=10
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=221
-TOPEACE=221 5
 CARVE=2
 RUNS
-RACE=10
-FLAG=NEUTRAL
 ORIGIN=uor
 SCRIPT=3228//shadowfiend.js
 }
 
+[shadowfiend]
+{
+GETUO=shadowfiend_lbr
+GETT2A=shadowfiend_lbr
+GETUOR=shadowfiend_lbr
+GETTD=shadowfiend_lbr
+GETLBR=shadowfiend_lbr
+GETAOS=shadowfiend_lbr
+GETSE=shadowfiend_lbr
+GETML=shadowfiend_lbr
+GETSA=shadowfiend_lbr
+GETHS=shadowfiend_lbr
+GETTOL=shadowfiend_lbr
+}
+
 //oni - Base NPC with shared DFN tags
 [base_oni]
 {
diff --git a/data/dfndata/npc/dragons.dfn b/data/dfndata/npc/dragons.dfn
index 61c3cc93a..9d0bc61df 100644
--- a/data/dfndata/npc/dragons.dfn
+++ b/data/dfndata/npc/dragons.dfn
@@ -1,346 +1,320 @@
-[graydragon]
+// Base dragons with shared DFN tags
+[base_dragons]
 {
-NAME=#//a dragon
-ID=0x000c
 DIRECTION=RND
 BACKPACK
-GOLD=1200 1400
-PACKITEM=0x0f84,4
-LOOT=randomgems,10
-LOOT=lowlevelscrolls,2
-LOOT=midlevelscrolls,4
-LOOT=highlevelscrolls,6
-LOOT=TreasureMapLvl4Loot
-STR=796 825
-DEX=86 105
-INT=436 475
-KARMA=-15000
-FAME=15000
-ANATOMY=990
-MAGERY=300 400
-MAGICRESISTANCE=990 1000
-PARRYING=550 950
-TACTICS=980 1000
-WRESTLING=900 930
-DAMAGE=9 29
-DEF=30
-SPATTACK=7
-SPADELAY=4
-NPCAI=2
 NPCWANDER=4
 FX2=20
-TOPROV=1050
-TOPEACE=1050 5
-TOTAME=939
+FLAG=NEUTRAL
+NPCAI=2
+RACE=12
+}
+
+[base_graydragon]
+{
+GET=base_dragons
+NAME=#//a dragon
+ID=0x000c
+SPATTACK=7
+SPADELAY=4
 TAMEDHUNGER=600 30
 FOOD=meat
 CARVE=57
-RACE=12
-FLAG=NEUTRAL
-CONTROLSLOTS=3
 RUNS
 SCRIPT=3300
 SCRIPT=3507
 }
 
-[reddragon]
+[graydragon]
+{
+GETUO=graydragon_lbr
+GETT2A=graydragon_lbr
+GETUOR=graydragon_lbr
+GETTD=graydragon_lbr
+GETLBR=graydragon_lbr
+GETAOS=graydragon_aos
+GETSE=graydragon_aos
+GETML=graydragon_aos
+GETSA=graydragon_aos
+GETHS=graydragon_aos
+GETTOL=graydragon_aos
+}
+
+[base_reddragon]
 {
 GET=graydragon
 NAME=#//a dragon
 ID=0x003b
 }
 
-[dragon]
+[reddragon]
+{
+GETUO=reddragon_lbr
+GETT2A=reddragon_lbr
+GETUOR=reddragon_lbr
+GETTD=reddragon_lbr
+GETLBR=reddragon_lbr
+GETAOS=reddragon_aos
+GETSE=reddragon_aos
+GETML=reddragon_aos
+GETSA=reddragon_aos
+GETHS=reddragon_aos
+GETTOL=reddragon_aos
+}
+
+[base_dragon]
 {
 GET=graydragon reddragon
 }
 
-[graydrake]
+[dragon]
 {
+GETUO=dragon_lbr
+GETT2A=dragon_lbr
+GETUOR=dragon_lbr
+GETTD=dragon_lbr
+GETLBR=dragon_lbr
+GETAOS=dragon_aos
+GETSE=dragon_aos
+GETML=dragon_aos
+GETSA=dragon_aos
+GETHS=dragon_aos
+GETTOL=dragon_aos
+}
+
+[base_graydrake]
+{
+GET=base_dragons
 NAME=#//a drake
 ID=0x003c
-DIRECTION=RND
-BACKPACK
-GOLD=100 250
-LOOT=randomgems,5
-LOOT=lowlevelscrolls,2
-LOOT=midlevelscrolls,2
-LOOT=TreasureMapLvl2Loot
-STR=401 430
-DEX=133 152
-INT=101 140
-KARMA=-5500
-FAME=5500
-MAGICRESISTANCE=650 800
-PARRYING=650 800
-TACTICS=650 900
-WRESTLING=651 800
-DAMAGE=4 24
-DEF=23
 SPATTACK=6
 SPADELAY=5
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=806
-TOPEACE=806 5
-TOTAME=843
 TAMEDHUNGER=600 30
 FOOD=carnivore
 CARVE=58
-RACE=12
-FLAG=NEUTRAL
-CONTROLSLOTS=2
 RUNS
 SCRIPT=3300
 }
 
-[reddrake]
+[graydrake]
+{
+GETUO=graydrake_lbr
+GETT2A=graydrake_lbr
+GETUOR=graydrake_lbr
+GETTD=graydrake_lbr
+GETLBR=graydrake_lbr
+GETAOS=graydrake_aos
+GETSE=graydrake_aos
+GETML=graydrake_aos
+GETSA=graydrake_aos
+GETHS=graydrake_aos
+GETTOL=graydrake_aos
+}
+
+[base_reddrake]
 {
 GET=graydrake
 NAME=#//a drake
 ID=0x003d
 }
 
-[drake]
+[reddrake]
+{
+GETUO=reddrake_lbr
+GETT2A=reddrake_lbr
+GETUOR=reddrake_lbr
+GETTD=reddrake_lbr
+GETLBR=reddrake_lbr
+GETAOS=reddrake_aos
+GETSE=reddrake_aos
+GETML=reddrake_aos
+GETSA=reddrake_aos
+GETHS=reddrake_aos
+GETTOL=reddrake_aos
+}
+
+[base_drake]
 {
 GET=graydrake reddrake
 }
 
-[shadowwyrm]
+[drake]
 {
+GETUO=drake_lbr
+GETT2A=drake_lbr
+GETUOR=drake_lbr
+GETTD=drake_lbr
+GETLBR=drake_lbr
+GETAOS=drake_aos
+GETSE=drake_aos
+GETML=drake_aos
+GETSA=drake_aos
+GETHS=drake_aos
+GETTOL=drake_aos
+}
+
+[base_shadowwyrm]
+{
+GET=base_dragons
 NAME=#//a shadow wyrm
 ID=0x006a
-DIRECTION=RND
-BACKPACK
-GOLD=1200 2000
-LOOT=randomgems,10
-LOOT=midlevelscrolls,6
-LOOT=TreasureMapLvl5Loot
-STR=900 1000
-DEX=68 200
-INT=488 620
-KARMA=-22500
-FAME=22500
-EVALUATINGINTEL=510 1000
-MAGERY=800 1000
-MAGICRESISTANCE=1000 1300
-MEDITATION=530 750
-PARRYING=550 950
-TACTICS=980 1000
-WRESTLING=980 1000
-POISONSTRENGTH=4
-POISONCHANCE=5
-DAMAGE=11 53
-DEF=35
-NPCAI=2
-NPCWANDER=4
-FX2=20
 SPATTACK=8
 SPADELAY=3
-TOPROV=1249
-TOPEACE=1249 5
 CARVE=51
-RACE=12
-FLAG=NEUTRAL
 FOOD=carnivore
-CONTROLSLOTS=5
 ORIGIN=uor
 SCRIPT=3300
 SCRIPT=3507
 }
 
-[whitewyrm]
+[shadowwyrm]
+{
+GETUO=shadowwyrm_lbr
+GETT2A=shadowwyrm_lbr
+GETUOR=shadowwyrm_lbr
+GETTD=shadowwyrm_lbr
+GETLBR=shadowwyrm_lbr
+GETAOS=shadowwyrm_aos
+GETSE=shadowwyrm_aos
+GETML=shadowwyrm_aos
+GETSA=shadowwyrm_aos
+GETHS=shadowwyrm_aos
+GETTOL=shadowwyrm_aos
+}
+
+[base_whitewyrm]
 {
+GET=base_dragons
 NAME=#//a white wyrm
 ID=0x0031
-DIRECTION=RND
-BACKPACK
-GOLD=600 1400
-LOOT=randomgems,8
-LOOT=midlevelscrolls,3
-LOOT=TreasureMapLvl4Loot
-STR=721 760
-DEX=101 130
-INT=386 425
-KARMA=-18000
-FAME=18000
-ANATOMY=1010
-MAGERY=990 1000
-MAGICRESISTANCE=990 1000
-PARRYING=700 900
-TACTICS=980 1000
-WRESTLING=900 1000
-DAMAGE=9 33
-DEF=32
-NPCAI=2
-NPCWANDER=4
-FX2=20
 SPATTACK=7
 SPADELAY=4
-TOPROV=1003
-TOPEACE=1003 5
-TOTAME=963
 TAMEDHUNGER=600 30
 FOOD=carnivore
 CARVE=51
-RACE=12
-FLAG=NEUTRAL
-CONTROLSLOTS=3
 ORIGIN=t2a
 }
 
-[ancientwyrm]
+[whitewyrm]
 {
+GETUO=whitewyrm_lbr
+GETT2A=whitewyrm_lbr
+GETUOR=whitewyrm_lbr
+GETTD=whitewyrm_lbr
+GETLBR=whitewyrm_lbr
+GETAOS=whitewyrm_aos
+GETSE=whitewyrm_aos
+GETML=whitewyrm_aos
+GETSA=whitewyrm_aos
+GETHS=whitewyrm_aos
+GETTOL=whitewyrm_aos
+}
+
+[base_ancientwyrm]
+{
+GET=base_dragons
 NAME=#//an ancient wyrm
 ID=0x002e
-DIRECTION=RND
-BACKPACK
-GOLD=1100 1300
-LOOT=randomgems,5
-LOOT=midlevelscrolls,6
-LOOT=highlevelscrolls,2
-LOOT=TreasureMapLvl5Loot
-STR=1100 1200
-DEX=86 175
-INT=686 775
-KARMA=-22500
-FAME=22500
-EVALUATINGINTEL=510 1000
-MAGERY=800 1000
-MAGICRESISTANCE=1010 1500
-MEDITATION=530 750
-PARRYING=550 950
-TACTICS=980 1000
-WRESTLING=980 1000
-DAMAGE=11 53
-DEF=35
-NPCAI=2
-NPCWANDER=4
-FX2=20
 SPATTACK=8
 SPADELAY=4
-TOPROV=1314
-TOPEACE=1314 5
 CARVE=51
-RACE=12
 FLAG=EVIL
 SCRIPT=3300
 SCRIPT=3507
 }
 
-[wyvern]
+[ancientwyrm]
 {
+GETUO=ancientwyrm_lbr
+GETT2A=ancientwyrm_lbr
+GETUOR=ancientwyrm_lbr
+GETTD=ancientwyrm_lbr
+GETLBR=ancientwyrm_lbr
+GETAOS=ancientwyrm_aos
+GETSE=ancientwyrm_aos
+GETML=ancientwyrm_aos
+GETSA=ancientwyrm_aos
+GETHS=ancientwyrm_aos
+GETTOL=ancientwyrm_aos
+}
+
+[base_wyvern]
+{
+GET=base_dragons
 NAME=#//a wyvern
 ID=0x003e
-DIRECTION=RND
-BACKPACK
-GOLD=250 300
-LOOT=midlevelscrolls
-LOOT=midlevelscrolls
-LOOT=midlevelscrolls
-LOOT=TreasureMapLvl2Loot
-STR=202 240
-DEX=153 172
-INT=51 90
-KARMA=-4000
-FAME=4000
-MAGICRESISTANCE=650 800
-PARRYING=650 800
-TACTICS=650 900
-WRESTLING=650 800
-POISONING=600 800
-POISONSTRENGTH=4
-DAMAGE=3 24
-DEF=20
-NPCWANDER=4
-FX2=20
-NPCAI=2
-TOPROV=782
-TOPEACE=782 5
 CARVE=96
-RACE=12
 FLAG=NEUTRAL
 ORIGIN=t2a
 }
 
-[serpentinedragon]
+[wyvern]
 {
+GETUO=wyvern_lbr
+GETT2A=wyvern_lbr
+GETUOR=wyvern_lbr
+GETTD=wyvern_lbr
+GETLBR=wyvern_lbr
+GETAOS=wyvern_aos
+GETSE=wyvern_aos
+GETML=wyvern_aos
+GETSA=wyvern_aos
+GETHS=wyvern_aos
+GETTOL=wyvern_aos
+}
+
+[base_serpentinedragon]
+{
+GET=base_dragons
 NAME=#//a serpentine dragon
 ID=0x0067
-DIRECTION=RND
-BACKPACK
-GOLD=1100 1300
-LOOT=randomgems,7
-LOOT=lowlevelscrolls,2
-LOOT=midlevelscrolls,4
-LOOT=highlevelscrolls,2
-STR=111 140
-DEX=201 220
-INT=1001 1040
-HPMAX=800
-KARMA=-15000
-FAME=15000
-EVALUATINGINTEL=1000
-MAGERY=1100 1200
-MAGICRESISTANCE=1000
-MEDITATION=1000
-PARRYING=550 950
-TACTICS=500 600
-WRESTLING=300 1000
-DAMAGE=5 12
-DEF=18
-NPCWANDER=4
-FX2=20
 SPATTACK=8
 SPADELAY=4
-TOPROV=1288
-TOPEACE=1288 5
 CARVE=51
-RACE=12
-FLAG=NEUTRAL
 ORIGIN=td
 SCRIPT=3300
 SCRIPT=3507
 }
 
-[skeletaldragon]
+[serpentinedragon]
+{
+GETUO=serpentinedragon_lbr
+GETT2A=serpentinedragon_lbr
+GETUOR=serpentinedragon_lbr
+GETTD=serpentinedragon_lbr
+GETLBR=serpentinedragon_lbr
+GETAOS=serpentinedragon_aos
+GETSE=serpentinedragon_aos
+GETML=serpentinedragon_aos
+GETSA=serpentinedragon_aos
+GETHS=serpentinedragon_aos
+GETTOL=serpentinedragon_aos
+}
+
+[base_skeletaldragon]
 {
+GET=base_dragons
 NAME=#//a skeletal dragon
 ID=0x0068
-DIRECTION=RND
-BACKPACK
-GOLD=1500 2000
-LOOT=randomgems,6
-LOOT=midlevelscrolls,6
-LOOT=highlevelscrolls,3
-STR=900 1000
-DEX=68 200
-INT=488 620
-KARMA=-22500
-FAME=22500
-EVALUATINGINTEL=510 1000
-MAGERY=800 1000
-MAGICRESISTANCE=1000 1300
-MEDITATION=530 750
-PARRYING=550 950
-TACTICS=980 600
-WRESTLING=980 1000
-DAMAGE=11 53
-DEF=40
-NPCWANDER=4
-FX2=20
-NPCAI=2
 SPATTACK=8
 SPADELAY=5
-TOPEACE=1183 5
-FLEEAT=-1
 CARVE=51
-RACE=12
-FLAG=NEUTRAL
-CONTROLSLOTS=3
 ORIGIN=td
 SCRIPT=3300
 SCRIPT=3507
 }
 
+[skeletaldragon]
+{
+GETUO=skeletaldragon_lbr
+GETT2A=skeletaldragon_lbr
+GETUOR=skeletaldragon_lbr
+GETTD=skeletaldragon_lbr
+GETLBR=skeletaldragon_lbr
+GETAOS=skeletaldragon_aos
+GETSE=skeletaldragon_aos
+GETML=skeletaldragon_aos
+GETSA=skeletaldragon_aos
+GETHS=skeletaldragon_aos
+GETTOL=skeletaldragon_aos
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_aos/dragons_aos.dfn b/data/dfndata/npc/npc_aos/dragons_aos.dfn
new file mode 100644
index 000000000..d0730becd
--- /dev/null
+++ b/data/dfndata/npc/npc_aos/dragons_aos.dfn
@@ -0,0 +1,334 @@
+[graydragon_aos]
+{
+GET=base_graydragon
+PACKITEM=0x0f84,4
+GOLD=1000 1200
+LOOT=randomgems,10
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,4
+LOOT=highlevelscrolls,6
+LOOT=TreasureMapLvl4Loot
+PACKITEM=0x0f84,4
+STR=796 825
+DEX=86 105
+INT=436 475
+HPMAX=478 495
+KARMA=-15000
+FAME=15000
+WRESTLING=901 925
+TACTICS=976 1000
+MAGERY=301 400
+MAGICRESISTANCE=991 1000
+EVALUATINGINTEL=301 400
+DAMAGE=16 22
+DEF=55 65
+RESISTFIRE=60 70
+RESISTCOLD=30 40
+RESISTPOISON=25 35
+RESISTLIGHTNING=35 45
+}
+
+[reddragon_aos]
+{
+GET=base_reddragon
+GOLD=1000 1200
+STR=796 825
+DEX=86 105
+INT=436 475
+HPMAX=478 495
+KARMA=-15000
+FAME=15000
+WRESTLING=901 925
+TACTICS=976 1000
+MAGERY=301 400
+MAGICRESISTANCE=991 1000
+EVALUATINGINTEL=301 400
+DAMAGE=16 22
+DEF=55 65
+RESISTFIRE=60 70
+RESISTCOLD=30 40
+RESISTPOISON=25 35
+RESISTLIGHTNING=35 45
+}
+
+[dragon_aos]
+{
+GET=base_dragon
+GOLD=1000 1200
+STR=796 825
+DEX=86 105
+INT=436 475
+HPMAX=478 495
+KARMA=-15000
+FAME=15000
+WRESTLING=901 925
+TACTICS=976 1000
+MAGERY=301 400
+MAGICRESISTANCE=991 1000
+EVALUATINGINTEL=301 400
+DAMAGE=16 22
+DEF=55 65
+RESISTFIRE=60 70
+RESISTCOLD=30 40
+RESISTPOISON=25 35
+RESISTLIGHTNING=35 45
+TOTAME=939
+TOPROV=1050
+TOPEACE=1050 5
+CONTROLSLOTS=3
+}
+
+[graydrake_aos]
+{
+GET=base_graydrake
+GOLD=275 325
+LOOT=randomgems,5
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,2
+LOOT=TreasureMapLvl2Loot
+STR=401 430
+DEX=133 152
+INT=101 140
+HPMAX=241 258
+KARMA=-5500
+FAME=5500
+WRESTLING=651 800
+TACTICS=651 900
+MAGERY=0 0
+MAGICRESISTANCE=651 800
+EVALUATINGINTEL=0 0
+DAMAGE=11 17
+DEF=45 50
+RESISTFIRE=50 60
+RESISTCOLD=40 50
+RESISTPOISON=20 30
+RESISTLIGHTNING=30 40
+TOTAME=843
+TOPROV=806
+TOPEACE=806 5
+CONTROLSLOTS=2
+}
+
+[reddrake_aos]
+{
+GET=base_reddrake
+GOLD=275 325
+STR=401 430
+DEX=133 152
+INT=101 140
+HPMAX=241 258
+KARMA=-5500
+FAME=5500
+WRESTLING=651 800
+TACTICS=651 900
+MAGERY=0 0
+MAGICRESISTANCE=651 800
+EVALUATINGINTEL=0 0
+DAMAGE=11 17
+DEF=45 50
+RESISTFIRE=50 60
+RESISTCOLD=40 50
+RESISTPOISON=20 30
+RESISTLIGHTNING=30 40
+}
+
+[drake_aos]
+{
+GET=base_drake
+GOLD=275 325
+STR=401 430
+DEX=133 152
+INT=101 140
+HPMAX=241 258
+KARMA=-5500
+FAME=5500
+WRESTLING=651 800
+TACTICS=651 900
+MAGERY=0 0
+MAGICRESISTANCE=651 800
+EVALUATINGINTEL=0 0
+DAMAGE=11 17
+DEF=45 50
+RESISTFIRE=50 60
+RESISTCOLD=40 50
+RESISTPOISON=20 30
+RESISTLIGHTNING=30 40
+}
+
+[whitewyrm_aos]
+{
+GET=base_whitewyrm
+GOLD=1200 1400
+LOOT=randomgems,8
+LOOT=midlevelscrolls,3
+LOOT=TreasureMapLvl4Loot
+STR=721 760
+DEX=101 130
+INT=386 425
+HPMAX=433 456
+KARMA=-18000
+FAME=18000
+WRESTLING=901 1000
+TACTICS=976 1000
+MAGERY=991 1000
+MAGICRESISTANCE=991 1000
+EVALUATINGINTEL=991 1000
+DAMAGE=17 25
+DEF=55 70
+RESISTFIRE=15 25
+RESISTCOLD=80 90
+RESISTPOISON=40 50
+RESISTLIGHTNING=40 50
+TOTAME=963
+TOPROV=1003
+TOPEACE=1003 5
+CONTROLSLOTS=3
+}
+
+[ancientwyrm_aos]
+{
+GET=base_ancientwyrm
+GOLD=1600 1800
+LOOT=randomgems,5
+LOOT=midlevelscrolls,6
+LOOT=highlevelscrolls,2
+LOOT=TreasureMapLvl5Loot
+STR=1096 1185
+DEX=86 175
+INT=847 847
+HPMAX=1177 1177
+KARMA=-22500
+FAME=22500
+WRESTLING=1100 1100
+TACTICS=1270 1270
+MAGERY=1097 1097
+MAGICRESISTANCE=1005 1500
+EVALUATINGINTEL=1090 1090
+MEDITATION=525 750
+DAMAGE=29 35
+DEF=65 75
+RESISTFIRE=80 90
+RESISTCOLD=70 80
+RESISTPOISON=60 70
+RESISTLIGHTNING=60 70
+TOPROV=1314
+TOPEACE=1314 5
+}
+
+[wyvern_aos]
+{
+GET=base_wyvern
+GOLD=175 225
+LOOT=midlevelscrolls
+LOOT=TreasureMapLvl2Loot
+STR=202 240
+DEX=153 209
+INT=51 90
+HPMAX=125 141
+KARMA=-4000
+FAME=4000
+WRESTLING=651 800
+TACTICS=651 900
+MAGERY=0 0
+MAGICRESISTANCE=651 800
+EVALUATINGINTEL=0 0
+POISONING=601 800
+DAMAGE=8 19
+DEF=35 45
+RESISTFIRE=30 40
+RESISTCOLD=20 30
+RESISTPOISON=90 100
+RESISTLIGHTNING=30 40
+TOPROV=782
+TOPEACE=782 5
+}
+
+[serpentinedragon_aos]
+{
+GET=base_serpentinedragon
+GOLD=1000 1200
+LOOT=randomgems,7
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,4
+LOOT=highlevelscrolls,2
+STR=796 825
+DEX=86 105
+INT=436 475
+HPMAX=478 495
+KARMA=-15000
+FAME=15000
+WRESTLING=901 925
+TACTICS=976 1000
+MAGERY=301 400
+MAGICRESISTANCE=991 1000
+EVALUATINGINTEL=301 400
+DAMAGE=16 22
+DEF=55 65
+RESISTFIRE=60 70
+RESISTCOLD=30 40
+RESISTPOISON=25 35
+RESISTLIGHTNING=35 45
+TOPROV=1288
+TOPEACE=1288 5
+}
+
+[skeletaldragon_aos]
+{
+GET=base_skeletaldragon
+GOLD=1600 1800
+LOOT=randomgems,6
+LOOT=midlevelscrolls,6
+LOOT=highlevelscrolls,3
+STR=898 1030
+DEX=68 200
+INT=488 620
+HPMAX=561 599
+MANAMAX=488 620
+KARMA=-22500
+FAME=22500
+WRESTLING=976 1000
+TACTICS=976 1000
+MAGERY=801 1000
+MAGICRESISTANCE=1003 1300
+EVALUATINGINTEL=801 1000
+DAMAGE=29 35
+DEF=75 80
+RESISTFIRE=40 60
+RESISTCOLD=40 60
+RESISTPOISON=70 80
+RESISTLIGHTNING=40 60
+TOPROV=1183
+TOPEACE=1183 5
+CONTROLSLOTS=3
+}}
+
+[shadowwyrm_aos]
+{
+GET=base_shadowwyrm
+GOLD=1550 1800
+LOOT=randomgems,10
+LOOT=midlevelscrolls,6
+LOOT=TreasureMapLvl5Loot
+STR=898 1030
+DEX=68 200
+INT=488 620
+HPMAX=561 599
+MANAMAX=488 620
+KARMA=-22500
+FAME=22500
+WRESTLING=976 1000
+TACTICS=976 1000
+MAGERY=801 1000
+MAGICRESISTANCE=1003 1300
+EVALUATINGINTEL=801 1000
+MEDITATION=525 750
+DAMAGE=29 35
+DEF=65 75
+RESISTFIRE=50 60
+RESISTCOLD=45 55
+RESISTPOISON=20 30
+RESISTLIGHTNING=50 60
+TOPROV=1249
+TOPEACE=1249 5
+CONTROLSLOTS=5
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_lbr/daemons_lbr.dfn b/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
new file mode 100644
index 000000000..6f1cb52e4
--- /dev/null
+++ b/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
@@ -0,0 +1,317 @@
+[abyssmalhorror_lbr]
+{
+GET=base_abyssmalhorror
+GOLD=1600 2000
+STR=401 420
+DEX=81 90
+INT=401 420
+HPMAX=6000
+KARMA=-26000
+FAME=26000
+MAGICRESISTANCE=1176 1200
+TACTICS=1000
+WRESTLING=841 880
+MAGERY=1126 1175
+EVALUATINGINTEL=2000
+MEDITATION=2000
+DAMAGE=19 35
+DEF=20
+POISONSTRENGTH=4
+}
+
+[balron_lbr]
+{
+GET=base_balron
+GOLD=800 1200
+LOOT=midlevelscrolls,5
+LOOT=highlevelscrolls,3
+LOOT=reagents,20
+LOOT=TreasureMapLvl5Loot
+STR=1000 1200
+DEX=175 255
+INT=151 250
+KARMA=-13000
+FAME=13000
+ANATOMY=250 500
+EVALUATINGINTEL=700 1000
+MAGERY=960 1000
+MEDITATION=250 500
+MAGICRESISTANCE=1010 1500
+PARRYING=900 1000
+TACTICS=900 1000
+WRESTLING=900 1000
+DAMAGE=18 33
+DEF=32 50
+TOPROV=1145
+TOPEACE=1145 5
+}
+
+[daemon_lbr]
+{
+GET=base_daemon
+GOLD=400 800
+PACKITEM=0x13ba
+LOOT=midlevelscrolls,2
+LOOT=highlevelscrolls
+LOOT=randomgems,5
+LOOT=TreasureMapLvl4Loot
+STR=476 505
+DEX=76 95
+INT=301 325
+KARMA=-9000
+FAME=9000
+MAGERY=700 800
+MAGICRESISTANCE=850 950
+PARRYING=650 750
+TACTICS=600 800
+WRESTLING=700 800
+DAMAGE=3 18
+DEF=25 30
+TOPROV=898
+TOPEACE=898 5
+}
+
+[armeddaemon_lbr]
+{
+GET=base_armeddaemon
+GOLD=400 800
+PACKITEM=0x13ba
+LOOT=midlevelscrolls,2
+LOOT=highlevelscrolls
+LOOT=randomgems,5
+LOOT=TreasureMapLvl4Loot
+STR=476 505
+DEX=76 95
+INT=301 325
+KARMA=-9000
+FAME=9000
+MAGERY=700 800
+MAGICRESISTANCE=850 950
+PARRYING=650 750
+TACTICS=600 800
+WRESTLING=700 800
+DAMAGE=3 18
+DEF=25 30
+TOPROV=898
+TOPEACE=898 5
+}
+
+[bonedaemon_lbr]
+{
+GET=base_bonedaemon
+GOLD=4000 5000
+STR=1000
+DEX=151 175
+INT=171 220
+HPMAX=3600
+KARMA=-20000
+FAME=20000
+MAGICRESISTANCE=501 750
+TACTICS=1000
+WRESTLING=1000
+MAGERY=776 875
+EVALUATINGINTEL=776 875
+MEDITATION=1000
+DAMAGE=82 88
+DEF=20
+}
+
+[exodus_lbr]
+{
+GET=base_exodus
+GOLD=800 1200
+LOOT=midlevelscrolls,5
+LOOT=highlevelscrolls,3
+LOOT=reagents,20
+LOOT=TreasureMapLvl5Loot
+STR=1000 1200
+DEX=175 255
+INT=151 250
+KARMA=-13000
+FAME=13000
+ANATOMY=250 500
+EVALUATINGINTEL=700 1000
+MAGERY=960 1000
+MEDITATION=250 500
+MAGICRESISTANCE=1010 1500
+PARRYING=900 1000
+TACTICS=900 1000
+WRESTLING=900 1000
+DAMAGE=18 33
+DEF=32 50
+TOPROV=1145
+TOPEACE=1145 5
+}
+
+[icefiend_lbr]
+{
+GET=base_icefiend
+GOLD=700 900
+LOOT=midlevelscrolls,4
+LOOT=TreasureMapLvl4Loot
+STR=376 405
+DEX=176 195
+INT=201 225
+KARMA=-7000
+FAME=7000
+EVALUATINGINTEL=160 400
+MAGERY=800 900
+MAGICRESISTANCE=750 850
+PARRYING=750 850
+TACTICS=800 900
+WRESTLING=800 1000
+DAMAGE=3 24
+DEF=30
+TOPROV=893
+TOPEACE=893 5
+}
+
+[imp_lbr]
+{
+GET=base_imp
+GOLD=0 50
+LOOT=lowlevelscrolls
+LOOT=random_useless_junk
+STR=76 100
+DEX=61 80
+INT=86 110
+KARMA=-1500
+FAME=1500
+ANATOMY=900
+MAGERY=400 600
+MAGICRESISTANCE=350 500
+PARRYING=500 600
+TACTICS=550 700
+WRESTLING=600 750
+DAMAGE=3 18
+DEF=15
+TOPROV=700
+TOPEACE=700 5
+TOTAME=831
+}
+
+[mongbat_lbr]
+{
+GET=base_mongbat
+LOOT=random_useless_junk
+STR=6 10
+DEX=26 38
+INT=6 14
+HPMAX=4 6
+MAXMANA=0
+KARMA=-150
+FAME=150
+MAGICRESISTANCE=50 140
+PARRYING=250 380
+TACTICS=50 100
+WRESTLING=50 100
+DAMAGE=1 2
+DEF=5
+TOPROV=99
+TOPEACE=99 5
+TOTAME=0
+}
+
+[greatermongbat_lbr]
+{
+GET=base_greatermongbat
+LOOT=random_useless_junk
+GOLD=0 50
+STR=56 80
+DEX=61 80
+INT=26 50
+HPMAX=34 48
+WRESTLING=201 350
+TACTICS=351 500
+MAGICRESISTANCE=151 300
+DAMAGE=3 9
+DEF=10
+TOPROV=313
+TOPEACE=313 5
+TOTAME=711
+}
+
+[arcanedaemon_lbr]
+{
+GET=base_arcanedaemon
+GOLD=250 300
+LOOT=randompotions,3
+LOOT=lowlevelscrolls,3
+LOOT=midlevelscrolls,3
+KARMA=-10000
+FAME=7000
+STR=131 150
+DEX=126 145
+INT=301 350
+EVALUATINGINTEL=701 800
+MAGERY=801 900
+MAGICRESISTANCE=851 950
+MEDITATION=701 800
+TACTICS=701 800
+WRESTLING=601 800
+DAMAGE=4 22
+DEF=20
+TOPROV=880
+TOPEACE=880 5
+}
+
+[moloch_lbr]
+{
+GET=base_moloch
+GOLD=300 350
+LOOT=randompotions,3
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,2
+KARMA=-7500
+FAME=7500
+STR=331 360
+DEX=66 85
+INT=41 65
+MAGICRESISTANCE=650 700
+TACTICS=750 900
+WRESTLING=700 900
+DAMAGE=7 13
+DEF=20
+TOPROV=725
+TOPEACE=725 5
+}
+
+[chaosdaemon_lbr]
+{
+GET=base_chaosdaemon
+LOOT=randompotions,2
+LOOT=lowlevelscrolls
+LOOT=midlevelscrolls
+GOLD=175 225
+KARMA=-4000
+FAME=3000
+STR=106 130
+DEX=171 200
+INT=56 80
+HPMAX=91 110
+MAGICRESISTANCE=851 950
+TACTICS=701 800
+WRESTLING=951 1000
+DAMAGE=7 13
+DEF=15
+TOPROV=715
+TOPEACE=715 5
+}
+
+[shadowfiend_lbr]
+{
+GET=base_shadowfiend
+GOLD=0 50
+STR=46 55
+DEX=121 130
+INT=46 55
+KARMA=-1000
+FAME=1000
+MAGICRESISTANCE=200 300
+TACTICS=200 300
+WRESTLING=200 300
+DAMAGE=3 12
+DEF=10
+TOPROV=221
+TOPEACE=221 5
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_lbr/dragons_lbr.dfn b/data/dfndata/npc/npc_lbr/dragons_lbr.dfn
new file mode 100644
index 000000000..920a53352
--- /dev/null
+++ b/data/dfndata/npc/npc_lbr/dragons_lbr.dfn
@@ -0,0 +1,229 @@
+[graydragon_lbr]
+{
+GET=base_graydragon
+GOLD=1200 1400
+LOOT=randomgems,10
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,4
+LOOT=highlevelscrolls,6
+LOOT=TreasureMapLvl4Loot
+PACKITEM=0x0f84,4
+STR=796 825
+DEX=86 105
+INT=436 475
+KARMA=-15000
+FAME=15000
+ANATOMY=990
+MAGERY=300 400
+MAGICRESISTANCE=990 1000
+PARRYING=550 950
+TACTICS=980 1000
+WRESTLING=900 930
+DAMAGE=9 29
+DEF=30
+TOPROV=1050
+TOPEACE=1050 5
+TOTAME=939
+CONTROLSLOTS=3
+}
+
+[reddragon_lbr]
+{
+GET=base_reddragon
+}
+
+[dragon_lbr]
+{
+GET=base_dragon
+}
+
+[graydrake_lbr]
+{
+GET=base_graydrake
+GOLD=100 250
+LOOT=randomgems,5
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,2
+LOOT=TreasureMapLvl2Loot
+STR=401 430
+DEX=133 152
+INT=101 140
+KARMA=-5500
+FAME=5500
+MAGICRESISTANCE=650 800
+PARRYING=650 800
+TACTICS=650 900
+WRESTLING=651 800
+DAMAGE=4 24
+DEF=23
+TOPROV=806
+TOPEACE=806 5
+TOTAME=843
+CONTROLSLOTS=2
+}
+
+[reddrake_lbr]
+{
+GET=base_reddrake
+}
+
+[drake_lbr]
+{
+GET=base_drake
+}
+
+[shadowwyrm_lbr]
+{
+GET=base_shadowwyrm
+GOLD=1200 2000
+LOOT=randomgems,10
+LOOT=midlevelscrolls,6
+LOOT=TreasureMapLvl5Loot
+STR=900 1000
+DEX=68 200
+INT=488 620
+KARMA=-22500
+FAME=22500
+MAGERY=800 1000
+MAGICRESISTANCE=1000 1300
+MEDITATION=530 750
+PARRYING=550 950
+TACTICS=980 1000
+WRESTLING=980 1000
+EVALUATINGINTEL=510 1000
+POISONSTRENGTH=4
+POISONCHANCE=5
+DAMAGE=11 53
+DEF=35
+TOPROV=1249
+TOPEACE=1249 5
+CONTROLSLOTS=5
+}
+
+[whitewyrm_lbr]
+{
+GET=base_whitewyrm
+GOLD=600 1400
+LOOT=randomgems,8
+LOOT=midlevelscrolls,3
+LOOT=TreasureMapLvl4Loot
+STR=721 760
+DEX=101 130
+INT=386 425
+KARMA=-18000
+FAME=18000
+ANATOMY=1010
+MAGERY=990 1000
+MAGICRESISTANCE=990 1000
+PARRYING=700 900
+TACTICS=980 1000
+WRESTLING=900 1000
+DAMAGE=9 33
+DEF=32
+TOPROV=1003
+TOPEACE=1003 5
+TOTAME=963
+CONTROLSLOTS=3
+}
+
+[ancientwyrm_lbr]
+{
+GET=base_ancientwyrm
+GOLD=1100 1300
+LOOT=randomgems,5
+LOOT=midlevelscrolls,6
+LOOT=highlevelscrolls,2
+LOOT=TreasureMapLvl5Loot
+STR=1100 1200
+DEX=86 175
+INT=686 775
+KARMA=-22500
+FAME=22500
+MAGERY=800 1000
+MAGICRESISTANCE=1010 1500
+MEDITATION=530 750
+PARRYING=550 950
+TACTICS=980 1000
+WRESTLING=980 1000
+EVALUATINGINTEL=510 1000
+DAMAGE=11 53
+DEF=35
+TOPROV=1314
+TOPEACE=1314 5
+}
+
+[wyvern_lbr]
+{
+GET=base_wyvern
+GOLD=250 300
+LOOT=midlevelscrolls
+LOOT=TreasureMapLvl2Loot
+STR=202 240
+DEX=153 172
+INT=51 90
+KARMA=-4000
+FAME=4000
+MAGICRESISTANCE=650 800
+PARRYING=650 800
+TACTICS=650 900
+WRESTLING=650 800
+POISONING=600 800
+POISONSTRENGTH=4
+DAMAGE=3 24
+DEF=20
+TOPROV=782
+TOPEACE=782 5
+}
+
+[serpentinedragon_lbr]
+{
+GET=base_serpentinedragon
+GOLD=1100 1300
+LOOT=randomgems,7
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,4
+LOOT=highlevelscrolls,2
+STR=111 140
+DEX=201 220
+INT=1001 1040
+HPMAX=800
+KARMA=-15000
+FAME=15000
+MAGERY=1100 1200
+MAGICRESISTANCE=1000
+MEDITATION=1000
+PARRYING=550 950
+TACTICS=500 600
+WRESTLING=300 1000
+EVALUATINGINTEL=1000
+DAMAGE=5 12
+DEF=18
+TOPROV=1288
+TOPEACE=1288 5
+}
+
+[skeletaldragon_lbr]
+{
+GET=base_skeletaldragon
+GOLD=1500 2000
+LOOT=randomgems,6
+LOOT=midlevelscrolls,6
+LOOT=highlevelscrolls,3
+STR=900 1000
+DEX=68 200
+INT=488 620
+KARMA=-22500
+FAME=22500
+MAGERY=800 1000
+MAGICRESISTANCE=1000 1300
+MEDITATION=530 750
+PARRYING=550 950
+TACTICS=980 600
+WRESTLING=980 1000
+EVALUATINGINTEL=510 1000
+DAMAGE=11 53
+DEF=40
+TOPEACE=1183 5
+FLEEAT=-1
+CONTROLSLOTS=3
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/undead.dfn b/data/dfndata/npc/undead.dfn
index edf82c231..315bdbc30 100644
--- a/data/dfndata/npc/undead.dfn
+++ b/data/dfndata/npc/undead.dfn
@@ -579,3 +579,52 @@ GETSA=revenant_lion_se
 GETHS=revenant_lion_se
 GETTOL=revenant_lion_se
 }
+
+[base_shadowknight]
+{
+GET=base_undead
+NAME=#//a shadowknight
+NAMELIST=17
+TITLE=5018//the Shadow Knight
+ID=0x137
+SPATTACK=8
+SPADELAY=5
+RUNS
+FLAG=NEUTRAL
+ORIGIN=aos
+}
+
+[shadowknight]
+{
+GETUO=shadowknight_lbr
+GETT2A=shadowknight_lbr
+GETUOR=shadowknight_lbr
+GETTD=shadowknight_lbr
+GETLBR=shadowknight_lbr
+GETAOS=shadowknight_lbr
+GETSE=shadowknight_lbr
+GETML=shadowknight_lbr
+GETSA=shadowknight_lbr
+GETHS=shadowknight_lbr
+GETTOL=shadowknight_lbr
+}
+
+[shadowknight_lbr]
+{
+GET=base_shadowknight
+GOLD=1600 2000
+STR=250
+DEX=100
+INT=100
+HPMAX=2000
+KARMA=-25000
+FAME=25000
+MAGICRESISTANCE=1200
+TACTICS=1000
+WRESTLING=1000
+MAGERY=1000
+EVALUATINGINTEL=1000
+MEDITATION=1000
+DAMAGE=41 65
+DEF=20
+}
\ No newline at end of file

From 22cff368990037a3aa1350bee754a21fc2115cd4 Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Sun, 14 Sep 2025 11:13:11 -0500
Subject: [PATCH 2/3] Update

---
 data/dfndata/npc/npc_aos/daemons_aos.dfn | 393 +++++++++++++++++++++++
 data/dfndata/npc/npc_lbr/daemons_lbr.dfn |  66 ++--
 2 files changed, 426 insertions(+), 33 deletions(-)
 create mode 100644 data/dfndata/npc/npc_aos/daemons_aos.dfn

diff --git a/data/dfndata/npc/npc_aos/daemons_aos.dfn b/data/dfndata/npc/npc_aos/daemons_aos.dfn
new file mode 100644
index 000000000..c1aa1345b
--- /dev/null
+++ b/data/dfndata/npc/npc_aos/daemons_aos.dfn
@@ -0,0 +1,393 @@
+[abyssmalhorror_aos]
+{
+GET=base_abyssmalhorror
+GOLD=1600 2000
+STR=401 421
+DEX=81 90
+INT=401 420
+HPMAX=6000 6000
+MANAMAX=401 420
+KARMA=-26000
+FAME=26000
+WRESTLING=841 880
+TACTICS=1000 1000
+MAGERY=1126 1175
+MAGICRESISTANCE=1176 1200
+EVALUATINGINTEL=2000 2000
+MEDITATION=2000 2000
+DAMAGE=13 17
+DEF=30 35
+RESISTFIRE=100 100
+RESISTCOLD=50 55
+RESISTPOISON=60 65
+RESISTLIGHTNING=77 80
+}
+
+[balron_aos]
+{
+GET=base_balron
+LOOT=midlevelscrolls,5
+LOOT=highlevelscrolls,3
+LOOT=reagents,20
+LOOT=TreasureMapLvl5Loot
+TOPROV=1145
+TOPEACE=1145 5
+GOLD=1200 1650
+STR=986 1185
+DEX=177 255
+INT=151 250
+HPMAX=592 711
+MANAMAX=151 250
+KARMA=-24000
+FAME=24000
+WRESTLING=901 1000
+TACTICS=901 1000
+MAGERY=955 1000
+MAGICRESISTANCE=1005 1500
+EVALUATINGINTEL=901 1000
+ANATOMY=251 500
+MEDITATION=251 500
+DAMAGE=22 29
+DEF=65 80
+RESISTFIRE=60 80
+RESISTCOLD=50 60
+RESISTPOISON=100 100
+RESISTLIGHTNING=40 50
+}
+
+[daemon_aos]
+{
+GET=base_daemon
+PACKITEM=0x13ba
+LOOT=midlevelscrolls,2
+LOOT=highlevelscrolls
+LOOT=randomgems,5
+LOOT=TreasureMapLvl4Loot
+TOPROV=898
+TOPEACE=898 5
+GOLD=550 650
+STR=476 505
+DEX=76 95
+INT=301 325
+HPMAX=301 325
+MANAMAX=301 325
+KARMA=-15000
+FAME=15000
+WRESTLING=601 800
+TACTICS=701 800
+MAGERY=701 800
+MAGICRESISTANCE=851 950
+EVALUATINGINTEL=701 800
+DAMAGE=7 14
+DEF=45 60
+RESISTFIRE=50 60
+RESISTCOLD=30 40
+RESISTPOISON=20 30
+RESISTLIGHTNING=30 40
+}
+
+[armeddaemon_aos]
+{
+GET=base_daemon
+PACKITEM=0x13ba
+LOOT=midlevelscrolls,2
+LOOT=highlevelscrolls
+LOOT=randomgems,5
+LOOT=TreasureMapLvl4Loot
+TOPROV=898
+TOPEACE=898 5
+GOLD=550 650
+STR=476 505
+DEX=76 95
+INT=301 325
+HPMAX=301 325
+MANAMAX=301 325
+KARMA=-15000
+FAME=15000
+WRESTLING=601 800
+TACTICS=701 800
+MAGERY=701 800
+MAGICRESISTANCE=851 950
+EVALUATINGINTEL=701 800
+DAMAGE=7 14
+DEF=45 60
+RESISTFIRE=50 60
+RESISTCOLD=30 40
+RESISTPOISON=20 30
+RESISTLIGHTNING=30 40
+}
+
+[bonedaemon_aos]
+{
+GET=base_bonedaemon
+LOOT=daemonbonearmor
+GOLD=4000 5000
+STR=1000 1000
+DEX=151 175
+INT=171 220
+HPMAX=3600 3600
+MANAMAX=171 220
+KARMA=-20000
+FAME=20000
+WRESTLING=1000 1000
+TACTICS=1000 1000
+MAGERY=776 875
+MAGICRESISTANCE=501 750
+EVALUATINGINTEL=776 875
+MEDITATION=1000 1000
+DAMAGE=34 36
+DEF=75 75
+RESISTFIRE=60 60
+RESISTCOLD=90 90
+RESISTPOISON=100 100
+RESISTLIGHTNING=60 60
+}
+
+[exodus_aos]
+{
+GET=base_exodus
+LOOT=exodusOverseerLoot
+LOOT=midlevelscrolls,5
+LOOT=highlevelscrolls,3
+LOOT=reagents,20
+LOOT=TreasureMapLvl5Loot
+TOPROV=1145
+TOPEACE=1145 5
+GOLD=450 650
+STR=551 650
+DEX=76 95
+INT=61 90
+HPMAX=331 390
+MANAMAX=61 90
+KARMA=-10000
+FAME=10000
+WRESTLING=802 980
+TACTICS=802 980
+MAGERY=0 0
+MAGICRESISTANCE=802 980
+EVALUATINGINTEL=0 0
+DAMAGE=13 19
+DEF=0 0
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+}
+
+[icefiend_aos]
+{
+GET=base_icefiend
+LOOT=midlevelscrolls,4
+LOOT=TreasureMapLvl4Loot
+TOPROV=893
+TOPEACE=893 5
+GOLD=650 800
+STR=376 405
+DEX=176 195
+INT=201 225
+HPMAX=226 243
+MANAMAX=201 225
+KARMA=-18000
+FAME=18000
+WRESTLING=801 1000
+TACTICS=801 900
+MAGERY=801 900
+MAGICRESISTANCE=751 850
+EVALUATINGINTEL=801 900
+DAMAGE=8 19
+DEF=55 65
+RESISTFIRE=10 20
+RESISTCOLD=60 70
+RESISTPOISON=20 30
+RESISTLIGHTNING=30 40
+}
+
+[imp_aos]
+{
+GET=base_imp
+LOOT=lowlevelscrolls
+LOOT=random_useless_junk
+TOPROV=700
+TOPEACE=700 5
+TOTAME=831
+GOLD=50 100
+STR=91 115
+DEX=61 80
+INT=86 105
+HPMAX=55 70
+MANAMAX=86 105
+KARMA=-2500
+FAME=2500
+WRESTLING=401 440
+TACTICS=421 500
+MAGERY=901 1000
+MAGICRESISTANCE=301 500
+EVALUATINGINTEL=201 300
+DAMAGE=10 14
+DEF=25 35
+RESISTFIRE=40 50
+RESISTCOLD=20 30
+RESISTPOISON=30 40
+RESISTLIGHTNING=30 40
+}
+
+[mongbat_aos]
+{
+GET=base_mongbat
+LOOT=random_useless_junk
+TOPROV=99
+TOPEACE=99 5
+TOTAME=0
+GOLD=25 50
+STR=6 10
+DEX=26 38
+INT=6 14
+HPMAX=4 6
+MANAMAX=0 0
+KARMA=-150
+FAME=150
+WRESTLING=51 100
+TACTICS=51 100
+MAGERY=0 0
+MAGICRESISTANCE=51 140
+EVALUATINGINTEL=0 0
+DAMAGE=1 2
+DEF=5 10
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+}
+
+[greatermongbat_aos]
+{
+GET=base_greatermongbat
+LOOT=random_useless_junk
+TOPROV=313
+TOPEACE=313 5
+TOTAME=711
+GOLD=25 50
+STR=56 80
+DEX=61 80
+INT=26 50
+HPMAX=34 48
+MANAMAX=26 50
+KARMA=-450
+FAME=450
+WRESTLING=201 350
+TACTICS=351 500
+MAGERY=0 0
+MAGICRESISTANCE=151 300
+EVALUATINGINTEL=0 0
+DAMAGE=5 7
+DEF=15 25
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+}
+
+[arcanedaemon_aos]
+{
+GET=base_arcanedaemon
+GOLD=250 300
+STR=131 150
+DEX=126 145
+INT=301 350
+HPMAX=101 115
+MANAMAX=301 350
+KARMA=-10000
+FAME=7000
+WRESTLING=601 800
+TACTICS=701 800
+MAGERY=801 900
+MAGICRESISTANCE=851 950
+EVALUATINGINTEL=701 800
+MEDITATION=701 800
+DAMAGE=12 16
+DEF=50 60
+RESISTFIRE=70 80
+RESISTCOLD=10 20
+RESISTPOISON=50 60
+RESISTLIGHTNING=30 40
+}
+
+[moloch_aos]
+{
+GET=base_moloch
+LOOT=randompotions,3
+LOOT=lowlevelscrolls,2
+LOOT=midlevelscrolls,2
+TOPROV=725
+TOPEACE=725 5
+GOLD=300 350
+STR=331 360
+DEX=66 85
+INT=41 65
+HPMAX=171 200
+MANAMAX=41 65
+KARMA=-7500
+FAME=7500
+WRESTLING=701 900
+TACTICS=751 900
+MAGERY=0 0
+MAGICRESISTANCE=651 750
+DAMAGE=15 23
+DEF=60 70
+RESISTFIRE=60 70
+RESISTCOLD=40 50
+RESISTPOISON=20 30
+RESISTLIGHTNING=20 30
+}
+
+[chaosdaemon_aos]
+{
+GET=base_chaosdaemon
+LOOT=randompotions,2
+LOOT=lowlevelscrolls
+LOOT=midlevelscrolls
+TOPROV=715
+TOPEACE=715 5
+GOLD=175 225
+STR=106 130
+DEX=171 200
+INT=56 80
+HPMAX=91 110
+MANAMAX=56 80
+KARMA=-3000
+FAME=3000
+WRESTLING=951 1000
+TACTICS=701 800
+MAGERY=0 0
+MAGICRESISTANCE=851 950
+DAMAGE=12 17
+DEF=50 60
+RESISTFIRE=60 70
+RESISTCOLD=40 50
+RESISTPOISON=20 30
+RESISTLIGHTNING=20 30
+}
+
+[shadowfiend_aos]
+{
+GET=base_shadowfiend
+TOPROV=221
+TOPEACE=221 5
+STR=46 55
+DEX=121 130
+INT=46 55
+HPMAX=28 33
+MANAMAX=0 0
+KARMA=-1000
+FAME=1000
+WRESTLING=201 300
+TACTICS=201 300
+MAGERY=0 0
+MAGICRESISTANCE=201 300
+DAMAGE=10 22
+DEF=20 25
+RESISTFIRE=20 25
+RESISTCOLD=40 45
+RESISTPOISON=60 70
+RESISTLIGHTNING=5 10
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_lbr/daemons_lbr.dfn b/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
index 6f1cb52e4..a7b6159b0 100644
--- a/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
+++ b/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
@@ -5,9 +5,8 @@ GOLD=1600 2000
 STR=401 420
 DEX=81 90
 INT=401 420
-HPMAX=6000
-KARMA=-26000
-FAME=26000
+KARMA=-20000
+FAME=20000
 MAGICRESISTANCE=1176 1200
 TACTICS=1000
 WRESTLING=841 880
@@ -17,6 +16,8 @@ MEDITATION=2000
 DAMAGE=19 35
 DEF=20
 POISONSTRENGTH=4
+LOOT=randomgems,3
+LOOT=highlevelscrolls,1
 }
 
 [balron_lbr]
@@ -99,21 +100,20 @@ TOPEACE=898 5
 [bonedaemon_lbr]
 {
 GET=base_bonedaemon
-GOLD=4000 5000
-STR=1000
-DEX=151 175
-INT=171 220
-HPMAX=3600
+GOLD=800 1200
+STR=750
+DEX=113 131
+INT=128 165
 KARMA=-20000
 FAME=20000
-MAGICRESISTANCE=501 750
-TACTICS=1000
-WRESTLING=1000
-MAGERY=776 875
-EVALUATINGINTEL=776 875
-MEDITATION=1000
-DAMAGE=82 88
-DEF=20
+MAGICRESISTANCE=376 562
+TACTICS=750
+WRESTLING=750
+MAGERY=582 656
+EVALUATINGINTEL=582 656
+MEDITATION=750
+DAMAGE=70 75
+DEF=5
 }
 
 [exodus_lbr]
@@ -264,14 +264,14 @@ LOOT=lowlevelscrolls,2
 LOOT=midlevelscrolls,2
 KARMA=-7500
 FAME=7500
-STR=331 360
-DEX=66 85
-INT=41 65
-MAGICRESISTANCE=650 700
-TACTICS=750 900
-WRESTLING=700 900
-DAMAGE=7 13
-DEF=20
+STR=298 324
+DEX=59 76
+INT=37 58
+MAGICRESISTANCE=585 630
+TACTICS=675 810
+WRESTLING=630 810
+DAMAGE=6 12
+DEF=15
 TOPROV=725
 TOPEACE=725 5
 }
@@ -285,15 +285,15 @@ LOOT=midlevelscrolls
 GOLD=175 225
 KARMA=-4000
 FAME=3000
-STR=106 130
-DEX=171 200
-INT=56 80
-HPMAX=91 110
-MAGICRESISTANCE=851 950
-TACTICS=701 800
-WRESTLING=951 1000
-DAMAGE=7 13
-DEF=15
+STR=95 117
+DEX=154 180
+INT=50 72
+HPMAX=82 99
+MAGICRESISTANCE=766 855
+TACTICS=631 720
+WRESTLING=856 900
+DAMAGE=6 12
+DEF=10
 TOPROV=715
 TOPEACE=715 5
 }

From 1f392c36daeb176acf67090efae84b7abbd9997e Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Sun, 14 Sep 2025 11:25:24 -0500
Subject: [PATCH 3/3] Update

Changed oni to have a toned down lbr stats and version and also fixed the get eras to match the expansions
---
 data/dfndata/npc/daemons.dfn             | 178 +++++++++++------------
 data/dfndata/npc/npc_lbr/daemons_lbr.dfn |  27 ++++
 2 files changed, 116 insertions(+), 89 deletions(-)

diff --git a/data/dfndata/npc/daemons.dfn b/data/dfndata/npc/daemons.dfn
index ace5dec36..97e85d321 100644
--- a/data/dfndata/npc/daemons.dfn
+++ b/data/dfndata/npc/daemons.dfn
@@ -30,12 +30,12 @@ GETT2A=abyssmalhorror_lbr
 GETUOR=abyssmalhorror_lbr
 GETTD=abyssmalhorror_lbr
 GETLBR=abyssmalhorror_lbr
-GETAOS=abyssmalhorror_lbr
-GETSE=abyssmalhorror_lbr
-GETML=abyssmalhorror_lbr
-GETSA=abyssmalhorror_lbr
-GETHS=abyssmalhorror_lbr
-GETTOL=abyssmalhorror_lbr
+GETAOS=abyssmalhorror_aos
+GETSE=abyssmalhorror_aos
+GETML=abyssmalhorror_aos
+GETSA=abyssmalhorror_aos
+GETHS=abyssmalhorror_aos
+GETTOL=abyssmalhorror_aos
 }
 
 [base_balron]
@@ -61,12 +61,12 @@ GETT2A=balron_lbr
 GETUOR=balron_lbr
 GETTD=balron_lbr
 GETLBR=balron_lbr
-GETAOS=balron_lbr
-GETSE=balron_lbr
-GETML=balron_lbr
-GETSA=balron_lbr
-GETHS=balron_lbr
-GETTOL=balron_lbr
+GETAOS=balron_aos
+GETSE=balron_aos
+GETML=balron_aos
+GETSA=balron_aos
+GETHS=balron_aos
+GETTOL=balron_aos
 }
 
 [base_daemon]
@@ -92,12 +92,12 @@ GETT2A=daemon_lbr
 GETUOR=daemon_lbr
 GETTD=daemon_lbr
 GETLBR=daemon_lbr
-GETAOS=daemon_lbr
-GETSE=daemon_lbr
-GETML=daemon_lbr
-GETSA=daemon_lbr
-GETHS=daemon_lbr
-GETTOL=daemon_lbr
+GETAOS=daemon_aos
+GETSE=daemon_aos
+GETML=daemon_aos
+GETSA=daemon_aos
+GETHS=daemon_aos
+GETTOL=daemon_aos
 }
 
 [base_armeddaemon]
@@ -122,12 +122,12 @@ GETT2A=armeddaemon_lbr
 GETUOR=armeddaemon_lbr
 GETTD=armeddaemon_lbr
 GETLBR=armeddaemon_lbr
-GETAOS=armeddaemon_lbr
-GETSE=armeddaemon_lbr
-GETML=armeddaemon_lbr
-GETSA=armeddaemon_lbr
-GETHS=armeddaemon_lbr
-GETTOL=armeddaemon_lbr
+GETAOS=armeddaemon_aos
+GETSE=armeddaemon_aos
+GETML=armeddaemon_aos
+GETSA=armeddaemon_aos
+GETHS=armeddaemon_aos
+GETTOL=armeddaemon_aos
 }
 
 [base_bonedaemon]
@@ -149,12 +149,12 @@ GETT2A=bonedaemon_lbr
 GETUOR=bonedaemon_lbr
 GETTD=bonedaemon_lbr
 GETLBR=bonedaemon_lbr
-GETAOS=bonedaemon_lbr
-GETSE=bonedaemon_lbr
-GETML=bonedaemon_lbr
-GETSA=bonedaemon_lbr
-GETHS=bonedaemon_lbr
-GETTOL=bonedaemon_lbr
+GETAOS=bonedaemon_aos
+GETSE=bonedaemon_aos
+GETML=bonedaemon_aos
+GETSA=bonedaemon_aos
+GETHS=bonedaemon_aos
+GETTOL=bonedaemon_aos
 }
 
 [base_exodus]
@@ -179,12 +179,12 @@ GETT2A=exodus_lbr
 GETUOR=exodus_lbr
 GETTD=exodus_lbr
 GETLBR=exodus_lbr
-GETAOS=exodus_lbr
-GETSE=exodus_lbr
-GETML=exodus_lbr
-GETSA=exodus_lbr
-GETHS=exodus_lbr
-GETTOL=exodus_lbr
+GETAOS=exodus_aos
+GETSE=exodus_aos
+GETML=exodus_aos
+GETSA=exodus_aos
+GETHS=exodus_aos
+GETTOL=exodus_aos
 }
 
 [base_icefiend]
@@ -207,12 +207,12 @@ GETT2A=icefiend_lbr
 GETUOR=icefiend_lbr
 GETTD=icefiend_lbr
 GETLBR=icefiend_lbr
-GETAOS=icefiend_lbr
-GETSE=icefiend_lbr
-GETML=icefiend_lbr
-GETSA=icefiend_lbr
-GETHS=icefiend_lbr
-GETTOL=icefiend_lbr
+GETAOS=icefiend_aos
+GETSE=icefiend_aos
+GETML=icefiend_aos
+GETSA=icefiend_aos
+GETHS=icefiend_aos
+GETTOL=icefiend_aos
 }
 
 [base_imp]
@@ -240,12 +240,12 @@ GETT2A=imp_lbr
 GETUOR=imp_lbr
 GETTD=imp_lbr
 GETLBR=imp_lbr
-GETAOS=imp_lbr
-GETSE=imp_lbr
-GETML=imp_lbr
-GETSA=imp_lbr
-GETHS=imp_lbr
-GETTOL=imp_lbr
+GETAOS=imp_aos
+GETSE=imp_aos
+GETML=imp_aos
+GETSA=imp_aos
+GETHS=imp_aos
+GETTOL=imp_aos
 }
 
 [base_mongbat]
@@ -267,12 +267,12 @@ GETT2A=mongbat_lbr
 GETUOR=mongbat_lbr
 GETTD=mongbat_lbr
 GETLBR=mongbat_lbr
-GETAOS=mongbat_lbr
-GETSE=mongbat_lbr
-GETML=mongbat_lbr
-GETSA=mongbat_lbr
-GETHS=mongbat_lbr
-GETTOL=mongbat_lbr
+GETAOS=mongbat_aos
+GETSE=mongbat_aos
+GETML=mongbat_aos
+GETSA=mongbat_aos
+GETHS=mongbat_aos
+GETTOL=mongbat_aos
 }
 
 [base_greatermongbat]
@@ -294,12 +294,12 @@ GETT2A=greatermongbat_lbr
 GETUOR=greatermongbat_lbr
 GETTD=greatermongbat_lbr
 GETLBR=greatermongbat_lbr
-GETAOS=greatermongbat_lbr
-GETSE=greatermongbat_lbr
-GETML=greatermongbat_lbr
-GETSA=greatermongbat_lbr
-GETHS=greatermongbat_lbr
-GETTOL=greatermongbat_lbr
+GETAOS=greatermongbat_aos
+GETSE=greatermongbat_aos
+GETML=greatermongbat_aos
+GETSA=greatermongbat_aos
+GETHS=greatermongbat_aos
+GETTOL=greatermongbat_aos
 }
 
 [base_arcanedaemon]
@@ -321,12 +321,12 @@ GETT2A=arcanedaemon_lbr
 GETUOR=arcanedaemon_lbr
 GETTD=arcanedaemon_lbr
 GETLBR=arcanedaemon_lbr
-GETAOS=arcanedaemon_lbr
-GETSE=arcanedaemon_lbr
-GETML=arcanedaemon_lbr
-GETSA=arcanedaemon_lbr
-GETHS=arcanedaemon_lbr
-GETTOL=arcanedaemon_lbr
+GETAOS=arcanedaemon_aos
+GETSE=arcanedaemon_aos
+GETML=arcanedaemon_aos
+GETSA=arcanedaemon_aos
+GETHS=arcanedaemon_aos
+GETTOL=arcanedaemon_aos
 }
 
 [base_moloch]
@@ -346,12 +346,12 @@ GETT2A=moloch_lbr
 GETUOR=moloch_lbr
 GETTD=moloch_lbr
 GETLBR=moloch_lbr
-GETAOS=moloch_lbr
-GETSE=moloch_lbr
-GETML=moloch_lbr
-GETSA=moloch_lbr
-GETHS=moloch_lbr
-GETTOL=moloch_lbr
+GETAOS=moloch_aos
+GETSE=moloch_aos
+GETML=moloch_aos
+GETSA=moloch_aos
+GETHS=moloch_aos
+GETTOL=moloch_aos
 }
 
 [base_chaosdaemon]
@@ -371,12 +371,12 @@ GETT2A=chaosdaemon_lbr
 GETUOR=chaosdaemon_lbr
 GETTD=chaosdaemon_lbr
 GETLBR=chaosdaemon_lbr
-GETAOS=chaosdaemon_lbr
-GETSE=chaosdaemon_lbr
-GETML=chaosdaemon_lbr
-GETSA=chaosdaemon_lbr
-GETHS=chaosdaemon_lbr
-GETTOL=chaosdaemon_lbr
+GETAOS=chaosdaemon_aos
+GETSE=chaosdaemon_aos
+GETML=chaosdaemon_aos
+GETSA=chaosdaemon_aos
+GETHS=chaosdaemon_aos
+GETTOL=chaosdaemon_aos
 }
 
 [base_shadowfiend]
@@ -397,12 +397,12 @@ GETT2A=shadowfiend_lbr
 GETUOR=shadowfiend_lbr
 GETTD=shadowfiend_lbr
 GETLBR=shadowfiend_lbr
-GETAOS=shadowfiend_lbr
-GETSE=shadowfiend_lbr
-GETML=shadowfiend_lbr
-GETSA=shadowfiend_lbr
-GETHS=shadowfiend_lbr
-GETTOL=shadowfiend_lbr
+GETAOS=shadowfiend_aos
+GETSE=shadowfiend_aos
+GETML=shadowfiend_aos
+GETSA=shadowfiend_aos
+GETHS=shadowfiend_aos
+GETTOL=shadowfiend_aos
 }
 
 //oni - Base NPC with shared DFN tags
@@ -416,11 +416,11 @@ ORIGIN=se
 
 [oni]
 {
-GETUO=oni_se
-GETT2A=oni_se
-GETUOR=oni_se
-GETTD=oni_se
-GETLBR=oni_se
+GETUO=oni_lbr
+GETT2A=oni_lbr
+GETUOR=oni_lbr
+GETTD=oni_lbr
+GETLBR=oni_lbr
 GETAOS=oni_se
 GETSE=oni_se
 GETML=oni_se
diff --git a/data/dfndata/npc/npc_lbr/daemons_lbr.dfn b/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
index a7b6159b0..b90d6be39 100644
--- a/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
+++ b/data/dfndata/npc/npc_lbr/daemons_lbr.dfn
@@ -314,4 +314,31 @@ DAMAGE=3 12
 DEF=10
 TOPROV=221
 TOPEACE=221 5
+}
+
+[oni_lbr]
+{
+GET=base_oni
+GOLD=900 1200
+PACKITEM=0x0f84,2
+LOOT=randomgems,2
+KARMA=-8000
+FAME=8000
+STR=600 679
+DEX=113 150
+INT=128 150
+MAGICRESISTANCE=638 750
+MAGERY=713 795
+EVALUATINGINTEL=750 938
+MEDITATION=206 319
+TACTICS=638 750
+WRESTLING=675 750
+ANATOMY=638 713
+SPATTACK=8
+SPADELAY=3
+DAMAGE=48 84
+DEF=55 70
+TOPROV=900
+TOPEACE=900 5
+SCRIPT=3507//magic items
 }
\ No newline at end of file