Update packets up to 2018-12-12

.travis.yml

@@ -38,7 +38,7 @@ matrix:
   - compiler: false
   include:
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20181031 --enable-packetver-re --enable-buildbot" HPM="1"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20181212 --enable-packetver-re --enable-buildbot" HPM="1"
     addons:
       apt:
         sources:
@@ -50,7 +50,7 @@ matrix:
         - libxml-sax-perl
         - libxml-parser-perl
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20181031 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20181212 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -68,7 +68,7 @@ matrix:
         packages:
         - clang-5.0
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20181031 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20181212 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -90,11 +90,11 @@ matrix:
   - compiler: clang
     env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20181031 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20181212 --enable-packetver-re --enable-buildbot"
   - compiler: gcc
     env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20181031 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20181212 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -110,7 +110,7 @@ matrix:
         packages:
         - gcc-5
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20181031 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20181212 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:

db/constants.conf

@@ -4045,4 +4045,7 @@ constants_db: {
 	ACH_PET_CREATE:                    43
 	ACH_ACHIEVE:                       44
 	ACH_ACHIEVEMENT_RANK:              45
+
+	comment__: "inventory expansion"
+	INVENTORY_INCREASE_STEP:           10
 }

db/pre-re/item_db.conf

@@ -96533,6 +96533,11 @@ item_db: (
 	AegisName: "GH_Cursed_Gemstone"
 	Name: "GH_Cursed_Gemstone"
 },
+{
+	Id: 25793
+	AegisName: "Inventory_Extension_Coupon"
+	Name: "Inventory_Extension_Coupon"
+},
 {
 	Id: 26007
 	AegisName: "Spectral_Spear_IL"

db/re/item_db.conf

@@ -152332,6 +152332,11 @@ item_db: (
 	AegisName: "GH_Cursed_Gemstone"
 	Name: "GH_Cursed_Gemstone"
 },
+{
+	Id: 25793
+	AegisName: "Inventory_Extension_Coupon"
+	Name: "Inventory_Extension_Coupon"
+},
 {
 	Id: 26007
 	AegisName: "Spectral_Spear_IL"

doc/script_commands.txt

@@ -10237,3 +10237,80 @@ Update already opened preview window with item from
 Works for 20181017 RE and main clients or newer.
 
 ---------------------------------------
+
+*enchantitem(<equip_pos>, <card_slot>, <card_id>);
+
+Insert card into equipped item in EQI_* slot.
+card_slot - can be 0 to 3.
+card_id   - any card item id.
+
+returns true if all parameters correct
+false in other case.
+Works for 20160831 main, 20151118 RE, any zero version
+
+---------------------------------------
+
+*servicemessage("<message>", <color>{, <account_id>})
+*servicemessage("<message>", <color>{, <player_name>})
+
+That command will send a service message to the chat window of the character
+specified by account ID or name, or to connected to npc player.
+It will not be seen by anyone else.
+
+Works for 20170830 RE and main and for any zero clients
+
+---------------------------------------
+
+*expandInventoryAck(<result>{, <itemId>})
+
+Send initial inventory expansion result.
+Normally this function should be called from script label
+inventory_expansion::OnInventoryExpandRequest.
+
+Valid result statuses:
+ EXPAND_INVENTORY_ASK_CONFIRMATION - force client to ask player about inventory expansion
+ EXPAND_INVENTORY_FAILED - other failed reason
+ EXPAND_INVENTORY_OTHER_WORK - failed because player busy with other work
+ EXPAND_INVENTORY_MISSING_ITEM - failed because missing item
+ EXPAND_INVENTORY_MAX_SIZE - failed because inventory size already maximum
+
+ItemId make sense only if result is EXPAND_INVENTORY_ASK_CONFIRMATION
+Works for 20181212 zero clients
+
+---------------------------------------
+
+*expandInventoryResult(<result>)
+
+Send final inventory expansion result.
+Normally this function should be called from script label
+inventory_expansion::OnInventoryExpandConfirmed.
+
+Valid result values:
+ EXPAND_INVENTORY_RESULT_SUCCESS - success message
+ EXPAND_INVENTORY_RESULT_FAILED - other failed reason
+ EXPAND_INVENTORY_RESULT_OTHER_WORK - failed because player busy with other work
+ EXPAND_INVENTORY_RESULT_MISSING_ITEM - failed because missing item
+ EXPAND_INVENTORY_RESULT_MAX_SIZE - failed because inventory size already maximum
+
+Works for 20181212 zero clients
+
+---------------------------------------
+
+*expandInventory(<value>)
+
+Adjust player inventory to given value.
+Maximum inventory size is MAX_INVENTORY.
+Minimum inventory size is FIXED_INVENTORY_SIZE.
+For supported clients it send inventory change packet. For old clients,
+this change is silent.
+Current max inventory size can be read by function getInventorySize().
+
+---------------------------------------
+
+*getInventorySize()
+
+Return current player max inventory size.
+This value always smaller or equal to MAX_INVENTORY.
+Size can be changed by group of functions expandInventory*
+
+---------------------------------------

npc/other/inventory_expansion.txt

@@ -0,0 +1,63 @@
+//================= Hercules Script =======================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2018  Hercules Dev Team
+//= Copyright (C)  4144
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Inventory expansion
+//=========================================================================
+
+-	script	inventory_expansion	FAKE_NPC,{
+	end;
+
+OnInvExpandRequest:
+	if (countitem(Inventory_Extension_Coupon) < 1) {
+		expandInventoryAck(EXPAND_INV_MISSING_ITEM);
+		end;
+	}
+	if (getInventorySize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) {
+		expandInventoryAck(EXPAND_INV_MAX_SIZE);
+		end;
+	}
+	expandInventoryAck(EXPAND_INV_ASK_CONFIRMATION, Inventory_Extension_Coupon);
+	end;
+
+OnInvExpandConfirmed:
+	if (countitem(Inventory_Extension_Coupon) < 1) {
+		expandInventoryResult(EXPAND_INV_RESULT_MISSING_ITEM);
+		end;
+	}
+	if (getInventorySize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) {
+		expandInventoryResult(EXPAND_INV_RESULT_MAX_SIZE);
+		end;
+	}
+	delitem(Inventory_Extension_Coupon, 1);
+	if (expandInventory(INVENTORY_INCREASE_STEP) == true) {
+		expandInventoryResult(EXPAND_INV_RESULT_SUCCESS);
+	}
+	end;
+
+OnInvExpandRejected:
+	end;
+}

npc/scripts.conf

@@ -226,6 +226,7 @@
 "npc/other/turbo_track.txt",
 "npc/other/item_merge.txt",
 "npc/other/private_airship.txt",
+"npc/other/inventory_expansion.txt",
 
 //================= Quests ================================================
 // - Quests-Tutorials for basic classes (1st class quests) ------

sql-files/main.sql

@@ -244,6 +244,7 @@ CREATE TABLE IF NOT EXISTS `char` (
   `attendance_count` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attendance_timer` BIGINT(20) NULL DEFAULT '0',
   `title_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+  `inventory_size` INT(11) UNSIGNED NOT NULL DEFAULT '100',
   PRIMARY KEY (`char_id`),
   UNIQUE KEY `name_key` (`name`),
   KEY `account_id` (`account_id`),
@@ -922,6 +923,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1528026381); -- 2018-06-0
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1528180320); -- 2018-06-05--12-02.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1532403228); -- 2018-07-24--03-23.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1535865732); -- 2018-09-01--05-22.sql
+INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1544738447); -- 2018-12-14--01-02.sql
 
 --
 -- Table structure for table `storage`

