diff --git a/gamedir/Data-1.13/Scripts/strategicmap.lua b/gamedir/Data-1.13/Scripts/strategicmap.lua index 88b498c79..4d1e6a29b 100644 --- a/gamedir/Data-1.13/Scripts/strategicmap.lua +++ b/gamedir/Data-1.13/Scripts/strategicmap.lua @@ -170,6 +170,7 @@ Profil = MADLAB = 146, ROBOT = 62, MIGUEL = 57, + KYLE = 95, } local gsRobotGridNo @@ -182,6 +183,13 @@ function HandleQuestCodeOnSectorEntry( sNewSectorX, sNewSectorY, bNewSectorZ ) SetCharacterSectorX(Profil.ANGEL, 0) SetCharacterSectorY(Profil.ANGEL, 0) end + + if ( sNewSectorX == 6 and sNewSectorY == SectorY.MAP_ROW_C and gubQuest( Quests.QUEST_LEATHER_SHOP_DREAM ) == qStatus.QUESTDONE ) then + -- move Kyle to his shop + SetCharacterSectorX(Profil.KYLE, 6) + SetCharacterSectorY(Profil.KYLE, SectorY.MAP_ROW_C) + SetProfileStrategicInsertionData(Profil.KYLE, 12380) + end if ( sNewSectorX == 5 and sNewSectorY == SectorY.MAP_ROW_D ) then ResetBoxers() diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml index 65086d169..1480970e5 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml @@ -1,8 +1,426 @@  + 0 - 0 - 0 + 1607 + 2 + + 1 + 1608 + 2 + + + 2 + 1609 + 2 + + + 3 + 1610 + 2 + + + 4 + 1612 + 2 + + + 5 + 1613 + 2 + + + 6 + 1615 + 2 + + + 7 + 1616 + 2 + + + 8 + 1617 + 2 + + + 9 + 1619 + 2 + + + 10 + 1621 + 2 + + + 11 + 1622 + 2 + + + + 12 + 188 + 7 + + + 13 + 189 + 2 + + + 14 + 190 + 1 + + + 15 + 191 + 1 + + + 16 + 1720 + 5 + + + 17 + 1625 + 5 + + + + 18 + 1641 + 4 + + + 19 + 1642 + 4 + + + 20 + 1643 + 4 + + + 21 + 1644 + 4 + + + 23 + 1645 + 4 + + + 24 + 1646 + 4 + + + 25 + 1647 + 4 + + + 26 + 1648 + 4 + + + 27 + 1649 + 4 + + + 28 + 1650 + 4 + + + 29 + 1651 + 4 + + + 30 + 1652 + 4 + + + 31 + 1653 + 4 + + + 32 + 1654 + 4 + + + 33 + 1655 + 4 + + + 34 + 1656 + 4 + + + 35 + 1657 + 4 + + + 36 + 1658 + 4 + + + 37 + 1659 + 4 + + + 38 + 1660 + 4 + + + 39 + 1661 + 4 + + + 40 + 1662 + 4 + + + 41 + 1663 + 4 + + + 42 + 1664 + 4 + + + 43 + 1665 + 4 + + + 44 + 1666 + 4 + + + 45 + 1667 + 4 + + + 46 + 1668 + 4 + + + 47 + 1669 + 4 + + + 48 + 1670 + 4 + + + 49 + 1671 + 4 + + + 50 + 1672 + 4 + + + 51 + 1673 + 4 + + + 52 + 1674 + 4 + + + 53 + 1675 + 4 + + + 54 + 1676 + 4 + + + 55 + 1677 + 4 + + + 56 + 1678 + 4 + + + 57 + 1679 + 4 + + + 58 + 1680 + 4 + + + 59 + 1681 + 4 + + + 60 + 1682 + 4 + + + 61 + 1683 + 4 + + + 62 + 1684 + 4 + + + 63 + 1685 + 4 + + + 64 + 1686 + 4 + + + 65 + 1687 + 4 + + + 66 + 1688 + 4 + + + 67 + 1689 + 4 + + + 68 + 1690 + 4 + + + 69 + 1691 + 4 + + + 70 + 1692 + 4 + + + 71 + 1693 + 4 + + + 72 + 1694 + 4 + + + 73 + 1695 + 4 + + + 74 + 1696 + 4 + + + 75 + 1705 + 4 + + + 76 + 1706 + 4 + + + 77 + 1707 + 4 + + + 78 + 1708 + 4 + + + 79 + 1715 + 4 + + + 80 + 1716 + 4 + + + 81 + 1717 + 4 + + + 82 + 1718 + 4 + + + 83 + 1719 + 4 + + + 84 + 1720 + 4 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml b/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml index 19740cd85..950f5773b 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml @@ -616,19 +616,19 @@ uiFlags must be of 21 - additional dealer 2 + Kyle 1.0 1.0 - 255 + 95 0 - 800 + 1000 268435456 - 800 - 800 - 0 + 1000 + 2000 + 1000 1 10 - 0 + 2 100 1 2