diff --git a/db/elemental_db.yml b/db/elemental_db.yml
index 30d1ee8f35..06e62d0408 100644
--- a/db/elemental_db.yml
+++ b/db/elemental_db.yml
@@ -59,182 +59,8 @@ Header:
Type: ELEMENTAL_DB
Version: 1
-Body:
- - Id: 2114
- AegisName: EL_AGNI_S
- Name: Agni
- Level: 100
- Size: Small
- Element: Fire
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_PYROTECHNIC
- Assist:
- Skill: EL_CIRCLE_OF_FIRE
- Aggressive:
- Skill: EL_FIRE_ARROW
- - Id: 2115
- AegisName: EL_AGNI_M
- Name: Agni
- Level: 100
- Size: Medium
- Element: Fire
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_HEATER
- Assist:
- Skill: EL_FIRE_CLOAK
- Aggressive:
- Skill: EL_FIRE_BOMB
- - Id: 2116
- AegisName: EL_AGNI_L
- Name: Agni
- Level: 100
- Size: Large
- Element: Fire
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_TROPIC
- Assist:
- Skill: EL_FIRE_MANTLE
- Aggressive:
- Skill: EL_FIRE_WAVE
- - Id: 2117
- AegisName: EL_AQUA_S
- Name: Aqua
- Level: 100
- Size: Small
- Element: Water
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_AQUAPLAY
- Assist:
- Skill: EL_WATER_SCREEN
- Aggressive:
- Skill: EL_ICE_NEEDLE
- - Id: 2118
- AegisName: EL_AQUA_M
- Name: Aqua
- Level: 100
- Size: Medium
- Element: Water
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_COOLER
- Assist:
- Skill: EL_WATER_DROP
- Aggressive:
- Skill: EL_WATER_SCREW
- - Id: 2119
- AegisName: EL_AQUA_L
- Name: Aqua
- Level: 100
- Str: 1
- Agi: 1
- Vit: 1
- Int: 1
- Dex: 1
- Luk: 1
- Size: Large
- Element: Water
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_CHILLY_AIR
- Assist:
- Skill: EL_WATER_BARRIER
- Aggressive:
- Skill: EL_TIDAL_WEAPON
- - Id: 2120
- AegisName: EL_VENTUS_S
- Name: Ventus
- Level: 100
- Size: Small
- Element: Wind
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_GUST
- Assist:
- Skill: EL_WIND_STEP
- Aggressive:
- Skill: EL_WIND_SLASH
- - Id: 2121
- AegisName: EL_VENTUS_M
- Name: Ventus
- Level: 100
- Size: Medium
- Element: Wind
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_BLAST
- Assist:
- Skill: EL_WIND_CURTAIN
- Aggressive:
- Skill: EL_HURRICANE
- - Id: 2122
- AegisName: EL_VENTUS_L
- Name: Ventus
- Level: 100
- Size: Large
- Element: Wind
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_WILD_STORM
- Assist:
- Skill: EL_ZEPHYR
- Aggressive:
- Skill: EL_TYPOON_MIS
- - Id: 2123
- AegisName: EL_TERA_S
- Name: Tera
- Level: 100
- Size: Small
- Element: Earth
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_PETROLOGY
- Assist:
- Skill: EL_SOLID_SKIN
- Aggressive:
- Skill: EL_STONE_HAMMER
- - Id: 2124
- AegisName: EL_TERA_M
- Name: Tera
- Level: 100
- Size: Medium
- Element: Earth
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_CURSED_SOIL
- Assist:
- Skill: EL_STONE_SHIELD
- Aggressive:
- Skill: EL_ROCK_CRUSHER
- - Id: 2125
- AegisName: EL_TERA_L
- Name: Tera
- Level: 100
- Size: Large
- Element: Earth
- ElementLevel: 4
- Mode:
- Passive:
- Skill: EL_UPHEAVAL
- Assist:
- Skill: EL_POWER_OF_GAIA
- Aggressive:
- Skill: EL_STONE_RAIN
-
Footer:
Imports:
+ - Path: db/re/elemental_db.yml
+ Mode: Renewal
- Path: db/import/elemental_db.yml
diff --git a/db/pre-re/statpoint.yml b/db/pre-re/statpoint.yml
index aac75b3e6d..dd5c180f2b 100644
--- a/db/pre-re/statpoint.yml
+++ b/db/pre-re/statpoint.yml
@@ -431,113 +431,103 @@ Body:
Points: 4503
- Level: 200
Points: 4545
- # - Level: 201
- # Points: 4588
- # - Level: 202
- # Points: 4631
- # - Level: 203
- # Points: 4674
- # - Level: 204
- # Points: 4717
- # - Level: 205
- # Points: 4760
- # - Level: 206
- # Points: 4804
- # - Level: 207
- # Points: 4848
- # - Level: 208
- # Points: 4892
- # - Level: 209
- # Points: 4936
- # - Level: 210
- # Points: 4980
- # - Level: 211
- # Points: 5025
- # - Level: 212
- # Points: 5070
- # - Level: 213
- # Points: 5115
- # - Level: 214
- # Points: 5160
- # - Level: 215
- # Points: 5205
- # - Level: 216
- # Points: 5251
- # - Level: 217
- # Points: 5297
- # - Level: 218
- # Points: 5343
- # - Level: 219
- # Points: 5389
- # - Level: 220
- # Points: 5435
- # - Level: 221
- # Points: 5482
- # - Level: 222
- # Points: 5529
- # - Level: 223
- # Points: 5576
- # - Level: 224
- # Points: 5623
- # - Level: 225
- # Points: 5670
- # - Level: 226
- # Points: 5718
- # - Level: 227
- # Points: 5766
- # - Level: 228
- # Points: 5814
- # - Level: 229
- # Points: 5862
- # - Level: 230
- # Points: 5910
- # - Level: 231
- # Points: 5959
- # - Level: 232
- # Points: 6008
- # - Level: 233
- # Points: 6057
- # - Level: 234
- # Points: 6106
- # - Level: 235
- # Points: 6155
- # - Level: 236
- # Points: 6205
- # - Level: 237
- # Points: 6255
- # - Level: 238
- # Points: 6305
- # - Level: 239
- # Points: 6355
- # - Level: 240
- # Points: 6405
- # - Level: 241
- # Points: 6456
- # - Level: 242
- # Points: 6507
- # - Level: 243
- # Points: 6558
- # - Level: 244
- # Points: 6609
- # - Level: 245
- # Points: 6660
- # - Level: 246
- # Points: 6712
- # - Level: 247
- # Points: 6764
- # - Level: 248
- # Points: 6816
- # - Level: 249
- # Points: 6868
- # - Level: 250
- # Points: 6920
- # - Level: 251
- # Points: 6973
- # - Level: 252
- # Points: 7026
- # - Level: 253
- # Points: 7079
- # - Level: 254
- # Points: 7132
- # - Level: 255
- # Points: 7185
+ - Level: 201
+ Points: 4545
+ - Level: 202
+ Points: 4545
+ - Level: 203
+ Points: 4545
+ - Level: 204
+ Points: 4545
+ - Level: 205
+ Points: 4545
+ - Level: 206
+ Points: 4545
+ - Level: 207
+ Points: 4545
+ - Level: 208
+ Points: 4545
+ - Level: 209
+ Points: 4545
+ - Level: 210
+ Points: 4545
+ - Level: 211
+ Points: 4545
+ - Level: 212
+ Points: 4545
+ - Level: 213
+ Points: 4545
+ - Level: 214
+ Points: 4545
+ - Level: 215
+ Points: 4545
+ - Level: 216
+ Points: 4545
+ - Level: 217
+ Points: 4545
+ - Level: 218
+ Points: 4545
+ - Level: 219
+ Points: 4545
+ - Level: 220
+ Points: 4545
+ - Level: 221
+ Points: 4545
+ - Level: 222
+ Points: 4545
+ - Level: 223
+ Points: 4545
+ - Level: 224
+ Points: 4545
+ - Level: 225
+ Points: 4545
+ - Level: 226
+ Points: 4545
+ - Level: 227
+ Points: 4545
+ - Level: 228
+ Points: 4545
+ - Level: 229
+ Points: 4545
+ - Level: 230
+ Points: 4545
+ - Level: 231
+ Points: 4545
+ - Level: 232
+ Points: 4545
+ - Level: 233
+ Points: 4545
+ - Level: 234
+ Points: 4545
+ - Level: 235
+ Points: 4545
+ - Level: 236
+ Points: 4545
+ - Level: 237
+ Points: 4545
+ - Level: 238
+ Points: 4545
+ - Level: 239
+ Points: 4545
+ - Level: 240
+ Points: 4545
+ - Level: 241
+ Points: 4545
+ - Level: 242
+ Points: 4545
+ - Level: 243
+ Points: 4545
+ - Level: 244
+ Points: 4545
+ - Level: 245
+ Points: 4545
+ - Level: 246
+ Points: 4545
+ - Level: 247
+ Points: 4545
+ - Level: 248
+ Points: 4545
+ - Level: 249
+ Points: 4545
+ - Level: 250
+ Points: 4545
diff --git a/db/re/elemental_db.yml b/db/re/elemental_db.yml
new file mode 100644
index 0000000000..64fbe2474e
--- /dev/null
+++ b/db/re/elemental_db.yml
@@ -0,0 +1,236 @@
+# This file is a part of rAthena.
+# Copyright(C) 2021 rAthena Development Team
+# https://rathena.org - https://github.com/rathena
+#
+# This program 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 .
+#
+###########################################################################
+# Elemental Summons Database
+###########################################################################
+#
+# Elemental Summons Settings
+#
+###########################################################################
+# - Id Elemental ID.
+# AegisName Server name to reference the elemental in scripts and lookups, should use no spaces.
+# Name Name in English.
+# Level Level.
+# Hp Additional HP. Base HP depends on caster HP. (Default: 0)
+# Sp Additional SP. Base SP depends on caster SP. (Default: 1)
+# Attack Additional minimum attack. Base attack depends on caster attack. (Default: 0)
+# Attack2 Additional maximum attack. Base attack depends on caster attack. (Default: 0)
+# Defense Physical defense of the elemental, reduces melee and ranged physical attack/skill damage. Base defense depends on the caster defense. (Default: 0)
+# MagicDefense Magic defense of the elemental, reduces magical skill damage. Base magic defense depends on the caster magic defense. (Default: 0)
+# Str Strength which affects attack. (Default: 0)
+# Agi Agility which affects flee. (Default: 0)
+# Vit Vitality which affects defense. (Default: 0)
+# Int Intelligence which affects magic attack. (Default: 0)
+# Dex Dexterity which affects hit rate. (Default: 0)
+# Luk Luck which affects perfect dodge/lucky flee/perfect flee/lucky dodge rate. (Default: 0)
+# AttackRange Attack range. (Default: 1)
+# SkillRange Skill cast range. (Default: 5)
+# ChaseRange Chase range. (Default: 12)
+# Size Size.
+# Race Race. (Default: Formless)
+# Element Element.
+# ElementLevel Level of element.
+# WalkSpeed Walk speed. (Default: 200)
+# AttackDelay Attack speed. (Default: 504)
+# AttackMotion Attack animation speed. Base AttackMotion depends on the caster AttackMotion. (Default: 1020)
+# DamageMotion Damage animation speed. (Default: 360)
+# Mode: List of elemental skills by mode. (Optional)
+# : Mode name to define the skill available. Available modes are Passive, Assist, and Aggressive.
+# Skill Skill name.
+# Level Skill level. (Default: 1)
+###########################################################################
+
+Header:
+ Type: ELEMENTAL_DB
+ Version: 1
+
+Body:
+ - Id: 2114
+ AegisName: EL_AGNI_S
+ Name: Agni
+ Level: 100
+ Size: Small
+ Element: Fire
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_PYROTECHNIC
+ Assist:
+ Skill: EL_CIRCLE_OF_FIRE
+ Aggressive:
+ Skill: EL_FIRE_ARROW
+ - Id: 2115
+ AegisName: EL_AGNI_M
+ Name: Agni
+ Level: 100
+ Size: Medium
+ Element: Fire
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_HEATER
+ Assist:
+ Skill: EL_FIRE_CLOAK
+ Aggressive:
+ Skill: EL_FIRE_BOMB
+ - Id: 2116
+ AegisName: EL_AGNI_L
+ Name: Agni
+ Level: 100
+ Size: Large
+ Element: Fire
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_TROPIC
+ Assist:
+ Skill: EL_FIRE_MANTLE
+ Aggressive:
+ Skill: EL_FIRE_WAVE
+ - Id: 2117
+ AegisName: EL_AQUA_S
+ Name: Aqua
+ Level: 100
+ Size: Small
+ Element: Water
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_AQUAPLAY
+ Assist:
+ Skill: EL_WATER_SCREEN
+ Aggressive:
+ Skill: EL_ICE_NEEDLE
+ - Id: 2118
+ AegisName: EL_AQUA_M
+ Name: Aqua
+ Level: 100
+ Size: Medium
+ Element: Water
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_COOLER
+ Assist:
+ Skill: EL_WATER_DROP
+ Aggressive:
+ Skill: EL_WATER_SCREW
+ - Id: 2119
+ AegisName: EL_AQUA_L
+ Name: Aqua
+ Level: 100
+ Str: 1
+ Agi: 1
+ Vit: 1
+ Int: 1
+ Dex: 1
+ Luk: 1
+ Size: Large
+ Element: Water
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_CHILLY_AIR
+ Assist:
+ Skill: EL_WATER_BARRIER
+ Aggressive:
+ Skill: EL_TIDAL_WEAPON
+ - Id: 2120
+ AegisName: EL_VENTUS_S
+ Name: Ventus
+ Level: 100
+ Size: Small
+ Element: Wind
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_GUST
+ Assist:
+ Skill: EL_WIND_STEP
+ Aggressive:
+ Skill: EL_WIND_SLASH
+ - Id: 2121
+ AegisName: EL_VENTUS_M
+ Name: Ventus
+ Level: 100
+ Size: Medium
+ Element: Wind
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_BLAST
+ Assist:
+ Skill: EL_WIND_CURTAIN
+ Aggressive:
+ Skill: EL_HURRICANE
+ - Id: 2122
+ AegisName: EL_VENTUS_L
+ Name: Ventus
+ Level: 100
+ Size: Large
+ Element: Wind
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_WILD_STORM
+ Assist:
+ Skill: EL_ZEPHYR
+ Aggressive:
+ Skill: EL_TYPOON_MIS
+ - Id: 2123
+ AegisName: EL_TERA_S
+ Name: Tera
+ Level: 100
+ Size: Small
+ Element: Earth
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_PETROLOGY
+ Assist:
+ Skill: EL_SOLID_SKIN
+ Aggressive:
+ Skill: EL_STONE_HAMMER
+ - Id: 2124
+ AegisName: EL_TERA_M
+ Name: Tera
+ Level: 100
+ Size: Medium
+ Element: Earth
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_CURSED_SOIL
+ Assist:
+ Skill: EL_STONE_SHIELD
+ Aggressive:
+ Skill: EL_ROCK_CRUSHER
+ - Id: 2125
+ AegisName: EL_TERA_L
+ Name: Tera
+ Level: 100
+ Size: Large
+ Element: Earth
+ ElementLevel: 4
+ Mode:
+ Passive:
+ Skill: EL_UPHEAVAL
+ Assist:
+ Skill: EL_POWER_OF_GAIA
+ Aggressive:
+ Skill: EL_STONE_RAIN
diff --git a/db/re/statpoint.yml b/db/re/statpoint.yml
index ed8e96a7b6..13519b2e51 100644
--- a/db/re/statpoint.yml
+++ b/db/re/statpoint.yml
@@ -431,113 +431,103 @@ Body:
Points: 4013
- Level: 200
Points: 4045
- # - Level: 201
- # Points: 4078
- # - Level: 202
- # Points: 4111
- # - Level: 203
- # Points: 4114
- # - Level: 204
- # Points: 4177
- # - Level: 205
- # Points: 4210
- # - Level: 206
- # Points: 4243
- # - Level: 207
- # Points: 4276
- # - Level: 208
- # Points: 4309
- # - Level: 209
- # Points: 4342
- # - Level: 210
- # Points: 4375
- # - Level: 211
- # Points: 4409
- # - Level: 212
- # Points: 4443
- # - Level: 213
- # Points: 4477
- # - Level: 214
- # Points: 4511
- # - Level: 215
- # Points: 4545
- # - Level: 216
- # Points: 4579
- # - Level: 217
- # Points: 4613
- # - Level: 218
- # Points: 4647
- # - Level: 219
- # Points: 4681
- # - Level: 220
- # Points: 4715
- # - Level: 221
- # Points: 4750
- # - Level: 222
- # Points: 4785
- # - Level: 223
- # Points: 4820
- # - Level: 224
- # Points: 4855
- # - Level: 225
- # Points: 4890
- # - Level: 226
- # Points: 4925
- # - Level: 227
- # Points: 4960
- # - Level: 228
- # Points: 5030
- # - Level: 229
- # Points: 5065
- # - Level: 230
- # Points: 5100
- # - Level: 231
- # Points: 5136
- # - Level: 232
- # Points: 5172
- # - Level: 233
- # Points: 5208
- # - Level: 234
- # Points: 5244
- # - Level: 235
- # Points: 5280
- # - Level: 236
- # Points: 5316
- # - Level: 237
- # Points: 5352
- # - Level: 238
- # Points: 5388
- # - Level: 239
- # Points: 5424
- # - Level: 240
- # Points: 5460
- # - Level: 241
- # Points: 5497
- # - Level: 242
- # Points: 5537
- # - Level: 243
- # Points: 5571
- # - Level: 244
- # Points: 5608
- # - Level: 245
- # Points: 5645
- # - Level: 246
- # Points: 5682
- # - Level: 247
- # Points: 5719
- # - Level: 248
- # Points: 5793
- # - Level: 249
- # Points: 5830
- # - Level: 250
- # Points: 5868
- # - Level: 251
- # Points: 5906
- # - Level: 252
- # Points: 5944
- # - Level: 253
- # Points: 5982
- # - Level: 254
- # Points: 6020
- # - Level: 255
- # Points: 6058
+ - Level: 201
+ Points: 4045
+ - Level: 202
+ Points: 4045
+ - Level: 203
+ Points: 4045
+ - Level: 204
+ Points: 4045
+ - Level: 205
+ Points: 4045
+ - Level: 206
+ Points: 4045
+ - Level: 207
+ Points: 4045
+ - Level: 208
+ Points: 4045
+ - Level: 209
+ Points: 4045
+ - Level: 210
+ Points: 4045
+ - Level: 211
+ Points: 4045
+ - Level: 212
+ Points: 4045
+ - Level: 213
+ Points: 4045
+ - Level: 214
+ Points: 4045
+ - Level: 215
+ Points: 4045
+ - Level: 216
+ Points: 4045
+ - Level: 217
+ Points: 4045
+ - Level: 218
+ Points: 4045
+ - Level: 219
+ Points: 4045
+ - Level: 220
+ Points: 4045
+ - Level: 221
+ Points: 4045
+ - Level: 222
+ Points: 4045
+ - Level: 223
+ Points: 4045
+ - Level: 224
+ Points: 4045
+ - Level: 225
+ Points: 4045
+ - Level: 226
+ Points: 4045
+ - Level: 227
+ Points: 4045
+ - Level: 228
+ Points: 4045
+ - Level: 229
+ Points: 4045
+ - Level: 230
+ Points: 4045
+ - Level: 231
+ Points: 4045
+ - Level: 232
+ Points: 4045
+ - Level: 233
+ Points: 4045
+ - Level: 234
+ Points: 4045
+ - Level: 235
+ Points: 4045
+ - Level: 236
+ Points: 4045
+ - Level: 237
+ Points: 4045
+ - Level: 238
+ Points: 4045
+ - Level: 239
+ Points: 4045
+ - Level: 240
+ Points: 4045
+ - Level: 241
+ Points: 4045
+ - Level: 242
+ Points: 4045
+ - Level: 243
+ Points: 4045
+ - Level: 244
+ Points: 4045
+ - Level: 245
+ Points: 4045
+ - Level: 246
+ Points: 4045
+ - Level: 247
+ Points: 4045
+ - Level: 248
+ Points: 4045
+ - Level: 249
+ Points: 4045
+ - Level: 250
+ Points: 4045
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 3ebdf4aebc..511e4a66ed 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -52,7 +52,7 @@ void map_msg_reload(void);
#define NATURAL_HEAL_INTERVAL 500
#define MIN_FLOORITEM 2
#define MAX_FLOORITEM START_ACCOUNT_NUM
-#define MAX_LEVEL 200
+#define MAX_LEVEL 250
#define MAX_DROP_PER_MAP 48
#define MAX_IGNORE_LIST 20 // official is 14
#define MAX_VENDING 12
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 02f598ac07..0f10970a9b 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -458,7 +458,7 @@ struct mob_data* mob_spawn_dataset(struct spawn_data *data)
md->mob_id = data->id;
md->state.boss = data->state.boss;
md->db = mob_db.find(md->mob_id);
- if (data->level > 0 && data->level <= MAX_LEVEL)
+ if (data->level > 0)
md->level = data->level;
memcpy(md->name, data->name, NAME_LENGTH);
if (data->state.ai)
@@ -4377,11 +4377,6 @@ uint64 MobDatabase::parseBodyNode(const YAML::Node &node) {
if (!this->asUInt16(node, "Level", level))
return 0;
- if (level > MAX_LEVEL) {
- this->invalidWarning(node["Level"], "Level %hu exceeds MAX_LEVEL, capping to %hu.\n", level, MAX_LEVEL);
- level = MAX_LEVEL;
- }
-
mob->lv = level;
} else {
if (!exists)