summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--conf/map/maps.conf20
-rw-r--r--db/constants.conf66
-rw-r--r--db/map_index.txt15
-rw-r--r--maps/pre-re/1@cor.mcachebin0 -> 4146 bytes
-rw-r--r--maps/pre-re/1@gl_prq.mcachebin0 -> 3437 bytes
-rw-r--r--maps/pre-re/1@os_a.mcachebin0 -> 7350 bytes
-rw-r--r--maps/pre-re/1@os_b.mcachebin0 -> 2157 bytes
-rw-r--r--maps/pre-re/1@rgsr.mcachebin0 -> 1836 bytes
-rw-r--r--maps/pre-re/gl_cas01_.mcachebin0 -> 6131 bytes
-rw-r--r--maps/pre-re/mag_dun03.mcachebin0 -> 1749 bytes
-rw-r--r--maps/pre-re/pub_cat.mcachebin0 -> 763 bytes
-rw-r--r--maps/pre-re/rgsr_in.mcachebin0 -> 1833 bytes
-rw-r--r--maps/pre-re/sp_cor.mcachebin0 -> 4146 bytes
-rw-r--r--maps/pre-re/sp_os.mcachebin0 -> 7339 bytes
-rw-r--r--maps/pre-re/sp_rudus.mcachebin0 -> 6326 bytes
-rw-r--r--maps/pre-re/sp_rudus2.mcachebin0 -> 7390 bytes
-rw-r--r--maps/pre-re/sp_rudus3.mcachebin0 -> 6494 bytes
-rw-r--r--maps/re/1@cor.mcachebin0 -> 4146 bytes
-rw-r--r--maps/re/1@gl_prq.mcachebin0 -> 3437 bytes
-rw-r--r--maps/re/1@os_a.mcachebin0 -> 7350 bytes
-rw-r--r--maps/re/1@os_b.mcachebin0 -> 2157 bytes
-rw-r--r--maps/re/1@rgsr.mcachebin0 -> 1836 bytes
-rw-r--r--maps/re/gl_cas01_.mcachebin0 -> 6131 bytes
-rw-r--r--maps/re/mag_dun03.mcachebin0 -> 1749 bytes
-rw-r--r--maps/re/pub_cat.mcachebin0 -> 763 bytes
-rw-r--r--maps/re/rgsr_in.mcachebin0 -> 1833 bytes
-rw-r--r--maps/re/sp_cor.mcachebin0 -> 4146 bytes
-rw-r--r--maps/re/sp_os.mcachebin0 -> 7339 bytes
-rw-r--r--maps/re/sp_rudus.mcachebin0 -> 6326 bytes
-rw-r--r--maps/re/sp_rudus2.mcachebin0 -> 7390 bytes
-rw-r--r--maps/re/sp_rudus3.mcachebin0 -> 6494 bytes
-rw-r--r--sql-files/main.sql2
-rw-r--r--src/map/npc.h2
34 files changed, 104 insertions, 3 deletions
diff --git a/README.md b/README.md
index f334b7862..6a543cea6 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ Build Status:
[![Coverity Scan Build Status](https://scan.coverity.com/projects/3892/badge.svg)](https://scan.coverity.com/projects/herculesws-hercules)
[![GitLab Build Status](https://gitlab.com/HerculesWS/Hercules/badges/master/build.svg)](https://gitlab.com/HerculesWS/Hercules/commits/master)
[![Coverage Report](https://gitlab.com/HerculesWS/Hercules/badges/master/coverage.svg)](https://gitlab.com/HerculesWS/Hercules/commits/master)
+[![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/HerculesWS/Hercules.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HerculesWS/Hercules/context:cpp)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/HerculesWS/Hercules.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HerculesWS/Hercules/alerts)
Issues and pull requests:
[![Open Issues](https://img.shields.io/github/issues-raw/HerculesWS/Hercules.svg?label=Open%20Issues)](https://github.com/HerculesWS/Hercules/issues)
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 2b1b134ff..1634ef3a8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -1333,6 +1333,26 @@ map_list: (
"star_frst",
"star_in",
+ // Episode 17.1
+ "1@cor",
+ "1@os_a",
+ "1@os_b",
+ "1@rgsr",
+ "rgsr_in",
+ "pub_cat",
+ "sp_cor",
+ "sp_os",
+ "sp_rudus",
+ "sp_rudus2",
+ "sp_rudus3",
+
+ // Level Expansion
+ "mag_dun03",
+ "gl_cas01_",
+
+ // EDDA the downfall of GlastHeim
+ "1@gl_prq",
+
//------------------------- Clone Maps ---------------------------
//------------------------- Extra Maps ---------------------------
diff --git a/db/constants.conf b/db/constants.conf
index c3b1fdb57..08dc63b40 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3554,6 +3554,40 @@ constants_db: {
4_M_AC_RUMIN: 10246
4_M_HIGH_WIZARD: 10247
4_SYSTEM_BOX: 10248
+ 4_STEELBOX: 10249
+ 4_WOODBOX: 10250
+ 4_M_POPFESTA: 10251
+ 4_BONFIRE: 10252
+ 4_PCCOUNT: 10253
+ 4_SCATLETON: 10271
+ 4_JJAK: 10280
+ 4_M_SNOWMAN_B: 10281
+ 4_M_SNOWMAN_R: 10282
+ 4_M_SNOWMAN_G: 10283
+ 4_F_DANGDANG: 10286
+ 4_M_DANGDANG: 10287
+ 4_F_DANGDANG1: 10288
+ 4_LEAFCAT: 10289
+ 4_NASARIAN: 10290
+ 4_NASARIAN_EM: 10291
+ 4_TEDDY_BEAR_W: 10292
+ 4_TEDDY_BEAR_B: 10293
+ 4_TEDDY_BEAR_B_L: 10294
+ 4_M_SOULREAPER: 10295
+ 4_F_SE_SUN: 10296
+ 4_M_SE_MOON: 10297
+ 4_M_SE_STAR: 10298
+ 4_EP17_KAYA: 10299
+ 4_EP17_AS: 10300
+ 4_EP17_ELYUMINA: 10301
+ 4_EP17_MORNING: 10302
+ 4_EP17_MIGUEL: 10303
+ 4_EP17_NIHIL_K: 10304
+ 4_EP17_MIGUEL_D: 10305
+ 4_ED_SCHMIDT: 10306
+ 4_ED_OSCAR: 10307
+ 4_ED_ORB: 10308
+ 4_ED_FENCE: 10309
comment__: "Mercenary IDs"
MER_LIF: 6001
@@ -3931,6 +3965,38 @@ constants_db: {
HAT_EF_QSCARABA: 54
HAT_EF_FSTONE: 55
HAT_EF_MAGICCIRCLE: 56
+ HAT_EF_BRYSINGGAMEN: 57
+ HAT_EF_MAGINGIORDE: 58
+ HAT_EF_LEVEL99_RED: 59
+ HAT_EF_LEVEL99_ULTRAMARINE: 60
+ HAT_EF_LEVEL99_CYAN: 61
+ HAT_EF_LEVEL99_LIME: 62
+ HAT_EF_LEVEL99_VIOLET: 63
+ HAT_EF_LEVEL99_LILAC: 64
+ HAT_EF_LEVEL99_SUN_ORANGE: 65
+ HAT_EF_LEVEL99_DEEP_PINK: 66
+ HAT_EF_LEVEL99_BLACK: 67
+ HAT_EF_LEVEL99_WHITE: 68
+ HAT_EF_LEVEL160_RED: 69
+ HAT_EF_LEVEL160_ULTRAMARINE: 70
+ HAT_EF_LEVEL160_CYAN: 71
+ HAT_EF_LEVEL160_LIME: 72
+ HAT_EF_LEVEL160_VIOLET: 73
+ HAT_EF_LEVEL160_LILAC: 74
+ HAT_EF_LEVEL160_SUN_ORANGE: 75
+ HAT_EF_LEVEL160_DEEP_PINK: 76
+ HAT_EF_LEVEL160_BLACK: 77
+ HAT_EF_LEVEL160_WHITE: 78
+ HAT_EF_FULL_BLOOMCHERRY_TREE: 79
+ HAT_EF_C_BLESSINGS_OF_SOUL: 80
+ HAT_EF_MANYSTARS: 81
+ HAT_EF_SUBJECT_AURA_GOLD: 82
+ HAT_EF_SUBJECT_AURA_WHITE: 83
+ HAT_EF_SUBJECT_AURA_RED: 84
+ HAT_EF_C_SHINING_ANGEL_WING: 85
+ HAT_EF_MAGIC_STAR_TW: 86
+ HAT_DIGITAL_SPACE: 87
+ HAT_EF_SLEIPNIR: 88
comment__: "Achievement Types"
ACH_QUEST: 0
diff --git a/db/map_index.txt b/db/map_index.txt
index 2efafb0b2..fbbf4d25a 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1026,7 +1026,20 @@ com_d02_i
1@soul
star_frst
star_in
-
+1@cor
+1@os_a
+1@os_b
+1@rgsr
+rgsr_in
+pub_cat
+sp_cor
+sp_os
+sp_rudus
+sp_rudus2
+sp_rudus3
+mag_dun03
+gl_cas01_
+1@gl_prq
// Only add maps under this line if they are not standard maps!
//======================================================================================
diff --git a/maps/pre-re/1@cor.mcache b/maps/pre-re/1@cor.mcache
new file mode 100644
index 000000000..eb75bcc4d
--- /dev/null
+++ b/maps/pre-re/1@cor.mcache
Binary files differ
diff --git a/maps/pre-re/1@gl_prq.mcache b/maps/pre-re/1@gl_prq.mcache
new file mode 100644
index 000000000..10f035f98
--- /dev/null
+++ b/maps/pre-re/1@gl_prq.mcache
Binary files differ
diff --git a/maps/pre-re/1@os_a.mcache b/maps/pre-re/1@os_a.mcache
new file mode 100644
index 000000000..e87860ac1
--- /dev/null
+++ b/maps/pre-re/1@os_a.mcache
Binary files differ
diff --git a/maps/pre-re/1@os_b.mcache b/maps/pre-re/1@os_b.mcache
new file mode 100644
index 000000000..8f2277128
--- /dev/null
+++ b/maps/pre-re/1@os_b.mcache
Binary files differ
diff --git a/maps/pre-re/1@rgsr.mcache b/maps/pre-re/1@rgsr.mcache
new file mode 100644
index 000000000..cf2114dd8
--- /dev/null
+++ b/maps/pre-re/1@rgsr.mcache
Binary files differ
diff --git a/maps/pre-re/gl_cas01_.mcache b/maps/pre-re/gl_cas01_.mcache
new file mode 100644
index 000000000..457a8be74
--- /dev/null
+++ b/maps/pre-re/gl_cas01_.mcache
Binary files differ
diff --git a/maps/pre-re/mag_dun03.mcache b/maps/pre-re/mag_dun03.mcache
new file mode 100644
index 000000000..ad35c4be1
--- /dev/null
+++ b/maps/pre-re/mag_dun03.mcache
Binary files differ
diff --git a/maps/pre-re/pub_cat.mcache b/maps/pre-re/pub_cat.mcache
new file mode 100644
index 000000000..1e4d4a92a
--- /dev/null
+++ b/maps/pre-re/pub_cat.mcache
Binary files differ
diff --git a/maps/pre-re/rgsr_in.mcache b/maps/pre-re/rgsr_in.mcache
new file mode 100644
index 000000000..fa37ec1ec
--- /dev/null
+++ b/maps/pre-re/rgsr_in.mcache
Binary files differ
diff --git a/maps/pre-re/sp_cor.mcache b/maps/pre-re/sp_cor.mcache
new file mode 100644
index 000000000..59f0835f6
--- /dev/null
+++ b/maps/pre-re/sp_cor.mcache
Binary files differ
diff --git a/maps/pre-re/sp_os.mcache b/maps/pre-re/sp_os.mcache
new file mode 100644
index 000000000..029e11070
--- /dev/null
+++ b/maps/pre-re/sp_os.mcache
Binary files differ
diff --git a/maps/pre-re/sp_rudus.mcache b/maps/pre-re/sp_rudus.mcache
new file mode 100644
index 000000000..bc2435ecd
--- /dev/null
+++ b/maps/pre-re/sp_rudus.mcache
Binary files differ
diff --git a/maps/pre-re/sp_rudus2.mcache b/maps/pre-re/sp_rudus2.mcache
new file mode 100644
index 000000000..0269518bc
--- /dev/null
+++ b/maps/pre-re/sp_rudus2.mcache
Binary files differ
diff --git a/maps/pre-re/sp_rudus3.mcache b/maps/pre-re/sp_rudus3.mcache
new file mode 100644
index 000000000..f060c444f
--- /dev/null
+++ b/maps/pre-re/sp_rudus3.mcache
Binary files differ
diff --git a/maps/re/1@cor.mcache b/maps/re/1@cor.mcache
new file mode 100644
index 000000000..eb75bcc4d
--- /dev/null
+++ b/maps/re/1@cor.mcache
Binary files differ
diff --git a/maps/re/1@gl_prq.mcache b/maps/re/1@gl_prq.mcache
new file mode 100644
index 000000000..10f035f98
--- /dev/null
+++ b/maps/re/1@gl_prq.mcache
Binary files differ
diff --git a/maps/re/1@os_a.mcache b/maps/re/1@os_a.mcache
new file mode 100644
index 000000000..e87860ac1
--- /dev/null
+++ b/maps/re/1@os_a.mcache
Binary files differ
diff --git a/maps/re/1@os_b.mcache b/maps/re/1@os_b.mcache
new file mode 100644
index 000000000..8f2277128
--- /dev/null
+++ b/maps/re/1@os_b.mcache
Binary files differ
diff --git a/maps/re/1@rgsr.mcache b/maps/re/1@rgsr.mcache
new file mode 100644
index 000000000..cf2114dd8
--- /dev/null
+++ b/maps/re/1@rgsr.mcache
Binary files differ
diff --git a/maps/re/gl_cas01_.mcache b/maps/re/gl_cas01_.mcache
new file mode 100644
index 000000000..457a8be74
--- /dev/null
+++ b/maps/re/gl_cas01_.mcache
Binary files differ
diff --git a/maps/re/mag_dun03.mcache b/maps/re/mag_dun03.mcache
new file mode 100644
index 000000000..ad35c4be1
--- /dev/null
+++ b/maps/re/mag_dun03.mcache
Binary files differ
diff --git a/maps/re/pub_cat.mcache b/maps/re/pub_cat.mcache
new file mode 100644
index 000000000..1e4d4a92a
--- /dev/null
+++ b/maps/re/pub_cat.mcache
Binary files differ
diff --git a/maps/re/rgsr_in.mcache b/maps/re/rgsr_in.mcache
new file mode 100644
index 000000000..fa37ec1ec
--- /dev/null
+++ b/maps/re/rgsr_in.mcache
Binary files differ
diff --git a/maps/re/sp_cor.mcache b/maps/re/sp_cor.mcache
new file mode 100644
index 000000000..59f0835f6
--- /dev/null
+++ b/maps/re/sp_cor.mcache
Binary files differ
diff --git a/maps/re/sp_os.mcache b/maps/re/sp_os.mcache
new file mode 100644
index 000000000..029e11070
--- /dev/null
+++ b/maps/re/sp_os.mcache
Binary files differ
diff --git a/maps/re/sp_rudus.mcache b/maps/re/sp_rudus.mcache
new file mode 100644
index 000000000..bc2435ecd
--- /dev/null
+++ b/maps/re/sp_rudus.mcache
Binary files differ
diff --git a/maps/re/sp_rudus2.mcache b/maps/re/sp_rudus2.mcache
new file mode 100644
index 000000000..0269518bc
--- /dev/null
+++ b/maps/re/sp_rudus2.mcache
Binary files differ
diff --git a/maps/re/sp_rudus3.mcache b/maps/re/sp_rudus3.mcache
new file mode 100644
index 000000000..f060c444f
--- /dev/null
+++ b/maps/re/sp_rudus3.mcache
Binary files differ
diff --git a/sql-files/main.sql b/sql-files/main.sql
index d29f05a2e..2fa6f1332 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -121,7 +121,7 @@ CREATE TABLE IF NOT EXISTS `autotrade_merchants` (
-- Table structure for table `char_achievements`
--
-CREATE TABLE `char_achievements` (
+CREATE TABLE IF NOT EXISTS `char_achievements` (
`char_id` INT(11) UNSIGNED NOT NULL,
`ach_id` INT(11) UNSIGNED NOT NULL,
`completed_at` INT(10) UNSIGNED NOT NULL DEFAULT '0',
diff --git a/src/map/npc.h b/src/map/npc.h
index eff4ed4ec..ed5f4138d 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -144,7 +144,7 @@ enum actor_classes {
#define MAX_NPC_CLASS 1000
// New NPC range
#define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10248
+#define MAX_NPC_CLASS2_END 10310
//Script NPC events.
enum npce_event {
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-07 22:44:26 +0000