-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-02.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-02.html
deleted file mode 100644
index 1b90bdd616..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-02.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You can obtain a Minion pet with a Minion Coupon. Please select the Minion pet you want.
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-03.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-03.html
deleted file mode 100644
index b033819791..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-03.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a White Weasel Pet Whistle.
-A White Weasel will help you in battle with fighter buffs and healing.
-Would you like to exchange the coupon for a White Weasel Pet Whistle?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-04.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-04.html
deleted file mode 100644
index 14accc35f9..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-04.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a Fairy Princess Pet Whistle.
-A Fairy Princess will help you in battle with wizard buffs and healing.
-Would you like to exchange the coupon for a Fairy Princess Pet Whistle?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-05.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-05.html
deleted file mode 100644
index 394d72ca18..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-05.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a Wild Beast Fighter Pet Whistle.
-A Wild Beast Fighter will help you in battle with fierce attacks.
-Would you like to exchange the coupon for a Wild Beast Fighter Pet Whistle?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-06.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-06.html
deleted file mode 100644
index 99194eb45e..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-06.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a Fox Shaman Pet Whistle.
-A Fox Shaman will help you in battle with strong magic.
-Would you like to exchange the coupon for a Fox Shaman Pet Whistle?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-07.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-07.html
deleted file mode 100644
index e46d83d74b..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-07.html
+++ /dev/null
@@ -1,4 +0,0 @@
-Dimensional Merchant:
-I am sorry, but you do not have sufficient Minion Coupons. Please verify that you selected the correct item.
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-09.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-09.html
deleted file mode 100644
index f1c193646f..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-09.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Dimensional Merchant:
-Please select a Superior Minion you would like to receive in exchange for the Superior Minion Coupon.
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-10.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-10.html
deleted file mode 100644
index fbddc04d69..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-10.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a Toy Knight Summon Whistle.
-A Toy Knight will attack your enemies with a sword while using fighter buffs and healing, to help you in battle.
-Would you like to exchange the coupon for a Toy Knight?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-11.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-11.html
deleted file mode 100644
index 185a1c32a4..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-11.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a Spirit Shaman Summon Whistle.
-A Spirit Shaman will help you in battle with wizard buffs, heals and recharges.
-Would you like to exchange the coupon for a Spirit Shaman Whistle?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-12.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-12.html
deleted file mode 100644
index e52b24f274..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-12.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-You selected a Turtle Ascetic Summon Necklace.
-A Turtle Ascetic will help you in battle with warsmith buffs, heals and recharges.
-Would you like to exchange the coupon for a Turtle Ascetic?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-13.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-13.html
deleted file mode 100644
index 01fb879d5d..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-13.html
+++ /dev/null
@@ -1,11 +0,0 @@
-Dimensional Merchant:
-Which improved Rose Spirit would you like?
-(When the inventory is full, you can't receive the item.)
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-14.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-14.html
deleted file mode 100644
index 20afa5aebc..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-14.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Dimensional Merchant:
-You have chosen the warrior type Rose Spirit.
-The name of the spirit is Desheloph.
-Desheloph is a Rose Spirit that uses various warrior type buffs and healing while attacking enemies with a sword.
-Will you exchange to Desheloph?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-15.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-15.html
deleted file mode 100644
index f26017062e..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-15.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Dimensional Merchant:
-You have chosen the wizard type Rose Spirit.
-The name of the spirit is Hyum.
-Hyum is a Rose Spirit that uses wizard type buffs, healing, and recharges while attacking enemies with magic.
-Will you exchange to Hyum?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-16.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-16.html
deleted file mode 100644
index 46c66bf10f..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-16.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Dimensional Merchant:
-You have chosen the warsmith type Rose Spirit.
-The name of the spirit is Lekang.
-Lekang is a Rose Spirit that uses a weapon or magic to attack enemies as well as healing and recharges while managing (warsmith buff) the owner's weapon and armor.
-Will you exchange to Lekang?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-17.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-17.html
deleted file mode 100644
index 2180943734..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-17.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Dimensional Merchant:
-You have chosen the warrior type Rose Spirit.
-The name of the spirit is Lilias.
-Lilias is a Rose Spirit that uses various warrior type buffs and healing while attacking enemies with a sword.
-Will you exchange to Lilias?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-18.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-18.html
deleted file mode 100644
index 13eacd041b..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-18.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Dimensional Merchant:
-You have chosen the wizard type Rose Spirit.
-The name of the spirit is Lapham.
-Lapham is a Rose Spirit that uses wizard type buffs, healing, and recharges while attacking enemies with magic.
-Will you exchange to Lapham?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-19.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-19.html
deleted file mode 100644
index 6367a6dd46..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-19.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Dimensional Merchant:
-You have chosen the warsmith type Rose Spirit.
-The name of the spirit is Mafum.
-Mafum is a Rose Spirit that uses a weapon or magic to attack enemies as well as healing and recharges while managing (warsmith buff) the owner's weapon and armor.
-Will you exchange to Mafum?
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-20.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-20.html
deleted file mode 100644
index c0459e0683..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-20.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-To exchange Vitality items, you need to have Vitality-related items in your inventory.
-You may exchange: Birthday Vitality Potion, Freya's Refreshing Breeze, Pa'agrio's Warm Breeze, Sweet Chocolate, Returning Hero's Vitality Replenishing Juice and Pirate Elixir and XP Buff 50%.
-Keep in mind, you cannot cancel any item exchange.
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-21.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-21.html
deleted file mode 100644
index c1ace942ee..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-21.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Dimensional Merchant:
-In order to seal or unseal the Power Shirt, you must have a Power Shirt or a Sealed Power Shirt in the character's inventory.
-A Sealed Power Shirt can be transferred to another character within the account through the Dimensional Merchant. But, when the seal is removed on a Sealed Power Shirt, you can no longer use seal/unseal.
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-22.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-22.html
deleted file mode 100644
index 4dfe40db2b..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-22.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-Which coupon would you like to use?
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-23.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-23.html
deleted file mode 100644
index 81d531a8b4..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-23.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Dimensional Merchant:
-What type of armor would you like?
-You can only choose once, so think carefully.
-
-
-
-
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html
deleted file mode 100644
index ae51167b5e..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html
+++ /dev/null
@@ -1,11 +0,0 @@
-Game Assistant:
-Pleased to meet you! We are the Game Assistants who help adventurers in Elmoreden.
-We have various services, so pick and choose.
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-01.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-01.html
new file mode 100644
index 0000000000..42c0e88689
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-01.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You can get a pet only for Minion Coupons, Superior Minion Coupons or Enhanced Rose Spirit Coupons. Please choose what option suits you the most.
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-02.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-02.html
new file mode 100644
index 0000000000..a70cf8bfa3
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-02.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You can exchange your Minion Coupon for a pet. Please choose who you want to get.
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-03.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-03.html
new file mode 100644
index 0000000000..012967aa2c
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-03.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen White Weasel Minion Necklace, right?
+White Weasels help their masters, buff and heal them.
+Are you sure you want this Minion Necklace, and not any other?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-04.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-04.html
new file mode 100644
index 0000000000..de9110b530
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-04.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen Fairy Princess Minion Necklace, right?
+Fairy Princesses help their masters, buff and heal them.
+Are you sure you want this Minion Necklace, and not any other?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-05.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-05.html
new file mode 100644
index 0000000000..22f77837d3
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-05.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen Wild Beast Fighter Minion Necklace, right?
+Wild Beast Fighters are very strong, their attacks are really powerful.
+Are you sure you want this Minion Necklace, and not any other?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-06.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-06.html
new file mode 100644
index 0000000000..3c5c8a0a42
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-06.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen Fox Shaman Minion Necklace, right?
+Fox Shamans are skillful mages with powerful attacks.
+Are you sure you want this Minion Necklace, and not any other?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-07.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-07.html
new file mode 100644
index 0000000000..e57a50733f
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-07.html
@@ -0,0 +1,4 @@
+Game Assistant:
+I'm sorry, but you don't have enough Minion Coupons for the exchange.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-08.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-08.html
similarity index 69%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-08.html
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-08.html
index fb9ea263f9..852a278999 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-08.html
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-08.html
@@ -1,4 +1,4 @@
-Dimensional Merchant:
-Thank you for your patronage.
-I hope you will visit me again soon.
+Game Assistant:
+Thank you for your patronage.
+I hope you will visit me again soon.
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-09.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-09.html
new file mode 100644
index 0000000000..12bbea899c
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-09.html
@@ -0,0 +1,6 @@
+Game Assistant:
+You can exchange your Superior Minion Coupon for a pet. Please choose who you want to get.
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-10.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-10.html
new file mode 100644
index 0000000000..0d1482817f
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-10.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen Toy Knight Summon Whistle.
+Toy Knight can use warrior magic, heal and attack enemies with a sword.
+Exchange it for Toy Knight?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-11.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-11.html
new file mode 100644
index 0000000000..0a839d0699
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-11.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen Spirit Shaman Summon Whistle.
+Spirit Shaman can buff, heal and attack enemies with magic.
+Exchange it for a Spirit Shaman?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-12.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-12.html
new file mode 100644
index 0000000000..3704983e1e
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-12.html
@@ -0,0 +1,7 @@
+Game Assistant:
+You've chosen Turtle Ascetic Summon Necklace.
+Turtle can heal, attack enemies with magic and weapon, also it takes care of its master's equipment (grants a buff of blacksmithing).
+Exchange it for Turtle?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-13.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-13.html
new file mode 100644
index 0000000000..9d8ae1e08f
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-13.html
@@ -0,0 +1,11 @@
+Game Assistant:
+Do you want to get Enhanced Rose Spirit?
+(You cannot get an item, if your inventory if full.)
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-14.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-14.html
new file mode 100644
index 0000000000..b12712205f
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-14.html
@@ -0,0 +1,8 @@
+Game Assistant:
+You have chosen Rose Spirit for warriors.
+His name is Desheloph.
+This spirit is able to buff and heal you, and attack your enemies.
+Do you want to get Desheloph?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-15.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-15.html
new file mode 100644
index 0000000000..523f2b9455
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-15.html
@@ -0,0 +1,8 @@
+Game Assistant:
+You have chosen Rose Spirit for mages.
+His name is Hyum.
+The spirit is able to buff and heal you, recharge your energy, and also attack your enemies.
+Do you want to get Hyum?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-16.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-16.html
new file mode 100644
index 0000000000..b3e4e3cca3
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-16.html
@@ -0,0 +1,8 @@
+Game Assistant:
+You have chosen Rose Spirit for blacksmiths..
+His name is Lekang.
+The spirit is able to heal you, recharge your energy, and also attack your enemies with magic. Also he can take care of your equipment thanks to his blacksmithing abilities.
+Do you want to get Lekang?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-17.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-17.html
new file mode 100644
index 0000000000..cc87d2e3f0
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-17.html
@@ -0,0 +1,8 @@
+Game Assistant:
+You have chosen Rose Spirit for warriors.
+Her name is Lilias.
+The spirit is able to buff and heal you, and attack your enemies.
+Do you want to get Lilias?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-18.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-18.html
new file mode 100644
index 0000000000..0cfdfd90a2
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-18.html
@@ -0,0 +1,8 @@
+Game Assistant:
+You have chosen Rose Spirit for mages.
+Her name is Lapham.
+The spirit is able to buff and heal you, recharge your energy, and also attack your enemies.
+Do you want to get Lapham?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-19.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-19.html
new file mode 100644
index 0000000000..aa4f4eee2e
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-19.html
@@ -0,0 +1,8 @@
+Game Assistant:
+You have chosen Rose Spirit for blacksmiths.
+Her name is Mafum.
+The spirit is able to heal you, recharge your energy, and also attack your enemies with magic. Also he can take care of your equipment thanks to her blacksmithing abilities.
+Do you want to get Mafum?
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-24.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-20.html
similarity index 50%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-24.html
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-20.html
index f203b512ce..a1fd2907be 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/32478-24.html
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-20.html
@@ -1,10 +1,11 @@
-Dimensional Merchant:
-Looking for a Dragon Shirt that is infused with the power of dragons? If you bring me Einhasaed, Melee Reflect, Reflect Magic T-shirt at +7 and above, and I'll exchange it for a Dragon Shirt.
+Game Assistant:
+Looking for a Dragon Shirt that is infused with the power of dragons? If you bring me Einhasad, Melee Reflect, Reflect Magic T-shirt at +7 and above, and I'll exchange it for a Dragon Shirt.
Additional 5 billion Adena required for +7 T-shirt, and +8 T-shirt can be exchanged to Dragon Shirt for free.
-If you bring a +9 T-shirt, I'll exchange it for a Dragon Leather Shirt, which is better then Dragon Shirt. And if you bring +10 T-shirt, I'll give you Radiant Rind Upgrade Stone along with the Dragon Leather Shirt. The Radiant Rind Upgrade Stone is an essential ingredient for upgrading the Dragon Leather Shirt. Don't miss the opportunity to upgrade the shirt to a stronger one.
-In addition, I also exchange the Blessed Dragon Shirt Enchant Scroll that is used to Enchance the Dragon Shirt. Keep that in mind.
-
-
-
-
+If you bring a +9 T-shirt, I'll exchange it for a Dragon Leather Shirt, which is better then Dragon Shirt. And if you bring +10 T-shirt, I'll give you Radiant Rind Upgrade Stone along with the Dragon Leather Shirt.
+The Radiant Rind Upgrade Stone is an essential ingredient for upgrading the Dragon Leather Shirt. Don't miss the opportunity to upgrade the shirt to a stronger one.
+In addition, I also exchange the Blessed Dragon Shirt Enchant Scroll that is used to Enhance the Dragon Shirt. Keep that in mind.
+
+
+
+
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21.html
new file mode 100644
index 0000000000..0148105e82
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21.html
@@ -0,0 +1,12 @@
+Game Assistant:
+Do you have a circlet enchanted to +5? If you want, I can exchange it for a Circlet Upgrade Stone.
+Maybe you have extra circlets? Then exchange them for Circlet Upgrade Stones, it will come in handy!
+Items for Noble Circlet Upgrade Stone exchange
+
+
+
+Items for Radiant Circlet Upgrade Stone exchange
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21a.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21a.html
new file mode 100644
index 0000000000..dff7483519
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21a.html
@@ -0,0 +1,3 @@
+Game Assistant:
+Exchange successful.
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21b.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21b.html
new file mode 100644
index 0000000000..e71e450fd0
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-21b.html
@@ -0,0 +1,4 @@
+Game Assistant:
+I can exchange only a circlet enchanted to +5.
+By the way, we have a deal only if you have one circlet. Drop extra circlets into warehouse.
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-22.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-22.html
new file mode 100644
index 0000000000..cdf4d5711a
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478-22.html
@@ -0,0 +1,7 @@
+Game Assistant:
+If you want to change a vitality item, it have to be in the character's inventory.
+This rule applies for exchangeable items. Pay attention to items such as Birthday Vitality Potion, Freya's Refreshing Breeze, Pa'agrio's Warm Breeze, Sweet Chocolate, Returning Hero's Vitality Replenishing Juice and Pirate Elixir and Nevit's Hourglass.
+Thay cannot be changed after exchange.
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478.html
new file mode 100644
index 0000000000..0b08223713
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/32478.html
@@ -0,0 +1,20 @@
+Game Assistant:
+Pleased to meet you! We are the Game Assistants who help adventurers in Elmoreden.
+We have various services, so pick and choose.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
similarity index 71%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index c20f397e29..990cd967b2 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -14,19 +14,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.others.DimensionalMerchant;
+package ai.others.GameAssistant;
+import java.util.Collection;
import java.util.HashMap;
import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.handler.ItemHandler;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
-import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
-import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
-import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -37,13 +33,13 @@ import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList;
import ai.AbstractNpcAI;
/**
- * Dimensional Merchant AI.
- * @author St3eT, Mobius
+ * Game Assistant AI.
+ * @author St3eT, Mobius, CostyKiller
*/
-public class DimensionalMerchant extends AbstractNpcAI
+public class GameAssistant extends AbstractNpcAI
{
// NPC
- private static final int MERCHANT = 32478; // Dimensional Merchant
+ private static final int MERCHANT = 32478; // Game Assistant
// Items
private static final int MINION_COUPON = 13273; // Minion Coupon (5-hour)
private static final int MINION_COUPON_EV = 13383; // Minion Coupon (5-hour) (Event)
@@ -51,8 +47,9 @@ public class DimensionalMerchant extends AbstractNpcAI
private static final int SUP_MINION_COUPON_EV = 14074; // Superior Minion Coupon (Event) - 5-hour
private static final int ENH_MINION_COUPON = 20914; // Enhanced Rose Spirit Coupon (5-hour)
private static final int ENH_MINION_COUPON_EV = 22240; // Enhanced Rose Spirit Coupon (5-hour) - Event
+ private static final int NOBLE_UPG_STONE = 48212; // Noble Upgrade Stone
+ private static final int RADIANT_UPG_STONE = 48213; // Radiant Upgrade Stone
// Others
- private static final String COMMAND_BYPASS = "Quest DimensionalMerchant ";
private static final HashMap MINION_EXCHANGE = new HashMap<>();
static
{
@@ -73,8 +70,20 @@ public class DimensionalMerchant extends AbstractNpcAI
MINION_EXCHANGE.put("lapham", 20919); // Enhanced Rose Necklace: Lapham
MINION_EXCHANGE.put("mafum", 20920); // Enhanced Rose Necklace: Mafum
}
+ private static final HashMap CIRCLET_EXCHANGE = new HashMap<>();
+ static
+ {
+ // Normal
+ CIRCLET_EXCHANGE.put("warrior", 48202); // Warrior's Circlet
+ CIRCLET_EXCHANGE.put("wizard", 48205); // Wizard's Circlet
+ CIRCLET_EXCHANGE.put("knight", 48208); // Knight's Circlet
+ // Noble
+ CIRCLET_EXCHANGE.put("nobleWarrior", 48203); // Noble Warrior's Circlet
+ CIRCLET_EXCHANGE.put("nobleWizard", 48206); // Noble Wizard's Circlet
+ CIRCLET_EXCHANGE.put("nobleKnight", 48209); // Noble Knight's Circlet
+ }
- private DimensionalMerchant()
+ private GameAssistant()
{
addStartNpc(MERCHANT);
addFirstTalkId(MERCHANT);
@@ -110,8 +119,6 @@ public class DimensionalMerchant extends AbstractNpcAI
case "32478-20.html":
case "32478-21.html":
case "32478-22.html":
- case "32478-23.html":
- case "32478-24.html":
{
htmltext = event;
break;
@@ -153,6 +160,16 @@ public class DimensionalMerchant extends AbstractNpcAI
htmltext = giveMinion(player, event, ENH_MINION_COUPON, ENH_MINION_COUPON_EV);
break;
}
+ case "warrior":
+ case "wizard":
+ case "knight":
+ case "nobleWarrior":
+ case "nobleWizard":
+ case "nobleKnight":
+ {
+ htmltext = giveCircletStone(player, event);
+ break;
+ }
case "package_deposit":
{
if (player.getAccountChars().size() < 1)
@@ -196,7 +213,12 @@ public class DimensionalMerchant extends AbstractNpcAI
private String giveMinion(PlayerInstance player, String event, int couponId, int eventCouponId)
{
- if (hasAtLeastOneQuestItem(player, couponId, eventCouponId))
+ String htmltext = null;
+ if (!hasAtLeastOneQuestItem(player, couponId, eventCouponId))
+ {
+ htmltext = "32478-07.html";
+ }
+ else if (hasAtLeastOneQuestItem(player, couponId, eventCouponId))
{
takeItems(player, (hasQuestItems(player, eventCouponId) ? eventCouponId : couponId), 1);
final int minionId = MINION_EXCHANGE.get(event);
@@ -207,24 +229,54 @@ public class DimensionalMerchant extends AbstractNpcAI
{
handler.useItem(player, summonItem, true);
}
- return "32478-08.html";
+ htmltext = "32478-08.html";
}
- return "32478-07.html";
+ return htmltext;
}
- @RegisterEvent(EventType.ON_PLAYER_BYPASS)
- @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
- public void OnPlayerBypass(OnPlayerBypass event)
+ private String giveCircletStone(PlayerInstance player, String event)
{
- final PlayerInstance player = event.getPlayer();
- if (event.getCommand().startsWith(COMMAND_BYPASS))
+ String htmltext = null;
+ final int circletId = CIRCLET_EXCHANGE.get(event);
+ final Collection enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5);
+ switch (enchCircletNum.size())
{
- notifyEvent(event.getCommand().replace(COMMAND_BYPASS, ""), null, player);
+ case 0:
+ default:
+ {
+ htmltext = "32478-21b.html";
+ break;
+ }
+ case 1:
+ {
+ switch (circletId)
+ {
+ case 48202: // Warrior's Circlet
+ case 48205: // Wizard's Circlet
+ case 48208: // Knight's Circlet
+ {
+ takeItems(player, circletId, 1);
+ giveItems(player, NOBLE_UPG_STONE, 1);
+ break;
+ }
+ case 48203: // Noble Warrior's Circlet
+ case 48206: // Noble Wizard's Circlet
+ case 48209: // Noble Knight's Circlet
+ {
+ takeItems(player, circletId, 1);
+ giveItems(player, RADIANT_UPG_STONE, 1);
+ break;
+ }
+ }
+ htmltext = "32478-21a.html";
+ break;
+ }
}
+ return htmltext;
}
public static void main(String[] args)
{
- new DimensionalMerchant();
+ new GameAssistant();
}
}
\ No newline at end of file