diff --git a/1.5/1.5/Assemblies/DragonianMix.dll b/1.5/1.5/Assemblies/DragonianMix.dll
index d666414..b2f3d7b 100644
Binary files a/1.5/1.5/Assemblies/DragonianMix.dll and b/1.5/1.5/Assemblies/DragonianMix.dll differ
diff --git a/1.5/1.5/Assemblies/DragonianMix.pdb b/1.5/1.5/Assemblies/DragonianMix.pdb
index 71e1e5f..d4d27f8 100644
Binary files a/1.5/1.5/Assemblies/DragonianMix.pdb and b/1.5/1.5/Assemblies/DragonianMix.pdb differ
diff --git a/1.5/1.5/Defs/Damage_Defs/DRM_Damages.xml b/1.5/1.5/Defs/Damage_Defs/DRM_Damages.xml
index ad39033..b6bf898 100644
--- a/1.5/1.5/Defs/Damage_Defs/DRM_Damages.xml
+++ b/1.5/1.5/Defs/Damage_Defs/DRM_Damages.xml
@@ -25,6 +25,7 @@
0
0
0
+ true
@@ -82,7 +83,7 @@
DRM_CryoShock
- 0.02
+ 0.01
DRM_Hediff_FrostCoverd_after
@@ -118,7 +119,7 @@
DRM_CryoShock
- 0.02
+ 0.01
Heat
@@ -184,6 +185,25 @@
false
+
+ DRM_Damage_AcidCover_Ex
+
+
+
+ DRM_AcidCoverd_Ex
+ 0.01
+
+
+ DRM_AcidCoverd
+ 0.01
+
+
+ DamageWorker_AddInjury
+ Sharp
+ AcidBurn
+ false
+
+
DRM_RangedStab
diff --git a/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml b/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml
index dd955bb..f3dd3b1 100644
--- a/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml
+++ b/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml
@@ -275,7 +275,7 @@
DRM_AcidCoverd
- This preson is coverd with acid .
+ This preson is coverd with acid.
(1, 1, 0.8)
DragonianMix.HediffCurseFlame
@@ -515,9 +515,9 @@
- DRM_Frostbite
- 1~1
- 40
+ Stun
+ 1~2
+ 80
@@ -764,9 +764,9 @@
- DRM_Hediff_FrostCoverd
-
- This preson is coverd with Frozen cloud.
+ DRM_AcidCoverd_Ex
+
+ This preson is coverd with acid.
(1, 1, 0.8)
HediffWithComps
@@ -774,15 +774,15 @@
-4
- DRM_Damage_FrostCoverd_after
+ DRM_AcidBurn
Explosion_Stun
3
true
- 0
+ 5
0.10
60~120
- DRM_FrostGasCloud_Ex
- 1
+ DRM_AcidGasCloud
+ 0.1
1
@@ -795,52 +795,37 @@
0.2
-
-
- Moving
- -0.1
-
-
+
+ 1.25
+
0.35
-
-
- Moving
- -0.2
-
-
+
+ 1.75
+
0.5
-
-
- Moving
- -0.3
-
-
+
+ 2.35
+
0.65
-
-
- Moving
- -0.4
-
-
+
+ 2.85
+
0.85
-
-
- Moving
- -0.5
-
-
+
+ 3.25
+
diff --git a/1.5/1.5/Defs/PawnKinds/DRM_PawnKinds_Dragonian_NPC.xml b/1.5/1.5/Defs/PawnKinds/DRM_PawnKinds_Dragonian_NPC.xml
index 96e9e7d..3a1ccd3 100644
--- a/1.5/1.5/Defs/PawnKinds/DRM_PawnKinds_Dragonian_NPC.xml
+++ b/1.5/1.5/Defs/PawnKinds/DRM_PawnKinds_Dragonian_NPC.xml
@@ -316,7 +316,7 @@
1
- DR_BattleStaff
+ DR_BattleStaff_Ranged
900
@@ -469,7 +469,7 @@
- DR_BattleStaff
+ DR_BattleStaff_Ranged
900
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
index 610de89..30e79ec 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
@@ -366,7 +366,7 @@
- DR_BattleStaff
+ DR_BattleStaff_Ranged
WeaponsRanged
@@ -429,6 +429,105 @@
DRHammerSound
+
+ DR_BattleStaff_AcidAir
+
+ A Staff for Dragonian.Can Shoot AcidAirCannon.
+
+ Dragonian/Things/Weapon/staff
+ Graphic_Single
+ CutoutComplex
+
+ 1
+ Medieval
+
+ 12000
+ 15
+ 0.60
+ 0.70
+ 0.65
+ 0.55
+ 1.70
+
+ 45
+ 80
+
+ Metallic
+
+
+ 40
+ 40
+ 5
+
+
+
+ 10
+
+
+
+ DR_BattleStaff_Ranged
+
+
+ WeaponsRanged
+
+
+ Ranged
+
+
+
+ Verb_Shoot
+ true
+ DRM_Bullet_AcidAirCannon
+ 2.4
+ 23.9
+ 1.9
+ 1
+ Shot_IncendiaryLauncher
+ GunTail_Medium
+ 14
+
+ true
+
+
+
+
+
+
+
+ Poke
+
+ 8
+ 2
+
+
+
+
+ Blunt
+ Demolish
+
+ 15
+
+
+ DRM_Arc
+ 15
+ 1
+
+
+ Stun
+ 1.5
+ 0.25
+
+
+ 5.2
+
+
+
+ 0.50
+ 0.083
+
+ DRHammerSound
+
+
DRM_Bullet_AirCannon
@@ -449,6 +548,26 @@
+
+ DRM_Bullet_AcidAirCannon
+
+
+ Things/Projectile/LauncherShot
+ Graphic_Single
+ TransparentPostLight
+ (111,111,111)
+
+ Projectile_Explosive
+
+ DRM_Damage_AcidCover_Ex
+ 10
+ 1.9
+ 3
+ 50
+ ThumpCannon_Impact
+
+
+
DR_BattleSpear
diff --git a/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml b/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml
index d573017..dfc103a 100644
--- a/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml
+++ b/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml
@@ -1,130 +1,135 @@
-
+
+ DRM_Bullet_BattleStaff_FlareSpewer
+
+ DragonianMix.FlamethrowProjectile
+
+ Dragonian/Projectile/Proj_HeavyFlamer
+ Dragonian/Projectile/Proj_HeavyFlamerFadeOut
+ MoteGlow
+
+
+ DRM_Flame
+ 50
+ 5
+
+
+ true
+ 100
+ 0.75
+ 1
+ (0, 0, -1)
+ 1.15
+ 2
+ 5
+ 20
+ true
+ 2
+
+
+
DR_BattleStaff_Flare
A Staff for Dragonian.Can Spray Fire shoot.
- Dragonian/Things/Weapon/staff
- Graphic_Single
- CutoutComplex
+ Dragonian/Things/Weapon/staff
+ Graphic_Single
+ CutoutComplex
1
Medieval
- 12000
- 15
- 0.60
- 0.70
- 0.65
- 0.55
- 1.70
-
+ 12000
+ 15
+ 0.60
+ 0.70
+ 0.65
+ 0.55
+ 1.70
+
45
80
- Metallic
-
+ Metallic
+
- 40
- 40
- 5
-
+ 40
+ 40
+ 5
+
-
- 10
-
+
+ 10
+
- DR_BattleStaff
+ DR_BattleStaff_Ranged
- WeaponsRanged
-
-
- Ranged
-
-
-
- Verb_ArcSprayIncinerator
- true
- 0.5
- 22.9
- 5.9
- 11
- 15
- false
- true
- 4
- 5
- DRM_Flame
- GunTail_Medium
- 9
- Flamethrower_Firing
- Fleck_IncineratorBeamBurn
- 0.32
- 0
- 0.1
- IncineratorBeam_End
- 0.8
- 0.55~0.85
- true
- true
- true
- true
- true
- (180, 60, 10)
- (220, 210, 20)
-
- true
-
-
-
- (0.6, 0)
- (0.7, 0.2)
- (1.2, 0.8)
-
-
- Combat_RangedFlamethrower
-
-
-
-
-
-
- Poke
-
- 8
- 2
-
-
-
-
- Blunt
- Demolish
-
- 15
-
-
- DRM_Flame
- 30
- 1
-
-
- Stun
- 1.5
- 0.25
-
-
- 5.2
-
+ WeaponsRanged
+
+
+ Ranged
+
+
+
+ Verb_Shoot
+ true
+ DRM_Bullet_BattleStaff_FlareSpewer
+ 3
+ 1.25
+ 22.9
+ 1
+ Flamethrower_Firing_Resolve
+ GunTail_Light
+ 50
+ 5.9
+ 1
+
+ true
+
+ true
+ Combat_RangedFlamethrower
+
+
+
+
+
+
+ Poke
+
+ 8
+ 2
+
+
+
+
+ Blunt
+ Demolish
+
+ 15
+
+
+ DRM_Flame
+ 30
+ 1
+
+
+ Stun
+ 1.5
+ 0.25
+
+
+ 5.2
+
- 0.50
- 0.083
+ 0.50
+ 0.083
DRHammerSound
-
+
\ No newline at end of file
diff --git a/1.5/Bio1.5/Defs/ThingDefs/DRM_Weapon_bio.xml b/1.5/Bio1.5/Defs/ThingDefs/DRM_Weapon_bio.xml
index d70a4d9..47afa8c 100644
--- a/1.5/Bio1.5/Defs/ThingDefs/DRM_Weapon_bio.xml
+++ b/1.5/Bio1.5/Defs/ThingDefs/DRM_Weapon_bio.xml
@@ -37,7 +37,7 @@
- DR_BattleStaff
+ DR_BattleStaff_Ranged
WeaponsRanged
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerA.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerA.png
new file mode 100644
index 0000000..f73f0bb
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerA.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerB.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerB.png
new file mode 100644
index 0000000..74a7a96
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerB.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerC.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerC.png
new file mode 100644
index 0000000..43f60f8
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerC.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerD.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerD.png
new file mode 100644
index 0000000..0dd1f22
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerD.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerE.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerE.png
new file mode 100644
index 0000000..b5db94f
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerE.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerF.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerF.png
new file mode 100644
index 0000000..9a43560
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerF.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerG.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerG.png
new file mode 100644
index 0000000..d576c79
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerG.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerH.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerH.png
new file mode 100644
index 0000000..f1384d0
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerH.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerI.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerI.png
new file mode 100644
index 0000000..462c1b1
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerI.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerJ.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerJ.png
new file mode 100644
index 0000000..9e90fbb
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerJ.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerK.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerK.png
new file mode 100644
index 0000000..4db17c8
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerK.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerL.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerL.png
new file mode 100644
index 0000000..cd3e1fc
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerL.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerM.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerM.png
new file mode 100644
index 0000000..3316917
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerM.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerN.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerN.png
new file mode 100644
index 0000000..899100d
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerN.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerO.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerO.png
new file mode 100644
index 0000000..db0e67b
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerO.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerP.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerP.png
new file mode 100644
index 0000000..e92517a
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerP.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerR.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerR.png
new file mode 100644
index 0000000..6adc4bf
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerR.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerS.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerS.png
new file mode 100644
index 0000000..1f1c2a9
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerS.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerT.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerT.png
new file mode 100644
index 0000000..6b4d740
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerT.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerU.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerU.png
new file mode 100644
index 0000000..d146f66
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerU.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerW.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerW.png
new file mode 100644
index 0000000..ebdf0cd
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerW.png differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerX.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerX.png
new file mode 100644
index 0000000..266c61e
Binary files /dev/null and b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerX.png differ