summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-12 13:02:55 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-12 13:02:55 +0000
commit9f05a741e4f978555a3daf4be540e1a2a6a77ce5 (patch)
tree610327694ae84e674e3857311d38cba0ba992aca /npc
parent5d4b770112aa26107059a5a03a2ddea04fc7676e (diff)
downloadhercules-9f05a741e4f978555a3daf4be540e1a2a6a77ce5.tar.gz
hercules-9f05a741e4f978555a3daf4be540e1a2a6a77ce5.tar.bz2
hercules-9f05a741e4f978555a3daf4be540e1a2a6a77ce5.tar.xz
hercules-9f05a741e4f978555a3daf4be540e1a2a6a77ce5.zip
- Fixed a divide-by-zero error in airships.txt (bugreport:651)
- Fixed a typo in Crusader jobchange quiz. (bugreport:443) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15074 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/airports/airships.txt2
-rw-r--r--npc/jobs/2-2/crusader.txt20
2 files changed, 11 insertions, 11 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 44b7ac115..856a4fc3f 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -870,7 +870,7 @@ s_Play:
next;
if(.@comparisonvar$[1] != .@typingstring1$ || .@comparisonvar$[2] != .@typingstring2$) goto s_Fail;
set .@time, (gettimetick(0) - .@start) / 100; //seconds taken
- set .@mypoints, (.@typingkeys * 100) / .@time;
+ if (.@time) set .@mypoints, (.@typingkeys * 100) / .@time;
mes "[Nils]";
mes "Your typing time";
mes "was ^FF0000" + .@time + " seconds^000000";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index e7c32988e..99a5ccb0b 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -6,24 +6,24 @@
//===== Current Version: =====================================
//= 3.3
//===== Compatible With: =====================================
-//= eAthena SVN
+//= eAthena SVN
//===== Description: =========================================
//= [Aegis Conversion]
//= Job quest for Crusader classes
//===== Additional Comments: =================================
//= 2.2 Updated All NPCs to the officials one [Samuray22]
-//= -Based on the ASB 4.0 Package.
-//= -Maybe need be checked the monsters in the test 2 and 4.
+//= -Based on the ASB 4.0 Package.
+//=-Maybe need be checked the monsters in the test 2 and 4.
//= 2.3 Fixed some bugs that prevented from going further. [SinSloth]
//= 2.4 Updated NPC dialogs using Aegis 10.3 files. [L0ne_W0lf]
-//= - Fixed logic error with job change reward for job 50 swordies.
-//= - Completely redid the 1st and third tests.
-//= - Optimized first four NPC scripts slightly.
-//= - Temporary character variables "@" are now ".@"
-//= - Fixed some indentation.
+//= - Fixed logic error with job change reward for job 50 swordies.
+//= - Completely redid the 1st and third tests.
+//= - Optimized first four NPC scripts slightly.
+//= - Temporary character variables "@" are now ".@"
+//= - Fixed some indentation.
//= 2.5 Fixed some spelling and grammar in crusader quest. [L0ne_W0lf]
//= 2.6 Fixed bug (about totally blocked baby class), optimized,
-//= made some NPC more unique names: Monster Summon#cr1 [Lupus]
+//= made some NPC more unique names: Monster Summon#cr1 [Lupus]
//= 2.7 Fixed Some variables like ".@item", and changed to "@item". [Samuray22]
//= 2.8 Fixed a little minor bug. [Samuray22]
//= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf]
@@ -537,7 +537,7 @@ prt_church,95,127,3 script Crusader 745,{
mes "[Gabriel Valentine]";
mes "2. If the monster is a Level 2 Undead, how much more damage does a Holy attack do compared to Fire?";
next;
- if (select("25 %:50 %:75 %:100 %") == 2)
+ if (select("25 %:50 %:75 %:100 %") == 1)
set .@cru_t,.@cru_t+10;
mes "[Gabriel Valentine]";