summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2023-08-21 22:55:26 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2023-08-21 22:55:26 +0000
commit373968b169863fd26826b9cab9da0acb8159db5a (patch)
treebff68b1f1e61e27b90847a4c2a93ccecf8afe3b3
parentd99010422f9ab7244b1966d82eaada5b2b62c721 (diff)
parent4b5a2062dc67fd613c6be8f72730b75a0d24db5f (diff)
downloadserverdata-master.tar.gz
serverdata-master.tar.bz2
serverdata-master.tar.xz
serverdata-master.zip
Merge branch 'fix_fortress_barrel_inv_space_test' into 'master'HEADmaster
Fix fortress rum barrel inventory space test (and add more redundant paranthesis, hehe) See merge request ml/serverdata!119
-rw-r--r--npc/025-1/rum.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/npc/025-1/rum.txt b/npc/025-1/rum.txt
index 68a6e1676..f7fd22514 100644
--- a/npc/025-1/rum.txt
+++ b/npc/025-1/rum.txt
@@ -142,7 +142,8 @@ L_Main:
mesn;
mesc l("Your request for @@ @@ are being fermented for @@.", FORTRESS_AMMO, getitemlink(CrazyRum), FuzzyTime(FORTRESS_DATE));
next;
- inventoryplace CrazyRum, FORTRESS_AMMO;
+ inventoryplace CrazyRum, (FORTRESS_AMMO * .cupammo);
+ inventoryplace WhiskeyAle, (FORTRESS_AMMO * .cupammo);
mesn;
mes l("Trying to retrieve it now will have @@ % chance to be successful.", rumbarrel_chance()/100);
mes l("Attempt to retrieve it now?");
@@ -151,9 +152,9 @@ L_Main:
if (rand(1000,10000) < rumbarrel_chance()) {
mesc l("Success!"), 3;
if (REBIRTH > rand2(20))
- getitem WhiskeyAle, FORTRESS_AMMO*.cupammo;
+ getitem WhiskeyAle, (FORTRESS_AMMO*.cupammo);
else
- getitem CrazyRum, FORTRESS_AMMO*.cupammo;
+ getitem CrazyRum, (FORTRESS_AMMO*.cupammo);
} else {
mesc l("The %s wasn't ready yet and you lost it...", l("Rum")), 1;
}