Merge remote-tracking branch 'origin/master'
This commit is contained in:
ceikry
@@ -47159,6 +47159,7 @@
|
||||
"aggressive": "true",
|
||||
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "276",
|
||||
"attack_level": "80"
|
||||
},
|
||||
{
|
||||
@@ -47410,6 +47411,7 @@
|
||||
"aggressive": "true",
|
||||
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "276",
|
||||
"attack_level": "80"
|
||||
},
|
||||
{
|
||||
@@ -47474,6 +47476,7 @@
|
||||
"aggressive": "true",
|
||||
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "276",
|
||||
"attack_level": "80"
|
||||
},
|
||||
{
|
||||
@@ -120616,6 +120619,7 @@
|
||||
"aggressive": "true",
|
||||
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "276",
|
||||
"attack_level": "80"
|
||||
},
|
||||
{
|
||||
@@ -120652,6 +120656,24 @@
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A regal cat with an evil glint in its eye.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "HRH Hrafn",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5479",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Jatizso's Chancellor.",
|
||||
"name": "Thorkel Silkbeard",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
@@ -120663,6 +120685,92 @@
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Harder than the rocks he sells.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Hring Hring",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5483",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Jatizso's fishmonger.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Flossi Dalksson",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5484",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A guy that will sell you armour.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Raum Urda-Stein",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5485",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Jatizso's armour merchant.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Skuli Myrka",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5486",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A rough-looking chef.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Keepa Kettilon",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5487",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "He can look after your money.",
|
||||
"facing_booth": "true",
|
||||
"name": "Magnus Gram",
|
||||
"defence_level": "1",
|
||||
@@ -120736,6 +120844,74 @@
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "One of Jatizso's many citizens.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Freygerd",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5493",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "One of Jatizso's many citizens.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Lensa",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5494",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A happy, friendly landlady.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Vanligga Gastfrihet",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5495",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "One of Jatizso's many citizens.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Sassilik",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5496",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A miner at work.",
|
||||
"melee_animation": "0",
|
||||
@@ -120752,6 +120928,74 @@
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A bedraggled-looking tramp.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Eric",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5499",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Mina guards the mine entrance.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Gruva Patrull",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5500",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A dwarven trader from Keldagrim.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Brendt",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5501",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A dwarven trader from Keldagrim.",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"combat_audio": "511,513,512",
|
||||
"defence_animation": "404",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Grundt",
|
||||
"defence_level": "1",
|
||||
"safespot": null,
|
||||
"lifepoints": "10",
|
||||
"strength_level": "1",
|
||||
"id": "5501",
|
||||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "The Burgher's protectors.",
|
||||
"melee_animation": "0",
|
||||
@@ -120867,6 +121111,7 @@
|
||||
"aggressive": "true",
|
||||
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "276",
|
||||
"attack_level": "80"
|
||||
},
|
||||
{
|
||||
@@ -120931,6 +121176,7 @@
|
||||
"aggressive": "true",
|
||||
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "276",
|
||||
"attack_level": "80"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -20283,6 +20283,114 @@
|
||||
"ids": "15748",
|
||||
"examine": "Home sweet home?"
|
||||
},
|
||||
{
|
||||
"ids": "18482",
|
||||
"examine": "A large fish."
|
||||
},
|
||||
{
|
||||
"ids": "21299",
|
||||
"examine": "Might be worth opening?"
|
||||
},
|
||||
{
|
||||
"ids": "21400,21402,21399",
|
||||
"examine": "A sturdy metal door."
|
||||
},
|
||||
{
|
||||
"ids": "21395",
|
||||
"examine": "I can climb this."
|
||||
},
|
||||
{
|
||||
"ids": "21403,21405",
|
||||
"examine": "A closed, sturdy metal door."
|
||||
},
|
||||
{
|
||||
"ids": "21404",
|
||||
"examine": "An open, sturdy metal door."
|
||||
},
|
||||
{
|
||||
"ids": "21437",
|
||||
"examine": "A display case, full of axes."
|
||||
},
|
||||
{
|
||||
"ids": "21438",
|
||||
"examine": "A display case, full of swords."
|
||||
},
|
||||
{
|
||||
"ids": "21439",
|
||||
"examine": "A table, displaying swords."
|
||||
},
|
||||
{
|
||||
"ids": "21441",
|
||||
"examine": "A table for preparing fish."
|
||||
},
|
||||
{
|
||||
"ids": "21442",
|
||||
"examine": "A container for storing mineral ores."
|
||||
},
|
||||
{
|
||||
"ids": "21443",
|
||||
"examine": "A table for working with ores."
|
||||
},
|
||||
{
|
||||
"ids": "21444",
|
||||
"examine": "A pile of raw mineral ores."
|
||||
},
|
||||
{
|
||||
"ids": "21445,21446",
|
||||
"examine": "A shield display."
|
||||
},
|
||||
{
|
||||
"ids": "21447",
|
||||
"examine": "A shelf, displaying armour."
|
||||
},
|
||||
{
|
||||
"ids": "21455",
|
||||
"examine": "I can climb down these stairs."
|
||||
},
|
||||
{
|
||||
"ids": "21464",
|
||||
"examine": "A sturdy-looking throne."
|
||||
},
|
||||
{
|
||||
"ids": "21465",
|
||||
"examine": "A stone torch."
|
||||
},
|
||||
{
|
||||
"ids": "21607",
|
||||
"examine": "A chair made from stone."
|
||||
},
|
||||
{
|
||||
"ids": "21608",
|
||||
"examine": "A table with swords on it."
|
||||
},
|
||||
{
|
||||
"ids": "21611",
|
||||
"examine": "A bed to sleep in."
|
||||
},
|
||||
{
|
||||
"ids": "21612",
|
||||
"examine": "A stone crate with some stuff in it."
|
||||
},
|
||||
{
|
||||
"ids": "21609,21610",
|
||||
"examine": "A table with plates and mugs on it."
|
||||
},
|
||||
{
|
||||
"ids": "21614,21615",
|
||||
"examine": "A shelf with some cups on it."
|
||||
},
|
||||
{
|
||||
"ids": "21637",
|
||||
"examine": "A Fremennik flag."
|
||||
},
|
||||
{
|
||||
"ids": "21834",
|
||||
"examine": "A short longboat!"
|
||||
},
|
||||
{
|
||||
"ids": "29945",
|
||||
"examine": "Contains traces of summoning energy."
|
||||
},
|
||||
{
|
||||
"ids": "37051",
|
||||
"examine": "I wonder what this spooky contains."
|
||||
|
||||
Reference in New Issue
Block a user