Merge pull request #2621 from dastgirp/script/rebellion

Added Rebellion Job Quest

3 files changed, 259 insertions, 1 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index adf425405..8163c540a 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -12626,6 +12626,42 @@ quest_db: (
 	Name: "About skills"
 },
 {
+	Id: 12340
+	Name: "Suspicious Person"
+},
+{
+	Id: 12341
+	Name: "New Challenge"
+},
+{
+	Id: 12342
+	Name: "Crafting Firearms"
+},
+{
+	Id: 12343
+	Name: "Target Practice"
+	Targets: (
+	{
+		MobId: 3169
+		Count: 10
+	},
+	)
+},
+{
+	Id: 12344
+	Name: "Wrong Target Practice"
+	Targets: (
+	{
+		MobId: 3170
+		Count: 3
+	},
+	)
+},
+{
+	Id: 12345
+	Name: "Transforming to Rebellion"
+},
+{
 	Id: 13101
 	Name: "The way of Taekwon"
 },
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"
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index c0c726f25..4f5c6ad9b 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -64487,7 +64487,43 @@ mob_db: (
 //2428,G_L_SEYREN
 //2429,G_L_EREMES
 //2430,G_L_HARWORD
-//2431,G_L_SHECIL
+{
+	Id: 2431
+	SpriteName: "G_L_SHECIL"
+	Name: "Hunter Shecil"
+	Lv: 98
+	Hp: 8835
+	Sp: 1
+	AttackRange: 14
+	Attack: [574, 223]
+	Def: 68
+	Mdef: 13
+	Stats: {
+		Str: 108
+		Agi: 113
+		Vit: 60
+		Int: 72
+		Dex: 148
+		Luk: 37
+	}
+	ViewRange: 10
+	ChaseRange: 12
+	Size: "Size_Medium"
+	Race: "RC_DemiHuman"
+	Element: ("Ele_Wind", 3)
+	Mode: {
+		CanMove: true
+		Aggressive: true
+		CanAttack: true
+		Angry: true
+		ChangeTargetMelee: true
+		ChangeTargetChase: true
+	}
+	MoveSpeed: 160
+	AttackDelay: 432
+	AttackMotion: 400
+	DamageMotion: 288
+},
 //2432,G_L_KATRINN
 //2433,G_L_MAGALETA
 //2434,G_L_YGNIZEM
@@ -83975,6 +84011,30 @@ mob_db: (
 //3156,EXPLORATION_ROVER
 //3166,M_E_DEVILING
 {
+	Id: 3169
+	SpriteName: "J_REB_SHECIL1"
+	Name: "Shooting Target"
+	Size: "Size_Small"
+	Race: "RC_Formless"
+	Element: ("Ele_Neutral", 1)
+	Mode: {
+		CanMove: true
+	}
+	MoveSpeed: 200
+},
+{
+	Id: 3170
+	SpriteName: "J_REB_SHECIL2"
+	Name: "Shooting Target"
+	Size: "Size_Small"
+	Race: "RC_Formless"
+	Element: ("Ele_Neutral", 1)
+	Mode: {
+		CanMove: true
+	}
+	MoveSpeed: 200
+},
+{
 	Id: 3181
 	SpriteName: "E1_FELOCK"
 	Name: "Captain Ferlock"