diff --git a/trunk/dist/game/data/Routes.xml b/trunk/dist/game/data/Routes.xml
index 4fc7810e46..a4ba6bca11 100644
--- a/trunk/dist/game/data/Routes.xml
+++ b/trunk/dist/game/data/Routes.xml
@@ -1368,8 +1368,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/default/33780.htm b/trunk/dist/game/data/html/default/33780.htm
new file mode 100644
index 0000000000..7a9d00191e
--- /dev/null
+++ b/trunk/dist/game/data/html/default/33780.htm
@@ -0,0 +1,5 @@
+Hesed of the Black Anvil Guild:Quest
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/merchant/32167.htm b/trunk/dist/game/data/html/merchant/32167.htm
index cd717470ba..96f17b09de 100644
--- a/trunk/dist/game/data/html/merchant/32167.htm
+++ b/trunk/dist/game/data/html/merchant/32167.htm
@@ -1,7 +1,6 @@
-Trade Nika:Buy supplies and minerals.
-Ask about the local lord and tax rate.
+Nika:"I need to exchange some consumables and minerals."
Quest
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/teleporter/32189-1.htm b/trunk/dist/game/data/html/teleporter/32189-1.htm
index affa61de13..a71825004d 100644
--- a/trunk/dist/game/data/html/teleporter/32189-1.htm
+++ b/trunk/dist/game/data/html/teleporter/32189-1.htm
@@ -1,5 +1,9 @@
&$556;The Town of Gludio - 9300 Adena
+Town of Rune - 10000 Adena
+The Village of Gludin - 7300 Adena
Town of Aden - 22000 Adena
Kamael Village - 4300 Adena
+Stronghold 2 (Lv. 93)
+Stronghold 3 (Lv. 93)
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/teleporter/32189.htm b/trunk/dist/game/data/html/teleporter/32189.htm
index 5decaafbc7..232c90a538 100644
--- a/trunk/dist/game/data/html/teleporter/32189.htm
+++ b/trunk/dist/game/data/html/teleporter/32189.htm
@@ -1,6 +1,7 @@
Gatekeeper Largo:Teleport.
+Welcome to the port of the Kamaels. It used to be a bustling place here, you know. But now that there are more people than things traveling, I've come to stand here to help you.main class is Lv. 76 or below , you can teleport for free.)
+"Yes, please."
Quest.
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/warehouse/19212-1.htm b/trunk/dist/game/data/html/warehouse/19212-1.htm
new file mode 100644
index 0000000000..5020ba7850
--- /dev/null
+++ b/trunk/dist/game/data/html/warehouse/19212-1.htm
@@ -0,0 +1,7 @@
+Warehouse Keeper Benis:
+Deposit an item (Private Warehouse)
+Claim an item (Private Warehouse)
+Back
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/warehouse/19212-2.htm b/trunk/dist/game/data/html/warehouse/19212-2.htm
new file mode 100644
index 0000000000..3243a64f58
--- /dev/null
+++ b/trunk/dist/game/data/html/warehouse/19212-2.htm
@@ -0,0 +1,7 @@
+Warehouse Keeper Benis:
+Deposit an item (Clan Warehouse)
+Claim an item (Clan Warehouse)
+Back
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/warehouse/19212.htm b/trunk/dist/game/data/html/warehouse/19212.htm
new file mode 100644
index 0000000000..7496b9ad7b
--- /dev/null
+++ b/trunk/dist/game/data/html/warehouse/19212.htm
@@ -0,0 +1,7 @@
+Benis:Private Warehouse
+Clan warehouse
+Wondrous Cubic Quest
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java
index 81d0851efb..f73b975845 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java
+++ b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java
@@ -34,6 +34,7 @@ public class HillsOfGold extends AbstractNpcAI
// Npcs
private static final int GOLEM_OF_REPAIRS = 19309;
private static final int EXCAVATOR_GOLEM = 19312;
+ private static final int DRILL_GOLEM = 19310;
private static final int SPICULA_1 = 23246;
private static final int SPICULA_2 = 23247;
private static final int YIN_FRAGMENT = 19308;
@@ -43,6 +44,7 @@ public class HillsOfGold extends AbstractNpcAI
23255,
23257,
23259,
+ 23261,
23263,
23264,
23266,
@@ -68,7 +70,7 @@ public class HillsOfGold extends AbstractNpcAI
{
break;
}
- if (nearby.isMonster() && ((nearby.getId() == GOLEM_OF_REPAIRS) || (nearby.getId() == EXCAVATOR_GOLEM)))
+ if (nearby.isMonster() && ((nearby.getId() == GOLEM_OF_REPAIRS) || (nearby.getId() == EXCAVATOR_GOLEM) || (nearby.getId() == DRILL_GOLEM)))
{
((L2MonsterInstance) npc).addDamage(nearby, 1, null);
break;
@@ -97,7 +99,7 @@ public class HillsOfGold extends AbstractNpcAI
@Override
public String onSpawn(L2Npc npc)
{
- if ((npc.getId() == SPICULA_1) || (npc.getId() == SPICULA_1))
+ if ((npc.getId() == SPICULA_1) || (npc.getId() == SPICULA_2))
{
startQuestTimer("SPICULA_AGGRO", 5000, npc, null);
}
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181.htm b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181.htm
index 19628311c9..2c248675db 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181.htm
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181.htm
@@ -1,6 +1,6 @@
Gatekeeper Mellon:Go to the village.
+"I'd like to go to the village."
Quest.
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/npcs/08500-08599.xml b/trunk/dist/game/data/stats/npcs/08500-08599.xml
index ee4dd72185..9ec4ff608d 100644
--- a/trunk/dist/game/data/stats/npcs/08500-08599.xml
+++ b/trunk/dist/game/data/stats/npcs/08500-08599.xml
@@ -25,8 +25,7 @@
-
+
DWARF
500
-
diff --git a/trunk/dist/game/data/stats/npcs/19100-19199.xml b/trunk/dist/game/data/stats/npcs/19100-19199.xml
index 30d4ca6ab2..16351d9bed 100644
--- a/trunk/dist/game/data/stats/npcs/19100-19199.xml
+++ b/trunk/dist/game/data/stats/npcs/19100-19199.xml
@@ -2392,8 +2392,8 @@
-
DWARF
+
334
-
@@ -2418,8 +2418,8 @@
-
DWARF
+
334
-
diff --git a/trunk/dist/game/data/stats/npcs/19200-19299.xml b/trunk/dist/game/data/stats/npcs/19200-19299.xml
index 34b139df6e..e9776cb20a 100644
--- a/trunk/dist/game/data/stats/npcs/19200-19299.xml
+++ b/trunk/dist/game/data/stats/npcs/19200-19299.xml
@@ -313,8 +313,7 @@
-
-
+
DWARF
-
-
+
ETC
-
-
500
-
-
-
+
ETC
500
-
-
-
+
ETC
500
-
-
-
+
ETC
500
-
-
-
+
ETC
500
-
-
-
+
ETC
500
-
-
-
+
ETC
-
-
500
-
-
HUMANOID
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
-
HUMANOID
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
-
HUMANOID
-
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
-
HUMANOID
-
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
-
HUMANOID
-
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
-
HUMANOID
-
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SPICULA_AGGRO
+
+
+
+ SPICULA_AGGRO
+
+
-
HUMANOID
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
-
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
-
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
+
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
-
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
-
+
+ SPICULA_AGGRO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2630,15 +3048,14 @@
-
CONSTRUCT
-
-
-
+
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
+
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
+
+
+ GOLEM
+
+
+
+
+
+
+
+
+
+
+
+
+
-
CONSTRUCT
-
-
-
+
+ GOLEMS
+
+
+
+
+
+
+
+
+
+
+
+
+
-