summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-02 18:09:25 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-02 18:09:25 +0000
commit1bdf177a0bbcf3885ca5f8fad35923591eb37bd5 (patch)
tree111533f3c1ad32dd969a959facfc5511a495c7de /npc/other
parent947dbec4da6c83498e71261996b12b0c4aa406d2 (diff)
downloadhercules-1bdf177a0bbcf3885ca5f8fad35923591eb37bd5.tar.gz
hercules-1bdf177a0bbcf3885ca5f8fad35923591eb37bd5.tar.bz2
hercules-1bdf177a0bbcf3885ca5f8fad35923591eb37bd5.tar.xz
hercules-1bdf177a0bbcf3885ca5f8fad35923591eb37bd5.zip
* Neuralizer is no longer consumed upon failure (bugreport:6040)
* Some cleaning of the Sorcerer job change quest (jobs\3-2\sorcerer.txt) * Cleaning of "Bunny Band Quest" script (quests\bunnyband.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16367 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/CashShop_Functions.txt15
1 files changed, 6 insertions, 9 deletions
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 382e43ba0..07630674b 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.2 Updated the dungeon teleport scroll menu. [L0ne_w0lf]
//= 1.3 Implemented Aozi Giant Flywing Fix. (bugreport:4242) [L0ne_w0lf]
//= 1.4 Simplified Giant Flywing function using warpparty. [L0ne_w0lf]
+//= 1.5 Neuralizer is no longer consumed upon failure. [Euphy]
//============================================================
// Kafra Card
@@ -78,14 +79,10 @@ function script F_CashPartyCall2 {
// - Reset players skills. Weight must be 0, options must be off.
// - No arguments.
function script F_CashReset {
- if (Class != Job_Novice) {
- if (Weight < 1) {
- if (checkriding() || checkfalcon() || checkcart()) return;
- else {
- resetskill;
- sc_end SC_ALL;
- }
- }
+ if (Class != Job_Novice && Weight == 0 && !checkriding() && !checkfalcon() && !checkcart() && !ismounting()) {
+ resetskill;
+ sc_end SC_ALL;
+ if (countitem(12213)) delitem 12213,1;
}
return;
}