summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/constants.conf7
-rw-r--r--db/pre-re/item_db.conf10
-rw-r--r--db/quest_db.conf9
-rw-r--r--db/re/item_db.conf149
4 files changed, 90 insertions, 85 deletions
diff --git a/db/constants.conf b/db/constants.conf
index a044aee7d..c22435a36 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3656,6 +3656,13 @@ constants_db: {
NPC_NAME_HIDDEN: 2
NPC_NAME_UNIQUE: 3
NPC_MAP: 4
+
+ comment__: "getcharid"
+ CHAR_ID_CHAR: 0
+ CHAR_ID_PARTY: 1
+ CHAR_ID_GUILD: 2
+ CHAR_ID_ACCOUNT: 3
+ CHAR_ID_BG: 4
comment__: "sc_start"
SCFLAG_NONE: 0x00
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 1ba177d18..4ba5719a4 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -93445,7 +93445,7 @@ item_db: (
Name: "Chemical Protection Helm Scroll"
Type: 2
Weight: 10
- Script: <" unitskilluseid getcharid(3),237,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),237,5; ">
},
{
Id: 14518
@@ -93453,7 +93453,7 @@ item_db: (
Name: "Chemical Protection Shield Scrol"
Type: 2
Weight: 10
- Script: <" unitskilluseid getcharid(3),235,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),235,5; ">
},
{
Id: 14519
@@ -93461,7 +93461,7 @@ item_db: (
Name: "Chemical Protection Armor Scroll"
Type: 2
Weight: 10
- Script: <" unitskilluseid getcharid(3),236,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),236,5; ">
},
{
Id: 14520
@@ -93469,7 +93469,7 @@ item_db: (
Name: "Chemical Protection Weapon Scroll"
Type: 2
Weight: 10
- Script: <" unitskilluseid getcharid(3),234,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),234,5; ">
},
{
Id: 14521
@@ -93489,7 +93489,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" unitskilluseid getcharid(3),108,1; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),108,1; ">
},
{
Id: 14522
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 67012bd8e..015692b07 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -4354,10 +4354,12 @@ quest_db: (
{
Id: 7104
Name: "Special task of an assassin guild 4"
+ TimeLimit: 3000
},
{
Id: 7105
Name: "Special task of an assassin guild 4"
+ TimeLimit: 600
},
{
Id: 7106
@@ -4378,6 +4380,13 @@ quest_db: (
{
Id: 7110
Name: "Special task of an assassin guild 9"
+ TimeLimit: 600
+ Targets: (
+ {
+ MobId: 2030
+ Count: 1
+ },
+ )
},
{
Id: 7111
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 41a44c2ee..34136aa5c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -25183,9 +25183,8 @@ item_db: (
EquipLv: 65
View: 3
Script: <"
- bonus2 bAddRaceTolerance,RC_Undead,5;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,-5;
- bonus2 bAddRaceTolerance,RC_Player,-5;
+ bonus2 bAddRaceTolerance, RC_Undead, 5;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, -5;
">
},
{
@@ -60141,11 +60140,9 @@ item_db: (
noauction: true
}
Script: <"
- bonus bAspdRate,10;
- bonus2 bAddRace,RC_DemiPlayer,5;
- bonus2 bAddRace,RC_Player,5;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
- bonus2 bAddRaceTolerance,RC_Player,10;
+ bonus bAspdRate, 10;
+ bonus2 bAddRace, RC_DemiPlayer, 5;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 10;
">
},
{
@@ -60170,11 +60167,9 @@ item_db: (
noauction: true
}
Script: <"
- bonus bAspdRate,7;
- bonus2 bAddRace,RC_DemiPlayer,3;
- bonus2 bAddRace,RC_Player,3;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,7;
- bonus2 bAddRaceTolerance,RC_Player,7;
+ bonus bAspdRate, 7;
+ bonus2 bAddRace, RC_DemiPlayer, 3;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 7;
">
},
{
@@ -60199,11 +60194,9 @@ item_db: (
noauction: true
}
Script: <"
- bonus bAspdRate,5;
- bonus2 bAddRace,RC_DemiPlayer,1;
- bonus2 bAddRace,RC_Player,1;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
- bonus2 bAddRaceTolerance,RC_Player,5;
+ bonus bAspdRate, 5;
+ bonus2 bAddRace, RC_DemiPlayer, 1;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 5;
">
},
{
@@ -62408,10 +62401,8 @@ item_db: (
Refine: false
View: 559
Script: <"
- bonus2 bAddRace,RC_DemiPlayer,5;
- bonus2 bAddRace,RC_Player,5;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
- bonus2 bAddRaceTolerance,RC_Player,5;
+ bonus2 bAddRace, RC_DemiPlayer, 5;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 5;
">
},
{
@@ -65567,11 +65558,10 @@ item_db: (
Loc: 256
View: 639
Script: <"
- bonus bAllStats,1;
- bonus bMdef,5;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,2;
- bonus2 bAddRaceTolerance,RC_Player,2;
- bonus2 bAddRaceTolerance,RC_Brute,2;
+ bonus bAllStats, 1;
+ bonus bMdef, 5;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 2;
+ bonus2 bAddRaceTolerance, RC_Brute, 2;
">
},
{
@@ -65726,10 +65716,7 @@ item_db: (
Loc: 256
EquipLv: 95
View: 651
- Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
- bonus2 bAddRaceTolerance,RC_Player,10;
- ">
+ Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 10; ">
},
{
Id: 5773
@@ -65742,10 +65729,7 @@ item_db: (
Loc: 256
EquipLv: 95
View: 652
- Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
- bonus2 bAddRaceTolerance,RC_Player,10;
- ">
+ Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 10; ">
},
{
Id: 5774
@@ -65758,10 +65742,7 @@ item_db: (
Loc: 256
EquipLv: 95
View: 496
- Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
- bonus2 bAddRaceTolerance,RC_Player,10;
- ">
+ Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 10; ">
},
{
Id: 5775
@@ -65861,9 +65842,8 @@ item_db: (
Loc: 256
View: 658
Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
- bonus2 bAddRaceTolerance,RC_Player,10;
- skill WZ_EARTHSPIKE,3;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 10;
+ skill WZ_EARTHSPIKE, 3;
">
},
{
@@ -120572,7 +120552,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" unitskilluseid getcharid(3),237,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),237,5; ">
},
{
Id: 14518
@@ -120589,7 +120569,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" unitskilluseid getcharid(3),235,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),235,5; ">
},
{
Id: 14519
@@ -120606,7 +120586,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" unitskilluseid getcharid(3),236,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),236,5; ">
},
{
Id: 14520
@@ -120623,7 +120603,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" unitskilluseid getcharid(3),234,5; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),234,5; ">
},
{
Id: 14521
@@ -120643,7 +120623,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" unitskilluseid getcharid(3),108,1; ">
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),108,1; ">
},
{
Id: 14522
@@ -132439,10 +132419,9 @@ item_db: (
Refine: false
View: 781
Script: <"
- bonus bMdef,5;
- bonus bMaxHPrate,2;
- bonus2 bAddRace,RC_DemiPlayer,5;
- bonus2 bAddRace,RC_Player,5;
+ bonus bMdef, 5;
+ bonus bMaxHPrate, 2;
+ bonus2 bAddRace, RC_DemiPlayer, 5;
">
},
{
@@ -132475,11 +132454,10 @@ item_db: (
EquipLv: 70
View: 784
Script: <"
- bonus2 bAddRace,RC_DemiPlayer,10;
- bonus2 bAddRace,RC_Player,10;
- bonus2 bAddRace,RC_Demon,10;
- if(getrefine()>6) {
- autobonus "{ bonus bAspdRate,100; }",10,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+ bonus2 bAddRace, RC_DemiPlayer, 10;
+ bonus2 bAddRace, RC_Demon, 10;
+ if(getrefine() > 6) {
+ autobonus "{ bonus bAspdRate, 100; }", 10, 7000, 0, "{ specialeffect2 EF_POTION_BERSERK; }";
}
">
},
@@ -132721,9 +132699,8 @@ item_db: (
Loc: 256
View: 798
Script: <"
- bonus bInt,1;
- bonus2 bAddRace,RC_DemiPlayer,5;
- bonus2 bAddRace,RC_Player,5;
+ bonus bInt, 1;
+ bonus2 bAddRace, RC_DemiPlayer, 5;
">
},
{
@@ -134405,10 +134382,9 @@ item_db: (
Loc: 256
View: 224
Script: <"
- bonus bMdef,1;
- bonus bUnbreakableHelm,0;
- bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
- bonus2 bAddRaceTolerance,RC_Player,10;
+ bonus bMdef, 1;
+ bonus bUnbreakableHelm, 0;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 10;
">
},
{
@@ -136014,9 +135990,8 @@ item_db: (
Loc: 256
View: 957
Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
- bonus2 bAddRaceTolerance,RC_Player,5;
- if (getrefine()>7) { bonus bMaxHPrate,getrefine()-7; }
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 5;
+ if (getrefine() > 7) { bonus bMaxHPrate, getrefine()-7; }
">
},
{
@@ -136047,9 +136022,9 @@ item_db: (
Refine: false
View: 959
Script: <"
- bonus bUnbreakableHelm,0;
- bonus bMaxSPrate,3;
- autobonus2 "{ bonus2 bAddRaceTolerance,RC_DemiPlayer,100; bonus2 bAddRaceTolerance,RC_Player,100; }",10,3000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";
+ bonus bUnbreakableHelm, 0;
+ bonus bMaxSPrate, 3;
+ autobonus2 "{ bonus2 bAddRaceTolerance, RC_DemiPlayer, 100; }", 10, 3000, BF_WEAPON|BF_MAGIC, "{ specialeffect2 EF_POTION_BERSERK; }";
">
},
{
@@ -136483,13 +136458,12 @@ item_db: (
EquipLv: 10
View: 1018
Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,8;
- bonus2 bAddRaceTolerance,RC_Player,8;
- bonus2 bAddRaceTolerance,RC_Dragon,8;
- bonus2 bAddItemHealRate,517,200;
- if(getrefine()>11) {
- bonus bMaxHPrate,7;
- bonus bMaxSPrate,3;
+ bonus2 bAddRaceTolerance, RC_DemiPlayer, 8;
+ bonus2 bAddRaceTolerance, RC_Dragon, 8;
+ bonus2 bAddItemHealRate, 517, 200;
+ if(getrefine() > 11) {
+ bonus bMaxHPrate, 7;
+ bonus bMaxSPrate, 3;
}
">
},
@@ -136504,10 +136478,7 @@ item_db: (
EquipLv: 70
Refine: false
View: 1019
- Script: <"
- bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
- bonus2 bAddRaceTolerance,RC_Player,5;
- ">
+ Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 5; ">
},
{
Id: 18895
@@ -146137,6 +146108,24 @@ item_db: (
//== New Etc Items =========================================
{
+ Id: 22508
+ AegisName: "Para_Team_Mark_"
+ Name: "Eden Group Mark"
+ Type: 11
+ Delay: 1200000
+ Trade: {
+ nodrop: true
+ notrade: true
+ noselltonpc: true
+ nocart: true
+ nostorage: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+ Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT), "AL_TELEPORT", 3; ">
+},
+{
Id: 22514
AegisName: "Candy_Holder"
Name: "Candy Holder"
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-08-03 10:04:28 +0000