diff options
author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/cities/niflheim.txt | |
parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/cities/niflheim.txt')
-rw-r--r-- | npc/cities/niflheim.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 4e6ba1f97..0bfa9a088 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -232,17 +232,20 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{ mes "lost to the ages~!"; emotion e_gg; next; - if (select("Clover:Klaatu:Klaytos") == 2) - set .@spell,.@spell+1; - if (select("Verit:Veritas:Verata") == 3) - set .@spell,.@spell+1; - if (select("Necktie:Necklace:Nero:^FFFFFFNictu!!!^000000") == 4) - set .@spell,.@spell+1; + if (select("Clover:Klaatu:Klaytos") == 2) { + ++.@spell; + } + if (select("Verit:Veritas:Verata") == 3) { + ++.@spell; + } + if (select("Necktie:Necklace:Nero:^FFFFFFNictu!!!^000000") == 4) { + ++.@spell; + } if (.@spell == 3) { switch(rand(1,5)) { case 1: if (morison_meat < 15) { - set morrison_meat,15; + morrison_meat = 15; mes "[Ashe Bruce]"; mes "You... You broke the curse!"; mes "How did you know that spell?!"; @@ -262,7 +265,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{ close; case 2: if (thai_head == 1) { - set thai_head,2; + thai_head = 2; mes "[Ashe Bruce]"; mes "What's..."; mes "this feeling?"; @@ -285,7 +288,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{ close; case 3: if (thai_head == 8) { - set thai_head,7; + thai_head = 7; mes "[Ashe Bruce]"; mes "You... You broke the curse!"; mes "Who taught you that spell?!"; |