summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/constants.conf122
-rw-r--r--db/pre-re/item_db.conf152
-rw-r--r--db/pre-re/job_db.conf13
-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.conf46
-rw-r--r--db/quest_db.conf20
-rw-r--r--db/re/item_db.conf134
-rw-r--r--db/re/map_zone_db.conf188
-rw-r--r--db/re/mob_db.conf4
-rw-r--r--db/re/skill_db.conf56
11 files changed, 507 insertions, 260 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 09c0fa9e4..d108e0976 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3504,6 +3504,51 @@ constants_db: {
4_F_REBELLION2: 10201
4_F_REBELLION3: 10202
4_M_ILYA: 10203
+ // Free ID - 10204
+ 4_ELDER: 10205
+ 4_LUNATIC: 10206
+ 4_F_NOVICE2: 10207
+ 4_WICKEDNYMPH: 10208
+ 4_F_PREMI: 10209
+ 4_M_COSTELL: 10210
+ 4_M_YATTWARP: 10211
+ 4_M_EVOKASCUDI: 10212
+ 4_M_JOHNNYJAMES: 10213
+ 4_M_ALBERTFORD: 10214
+ 4_M_SEANMCCURDY: 10215
+ 4_M_KARAMPUCCI: 10216
+ 4_M_CACTUSMAN1: 10217
+ 4_M_CACTUSMAN2: 10218
+ 4_M_CACTUSMAN3: 10219
+ 4_M_CACTUSLADY: 10220
+ 4_M_GAST: 10221
+ 4_M_CACTUSCHILD: 10222
+ 4_KING: 10223
+ 4_F_BOMI: 10224
+ 4_M_CACTUSCHIEF: 10225
+ 4_F_CACTUSCHILD2: 10226
+ 4_F_CACTUSLADY2: 10227
+ 4_F_CACTUSLADY3: 10228
+ 4_M_CACTUS: 10229
+ 4_M_COWRAIDERS1: 10230
+ 4_M_COWRAIDERS2: 10231
+ 4_M_COWRAIDERS3: 10232
+ 4_F_JP14THEVT: 10233
+ 4_M_POORSCHOLAR: 10234
+ 4_M_PEPPERROTI: 10235
+ JP_NPC01: 10236
+ 4_PURPLE_WARP: 10237
+ 4_F_NARIN: 10238
+ 4_M_URGENT_MAN: 10239
+ 4_M_KEEN_SOLDIER: 10240
+ 4_F_SLOPPY_WOMAN: 10241
+ 4_F_DRKAFRA01: 10242
+ 4_M_DRZONDA01: 10243
+ 4_M_SWD_RENO: 10244
+ 4_M_KNG_RENO: 10245
+ 4_M_AC_RUMIN: 10246
+ 4_M_HIGH_WIZARD: 10247
+ 4_SYSTEM_BOX: 10248
comment__: "Mercenary IDs"
MER_LIF: 6001
@@ -3664,14 +3709,14 @@ constants_db: {
PC_PARTY: 1
PC_GUILD: 2
PC_MAP: 3
-
+
comment__: "strnpcinfo"
NPC_NAME: 0
NPC_NAME_VISIBLE: 1
NPC_NAME_HIDDEN: 2
NPC_NAME_UNIQUE: 3
NPC_MAP: 4
-
+
comment__: "getcharid"
CHAR_ID_CHAR: 0
CHAR_ID_PARTY: 1
@@ -3699,7 +3744,7 @@ constants_db: {
MOUNT_DRAGON_BLUE: 7
MOUNT_DRAGON_RED: 8
- comment__: "gettime"
+ comment__: "Gettime Types"
GETTIME_SECOND: 1
GETTIME_MINUTE: 2
GETTIME_HOUR: 3
@@ -3709,6 +3754,11 @@ constants_db: {
GETTIME_YEAR: 7
GETTIME_DAYOFYEAR: 8
+ comment__: "gettimer"
+ TIMER_COUNT: 0
+ TIMER_TICK_NEXT: 1
+ TIMER_TICK_LAST: 2
+
comment__: "unit types"
UNITTYPE_PC: 0
UNITTYPE_NPC: 1
@@ -3717,7 +3767,14 @@ constants_db: {
UNITTYPE_HOM: 4
UNITTYPE_MER: 5
UNITTYPE_ELEM: 6
-
+
+ comment__: "Unit AI Types"
+ AI_NONE: 0 //0: Normal mob.
+ AI_ATTACK: 1 //1: Standard summon, attacks mobs.
+ AI_SPHERE: 2 //2: Alchemist Marine Sphere
+ AI_FLORA: 3 //3: Alchemist Summon Flora
+ AI_ZANZOU: 4 //4: Summon Zanzou
+
comment__: "Colors"
C_AQUA: 0x00FFFF
C_BLACK: 0x000000
@@ -3744,4 +3801,61 @@ constants_db: {
comment__: "Genders"
SEX_FEMALE: 0
SEX_MALE: 1
+
+ comment__: "Script Unit Data Types"
+ UDT_TYPE: 0
+ UDT_SIZE: 1
+ UDT_LEVEL: 2
+ UDT_HP: 3
+ UDT_MAXHP: 4
+ UDT_SP: 5
+ UDT_MAXSP: 6
+ UDT_MASTERAID: 7
+ UDT_MASTERCID: 8
+ UDT_MAPIDXY: 9
+ UDT_WALKTOXY: 10
+ UDT_SPEED: 11
+ UDT_MODE: 12
+ UDT_AI: 13
+ UDT_SCOPTION: 14
+ UDT_SEX: 15
+ UDT_CLASS: 16
+ UDT_HAIRSTYLE: 17
+ UDT_HAIRCOLOR: 18
+ UDT_HEADBOTTOM: 19
+ UDT_HEADMIDDLE: 20
+ UDT_HEADTOP: 21
+ UDT_CLOTHCOLOR: 22
+ UDT_SHIELD: 23
+ UDT_WEAPON: 24
+ UDT_LOOKDIR: 25
+ UDT_CANMOVETICK: 26
+ UDT_STR: 27
+ UDT_AGI: 28
+ UDT_VIT: 29
+ UDT_INT: 30
+ UDT_DEX: 31
+ UDT_LUK: 32
+ UDT_ATKRANGE: 33
+ UDT_ATKMIN: 34
+ UDT_ATKMAX: 35
+ UDT_MATKMIN: 36
+ UDT_MATKMAX: 37
+ UDT_DEF: 38
+ UDT_MDEF: 39
+ UDT_HIT: 40
+ UDT_FLEE: 41
+ UDT_PDODGE: 42
+ UDT_CRIT: 43
+ UDT_RACE: 44
+ UDT_ELETYPE: 45
+ UDT_ELELEVEL: 46
+ UDT_AMOTION: 47
+ UDT_ADELAY: 48
+ UDT_DMOTION: 49
+ UDT_HUNGER: 50
+ UDT_INTIMACY: 51
+ UDT_LIFETIME: 52
+ UDT_MERC_KILLCOUNT: 53
+ UDT_STATADD: 54
}
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index a681d5753..cfa7cb7d1 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1197,6 +1197,9 @@ item_db: (
Buy: 2000
Weight: 100
BuyingStore: true
+ Nouse: {
+ sitting: true
+ }
Script: <" itemskill SM_ENDURE,1; ">
},
{
@@ -1207,6 +1210,9 @@ item_db: (
Buy: 1500
Weight: 100
BuyingStore: true
+ Nouse: {
+ sitting: true
+ }
Script: <" itemskill SM_SELFPROVOKE,1; ">
},
{
@@ -74741,11 +74747,15 @@ item_db: (
Name: "Paralyze"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74754,11 +74764,15 @@ item_db: (
Name: "Leech End"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74767,11 +74781,15 @@ item_db: (
Name: "Oblivion Curse"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74780,11 +74798,15 @@ item_db: (
Name: "Disheart"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74793,11 +74815,15 @@ item_db: (
Name: "Toxin"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74806,11 +74832,15 @@ item_db: (
Name: "Pyrexia"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74819,11 +74849,16 @@ item_db: (
Name: "Magic Mushroom"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ BuyingStore: true
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -74832,11 +74867,15 @@ item_db: (
Name: "Venom Bleed"
Type: 0
Buy: 2
- Weight: 100
+ Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 8
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK;
">
},
@@ -74848,6 +74887,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Delay: 120000
Trade: {
@@ -74863,7 +74905,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_REFRESH,1; ">
+ Script: <" itemskill RK_REFRESH, 1; ">
},
{
Id: 12726
@@ -74872,6 +74914,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Delay: 30000
Trade: {
@@ -74887,7 +74932,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_CRUSHSTRIKE,1; ">
+ Script: <" itemskill RK_CRUSHSTRIKE, 1; ">
},
{
Id: 12727
@@ -74896,6 +74941,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Delay: 60000
Trade: {
@@ -74911,7 +74959,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_MILLENNIUMSHIELD,1; ">
+ Script: <" itemskill RK_MILLENNIUMSHIELD, 1; ">
},
{
Id: 12728
@@ -74920,6 +74968,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Trade: {
nodrop: true
@@ -74934,7 +74985,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_VITALITYACTIVATION,1; ">
+ Script: <" itemskill RK_VITALITYACTIVATION, 1; ">
},
{
Id: 12729
@@ -74943,6 +74994,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Trade: {
nodrop: true
@@ -74957,7 +75011,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_FIGHTINGSPIRIT,1; ">
+ Script: <" itemskill RK_FIGHTINGSPIRIT, 1; ">
},
{
Id: 12730
@@ -74966,6 +75020,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Trade: {
nodrop: true
@@ -74980,7 +75037,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_ABUNDANCE,1; ">
+ Script: <" itemskill RK_ABUNDANCE, 1; ">
},
{
Id: 12731
@@ -74989,6 +75046,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Trade: {
nodrop: true
@@ -75003,7 +75063,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_GIANTGROWTH,1; ">
+ Script: <" itemskill RK_GIANTGROWTH, 1; ">
},
{
Id: 12732
@@ -75012,6 +75072,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Delay: 1000
Trade: {
@@ -75027,7 +75090,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_STORMBLAST,1; ">
+ Script: <" itemskill RK_STORMBLAST, 1; ">
},
{
Id: 12733
@@ -75036,6 +75099,9 @@ item_db: (
Type: 11
Buy: 100
Weight: 100
+ Job: {
+ Knight: true
+ }
Upper: 8
Trade: {
nodrop: true
@@ -75050,9 +75116,10 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_STONEHARDSKIN,1; ">
+ Script: <" itemskill RK_STONEHARDSKIN, 1; ">
},
-// Rune Knight Rune Ores
+
+//== Rune Knight Rune Ores =============================
{
Id: 12734
AegisName: "Runstone_Quality"
@@ -75060,10 +75127,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
- Upper: 8
BuyingStore: true
Script: <" makerune 5; ">
},
@@ -75074,10 +75137,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
- Upper: 8
BuyingStore: true
Script: <" makerune 11; ">
},
@@ -75088,10 +75147,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
- Upper: 8
BuyingStore: true
Script: <" makerune 14; ">
},
@@ -75102,10 +75157,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
- Upper: 8
BuyingStore: true
Script: <" makerune 2; ">
},
@@ -75116,10 +75167,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
- Upper: 8
BuyingStore: true
Script: <" makerune 8; ">
},
@@ -96076,7 +96123,20 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 8
Delay: 60000
+ Trade: {
+ nodrop: true
+ notrade: true
+ noselltonpc: true
+ nocart: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
Stack: [20, 1]
Script: <" itemskill RK_LUXANIMA,1; ">
},
diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf
index 5f5131726..186e5bd99 100644
--- a/db/pre-re/job_db.conf
+++ b/db/pre-re/job_db.conf
@@ -102,12 +102,12 @@ Novice: {
71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
- 141, 142, 143, 144, 145, 146, 147, 148, 149, 150] // 141 - 150
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 91 - 100
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 101 - 110
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 111 - 120
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 121 - 130
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 131 - 140
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 141 - 150
}
Swordsman: {
Weight: 28000
@@ -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..80527b4f6 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2014-2016 Hercules Dev Team
+//= Copyright (C) 2014-2017 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
@@ -6041,7 +6041,7 @@ skill_db: (
DamageType: {
NoDamage: true
}
- SkillData2: 3000
+ SkillData2: 5000
CoolDown: 0
},
{
@@ -6177,18 +6177,7 @@ skill_db: (
}
SplashRange: 1
SkillData1: 5000
- SkillData2: {
- Lv1: 8000
- Lv2: 9000
- Lv3: 10000
- Lv4: 11000
- Lv5: 12000
- Lv6: 13000
- Lv7: 14000
- Lv8: 15000
- Lv9: 16000
- Lv10: 17000
- }
+ SkillData2: 30000
CoolDown: 0
Requirements: {
SPCost: 20
@@ -14881,11 +14870,10 @@ skill_db: (
Range: -9
Hit: "BDT_MULTIHIT"
SkillType: {
- Self: true
+ Enemy: true
}
SkillInfo: {
Spirit: true
- NoCastSelf: true
}
AttackType: "Weapon"
Element: "Ele_Weapon"
@@ -17953,7 +17941,7 @@ skill_db: (
SplashRange: 1
KnockBackTiles: 5
AfterCastActDelay: 2000
- SkillData2: 2000
+ SkillData2: 5000
CoolDown: 0
Requirements: {
HPCost: 10
@@ -24041,16 +24029,11 @@ skill_db: (
}
AttackType: "Weapon"
SkillData1: {
- Lv1: 3500
- Lv2: 4000
- Lv3: 4500
- Lv4: 5000
- Lv5: 5500
- Lv6: 6000
- Lv7: 6500
- Lv8: 7000
- Lv9: 7500
- Lv10: 8000
+ Lv1: 5500
+ Lv2: 6000
+ Lv3: 6500
+ Lv4: 7000
+ Lv5: 7500
}
CoolDown: 2000
Requirements: {
@@ -24806,7 +24789,13 @@ skill_db: (
Lv9: 9
Lv10: 10
}
- SkillData1: 1000
+ SkillData1: {
+ Lv1: 1000
+ Lv2: 2000
+ Lv3: 2000
+ Lv4: 3000
+ Lv5: 3000
+ }
CoolDown: 3000
Requirements: {
SPCost: {
@@ -29853,6 +29842,7 @@ skill_db: (
}
Requirements: {
SPCost: 40
+ State: "Cart"
}
},
{
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 015692b07..49952d94b 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -9040,6 +9040,14 @@ quest_db: (
Name: "Shortage of Roast Beef"
},
{
+ Id: 11204
+ Name: "Mora Village..."
+},
+{
+ Id: 11205
+ Name: "Pauchon's Friend"
+},
+{
Id: 11206
Name: "Quick Delivery Yoneseu"
},
@@ -15275,6 +15283,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/item_db.conf b/db/re/item_db.conf
index f813bdbfa..d1f416b08 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1218,6 +1218,9 @@ item_db: (
Buy: 2000
Weight: 100
BuyingStore: true
+ Nouse: {
+ sitting: true
+ }
Script: <" itemskill SM_ENDURE,1; ">
},
{
@@ -1228,6 +1231,9 @@ item_db: (
Buy: 1500
Weight: 100
BuyingStore: true
+ Nouse: {
+ sitting: true
+ }
Script: <" itemskill SM_SELFPROVOKE,1; ">
},
{
@@ -31572,7 +31578,8 @@ item_db: (
EquipLv: 100
Script: <"
bonus bMaxSP,40;
- bonus bAgi,-7+min(getequiprefinerycnt(EQI_SHOES),8);
+ if (getrefine() >= 8)
+ bonus bAgi, getrefine() - 7;
">
},
{
@@ -94152,10 +94159,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94165,10 +94176,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94178,10 +94193,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94191,10 +94210,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94204,10 +94227,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94217,10 +94244,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94230,10 +94261,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK;
">
},
{
@@ -94243,10 +94278,14 @@ item_db: (
Type: 0
Buy: 2
Weight: 20
+ Job: {
+ Assassin: true
+ }
+ Upper: 56
BuyingStore: true
Script: <"
specialeffect2 EF_ENCHANTPOISON;
- sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK;
+ sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK;
">
},
@@ -94258,6 +94297,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Delay: 120000
Trade: {
nodrop: true
@@ -94272,7 +94315,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_REFRESH,1; ">
+ Script: <" itemskill RK_REFRESH, 1; ">
},
{
Id: 12726
@@ -94281,6 +94324,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Delay: 30000
Trade: {
nodrop: true
@@ -94295,7 +94342,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_CRUSHSTRIKE,1; ">
+ Script: <" itemskill RK_CRUSHSTRIKE, 1; ">
},
{
Id: 12727
@@ -94304,6 +94351,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Delay: 60000
Trade: {
nodrop: true
@@ -94318,7 +94369,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_MILLENNIUMSHIELD,1; ">
+ Script: <" itemskill RK_MILLENNIUMSHIELD, 1; ">
},
{
Id: 12728
@@ -94327,6 +94378,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Trade: {
nodrop: true
notrade: true
@@ -94340,7 +94395,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_VITALITYACTIVATION,1; ">
+ Script: <" itemskill RK_VITALITYACTIVATION, 1; ">
},
{
Id: 12729
@@ -94349,6 +94404,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Trade: {
nodrop: true
notrade: true
@@ -94362,7 +94421,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_FIGHTINGSPIRIT,1; ">
+ Script: <" itemskill RK_FIGHTINGSPIRIT, 1; ">
},
{
Id: 12730
@@ -94371,6 +94430,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Trade: {
nodrop: true
notrade: true
@@ -94384,7 +94447,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_ABUNDANCE,1; ">
+ Script: <" itemskill RK_ABUNDANCE, 1; ">
},
{
Id: 12731
@@ -94393,6 +94456,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Trade: {
nodrop: true
notrade: true
@@ -94406,7 +94473,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_GIANTGROWTH,1; ">
+ Script: <" itemskill RK_GIANTGROWTH, 1; ">
},
{
Id: 12732
@@ -94415,6 +94482,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Delay: 1000
Trade: {
nodrop: true
@@ -94429,7 +94500,7 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_STORMBLAST,1; ">
+ Script: <" itemskill RK_STORMBLAST, 1; ">
},
{
Id: 12733
@@ -94438,6 +94509,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Trade: {
nodrop: true
notrade: true
@@ -94451,8 +94526,10 @@ item_db: (
sitting: true
}
Stack: [20, 1]
- Script: <" itemskill RK_STONEHARDSKIN,1; ">
+ Script: <" itemskill RK_STONEHARDSKIN, 1; ">
},
+
+//== Rune Knight Rune Ores =============================
{
Id: 12734
AegisName: "Runstone_Quality"
@@ -94460,9 +94537,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
BuyingStore: true
Script: <" makerune 5; ">
},
@@ -94473,9 +94547,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
BuyingStore: true
Script: <" makerune 11; ">
},
@@ -94486,9 +94557,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
BuyingStore: true
Script: <" makerune 14; ">
},
@@ -94499,9 +94567,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
BuyingStore: true
Script: <" makerune 2; ">
},
@@ -94512,9 +94577,6 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
- Job: {
- Knight: true
- }
BuyingStore: true
Script: <" makerune 8; ">
},
@@ -146814,6 +146876,10 @@ item_db: (
Type: 11
Buy: 2
Weight: 100
+ Job: {
+ Knight: true
+ }
+ Upper: 56
Delay: 60000
Trade: {
nodrop: true
@@ -146825,7 +146891,7 @@ item_db: (
noauction: true
}
Stack: [20, 1]
- Script: <" itemskill RK_LUXANIMA,1; ">
+ Script: <" itemskill RK_LUXANIMA, 1; ">
},
{
Id: 22669
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)
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 8eb2b40fa..2a59785fa 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2014-2016 Hercules Dev Team
+//= Copyright (C) 2014-2017 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
@@ -6271,7 +6271,7 @@ skill_db: (
DamageType: {
NoDamage: true
}
- SkillData2: 3000
+ SkillData2: 5000
FixedCastTime: 0
},
{
@@ -6408,18 +6408,7 @@ skill_db: (
}
SplashRange: 3
SkillData1: 5000
- SkillData2: {
- Lv1: 8000
- Lv2: 9000
- Lv3: 10000
- Lv4: 11000
- Lv5: 12000
- Lv6: 13000
- Lv7: 14000
- Lv8: 15000
- Lv9: 16000
- Lv10: 17000
- }
+ SkillData2: 20000
FixedCastTime: 0
Requirements: {
SPCost: 20
@@ -18494,7 +18483,7 @@ skill_db: (
SplashRange: 1
KnockBackTiles: 5
AfterCastActDelay: 2000
- SkillData2: 2000
+ SkillData2: 5000
FixedCastTime: -1
Requirements: {
HPCost: 10
@@ -24690,16 +24679,11 @@ skill_db: (
}
AttackType: "Weapon"
SkillData1: {
- Lv1: 3500
- Lv2: 4000
- Lv3: 4500
- Lv4: 5000
- Lv5: 5500
- Lv6: 6000
- Lv7: 6500
- Lv8: 7000
- Lv9: 7500
- Lv10: 8000
+ Lv1: 5500
+ Lv2: 6000
+ Lv3: 6500
+ Lv4: 7000
+ Lv5: 7500
}
CoolDown: 2000
FixedCastTime: -1
@@ -25464,7 +25448,13 @@ skill_db: (
Lv9: 9
Lv10: 10
}
- SkillData1: 1000
+ SkillData1: {
+ Lv1: 1000
+ Lv2: 2000
+ Lv3: 2000
+ Lv4: 3000
+ Lv5: 3000
+ }
CoolDown: 3000
FixedCastTime: -1
Requirements: {
@@ -30667,6 +30657,7 @@ skill_db: (
}
Requirements: {
SPCost: 40
+ State: "Cart"
}
},
{
@@ -33999,18 +33990,7 @@ skill_db: (
NoDamage: true
}
NumberOfHits: 0
- SkillData2: {
- Lv1: 60000
- Lv2: 70000
- Lv3: 80000
- Lv4: 90000
- Lv5: 129000
- Lv6: 129000
- Lv7: 129000
- Lv8: 129000
- Lv9: 129000
- Lv10: 129000
- }
+ CoolDown: 1000
FixedCastTime: -1
Requirements: {
SPCost: 10
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 01:56:40 +0000