Guns core. Allow poison arrow to poison. This is for pyn and pihro, original content.

2 files changed, 88 insertions, 5 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index fc570deee..78f5ca2e5 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9905,6 +9905,44 @@ item_db: (
 	}
 },
 {
+	Id: 6010
+	AegisName: "PynRifle"
+	Name: "Pyn Rifle"
+	Type: "IT_WEAPON"
+	Buy: 55000
+	Sell: 5200
+	Weight: 1390
+	Atk: 210
+	Range: 6
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 70
+	Subtype: "W_RIFLE"
+	AllowAmmo: {
+		Id6510: 1
+		Id6511: 1
+	}
+},
+{
+	Id: 6020
+	AegisName: "PynGatling"
+	Name: "Pyn Gatling"
+	Type: "IT_WEAPON"
+	Buy: 55000
+	Sell: 5200
+	Weight: 1390
+	Atk: 30
+	Range: 6
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 70
+	Subtype: "W_GATLING"
+	AllowAmmo: {
+		Id6510: 1
+		Id6511: 1
+	}
+},
+{
 	Id: 6500
 	AegisName: "TrainingArrow"
 	Name: "Training Arrow"
@@ -9974,7 +10012,10 @@ item_db: (
 	Weight: 2
 	Atk: 90
 	Loc: "EQP_AMMO"
-	Subtype: "W_DAGGER"
+	Subtype: "A_ARROW"
+	Script: <"
+		bonus2 bAddEff,Eff_Poison,500;
+	">
 },
 {
 	Id: 6506
@@ -10000,6 +10041,36 @@ item_db: (
 	Loc: "EQP_AMMO"
 	Subtype: "A_ARROW"
 },
+// Important: NEVER raise bullet attack too much!
+// Unlike bows where the arrow is important, here the bullets are not.
+// Buy a more capable gun to drain full weapon power %%e
+{
+	Id: 6510
+	AegisName: "Bullet"
+	Name: "Bullet"
+	Type: "IT_AMMO"
+	Buy: 6
+	Sell: 1
+	Weight: 10
+	Atk: 10
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+},
+{
+	Id: 6510
+	AegisName: "SacredBullet"
+	Name: "Sacred Bullet"
+	Type: "IT_AMMO"
+	Buy: 12
+	Sell: 2
+	Weight: 12
+	Atk: 10
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+	Script: <"
+		bonus bAtkEle,Ele_Holy;
+	">
+},
 {
 	Id: 7420
 	AegisName: "DeathPenality"
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index b101a116e..0ee526c37 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -36,10 +36,10 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 		Whip: 0~200				(int, defaults to 200)
 		Book: 0~200				(int, defaults to 200)
 		Katar: 0~200			(int, defaults to 200)
-		Revolver: 0~200			(int, defaults to 200)
-		Rifle: 0~200			(int, defaults to 200)
-		GatlingGun: 0~200		(int, defaults to 200)
-		Shotgun: 0~200			(int, defaults to 200)
+		Revolver: 0~200			(int, defaults to 200) (inaccurate)
+		Rifle: 0~200			(int, defaults to 200) (slow and powerful)
+		GatlingGun: 0~200		(int, defaults to 200) (fast and weak) (very powerful with GatlingFever)
+		Shotgun: 0~200			(int, defaults to 200) (splash damage, very slow)
 		GrenadeLauncher: 0~200	(int, defaults to 200)
 		FuumaShuriken: 0~200	(int, defaults to 200)
 		TwoHandRod: 0~200		(int, defaults to 200)
@@ -67,6 +67,8 @@ Human: {
         TwoHandRod: 65
         Shield: 10
         Bow: 100
+		Rifle: 180
+		GatlingGun: 40
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -118,6 +120,8 @@ Ukar: {
         TwoHandRod: 65
         Shield: 10
         Bow: 100
+		Rifle: 180
+		GatlingGun: 40
     }
 	InheritHP: ( "Human" );
 	InheritSP: ( "Human" );
@@ -139,6 +143,8 @@ Redy: {
         TwoHandRod: 65
         Shield: 10
         Bow: 100
+		Rifle: 180
+		GatlingGun: 40
     }
 	InheritHP: ( "Human" );
 	InheritSP: ( "Human" );
@@ -181,6 +187,8 @@ Orc: {
         TwoHandRod: 65
         Shield: 10
         Bow: 100
+		Rifle: 180
+		GatlingGun: 40
     }
 	InheritHP: ( "Human" );
 	InheritSP: ( "Human" );
@@ -202,6 +210,8 @@ Raijin: {
         TwoHandRod: 65
         Shield: 10
         Bow: 100
+		Rifle: 180
+		GatlingGun: 40
     }
 	InheritHP: ( "Human" );
 	InheritSP: ( "Human" );
@@ -223,6 +233,8 @@ Tritan: {
         TwoHandRod: 65
         Shield: 10
         Bow: 100
+		Rifle: 180
+		GatlingGun: 40
     }
 	InheritHP: ( "Human" );
 	InheritSP: ( "Human" );