Merge pull request #2621 from dastgirp/script/rebellion

Added Rebellion Job Quest

1 files changed, 162 insertions, 0 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index fb0df3d2d..4f5be9de5 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -74523,6 +74523,16 @@ item_db: (
 	Name: "Love Wand"
 },
 {
+	Id: 6746
+	AegisName: "Steel_Article"
+	Name: "Steel Artifact"
+},
+{
+	Id: 6747
+	AegisName: "Steel_Article_"
+	Name: "Steel Artifact"
+},
+{
 	Id: 6755
 	AegisName: "Corrupted_Charm"
 	Name: "Contaminated Magic"
@@ -101220,6 +101230,58 @@ item_db: (
 	">
 },
 {
+	Id: 13118
+	AegisName: "Tiny_Flame"
+	Name: "Fading Flame"
+	Type: "IT_WEAPON"
+	Weight: 100
+	Range: 7
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_ARMS"
+	WeaponLv: 1
+	EquipLv: 1
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Subtype: "W_REVOLVER"
+},
+{
+	Id: 13119
+	AegisName: "Freedom_Flame"
+	Name: "Freedom Flame"
+	Type: "IT_WEAPON"
+	Weight: 100
+	Atk: 100
+	Range: 7
+	Slots: 2
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_ARMS"
+	WeaponLv: 3
+	EquipLv: 99
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Subtype: "W_REVOLVER"
+},
+{
 	Id: 13120
 	AegisName: "H_FEATHER_H_FIRE"
 	Name: "Heaven's_Feather_&_Hell's_Fire"
@@ -102889,6 +102951,7 @@ item_db: (
 	Atk: 15
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
@@ -102904,6 +102967,7 @@ item_db: (
 	Atk: 30
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
@@ -102922,6 +102986,7 @@ item_db: (
 	Atk: 50
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
@@ -102937,6 +103002,7 @@ item_db: (
 	Atk: 50
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
@@ -102952,6 +103018,7 @@ item_db: (
 	Atk: 50
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
@@ -102970,6 +103037,7 @@ item_db: (
 	Atk: 50
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
@@ -102988,11 +103056,98 @@ item_db: (
 	Atk: 50
 	Job: {
 		Gunslinger: true
+		Rebellion: true
 	}
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
 	Script: <" bonus bAtkEle, Ele_Water; ">
 },
+{
+	Id: 13228
+	AegisName: "Flare_Bullet"
+	Name: "Flare Bullet"
+	Type: "IT_AMMO"
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+	Script: <" bonus bAtkEle, Ele_Fire; ">
+},
+{
+	Id: 13229
+	AegisName: "Lightning_Bullet"
+	Name: "Lightning Bullet"
+	Type: "IT_AMMO"
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+	Script: <" bonus bAtkEle, Ele_Wind; ">
+},
+{
+	Id: 13230
+	AegisName: "Ice_Bullet"
+	Name: "Ice Bullet"
+	Type: "IT_AMMO"
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+	Script: <" bonus bAtkEle, Ele_Water; ">
+},
+{
+	Id: 13231
+	AegisName: "Poison_Bullet"
+	Name: "Poison Bullet"
+	Type: "IT_AMMO"
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+	Script: <"
+		bonus bAtkEle, Ele_Poison;
+		bonus2 bAddEff, Eff_Poison, 500;
+	">
+},
+{
+	Id: 13232
+	AegisName: "Blind_Bullet"
+	Name: "Blind Bullet"
+	Type: "IT_AMMO"
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: {
+		Gunslinger: true
+		Rebellion: true
+	}
+	Loc: "EQP_AMMO"
+	Subtype: "A_BULLET"
+	Script: <"
+		bonus bAtkEle, Ele_Dark;
+		bonus2 bAddEff, Eff_Blind, 500;
+	">
+},
 
 //== Shurikens & Kunais ====================================
 {
@@ -153464,6 +153619,13 @@ item_db: (
 	Name: "S_Genesis_Earing"
 },
 {
+	Id: 25187
+	AegisName: "Slug_Bullet"
+	Name: "Slug Bullet"
+	Buy: 1200
+	Weight: 1200
+},
+{
 	Id: 25258
 	AegisName: "BrokenArrow"
 	Name: "BrokenArrow"