Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b2a1d99
Updated Horror Toy Factory with new Mob_Skill_DB Scheme.
Zarbony Mar 31, 2020
8a0f6fa
Delete Duplicate Entry of Bloody Coin and Closed Mind Box, Edit Noble…
Zarbony Apr 1, 2020
38920e0
Some Hints for unitdata script commands
Zarbony Apr 7, 2020
2d9bb4c
Apply suggestions from code review
Zarbony Apr 12, 2020
a870364
Update npc/re/merchants/enchan_htf.txt
Zarbony Apr 13, 2020
c616e74
Update npc/re/merchants/enchan_htf.txt
Zarbony Apr 13, 2020
b9bca8c
Merge pull request #1 from HerculesWS/master
Zarbony Jul 30, 2020
82badaa
Merge branch 'master' of https://github.com/Zarbony/Hercules into Hor…
Zarbony Jul 30, 2020
6fd80e0
Merge pull request #2 from HerculesWS/master
Zarbony Mar 17, 2021
bfa8bcf
Merge branch 'master' into Horror_Toy_Factory
Zarbony Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions db/quest_db.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10950,6 +10950,15 @@ quest_db: (
Id: 12322
Name: "Space Distortion"
},
{
Id: 12330
Name: "Skull-faced Girl"
},
{
Id: 12331
Name: "Trail of Toy Factory"
TimeLimit: 82800
},
{
Id: 12363
Name: "?????? ?? ??"
Expand Down
255 changes: 248 additions & 7 deletions db/re/item_db.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41309,6 +41309,71 @@ item_db: (
bonus bMatkRate,7;
">
},
{
Id: 2976
AegisName: "Red_Lantern"
Name: "Red Lantern"
Type: 5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Type: 5
Type: IT_***

convert to constant, same for other new/updated items.

Weight: 200
Slots: 1
Loc: 136
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Loc: 136
Loc: EQP_***

convert to constant, same for other new/updated items.

EquipLv: 100
Script: <"
bonus bMaxSP, -300;
skill MG_SIGHT, 1;
bonus2 bAddMonsterDropItem, Alchol, 100;
bonus2 bAddMonsterDropItem, Detrimindexta, 100;
bonus2 bAddMonsterDropItem, Karvodailnirol, 100;
">
OnUnequipScript: <" sc_end SC_SIGHT; ">
},
{
Id: 2977
AegisName: "Hurt_Mind"
Name: "Broken Heart"
Type: 5
Weight: 100
Slots: 1
Loc: 136
EquipLv: 110
Script: <"
bonus bMaxSP, 200;
skill DC_SCREAM, 3;
">
},
{
Id: 2978
AegisName: "KindHeart"
Name: "Gentle Heart"
Type: 5
Weight: 100
Slots: 1
Loc: 136
EquipLv: 110
Script: <"
bonus bMaxHP, 500;
bonus2 bHPRegenRate, 300, 10000;
">
},
{
Id: 2980
AegisName: "Evilspirit_Gloves"
Name: "Evilspirit Gloves"
Type: 5
Weight: 100
Slots: 1
Loc: 136
EquipLv: 110
Script: <"
bonus bMaxSP, 200;
bonus bMaxHP, 500;
skill PF_SPIDERWEB, 1;
bonus4 bAutoSpell, WZ_FROSTNOVA, 10, 25, 0;
bonus4 bAutoSpell, SO_PSYCHIC_WAVE, 10, 15, 1;
bonus5 bAutoSpell, HW_MAGICPOWER, 1, 15, BF_MAGIC, 0;
bonus5 bAutoSpellWhenHit, DC_SCREAM, 1, 50, BF_WEAPON | BF_MAGIC, 0;
">
},
{
Id: 2981
AegisName: "RingOfHero"
Expand Down Expand Up @@ -74649,6 +74714,13 @@ item_db: (
Name: "Cash Hair Coupon"
Weight: 10
},
{
Id: 6683
AegisName: "Dried_Flower"
Name: "Dried Flower"
Weight: 10
BuyingStore: true
},
{
Id: 6712
AegisName: "Lovely_Stick"
Expand Down Expand Up @@ -80336,6 +80408,22 @@ item_db: (
AegisName: "Bloody_Coin"
Name: "Bloody Coin"
Buy: 10
BuyingStore: true
},
{
Id: 7643
AegisName: "Bloody_Letter"
Name: "Bloody Letter"
Buy: 220
Weight: 10
BuyingStore: true
},
{
Id: 7644
AegisName: "Draft_Letter"
Name: "Draft Letter"
Buy: 560
BuyingStore: true
},
{
Id: 7646
Expand Down Expand Up @@ -85618,6 +85706,24 @@ item_db: (
Weight: 100
Script: <" itemheal rand(325,405),0; ">
},
{
Id: 11563
AegisName: "Hot_Tee"
Name: "Hot Tea"
Type: 0
Weight: 20
BuyingStore: true
Script: <" itemheal 0, rand(80, 100); ">
},
{
Id: 11564
AegisName: "Sweet_Canape"
Name: "Sweet Pastry"
Type: 0
Weight: 20
BuyingStore: true
Script: <" itemheal rand(800, 1000), 0; ">
},
{
Id: 11592
AegisName: "Trance_Candy_R"
Expand Down Expand Up @@ -126852,6 +126958,32 @@ item_db: (
">
OnUnequipScript: <" heal -1000,0; ">
},
{
Id: 16029
AegisName: "Noble_Cross"
Name: "Noble Cross"
Type: 4
Weight: 1500
Atk: 195
Matk: 150
Range: 1
Job: {
Acolyte: true
Priest: true
Monk: true
}
Upper: 58
Loc: 2
WeaponLv: 4
EquipLv: 40
Subtype: 8
Script: <"
bonus bAtkEle, Ele_Holy;
bonus3 bAutoSpell, PR_TURNUNDEAD, 6, 100;
bonus2 bSPDrainValueRace, RC_Undead, 1;
bonus2 bSPGainRace, RC_Undead, 12;
">
},
{
Id: 16030
AegisName: "Pilebuncker_S"
Expand Down Expand Up @@ -149026,17 +149158,28 @@ item_db: (
Buy: 10
Weight: 300
},
{
Id: 22516
AegisName: "Dark_Red_Clot"
Name: "Dark Red Lump"
Type: 2
Buy: 1440
Weight: 10
BuyingStore: true
Script: <"
if (rand(1000) < 300)
sc_start SC_CURSE, 30000, 0, 3000, SCFLAG_NONE;
">
},
{
Id: 22534
AegisName: "Closedmind_Box"
Name: "Closed Mind Box"
Type: "IT_CASH"
Buy: 10
Name: "Sealed Mind Box"
Type: 2
Buy: 1000
Weight: 1000
EquipLv: 1
Script: <"
// getgroupitem(IG_Sealed_Mind_Box);
">
BuyingStore: true
Script: <" packageitem(); ">
},
{
Id: 22537
Expand Down Expand Up @@ -157127,6 +157270,103 @@ item_db: (
Name: "Shinee_Opal"
},
{
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict aren't resolved?

Id: 31016
AegisName: "Decorated_Evil_Tree_Card"
Name: "Decorated Tree Matilda Card"
Type: 6
Weight: 10
Loc: 16
Script: <"
bonus bMaxHP, 1000;
bonus bMaxSP, 150;
bonus bFlee, -25;
">
},
{
Id: 31017
AegisName: "Brutal_Tattered_Cookie_Card"
Name: "Terrifying Cookie Card"
Type: 6
Weight: 10
Loc: 64
Script: <"
bonus2 bAddRace, RC_All, 1 + getrefine() / 2;
bonus bMatkRate, 1 + getrefine() / 2;
bonus bMaxHPrate, -2 - (getrefine() / 2) * 2;
">
},
{
Id: 31018
AegisName: "Evil_Enchanted_Box_Card"
Name: "Gift of Darkness Card"
Type: 6
Weight: 10
Loc: 2
Script: <"
bonus bMaxHP, -1225;
bonus3 bAddEff, Eff_Curse, 1000, ATF_MAGIC;
">
},
{
Id: 31019
AegisName: "Eerie_Spirit_Card"
Name: "Eerie Spirit Card"
Type: 6
Weight: 10
Loc: 136
Script: <"
bonus bMaxHPrate, -13;
bonus5 bAutoSpellWhenHit, NPC_WIDECURSE, 5, 100, BF_MAGIC, 0;
">
},
{
Id: 31020
AegisName: "Evil_Chill_Ghost_Card"
Name: "Bloody Poltergeist Card"
Type: 6
Weight: 10
Loc: 136
Script: <"
bonus bMaxHPrate, -13;
bonus5 bAutoSpellWhenHit, NPC_WIDECURSE, 5, 100, BF_WEAPON, 0;
">
},
{
Id: 31021
AegisName: "Dancing_Marionette_Card"
Name: "Demonic Marionette Card"
Type: 6
Weight: 10
Loc: 2
Script: <"
bonus bAspdRate, 10;
bonus2 bAddRace, RC_All, -3;
">
},
{
Id: 31022
AegisName: "Dumped_Teddy_Bear_Card"
Name: "Dumped Teddy Bear Card"
Type: 6
Weight: 10
Loc: 64
Script: <"
bonus bMaxSPrate, 20;
bonus2 bAddEff2, Eff_Curse, 100;
">
},
{
Id: 31023
AegisName: "Celine_Kimi_Card"
Name: "Celine Kimi Card"
Type: 6
Weight: 10
Loc: 2
Script: <"
bonus bMatkRate, 10;
bonus5 bAutoSpell, NPC_CRITICALWOUND, 3, 50 + 5 * (getrefine() / 3), BF_MAGIC, 1;
=======
Id: 31022
AegisName: "Abandoned_Teddy_Bear_Card"
Name: "Abandoned Teddy Bear Card"
Expand All @@ -157137,6 +157377,7 @@ item_db: (
Script: <"
bonus(bMaxSPrate, 20);
bonus2(bAddEff2, Eff_Curse, 20);
>>>>>>> b9bca8ceaa551fd9f9c26bea4b4f738ad94ca2d6
">
},
{
Expand Down
62 changes: 62 additions & 0 deletions db/re/item_packages.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12869,3 +12869,65 @@ Malang_Woe_Encard_Box: {
Random: 0
}
}
Closedmind_Box: {
Crystal_Jewel__: {
Random: 1
Count: 10
Rate: 1
}
Violet_Jewel: {
Random: 1
Count: 10
Rate: 1
}
Bloody_Coin: {
Random: 1
Count: 5
Rate: 1
}
Gold: {
Random: 1
Count: 2
Rate: 1
}
Manacles: {
Random: 1
Count: 10
Rate: 1
}
Old_Card_Album: {
Random: 1
Count: 1
Rate: 1
}
Old_Violet_Box: {
Random: 1
Count: 3
Rate: 1
}
Sweet_Canape: {
Random: 1
Count: 5
Rate: 1
}
Hot_Tee: {
Random: 1
Count: 5
Rate: 1
}
KindHeart: {
Random: 1
Count: 1
Rate: 1
}
Hurt_Mind: {
Random: 1
Count: 1
Rate: 1
}
Lush_Rose: {
Random: 1
Count: 1
Rate: 1
}
}
Loading