Added returning to instances (#7622)

Fixes #5226 Thanks to @Forte22, @attackjom and @OptimusM Co-authored-by: Aleos <aleos89@users.noreply.github.com>
rathena · Mar 23, 2023 · 49ba072 · Pokye · Mar 23, 2023 · Atemo
1 parent 8abf996
commit 49ba072
Show file tree

Hide file tree

Showing 11 changed files with 194 additions and 283 deletions.
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
@@ -168,3 +168,10 @@ feature.mesitemlink_dbname: no
 // Stylist UI (Note 1)
 // Requires: 2015-11-04 or later
 feature.stylist: on
+
+// Are players allowed to reconnect into instances? (Note 1)
+// This is enabled by default in Renewal mode and
+// disabled by default in Pre-Renewal mode.
+// If this is allowed the "nosave" mapflag is still being respected
+// and may prevent players from warping back into the instance.
+//feature.instance_allow_reconnect: yes
diff --git a/npc/mapflag/nosave.txt b/npc/mapflag/nosave.txt
@@ -7,6 +7,7 @@
 //= 1.7 Updated. [Lupus]
 //= 1.8 Updated. [L0ne_W0lf]
 //= 1.9 Renewal split. [Euphy]
+//= 2.0 Moved instances to pre-renewal. [Lemongrass]
 //============================================================
 
 //============================================================
@@ -268,23 +269,6 @@ que_qaru03	mapflag	nosave	SavePoint
 que_qaru04	mapflag	nosave	SavePoint
 que_qaru05	mapflag	nosave	SavePoint
 
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	nosave	SavePoint
-2@cata	mapflag	nosave	SavePoint
-
-//============================================================
-// Endless Tower
-//============================================================
-e_tower	mapflag	nosave	SavePoint
-1@tower	mapflag	nosave	SavePoint
-2@tower	mapflag	nosave	SavePoint
-3@tower	mapflag	nosave	SavePoint
-4@tower	mapflag	nosave	SavePoint
-5@tower	mapflag	nosave	SavePoint
-6@tower	mapflag	nosave	SavePoint
-
 //============================================================
 // Battlegrounds
 //============================================================
@@ -307,18 +291,6 @@ schg_dun01	mapflag	nosave	SavePoint
 arug_que01	mapflag	nosave	SavePoint
 arug_dun01	mapflag	nosave	SavePoint
 
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	nosave	SavePoint
-2@orcs	mapflag	nosave	SavePoint
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	nosave	SavePoint
-2@nyd	mapflag	nosave	SavePoint
-
 //============================================================
 // RWC
 //============================================================

diff --git a/npc/pre-re/mapflag/nosave.txt b/npc/pre-re/mapflag/nosave.txt
@@ -0,0 +1,37 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable auto-save.
+//===== Description: ========================================= 
+//= Characters logging out on the specified map will be warped
+//= to the map specified in the last field, or "SavePoint".
+//===== Additional Comments: ================================= 
+//= 1.0 Renewal Split. [Lemongrass]
+//============================================================
+
+//============================================================
+// Endless Tower
+//============================================================
+e_tower	mapflag	nosave	SavePoint
+1@tower	mapflag	nosave	SavePoint
+2@tower	mapflag	nosave	SavePoint
+3@tower	mapflag	nosave	SavePoint
+4@tower	mapflag	nosave	SavePoint
+5@tower	mapflag	nosave	SavePoint
+6@tower	mapflag	nosave	SavePoint
+
+//============================================================
+// Sealed Shrine
+//============================================================
+1@cata	mapflag	nosave	SavePoint
+2@cata	mapflag	nosave	SavePoint
+
+//============================================================
+// Orc's Memory
+//============================================================
+1@orcs	mapflag	nosave	SavePoint
+2@orcs	mapflag	nosave	SavePoint
+
+//============================================================
+// Nidhoggr's Instance
+//============================================================
+1@nyd	mapflag	nosave	SavePoint
+2@nyd	mapflag	nosave	SavePoint
diff --git a/npc/re/mapflag/nosave.txt b/npc/re/mapflag/nosave.txt
@@ -6,6 +6,7 @@
 //===== Changelogs: ==========================================
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added GVG TE Guild Dungeons. [Capuche]
+//= 1.2 Removed instances. [Lemongrass]
 //============================================================
 
 //============================================================
@@ -60,27 +61,10 @@ te_aldecas3	mapflag	nosave	SavePoint
 te_aldecas4	mapflag	nosave	SavePoint
 te_aldecas5	mapflag	nosave	SavePoint
 
-//============================================================
-// Misty Forest Labyrinth
-//============================================================
-1@mist	mapflag	nosave	SavePoint
-
-//============================================================
-// Octopus Cave
-//============================================================
-1@cash	mapflag	nosave	SavePoint
-
-//============================================================
-// Drain
-//============================================================
-1@pump	mapflag	nosave	SavePoint
-2@pump	mapflag	nosave	SavePoint
-
 //============================================================
 // Somatology Laboratory
 //============================================================
 que_lhz	mapflag	nosave	SavePoint
-1@lhz	mapflag	nosave	SavePoint
 
 //============================================================
 // Port Malaya
@@ -95,246 +79,22 @@ ma_zif07	mapflag	nosave	SavePoint
 ma_zif08	mapflag	nosave	SavePoint
 ma_zif09	mapflag	nosave	SavePoint
 
-//============================================================
-// Bangungot Hospital F2
-//============================================================
-1@ma_h	mapflag	nosave	SavePoint
-
-//============================================================
-// Buwaya Cave
-//============================================================
-1@ma_c	mapflag	nosave	SavePoint
-
-//============================================================
-// Bakonawa Hideout
-//============================================================
-1@ma_b	mapflag	nosave	SavePoint
-
 //============================================================
 // Inside Eclage
 //============================================================
 que_avan01	mapflag	nosave	SavePoint
-1@ecl	mapflag	nosave	SavePoint
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	nosave	SavePoint
-2@gl_k	mapflag	nosave	SavePoint
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	nosave	SavePoint
-1@def02	mapflag	nosave	SavePoint
-1@def03	mapflag	nosave	SavePoint
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	nosave	SavePoint
-1@sara	mapflag	nosave	SavePoint
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	nosave	SavePoint
-1@gef	mapflag	nosave	SavePoint
-1@gef_in	mapflag	nosave	SavePoint
-1@spa	mapflag	nosave	SavePoint
-1@tnm1	mapflag	nosave	SavePoint
-1@tnm2	mapflag	nosave	SavePoint
-1@tnm3	mapflag	nosave	SavePoint
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	nosave	SavePoint
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	nosave	SavePoint
-1@air1	mapflag	nosave	SavePoint
-1@air2	mapflag	nosave	SavePoint
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	nosave	SavePoint
-1@dth2	mapflag	nosave	SavePoint
-1@dth3	mapflag	nosave	SavePoint
-1@rev	mapflag	nosave	SavePoint
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	nosave	SavePoint
-1@jtb	mapflag	nosave	SavePoint
 
 //============================================================
 // Episode 15 - Phantasmagorica
 //============================================================
-1@lab	mapflag	nosave	SavePoint
-1@uns	mapflag	nosave	SavePoint
 un_myst	mapflag	nosave	SavePoint
-1@mcd	mapflag	nosave	SavePoint
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	nosave
 
 //============================================================
 // Episode 16.1 - Banquet of Heroes
 //============================================================
 que_swat	mapflag	nosave	SavePoint
-1@mir	mapflag	nosave	SavePoint
-2@mir	mapflag	nosave	SavePoint
-1@sthb	mapflag	nosave	SavePoint
-1@sthc	mapflag	nosave	SavePoint
-1@sthd	mapflag	nosave	SavePoint
-1@slw	mapflag	nosave	SavePoint
-1@swat	mapflag	nosave	SavePoint
 
 //============================================================
 // Rockridge
 //============================================================
 rockmi2	mapflag	nosave	SavePoint
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	nosave	SavePoint
-1@md_pay	mapflag	nosave	SavePoint
-
-//============================================================
-// Chicken Mode - Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	nosave	SavePoint
-2@gl_k2	mapflag	nosave	SavePoint
-
-//============================================================
-// Chicken Mode - Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	nosave	SavePoint
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	nosave	SavePoint
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	nosave	SavePoint
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	nosave	SavePoint
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	nosave	SavePoint
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	nosave	SavePoint
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	nosave	SavePoint
-1@os_a	mapflag	nosave	SavePoint
-1@os_b	mapflag	nosave	SavePoint
-1@rgsr	mapflag	nosave	SavePoint
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	nosave	SavePoint
-1@bamq	mapflag	nosave	SavePoint
-1@ghg	mapflag	nosave	SavePoint
-1@herbs	mapflag	nosave	SavePoint
-1@lost	mapflag	nosave	SavePoint
-1@odin	mapflag	nosave	SavePoint
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	nosave	SavePoint
-1@4mag	mapflag	nosave	SavePoint
-1@4mst	mapflag	nosave	SavePoint
-1@4sac	mapflag	nosave	SavePoint
-1@4tro	mapflag	nosave	SavePoint
-1@4inq	mapflag	nosave	SavePoint
-1@4cdn	mapflag	nosave	SavePoint
-1@4igd	mapflag	nosave	SavePoint
-1@4drk	mapflag	nosave	SavePoint
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	nosave	SavePoint
-
-//============================================================
-// Traces of Heroes
-//============================================================
-1@mjo1	mapflag	nosave	SavePoint
-1@mjo2	mapflag	nosave	SavePoint
-1@spa2	mapflag	nosave	SavePoint
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	nosave	SavePoint
-2@thts	mapflag	nosave	SavePoint
-3@thts	mapflag	nosave	SavePoint
-4@thts	mapflag	nosave	SavePoint
-5@thts	mapflag	nosave	SavePoint
-6@thts	mapflag	nosave	SavePoint
-7@thts	mapflag	nosave	SavePoint
-8@thts	mapflag	nosave	SavePoint
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	nosave	SavePoint
-1@gl_he2	mapflag	nosave	SavePoint
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	nosave	SavePoint
-1@gol1	mapflag	nosave	SavePoint
-1@gol2	mapflag	nosave	SavePoint
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	nosave	SavePoint
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	nosave	SavePoint
-2@ch_t	mapflag	nosave	SavePoint
-3@ch_t	mapflag	nosave	SavePoint
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	nosave	SavePoint
-1@advs	mapflag	nosave	SavePoint
-1@nyr	mapflag	nosave	SavePoint
-1@oz	mapflag	nosave	SavePoint
-1@tcamp	mapflag	nosave	SavePoint
-2@nyr	mapflag	nosave	SavePoint
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	nosave	SavePoint
diff --git a/sql-files/main.sql b/sql-files/main.sql
@@ -259,6 +259,7 @@ CREATE TABLE IF NOT EXISTS `char` (
   `last_map` varchar(11) NOT NULL default '',
   `last_x` smallint(4) unsigned NOT NULL default '53',
   `last_y` smallint(4) unsigned NOT NULL default '111',
+  `last_instanceid` int(11) unsigned NOT NULL default '0',
   `save_map` varchar(11) NOT NULL default '',
   `save_x` smallint(4) unsigned NOT NULL default '53',
   `save_y` smallint(4) unsigned NOT NULL default '111',

diff --git a/sql-files/upgrades/upgrade_20230224.sql b/sql-files/upgrades/upgrade_20230224.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `char`
+	ADD COLUMN `last_instanceid` int(11) unsigned NOT NULL default '0' AFTER `last_y`
+;