Skip to content

Commit

Permalink
Merge pull request #2816 from CombatExtended-Continued/CasingMoteCenter
Browse files Browse the repository at this point in the history 
Casing mote center to gun draw center
  • Loading branch information
@N7Huntsman
N7Huntsman authored Oct 20, 2023
2 parents 48e0bf5 + 2bdbd2a commit 186f7dd
Show file tree
Hide file tree
Showing 8 changed files with 2,335 additions and 2,090 deletions.
332 changes: 168 additions & 164 deletions Defs/Effects/Flecks.xml
View file
Original file line number Diff line number Diff line change
@@ -1,171 +1,175 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<!--=============== Thrown Bullet Casings ==============-->

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_EmptyCasing</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_BulletCasing</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_PistolAmmoCasings</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_PistolAmmoCasings</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_RifleAmmoCasings_Steel</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_SteelRifleAmmoCasings</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_RifleAmmoCasings_HighCal</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_RifleAmmoCasings_HighCal</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_ShotgunShell</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_ShotgunShell_Green</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell_Green</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_ShotgunShell_White</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell_White</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_ShotgunShell_Black</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell_Black</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_GrenadeLauncherAmmoCasings</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_GrenadeLauncherAmmoCasings</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_CannonShellCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_BigShell</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_BigShell</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_CannonShellCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_GrenadePin</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_GrenadePin</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="FleckBase_Thrown">
<defName>Fleck_DisposableLauncherCasing</defName>
<graphicData>
<texPath>Things/Filth/Filth_DisposableLauncherCasings/Filth_DisposableLauncherCasings</texPath>
<renderInstanced>true</renderInstanced>
<drawSize>(1.5,1.5)</drawSize>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<!--
<FleckDef ParentName="FleckBase" Name="CE_CasingFleckBase" Abstract="True">
<fleckSystemClass>CombatExtended.FleckSystem_Casing</fleckSystemClass>
<acceleration>(0,0,-5)</acceleration>
</FleckDef>

<!--=============== Thrown Bullet Casings ==============-->

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_EmptyCasing</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_BulletCasing</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_PistolAmmoCasings</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_PistolAmmoCasings</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_RifleAmmoCasings_Steel</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_SteelRifleAmmoCasings</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_RifleAmmoCasings_HighCal</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_RifleAmmoCasings_HighCal</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_ShotgunShell</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_ShotgunShell_Green</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell_Green</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_ShotgunShell_White</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell_White</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_ShotgunShell_Black</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_ShotgunShell_Black</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_ShotgunCasingImpact</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_GrenadeLauncherAmmoCasings</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_GrenadeLauncherAmmoCasings</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_CannonShellCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_BigShell</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_BigShell</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_CannonShellCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_GrenadePin</defName>
<graphicData>
<texPath>Things/Flecks/Fleck_GrenadePin</texPath>
<renderInstanced>true</renderInstanced>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<FleckDef ParentName="CE_CasingFleckBase">
<defName>Fleck_DisposableLauncherCasing</defName>
<graphicData>
<texPath>Things/Filth/Filth_DisposableLauncherCasings/Filth_DisposableLauncherCasings</texPath>
<renderInstanced>true</renderInstanced>
<drawSize>(1.5,1.5)</drawSize>
</graphicData>
<altitudeLayer>MoteOverhead</altitudeLayer>
<solidTime>3.0</solidTime>
<fadeOutTime>0.2</fadeOutTime>
<landSound>C_Impact_BulletCasing</landSound>
<collide>true</collide>
</FleckDef>

<!--
Keeping these as motes for now
-->

<!--
<FleckDef ParentName="FleckBase_Thrown">
<!--
<FleckDef ParentName="">
<defName>Mote_BigExplode</defName>
<graphicData>
<texPath>Things/Mote/Mote_BigExplode</texPath>
Expand All @@ -177,7 +181,7 @@
<growthRate>15</growthRate>
</FleckDef>
<FleckDef ParentName="FleckBase_Thrown">
<FleckDef ParentName="">
<defName>Mote_Firetrail</defName>
<graphicData>
<texPath>Things/Mote/Mote_Firetrail</texPath>
Expand Down
Loading

0 comments on commit 186f7dd

Please sign in to comment.