From c0f8e3c0dd63ea644fa4633353f5955e77820a5b Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 29 Oct 2012 22:37:12 +0000
Subject: [PATCH] BETA: SSQ Missing feature Lord of the Manor's Certificate of
Approval: * Chamberlain related htmls and bypass fixes. * SQL support
for sold Lord of the Manor's Certificate of Approval for each castle.
Reported by: valdaron
'''Note:''' C3 feature.
---
.../html/chamberlain/chamberlain-products.htm | 2 +-
.../html/chamberlain/chamberlain_noadena.htm | 7 +++++++
.../html/chamberlain/ssq_notdawnorevent.htm | 6 ++++++
.../html/chamberlain/ssq_notenoughticket.htm | 5 +++++
.../html/chamberlain/ssq_selldawnticket.htm | 9 +++++++++
L2J_DataPack_BETA/dist/sql/game/castle.sql | 19 ++++++++++---------
.../dist/sql/game/updates/20121029update.sql | 1 +
7 files changed, 39 insertions(+), 10 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain_noadena.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notdawnorevent.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notenoughticket.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_selldawnticket.htm
create mode 100644 L2J_DataPack_BETA/dist/sql/game/updates/20121029update.sql
diff --git a/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-products.htm b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-products.htm
index 806875e28c..11db4b6cdb 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-products.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-products.htm
@@ -1,7 +1,7 @@
<html><body>
You can obtain the following from the castle:<br><br>
<center>
-<a action="bypass -h npc_%objectId%_Link chamberlain/chamberlain-products.htm">Lord of the Manor's Certificate of Approval</a><br>
+<a action="bypass -h npc_%objectId%_manors_cert">Lord of the Manor's Certificate of Approval</a><br>
<a action="bypass -h npc_%objectId%_items %npcId%">General Items</a><br>
<a action="bypass -h npc_%objectId%_give_crown">Castle Lord's Crown</a><br>
<a action="bypass -h npc_%objectId%_Link chamberlain/chamberlain.htm">Back</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain_noadena.htm b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain_noadena.htm
new file mode 100644
index 0000000000..c22c5e385f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain_noadena.htm
@@ -0,0 +1,7 @@
+<html><body>
+My Lord, I regret to inform you that you do not currently have enough Adena to set this function.<br>
+You may find the money you need in the warehouse.<br>
+<center>
+<a action="bypass -h npc_%objectId%_Link chamberlain/chamberlain.htm">Return</a>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notdawnorevent.htm b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notdawnorevent.htm
new file mode 100644
index 0000000000..81b28f31b2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notdawnorevent.htm
@@ -0,0 +1,6 @@
+<html><body>
+<font color="LEVEL">[Sale of Certificates of Approval]</font><br>
+It is either not currently a competition period, or you did not join the Rulers of Dawn.<br>
+<br>
+<button action="bypass -h npc_%objectId%_Link chamberlain/chamberlain.htm" value="Main screen" width="80" height="27" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notenoughticket.htm b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notenoughticket.htm
new file mode 100644
index 0000000000..084f540f0a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_notenoughticket.htm
@@ -0,0 +1,5 @@
+<html><body>
+<font color="LEVEL">[Sale of Certificates of Approval]</font><br>
+All available Certificates of Approval have been issued.<br>
+<br><button action="bypass -h npc_%objectId%_Link chamberlain/chamberlain.htm" value="Initial Screen" width="80" height="27" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_selldawnticket.htm b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_selldawnticket.htm
new file mode 100644
index 0000000000..c2e730b03c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/chamberlain/ssq_selldawnticket.htm
@@ -0,0 +1,9 @@
+<html><body>
+<font color="LEVEL">[Sale of Certificates of Approval]</font><br>
+Currently, you have <font color="00FFFF">%DawnTicketLeft%</font> Certificates of Approval remaining.<br>
+The Certificate of Approval is issued <font color="00FFFF">%DawnTicketBundle%</font> at a time, and each certificate costs <font color="00FFFF">%DawnTicketPrice%</font> Adena.<br>
+Do you wish to buy a Certificate of Approval?<br>
+<br>
+<button action="bypass -h npc_%objectId%_manors_cert_confirm" value="Confirm" width="80" height="27" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button action="bypass -h npc_%objectId%_Link chamberlain/chamberlain.htm" value="Cancel" width="80" height="27" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/castle.sql b/L2J_DataPack_BETA/dist/sql/game/castle.sql
index e1cb887317..d77407d51b 100644
--- a/L2J_DataPack_BETA/dist/sql/game/castle.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/castle.sql
@@ -8,17 +8,18 @@ CREATE TABLE IF NOT EXISTS `castle` (
`regTimeEnd` bigint(13) unsigned NOT NULL DEFAULT '0',
`showNpcCrest` enum('true','false') DEFAULT 'false' NOT NULL,
`bloodAlliance` int(3) NOT NULL default 0,
+ `ticketBuyCount` smallint(3) NOT NULL default 0,
PRIMARY KEY (`name`),
KEY `id` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT IGNORE INTO `castle` VALUES
-(1,'Gludio',0,0,0,'true',0,'false',0),
-(2,'Dion',0,0,0,'true',0,'false',0),
-(3,'Giran',0,0,0,'true',0,'false',0),
-(4,'Oren',0,0,0,'true',0,'false',0),
-(5,'Aden',0,0,0,'true',0,'false',0),
-(6,'Innadril',0,0,0,'true',0,'false',0),
-(7,'Goddard',0,0,0,'true',0,'false',0),
-(8,'Rune',0,0,0,'true',0,'false',0),
-(9,'Schuttgart',0,0,0,'true',0,'false',0);
\ No newline at end of file
+(1,'Gludio',0,0,0,'true',0,'false',0,0),
+(2,'Dion',0,0,0,'true',0,'false',0,0),
+(3,'Giran',0,0,0,'true',0,'false',0,0),
+(4,'Oren',0,0,0,'true',0,'false',0,0),
+(5,'Aden',0,0,0,'true',0,'false',0,0),
+(6,'Innadril',0,0,0,'true',0,'false',0,0),
+(7,'Goddard',0,0,0,'true',0,'false',0,0),
+(8,'Rune',0,0,0,'true',0,'false',0,0),
+(9,'Schuttgart',0,0,0,'true',0,'false',0,0);
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20121029update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20121029update.sql
new file mode 100644
index 0000000000..3ec6ef8ff0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20121029update.sql
@@ -0,0 +1 @@
+ALTER TABLE `castle` ADD `ticketBuyCount` SMALLINT(3) NOT NULL default 0 AFTER `bloodAlliance`;
\ No newline at end of file
--
GitLab