diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-20 10:11:20 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-20 10:11:20 +0000 |
| commit | 910042238bb081e769cd756a8268e3cdbef18f9e (patch) | |
| tree | 8acb464c5d89faee316f67f1e5f4629e993bf065 /npc/merchants | |
| parent | d346bb491de94ea13a2dbc574cf05fe6be473945 (diff) | |
| download | hercules-910042238bb081e769cd756a8268e3cdbef18f9e.tar.gz hercules-910042238bb081e769cd756a8268e3cdbef18f9e.tar.bz2 hercules-910042238bb081e769cd756a8268e3cdbef18f9e.tar.xz hercules-910042238bb081e769cd756a8268e3cdbef18f9e.zip | |
- Removed security check since source level patch is applied. Reverted select(), created prompt().
modified Changelog-Trunk.txt
modified npc/airports/airships.txt
modified npc/cities/amatsu.txt
modified npc/cities/gonryun.txt
modified npc/cities/hugel.txt
modified npc/cities/lighthalzen.txt
modified npc/cities/niflheim.txt
modified npc/cities/valkyrie.txt
modified npc/custom/eAAC_Scripts/disguiser.txt
modified npc/custom/eAAC_Scripts/quest_warper.txt
modified npc/custom/jobs/jobmaster.txt
modified npc/events/idul_fitri.txt
modified npc/jobs/1-1e/gunslinger.txt
modified npc/jobs/1-1e/ninja.txt
modified npc/jobs/novice/novice.txt
modified npc/merchants/kunai_maker.txt
modified npc/merchants/novice_exchange.txt
modified npc/merchants/refine.txt
modified npc/other/comodo_gambling.txt
modified npc/other/dts_warper.txt
modified npc/other/marriage.txt
modified npc/other/powernpc.txt
modified npc/quests/Lvl4_weapon_quest.txt
modified npc/quests/gunslinger_quests.txt
modified npc/quests/quests_ein.txt
modified npc/quests/quests_umbala.txt
modified npc/sample/monster_controller.cpp
modified src/map/script.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9267 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/kunai_maker.txt | 2 | ||||
| -rw-r--r-- | npc/merchants/novice_exchange.txt | 2 | ||||
| -rw-r--r-- | npc/merchants/refine.txt | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 3f2eae55c..f836befdf 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -38,7 +38,6 @@ switch(select("10 Poison Kunais:10 Icycle Kunais:10 Rough Wind Kunais:10 Black S callfunc "Kunai_Trade",13254,1,7521,2,13258;
goto L_Bye;
case 6:
- case 255:
goto L_Bye;
}
L_Bye:
@@ -91,7 +90,6 @@ function script Kunai_Trade { next;
return;
case 2:
- case 255:
return;
}
L_Return:
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index aed369124..6c2dda72b 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -134,8 +134,6 @@ function script F_NMerch { mes "Hah, no problem.";
mes "Bah!";
close;
- case 255:
- end;
}
}
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 5f3922984..1ea743dc3 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -798,13 +798,12 @@ function script repairmain { getitemname(getbrokenid(3)),getitemname(getbrokenid(4)),getitemname(getbrokenid(5)),
getitemname(getbrokenid(6)),getitemname(getbrokenid(7)),getitemname(getbrokenid(8)),
getitemname(getbrokenid(9)),getitemname(getbrokenid(10)));
- if(@choice == 255) end;
mes "[" + @name$ + "]";
mes "You're gonna repair " + getitemname(getbrokenid(@choice)) + ".";
mes "To repair this, I need " + @repairprice + " Zeny.";
mes "Continue?";
next;
- if(select("Yes","No") == 2 || @menu == 255) {
+ if(select("Yes","No") == 2) {
mes "[" + @name$ + "]";
mes "Ok, but don't expect to be using that...";
close;
|