diff options
| author | Freeyorp <Freeyorp101@hotmail.com> | 2010-04-14 16:16:35 +1200 |
|---|---|---|
| committer | Freeyorp <Freeyorp101@hotmail.com> | 2010-05-24 23:33:30 +1200 |
| commit | 33a09da4867c32a5c1bc2e0a497c37921eaba133 (patch) | |
| tree | 01689d570bacd7bf3e06d63149fde7e8d8db4ec1 /npc | |
| parent | 70de5e23d0be6af225a617b30414ca23aa7e70db (diff) | |
| download | serverdata-33a09da4867c32a5c1bc2e0a497c37921eaba133.tar.gz serverdata-33a09da4867c32a5c1bc2e0a497c37921eaba133.tar.bz2 serverdata-33a09da4867c32a5c1bc2e0a497c37921eaba133.tar.xz serverdata-33a09da4867c32a5c1bc2e0a497c37921eaba133.zip | |
Some more minor fixes
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/028-1/Doctor4.txt | 8 | ||||
| -rwxr-xr-x | npc/028-1/_mobs.txt | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/npc/028-1/Doctor4.txt b/npc/028-1/Doctor4.txt index 9402dff8..dcbe7481 100644 --- a/npc/028-1/Doctor4.txt +++ b/npc/028-1/Doctor4.txt @@ -236,12 +236,12 @@ L_lens_loop_auto_post_warp_hair: if (@effects > @crystalEnergy) goto L_lens_autofix_texture; L_lens_loop_auto_post_fix_texture: set @temp, 0; - if (!(@effects > 80 && rand(@dilution) && !(@effects & 1))) set @temp, 1; + if (!(@effects < 65 && rand(@dilution) < 2 && (@effects & 7))) set @temp, 1; if (@temp == 1) set @retloc, 2; if (@temp == 1) goto L_lens_drydamage; L_lens_loop_auto_post_drydamage: set @temp, 0; - if (@effects + @crystalEnergy / 3 > 120 && (!(@pcmod & 1) || @pcmod & 2)) set @temp, 1; + if ((@effects + @crystalEnergy / 3 > 85 || (@textureID == 0 && rand(@effects + @crystalEnergy) > 30)) && (!(@pcmod & 1) || @pcmod & 2)) set @temp, 1; if (@temp == 1) set @retloc, 3; if (@temp == 1) goto L_lens_directdamage; set @temp, 0; @@ -264,7 +264,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 + 2) / (@dilution + 2) > 4) goto L_lens_dry_destroyed; + if (@textureID == 0 && (@rounds + 36) / (@dilution + 5) > 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; @@ -302,7 +302,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 + 2) / (@dilution + 2)) > 0) set @tintID, @tintID & ~1; // Remove red + if (rand(3 * (@rounds + 6) / (@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; diff --git a/npc/028-1/_mobs.txt b/npc/028-1/_mobs.txt index 45a97279..acab9cd6 100755 --- a/npc/028-1/_mobs.txt +++ b/npc/028-1/_mobs.txt @@ -5,8 +5,8 @@ 028-1.gat,93,33,48,32 monster Wisp 1040,8,200000,15000,Mob028-1::On1040 028-1.gat,93,33,46,34 monster Spectre 1042,8,200000,15000,Mob028-1::On1042 028-1.gat,93,33,44,36 monster Poltergeist 1047,8,200000,15000,Mob028-1::On1047 -028-1.gat,35,64,38,9 monster Sea Slime 1017,18,100000,1200,Mob028-1::On1017 -028-1.gat,45,75,22,10 monster Sea Slime 1017,18,100000,1200,Mob028-1::On1017 +028-1.gat,35,64,38,9 monster Sea Slime 1033,18,100000,1200,Mob028-1::On1033 +028-1.gat,45,75,22,10 monster Sea Slime 1033,18,100000,1200,Mob028-1::On1033 028-1.gat,23,101,1,1 monster squirrel 1038,1,300000,50000,Mob028-1::On1038 028-1.gat,68,95,71,18 monster Wisp 1040,8,200000,15000,Mob028-1::On1040 028-1.gat,76,100,93,16 monster Spectre 1042,8,200000,15000,Mob028-1::On1042 @@ -25,6 +25,11 @@ On1019: callfunc "MobPoints"; break; +On1033: + set @mobID, 1033; + callfunc "MobPoints"; + break; + On1038: set @mobID, 1038; callfunc "MobPoints"; |