diff options
Diffstat (limited to 'npc/re/jobs')
26 files changed, 1595 insertions, 556 deletions
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index dae96908b..70de529d2 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index a7ef0ef10..19dc2bbf4 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index 29593163b..c0571635f 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 2682e545d..b68a00c61 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index 8dbadbd9d..f0d62365c 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index 393b9a13c..bb68dd5f4 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1e/taekwon.txt b/npc/re/jobs/1-1e/taekwon.txt index 1befa3b73..d07face21 100644 --- a/npc/re/jobs/1-1e/taekwon.txt +++ b/npc/re/jobs/1-1e/taekwon.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 5c54a0114..832876c61 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy -//= Copyright (C) M45T3R -//= Copyright (C) Dastgir +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy +//= Copyright (C) M45T3R +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -120,7 +120,7 @@ que_ng,21,76,0 script Wall with a Drawing#ko CLEAR_NPC,{ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ if (MaxWeight - Weight < 1000 || checkweight("Knife",1) == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You don't need to carry so many things."; close; } @@ -128,8 +128,8 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ for (set .@i,5131; .@i<=5146; set .@i,.@i+1) if (questprogress(.@i)) erasequest .@i; set job_kagero,0; - mes "[Cougar]"; - mes "You are not in the Family of the Ninja."; + mes "[Kuuga Gai]"; + mes "You are not in the clan of the Ninja."; close2; warp "amatsu",147,136; end; @@ -156,28 +156,28 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "^1A95E6He keeps talking and doesn't stop to answer your question.^1A95E6"; next; mes "[Old Man]"; - mes "There once was a quiet family living in ancient Amatsu times that is never mentioned in history books or stories."; + mes "There once was a quiet clan living in ancient Amatsu times that is never mentioned in history books or stories."; next; mes "[Old Man]"; mes "They lived beneath shadows but always yearned for the bright sun, like a sunflower."; next; mes "[Old Man]"; - mes "A family that was loyal to their lord who they served as their bright sun."; + mes "A clan that was loyal to their lord who they served as their bright sun."; next; mes "[Old Man]"; - mes "...a very trustworthy family..."; + mes "...a very trustworthy clan..."; next; mes "[Old Man]"; mes "....loyal to their core..."; next; mes "[Old Man]"; - mes "...a family of integrity..."; + mes "...a clan of integrity..."; next; select("What happened to them?"); mes "^1A95E6The old man looks at you with a melancholy face.^1A95E6"; next; mes "[Old Man]"; - mes "Why are you interested in a family that was abandoned by their lord and disappeared from history itself?"; + mes "Why are you interested in a clan that was abandoned by their lord and disappeared from history itself?"; next; if(select("I'm a Ninja.", "I'm bored.") == 2) { mes "[Old Man]"; @@ -188,13 +188,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } cutin "job_ko02",2; mes "[Old Man]"; - mes "Ninja! There was a time when the family was called ninjas, too."; + mes "Ninja! There was a time when the clan was called ninjas, too."; next; erasequest 5131; setquest 5132; set job_kagero,2; mes "[Old Man]"; - mes "You'll have to lend me your ear for I have so much to tell you about the family story."; + mes "You'll have to lend me your ear for I have so much to tell you about the clan story."; close2; cutin "",255; end; @@ -206,13 +206,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "This goes way back to ancient times and nobody in Amatsu remembers about it."; next; mes "[Old Man]"; - mes "The family worked behind the scenes and basically lived their lives for their lord."; + mes "The clan worked behind the scenes and basically lived their lives for their lord."; next; mes "[Old Man]"; mes "They were very loyal doing whatever deed their lord asked for."; next; mes "[Old Man]"; - mes "Ninja, the family was known as the dark family but that doesn't mean they wanted to be hidden in the darkness."; + mes "Ninja, the clan was known as the dark clan but that doesn't mean they wanted to be hidden in the darkness."; next; mes "[Old Man]"; mes "They were loyal enough to be satisfied as the lord's servants but their loyalty became the problem."; @@ -222,13 +222,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "They are a secret organization that even the lord didn't know much about."; next; mes "[Old Man]"; - mes "The few that knew about the family's existence, tried to investigate them but nobody was able to reveal their true identity."; + mes "The few that knew about the clan's existence, tried to investigate them but nobody was able to reveal their true identity."; next; mes "[Old Man]"; - mes "That is why this family has grown from loyal servants to a group feared for its secrets."; + mes "That is why this clan has grown from loyal servants to a group feared for its secrets."; next; mes "[Old Man]"; - mes "The lord shunned the family and didn't call them for their service any more but they never betrayed him."; + mes "The lord shunned the clan and didn't call them for their service any more but they never betrayed him."; next; select("They were really loyal people."); cutin "job_ko03",2; @@ -245,20 +245,20 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } else if (job_kagero == 3) { cutin "job_ko03",2; mes "[Old Man]"; - mes "The family has been living in hiding for so long since the old days. The current lord didn't even know of their existence."; + mes "The clan has been living in hiding for so long since the old days. The current lord didn't even know of their existence."; next; select("........."); cutin "job_ko01",2; mes "[Old Man]"; - mes "I'm Guide Gion, the last of the dark ninja family."; + mes "I'm Leader Gion, the last of the dark ninja clan."; next; if(select("I think your time has ended.", "I need your teaching.") == 1) { cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Are you an assassin to end this old man's life?"; next; - mes "[Guide Gion]"; - mes "So that is why you've shown interest in my family. I won't give up easily."; + mes "[Leader Gion]"; + mes "So that is why you've shown interest in my clan. I won't give up easily."; next; percentheal -99,0; mes "Pow!!"; @@ -268,50 +268,50 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ end; } cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Teaching..."; mes "Been a long time since I last heard that word."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I guess this little visit was not by coincidence but a start of a connection."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Sorry I am not a teacher. But!"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I can help you on the path you've chosen, the ^33CC71"+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^000000 path."; next; - mes "^1A95E6You hear Guide Gion's voice faintly as you slip away.^1A95E6"; + mes "^1A95E6You hear Leader Gion's voice faintly as you slip away.^1A95E6"; next; erasequest 5133; setquest 5134; set job_kagero,4; - mes "[Guide Gion]"; - mes "If you are prepared to follow me, Guide Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; + mes "[Leader Gion]"; + mes "If you are prepared to follow me, Leader Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; close2; warp "amatsu",147,136; end; } else if (job_kagero == 4) { cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I thought you were afraid of the ^33CC71path of the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^33CC71 and wouldn't come back."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But from the look of your eyes, I guess I misjudged you."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will have to train your mind and body to walk steadily in the unknown world and never fall into temptation to stay on the path."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Our ancestors had 4 tests to train our people."; next; select("4 tests?"); cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Yes, there are 4 tests."; mes "My ancestors trained my people with 4 tests that involve ^087FF8knowledge^000000, ^087FF8survival^000000, ^087FF8weapons^000000, and ^087FF8battle^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I know you are curious what these tests are. Let me explain one by one."; next; while(1) { @@ -319,75 +319,75 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@test, .@test | (1<<(.@i-1)); switch (.@i) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "We need to be knowledgeable in order to assist the lord. This test is for this purpose."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You can pass the test if you successfully solve more than 9 out of 10 questions."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The test will be easy to pass if you've been steady in your studies. Now what other test are you curious about?"; next; } break; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Missions aren't always easy and safe. That is why survival instincts are vital to us."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My ancestors call this test the dice test. It is a test to advance forward depending on the dice results."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Think of it as the simple dice games people play."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But never let your guard down during the test because it isn't called the survival test for nothing."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There will be blocks that help you while there are blocks that will interrupt you."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "If you deal with various situations wisely, you will be able to pass the test. Now what other test are you curious about?"; next; } break; case 3: - mes "[Guide Gion]"; - mes "My family was famous for using unique weapons that we created."; + mes "[Leader Gion]"; + mes "My clan was famous for using unique weapons that we created."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You would be considered blessed if you created your own unique weapon."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Creating a weapon for yourself and refining it is the purpose of this test."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope you will be blessed and find the best weapon for yourself. Now what other test are you curious about?"; next; } break; case 4: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Missions are not always done alone. You will often work in teams of 2 or 3 for a common goal."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The battle test is only for those that pass that knowledge, survival and weapon tests. So! It is the very last test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Unlike the other three tests that are done alone, you will have to compete with others in this final test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There is only one target!!"; mes "And only the first to get to the target passes the test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You'll be lucky if you have no competitors during your test."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "A challenge is better than explaining it a hundred times. It's the actual experience that makes you better."; next; } @@ -396,13 +396,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ if (.@test == 15) break; } cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Seeing is believing, so go on and take the challenge."; next; erasequest 5134; setquest 5135; set job_kagero,5; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Let's start right away after you are done with preparations."; close2; cutin "",255; @@ -414,110 +414,110 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@ko_test, .@ko_test_01 + .@ko_test_02 + .@ko_test_03; if (.@ko_test == 0) { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It's been a while."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Since I felt happy like this. I feel young and energetic seeing young people like you challenge themselves with a new path."; next; - mes "[Guide Gion]"; - mes "We're done with explaining about the tests, now should I tell you my family story?"; + mes "[Leader Gion]"; + mes "We're done with explaining about the tests, now should I tell you my clan story?"; next; cutin "job_ko01",2; - mes "[Guide Gion]"; - mes "My family started from two warriors."; + mes "[Leader Gion]"; + mes "My clan started from two warriors."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Sun and the Moon."; mes "The sunlight that lights up the world and the moonlight that lights up the night. Both were very similar but different warriors."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There was a time there was an enmity between both warriors."; next; - mes "[Guide Gion]"; - mes "But it didn't take long for them to become one as a family."; + mes "[Leader Gion]"; + mes "But it didn't take long for them to become one as a clan."; next; select("How did it go afterwards?"); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. It is never fun to listen to the whole story all at once, no? Come back after passing a test and I'll continue my story."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Which test will you select as your first test?"; next; callsub L_StartTest,select("Test of Knowledge", "Test of Survival", "Test of Weaponry"),1; end; } else if (.@ko_test == 2) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; if (.@ko_test_01 == 2) { set .@menu$,":Test of Survival:Test of Weaponry"; mes "You've passed the Test of Knowledge."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My friend doesn't approve of others that easily but I guess he liked you."; next; } else if (.@ko_test_02 == 2) { set .@menu$,"Test of Knowledge::Test of Weaponry"; mes "You've passed the Test of Survival."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you went through hell with this test."; next; } else if (.@ko_test_03 == 2) { set .@menu$,"Test of Knowledge:Test of Survival:"; mes "You've passed the Test of Weaponry."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I wonder if Joe is satisfied with your performance."; next; } - select("Please continue with the family story."); + select("Please continue with the clan story."); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you are pretty eager to hear more. Where did I leave off... Ah! I remember."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Both warriors weren't close at first, because personality and everything else was completely opposite of each other."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The first place they met was the battlefield. And you know how enemies greet each other on a battlefield."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "They ended up injuring each other badly."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But what can you do? War is a war."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The friend you've laughed with yesterday is a foe that you have to fight with in a war today."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "So nobody can get along with anyone during a war."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'll continue the story after you pass another test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Which test will you choose for the second test?"; next; callsub L_StartTest,select(.@menu$),2; end; } else if (.@ko_test == 4) { cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; if (.@ko_test_01 == 2 && .@ko_test_02 == 2) { set .@last_test,3; mes "You've passed the ^339CCCTests of Knowledge and Survival^000000!"; @@ -529,96 +529,96 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "You've passed the ^339CCCTests of Survival and Weaponry^000000!"; } next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You are already done with two tests. Hope you've learned a lot from them."; next; cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Shall we continue with the story?"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I think I left off when the two warriors met at the battlefield as enemies."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The long war ended eventually but the wounds and pain of those that survived had just started."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "So these two warriors started to embrace and heal the war wounds together and became one."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There is a backstory of a man appearing in front of them and winning the loyalty from both warriors."; next; select("Who is this man?"); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There isn't much known about this man. Only a short mentioning of the two warriors pledging their allegiance."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Maybe current generations like me are the ancestors of the current Amatsu lord? But this is only an assumption."; next; - mes "[Guide Gion]"; - mes "I'm almost at the end of my family story. Come back after you've passed the third test and I will tell you the rest."; + mes "[Leader Gion]"; + mes "I'm almost at the end of my clan story. Come back after you've passed the third test and I will tell you the rest."; next; callsub L_StartTest,.@last_test,3; end; } else if (.@ko_test == 6) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You've gone through three tests leaving only one to pass."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "As I've told you before, the last test is different because you have to compete against others."; next; select("Will you continue the story?"); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. I will finish the story."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It is told that the man that earned the loyalty of the two warriors was a humorous person."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "He like the jokes and conversations better than quarrels and he liked women over men."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Hmm... I don't know why this part of the story was kept alive all these years but this man wanted to bring these two warriors together."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Both warriors did travel together after the war but kept an awkward distance from each other."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "They must have had their reasons but their lord would send them out to a difficult mission together, put them in a secret room together and all sorts of situations together."; next; select("Sounds like an odd person."); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Yes, he was. And his efforts didn't go in vain since the two warriors eventually got acquainted and married."; next; - mes "[Guide Gion]"; - mes "This is how the family started."; + mes "[Leader Gion]"; + mes "This is how the clan started."; next; select("What happened after?"); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Sadly, the next part of story was purposely discontinued."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I think it's because someone wanted us to let go of the past and move forward."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "That's that. Now shouldn't you be preparing for the last test?"; next; set job_kagero,6; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But you must be tired from all the tests so far. Take a rest."; close2; cutin "",255; @@ -631,12 +631,12 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@test_ko$, "Survival"; else if (.@ko_test_03 == 1) set .@test_ko$, "Weaponry"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Weren't you taking the Test of " + .@test_ko$ + " just now?"; next; switch(select("I want to go back to test site.", "Ah... no.")) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Test of " + .@test_ko$ + " site is over here."; close2; if (.@ko_test_01 == 1) @@ -647,7 +647,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ warp "job_ko",121,129; end; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The village is over here."; close2; warp "amatsu",147,136; @@ -656,39 +656,39 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } } else if (job_kagero == 6) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You've come back already? You could have rested more. Is there a reason to hurry?"; next; - input .@inputstr$; + input(.@inputstr$); cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Because of ^B24E59" + .@inputstr$ + "^000000?"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I have to admit, I don't understand you now."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But since you've gone through much, I'm sure you will do good with the final test."; next; cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Now! No more small talk. I'll let you know what the target is for the Test of Battle."; next; - mes "[Guide Gion]"; - mes "The target is a monster called the ^FF0000Family Secret^000000."; + mes "[Leader Gion]"; + mes "The target is a monster called the ^FF0000Clan Secret^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will have to be careful because there are many similiar shaped and named monsters in test site."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "And if you are lucky, there will be others targeting the monster."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "May the blessings of '" + (Sex == SEX_MALE ? "Kagerou, dancing sun" : "Oboro, misty moonlight") + "' be with you."; next; setquest 5146; set job_kagero,7; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Then let's go to the battle test field."; close2; switch(rand(3)) { @@ -699,12 +699,12 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ end; } else if (job_kagero == 7 || job_kagero == 8) { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I see you are in the middle of the ^339CCCTest of Battle^000000. Will you go back to the test site?"; next; switch(select("Go back to the test site.", "Visit the village.")) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The test site is over here."; close2; switch(rand(3)) { @@ -714,7 +714,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } end; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The village is over here."; close2; cutin "",255; @@ -722,7 +722,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } } else { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You should not be here. Leave!"; close2; warp "amatsu",147,136; @@ -737,14 +737,14 @@ L_StartTest: case 2: set .@str$,"You are taking the ^339CCCTest of %s^000000 as the second test? "; break; case 3: set .@str$,"Your third test is the ^339CCCTest of %s^000000! "; break; } - mes "[Guide Gion]"; + mes "[Leader Gion]"; switch (getarg(0)) { case 1: mes sprintf(.@str$ + "Then I will get to see a familiar face after so long...","Knowledge"); next; select("Familiar face?"); setquest 5136; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. You'll know when we get there. The Test of Knowledge is taken over here."; close2; warp "job_ko",72,128; @@ -753,7 +753,7 @@ L_StartTest: mes sprintf(.@str$ + "It's a lonesome test that you have to face alone.","Survival"); next; setquest 5137; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But I believe you can handle it. The Test of Survival is taken over here."; close2; warp "job_ko",62,16; @@ -766,7 +766,7 @@ L_StartTest: getitem "Phracon", 1; mes "You receive 5 Iron Ore and 1 Phracon."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will find these useful. The Test of Weaponry is taken over here."; close2; warp "job_ko",121,129; @@ -775,74 +775,74 @@ L_StartTest: } //== Test of Knowledge ===================================== -job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ +job_ko,81,124,4 script Kuuga Gai#ko 4_M_JOB_ASSASSIN,{ if (BaseJob != Job_Ninja) { for (set .@i,5131; .@i<=5146; set .@i,.@i+1) if (questprogress(.@i)) erasequest .@i; set job_kagero,0; - mes "[Cougar]"; - mes "Sorry, your family is not same as ours, is there something wrong?"; + mes "[Kuuga Gai]"; + mes "Sorry, your clan is not same as ours, is there something wrong?"; close2; warp "amatsu",147,136; end; } if (job_kagero == 5) { if (MaxWeight - Weight < 1000 || checkweight("Knife",1) == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "This is a test of knowledge, so why did you bring so many things?"; close; } set .@ko_test_01, questprogress(5136); set .@ko_test_01_1, questprogress(5139); if (.@ko_test_01 == 1 && .@ko_test_01_1 == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "It's been a while."; next; select("Aren't you..."); - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I remember you from before looking for the way of the ninja."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You've grown this strong already?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Ha ha ha-"; mes "A truly determined youth! I like that."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Good! The test you are about to take is the ^339CCCTest of Knowledge^000000."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I hope you haven't been lazy with your studies while focusing on getting stronger?"; next; switch(select("Yes", "No")) { case 1: setquest 5139; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "That's a relief. Let me know when you are ready to start the test."; close; case 2: setquest 5139; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "So you were all talk? Well, let me know when you are ready then."; close; } } else if (.@ko_test_01 == 1 && .@ko_test_01_1 == 1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I'm ready at my end. Are you ready for the test?"; next; if(select("Yes", "No") == 2) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well, what can I do but wait for you."; close; } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "This isn't your first test, is it?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You only need to choose the correct answer to my questions."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Let's start."; next; @@ -862,9 +862,9 @@ job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ deletearray .@n[10],getarraysize(.@n) - .@questions; freeloop(0); - set @job_ko_cougar,0; + set @job_ko_kuuga,0; for (set .@i,1; .@i<=.@questions; set .@i,.@i+1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes (.@i < .@questions)?"Question number "+.@i+":":"Last question:"; switch (.@n[.@i-1]) { case 1: callsub L_Question,"What is the DEX + LUK total for a Job Master?",2,"8:10:12:14"; break; @@ -918,67 +918,67 @@ job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ case 49: callsub L_Question,"Which of the following blacksmiths do not create ninja items?",2,"Khaibara:Aiku:Tetsu:Toshu"; break; case 50: callsub L_Question,"What is the name of the suspicious man you can meet during the Ninja job change quest?",3,"Red Leopard Jack:Black Leopard Jack:Red Leopard Joe:Black Leopard Joe"; break; default: - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "An unknown error has occurred."; mes "Please contact customer service."; close; } } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You're through all 10 questions. Wasn't so bad! The important part starts now."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "... ... ..."; next; - if (@job_ko_cougar < 90) { - mes "[Cougar]"; + if (@job_ko_kuuga < 90) { + mes "[Kuuga Gai]"; mes "You fool!!"; mes "You couldn't even solve these?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Can't believe someone who is taking a new path can be so pathetic."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I'll give you another chance."; mes "You will take the test again with new questions. Better pass it this time."; } else { - mes "[Cougar]"; - mes "Hmm. " + (@job_ko_cougar) + "?"; + mes "[Kuuga Gai]"; + mes "Hmm. " + (@job_ko_kuuga) + "?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well, looks like you weren't lazy with your studies."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "What? Proud of yourself for solving these questions?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You still have a long way to go and this is only a small fraction of it."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well... I'm curious how far your strong will can take you through other tests."; next; completequest 5136; erasequest 5139; - mes "[Cougar]"; - mes "I'll let you go now so go report back to Guide Gion with your results."; + mes "[Kuuga Gai]"; + mes "I'll let you go now so go report back to Leader Gion with your results."; close2; warp "job_ko",16,113; end; } - set @job_ko_cougar,0; + set @job_ko_kuuga,0; close; } else if (.@ko_test_01 == 2 && .@ko_test_01_1 == 0) { - mes "[Cougar]"; - mes "I'll let you go now so go report back to Guide Gion with your results."; + mes "[Kuuga Gai]"; + mes "I'll let you go now so go report back to Leader Gion with your results."; close2; warp "job_ko",16,113; end; } } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "How did you get here?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "It's my duty to get rid of you."; mes "^000099(He's a short, silent man.)^000000"; mes "This will push you back!"; @@ -991,7 +991,7 @@ L_Question: mes getarg(0); next; if(select(getarg(2)) == getarg(1)) - set @job_ko_cougar, @job_ko_cougar + 10; + set @job_ko_kuuga, @job_ko_kuuga + 10; return; } @@ -1934,7 +1934,7 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ if (questprogress(.@i)) erasequest .@i; set job_kagero,0; mes "[Red Leopard Joe]"; - mes "Sorry, your family is not the same as ours, is there something wrong?"; + mes "Sorry, your clan is not the same as ours, is there something wrong?"; close2; warp "amatsu",147,136; end; @@ -1959,17 +1959,17 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ next; select("Long time indeed, Joe."); mes "[Red Leopard Joe]"; - mes "You aren't surprised I'm here. Did you meet ^0237FDCougar^000000 before coming here?"; + mes "You aren't surprised I'm here. Did you meet ^0237FDKuuga Gai^000000 before coming here?"; next; mes "[Red Leopard Joe]"; mes "Don't like it that I'm not the first one you visited but that is not important."; next; mes "[Red Leopard Joe]"; mes "Alright, " + strcharinfo(PC_NAME) + "!"; - mes "Welcome to the workshop where weapons are created for the family."; + mes "Welcome to the workshop where weapons are created for the clan."; next; mes "[Red Leopard Joe]"; - mes "Our family has been creating and using unique weapons to serve our secret missions since ancient times."; + mes "Our clan has been creating and using unique weapons to serve our secret missions since ancient times."; next; select("Really? At Einbroch?"); mes "[Red Leopard Joe]"; @@ -1979,7 +1979,7 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ mes "Yes. Einbroch is known as an industrial city, the city of great blacksmiths create new technology."; next; mes "[Red Leopard Joe]"; - mes "My mission is to analyze their technology and report back to the family."; + mes "My mission is to analyze their technology and report back to the clan."; next; mes "[Red Leopard Joe]"; mes "I spoke more than I intended to."; @@ -2503,44 +2503,44 @@ job_ko,127,121,0 duplicate(Refinement Tools#ko_01) Refinement Tools#ko_02 CLEAR_ //== Test of Battle ======================================== job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ if (MaxWeight - Weight < 2000 || checkweight("Knife",1) == 0) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You don't need so many things now!"; close; } if (job_kagero == 7) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you haven't taken care of the target yet."; next; - mes "[Guide Gion]"; - mes "I'll tell you once more. The target is the ^FF0000Family Secret^000000."; + mes "[Leader Gion]"; + mes "I'll tell you once more. The target is the ^FF0000Clan Secret^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Of course the path will be difficult, so continue searching!"; close2; cutin "",255; end; } else if (job_kagero == 8) { cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you've taken care of the target. Hmm."; next; if (checkmount()) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But please get down from your frog. Otherwise I can't continue!"; close2; cutin "",255; end; } if (BaseLevel < 99 || JobLevel < 70) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "How did you get weaker? Come back once you've regained your previous levels."; close2; cutin "",255; end; } if (SkillPoint != 0) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Please come back after using all your Skill Points."; close2; cutin "",255; @@ -2548,38 +2548,38 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ } mapannounce "job_ko","[Gion] Interrupting the Test of Battle.",bc_map; cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Test of Battle will be put off for a while. Don't worry because this does not have affect to other tests."; next; mapannounce "job_ko","[Gion] My Friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!",bc_map; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!"; next; cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It is pleasant to meet a youth that is walking through a new path."; next; mes "[Someone's Voice]"; mes "Wait for a while, Gion."; next; - donpcevent "Cougar#ko2::OnEnable"; + donpcevent "Kuuga Gai#ko2::OnEnable"; donpcevent "Red Leopard Joe#ko2::OnEnable"; cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'm sorry I almost forgot about you two. Do you have anything to share with " + strcharinfo(PC_NAME) + "?"; next; cutin "",255; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Hmm... Embarrassing... to speak so suddenly..."; next; - mes "[Cougar]"; - mes strcharinfo(PC_NAME) + ", you are now a proud member of our family. Always hold your head high and..."; + mes "[Kuuga Gai]"; + mes strcharinfo(PC_NAME) + ", you are now a proud member of our clan. Always hold your head high and..."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "^777777(Gai's voice fades out.)^000000."; mes "I'm sorry I strangled you when we first met."; next; - donpcevent "Cougar#ko2::OnDisable"; + donpcevent "Kuuga Gai#ko2::OnDisable"; mes "[Red Leopard Joe]"; mes "Puhahaha! Gai is all talk. I know I was know valuable to you than that Gai."; next; @@ -2600,17 +2600,17 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ mes "I named your weapons on my own but I know you'll like the name."; next; mes "[Red Leopard Joe]"; - mes "Guide Gion, please continue."; + mes "Leader Gion, please continue."; next; cutin "job_ko01",2; donpcevent "Red Leopard Joe#ko2::OnDisable"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I don't have much to add because Gai and Joe said it all."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'm just sorry that the environment of all these tests could have been better for our later generation."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You only need to look forward and never turn back."; next; for (set .@i,5131; .@i<=5146; set .@i,.@i+1) @@ -2619,21 +2619,21 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ getnameditem .@item,strcharinfo(PC_NAME); jobchange(Sex == SEX_MALE ? Job_Kagerou : Job_Oboro); donpcevent "Summon Target#ko::OnEnable"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; close2; warp "que_ng",21,71; end; } else if (job_kagero == 9) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; close2; warp "que_ng",21,71; end; } else { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You should not be here. Please leave!"; close2; warp "amatsu",147,136; @@ -2641,16 +2641,16 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ } } -job_ko,151,47,4 script Cougar#ko2 4_M_JOB_ASSASSIN,{ - mes "[Cougar]"; +job_ko,151,47,4 script Kuuga Gai#ko2 4_M_JOB_ASSASSIN,{ + mes "[Kuuga Gai]"; mes "Congratulation for choosing the road of development!"; close; OnInit: OnDisable: - disablenpc "Cougar#ko2"; + disablenpc "Kuuga Gai#ko2"; end; OnEnable: - enablenpc "Cougar#ko2"; + enablenpc "Kuuga Gai#ko2"; end; } @@ -2684,7 +2684,7 @@ OnEnable: case 6: set .@mob,1049; break; case 7: set .@mob,1050; break; } - areamonster "job_ko",120,30,160,70,"Family Secret",.@mob,1,"Summon Target#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan Secret",.@mob,1,"Summon Target#ko::OnMyMobDead"; end; OnDisable: initnpctimer; @@ -2706,25 +2706,25 @@ OnInit: donpcevent "Summon Fake#ko::OnEnable"; end; OnEnable: - areamonster "job_ko",120,30,160,70,"Family's Legacy",1002,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Legacy",1002,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Memory",1002,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Memory",1002,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Memory",1113,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Memory",1113,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Past",1113,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Past",1113,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Mistake",1010,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Mistake",1010,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Memory",1010,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Memory",1010,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Past",1049,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Past",1049,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Mistake",1049,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Mistake",1049,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Memory",1050,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Memory",1050,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Past",1050,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Past",1050,5,"Summon Fake#ko::OnMyMobDead"; end; diff --git a/npc/re/jobs/2e/rebellion.txt b/npc/re/jobs/2e/rebellion.txt new file mode 100644 index 000000000..53beb11f5 --- /dev/null +++ b/npc/re/jobs/2e/rebellion.txt @@ -0,0 +1,1035 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Rebellion Job Quest +//================= Description =========================================== +//= Job change Quest from Gunslinger -> Rebellion +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +job_gun,1,1,1 script Administrator1 CLEAR_NPC,{ + callfunc("F_GM_NPC"); + mes("Please enter the password."); + .@success = callfunc("F_GM_NPC", 1854, 0); + if (.@sucess != 1) + close(); + + mes("[Time Administrator]"); + mes("What time would you like to return?"); + next(); + .@select = select("Cancel", "Test monster spawn", "Start from beginning", "Furnace Zone", "Shooting Zone", "Complete the test"); + if (.@select == 1) { + close(); + } else if (.@select == 2) { + donpcevent("#target::OnStart"); + donpcevent("#nontarget::OnStart"); + close(); + } else if (.@select == 4) { + .@questComplete = 12341; + } else if (.@select == 5) { + .@questComplete = 12342; + } else if (.@select == 6) { + .@questComplete = 12344; + } + for (.@i = 12340; .@i <= 12345; .@i++) { + erasequest(.@i); + if (.@i <= .@questComplete) { + setquest(.@i); + completequest(.@i); + } + } + close(); + +OnInit: + disablenpc(strnpcinfo(NPC_NAME)); + end; +} + +// Warps +job_gun,56,26,0 warp rebelroom#1 2,2,einbroch,49,97 +job_gun,18,10,0 warp rebelroom#2 2,2,job_gun,81,29 +job_gun,165,22,0 warp rebelroom#3 2,2,job_gun,196,35 +job_gun,197,49,0 warp rebelroom#4 2,2,job_gun,157,21 + +job_gun,88,144,0 warp shootingrange#1 3,3,job_gun,93,123 +job_gun,105,97,0 warp shootingrange#2 3,3,job_gun,125,98 +job_gun,156,115,0 warp shootingrange#3 3,3,job_gun,157,137 +job_gun,152,154,0 warp shootingrange#4 3,3,job_gun,135,154 +job_gun,130,146,0 warp shootingrange#5 3,3,job_gun,120,130 + +job_gun,165,18,1 script Furnace Controller#1 CLEAR_NPC,{ + if (Class != Job_Gunslinger) { + mes("Only authorized user can do the operation."); + close(); + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) != G_L_SHECIL) { + mes("Not an authorized user. Abort the operation."); + close(); + } + if (questprogress(12342) != 1) { + mes("Not an authorized user. Abort the operation."); + close(); + } + mes("Do you want to dredge the mold up from the furnace?"); + next(); + if (select("Quit.", "Begin.") == 1) { + mes("Switch to the Standby mode."); + close(); + } + hideonnpc("Furnace Controller#1"); + donpcevent("Furnace Controller#2::OnStart"); + mes("Initializing Furnace Controller ZX-3100..."); + close(); + +OnInit: + hideoffnpc("Furnace Controller#1"); + end; +} + +job_gun,214,36,1 script Auto Anvil#1 CLEAR_NPC,{ + if (Class != Job_Gunslinger) { + mes("Only authorized user can do the operation."); + close(); + } + if (countitem(Tiny_Flame) > 0) { + mes("Unauthorized firearm creation has been detected. Report to Manager Elwin."); + close(); + } + if (checkweight(Tiny_Flame, 1) == 0) { + mes("You have too many items, please reduce them to continue."); + close(); + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) != G_L_SHECIL || countitem(Steel_Article_) <= 4 || questprogress(12342) != 1) { + mes("Not an authorized user. Abort the operation."); + close(); + } + + mes("Do you want to use the auto anvil and shape the standard Steel Artifacts into a firearm?"); + next(); + if (select("Quit.", "Begin.") == 1) { + mes("For your safety, please step away from the auto anvil."); + close(); + } + if (rand(1, 10) > 6) { + specialeffect(EF_REPAIRWEAPON); + mes("You have successfully created a firearm using the auto anvil. ^ff0000Please report before your transformation expires^000000."); + delitem(Steel_Article_, 5); + getitem(Tiny_Flame, 1); + } else { + specialeffect(EF_SUI_EXPLOSION); + mes("Failed to create a firearm."); + delitem(Steel_Article_, 5); + } + close(); + +OnInit: + hideoffnpc("Auto Anvil#1"); + end; +} + +job_gun,165,18,1 script Furnace Controller#2 CLEAR_NPC,{ + mes("The system is busy dredging a completed mold from the furnace."); + close(); + +OnInit: + hideonnpc("Furnace Controller#2"); + end; + +OnStart: + hideoffnpc("Furnace Controller#2"); + sleep(3000); + mapannounce("job_gun", "Furnace Controller: Dredging a mold up from the furnace... Workers, stand by at the production line.", bc_map, "0x00ff44"); + sleep(500); + .@wh_start = 0; + while (true) { + if (.@wh_start >= 30) + break; + + .@eff_rnd = rand(1, 100); + if (.@eff_rnd < 33) { // 0 - 32 + donpcevent("Heating Furnace#3::OnStart"); + } else if (.@eff_rnd > 66) { // 67-100 + donpcevent("Heating Furnace#4::OnStart"); + } else { // 33-66 + donpcevent("Heating Furnace#5::OnStart"); + } + sleep(200); + makeitem(Steel_Article, 1, "job_gun", rand(127, 143), rand(26, 29)); + if (rand(1, 10) > 7) { + makeitem(Steel_Article_, 1, "job_gun", rand(127, 143), rand(26, 29)); + } + .@wh_start += 1; + sleep(500); + + } + sleep(2000); + mapannounce("job_gun", "Furnace Controller: Finishing the operation... Entering Standby mode in 15 seconds.", bc_map, "0x00ff44"); + sleep(15000); + hideonnpc("Furnace Controller#2"); + hideoffnpc("Furnace Controller#1"); + end; +} + +job_gun,130,31,1 script Heating Furnace#3 CLEAR_NPC,{ + end; + +OnStart: + specialeffect(EF_FIREPILLAR); + sleep(500); + specialeffect(EF_FIREPILLARBOMB); + end; +} + +job_gun,136,31,1 script Heating Furnace#4 CLEAR_NPC,{ + end; + +OnStart: + specialeffect(EF_FIREPILLAR); + sleep(500); + specialeffect(EF_FIREPILLARBOMB); + end; +} + +job_gun,141,31,1 script Heating Furnace#5 CLEAR_NPC,{ + end; + +OnStart: + specialeffect(EF_FIREPILLAR); + sleep(500); + specialeffect(EF_FIREPILLARBOMB); + end; +} + +function script F_summonTargetMonster { + .@monster_id = getarg(0); + .@max_mob_count = getarg(1); + .@monster_name$ = getarg(2); + .@event_name$ = getarg(3); + while(true) { + .@mob_dead_num = mobcount("job_gun", .@event_name$); + if (.@mob_dead_num >= .@max_mob_count) + break; + + switch(rand(1, 5)) { + case 1: + .@mobx = rand(88, 99); + .@moby = rand(143, 147); + break; + case 2: + .@mobx = rand(92, 96); + .@moby = rand(95, 122); + break; + case 3: + .@mobx = rand(143, 159); + .@moby = rand(99, 100); + break; + case 4: + .@mobx = rand(157, 158); + .@moby = rand(137, 160); + break; + case 5: + .@mobx = rand(119, 134); + .@moby = rand(156, 160); + break; + } + monster("job_gun", .@mobx, .@moby, .@monster_name$, .@monster_id, 1, .@event_name$); + } + return; +} + +job_gun,1,4,1 script #target CLEAR_NPC,{ + end; + +OnStart: + killmonster("job_gun", "#target::OnTargetDead"); + callfunc("F_summonTargetMonster", J_REB_SHECIL1, 16, _("Standard-issue Target"), "#target::OnTargetDead"); + end; + +OnInit: + hideonnpc("#target"); + callfunc("F_summonTargetMonster", J_REB_SHECIL1, 16, _("Standard-issue Target"), "#target::OnTargetDead"); + end; + +OnTargetDead: + hideonnpc("#target"); + callfunc("F_summonTargetMonster", J_REB_SHECIL1, 16, _("Standard-issue Target"), "#target::OnTargetDead"); + end; +} + +job_gun,1,5,1 script #nontarget CLEAR_NPC,{ + end; +OnStart: + killmonster("job_gun", "#nontarget::OnNonTargetDead"); + hideonnpc("#nontarget"); + callfunc("F_summonTargetMonster", J_REB_SHECIL2, 56, _("Defective Target"), "#nontarget::OnNonTargetDead"); + end; + +OnInit: + hideonnpc("#nontarget"); + callfunc("F_summonTargetMonster", J_REB_SHECIL2, 56, _("Defective Target"), "#nontarget::OnNonTargetDead"); + end; + +OnNonTargetDead: + hideonnpc("#nontarget"); + callfunc("F_summonTargetMonster", J_REB_SHECIL2, 56, _("Defective Target"), "#nontarget::OnNonTargetDead"); + end; +} + +moc_fild12,261,318,3 script Suspicious Man 4_M_MOCASS2,2,2,{ + end; +OnTouch: + if (Class != Job_Gunslinger || BaseLevel < 99 || JobLevel < 70) + end; + if (questprogress(12340) < 1) { + mes("[Suspicious Man]"); + mes("Finally I've found you, Vagabond Spike! Your neck is mine!"); + next(); + select("Say what?"); + + mes("[Suspicious Man]"); + mes("*Snort* Don't pretend like you don't know. Look at this poster! You're in it!"); + next(); + select("I see the resemblance, but that's not me."); + + mesf("[%s]", strcharinfo(PC_NAME)); + mes("Forget the resemblance. Where did you get that poster? I've never committed a crime."); + next(); + mes("[Suspicious Man]"); + mes("I knew you'd try to lie your way out."); + next(); + mes("[Suspicious Man]"); + mes("The ^0000ffEinbroch Private Pub^000000 has released that wanted poster. You have many bounty hunters like me on your heels."); + next(); + mes("[Suspicious Man]"); + mes("I don't care if you're the right one so long as you look it and I can take you dead or alive."); + next(); + } else { + mes("[Suspicious Man]"); + mes("It's you again! You've got guts to come back here!"); + next(); + } + switch (select("Make a run for it.", "Fight him.")) { + case 1: + mes("^0000ffI should run for now and think about this later.^000000"); + close2(); + break; + case 2: + mes("^0000ffHe's not the only bounty hunter after me, if he's telling the truth. I need time to strategize.^000000"); + close2(); + break; + } + setquest(12340); + warp("moc_fild12", 186, 83); + end; +} + +einbroch,54,97,3 script Bouncer 4_M_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Bouncer]"); + mes("No loitering around the venue."); + close(); + } + if (questprogress(12340) < 1) { + mes("[Bouncer]"); + mes("Under construction, can't get in."); + close(); + } else if (questprogress(12340) == 1) { + mes("[Bouncer]"); + mes("*Gasp* You! I thought you were already captured. Ooh, doesn't matter now. You're my Get Out of Jail Free card!"); + next(); + select("I'm not the criminal you think I am!"); + mes("[Bouncer]"); + mes("You aren't?"); + next(); + mes("^0000ffThe bouncer examines your face.^000000"); + next(); + mes("[Bouncer]"); + mes("Hm, you bear a striking resemblance, though you don't look not as menacing as that criminal Spike"); + next(); + select("I want to talk to the poster publisher."); + mes("[Bouncer]"); + mes("Your problem is a bit out of my league. Get in. If I find out you're the real deal all along, I'll see that you'll never see the outside again."); + close2(); + warp("job_gun", 81, 29); + } else if (questprogress(12340) > 1) { + mes("[Bouncer]"); + mes("You're back. Why?"); + next(); + if (select("I want in.", "I was passing by.") == 2) { + mes("[Bouncer]"); + mes("You're silly."); + close(); + } + mes("[Bouncer]"); + mes("Go ahead. Stay out of trouble."); + close2(); + warp("job_gun", 70, 28); + } + end; +} + +job_gun,68,33,3 script Ruthless Rebellion 4_F_REBELLION,2,2,{ + mes("[Ruthless Rebellion]"); + mes("Do you know how to use a gun?"); + close(); +} + +job_gun,78,33,6 script Suspicious Gunslinger 4_M_JOB_BLACKSMITH,2,2,{ + mes("[Suspicious Gunslinger]"); + mes("... "); + next(); + mes("[Quiet Gunslinger]"); + mes("Don't say I look like a blacksmith you know."); + close(); +} + +job_gun,74,24,6 script Drunken Man 4_M_LIEMAN,2,2,{ + mes("[Drunken Man]"); + mes("*Hiccups* Oh, I'm the owner here."); + mes("Oh wait, am I in the pub or someplace else? Zzz..."); + close(); +} + +job_gun,64,33,6 script Anxious Man 4_M_ALCHE_A,2,2,{ + mes("[Anxious Man]"); + mes("Maybe I'm in the wrong place. This place doesn't look like a pub."); + close(); +} + +job_gun,86,29,3 script Kulbertinov 4_M_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Kulbertinov]"); + mes("Are you looking for me?"); + close(); + } + if (questprogress(12340) < 1) { + mes("[Kulbertinov]"); + mes("Can I help you?"); + close(); + } else if (questprogress(12340) == 1) { + mes("[Kulbertinov]"); + mes("What do you want?"); + next(); + select("I'm mistaken for a criminal!"); + mes("[Kulbertinov]"); + mes("Wait a minute... Mwah hah hah!"); + next(); + mes("^0000ffHe scans your face, then guffaws.^000000"); + next(); + mes("[Kulbertinov]"); + mes("I'm sorry. For a moment, I thought Spike came back to life. He was found dead three days ago."); + next(); + select("He was captured already?"); + mes("[Kulbertinov]"); + mes("Yes, and the bounty hunter was already paid. The news hasn't spread, and you're the spitting image of him. Go figure."); + next(); + select("You have to do something!"); + mes("[Kulbertinov]"); + mes("I'm sorry, but I can't talk to every single bounty hunter for you. Of course, I'm willing to compensate for your inconvenience."); + next(); + mes("[Kulbertinov]"); + mes("Hey, how about you join our ranks? At the very last, you won't get shot."); + next(); + select("You want me become a bounty hunter?"); + mes("[Kulbertinov]"); + mes("No, bounty hunting is just a pastime. We're the experts of all the firearms in the world."); + next(); + mes("[Kulbertinov]"); + mes("Carefree spirits!"); + mes("Magical spitfires!"); + mes("We call ourselves the ^0000ffRebellion^000000."); + next(); + mes("[Kulbertinov]"); + mes("You look like you know how to use a gun. How'd you like to join our ranks? You won't have to worry about other bounty hunters anymore too."); + next(); + switch (select("Let me think it over.", "I don't think I have a choice.")) { + case 1: + mes("[Kulbertinov]"); + mes("You can think it over and over, but the answer won't change. Just take the offer."); + break; + case 2: + mes("[Kulbertinov]"); + mes("Good thinking. Might as well do it now and get it over with."); + break; + } + next(); + mes("[Kulbertinov]"); + mes("Talk to Enwin Conick. She guides drifting spirits like you to the way of the Rebellion. I'll send word to her. Ah, and don't point your gun at her."); + setquest(12341); + completequest(12340); + } else if (questprogress(12340) > 1) { + mes("[Kulbertinov]"); + mes("Do you have business with Elwin Conick?"); + next(); + if (select("No.", "Send me to Elwin Conick.") == 1) { + mes("[Kulbertinov]"); + mes("All right. Care for a shot of vodka?"); + close(); + } + mes("[Kulbertinov]"); + mes("Okay, I'll let her know."); + } + close2(); + warp("job_gun", 19, 15); + end; +} + +job_gun,19,24,3 script Elwin Conick#1 4_F_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Elwin Conick]"); + mes("If you don't want to join Rebellions, just get out."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12341) == 1) { + mes("[Elwin Conick]"); + mes("Do you to join us Rebellions?"); + next(); + mes("^0000ffThe short woman with keen eyes stares into your eyes.^000000"); + next(); + mes("[Elwin Conick]"); + mes("Sign here."); + next(); + mes("^0000ffThe undersigned party [_____] will not speak of the test even if he or she suffers injury, mutilation, or death in an unforeseen accident that may occur during the test.^000000"); + next(); + select("WHAT?!"); + mes("[Elwin Conick]"); + mes("Do you want join us or not?"); + next(); + if (select("I give up.", "...I'll sign.") == 1) { + mes("[Elwin Conick]"); + mes("Your choice."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Good. Now, follow me."); + close2(); + warp("job_gun", 117, 41); + end; + } + if (questprogress(12342) == 1) { + mes("[Elwin Conick]"); + mes("Do you want to try again?"); + next(); + if (select("I give up.", "Do it.") == 1) { + mes("[Elwin Conick]"); + mes("Your choice."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Follow me."); + close2(); + warp("job_gun", 117, 41); + end; + } + if (questprogress(12343) == 1) { + mes("[Elwin Conick]"); + mes("You still have Ivan's shooting test, do you want to try again?"); + next(); + if (select("I give up.", "Do it.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Remember to give your best."); + close2(); + warp("job_gun", 120, 130); + end; + } + if (questprogress(12343) > 1) { + mes("[Elwin Conick]"); + mes("Ivan's shooting test have not finished yet, do you want to try again?"); + next(); + if (select("I give up.", "Do it.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Remember to give your best."); + close2(); + warp("job_gun", 120, 130); + end; + } + if (questprogress(12345) == 1) { + mes("[Elwin Conick]"); + mes("Ivan is waiting for you, go find him."); + close2(); + warp("job_gun", 120, 130); + end; + } + mes("[Elwin Conick]"); + mes("You have no more test to take. Why don't you go out and have a drink?"); + close2(); + warp("job_gun", 81, 29); + end; +} + +job_gun,117,46,3 script Elwin Conick#2 4_F_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Elwin Conick]"); + mes("If you don't want to join Rebellions, just get out."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) == G_L_SHECIL) { + mes("^0000ffYou are already in the test form. If you have finished all your tests, report to Elwin Conick in the Assembly Room^000000."); + close(); + } else if (getstatus(SC_MONSTER_TRANSFORM, 1) > 1) { + mes("[Elwin Conick]"); + mes("Look at yourself, do you really want to test?"); + next(); + mes("^0000ffElwin see you turn into another form and she is very angry. Wait for your current form ends, and then find her again.^000000"); + next(); + if (select("Wait.", "Go away.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax.."); + close(); + } + mes("[Elwin Conick]"); + mes("Come back when you aren't in any form."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12341) == 1) { + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + mes("[Elwin Conick]"); + mes("Any leftover Steel Artifacts must be returned after the test."); + close(); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + mes("[Elwin Conick]"); + mes("Any leftover Steel Artifacts must be returned after the test."); + close(); + } + if (countitem(Tiny_Flame) > 0) { + delitem(Tiny_Flame, 1); + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + close(); + } + setquest(12342); + completequest(12341); + .@showDialog = true; + } else if (questprogress(12342) == 1) { + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + mes("[Elwin Conick]"); + mes("Any leftover Steel Artifacts must be returned after the test."); + close(); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + close(); + } + if (countitem(Tiny_Flame) > 0) { + delitem(Tiny_Flame, 1); + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + close2(); + end; + } + .@showDialog = true; + } + if (.@showDialog) { + mes("[Elwin Conick]"); + mes("Listen up. I'm not going to great lengths trying to explain the test to you."); + next(); + select("Okay."); + mes("[Elwin Conick]"); + mes("This is where the firearm molds are cast. Everywhere you can see Steel Artifacts are being produced."); + next(); + mes("[Elwin Conick]"); + mes("You'll be asked to control switches on the machine and select 5 standard Steel Artifacts."); + next(); + mes("[Elwin Conick]"); + mes("You'll then take them to the next Assembly Room and assemble them into a complete firearm. You'll be given 3 minutes to finish all that. ^0000ffTo check the elapsed time, you'll be transformed into a different job^000000."); + next(); + mes("[Elwin Conick]"); + mes("I'll be in the next room, waiting for you to bring me a complete firearm. Remember, ^0000ffyou fail the test when your transformation expires after 3 minutes^000000."); + montransform(G_L_SHECIL, 180000); + close(); + } + mes("[Elwin Conick]"); + mes("Ah? Are you lost? You need to register first and then get back here."); + close2(); + warp("job_gun", 81, 29); + end; +} + +job_gun,198,39,3 script Elwin Conick#3 4_F_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Elwin Conick]"); + mes("If you don't want to join Rebellions, just get out."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12342) != 1) { + mes("[Elwin Conick]"); + mes("Ah? Are you lost? You need to register first and then get back here."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) == G_L_SHECIL) { + if (countitem(Tiny_Flame) == 0) { + mes("[Elwin Conick]"); + mes("Are you done? I don't see any completed firearm in your inventory."); + close(); + } + delitem(Tiny_Flame, 1); + mes("[Elwin Conick]"); + mes("It's shoddy but not bad, given the time. You passed."); + next(); + mes("[Elwin Conick]"); + mes("Let me take all your leftover test materials."); + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + } + next(); + mes("[Elwin Conick]"); + mes("Now you can move on to the next course. Ivan Sidorenko will oversee your test."); + completequest(12342); + close2(); + warp("job_gun", 120, 133); + end; + + } else if (getstatus(SC_MONSTER_TRANSFORM, 1) > 1) { + mes("[Elwin Conick]"); + mes("Look at yourself, do you really want to test?"); + next(); + mes("^0000ffElwin see you turn into another form and she is very angry. Wait for your current form ends, and then find her again.^000000"); + next(); + if (select("Wait.", "Go away.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax.."); + close(); + } + mes("[Elwin Conick]"); + mes("Come back when you aren't in any form."); + close2(); + warp("job_gun", 81, 29); + end; + } else { + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + } + if (countitem(Tiny_Flame) > 0) { + delitem(Tiny_Flame, 1); + } + next(); + mes("[Elwin Conick]"); + mes("Let's start again."); + close2(); + warp("job_gun", 117, 41); + end; + } + end; +} + +job_gun,120,138,3 script Ivan Sidorenko#1 4_M_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Ivan Sidorenko]"); + mes("This is shooting test area, you can't come here as you like."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12342) < 2) { + mes("[Ivan Sidorenko]"); + mes("There seems to be a mistake, you can't stay here."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12343) < 1) { + mes("[Ivan Sidorenko]"); + mes("Hey, stay focused--we're using live ammo here, and you can get shot anytime."); + next(); + mes("[Ivan Sidorenko]"); + mes("Let me make this quick. Basically you'll be running in this shooting range consisting of 5 sections."); + next(); + mes("[Ivan Sidorenko]"); + mes("The objective is to find enemies in the midst of a crowd quickly and without fail."); + next(); + mes("[Ivan Sidorenko]"); + mes("Among all the targets, you must shoot only the ^0000ffStandard-issue Targets^000000. If you make a mistake, you'll lose points."); + next(); + mes("[Ivan Sidorenko]"); + mes("Let's try. There aren't many ^0000ffStandard-issue Targets^000000, so keep your eyes peeled."); + next(); + mes("[Ivan Sidorenko]"); + mes("^0000ffYou have 3 minutes to finish this test. If you can't finish before your transformation expires^000000, you'll fail. If that happens, just follow the path back to me."); + next(); + mes("[Ivan Sidorenko]"); + mes("^0000ffYou'll fail if you miss a Standard-issue Target, or shoot 3 incorrect targets^000000. Let's get started."); + setquest(12343); + setquest(12344); + montransform(G_L_SHECIL, 180000); + close2(); + warp("job_gun", 102, 146); + end; + } else if (questprogress(12343) == 1) { + .@standard_target = 0; + .@failed_target = 0; + .@total_target = 0; + if (questprogress(12343, HUNTING) == 2) { + .@standard_target = 10; + } + if (questprogress(12344, HUNTING) == 2) { + .@failed_target = 2; + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) != G_L_SHECIL) { + .@total_target = 5; + } + .@target_count = .@standard_target - (.@failed_target + .@total_target); // + if (.@target_count > 9) { // Killed 10 Standard, 0 Failed + completequest(12343); + completequest(12344); + setquest(12345); + mes("[Ivan Sidorenko]"); + mes("Good job. I didn't think you could pass so quickly."); + next(); + mes("[Ivan Sidorenko]"); + mes("You may leave and wait outside. I'll bring other instructors' evaluation reports to see you."); + close2(); + warp("job_gun", 210, 132); + end; + } else if (.@target_count == 8) { // Killed 10 Standard, 3 failed + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("You're quick enough, but you shot too many incorrect targets. You failed."); + next(); + } else if (.@target_count == 5) { // Timeout + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("You accurate enough, but you took too much time. Slow Rebellions don't survive long enough."); + next(); + } else if (.@target_count < 5) { // Timeout and failed targets + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("You failed at both speed and accuracy. How did you survive this long?"); + next(); + } else { + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("There's a problem, the statistic seems to be wrong. Well... This can happen sometimes."); + next(); + } + mes("[Ivan Sidorenko]"); + mes("Let's try again. Be more careful this time."); + setquest(12343); + setquest(12344); + montransform(G_L_SHECIL, 180000); + close2(); + warp("job_gun", 102, 146); + end; + } else { + mes("[Ivan Sidorenko]"); + mes("How did you not leave?"); + next(); + mes("[Ivan Sidorenko]"); + mes("You may leave and wait outside. I'll bring other instructors' evaluation reports to see you."); + close2(); + warp("job_gun", 210, 132); + end; + } + end; +} + +job_gun,220,132,3 script Ivan Sidorenko#2 4_M_REBELLION,2,2,{ + .@now_weight = MaxWeight - Weight; + if (checkweight(Knife, 1) == 0) { + mes("You have too many items, please reduce them to continue."); + close(); + } + if (.@now_weight < 1000) { + mes("The items in your inventory are weighing you down. Lighten your weight first."); + close(); + } + if (questprogress(12345) != 1) { + mes("[Ivan Sidorenko]"); + mes("There must have been a mistake. You aren't supposed to remain here."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (Class == Job_Gunslinger) { + if (BaseLevel < 99 || JobLevel < 70) { + mes("[Ivan Sidorenko]"); + mes("Huh? You look so weak? I have nothing more to say."); + close(); + } + if (SkillPoint != 0) { + mes("[Ivan Sidorenko]"); + mes("Oh no~ You still have Skill Points."); + close(); + } + mes("[Ivan Sidorenko]"); + mes("Kulbertinov, Elwin, and I've evaluated your Rebellion test results."); + next(); + mes("[Ivan Sidorenko]"); + mes("And..."); + next(); + mes("[Ivan Sidorenko]"); + mes("You've met all our requirements including the attitude and the test performance."); + next(); + mes("[Ivan Sidorenko]"); + mes("That's right, you're now a member of the Rebellion. Get ready to be wowed."); + next(); + jobchange(Job_Rebellion); + completequest(12345); + mes("[Ivan Sidorenko]"); + mes("And Elwin wants you to have this. Take good care of it. He made it for you."); + getitem(Freedom_Flame, 1); + next(); + mes("[Ivan Sidorenko]"); + mes("See you later."); + close2(); + warp("job_gun", 81, 29); + end; + } else if (Class == Job_Rebellion) { + mes("[Ivan Sidorenko]"); + mes("This life should be fun, not boring."); + next(); + mes("[Ivan Sidorenko]"); + mes("And by becoming a Rebellion your life should be upgraded. So, go and create a great journey, make us proud!"); + close(); + } else { + mes("[Ivan Sidorenko]"); + mes("Do you have something to say to me, don't you?"); + close(); + } +} + +job_gun,220,138,4 trader Prop Vending Machine 2_VENDING_MACHINE1,{ + end; +OnInit: + sellitem(Slug_Bullet_1); + sellitem(Slug_Bullet_2); + sellitem(Slug_Bullet_3); + sellitem(Slug_Bullet_4); + sellitem(Slug_Bullet_5); + sellitem(Fullmetal_Jacket_Bullet); + sellitem(Mine_Projectile); + sellitem(Dragon_Tail_Missile); + end; +} + +job_gun,216,138,4 script Butler Karlex 1_M_01,{ + mes("[Butler Karlex]"); + mes("Use this temporary storage to keep your items safe while on the Advancement test."); + next(); + .@select = select("Cancel", "Open the storage."); + mes("[Butler Karlex]"); + mes("Thank you for using the service."); + close2(); + if (.@select == 2) { + openstorage(); + } + end; +} + +prontera,92,209,4 trader Rebellion Weapons 2_VENDING_MACHINE1,{ + end; +OnInit: + sellitem(H_FEATHER_H_FIRE); + sellitem(ALTAIR_ARES); + sellitem(COLORSCOPE); + sellitem(RAG203); + sellitem(DEATHFIRE); + sellitem(R_THUNDER); + sellitem(P_BREAKER); + sellitem(MINIMAY); + sellitem(TEMPEST); + sellitem(END_OF_HORIZON); + sellitem(Southern_Cross_R); + end; +} + +prontera,96,209,4 trader Rebellion Accessories 2_VENDING_MACHINE1,{ + end; +OnInit: + sellitem(Slug_Bullet); + sellitem(Fullmetal_Jacket_Bullet); + sellitem(Mine_Projectile); + sellitem(Dragon_Tail_Missile); + sellitem(Special_Alloy_Trap); + sellitem(Bullet); + sellitem(Silver_Bullet_); + sellitem(Shell_Of_Blood_); + sellitem(AP_Ammo); + sellitem(Blaze_Bullet); + sellitem(Freezing_Bullet); + sellitem(Electric_Shock_Bullet); + sellitem(Magical_Stone_Bullet); + sellitem(Sanctified_Bullet); + sellitem(Flare_Bullet); + sellitem(Lightning_Bullet); + sellitem(Poison_Bullet); + sellitem(Blind_Bullet); + sellitem(Ice_Bullet); + end; +} diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index e59492ce5..c7e5b8a61 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -243,7 +243,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm, I wanted to tell you..."; next; - input .@inputstr$; + input(.@inputstr$); mes "[" + strcharinfo(PC_NAME) + "]"; mes "" + .@inputstr$ + ""; next; @@ -483,7 +483,7 @@ OnTouch: next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "Pain... What kind of faults have I had?"; - input .@inputstr$; + input(.@inputstr$); next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "I confess my guilt to the Almighty God Odin."; @@ -779,7 +779,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{ warp "odin_tem02",282,263; end; } - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1006,7 +1006,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { if (strnpcinfo(NPC_NAME) == "#arch_1_10") viewpoint 1,113,327,1,0xFF9900; .@randht = rand(1,10); @@ -1038,7 +1038,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000"; donpcevent "mob#arch_1::OnKill"; end; @@ -1113,7 +1113,7 @@ OnKill: } job3_arch02,113,327,5 script Valkyrie#arch_01 4_F_VALKYRIE2,{ - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1355,7 +1355,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { .@randht = rand(1,10); if (.@randht < 8) mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; @@ -1400,7 +1400,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000"; end; } diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 19f4ac7cf..a13afcbd9 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 4dcc98448..b97c27c85 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 41e5b476f..d91a1b448 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Elias -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Elias +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -613,7 +613,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ mes "Don't hang around here doing nothing. This is my area!"; close; L_Start: - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Test Instructor, Teardrop]"; mes "Stop!"; next; @@ -1491,7 +1491,7 @@ job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{ setquest 8261; close; } - if (getmercinfo(1) == 2034) { + if (getmercinfo(MERCINFO_CLASS) == M_DESERT_WOLF_B) { erasequest 8261; mes "Good! Then I'll start the test right now!"; next; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ad8ab8f74..333c5c129 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -962,7 +962,7 @@ job3_rune01,58,51,1 script Rune Furnace CLEAR_NPC,{ next; mes .@str$[1]; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@str$[0]) { mes "[Rune Knight Renoa]"; mes "Wow! This is great. The image of the rune stone in my head and the modeled rune stone match perfectly. It's well made."; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 13f99013b..41921e74e 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index d9fb1bce6..14f065833 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Aeomin -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Aeomin +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index a9f30975c..a0312ab7c 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 87cf554ad..16c8f78dd 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) brAthena -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) brAthena +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -521,7 +521,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ switch(select("Royal Guard", "Rune Knight", "Sorcerer")) { case 1: mes "1~5"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 5) { mes "Set item to adjust the Royal Guard"; @@ -533,7 +533,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ close; case 2: mes "1~24"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 24) { mes "Set item to adjust the Rune Knight"; @@ -545,7 +545,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ close; case 3: mes "1~5"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 5) { mes "Set item to adjust the Sorcerer"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 9cdd3f732..877752431 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Oshinoke -//= Copyright (C) ultragunner -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Oshinoke +//= Copyright (C) ultragunner +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -327,7 +327,7 @@ s_atelier,65,123,5 script Manager#sc04_prt 4_M_KHKYEL,{ mes "Wow, you deciphered it?"; mes "So, what's the right answer?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "shadows atelier in prontera" || .@inputstr$ == "SHADOWS ATELIER IN PRONTERA") { mes "[Manager]"; mes "Good."; @@ -1118,7 +1118,7 @@ L_Code: mes "["+strcharinfo(PC_NAME)+"]"; mes "Paul said..."; next; - input .@inputstr$; + input(.@inputstr$); mes "["+strcharinfo(PC_NAME)+"]"; mes "Paul said..."; mes "'"+.@inputstr$+"' ."; @@ -1694,7 +1694,7 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{ mes "A blue flame is roaring."; mes "The deciphered code means..."; next; - input .@inputstr$; + input(.@inputstr$); .@dap01$ = "blue fire in turtle island third floor"; .@dap02$ = "BLUE FIRE IN TURTLE ISLAND THIRD FLOOR"; if (.@inputstr$ != .@dap01$ && .@inputstr$ != .@dap02$) { @@ -1986,7 +1986,7 @@ job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{ mes " "; mes "And also letters. They are blinking as if waiting for a code to be input."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@Codes2$[.@i] || .@inputstr$ == strtolower(.@Codes2$[.@i])) { mes "When you put the correct answer in there,"; mes "the box is opened."; @@ -2042,7 +2042,7 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ next; switch(select("Input the answer.", "I can't get it.")) { case 1: - input .@input; + input(.@input); if (.@input == .@numbers[.@i]) { mes "You put 2 and "+(.@numbers[.@i]-20)+"."; mes "The box opens and you get one key."; @@ -2122,7 +2122,7 @@ job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{ mes "There's no code, so 1 should be A."; mes "And the answer is..."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "turn and shake" || .@inputstr$ == "TURN AND SHAKE") { mes "["+strcharinfo(PC_NAME)+"]"; mes "Turn... Turn... and"; diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index 0af118a0d..052771c33 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 4e0108fd8..280e6ce28 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index 30449e2fa..0de90c3cf 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Meyraw -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Meyraw +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -252,7 +252,7 @@ xmas,132,143,5 script Performance Manager#wnd 4_M_06,{ next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "It's because..."; - input .@inputstr$; + input(.@inputstr$); mes "^3131FF" + .@inputstr$ + "^000000"; mes "......"; next; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 3b260d3db..f7cd335ce 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015-2016 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Kisuka +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -4513,7 +4513,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ } next(); input(.@input); - if (!.@input) { + if (.@input <= 0) { mes("[Querrie]"); mes("Well, you don't need to buy it now."); mes("Use it next time."); @@ -4525,7 +4525,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ mes("You can buy up to 99 at once."); close(); } - set .@cost, .@input * (BaseLevel <= 20 ? 30 : 500); + .@cost = .@input * (BaseLevel <= 20 ? 30 : 500); mes("[Querrie]"); mesf("%d combination kits will cost you %d.... zeny.", .@input, .@cost); if (Zeny < .@cost) { @@ -5945,199 +5945,199 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("If you want to stop, say 0."); next(); input(.@style); - if (.@style > 19) { - mes("[Otter Samssoon]"); - mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); - close(); - } else if (!.@style) { + if (.@style <= 0) { mes("[Otter Samssoon]"); mes("Did you decide? Which style??"); mes("I want to touch your hair with my hands~ Honey~"); close(); - } else { - callsub(L_cutin, .@style); + } + if (.@style > 19) { mes("[Otter Samssoon]"); - switch(.@style) { - case 1: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Play Dead' cut?"); - mes("This looks neat and relaxed.. So popular style."); - } else { - mes("Oh my!!? 'First Aid' cut?"); - mes("This is and adorable style."); - mes("I guess it looks good on you too!!"); - } - break; - case 2: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Two Handed Sword Mastery' cut?"); - mes("You... You know the famous D..? He has exactly the same style!"); - } else { - mes("Oh my!!? 'Bash' cut?"); - mes("This style gives strong curls on both side hair."); - } - break; - case 3: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Napalm Beat' cut?"); - mes("It has well arranges hair line that makes feel charisma."); - } else { - mes("Oh my!!? 'Frost Diver' cut?"); - mes("It is mysterious style that gives cold and warm feeling at the same time."); - } - break; - case 4: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Double Strafe' cut?"); - mes("Natural hair is shaking by wind.. Clean and good feeling."); - } else { - mes("Oh my!!? 'Arrow Shower' cut?"); - mes("Cool and nice shaggy cut makes good style."); - } - break; - case 5: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Angelus' cut?"); - mes("Calm and piety feeling.. Not boring style."); - } else { - mes("Oh my!!? 'Heal' cut?"); - mes("Feminine style give healing feeling."); - } - break; - case 6: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Push Cart' cut?"); - mes("Big Kar is motivated for this style with a romance of a man."); - } else { - mes("Oh my!!? 'Vending' cut?"); - mes("Royal ladies like this style. Make good money style."); - } - break; - case 7: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Envenom' cut?"); - mes("Tough style makes addicted."); - } else { - mes("Oh my!!? 'Double Attack' cut?"); - mes("Whoever will dash twice for this style."); - mes("Ponytail is important."); - } - break; - case 8: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Bowling Bash' cut?"); - mes("This style makes a nice guy to challenge."); - mes("Just a giving a glance can steal the heart."); - } else { - mes("Oh my!!? 'Gloria' cut?"); - mes("This style is ultimately gorgeous and graceful."); - } - break; - case 9: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Venom Dust' cut?"); - mes("This style has special ending line that looks fatal."); - } else { - mes("Oh my!!? 'SP Recovery' cut?"); - mes("This style has neat cutting that inspires."); - } - break; - case 10: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Turn Undead' cut?"); - mes("This style is like a cold city man who is strong enough to kill a monster."); - } else { - mes("Oh my!!? 'Prepare Potion' cut?"); - mes("This style has a liquid medicine motive so it makes feel cure."); - } - break; - case 11: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Dragonology' cut?"); - mes("This style is intelligent style of mysterious dragon."); - } else { - mes("Oh my!!? 'Grand Cross' cut?"); - mes("Well trimmed hair cut line gives trust."); - } - break; - case 12: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Mace Mastery' cut?"); - mes("Look fresh and look neat with wax treatment."); - } else { - mes("Oh my!!? 'Intimidate' cut?"); - mes("This style is very familiar."); - } - break; - case 13: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Thunder Storm' cut?"); - mes("This style has natural attractive perm which is like hitting by thunder storm."); - } else { - mes("Oh my!!? 'Spiritual Sphere"); - mes("Calm and a little bit looks like a boy cut draw attention."); - } - break; - case 14: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Encore' cut?"); - mes("Rocker's favorite style.. Even the name itself.."); - } else { - mes("Oh my!!? 'Gypsy's Kiss' cut?"); - mes("The hair.. Kind to everyone.. Neat and round hair line is very soft and charming."); - } - break; - case 15: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Grimtooth' cut?"); - mes("The style with edge."); - } else { - mes("Oh my!!? 'Counter Attack' cut?"); - mes("It is the style that looks cold and arrogant. Hard to talk to.."); - mes("But might be nice to boyfriend..?"); - } - break; - case 16: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Blitz Beat' cut?"); - mes("It is the style my senior invented after he broke up with his girlfriends 5 times."); - } else { - mes("Oh my!!? 'Anke Snare' cut?"); - mes("It is killing style.. No one can take eyes off!"); - } - break; - case 17: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Find Ore' cut?"); - mes("This style seems to bring encounter or find unexpected things while walking on the street."); - } else { - mes("Oh my!!? 'Hammer Fall' cut?"); - mes("Stunning hair with attraction."); - } - break; - case 18: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Fire Pillar' cut?"); - mes("Everyone used to have this hair style.. Which means that was a trend of an era."); - } else { - mes("Oh my!!? 'Jupitel Thunder'"); - mes("Fresh style by giving light waves on both side hairs."); - } - break; - case 19: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Guillotine Fist'"); - mes("It is like one-shot style.. Like a real man. Right?"); - } else { - mes("Oh my!!? 'Whirlwind' cut?"); - mes("It is cool style which flows with wind. Lah, lah, lah, lah ~"); - } - break; + mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); + close(); + } + callsub(L_cutin, .@style); + mes("[Otter Samssoon]"); + switch(.@style) { + case 1: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Play Dead' cut?"); + mes("This looks neat and relaxed.. So popular style."); + } else { + mes("Oh my!!? 'First Aid' cut?"); + mes("This is and adorable style."); + mes("I guess it looks good on you too!!"); } - close2(); - cutin("", 255); - end; + break; + case 2: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Two Handed Sword Mastery' cut?"); + mes("You... You know the famous D..? He has exactly the same style!"); + } else { + mes("Oh my!!? 'Bash' cut?"); + mes("This style gives strong curls on both side hair."); + } + break; + case 3: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Napalm Beat' cut?"); + mes("It has well arranges hair line that makes feel charisma."); + } else { + mes("Oh my!!? 'Frost Diver' cut?"); + mes("It is mysterious style that gives cold and warm feeling at the same time."); + } + break; + case 4: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Double Strafe' cut?"); + mes("Natural hair is shaking by wind.. Clean and good feeling."); + } else { + mes("Oh my!!? 'Arrow Shower' cut?"); + mes("Cool and nice shaggy cut makes good style."); + } + break; + case 5: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Angelus' cut?"); + mes("Calm and piety feeling.. Not boring style."); + } else { + mes("Oh my!!? 'Heal' cut?"); + mes("Feminine style give healing feeling."); + } + break; + case 6: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Push Cart' cut?"); + mes("Big Kar is motivated for this style with a romance of a man."); + } else { + mes("Oh my!!? 'Vending' cut?"); + mes("Royal ladies like this style. Make good money style."); + } + break; + case 7: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Envenom' cut?"); + mes("Tough style makes addicted."); + } else { + mes("Oh my!!? 'Double Attack' cut?"); + mes("Whoever will dash twice for this style."); + mes("Ponytail is important."); + } + break; + case 8: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Bowling Bash' cut?"); + mes("This style makes a nice guy to challenge."); + mes("Just a giving a glance can steal the heart."); + } else { + mes("Oh my!!? 'Gloria' cut?"); + mes("This style is ultimately gorgeous and graceful."); + } + break; + case 9: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Venom Dust' cut?"); + mes("This style has special ending line that looks fatal."); + } else { + mes("Oh my!!? 'SP Recovery' cut?"); + mes("This style has neat cutting that inspires."); + } + break; + case 10: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Turn Undead' cut?"); + mes("This style is like a cold city man who is strong enough to kill a monster."); + } else { + mes("Oh my!!? 'Prepare Potion' cut?"); + mes("This style has a liquid medicine motive so it makes feel cure."); + } + break; + case 11: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Dragonology' cut?"); + mes("This style is intelligent style of mysterious dragon."); + } else { + mes("Oh my!!? 'Grand Cross' cut?"); + mes("Well trimmed hair cut line gives trust."); + } + break; + case 12: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Mace Mastery' cut?"); + mes("Look fresh and look neat with wax treatment."); + } else { + mes("Oh my!!? 'Intimidate' cut?"); + mes("This style is very familiar."); + } + break; + case 13: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Thunder Storm' cut?"); + mes("This style has natural attractive perm which is like hitting by thunder storm."); + } else { + mes("Oh my!!? 'Spiritual Sphere"); + mes("Calm and a little bit looks like a boy cut draw attention."); + } + break; + case 14: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Encore' cut?"); + mes("Rocker's favorite style.. Even the name itself.."); + } else { + mes("Oh my!!? 'Gypsy's Kiss' cut?"); + mes("The hair.. Kind to everyone.. Neat and round hair line is very soft and charming."); + } + break; + case 15: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Grimtooth' cut?"); + mes("The style with edge."); + } else { + mes("Oh my!!? 'Counter Attack' cut?"); + mes("It is the style that looks cold and arrogant. Hard to talk to.."); + mes("But might be nice to boyfriend..?"); + } + break; + case 16: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Blitz Beat' cut?"); + mes("It is the style my senior invented after he broke up with his girlfriends 5 times."); + } else { + mes("Oh my!!? 'Anke Snare' cut?"); + mes("It is killing style.. No one can take eyes off!"); + } + break; + case 17: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Find Ore' cut?"); + mes("This style seems to bring encounter or find unexpected things while walking on the street."); + } else { + mes("Oh my!!? 'Hammer Fall' cut?"); + mes("Stunning hair with attraction."); + } + break; + case 18: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Fire Pillar' cut?"); + mes("Everyone used to have this hair style.. Which means that was a trend of an era."); + } else { + mes("Oh my!!? 'Jupitel Thunder'"); + mes("Fresh style by giving light waves on both side hairs."); + } + break; + case 19: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Guillotine Fist'"); + mes("It is like one-shot style.. Like a real man. Right?"); + } else { + mes("Oh my!!? 'Whirlwind' cut?"); + mes("It is cool style which flows with wind. Lah, lah, lah, lah ~"); + } + break; } + close2(); + cutin("", 255); + end; close(); case 2: if (!countitem(Cryptura_Hair_Coupon)) { @@ -6152,15 +6152,17 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("Pick the style from page 1 to 19."); next(); input(.@style); - if (.@style > 19) { + if (.@style <= 0) { mes("[Otter Samssoon]"); - mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); + mes("Oh my!!? You do not want to?"); close(); - } else if (!.@style) { + } + if (.@style > 19) { mes("[Otter Samssoon]"); - mes("Oh my!!? You do not want to?"); + mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); close(); - } else if (getlook(1) == .@style) { + } + if (getlook(1) == .@style) { mes("[Otter Samssoon]"); mes("Come on.. Honey~ That is the same style you have."); mes("Do you want to try something new?"); @@ -13114,18 +13116,19 @@ izlude,145,122,7 script Tadde#iz 4_M_04,{ mes("How many would you like? Enter '0' if you want to end."); next(); while(true) { - input(.@amount, 0, 501); - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes("[Tadde]"); mes("Trade ended."); close(); - } else if (.@amount > 500) { + } + if (.@amount > 500) { mes("[Tadde]"); mes("Please reduce your quantity to 500 or less."); next(); - } else { - break; + continue; } + break; } .@sell = .@amount * 200; .@item_weight = .@amount * 200; @@ -13150,18 +13153,19 @@ izlude,145,122,7 script Tadde#iz 4_M_04,{ mes("How many would you like? Enter '0' if you want to end."); next(); while(true) { - input(.@amount, 0, 501); - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes("[Tadde]"); mes("Trade ended."); close(); - } else if (.@amount > 500) { + } + if (.@amount > 500) { mes("[Tadde]"); mes("Please reduce your quantity to 500 or less."); next(); - } else { - break; + continue; } + break; } .@sell = .@amount * 1000; .@item_weight = .@amount * 200; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 18ba3fbe1..ed96a7524 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 74328278f..5e362edfe 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt index 7acd3b606..482d50d73 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by |