summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreeyorp <Freeyorp101@hotmail.com>2010-04-11 20:04:59 +1200
committerFreeyorp <Freeyorp101@hotmail.com>2010-05-24 23:33:30 +1200
commita2aed404767a3a7f0563f22340f4f501d16aa97f (patch)
tree08233befa83849630d87598a4170e9f551a6b65c
parent01dc57b12f8af4880ce57063bdaaf28d02269543 (diff)
downloadserverdata-a2aed404767a3a7f0563f22340f4f501d16aa97f.tar.gz
serverdata-a2aed404767a3a7f0563f22340f4f501d16aa97f.tar.bz2
serverdata-a2aed404767a3a7f0563f22340f4f501d16aa97f.tar.xz
serverdata-a2aed404767a3a7f0563f22340f4f501d16aa97f.zip
More fixes
-rw-r--r--conf/magic.conf.template2
-rw-r--r--npc/028-1/Doctor.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index 1e63c5f2..43e93573 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -1473,7 +1473,7 @@ NONMAGIC SILENT SPELL easter-invader-jump (t : STRING) : "#j" =
(REQUIRE name_of(caster) == "Xakelbael the Dark") =>
EFFECT IF not (status_option(caster, 4096)) THEN ( sfx(caster, 33, 0);
WAIT 200; );
- IF (t == "r") THEN ( warp(caster, @("028-1.gat", 139, 46)); )
+ IF (t == "r") THEN ( warp(caster, @("028-1.gat", 129, 46)); )
ELSE IF (t == "s") THEN ( warp(caster, @("028-1.gat", 69, 96)); )
ELSE IF (t == "c") THEN ( warp(caster, @("028-3.gat", 50, 58)); )
ELSE IF (t == "t") THEN ( warp(caster, @("009-1.gat", 48, 35)); )
diff --git a/npc/028-1/Doctor.txt b/npc/028-1/Doctor.txt
index c00a319a..0260043f 100644
--- a/npc/028-1/Doctor.txt
+++ b/npc/028-1/Doctor.txt
@@ -1596,7 +1596,7 @@ L_lens_pc_use_pearl:
delitem "Pearl", 1;
mes "You pass the pearl to the Doctor, who awkwardly takes it with one hand, grinds it into powder with another device, all the while keeping the container firmly in place. After he finishes, you sprinkle the powder evenly over the concoction.";
if (@textureID > 1) set @textureID, @textureID - 1;
- if (rand(3 * @rounds / @dilution) > 0) set @tintID, @tintID & ~1; // Remove red
+ if (rand(3 * (@rounds + 2) / (@dilution + 2)) > 0) set @tintID, @tintID & ~1; // Remove red
if (rand(2) > 0) set @tintID, @tintID & ~2; // Remove blue
if (rand(3) > 0) set @tintID, @tintID & ~4; // Remove yellow
if (rand(@opacityID) == 0) set @opacityID, @opacityID + 1;