You can now, in theory, change what will be on craft bonuses selections.

3 files changed, 80 insertions, 7 deletions

diff --git a/npc/003-1/oldwell.txt b/npc/003-1/oldwell.txt
index fb7daf458..deb95ea7c 100644
--- a/npc/003-1/oldwell.txt
+++ b/npc/003-1/oldwell.txt
@@ -21,6 +21,7 @@
 
     delitem EmptyBottle, .@count;
     getitem "BottleOfSewerWater", .@count;
+    closeclientdialog;
     dispbottom("Eek, Sewer Water! What the?! Better not drink this!");
     close;
 
diff --git a/npc/commands/ucp.txt b/npc/commands/ucp.txt
index f103ad54a..652d779ff 100644
--- a/npc/commands/ucp.txt
+++ b/npc/commands/ucp.txt
@@ -23,7 +23,7 @@ function	script	UserCtrlPanel	{
             l("Account Information"),
             rif(getcharid(2) > 0, l("Guild Information")),
             l("Change Language"),
-            rif(is_admin() && $@GM_OVERRIDE, l("DISABLE OVERRIDE MODE")),
+            rif(getskilllv(TMW2_CRAFT), l("Change Crafting Options")),
             l("Game Settings"),
             l("Save & Exit");
 
@@ -87,8 +87,54 @@ function	script	UserCtrlPanel	{
                 break;
             case 5: asklanguage(LANG_IN_SHIP); break;
             case 6:
-                $@GM_OVERRIDE=false;
-               break;
+              // Draw the GUI and any info on it
+              csysGUI_Report();
+              //mesc l("Mobpt: @@", Mobpt);
+              do {
+                .@opt$="Do nothing";
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_BASE);
+
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_ATK);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_DEF);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_ACC);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_EVD);
+
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_REGEN);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_SPEED);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_DOUBLE);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_MAXPC);
+
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_SCRESIST);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_SCINFLICT);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_MANAUSE);
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_BOSSATK);
+
+                .@opt$+=":"+csysGUI_OptToogleMenu(CRGROUP_FINAL);
+
+                select (.@opt$);
+                mes "";
+                switch (@menu) {
+                case 2: csysGUI_ChangeOpt(CRGROUP_BASE); break;
+
+                case 3: csysGUI_ChangeOpt(CRGROUP_ATK); break;
+                case 4: csysGUI_ChangeOpt(CRGROUP_DEF); break;
+                case 5: csysGUI_ChangeOpt(CRGROUP_ACC); break;
+                case 6: csysGUI_ChangeOpt(CRGROUP_EVD); break;
+
+                case 7: csysGUI_ChangeOpt(CRGROUP_REGEN); break;
+                case 8: csysGUI_ChangeOpt(CRGROUP_SPEED); break;
+                case 9: csysGUI_ChangeOpt(CRGROUP_DOUBLE); break;
+                case 10: csysGUI_ChangeOpt(CRGROUP_MAXPC); break;
+
+                case 11: csysGUI_ChangeOpt(CRGROUP_SCRESIST); break;
+                case 12: csysGUI_ChangeOpt(CRGROUP_SCINFLICT); break;
+                case 13: csysGUI_ChangeOpt(CRGROUP_MANAUSE); break;
+                case 14: csysGUI_ChangeOpt(CRGROUP_BOSSATK); break;
+
+                case 15: csysGUI_ChangeOpt(CRGROUP_FINAL); break;
+                }
+              } while (@menu > 1);
+                break;
             case 7:
               do
               {
diff --git a/npc/craft/options.txt b/npc/craft/options.txt
index d1384a21e..985fae210 100644
--- a/npc/craft/options.txt
+++ b/npc/craft/options.txt
@@ -457,12 +457,12 @@ function	script	csys_Apply	{
 // Report craft skill levels
 function	script	csysGUI_Report	{
 
-    mes l("Crafting Skill: @@", getskilllv(TMW2_CRAFT));
+    mes l("Crafting Skill: Lv @@", getskilllv(TMW2_CRAFT));
     mes "";
     mes ".:: " + l("First Tier") + " ::.";
     mesc l("Craft Min Level: 1");
     mes "";
-    mes l("BASIC SKILLS: @@", CRAFTSYS[CRGROUP_BASE]);
+    mes l("BASIC SKILLS: Lv @@", CRAFTSYS[CRGROUP_BASE]);
     mesc l("Lv 1 - Str, Int");
     mesc l("Lv 3 - Dex, MaxHP");
     mesc l("Lv 5 - Agi, MaxMP");
@@ -472,12 +472,12 @@ function	script	csysGUI_Report	{
     mes ".:: " + l("Second Tier") + " ::.";
     mesc l("Craft Min Level: 2");
     mes "";
-    mes l("ATTACK SKILLS: @@", CRAFTSYS[CRGROUP_ATK]);
+    mes l("ATTACK SKILLS: Lv @@", CRAFTSYS[CRGROUP_ATK]);
     mesc l("BASIC Min Level: 2");
     mesc l("Lv 1 - Atk, MAtk");
     mesc l("Lv 5 - Atk %, MAtk %");
     mes "";
-    mes l("DEFENSE SKILLS: @@", CRAFTSYS[CRGROUP_DEF]);
+    mes l("DEFENSE SKILLS: Lv @@", CRAFTSYS[CRGROUP_DEF]);
     mesc l("BASIC Min Level: 2");
     mesc l("Lv 1 - Def, MDef");
     mesc l("Lv 5 - Crit DEF, Ranged DEF");
@@ -545,6 +545,15 @@ function	script	csysGUI_OptToogleMenu	{
 }
 
 
+// csysGUI_ChangeOpt( cr )
+// Change option
+function	script	csysGUI_ChangeOpt	{
+    .@sk=getarg(0);
+    CRAFTSYS_CURRENT=CRAFTSYS_CURRENT^.@sk;
+    return;
+}
+
+
 // csysGUI_OptReq( cr )
 // Return true if all requisites for Option were met
 function	script	csysGUI_OptReq	{
@@ -669,3 +678,20 @@ function	script	csysGUI_GroupOpt	{
     return "";
 }
 
+
+// csysGUI_RaiseOpt( cr )
+// Returns true if can raise group, false otherwise
+function	script	csysGUI_RaiseOpt	{
+    .@sk=getarg(0);
+    .@pc=csysGUI_OptPrice(.@sk);
+    if (csysGUI_OptReq(.@sk)) {
+        if (Mobpt >= .@pc) {
+            Mobpt-=.@pc;
+            .@lv=getd("CRAFTSYS["+.@sk+"]");
+            setd("CRAFTSYS["+.@sk+"]", .@lv+1);
+            return true;
+        }
+    }
+    return false;
+}
+