summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorNo Name <remoit(DOT)nane(AT)gmail(DOT)com>2010-04-11 16:23:55 -0700
committerFreeyorp <Freeyorp101@hotmail.com>2010-05-24 23:33:30 +1200
commitca3bbfd557874c140c78aacc2100e87d4e02b9d7 (patch)
tree318a987172c44ef44f03450e0083ad5d4b84d1f8 /npc
parent4bb5ed221061f5b8902357d77ace97ce0bcafeaf (diff)
downloadserverdata-ca3bbfd557874c140c78aacc2100e87d4e02b9d7.tar.gz
serverdata-ca3bbfd557874c140c78aacc2100e87d4e02b9d7.tar.bz2
serverdata-ca3bbfd557874c140c78aacc2100e87d4e02b9d7.tar.xz
serverdata-ca3bbfd557874c140c78aacc2100e87d4e02b9d7.zip
More fixes for the Doctor that were lost.
Diffstat (limited to 'npc')
-rw-r--r--npc/028-1/Doctor3.txt1
-rw-r--r--npc/028-1/Doctor4.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/npc/028-1/Doctor3.txt b/npc/028-1/Doctor3.txt
index 2a0def64..e0ee86bd 100644
--- a/npc/028-1/Doctor3.txt
+++ b/npc/028-1/Doctor3.txt
@@ -153,6 +153,7 @@ L_stones_crystal:
set @menuid[@c], E10_STONES_RAGS;
set @c, @c +1;
+L_stones_rags:
if (countitem("DarkPetal") < 1) goto L_stones_petal;
set @menuitems$[@c], "A Dark Petal?";
set @menuid[@c], E10_STONES_PETAL;
diff --git a/npc/028-1/Doctor4.txt b/npc/028-1/Doctor4.txt
index 9384e734..4b63e128 100644
--- a/npc/028-1/Doctor4.txt
+++ b/npc/028-1/Doctor4.txt
@@ -263,7 +263,7 @@ L_lens_loop_check:
// Check to whether you finished here
if ((@textureID == 3 || @textureID == 2) && @tintID == 0 && @opacityID == 0 && @rounds < 3) goto L_lens_early;
if ((@textureID == 3 || @textureID == 2) && @tintID == 0 && @opacityID == 0) goto L_lens_complete;
- if (@textureID == 0 && @rounds / @dilution > 4) goto L_lens_dry_destroyed;
+ if (@textureID == 0 && (@rounds + 2) / (@dilution + 2) > 4) goto L_lens_dry_destroyed;
if ((@damage > 3 && @crystalEnergy > 80) || (@damage > 2 && @crystalEnergy > 80 && @textureID == 0)) goto L_lens_violently_destroyed;
next;
goto L_lens_loop_main;
@@ -301,7 +301,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;