summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/job_db.conf1
-rw-r--r--db/pre-re/map_zone_db.conf28
-rw-r--r--db/pre-re/mob_db.conf4
-rw-r--r--db/pre-re/skill_db.conf3
-rw-r--r--db/quest_db.conf12
-rw-r--r--db/re/map_zone_db.conf188
-rw-r--r--db/re/mob_db.conf4
7 files changed, 134 insertions, 106 deletions
diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf
index 5f5131726..74a765fbf 100644
--- a/db/pre-re/job_db.conf
+++ b/db/pre-re/job_db.conf
@@ -335,6 +335,7 @@ Priest: {
Mace: 600
TwoHandMace: 600
Rod: 600
+ // Knuckle: 500 /* Note. Official value is 2000 (default). To normalize aspd remove comment to this line. */
Book: 600
TwoHandRod: 600
}
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index cab00bbb9..b8797a6d3 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -66,7 +66,7 @@ zones: (
//heal: 70
}
skill_damage_cap: {
- //Exemple Below caps firebolt damage in maps within this zone to a maximum 50 damage,
+ //Example Below caps Cold Bolt damage in maps within this zone to a maximum 50 damage,
// (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
// when cast vs players and monsters.
//MG_COLDBOLT: (50,"PLAYER | MONSTER")
@@ -334,6 +334,19 @@ zones: (
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
}
+
+ mapflags: (
+ "nobranch",
+ "noicewall",
+ "nomemo",
+ "nosave SavePoint",
+ "noteleport",
+ "monster_noteleport",
+ "nowarpto",
+ "partylock",
+ "pvp off",
+ "src4instance",
+ )
},
{
name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
@@ -347,6 +360,19 @@ zones: (
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
}
+
+ mapflags: (
+ "nobranch",
+ "noicewall",
+ "nomemo",
+ "nosave SavePoint",
+ "noteleport",
+ "monster_noteleport",
+ "nowarpto",
+ "partylock",
+ "pvp off",
+ "src4instance",
+ )
},
{
name: "Towns"
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 82501748d..40635cd68 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -57,8 +57,8 @@ mob_db: (
}
ViewRange: view range (int, defaults to 1)
ChaseRange: chase range (int, defaults to 1)
- Size: size (int, defaults to 1)
- Race: race (int, defaults to 0)
+ Size: size (string, defaults to "Size_Medium")
+ Race: race (string, defaults to "RC_Formless")
Element: (type, level)
Mode: {
CanMove: true/false (bool, defaults to false)
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 95683a9e0..a5c27257f 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -14881,11 +14881,10 @@ skill_db: (
Range: -9
Hit: "BDT_MULTIHIT"
SkillType: {
- Self: true
+ Enemy: true
}
SkillInfo: {
Spirit: true
- NoCastSelf: true
}
AttackType: "Weapon"
Element: "Ele_Weapon"
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 015692b07..98a7ee190 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -15275,6 +15275,18 @@ quest_db: (
TimeLimit: 14400
},
{
+ Id: 60211
+ Name: "Thor Volcano base camp"
+},
+{
+ Id: 60212
+ Name: "Thor Volcano base camp"
+},
+{
+ Id: 60213
+ Name: "Thor Volcano base camp"
+},
+{
Id: 60301
Name: "Dragon Hunting"
Targets: (
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 282a85abb..133cc5337 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -55,37 +55,6 @@ zones: (
//Both examples below disable apple (id 501)
//Apple: true
//ID501: true
- }
-
- mapflags: (
- )
-
- /* "command:min-group-lv-to-override" e.g. "heal: 70" */
- disabled_commands: {
- //Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
- //heal: 70
- }
- skill_damage_cap: {
- //Exemple Below caps firebolt damage in maps within this zone to a maximum 50 damage,
- // (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
- // when cast vs players and monsters.
- //MG_COLDBOLT: (50,"PLAYER | MONSTER")
- }
-},
-{
- /* Normal zone is applied to all maps that are not pkable (where players cant fight each other) */
- /* However, it wont be applied to maps with its own zones (specified through mapflag) */
- name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
-
- disabled_skills: {
- WM_LULLABY_DEEPSLEEP: "PLAYER"
- WM_SIRCLEOFNATURE: "PLAYER"
- WM_SATURDAY_NIGHT_FEVER: "PLAYER"
- SO_ARRULLO: "PLAYER"
- CG_HERMODE: "PLAYER"
- }
-
- disabled_items: {
Velum_Jamadhar: true
Velum_Scare: true
Velum_Buster: true
@@ -124,6 +93,37 @@ zones: (
mapflags: (
)
+ /* "command:min-group-lv-to-override" e.g. "heal: 70" */
+ disabled_commands: {
+ //Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
+ //heal: 70
+ }
+ skill_damage_cap: {
+ //Example Below caps Cold Bolt damage in maps within this zone to a maximum 50 damage,
+ // (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
+ // when cast vs players and monsters.
+ //MG_COLDBOLT: (50,"PLAYER | MONSTER")
+ }
+},
+{
+ /* Normal zone is applied to all maps that are not pkable (where players cant fight each other) */
+ /* However, it wont be applied to maps with its own zones (specified through mapflag) */
+ name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
+
+ disabled_skills: {
+ WM_LULLABY_DEEPSLEEP: "PLAYER"
+ WM_SIRCLEOFNATURE: "PLAYER"
+ WM_SATURDAY_NIGHT_FEVER: "PLAYER"
+ SO_ARRULLO: "PLAYER"
+ CG_HERMODE: "PLAYER"
+ }
+
+ disabled_items: {
+ }
+
+ mapflags: (
+ )
+
},
{
/* PvP zone is applied to all maps with a pvp mapflag */
@@ -137,6 +137,38 @@ zones: (
disabled_items: {
Greed_Scroll: true
C_Beginner_Cap: true
+ Velum_Jamadhar: false
+ Velum_Scare: false
+ Velum_Buster: false
+ Velum_Guillotine: false
+ Velum_Spear: false
+ Velum_Glaive: false
+ Velum_Bible: false
+ Velum_Encyclopedia: false
+ Velum_Claw: false
+ Velum_Arc_Wand: false
+ Velum_Damascus: false
+ Velum_Stunner: false
+ Velum_Flail: false
+ Velum_Arbalest: false
+ Velum_CrossBow: false
+ Velum_Claymore: false
+ Velum_Katzbalger: false
+ Siege_Arrow_A: false
+ Siege_Arrow_S: false
+ Siege_Greave: false
+ Siege_Boots: false
+ Siege_Shoes: false
+ Siege_Manteau: false
+ Siege_Muffler: false
+ Siege_White_Potion: false
+ Siege_Blue_Potion: false
+ Woe_Violet_Potion: false
+ Woe_White_Potion: false
+ Woe_Blue_Potion: false
+ Siege_Plate: false
+ Siege_Suits: false
+ Siege_Robe: false
}
/* cashshop disabled in pvp maps */
@@ -298,40 +330,6 @@ zones: (
disabled_items: {
Assumptio_5_Scroll: true
Pty_Assumptio_Scroll: true
- Velum_Jamadhar: true
- Velum_Scare: true
- Velum_Buster: true
- Velum_Guillotine: true
- Velum_Spear: true
- Velum_Glaive: true
- Velum_Bible: true
- Velum_Encyclopedia: true
- Velum_Claw: true
- Velum_Arc_Wand: true
- Velum_Damascus: true
- Velum_Stunner: true
- Velum_Flail: true
- Velum_Arbalest: true
- Velum_CrossBow: true
- Velum_Claymore: true
- Velum_Katzbalger: true
- Siege_Arrow_A: true
- Siege_Arrow_S: true
- Siege_Greave: true
- Siege_Boots: true
- Siege_Shoes: true
- Siege_Manteau: true
- Siege_Muffler: true
- Siege_White_Potion: true
- Siege_Blue_Potion: true
- Woe_Violet_Potion: true
- Woe_White_Potion: true
- Woe_Blue_Potion: true
- TE_White_Potion: true
- TE_White_Slim_Potion: true
- Siege_Plate: true
- Siege_Suits: true
- Siege_Robe: true
C_Beginner_Cap: true
}
@@ -445,6 +443,19 @@ zones: (
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
}
+
+ mapflags: (
+ "nobranch",
+ "noicewall",
+ "nomemo",
+ "nosave SavePoint",
+ "noteleport",
+ "monster_noteleport",
+ "nowarpto",
+ "partylock",
+ "pvp off",
+ "src4instance",
+ )
},
{
name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
@@ -458,6 +469,19 @@ zones: (
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
}
+
+ mapflags: (
+ "nobranch",
+ "noicewall",
+ "nomemo",
+ "nosave SavePoint",
+ "noteleport",
+ "monster_noteleport",
+ "nowarpto",
+ "partylock",
+ "pvp off",
+ "src4instance",
+ )
},
{
name: "Towns"
@@ -474,40 +498,6 @@ zones: (
disabled_items: {
Greed_Scroll: true
- Velum_Jamadhar: true
- Velum_Scare: true
- Velum_Buster: true
- Velum_Guillotine: true
- Velum_Spear: true
- Velum_Glaive: true
- Velum_Bible: true
- Velum_Encyclopedia: true
- Velum_Claw: true
- Velum_Arc_Wand: true
- Velum_Damascus: true
- Velum_Stunner: true
- Velum_Flail: true
- Velum_Arbalest: true
- Velum_CrossBow: true
- Velum_Claymore: true
- Velum_Katzbalger: true
- Siege_Arrow_A: true
- Siege_Arrow_S: true
- Siege_Greave: true
- Siege_Boots: true
- Siege_Shoes: true
- Siege_Manteau: true
- Siege_Muffler: true
- Siege_White_Potion: true
- Siege_Blue_Potion: true
- Woe_Violet_Potion: true
- Woe_White_Potion: true
- Woe_Blue_Potion: true
- TE_White_Potion: true
- TE_White_Slim_Potion: true
- Siege_Plate: true
- Siege_Suits: true
- Siege_Robe: true
}
}
)
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index caa92b718..188654cf8 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -57,8 +57,8 @@ mob_db: (
}
ViewRange: view range (int, defaults to 1)
ChaseRange: chase range (int, defaults to 1)
- Size: size (int, defaults to 1)
- Race: race (int, defaults to 0)
+ Size: size (string, defaults to "Size_Medium")
+ Race: race (string, defaults to "RC_Formless")
Element: (type, level)
Mode: {
CanMove: true/false (bool, defaults to false)