summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/constants.conf11
-rw-r--r--db/map_index.txt29
-rw-r--r--db/pre-re/item_db.conf75
-rw-r--r--db/pre-re/mob_db.conf164
-rw-r--r--db/pre-re/skill_db.conf19
-rw-r--r--db/pre-re/skill_tree.conf1
6 files changed, 283 insertions, 16 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 21bfd5f3..477a28ab 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3185,9 +3185,18 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
NPC432:432
NPC433:433
NPC434:434
+ NPC435:435
+ NPC436:436
+ NPC437:437
+ NPC438:438
+ NPC439:439
+ NPC440:440
NPC32767:32767
// NPCs decently named
+ NPC_ALISSA: 438
+ NPC_SANTA: 439
+ NPC_GAK: 440
NPC_OFFSET_NO_SPRITE: 998
// Avatars (1000+)
@@ -3214,7 +3223,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
NPC_UNUSED__MOBTOMB: 565
NPC_WARP_DEBUG: 722
NPC_UNUSED__FLAG: 722
- NPC_NO_SPRITE: 999
+ NPC_NO_SPRITE: 400
NPC_HIDDEN: 32767
comment__: "Walk masks"
diff --git a/db/map_index.txt b/db/map_index.txt
index 354f427b..a7b53599 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -119,14 +119,21 @@
069-2 119
070-1 120
070-3 121
-099-1 122
-099-2 123
-099-3 124
-099-4 125
-099-5 126
-099-6 127
-099-7 128
-099-8 129
-botcheck 130
-fermi 131
-sec_pri 132
+080-1 122
+080-3 123
+081-1 124
+081-2 125
+081-3 126
+082-2 127
+082-3 128
+099-1 129
+099-2 130
+099-3 131
+099-4 132
+099-5 133
+099-6 134
+099-7 135
+099-8 136
+botcheck 137
+fermi 138
+sec_pri 139
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index a037f0cd..1af0656f 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1112,6 +1112,7 @@ item_db: (
Id5260: 1
}
},
+/* Rings & Accessories */
{
Id: 702
AegisName: "WeddingRing"
@@ -1517,6 +1518,7 @@ item_db: (
bonus bHit, 25;
">
},
+/* Boots */
{
Id: 528
AegisName: "Boots"
@@ -4794,6 +4796,54 @@ item_db: (
ViewSprite: 5265
},
{
+ Id: 5276
+ AegisName: "ThermalNapalm"
+ Name: "Thermal Napalm"
+ Type: "IT_ETC"
+ Buy: 9999
+ Sell: 0
+ Weight: 1
+ ViewSprite: 5276
+ Trade: {
+ partneroverride: true
+ notrade: false
+ nodrop: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+},
+{
+ Id: 5278
+ AegisName: "XmasTicket"
+ Name: "Christmas Ticket"
+ Type: "IT_ETC"
+ Buy: 0
+ Sell: 0
+ Weight: 0
+ ViewSprite: 5278
+},
+{
+ Id: 5279
+ AegisName: "Carrot"
+ Name: "Legendary Carrot"
+ Type: "IT_ETC"
+ Buy: 0
+ Sell: 0
+ Weight: 0
+ ViewSprite: 5279
+ Trade: {
+ notrade: true
+ nodrop: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+},
+/* Chest Armor */
+{
Id: 523
AegisName: "LeatherShirt"
Name: "LeatherShirt"
@@ -11545,7 +11595,6 @@ item_db: (
bonus bDex, 1;
bonus bLuk, 1;
bonus bCritical, 10;
- callfunc "DrugItem";
">
},
{
@@ -12074,6 +12123,7 @@ item_db: (
bonus bMatkRate, -5;
">
},
+/* Usable items */
{
Id: 501
AegisName: "CactusDrink"
@@ -13738,6 +13788,29 @@ item_db: (
">
},
{
+ Id: 5277
+ AegisName: "XmasSeeds"
+ Name: "Christmas Seeds"
+ Type: "IT_USABLE"
+ Buy: 9999
+ Sell: 0
+ Weight: 1
+ ViewSprite: 5277
+ Trade: {
+ partneroverride: true
+ notrade: true
+ nodrop: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+ Script: <"
+ callfunc "X21_SEEDS";
+ ">
+},
+/* Legs Armor */
+{
Id: 586
AegisName: "CottonShorts"
Name: "CottonShorts"
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 50798b57..107d1e26 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -3481,7 +3481,7 @@ mob_db: (
AttackMotion: 672
DamageMotion: 50
Drops: {
- WumpusEgg: 10000
+ WumpusEgg: 1
}
},
{
@@ -6569,7 +6569,7 @@ mob_db: (
AttackRange: 2
Attack: [40, 40]
Def: 20
- Mdef: 40
+ Mdef: 30
Stats: {
Str: 30
Agi: 30
@@ -6606,7 +6606,7 @@ mob_db: (
AttackRange: 2
Attack: [40, 40]
Def: 20
- Mdef: 40
+ Mdef: 30
Stats: {
Str: 30
Agi: 30
@@ -7002,4 +7002,162 @@ mob_db: (
CandyPumpkin: 1250
}
},
+{
+ Id: 1164
+ SpriteName: "ChristmasTree"
+ Name: "Christmas Tree"
+ Lv: 40
+ Hp: 12000
+ Sp: 0
+ Exp: 3647
+ JExp: 392
+ AttackRange: 2
+ Attack: [40, 40]
+ Def: 20
+ Mdef: 40
+ Stats: {
+ Str: 30
+ Agi: 30
+ Vit: 30
+ Int: 30
+ Dex: 30
+ Luk: 30
+ }
+ ViewRange: 9
+ ChaseRange: 10
+ Size: 1
+ Race: 0
+ Element: (0, 1)
+ Mode: {
+ CanMove: false
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ }
+ MoveSpeed: 190
+ AttackDelay: 1500
+ AttackMotion: 800
+ DamageMotion: 800
+},
+{
+ Id: 1165
+ SpriteName: "ChristmasGift"
+ Name: "Christmas Gift"
+ Lv: 1
+ Hp: 1
+ Sp: 0
+ Exp: 1
+ JExp: 1
+ AttackRange: 1
+ Attack: [0, 0]
+ Def: 0
+ Mdef: 5
+ Stats: {
+ Str: 0
+ Agi: 0
+ Vit: 0
+ Int: 0
+ Dex: 0
+ Luk: 0
+ }
+ ViewRange: 9
+ ChaseRange: 10
+ Size: 1
+ Race: 3
+ Element: (2, 1)
+ MoveSpeed: 800
+ AttackDelay: 800
+ AttackMotion: 672
+ DamageMotion: 480
+ Drops: {
+ FourLeafClover: 5
+ }
+},
+{
+ Id: 1166
+ SpriteName: "Snowman"
+ Name: "Snowman"
+ Lv: 100
+ Hp: 4200
+ Sp: 0
+ Exp: 2897
+ JExp: 689
+ AttackRange: 1
+ Attack: [60, 80]
+ Def: 5
+ Mdef: 20
+ Stats: {
+ Str: 15
+ Agi: 25
+ Vit: 40
+ Int: 15
+ Dex: 75
+ Luk: 30
+ }
+ ViewRange: 8
+ ChaseRange: 10
+ Size: 1
+ Race: 3
+ Element: (0, 1)
+ Mode: {
+ CanMove: true
+ Aggressive: true
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ }
+ MoveSpeed: 800
+ AttackDelay: 1872
+ AttackMotion: 672
+ DamageMotion: 480
+ Drops: {
+ IronPotion: 800
+ ConcentrationPotion: 800
+ Diamond: 50
+ }
+},
+{
+ Id: 1167
+ SpriteName: "SnowmanBoss"
+ Name: "Der Schneemann"
+ Lv: 100
+ Hp: 35000
+ Sp: 0
+ Exp: 2897
+ JExp: 689
+ AttackRange: 3
+ Attack: [60, 80]
+ Def: 20
+ Mdef: 20
+ Stats: {
+ Str: 15
+ Agi: 15
+ Vit: 10
+ Int: 15
+ Dex: 95
+ Luk: 50
+ }
+ ViewRange: 14
+ ChaseRange: 16
+ Size: 1
+ Race: 3
+ Element: (0, 1)
+ Mode: {
+ CanMove: true
+ Aggressive: true
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ Boss: true
+ }
+ MoveSpeed: 700
+ AttackDelay: 1672
+ AttackMotion: 672
+ DamageMotion: 480
+ Drops: {
+ IronPotion: 800
+ ConcentrationPotion: 800
+ Diamond: 50
+ }
+},
)
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 98f0ab73..a553cd9e 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -39366,5 +39366,24 @@ skill_db: (
Quest: true
}
},
+{
+ Id: 20057
+ Name: "SKILL_JANDE"
+ Description: "Jande"
+ MaxLevel: 9
+ SkillType: {
+ Self: true
+ }
+ SkillInfo: {
+ Quest: true
+ }
+ CoolDown: 60000
+ Requirements: {
+ SPCost: 100
+ Items: {
+ TinyManaElixir: 0
+ }
+ }
+},
)
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 1a009ef3..ba2202ec 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -43,6 +43,7 @@ Talpan: {
//AC_SHOWER: 0
//MG_FIREWALL: 0
+ SKILL_JANDE: 5
// Base Class
SKILL_MAGIC: 0