sql-files/upgrades/2018-12-14--01-02.sql

@@ -0,0 +1,24 @@
+#1544738447
+
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 2018 Hercules Dev Team
+-- Copyright (C) 4144
+--
+-- Hercules is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ALTER TABLE `char` ADD `inventory_size` INT(11) UNSIGNED NOT NULL DEFAULT '100';
+
+INSERT INTO `sql_updates` (`timestamp`, `ignored`) VALUES (1544738447, 'No');

sql-files/upgrades/index.txt

@@ -50,3 +50,4 @@
 2018-06-05--12-02.sql
 2018-07-24--03-23.sql
 2018-09-01--05-22.sql
+2018-12-14--01-02.sql

src/char/Makefile.in

@@ -46,7 +46,7 @@ CHAR_C = char.c HPMchar.c loginif.c mapif.c geoip.c inter.c int_achievement.c in
 CHAR_OBJ = $(addprefix obj_sql/, $(patsubst %.c,%.o,$(CHAR_C)))
 CHAR_H = char.h HPMchar.h loginif.h mapif.h geoip.h inter.h int_achievement.h int_auction.h int_clan.h int_elemental.h \
          int_guild.h int_homun.h int_mail.h int_mercenary.h int_party.h int_pet.h \
-         int_quest.h int_rodex.h int_storage.h pincode.h
+         int_quest.h int_rodex.h int_storage.h pincode.h packets_hc_struct.h
 CHAR_PH =
 
 HAVE_MYSQL=@HAVE_MYSQL@