Luca is ready (again, rebalances were needed). This means Magic Academy Alpha!

2 files changed, 66 insertions, 25 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index da7a36e30..73ab48e1e 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -335,10 +335,6 @@ skill_db: (
 			Katars: true
 			Revolvers: true
 			Rifles: true
-			GatlingGuns: true
-			Shotguns: true
-			GrenadeLaunchers: true
-			FuumaShurikens: true
 		}
 	}
 },
@@ -1727,16 +1723,35 @@ skill_db: (
 	Element: "Ele_Weapon"
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 200
-			Lv3: 300
-			Lv4: 400
-			Lv5: 500
-			Lv6: 600
-			Lv7: 700
-			Lv8: 800
-			Lv9: 900
-			Lv10: 1000
+			Lv1: 80
+			Lv2: 100
+			Lv3: 120
+			Lv4: 140
+			Lv5: 160
+			Lv6: 180
+			Lv7: 200
+			Lv8: 220
+			Lv9: 240
+			Lv10: 260
+		}
+		WeaponTypes: {
+			NoWeapon: true
+			Daggers: true
+			1HSwords: true
+			2HSwords: true
+			1HSpears: true
+			2HSpears: true
+			1HAxes: true
+			2HAxes: true
+			Maces: true
+			2HMaces: true
+			Knuckles: true
+			Instruments: true
+			Whips: true
+			Books: true
+			Katars: true
+			Revolvers: true
+			Rifles: true
 		}
 	}
 },
diff --git a/npc/003-0/luca.txt b/npc/003-0/luca.txt
index c6ba03d60..0d64c2223 100644
--- a/npc/003-0/luca.txt
+++ b/npc/003-0/luca.txt
@@ -7,28 +7,54 @@
 
 003-0,34,41,0	script	Luca	NPC_PLAYER,{
     if (!MAGIC_LVL) goto L_NoMagic;
-    mes l(".:: Scholarship Class ::.");
-    mesc l("Specialized in support, buff, debuff and strengthening skills.");
+    mes l(".:: Assassin Class ::.");
+    mesc l("Specialized in skills with weapon-based damage.");
     next;
     mesn;
     do {
     mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
     next;
-    mesc l("Healing - The most basic healing skill, requires no items to use.");
-    mesc l("Mana Wisdom - Raise Mana EXP Gain rate");
+    mesc l("Falkon Punch - Bash your weapon against your enemies with raised damage and accuracy.");
+    mesc l("Supreme Attack - Cause a very strong attack with lowered accuracy.");
+    mesc l("Arrow Shower - Shoot FIVE arrows or bullets to the air and cause Area Of Effect Damage.");
+
+    mesc l("Counter Attack - Next attack will be retaliated, with twice critical ratio.");
+
+    mesc l("Ground Strike - Hit the ground, exploding the surroundings and disabling enemies.");
+    mesc l("Sharpshooter - Shoot an arrow or bullet which damages everything on its way.");
     menuint
-        "Healing", AL_HEAL,
-        "Mana Wisdom", TMW2_SAGE,
-        "Cancel", 0;
+        l("Falkon Punch"), SM_BASH,
+        l("Supreme Attack"), MC_MAMMONITE,
+        l("Arrow Shower"), AC_SHOWER,
+        l("Counter Attack"), KN_AUTOCOUNTER,
+        l("Ground Strike"), ASC_METEORASSAULT,
+        l("Sharpshooter"), SN_SHARPSHOOTING,
+        l("Cancel"), 0;
     mes "";
 
     switch (@menuret) {
-        case AL_HEAL:
-            if (!mlearn(AL_HEAL, 1, 1, SpellBookPage, 1))
+        case SM_BASH:
+            if (!mlearn(SM_BASH, 10, 1, FluoPowder, 3))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case MC_MAMMONITE:
+            if (!mlearn(MC_MAMMONITE, 10, 1, FluoPowder, 3))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case AC_SHOWER:
+            if (!mlearn(AC_SHOWER, 10, 1, FluoPowder, 3))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case KN_AUTOCOUNTER:
+            if (!mlearn(KN_AUTOCOUNTER, 5, 2, FluoPowder, 3))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case ASC_METEORASSAULT:
+            if (!mlearn(ASC_METEORASSAULT, 5, 3, FluoPowder, 3))
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
-        case TMW2_SAGE:
-            if (!mlearn(TMW2_SAGE, 1, 1, SpellBookPage, 1))
+        case SN_SHARPSHOOTING:
+            if (!mlearn(SN_SHARPSHOOTING, 1, 3, FluoPowder, 3))
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
         default: