Skip to content

Commit

Permalink
Add Boombardier SFX, crosshair, extenstion combos, add #739
Browse files Browse the repository at this point in the history
- Add early detonation with fire extension
- Add explosive barrel variant with enlarger extension
- Add trashuplink detonation targeting
- Remove crosshairs when spectating
- Fix issue where decals could be placed on AiTargetPosition prefab
- Add explosion screen shakes for closing #739
- Add new secret names and loading screen tips
  • Loading branch information
Fueredoriku committed Dec 1, 2024
1 parent 300c01d commit f39fb14
Show file tree
Hide file tree
Showing 33 changed files with 832 additions and 37 deletions.
8 changes: 8 additions & 0 deletions Assets/Audio/Augments/boomBardier.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Assets/Audio/Augments/boomBardier/BoomBardier.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
m_Name: BoomBardier
m_EditorClassIdentifier:
sounds:
- {fileID: 8300000, guid: 25ffafe1977fbde459c8cd438086b78a, type: 3}
semitoneRange:
min: -5
max: 0
continuousPitchBend: 0
volumeRange:
min: 0.8990219
max: 1
is3D: 1
shouldPlayInSplitscreen: 1
8 changes: 8 additions & 0 deletions Assets/Audio/Augments/boomBardier/BoomBardier.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Audio/Augments/boomBardier/boomBardierShot.mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 116 additions & 1 deletion Assets/Prefabs/GunParts/Bullets/StickyDynamiteStick.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,120 @@ VFXRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &3373628028266271307
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4153152802966413163}
- component: {fileID: 7822331909276670013}
- component: {fileID: 6997668613973519752}
m_Layer: 3
m_Name: ShockWave
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4153152802966413163
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3373628028266271307}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.51, y: 0.51, z: 0.51}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6344376435459863123}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!2083052967 &7822331909276670013
VisualEffect:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3373628028266271307}
m_Enabled: 0
m_Asset: {fileID: 8926484042661614526, guid: 6981c21faa5329a468335451ba63132b, type: 3}
m_InitialEventName: OnPlay
m_InitialEventNameOverriden: 1
m_StartSeed: 0
m_ResetSeedOnPlay: 1
m_AllowInstancing: 1
m_ResourceVersion: 1
m_PropertySheet:
m_Float:
m_Array:
- m_Value: 0.1
m_Name: Size
m_Overridden: 0
m_Vector2f:
m_Array: []
m_Vector3f:
m_Array: []
m_Vector4f:
m_Array: []
m_Uint:
m_Array: []
m_Int:
m_Array: []
m_Matrix4x4f:
m_Array: []
m_AnimationCurve:
m_Array: []
m_Gradient:
m_Array: []
m_NamedObject:
m_Array: []
m_Bool:
m_Array: []
--- !u!73398921 &6997668613973519752
VFXRenderer:
serializedVersion: 1
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3373628028266271307}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &6250359422203994716
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -364,7 +478,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 4153152802966413163}
m_Father: {fileID: 526888926941635231}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
115 changes: 114 additions & 1 deletion Assets/Prefabs/GunParts/DynamiteBarrel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ GameObject:
- component: {fileID: 4593536943137362801}
- component: {fileID: -4580984059022627980}
- component: {fileID: 2432424435679735251}
- component: {fileID: 409957007994980770}
- component: {fileID: 7122751467370419192}
m_Layer: 0
m_Name: DynamiteBarrel
m_TagString: Untagged
Expand Down Expand Up @@ -182,12 +184,13 @@ MonoBehaviour:
outputs:
- {fileID: 4039450451453750485}
midpoint: {fileID: 9063465194214752546}
crossHairMode: 0
crossHairMode: 3
attachmentPoints:
- {fileID: 5295543331499923172}
muzzleFlash: {fileID: 2901028697059851447}
stickyModifer: {fileID: 2432424435679735251}
explodingBarrelMesh: {fileID: 2750013030952444713, guid: 225f0cc88b163c5469afdd1e4ab9b70c, type: 3}
meshProjectiles: {fileID: 4593536943137362801}
--- !u!114 &4593536943137362801
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -247,12 +250,122 @@ MonoBehaviour:
stuckObject: {fileID: 1164456291252445790, guid: 2eb9af49dc0f4124a8d06d0a77c5b22c, type: 3}
isDespawnedAfterTime: 0
stuckLifeTime: 5
maxObjects: 20
triggerOnHit: 0
onHitInterval: 1
affectedLayers:
serializedVersion: 2
m_Bits: 4294967295
priority: 4
--- !u!82 &409957007994980770
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5146486171313696063}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &7122751467370419192
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5146486171313696063}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aae53bd787064924e95013b68e33af86, type: 3}
m_Name:
m_EditorClassIdentifier:
firingSound: {fileID: 11400000, guid: 83ebc3c9a2cdc6049822b4ea1e94340d, type: 2}
--- !u!1 &5383569926040901172
GameObject:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Input/AITargetPosition.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 3354261919955842085}
m_Layer: 2
m_Name: AITargetPosition
m_TagString: Untagged
m_TagString: NoDecal
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down
9 changes: 9 additions & 0 deletions Assets/Prefabs/UI/LoadingScreen.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,15 @@ MonoBehaviour:
- The pan extension <sprite name="extension_white"> can do a super slide by performing
a leap directly into a pan skate!
- Some barrels <sprite name="barrel_white"> grant extra damage on headshots!
- Combining the BOOM-bardier barrel <sprite name="barrel_white"> with the Fire
extension <sprite name="extension_white"> lets you detonate the dynamites <i>before</i>
they hit the ground!
- Combining the BOOM-bardier barrel <sprite name="barrel_white"> with the Fire
extension <sprite name="extension_white"> lets you detonate the dynamites <i>before</i>
they hit the ground!
- Combining the BOOM-bardier barrel <sprite name="barrel_white"> with the Enlarger
extension <sprite name="extension_white"> turns your dynamites into explosive
barrels. Trick your opponents by hiding them well!
background: {fileID: 8814292908430132048}
mandatoryDuration: 4
normalRotationSpeed: 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,18 @@ MonoBehaviour:
Extension: {fileID: 11400000, guid: 6955edf1e31801642a2f47defb820d36, type: 2}
Name: The Turbocharged Point&Click Adventure
Achievement: 20
- Body: {fileID: 11400000, guid: bdea3807a64796f4da3038c849234215, type: 2}
Barrel: {fileID: 11400000, guid: 42441b7c0dcc82c43a745456680f2693, type: 2}
Extension: {fileID: 11400000, guid: a0f539379f7384445bc1535317457198, type: 2}
Name: The Unpatient S'ploder
Achievement: 21
- Body: {fileID: 11400000, guid: 63bf1979c291d114b8dfb8d01bb407a9, type: 2}
Barrel: {fileID: 11400000, guid: 42441b7c0dcc82c43a745456680f2693, type: 2}
Extension: {fileID: 11400000, guid: 1e8a76909fc7b284dae3c37ebcf4d7ce, type: 2}
Name: The Barrel Imposter
Achievement: 22
- Body: {fileID: 11400000, guid: a99e4b806f963ac45a0635c34182107a, type: 2}
Barrel: {fileID: 11400000, guid: 42441b7c0dcc82c43a745456680f2693, type: 2}
Extension: {fileID: 11400000, guid: 87e98f42380f122a486cd5034ef1d278, type: 2}
Name: The Tactical Strike
Achievement: 23
Loading

0 comments on commit f39fb14

Please sign in to comment.