summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/constants.conf2
-rw-r--r--db/pre-re/item_db.conf27
-rw-r--r--db/pre-re/mob_db.conf2
-rw-r--r--db/quest_db.conf36
-rw-r--r--db/re/item_db.conf189
-rw-r--r--db/re/mob_db.conf64
-rw-r--r--db/sc_config.conf11
7 files changed, 318 insertions, 13 deletions
diff --git a/db/constants.conf b/db/constants.conf
index f76f2ea6a..6f87b2d51 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1416,6 +1416,7 @@ constants_db: {
SC_RESIST_PROPERTY_FIRE: 666
SC_RESIST_PROPERTY_WIND: 667
SC_CLIENT_ONLY_EQUIP_ARROW: 668
+ SC_MADOGEAR: 669
comment__: "Emotes"
e_gasp: 0
@@ -4730,4 +4731,5 @@ constants_db: {
SI_FRESHSHRIMP: 921
SI_SUHIDE: 933
SI_SPRITEMABLE: 937
+ SI_MADOGEAR: 1149
}
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 7d9708f81..38833636d 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -67261,7 +67261,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,-15,0,20,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12119
@@ -67271,7 +67274,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,20,0,0,-15; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12120
@@ -67281,7 +67287,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,20,-15,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12121
@@ -67291,7 +67300,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,-15,0,20; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12122
@@ -69521,7 +69533,12 @@ item_db: (
Name: "Undead Elemental Scroll"
Type: "IT_USABLE"
Weight: 10
- Script: <" sc_start4 SC_ARMOR_RESIST,300000,20,20,20,20; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_FIRE, 300000, 20);
+ sc_start(SC_RESIST_PROPERTY_WATER, 300000, 20);
+ sc_start(SC_RESIST_PROPERTY_WIND, 300000, 20);
+ sc_start(SC_RESIST_PROPERTY_GROUND, 300000, 20);
+ ">
},
{
Id: 12280
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 45592ad90..78e255f36 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -102,7 +102,7 @@ mob_db: (
HeadTopId: top headgear id (int, defaults to 0)
HeadMidId: middle headgear id (int, defaults to 0)
HeadLowId: lower headgear id (int, defaults to 0)
- HairStyleId: hair style id (int, defaults to 0)
+ HairStyleId: hair style id (int, defaults to 1)
BodyStyleId: clothes id (int, defaults to 0)
HairColorId: hair color id (int, defaults to 0)
BodyColorId: clothes color id (int, defaults to 0)
diff --git a/db/quest_db.conf b/db/quest_db.conf
index adf425405..8163c540a 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -12626,6 +12626,42 @@ quest_db: (
Name: "About skills"
},
{
+ Id: 12340
+ Name: "Suspicious Person"
+},
+{
+ Id: 12341
+ Name: "New Challenge"
+},
+{
+ Id: 12342
+ Name: "Crafting Firearms"
+},
+{
+ Id: 12343
+ Name: "Target Practice"
+ Targets: (
+ {
+ MobId: 3169
+ Count: 10
+ },
+ )
+},
+{
+ Id: 12344
+ Name: "Wrong Target Practice"
+ Targets: (
+ {
+ MobId: 3170
+ Count: 3
+ },
+ )
+},
+{
+ Id: 12345
+ Name: "Transforming to Rebellion"
+},
+{
Id: 13101
Name: "The way of Taekwon"
},
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index d06c02279..4f5be9de5 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -74523,6 +74523,16 @@ item_db: (
Name: "Love Wand"
},
{
+ Id: 6746
+ AegisName: "Steel_Article"
+ Name: "Steel Artifact"
+},
+{
+ Id: 6747
+ AegisName: "Steel_Article_"
+ Name: "Steel Artifact"
+},
+{
Id: 6755
AegisName: "Corrupted_Charm"
Name: "Contaminated Magic"
@@ -86890,7 +86900,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,-15,0,20,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12119
@@ -86900,7 +86913,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,20,0,0,-15; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WATER, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12120
@@ -86910,7 +86926,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,20,-15,0; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_FIRE, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12121
@@ -86920,7 +86939,10 @@ item_db: (
Buy: 2
Weight: 10
BuyingStore: true
- Script: <" sc_start4 SC_ARMORPROPERTY,1200000,0,-15,0,20; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_WIND, 1200000, 20);
+ sc_start(SC_RESIST_PROPERTY_GROUND, 1200000, -15, 10000, SCFLAG_NOAVOID | SCFLAG_NOICON);
+ ">
},
{
Id: 12122
@@ -89170,7 +89192,12 @@ item_db: (
Name: "Undead Elemental Scroll"
Type: "IT_USABLE"
Weight: 10
- Script: <" sc_start4 SC_ARMOR_RESIST,300000,20,20,20,20; ">
+ Script: <"
+ sc_start(SC_RESIST_PROPERTY_FIRE, 300000, 20);
+ sc_start(SC_RESIST_PROPERTY_WATER, 300000, 20);
+ sc_start(SC_RESIST_PROPERTY_WIND, 300000, 20);
+ sc_start(SC_RESIST_PROPERTY_GROUND, 300000, 20);
+ ">
},
{
Id: 12280
@@ -101203,6 +101230,58 @@ item_db: (
">
},
{
+ Id: 13118
+ AegisName: "Tiny_Flame"
+ Name: "Fading Flame"
+ Type: "IT_WEAPON"
+ Weight: 100
+ Range: 7
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_ARMS"
+ WeaponLv: 1
+ EquipLv: 1
+ Trade: {
+ nodrop: true
+ notrade: true
+ nocart: true
+ nostorage: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+ Subtype: "W_REVOLVER"
+},
+{
+ Id: 13119
+ AegisName: "Freedom_Flame"
+ Name: "Freedom Flame"
+ Type: "IT_WEAPON"
+ Weight: 100
+ Atk: 100
+ Range: 7
+ Slots: 2
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_ARMS"
+ WeaponLv: 3
+ EquipLv: 99
+ Trade: {
+ nodrop: true
+ notrade: true
+ nocart: true
+ nostorage: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+ Subtype: "W_REVOLVER"
+},
+{
Id: 13120
AegisName: "H_FEATHER_H_FIRE"
Name: "Heaven's_Feather_&_Hell's_Fire"
@@ -102872,6 +102951,7 @@ item_db: (
Atk: 15
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
@@ -102887,6 +102967,7 @@ item_db: (
Atk: 30
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
@@ -102905,6 +102986,7 @@ item_db: (
Atk: 50
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
@@ -102920,6 +103002,7 @@ item_db: (
Atk: 50
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
@@ -102935,6 +103018,7 @@ item_db: (
Atk: 50
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
@@ -102953,6 +103037,7 @@ item_db: (
Atk: 50
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
@@ -102971,11 +103056,98 @@ item_db: (
Atk: 50
Job: {
Gunslinger: true
+ Rebellion: true
}
Loc: "EQP_AMMO"
Subtype: "A_BULLET"
Script: <" bonus bAtkEle, Ele_Water; ">
},
+{
+ Id: 13228
+ AegisName: "Flare_Bullet"
+ Name: "Flare Bullet"
+ Type: "IT_AMMO"
+ Buy: 15
+ Weight: 5
+ Atk: 50
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_AMMO"
+ Subtype: "A_BULLET"
+ Script: <" bonus bAtkEle, Ele_Fire; ">
+},
+{
+ Id: 13229
+ AegisName: "Lightning_Bullet"
+ Name: "Lightning Bullet"
+ Type: "IT_AMMO"
+ Buy: 15
+ Weight: 5
+ Atk: 50
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_AMMO"
+ Subtype: "A_BULLET"
+ Script: <" bonus bAtkEle, Ele_Wind; ">
+},
+{
+ Id: 13230
+ AegisName: "Ice_Bullet"
+ Name: "Ice Bullet"
+ Type: "IT_AMMO"
+ Buy: 15
+ Weight: 5
+ Atk: 50
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_AMMO"
+ Subtype: "A_BULLET"
+ Script: <" bonus bAtkEle, Ele_Water; ">
+},
+{
+ Id: 13231
+ AegisName: "Poison_Bullet"
+ Name: "Poison Bullet"
+ Type: "IT_AMMO"
+ Buy: 15
+ Weight: 5
+ Atk: 50
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_AMMO"
+ Subtype: "A_BULLET"
+ Script: <"
+ bonus bAtkEle, Ele_Poison;
+ bonus2 bAddEff, Eff_Poison, 500;
+ ">
+},
+{
+ Id: 13232
+ AegisName: "Blind_Bullet"
+ Name: "Blind Bullet"
+ Type: "IT_AMMO"
+ Buy: 15
+ Weight: 5
+ Atk: 50
+ Job: {
+ Gunslinger: true
+ Rebellion: true
+ }
+ Loc: "EQP_AMMO"
+ Subtype: "A_BULLET"
+ Script: <"
+ bonus bAtkEle, Ele_Dark;
+ bonus2 bAddEff, Eff_Blind, 500;
+ ">
+},
//== Shurikens & Kunais ====================================
{
@@ -153447,6 +153619,13 @@ item_db: (
Name: "S_Genesis_Earing"
},
{
+ Id: 25187
+ AegisName: "Slug_Bullet"
+ Name: "Slug Bullet"
+ Buy: 1200
+ Weight: 1200
+},
+{
Id: 25258
AegisName: "BrokenArrow"
Name: "BrokenArrow"
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index c0c726f25..492b75a04 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -102,7 +102,7 @@ mob_db: (
HeadTopId: top headgear id (int, defaults to 0)
HeadMidId: middle headgear id (int, defaults to 0)
HeadLowId: lower headgear id (int, defaults to 0)
- HairStyleId: hair style id (int, defaults to 0)
+ HairStyleId: hair style id (int, defaults to 1)
BodyStyleId: clothes id (int, defaults to 0)
HairColorId: hair color id (int, defaults to 0)
BodyColorId: clothes color id (int, defaults to 0)
@@ -64487,7 +64487,43 @@ mob_db: (
//2428,G_L_SEYREN
//2429,G_L_EREMES
//2430,G_L_HARWORD
-//2431,G_L_SHECIL
+{
+ Id: 2431
+ SpriteName: "G_L_SHECIL"
+ Name: "Hunter Shecil"
+ Lv: 98
+ Hp: 8835
+ Sp: 1
+ AttackRange: 14
+ Attack: [574, 223]
+ Def: 68
+ Mdef: 13
+ Stats: {
+ Str: 108
+ Agi: 113
+ Vit: 60
+ Int: 72
+ Dex: 148
+ Luk: 37
+ }
+ ViewRange: 10
+ ChaseRange: 12
+ Size: "Size_Medium"
+ Race: "RC_DemiHuman"
+ Element: ("Ele_Wind", 3)
+ Mode: {
+ CanMove: true
+ Aggressive: true
+ CanAttack: true
+ Angry: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ }
+ MoveSpeed: 160
+ AttackDelay: 432
+ AttackMotion: 400
+ DamageMotion: 288
+},
//2432,G_L_KATRINN
//2433,G_L_MAGALETA
//2434,G_L_YGNIZEM
@@ -83975,6 +84011,30 @@ mob_db: (
//3156,EXPLORATION_ROVER
//3166,M_E_DEVILING
{
+ Id: 3169
+ SpriteName: "J_REB_SHECIL1"
+ Name: "Shooting Target"
+ Size: "Size_Small"
+ Race: "RC_Formless"
+ Element: ("Ele_Neutral", 1)
+ Mode: {
+ CanMove: true
+ }
+ MoveSpeed: 200
+},
+{
+ Id: 3170
+ SpriteName: "J_REB_SHECIL2"
+ Name: "Shooting Target"
+ Size: "Size_Small"
+ Race: "RC_Formless"
+ Element: ("Ele_Neutral", 1)
+ Mode: {
+ CanMove: true
+ }
+ MoveSpeed: 200
+},
+{
Id: 3181
SpriteName: "E1_FELOCK"
Name: "Captain Ferlock"
diff --git a/db/sc_config.conf b/db/sc_config.conf
index 1d8f50e1c..2520fc595 100644
--- a/db/sc_config.conf
+++ b/db/sc_config.conf
@@ -3664,3 +3664,14 @@ SC_SV_ROOTTWIST: {
NoBoss: true
}
}
+SC_MADOGEAR: {
+ Visible: true
+ Flags: {
+ NoDeathReset: true
+ NoDispelReset: true
+ NoClearanceReset: true
+ NoAllReset: true
+ NoBoss: true
+ }
+ Icon: "SI_MADOGEAR"
+}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 03:15:52 +0000