Lightsabers & Crafting alpha prototype (they need a nerf)

2 files changed, 82 insertions, 3 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 1ed902abd..6c33c831c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -11887,9 +11887,10 @@ item_db: (
 	Type: "IT_WEAPON"
 	Buy: 900000
 	Sell: 2000
-	Weight: 1000
-	Atk: 232
+	Weight: 360
+	Atk: 240
 	Matk: 0
+	Range: 1
 	Loc: "EQP_HAND_R"
 	WeaponLv: 1
 	EquipLv: 60
@@ -11911,7 +11912,46 @@ item_db: (
 		id5040: 1
 	}
 	Script: <"
-		bonus bAtk,(BaseLevel-60);
+		bonus bAtk,(BaseLevel-60)*3;
+	">
+},
+{
+	Id: 3537
+	AegisName: "PowerfulLightsaber"
+	Name: "PowerfulLightsaber"
+	Type: "IT_WEAPON"
+	Buy: 900000
+	Sell: 2000
+	Weight: 380
+	Atk: 300
+	Matk: 0
+	Range: 2
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 60
+	Refine: true
+	Subtype: "W_KATAR"
+	Slots: 1
+	AllowCards: {
+		id5022: 1
+		id5023: 1
+		id5024: 1
+		id5025: 1
+		id5026: 1
+		id5027: 1
+		id5028: 1
+		id5029: 1
+		id5037: 1
+		id5038: 1
+		id5039: 1
+		id5040: 1
+	}
+	Script: <"
+		bonus bAtk,(BaseLevel-60)*4;
+		bonus bAgi, -(BaseLevel/10);
+		bonus bDex, -(BaseLevel/10);
+		bonus bDef, -(BaseLevel*8/10);
+		bonus bCritical, BaseLevel/5;
 	">
 },
 // Insert new weapons above this line
diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt
index b34ab6437..c4cf20f0f 100644
--- a/npc/017-4/pyndragon.txt
+++ b/npc/017-4/pyndragon.txt
@@ -5,6 +5,7 @@
 // Description:
 //    Forge firearms
 017-4,34,23,0	script	Pyndragon	NPC_PLAYER,{
+    function explainMelee;
     // craft_gun( BaseItem1, Amount, BaseItem2, Amount, BaseItem3, Amount, PrizeItem, Price )
     function craft_gun {
         .@base1=getarg(0);
@@ -91,6 +92,7 @@ L_Menu:
     menu
         l("I would like some information"), L_Info,
         l("I want a gun!"), L_Craft,
+        l("Do you have non-ranged weapons?"), L_CraftMelee,
         l("I don't want anything right now, bye."), L_Close;
 
 L_Info:
@@ -144,11 +146,48 @@ L_Craft:
     }
     goto L_Menu;
 
+
+L_CraftMelee:
+    select
+        l("I changed my mind."),
+        l("Which melee you craft?"),
+        l("I want a PORTABLE LIGHTSABER."),
+        l("I want a POWERFUL LIGHTSABER.");
+    mes "";
+
+    switch (@menu) {
+        case 2:
+            explainMelee();
+            goto L_CraftMelee;
+        case 3:
+            craft_gun( LeadIngot, 6, TitaniumIngot, 7, Coal, 14, Lightsaber, 4000 );
+            goto L_CraftMelee;
+        case 4:
+            craft_gun( LeadIngot, 6, TitaniumIngot, 7, Coal, 14, PowerfulLightsaber, 4000 );
+            goto L_CraftMelee;
+    }
+    goto L_Menu;
+
+
 L_Close:
     closedialog;
     goodbye;
     close;
 
+function explainMelee {
+    mesc l("PORTABLE LIGHTSABER");
+    mesc l("* Very quick and can be used in a single hand, but weak.");
+    mes l("  The standard lightsaber! It's power is over 9000!");
+    mes l("  The blue color is alluring.");
+    mes "";
+    mesc l("POWERFUL LIGHTSABER");
+    mesc l("* Very quick, two handed, in overall strong.");
+    mes l("  I love this staff. I've heard it is evil, though.");
+    mes l("  The red color is alluring.");
+    next;
+    return;
+}
+
 OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet);