Barbarian village cleanup

data/area/kandarin/barbarian_outpost/barbarian_outpost.npc-spawns.toml

@@ -7,13 +7,13 @@ spawns = [
   { id = "fishing_spot_barbarian_outpost", x = 2498, y = 3547, members = true },
   { id = "fishing_spot_barbarian_outpost", x = 2511, y = 3562, members = true },
   { id = "fishing_spot_barbarian_outpost", x = 2516, y = 3575, members = true },
-  { id = "barbarian_barbarian_outpost", x = 2546, y = 3560 },
-  { id = "barbarian_barbarian_outpost_2", x = 2546, y = 3565 },
-  { id = "barbarian_barbarian_outpost_3", x = 2549, y = 3566 },
-  { id = "barbarian_barbarian_outpost_4", x = 2549, y = 3570 },
-  { id = "barbarian_barbarian_outpost_5", x = 2544, y = 3577 },
-  { id = "barbarian_barbarian_outpost_6", x = 2550, y = 3563 },
-  { id = "barbarian_barbarian_outpost_7", x = 2548, y = 3558 },
+  { id = "barbarian_alberich", x = 2546, y = 3560  },
+  { id = "barbarian_fafner", x = 2546, y = 3565  },
+  { id = "barbarian_fasolt", x = 2549, y = 3566  },
+  { id = "barbarian_siegfried", x = 2549, y = 3570  },
+  { id = "barbarian_minarch", x = 2544, y = 3577  },
+  { id = "barbarian_brunnhilde", x = 2550, y = 3563 },
+  { id = "barbarian_edelschwarz", x = 2548, y = 3558 },
   { id = "kharid_scorpion_barbarian_outpost", x = 2552, y = 3570, members = true },
   { id = "commander_connad_barbarian_outpost", x = 2536, y = 3577, members = true },
   { id = "captain_cain_barbarian_outpost", x = 2534, y = 3568, members = true },

data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml

@@ -14,38 +14,38 @@ examine = "He maintains this agility course."
 [fishing_spot_barbarian_outpost]
 id = 2724
 
-[barbarian_barbarian_outpost]
+[barbarian_alberich]
 id = 3246
 hitpoints = 240
 att = 15
 str = 14
 def = 10
 style = "crush"
-max_hit_melee = 30
 attack_bonus = 9
 respawn_delay = 50
 drop_table = "barbarian_high"
+combat_def = "barbarian_two_hand_axe_high"
 examine = "Alberich, a fierce barbarian warrior."
 
-[barbarian_barbarian_outpost_2]
+[barbarian_fafner]
 id = 3247
 hitpoints = 180
 att = 8
 str = 7
 def = 3
 style = "crush"
-max_hit_melee = 20
 attack_bonus = 9
 respawn_delay = 50
 drop_table = "barbarian_low"
+combat_def = "barbarian_two_hand_sword_low"
 examine = "Fafner, a tough barbarian warrior."
 
-[barbarian_barbarian_outpost_3]
+[barbarian_fasolt]
 id = 3248
-clone = "barbarian_barbarian_outpost"
+clone = "barbarian_alberich"
 examine = "Fasolt, a strong barbarian warrior."
 
-[barbarian_barbarian_outpost_4]
+[barbarian_siegfried]
 id = 3250
 hitpoints = 180
 att = 8
@@ -56,21 +56,25 @@ max_hit_melee = 20
 attack_bonus = 9
 respawn_delay = 50
 drop_table = "barbarian_low"
+combat_def = "barbarian_two_hand_axe_low"
 examine = "Siegfried, a young guard in the Barbarian Village."
 
-[barbarian_barbarian_outpost_5]
+[barbarian_minarch]
 id = 3253
-clone = "barbarian_barbarian_outpost"
+clone = "barbarian_alberich"
+combat_def = "barbarian_two_hand_mace_high"
 examine = "Minarch, a barbarian who likes his beer."
 
-[barbarian_barbarian_outpost_6]
+[barbarian_brunnhilde]
 id = 3260
-clone = "barbarian_barbarian_outpost"
+clone = "barbarian_alberich"
+combat_def = "barbarian_spear_high"
 examine = "Brunnhilde, a fierce barbarian warrior."
 
-[barbarian_barbarian_outpost_7]
+[barbarian_edelschwarz]
 id = 3262
-clone = "barbarian_barbarian_outpost_4"
+clone = "barbarian_siegfried"
+combat_def = "barbarian_spear_low"
 examine = "Edelschwarz, a barbarian warrior with a spear."
 
 [kharid_scorpion_barbarian_outpost]

data/area/misthalin/barbarian_village/barbarian_village.combat.toml

@@ -1,8 +1,102 @@
 [haakon_the_champion]
-clone = "human"
+defend_anim = "human_defend"
+defend_sound = "barbarian_defend"
+death_anim = "human_death"
+death_sound = "barbarian_death"
 attack_speed = 6
 
 [haakon_the_champion.melee]
 clone = "human.melee"
 anim = "2h_smash"
 target_hit = { offense = "crush", max = 42 }
+
+[barbarian_two_hand_axe_low]
+attack_speed = 6
+defend_anim = "barbarian_unarmed_defend"
+defend_sound = "barbarian_defend"
+death_anim = "human_death"
+death_sound = "barbarian_death"
+
+[barbarian_two_hand_axe_low.melee]
+range = 1
+anim = "dharoks_greataxe_smash"
+target_sound = "dharok_axe_crush"
+target_hit = { offense = "crush", max = 20 }
+
+[barbarian_two_hand_axe_high]
+clone = "barbarian_two_hand_axe_low"
+
+[barbarian_two_hand_axe_high.melee]
+range = 1
+anim = "dharoks_greataxe_smash"
+target_sound = "dharok_axe_crush"
+target_hit = { offense = "crush", max = 30 }
+
+[barbarian_two_hand_mace_low]
+attack_speed = 6
+defend_anim = "hammer_defend"
+defend_sound = "barbarian_defend"
+death_anim = "human_death"
+death_sound = "barbarian_death"
+
+[barbarian_two_hand_mace_low.melee]
+range = 1
+anim = "hammer_pound"
+target_sound = "warhammer_crush"
+target_hit = { offense = "crush", max = 20 }
+
+[barbarian_two_hand_mace_high]
+clone = "barbarian_two_hand_mace_low"
+
+[barbarian_two_hand_mace_high.melee]
+range = 1
+anim = "hammer_pound"
+target_sound = "warhammer_crush"
+target_hit = { offense = "crush", max = 30 }
+
+[barbarian_two_hand_sword_low]
+attack_speed = 6
+defend_anim = "1h_defend"
+defend_sound = "barbarian_defend"
+death_anim = "human_death"
+death_sound = "barbarian_death"
+
+[barbarian_two_hand_sword_low.melee]
+range = 1
+anim = "sword_slash"
+target_hit = { offense = "crush", max = 20 }
+
+[barbarian_spear_low]
+attack_speed = 6
+defend_anim = "spear_defend"
+defend_sound = "barbarian_female_defend"
+death_anim = "human_death"
+death_sound = "woman_death"
+
+[barbarian_spear_low.melee]
+range = 1
+anim = "spear_pound"
+target_sound = "staff_stab"
+target_hit = { offense = "crush", max = 20 }
+
+[barbarian_spear_high]
+clone = "barbarian_spear_low"
+
+[barbarian_spear_high.melee]
+range = 1
+anim = "spear_pound"
+target_sound = "staff_stab"
+target_hit = { offense = "crush", max = 30 }
+
+[barbarian_bow]
+attack_speed = 4
+death_anim = "human_death"
+death_sound = "barbarian_death"
+defend_anim = "bow_defend"
+defend_sound = "barbarian_defend"
+
+[barbarian_bow.range]
+range = 8
+anim = "bow_accurate"
+projectile = "bronze_arrow"
+target_hit = { offense = "range", max = 10 }

data/area/misthalin/barbarian_village/barbarian_village.item-spawns.toml

@@ -0,0 +1,10 @@
+spawns = [
+# 12341
+    { id = "empty_pot", x = 3074, y = 3431, delay = 100 },
+    { id = "bronze_pickaxe", x = 3081, y = 3429, delay = 228 },
+    { id = "beer", x = 3077, y = 3439, delay = 100 },
+    { id = "cooked_meat", x = 3077, y = 3441, delay = 100 },
+    { id = "beer", x = 3077, y = 3443, delay = 100 },
+    { id = "cooked_meat", x = 3080, y = 3443, delay = 100 },
+    { id = "beer", x = 3080, y = 3441, delay = 100 },
+]

data/area/misthalin/barbarian_village/barbarian_village.npc-spawns.toml

@@ -11,23 +11,23 @@ spawns = [
   { id = "haakon_the_champion", x = 3081, y = 3444 },
   { id = "kjell", x = 3079, y = 3414, direction = "NORTH_EAST" },
   { id = "tassie_slipcast", x = 3084, y = 3408, members = true },
-  { id = "barbarian_barbarian_outpost", x = 3079, y = 3444 },
-  { id = "barbarian_barbarian_outpost_2", x = 3079, y = 3409 },
-  { id = "barbarian_barbarian_outpost_3", x = 3079, y = 3437 },
-  { id = "barbarian_barbarian_village", x = 3078, y = 3436 },
-  { id = "barbarian_barbarian_outpost_4", x = 3083, y = 3429 },
-  { id = "barbarian_barbarian_village_2", x = 3080, y = 3423 },
-  { id = "barbarian_barbarian_village_3", x = 3078, y = 3419 },
-  { id = "barbarian_barbarian_outpost_5", x = 3075, y = 3445 },
+  { id = "barbarian_alberich", x = 3079, y = 3444 },
+  { id = "barbarian_fafner", x = 3079, y = 3409 },
+  { id = "barbarian_fasolt", x = 3079, y = 3437 },
+  { id = "barbarian_siegmund", x = 3078, y = 3436  },
+  { id = "barbarian_siegfried", x = 3083, y = 3429 },
+  { id = "barbarian_lydspor", x = 3080, y = 3423  },
+  { id = "barbarian_hagen", x = 3078, y = 3419  },
+  { id = "barbarian_minarch", x = 3075, y = 3445 },
   { id = "hunding_barbarian_village", x = 3096, y = 3428, level = 2 },
-  { id = "barbarian_barbarian_village_4", x = 3076, y = 3414 },
-  { id = "barbarian_barbarian_village_5", x = 3085, y = 3409 },
-  { id = "barbarian_barbarian_village_6", x = 3096, y = 3432 },
-  { id = "barbarian_barbarian_village_7", x = 3086, y = 3440 },
-  { id = "barbarian_barbarian_village_8", x = 3078, y = 3442 },
-  { id = "barbarian_barbarian_outpost_6", x = 3078, y = 3440 },
-  { id = "barbarian_barbarian_village_9", x = 3084, y = 3426 },
-  { id = "barbarian_barbarian_outpost_7", x = 3077, y = 3422 },
+  { id = "barbarian_wotan", x = 3076, y = 3414 },
+  { id = "barbarian_acelin", x = 3085, y = 3409 },
+  { id = "barbarian_adelino", x = 3096, y = 3432 },
+  { id = "barbarian_adolpho", x = 3086, y = 3440 },
+  { id = "barbarian_aitan", x = 3078, y = 3442 },
+  { id = "barbarian_brunnhilde", x = 3078, y = 3440 },
+  { id = "barbarian_gutrune", x = 3084, y = 3426 },
+  { id = "barbarian_edelschwarz", x = 3077, y = 3422 },
   { id = "barbarian_sieglinde", x = 3086, y = 3419 },
   { id = "goblin_barbarian_village", x = 3126, y = 3431 },
   { id = "goblin_barbarian_village_2", x = 3118, y = 3432 },
@@ -64,4 +64,5 @@ spawns = [
   { id = "student_barbarian_village_4", x = 3077, y = 3453, direction = "EAST" },
   { id = "lakki_the_delivery_dwarf", x = 3008, y = 3434, members = true },
   { id = "unicorn", x = 3090, y = 3450 },
+  { id = "unicorn", x = 3097, y = 3458 },
 ]

data/area/misthalin/barbarian_village/barbarian_village.npcs.toml

@@ -91,79 +91,82 @@ examine = "His furs look very damp."
 id = 1793
 examine = "A hard-working potter."
 
-[barbarian_barbarian_village]
+[barbarian_siegmund]
 id = 3249
 hitpoints = 240
 att = 15
 str = 14
 def = 10
-style = "crush"
-max_hit_melee = 30
 attack_bonus = 9
 respawn_delay = 50
+combat_def = "barbarian_two_hand_mace_high"
 drop_table = "barbarian_high"
 examine = "Siegmund, a guard in the Barbarian Village."
 
-[barbarian_barbarian_village_2]
+##fun fact sword barbarians: patch 1 February 2011 (Update):
+#
+#    Barbarians no longer swing two-handed swords with one hand.
+#so authentic that they hit with their one hand
+[barbarian_lydspor]
 id = 3251
 hitpoints = 180
 att = 8
 str = 7
 def = 3
 style = "crush"
-max_hit_melee = 20
 attack_bonus = 9
 respawn_delay = 50
+drop_table = "barbarian_low"
+combat_def = "barbarian_two_hand_sword_low"
 examine = "Lydspor, a well-travelled barbarian warrior."
 
-[barbarian_barbarian_village_3]
+[barbarian_hagen]
 id = 3252
-clone = "barbarian_barbarian_village_2"
+clone = "barbarian_lydspor"
+combat_def = "barbarian_two_hand_axe_low"
 examine = "Hagen, a guard in the Barbarian Village."
 
 [hunding_barbarian_village]
 id = 3254
 examine = "Likes a good fight."
 
-[barbarian_barbarian_village_4]
+[barbarian_wotan]
 id = 3255
-clone = "barbarian_barbarian_village_2"
+clone = "barbarian_lydspor"
+combat_def = "barbarian_two_hand_mace_low"
 examine = "Wotan, a sturdy barbarian warrior."
 
-[barbarian_barbarian_village_5]
+[barbarian_acelin]
 id = 3256
-clone = "barbarian_barbarian_village_2"
+clone = "barbarian_lydspor"
 examine = "Acelin, a guard in the Barbarian Village."
 
-[barbarian_barbarian_village_6]
+[barbarian_adelino]
 id = 3257
-clone = "barbarian_barbarian_village_2"
+clone = "barbarian_hagen"
 examine = "Adelino, a barbarian warrior with a big axe."
 
-[barbarian_barbarian_village_7]
+[barbarian_adolpho]
 id = 3258
-clone = "barbarian_barbarian_village_2"
+clone = "barbarian_wotan"
 examine = "Adolpho, a barbarian warrior with a warhammer."
 
-[barbarian_barbarian_village_8]
+[barbarian_aitan]
 id = 3259
 hitpoints = 240
 att = 15
 str = 3
 def = 10
 range = 15
-style = "range"
-weapon_style = "bow"
-ammo = "bronze_arrow"
-attack_range = 8
-max_hit_range = 10
 attack_bonus = 9
 respawn_delay = 50
+combat_def = "barbarian_bow"
+drop_table = "barbarian_high"
 examine = "Aitan, a barbarian archer."
 
-[barbarian_barbarian_village_9]
+[barbarian_gutrune]
 id = 3261
-clone = "barbarian_barbarian_village_2"
+clone = "barbarian_sieglinde"
 examine = "Gutrune, a mighty barbarian warrior."
 
 [barbarian_sieglinde]
@@ -172,10 +175,10 @@ hitpoints = 200
 att = 6
 str = 7
 def = 3
-style = "crush"
-max_hit_melee = 20
 attack_bonus = 9
 respawn_delay = 50
+combat_def = "barbarian_spear_low"
+drop_table = "barbarian_low"
 examine = "Sieglinde, a muscular barbarian warrior."
 
 [goblin_barbarian_village]
@@ -242,8 +245,7 @@ hitpoints = 190
 att = 11
 str = 13
 def = 13
-style = "stab"
-max_hit_melee = 20
+combat_def = "unicorn"
 respawn_delay = 90
 drop_table = "unicorn"
 examine = "Horse with a horn."