Allow you to cancel class selection in the middle.

Doing so will revert selection and reimburse the money.

Still no handling if you close the dialogue in the middle.

1 files changed, 23 insertions, 5 deletions

diff --git a/npc/003-0/fejda.txt b/npc/003-0/fejda.txt
index 61ef1381e..a92e464fc 100644
--- a/npc/003-0/fejda.txt
+++ b/npc/003-0/fejda.txt
@@ -24,18 +24,25 @@
     if (CLASS_CHANGE > gettimetick(2)) close;
     next;
     mesc l("Do you want to change your job class(es)?"), 1;
-    if (askyesnosafe() == ASK_NO) {
-        closeclientdialog;
-        close;
-    }
     // Do you need to pay the fee?
     if (CLASS_CHANGE) {
+        if (askyesnosafe() == ASK_NO) {
+            closeclientdialog;
+            close;
+        }
+        // Pay the fee
         if (Zeny < .GpFee) {
             mesc l("Not enough money."), 1;
             close;
         } else {
             Zeny -= .GpFee;
         }
+    } else {
+        // First class change, so no need for safe confirm
+        if (askyesno() == ASK_NO) {
+            closeclientdialog;
+            close;
+        }
     }
 
     // Reset class
@@ -66,8 +73,19 @@ O	CLASS_CARRY:      2048 // Bonus on max weight
             l("Tanker (def+/hp+)"), CLASS_TANKER,
             l("Paladin (aspd+)"), CLASS_PALADIN,
             l("Ninja (eva+)"), CLASS_NINJA,
-            l("Carry (weight+)"), CLASS_CARRY;
+            l("Carry (weight+)"), CLASS_CARRY,
+            l("[Cancel]"), -1;
 
+        // Cancel selection, reverting class again and recovering money.
+        if (@menuret == -1) {
+            JobClass = 0;
+            if (CLASS_CHANGE) {
+                Zeny += .GpFee;
+                //CLASS_CHANGE += 86400;
+            }
+            closeclientdialog;
+            close;
+        }
 
         // If you pick a class you already selected, it'll be unselected
         // Otherwise, it'll be added