summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-02-18 16:31:07 -0300
committerJesusaves <cpntb1@ymail.com>2021-02-18 16:31:07 -0300
commita58e959809c836afe9e95316fe15714b4fd757d2 (patch)
tree0320ab9d9ee1fb410271eeba8618cf59f4def48b
parentf6ee091f2f0f3e9f1eb5befa4188987a06a3ebf6 (diff)
downloadserverdata-a58e959809c836afe9e95316fe15714b4fd757d2.tar.gz
serverdata-a58e959809c836afe9e95316fe15714b4fd757d2.tar.bz2
serverdata-a58e959809c836afe9e95316fe15714b4fd757d2.tar.xz
serverdata-a58e959809c836afe9e95316fe15714b4fd757d2.zip
Tweak test and bugfix
-rw-r--r--db/re/item_db.conf5
-rw-r--r--db/re/pet_db.conf2
-rw-r--r--npc/025-2-4/tree.txt9
3 files changed, 11 insertions, 5 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 9f5d2127e..82bc793cf 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -12667,6 +12667,7 @@ item_db: (
}
Script: <"
bonus bFlee2,20;
+ bonus bFlee,20;
bonus bSpeedAddRate,-50;
bonus bCriticalDef,100;
bonus bSPrecovRate,100;
@@ -12677,7 +12678,7 @@ item_db: (
// However, it comes at an expensive price.
bonus bDef,BaseLevel*9/10;
bonus bDef2,BaseLevel/5;
- bonus bMaxHP, JobLevel*7; // Why not, if you're the ultimate tanker?
+ bonus bMaxHP, JobLevel*9; // Why not, if you're the ultimate tanker?
bonus bAtkRate,-100;
bonus bMatkRate,-100;
bonus bRestartFullRecover,1;
@@ -16445,7 +16446,7 @@ item_db: (
Delay: 2500
Script: <"
// Reset homunculus stats
- homshuffle();
+ homshuffle(); // FIXME
dispbottom l("Homunculus stats were reset!");
">
},
diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf
index f430cc8a9..f1945e282 100644
--- a/db/re/pet_db.conf
+++ b/db/re/pet_db.conf
@@ -392,7 +392,7 @@ pet_db:(
FoodEffectiveness: 70
HungerDelay: 100
Intimacy: {
- Initial: 60
+ Initial: 100
FeedIncrement: 100
OverFeedDecrement: 10
OwnerDeathDecrement: 10
diff --git a/npc/025-2-4/tree.txt b/npc/025-2-4/tree.txt
index 3a3f22173..08dc03f1c 100644
--- a/npc/025-2-4/tree.txt
+++ b/npc/025-2-4/tree.txt
@@ -14,23 +14,24 @@
next;
mesc l("This might be the place of a great secret, but yet, all you can do is stare.");
next;
- if (!true) manatreeOff(); // TODO: Official rumors about the Mana Tree
+ if (getq(FortressQuest_ManaTree) < 2) manatreeOff();
else if ($AEGIS_HOLDER$ == "" && @manacool < gettimetick(2)) manatreeAegis();
else manatreeAgain();
- next;
setpcblock(PCBLOCK_HARD, false);
closeclientdialog;
close;
function manatreeOff {
mesc l("...for now.");
+ next;
return;
}
function manatreeAgain {
mesc l("...for now.");
// TODO: getitem Manapple, 1; // Maybe can obtain one daily/weekly?
+ next;
return;
}
@@ -43,6 +44,10 @@ function manatreeAegis {
percentheal -20, -50;
return;
}
+ if (.@prayer$ == "") {
+ mesc l("...Alright then.");
+ return;
+ }
@manacool=gettimetick(2)+30;
.@cid=getcharid(3, .@prayer$);
if (.@cid < 1) {