diff options
author | tux9th <mr.x@aon.at> | 2013-11-24 10:41:18 -0800 |
---|---|---|
committer | tux9th <mr.x@aon.at> | 2013-11-24 10:41:18 -0800 |
commit | 5b7768879adf803278e425bc20961c2dc4bc4147 (patch) | |
tree | 56e71a52fa2f564fc9b10b21d571852fcd46b4bd /world/map/npc/042-2 | |
parent | 9bab4466134d43018070483b6d6a505dc0c08780 (diff) | |
parent | 5d34457becf1d1bbdda00c950d76b538d322c7bc (diff) | |
download | serverdata-5b7768879adf803278e425bc20961c2dc4bc4147.tar.gz serverdata-5b7768879adf803278e425bc20961c2dc4bc4147.tar.bz2 serverdata-5b7768879adf803278e425bc20961c2dc4bc4147.tar.xz serverdata-5b7768879adf803278e425bc20961c2dc4bc4147.zip |
Merge pull request #45 from wushin/equip-arrow-fix
Unequip & Multiple Ammo Types and Launcher Fix
Diffstat (limited to 'world/map/npc/042-2')
-rw-r--r-- | world/map/npc/042-2/sorfina.txt | 2 | ||||
-rw-r--r-- | world/map/npc/042-2/tanisha.txt | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt index b01a83c7..20c04adf 100644 --- a/world/map/npc/042-2/sorfina.txt +++ b/world/map/npc/042-2/sorfina.txt @@ -231,6 +231,8 @@ L_SkipTut: mes "\"Alright, if you say so. But take at least this."; callfunc "TutorialCompleted"; getitem "Knife", 1; + getitem "SlingShot", 1; + getitem "SlingBullet", 100; getitem "CottonShirt", 1; getitem "RaggedShorts", 1; set Zeny, Zeny + 50; diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index 437099dd..de93b8d5 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -50,7 +50,7 @@ L_Maggots: L_Fight_Again: mes "\"Ok, listen what to do."; - mes "Equip the knife and kill the maggots.\""; + mes "Equip a weapon and kill the maggots.\""; next; mes "\"Press A to focus on a monster. With X you can focus and start attacking the same time."; mes "But it also works to click on the monster with your mouse.\""; @@ -64,7 +64,15 @@ L_Fight_Again: // The getitem must be in the same place as set tanisha, 2; // since it was moved to after L_Fight_Again, add it conditionally if (tanisha == 1) - getitem "Knife", 1; + goto L_GetFightItems; + goto L_ContinueFight; + +L_GetFightItems: + getitem "Knife", 1; + getitem "SlingShot", 1; + getitem "SlingBullet", 100; + +L_ContinueFight: set tanisha, 2; set @Maggot_Kills, 0; set @time, 0; |