Fix some missing effects of Gunslinger & Rebellion bullets in PRE-RE and RE.

Added new Rebellion bullets in RENEWAL.

2 files changed, 326 insertions, 12 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 399f869eb..0d1edbf5b 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -72471,6 +72471,7 @@ item_db: (
 	Loc: 32768
 	EquipLv: 1
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
 },
 {
 	Id: 13201
@@ -72498,7 +72499,10 @@ item_db: (
 	Loc: 32768
 	EquipLv: 1
 	View: 3
-	Script: <" bonus2 bAddEff,Eff_Bleeding,100; ">
+	Script: <"
+		bonus bAtkEle, Ele_Neutral;
+		bonus2 bAddEff, Eff_Bleeding, 100;
+	">
 },
 {
 	Id: 13203
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 36c581ec7..ab744dfc7 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -77105,7 +77105,7 @@ item_db: (
 	Buy: 2
 	Weight: 350
 	BuyingStore: true
-	Script: <" getitem 13204,500; ">
+	Script: <" getitem Lighting_Sphere, 500; ">
 },
 {
 	Id: 12145
@@ -77115,7 +77115,7 @@ item_db: (
 	Buy: 2
 	Weight: 350
 	BuyingStore: true
-	Script: <" getitem 13206,500; ">
+	Script: <" getitem Blind_Sphere, 500; ">
 },
 {
 	Id: 12146
@@ -77125,7 +77125,7 @@ item_db: (
 	Buy: 2
 	Weight: 350
 	BuyingStore: true
-	Script: <" getitem 13205,500; ">
+	Script: <" getitem Poison_Sphere, 500; ">
 },
 {
 	Id: 12147
@@ -77135,7 +77135,7 @@ item_db: (
 	Buy: 2
 	Weight: 350
 	BuyingStore: true
-	Script: <" getitem 13207,500; ">
+	Script: <" getitem Freezing_Sphere, 500; ">
 },
 {
 	Id: 12148
@@ -77145,7 +77145,7 @@ item_db: (
 	Buy: 2
 	Weight: 350
 	BuyingStore: true
-	Script: <" getitem 13203,500; ">
+	Script: <" getitem Flare_Sphere, 500; ">
 },
 {
 	Id: 12149
@@ -77155,7 +77155,7 @@ item_db: (
 	Buy: 2
 	Weight: 250
 	BuyingStore: true
-	Script: <" getitem 13200,500; ">
+	Script: <" getitem Bullet, 500; ">
 },
 {
 	Id: 12150
@@ -77165,7 +77165,7 @@ item_db: (
 	Buy: 2
 	Weight: 250
 	BuyingStore: true
-	Script: <" getitem 13202,500; ">
+	Script: <" getitem Shell_Of_Blood, 500; ">
 },
 {
 	Id: 12151
@@ -77175,7 +77175,7 @@ item_db: (
 	Buy: 2
 	Weight: 250
 	BuyingStore: true
-	Script: <" getitem 13201,500; ">
+	Script: <" getitem Silver_Bullet, 500; ">
 },
 {
 	Id: 12152
@@ -91073,7 +91073,7 @@ item_db: (
 },
 {
 	Id: 13198
-	AegisName: "Tempest_"
+	AegisName: "Tempest"
 	Name: "Tempest"
 	Type: 5
 	Buy: 2200000
@@ -91093,7 +91093,7 @@ item_db: (
 },
 {
 	Id: 13199
-	AegisName: "Tempest"
+	AegisName: "Tempest_"
 	Name: "Tempest"
 	Type: 5
 	Buy: 2200000
@@ -91125,6 +91125,7 @@ item_db: (
 	Job: 0x01000000
 	Loc: 32768
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
 },
 {
 	Id: 13201
@@ -91150,7 +91151,10 @@ item_db: (
 	Job: 0x01000000
 	Loc: 32768
 	View: 3
-	Script: <" bonus2 bAddEff,Eff_Bleeding,100; ">
+	Script: <"
+		bonus bAtkEle, Ele_Neutral;
+		bonus2 bAddEff, Eff_Bleeding, 100;
+	">
 },
 {
 	Id: 13203
@@ -91256,6 +91260,7 @@ item_db: (
 	Job: 0x41000000
 	Loc: 32768
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
 },
 {
 	Id: 13211
@@ -91268,6 +91273,7 @@ item_db: (
 	Job: 0x41000000
 	Loc: 32768
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
 },
 {
 	Id: 13212
@@ -91280,6 +91286,7 @@ item_db: (
 	Job: 0x41000000
 	Loc: 32768
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
 },
 {
 	Id: 13213
@@ -91292,6 +91299,7 @@ item_db: (
 	Job: 0x41000000
 	Loc: 32768
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
 },
 {
 	Id: 13214
@@ -91304,6 +91312,191 @@ item_db: (
 	Job: 0x41000000
 	Loc: 32768
 	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
+},
+{
+	Id: 13215
+	AegisName: "Armor_Piercing_Bullet"
+	Name: "Armor-Piercing Bullet"
+	Type: 10
+	Buy: 15
+	Weight: 2
+	Atk: 50
+	Job: 0x41000000
+	Loc: 32768
+	EquipLv: 100
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Neutral; ">
+},
+{
+	Id: 13216
+	AegisName: "Blazing_Bullet"
+	Name: "Blazing Bullet"
+	Type: 10
+	Buy: 10
+	Weight: 2
+	Atk: 40
+	Job: 0x41000000
+	Loc: 32768
+	EquipLv: 100
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Fire; ">
+},
+{
+	Id: 13217
+	AegisName: "Freezing_Bullet"
+	Name: "Freezing Bullet"
+	Type: 10
+	Buy: 10
+	Weight: 2
+	Atk: 40
+	Job: 0x41000000
+	Loc: 32768
+	EquipLv: 100
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Water; ">
+},
+{
+	Id: 13218
+	AegisName: "Lightning_Bullet"
+	Name: "Lightning Bullet"
+	Type: 10
+	Buy: 10
+	Weight: 2
+	Atk: 40
+	Job: 0x41000000
+	Loc: 32768
+	EquipLv: 100
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Wind; ">
+},
+{
+	Id: 13219
+	AegisName: "Magic_Stone_Bullet"
+	Name: "Magic Stone Bullet"
+	Type: 10
+	Buy: 10
+	Weight: 2
+	Atk: 40
+	Job: 0x41000000
+	Loc: 32768
+	EquipLv: 100
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Earth; ">
+},
+{
+	Id: 13220
+	AegisName: "Purifying_Bullet"
+	Name: "Purifying Bullet"
+	Type: 10
+	Buy: 10
+	Weight: 2
+	Atk: 40
+	Job: 0x41000000
+	Loc: 32768
+	EquipLv: 100
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Holy; ">
+},
+{
+	Id: 13221
+	AegisName: "Silver_Bullet_"
+	Name: "Silver Bullet"
+	Type: 10
+	Buy: 5
+	Weight: 2
+	Atk: 15
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Holy; ">
+},
+{
+	Id: 13222
+	AegisName: "Shell_Of_Blood_"
+	Name: "Bloody Shell"
+	Type: 10
+	Buy: 10
+	Weight: 2
+	Atk: 30
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <"
+		bonus bAtkEle, Ele_Neutral;
+		bonus2 bAddEff, Eff_Bleeding, 100;
+	">
+},
+{
+	Id: 13223
+	AegisName: "Incendiary_Grenade"
+	Name: "Incendiary Grenade"
+	Type: 10
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Fire; ">
+},
+{
+	Id: 13224
+	AegisName: "Lightning_Grenade"
+	Name: "Lightning Grenade"
+	Type: 10
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Wind; ">
+},
+{
+	Id: 13225
+	AegisName: "Poison_Grenade"
+	Name: "Poison Grenade"
+	Type: 10
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <"
+		bonus bAtkEle, Ele_Poison;
+		bonus2 bAddEff, Eff_Poison, 500;
+	">
+},
+{
+	Id: 13226
+	AegisName: "Flash_Grenade"
+	Name: "Flash Grenade"
+	Type: 10
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <"
+		bonus bAtkEle, Ele_Dark;
+		bonus2 bAddEff, Eff_Blind, 500;
+	">
+},
+{
+	Id: 13227
+	AegisName: "Cyro_Grenade"
+	Name: "Cyro Grenade"
+	Type: 10
+	Buy: 15
+	Weight: 5
+	Atk: 50
+	Job: 0x01000000
+	Loc: 32768
+	View: 3
+	Script: <" bonus bAtkEle, Ele_Water; ">
 },
 
 //== Shurikens & Kunais ====================================
@@ -133749,6 +133942,123 @@ item_db: (
 	Script: <" percentheal 5,5; ">
 },
 {
+	Id: 22737
+	AegisName: "Bloody_Cartrige"
+	Name: "Bloody Bullet Case"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Shell_Of_Blood_, 500; ">
+},
+{
+	Id: 22738
+	AegisName: "Silver_Cartrige"
+	Name: "Silver Bullet Case"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Silver_Bullet_, 500; ">
+},
+{
+	Id: 22739
+	AegisName: "Lightning_Sphere_Pack"
+	Name: "Lightning Sphere Pack"
+	Type: 2
+	Buy: 2
+	Weight: 350
+	Script: <" getitem Lightning_Grenade, 500; ">
+},
+{
+	Id: 22740
+	AegisName: "Blind_Sphere_Pack"
+	Name: "Blind Sphere Pack"
+	Type: 2
+	Buy: 2
+	Weight: 350
+	Script: <" getitem Flash_Grenade, 500; ">
+},
+{
+	Id: 22741
+	AegisName: "Poison_Sphere_Pack"
+	Name: "Poison Sphere Pack"
+	Type: 2
+	Buy: 2
+	Weight: 350
+	Script: <" getitem Poison_Grenade, 500; ">
+},
+{
+	Id: 22742
+	AegisName: "Freezing_Sphere_Pack"
+	Name: "Freezing Sphere Pack"
+	Type: 2
+	Buy: 2
+	Weight: 350
+	Script: <" getitem Cyro_Grenade, 500; ">
+},
+{
+	Id: 22743
+	AegisName: "Flare_Sphere_Pack"
+	Name: "Flare Sphere Pack"
+	Type: 2
+	Buy: 2
+	Weight: 350
+	Script: <" getitem Incendiary_Grenade, 500; ">
+},
+{
+	Id: 22744
+	AegisName: "Armor_Piercing_Cartrige"
+	Name: "Armor-Piercing Cartrige"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Armor_Piercing_Bullet, 500; ">
+},
+{
+	Id: 22745
+	AegisName: "Incandescence_Shot_Cartridge"
+	Name: "Incandescence Shot Cartridge"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Blazing_Bullet, 500; ">
+},
+{
+	Id: 22746
+	AegisName: "Glaciation_Shot_Cartridge"
+	Name: "Glaciation Shot Cartridge"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Freezing_Bullet, 500; ">
+},
+{
+	Id: 22747
+	AegisName: "Dengeki_Shot_Cartridge"
+	Name: "Dengeki Shot Cartridge"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Lightning_Bullet, 500; ">
+},
+{
+	Id: 22748
+	AegisName: "Hearthstone_Shot_Cartridge"
+	Name: "Hearthstone Shot Cartridge"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Magic_Stone_Bullet, 500; ">
+},
+{
+	Id: 22749
+	AegisName: "Purification_Shot_Cartridge"
+	Name: "Purification Shot Cartridge"
+	Type: 2
+	Buy: 2
+	Weight: 250
+	Script: <" getitem Purifying_Bullet, 500; ">
+},
+{
 	Id: 22777
 	AegisName: "Buff_Gift_Set"
 	Name: "Buff Gift Set"