From 5cd797d7e89b1e320cd37e385ca20bb7d8d7920a Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 22 May 2019 10:27:57 -0300 Subject: Populate 020-7-2 --- db/constants.conf | 1 + npc/020-7-1/janitors.txt | 21 ++++++++++++++++----- npc/020-7-2/_import.txt | 3 +++ npc/020-7-2/_mobs.txt | 8 ++++++++ npc/020-7-2/connor.txt | 9 +++++++++ npc/020-7-2/parcival.txt | 9 +++++++++ 6 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 npc/020-7-2/_mobs.txt create mode 100644 npc/020-7-2/connor.txt create mode 100644 npc/020-7-2/parcival.txt diff --git a/db/constants.conf b/db/constants.conf index 1f4acffcb..de9185d17 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4331,6 +4331,7 @@ constants_db: { BS_SNEST6: 32 BS_SNEST7: 64 BS_SNEST8: 128 + BS_SNESTALL: 255 comment__: "Being actions" ACTION_STAND: 0 diff --git a/npc/020-7-1/janitors.txt b/npc/020-7-1/janitors.txt index 617028cd0..8b2583480 100644 --- a/npc/020-7-1/janitors.txt +++ b/npc/020-7-1/janitors.txt @@ -24,11 +24,11 @@ function askQuestion { .@q2=getq2(NivalisQuest_BlueSage); .@q3=getq3(NivalisQuest_BlueSage); .@qs=BSQuestion(getq(NivalisQuest_BlueSage)); - .@qt=getq3(NivalisQuest_BlueSage); + .@qt=getq2(NivalisQuest_BlueSageSlimes); next; mes ""; select - rif(.@qt < 255, "What are you doing?"), + rif(.@qt < BS_SNESTALL, "What are you doing?"), rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")), rif(.@qs & BS_QHELPER, l("What's your opinion of Peetu and his work?")), any(l("I need to leave."), l("See you."), l("Bye.")); @@ -56,6 +56,17 @@ function askQuestion { close; } +OnSlimeDeath: + if (playerattached()) { + getmapxy(.@m$, .@x, .@y, 0); + // Capped at ~10% drop chance of book pages + if (rand(0,10000) <= 360+(readparam(bLuck)*7)) + makeitem SpellBookPage, 1, .@m$, .@x, .@y; + if (rand(0,10000) <= 100) + makeitem Candy, 1, .@m$, .@x, .@y; + } + end; + OnInit: .bsId=BS_NPC06; .sex=G_MALE; @@ -130,7 +141,7 @@ function askQuestion { } mes ""; select - rif(.@qt < 255, ""), + rif(.@qt < BS_SNESTALL, ""), rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")), rif(.@qs & BS_QHELPER, l("What's your opinion of Peetu and his work?")), any(l("I need to leave."), l("See you."), l("Bye.")); @@ -234,7 +245,7 @@ function askQuestion { next; mes ""; select - rif(.@qt < 255, ""), + rif(.@qt < BS_SNESTALL, ""), rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")), rif(.@qs & BS_QHELPER, l("What's your opinion of Peetu and his work?")), any(l("I need to leave."), l("See you."), l("Bye.")); @@ -334,7 +345,7 @@ function askQuestion { } mes ""; select - rif(.@qt < 255, ""), + rif(.@qt < BS_SNESTALL, ""), rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")), rif(.@qs & BS_QHELPER, l("What's your opinion of Peetu and his work?")), any(l("I need to leave."), l("See you."), l("Bye.")); diff --git a/npc/020-7-2/_import.txt b/npc/020-7-2/_import.txt index db78130d1..6d305d4eb 100644 --- a/npc/020-7-2/_import.txt +++ b/npc/020-7-2/_import.txt @@ -1,3 +1,6 @@ // Map 020-7-2: Ice cave // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/020-7-2/_mobs.txt", "npc/020-7-2/_warps.txt", +"npc/020-7-2/connor.txt", +"npc/020-7-2/parcival.txt", diff --git a/npc/020-7-2/_mobs.txt b/npc/020-7-2/_mobs.txt new file mode 100644 index 000000000..a522ab6f5 --- /dev/null +++ b/npc/020-7-2/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 020-7-2: Ice cave mobs +020-7-2,57,92,40,26 monster Blue Slime 1087,30,35000,450000,Pyry::OnSlimeDeath +020-7-2,60,88,40,26 monster White Slime 1094,15,45000,450000,Pyry::OnSlimeDeath +020-7-2,56,97,38,26 monster Black Slime 1178,50,35000,450000 +020-7-2,36,68,18,55 monster Santa Slime 1096,9,35000,450000 +020-7-2,66,74,29,55 monster Cave Bat 1039,16,35000,450000 +020-7-2,52,34,40,26 monster Azul Slime 1095,7,35000,450000 diff --git a/npc/020-7-2/connor.txt b/npc/020-7-2/connor.txt new file mode 100644 index 000000000..536d2b3cb --- /dev/null +++ b/npc/020-7-2/connor.txt @@ -0,0 +1,9 @@ +// TMW2 scripts. +// Authors: +// Jesusalva +// TMW LoF (Paxel) +// Description: +// Makes Raw Coal to fool the Blue Sage + + + diff --git a/npc/020-7-2/parcival.txt b/npc/020-7-2/parcival.txt new file mode 100644 index 000000000..92aae41ef --- /dev/null +++ b/npc/020-7-2/parcival.txt @@ -0,0 +1,9 @@ +// TMW2 scripts. +// Authors: +// Jesusalva +// TMW LoF (Paxel) +// Description: +// Informs about the Slime Cage + + + -- cgit v1.2.3-70-g09d2