This repository has been archived by the owner on Apr 14, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #263 from NoImageAvailable/Development
Development
- Loading branch information
Showing
195 changed files
with
4,963 additions
and
1,408 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <Defs> | ||
|
|
||
| <ThingCategoryDef> | ||
| <defName>Ammo15x65mmDiffusingCharged</defName> | ||
| <label>15x65mm Diffusing Charged</label> | ||
| <parent>AmmoAdvanced</parent> | ||
| <iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath> | ||
| </ThingCategoryDef> | ||
|
|
||
| <!-- ==================== AmmoSet ========================== --> | ||
|
|
||
| <CombatExtended.AmmoSetDef> | ||
| <defName>AmmoSet_15x65mmDiffusingCharged</defName> | ||
| <label>15x65mm Diffusing Charged</label> | ||
| <ammoTypes> | ||
| <Ammo_15x65mmDiffusingCharged_Buck>Bullet_15x65mmDiffusingCharged_Buck</Ammo_15x65mmDiffusingCharged_Buck> | ||
| </ammoTypes> | ||
| </CombatExtended.AmmoSetDef> | ||
|
|
||
| <!-- ==================== Ammo ========================== --> | ||
|
|
||
| <ThingDef Name="15x65mmDiffusingChargedBase" ParentName="SmallAmmoBase" Abstract="True"> | ||
| <description>Mechanoid-built cartridge designed to split upon firing.</description> | ||
| <statBases> | ||
| <Mass>0.05</Mass> | ||
| <Bulk>0.07</Bulk> | ||
| </statBases> | ||
| <thingCategories> | ||
| <li>Ammo15x65mmDiffusingCharged</li> | ||
| </thingCategories> | ||
| </ThingDef> | ||
|
|
||
| <ThingDef ParentName="15x65mmDiffusingChargedBase"> | ||
| <defName>Ammo_15x65mmDiffusingCharged_Buck</defName> | ||
| <label>15x65mm Diffusing Charged cartridge</label> | ||
| <graphicData> | ||
| <texPath>Things/Ammo/Charged/Regular</texPath> | ||
| <graphicClass>Graphic_StackCount</graphicClass> | ||
| </graphicData> | ||
| <statBases> | ||
| <MarketValue>0.44</MarketValue> | ||
| </statBases> | ||
| <ammoClass>BuckShot</ammoClass> | ||
| <cookOffProjectile>Bullet_15x65mmDiffusingCharged_Buck</cookOffProjectile> | ||
| </ThingDef> | ||
|
|
||
| <!-- ================== Projectiles ================== --> | ||
|
|
||
| <ThingDef Name="Base15x65mmDiffusingChargedBullet" ParentName="BaseBullet" Abstract="true"> | ||
| <projectile> | ||
| <damageDef>Bullet</damageDef> | ||
| <speed>112</speed> | ||
| <casingMoteDefName>Mote_ShotgunShell</casingMoteDefName> | ||
| </projectile> | ||
| </ThingDef> | ||
|
|
||
| <ThingDef ParentName="Base15x65mmDiffusingChargedBullet"> | ||
| <defName>Bullet_15x65mmDiffusingCharged_Buck</defName> | ||
| <label>buckshot charged</label> | ||
| <graphicData> | ||
| <texPath>Things/Projectile/Charged/charge_regular</texPath> | ||
| <graphicClass>Graphic_Single</graphicClass> | ||
| </graphicData> | ||
| <projectile> | ||
| <damageAmountBase>6</damageAmountBase> | ||
| <pelletCount>8</pelletCount> | ||
| <secondaryDamage> | ||
| <li> | ||
| <def>Bomb_Secondary</def> | ||
| <amount>4</amount> | ||
| </li> | ||
| </secondaryDamage> | ||
| <armorPenetration>0.65</armorPenetration> | ||
| <spreadMult>17.8</spreadMult> | ||
| </projectile> | ||
| </ThingDef> | ||
|
|
||
| <!-- ==================== Recipes ========================== --> | ||
|
|
||
| </Defs> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <Defs> | ||
|
|
||
| <ThingCategoryDef> | ||
| <defName>Ammo60x225mmGammaShell</defName> | ||
| <label>60x225mm Gamma Shell</label> | ||
| <parent>AmmoAdvanced</parent> | ||
| <iconPath>UI/Icons/ThingCategories/CaliberFuelLarge</iconPath> | ||
| </ThingCategoryDef> | ||
|
|
||
| <!-- ==================== AmmoSet ========================== --> | ||
|
|
||
| <CombatExtended.AmmoSetDef> | ||
| <defName>AmmoSet_60x225mmGamma</defName> | ||
| <label>60x225mm Gamma Shell</label> | ||
| <ammoTypes> | ||
| <Ammo_60x225mmGamma_Standard>Bullet_60x225mmGamma_Standard</Ammo_60x225mmGamma_Standard> | ||
| </ammoTypes> | ||
| </CombatExtended.AmmoSetDef> | ||
|
|
||
| <!-- ==================== Ammo ========================== --> | ||
|
|
||
| <ThingDef Name="60x225mmGammaBase" ParentName="SmallAmmoBase" Abstract="True"> | ||
| <description>Shell containing large amounts of ionising gamma radiation.</description> | ||
| <statBases> | ||
| <Mass>2.5</Mass> | ||
| <Bulk>7</Bulk> | ||
| </statBases> | ||
| <thingCategories> | ||
| <li>Ammo60x225mmGammaShell</li> | ||
| </thingCategories> | ||
| <stackLimit>25</stackLimit> | ||
| </ThingDef> | ||
|
|
||
| <ThingDef ParentName="60x225mmGammaBase"> | ||
| <defName>Ammo_60x225mmGamma_Standard</defName> | ||
| <label>60x225mm Gamma Shell (Standard)</label> | ||
| <graphicData> | ||
| <texPath>Things/Ammo/FuelCell/Large</texPath> | ||
| <graphicClass>Graphic_StackCount</graphicClass> | ||
| </graphicData> | ||
| <statBases> | ||
| <MarketValue>28.98</MarketValue> | ||
| </statBases> | ||
| <ammoClass>RadiationIonising</ammoClass> | ||
| <comps> | ||
| <li Class="CombatExtended.CompProperties_ExplosiveCE"> | ||
| <explosionDamage>12</explosionDamage> | ||
| <explosionDamageDef>Burn</explosionDamageDef> | ||
| <explosionRadius>3.5</explosionRadius> | ||
| <soundExplode>MortarIncendiary_Explode</soundExplode> | ||
| </li> | ||
| </comps> | ||
| </ThingDef> | ||
|
|
||
| <!-- ================== Projectiles ================== --> | ||
|
|
||
| <ThingDef ParentName="BaseBullet"> | ||
| <defName>Bullet_60x225mmGamma_Standard</defName> | ||
| <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass> | ||
| <label>radiation cannon shell</label> | ||
| <graphicData> | ||
| <texPath>Things/Projectile/InfernoCannonShot</texPath> | ||
| <graphicClass>Graphic_Single</graphicClass> | ||
| <shaderType>TransparentPostLight</shaderType> | ||
| </graphicData> | ||
| <projectile> | ||
| <damageDef>Burn</damageDef> | ||
| <damageAmountBase>12</damageAmountBase> | ||
| <speed>90</speed> | ||
| <flyOverhead>false</flyOverhead> | ||
| <explosionRadius>3.5</explosionRadius> | ||
| <soundExplode>MortarIncendiary_Explode</soundExplode> | ||
| <soundHitThickRoof>ArtilleryHitThickRoof</soundHitThickRoof> | ||
| <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate> | ||
| <soundAmbient>MortarRound_Ambient</soundAmbient> | ||
| </projectile> | ||
| </ThingDef> | ||
|
|
||
| <!-- ==================== Recipes ========================== --> | ||
|
|
||
| </Defs> |
Oops, something went wrong.