summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/const.txt59
-rw-r--r--db/pre-re/mob_db.conf37
-rw-r--r--db/pre-re/pet_db.txt10
-rw-r--r--db/re/item_db.conf15
-rw-r--r--db/re/pet_db.txt8
5 files changed, 109 insertions, 20 deletions
diff --git a/db/const.txt b/db/const.txt
index efdad29bc..f02a5479c 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -361,6 +361,7 @@ mf_battleground 51
mf_reset 52
mf_notomb 53
mf_nocashshop 54
+mf_noviewid 55
cell_walkable 0
cell_shootable 1
@@ -2490,13 +2491,30 @@ EF_MIRESULT_MAKE_FAIL 1018
EF_ALL_RAY_OF_PROTECTION 1019
EF_VENOMFOG 1020
EF_DUSTSTORM 1021
-//1022 - 1039 Unknown
+EF_LEVEL160 1022
+EF_LEVEL160_SUB 1023
+EF_MAPCHAIN 1024
+EF_MAGIC_FLOOR 1025
+EF_ICEMINE 1026
+EF_FLAMECORSS 1027
+EF_ICEMINE_1 1028
+EF_DANCE_BLADE_ATK 1029
+EF_DARKPIERCING 1030
+EF_INVINCIBLEOFF2 1031
+EF_MAXPAIN 1032
+EF_DEATHSUMMON 1033
+EF_MOONSTAR 1034
+EF_STRANGELIGHTS 1035
+EF_SUPER_STAR 1036
+EF_YELLOBODY 1037
+EF_COLORPAPER2 1038
+EF_EVILS_PAW 1039
EF_GC_DARKCROW 1040
EF_RK_DRAGONBREATH_WATER 1041
EF_ALL_FULL_THROTTLE 1042
EF_SR_FLASHCOMBO 1043
EF_RK_LUXANIMA 1044
-//1045 Unknown
+EF_CLOUD10 1045
EF_SO_ELEMENTAL_SHIELD 1046
EF_AB_OFFERTORIUM 1047
EF_WL_TELEKINESIS_INTENSE 1048
@@ -2511,15 +2529,44 @@ EF_RA_UNLIMIT 1056
EF_AB_OFFERTORIUM_RING 1057
EF_SC_ESCAPE 1058
EF_WM_FRIGG_SONG 1059
-EF_C_MAKER 1060
-//1061 Unknown
+EF_FLICKER 1060
+EF_C_MAKER 1061
EF_HAMMER_OF_GOD 1062
-//1063 - 1065 Unknown
+EF_MASS_SPIRAL 1063
+EF_FIRE_RAIN 1064
+EF_WHITEBODY 1065
EF_BANISHING_BUSTER 1066
EF_SLUGSHOT 1067
EF_D_TAIL 1068
-//1069 - 1077 Unknown
+EF_BIND_TRAP1 1069
+EF_BIND_TRAP2 1070
+EF_BIND_TRAP3 1071
+EF_JUMPBODY1 1072
+EF_ANIMATED_EMITTER 1073
+EF_RL_EXPLOSION 1074
+EF_C_MAKER_1 1075
+EF_QD_SHOT 1076
+EF_P_ALTER 1077
EF_S_STORM 1078
+EF_MUSIC_HAT 1079
+EF_CLOUD_KILL 1080
+EF_ESCAPE 1081
+EF_XENO_SLASHER 1082
+EF_FLOWERSMOKE 1083
+EF_FSTONE 1084
+EF_QSCARABA 1085
+EF_LJOSALFAR 1086
+EF_HAPPINESSSTAR 1087
+EF_POWER_OF_GAIA 1088
+EF_MAPLE_FALLS 1089
+EF_MARKING_USE_CHANGEMONSTER 1090
+EF_MAGICAL_FEATHER 1091
+EF_MERMAID_LONGING 1092
+EF_GIFT_OF_SNOW 1093
+EF_ACH_COMPLETE 1094
+EF_TIME_ACCESSORY 1095
+EF_SPRITEMABLE 1096
+EF_TUNAPARTY 1097
WARPNPC 45
1_ETC_01 46
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 26ab0d81f..6d73375eb 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -49886,6 +49886,43 @@ mob_db: (
MvpExp: 0
},
{
+ Id: 2210
+ SpriteName: "XMAS_LUNATIC"
+ Name: "Xmas Lunatic"
+ Lv: 1
+ Hp: 100
+ Sp: 1
+ Exp: 0
+ JExp: 0
+ AttackRange: 1
+ Attack: [1, 1]
+ Def: 0
+ Mdef: 0
+ Stats: {
+ Str: 10
+ Agi: 1
+ Vit: 1
+ Int: 1
+ Dex: 1
+ Luk: 1
+ }
+ ViewRange: 10
+ ChaseRange: 12
+ Size: 0
+ Race: 2
+ Element: (0, 1)
+ Mode: {
+ CanMove: true
+ Looter: true
+ CanAttack: true
+ }
+ MoveSpeed: 200
+ AttackDelay: 1456
+ AttackMotion: 456
+ DamageMotion: 336
+ MvpExp: 0
+},
+{
Id: 2308
SpriteName: "KO_KAGE"
Name: "Zanzou"
diff --git a/db/pre-re/pet_db.txt b/db/pre-re/pet_db.txt
index 8676d7140..c0f3a3e91 100644
--- a/db/pre-re/pet_db.txt
+++ b/db/pre-re/pet_db.txt
@@ -80,7 +80,7 @@
1188,BON_GUN,Bon Gun,659,9025,10020,537,80,60,30,100,250,20,500,150,1,0,600,200,400,{ petskillattack "NPC_DARKNESSATTACK",555,1,1,1; },{ bonus bVit,1; bonus2 bResEff,Eff_Stun,100; }
1200,ZHERLTHSH,Zealotus,660,9026,0,929,80,60,10,100,250,20,300,150,0,0,1000,100,500,{ petskillattack "AS_SONICBLOW",1,0,0,3; },{ bonus2 bAddRace,RC_DemiPlayer,2; bonus2 bMagicAddRace,RC_DemiPlayer,2; }
1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "MG_SIGHT",5,0,5,5; },{ bonus bMaxHP,30; bonus2 bSubEle,Ele_Water,1; }
-1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; if (RENEWAL) { bonus2 bAddRaceTolerance,RC_DemiPlayer,1; } else { bonus2 bSubRace,RC_DemiPlayer,1; } }
+1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; bonus2 bSubRace,RC_DemiPlayer,1; }
// New Pets
1122,GOBLIN_1,Goblin,14569,9032,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_WINDATTACK",5,0,5,5; },{}
@@ -114,7 +114,11 @@
1504,DULLAHAN,Dullahan,12367,9049,10031,6107,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus bCritAtkRate,5; }
1505,LOLI_RURI,Loli Ruri,12360,9042,10024,6097,80,60,15,100,250,20,200,150,0,0,300,300,800,{},{ bonus bMaxHPrate,3; bonus3 bAutoSpellWhenHit,"AL_HEAL",1,50; }
1513,CIVIL_SERVANT,Mao Guai,12358,9040,10022,6095,80,60,10,100,250,20,500,150,0,0,300,300,800,{},{ bonus bMaxSP,10; }
-1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; if (RENEWAL) { bonus2 bAddRaceTolerance,RC_DemiPlayer,1; } else { bonus2 bSubRace,RC_DemiPlayer,1; } }
-1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ if (RENEWAL) { bonus2 bAddRaceTolerance,RC_Brute,2; } else { bonus2 bSubRace,RC_Brute,3; } }
+1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; bonus2 bSubRace,RC_DemiPlayer,1; }
+1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubRace,RC_Brute,3; }
1630,BACSOJIN_,White Lady,12357,9039,10021,6094,80,60,10,100,250,20,2000,150,0,0,300,300,800,{},{}
1837,IMP,Fire Imp,12374,9056,10038,6114,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,2; bonus2 bAddEle,Ele_Fire,2; }
+
+// Episode 13.2 Brasilis
+2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // kRO version
+2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // iRO/cRO version
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index adf25baa8..7c5a286b1 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -28073,13 +28073,14 @@ item_db: (
EquipLv: 94
Refine: false
Script: <"
- bonus bDex,6;
- bonus bStr,6;
- bonus bAgi,6;
- bonus bVit,6;
- bonus bInt,10;
- bonus bLuk,10;
- bonus bMdef,5;
+ bonus bDex, 6;
+ bonus bStr, 6;
+ bonus bAgi, 6;
+ bonus bVit, 6;
+ bonus bInt, 10;
+ bonus bLuk, 10;
+ bonus bMdef, 5;
+ bonus bHealPower, 6;
">
},
{
diff --git a/db/re/pet_db.txt b/db/re/pet_db.txt
index 9a323b5c3..42d758cb9 100644
--- a/db/re/pet_db.txt
+++ b/db/re/pet_db.txt
@@ -79,7 +79,7 @@
1188,BON_GUN,Bon Gun,659,9025,10020,537,80,60,30,100,250,20,500,150,1,0,600,200,400,{ petskillattack "NPC_DARKNESSATTACK",555,1,1,1; },{ bonus bVit,1; bonus2 bResEff,Eff_Stun,100; }
1200,ZHERLTHSH,Zealotus,660,9026,0,929,80,60,10,100,250,20,300,150,0,0,1000,100,500,{ petskillattack "AS_SONICBLOW",1,0,0,3; },{ bonus2 bAddRace,RC_DemiPlayer,2; bonus2 bMagicAddRace,RC_DemiPlayer,2; }
1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "MG_SIGHT",5,0,5,5; },{ bonus bMaxHP,30; bonus2 bSubEle,Ele_Water,1; }
-1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; if (RENEWAL) { bonus2 bAddRaceTolerance,RC_DemiPlayer,1; } else { bonus2 bSubRace,RC_DemiPlayer,1; } }
+1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; bonus2 bAddRaceTolerance,RC_DemiPlayer,1; }
// New Pets
1122,GOBLIN_1,Goblin,14569,9032,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_WINDATTACK",5,0,5,5; },{}
@@ -113,12 +113,12 @@
1504,DULLAHAN,Dullahan,12367,9049,10031,6107,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus bCritAtkRate,5; }
1505,LOLI_RURI,Loli Ruri,12360,9042,10024,6097,80,60,15,100,250,20,200,150,0,0,300,300,800,{},{ bonus bMaxHPrate,3; bonus3 bAutoSpellWhenHit,"AL_HEAL",1,50; }
1513,CIVIL_SERVANT,Mao Guai,12358,9040,10022,6095,80,60,10,100,250,20,500,150,0,0,300,300,800,{},{ bonus bMaxSP,10; }
-1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; if (RENEWAL) { bonus2 bAddRaceTolerance,RC_DemiPlayer,1; } else { bonus2 bSubRace,RC_DemiPlayer,1; } }
-1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ if (RENEWAL) { bonus2 bAddRaceTolerance,RC_Brute,2; } else { bonus2 bSubRace,RC_Brute,3; } }
+1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; bonus2 bAddRaceTolerance,RC_DemiPlayer,1; }
+1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bAddRaceTolerance,RC_Brute,2; }
1630,BACSOJIN_,White Lady,12357,9039,10021,6094,80,60,10,100,250,20,2000,150,0,0,300,300,800,{},{}
1837,IMP,Fire Imp,12374,9056,10038,6114,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,2; bonus2 bAddEle,Ele_Fire,2; }
-// Episode 13.2 Brasilis (Start of RE)
+// Episode 13.2 Brasilis
2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // kRO version
2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // iRO/cRO version