@@ -28143,19 +28143,47 @@
2814328143 m_strValue = "8"
2814428144 m_strCSSClass = "duration"
2814528145 }
28146- BarrelDamage =
28146+ ImpactDamage =
2814728147 {
28148- m_strValue = 80
28148+ m_strValue = 40
2814928149 m_strCSSClass = "tech_damage"
2815028150 m_subclassScaleFunction = subclass:
2815128151 {
2815228152 _class = "scale_function_tech_damage"
28153- _my_subclass_name = "BarrelDamage_scale_function"
28154- m_flStatScale = 1.05
28153+ _my_subclass_name = "BarrelImpactDamage_scale_function"
28154+ m_flStatScale = 0.525
2815528155 m_eSpecificStatScaleType = "ETechPower"
2815628156 }
2815728157 m_bIsAbilityDamageProperty = true
2815828158 }
28159+ DPS =
28160+ {
28161+ m_strValue = 13.3333
28162+ m_strCSSClass = "tech_damage"
28163+ m_subclassScaleFunction = subclass:
28164+ {
28165+ _class = "scale_function_tech_damage"
28166+ _my_subclass_name = "BarrelDPS_scale_function"
28167+ m_flStatScale = 0.175
28168+ m_eSpecificStatScaleType = "ETechPower"
28169+ }
28170+ m_bIsAbilityDamageProperty = true
28171+ }
28172+ BurnDuration =
28173+ {
28174+ m_strValue = "3"
28175+ m_strCSSClass = "duration"
28176+ m_subclassScaleFunction = subclass:
28177+ {
28178+ _class = "scale_function_tech_duration"
28179+ _my_subclass_name = "BurnDuration_scale_function"
28180+ }
28181+ }
28182+ TickRate =
28183+ {
28184+ m_strValue = "0.5"
28185+ m_bIsHidden = true
28186+ }
2815928187 BarrelRollSpeedMoveMin =
2816028188 {
2816128189 m_strValue = "20m"
@@ -28288,16 +28316,26 @@
2828828316 m_vecPropertyUpgrades =
2828928317 [
2829028318 {
28291- m_strPropertyName = "BarrelDamage"
28292- m_strBonus = "80"
28319+ m_strPropertyName = "ImpactDamage"
28320+ m_strBonus = "40"
28321+ },
28322+ {
28323+ m_strPropertyName = "DPS"
28324+ m_strBonus = "13.3333"
2829328325 },
2829428326 {
2829528327 m_strPropertyName = "AbilityCooldownBetweenCharge"
2829628328 m_strBonus = "-5"
2829728329 },
2829828330 {
28299- m_strPropertyName = "BarrelDamage"
28300- m_strBonus = 0.5
28331+ m_strPropertyName = "ImpactDamage"
28332+ m_strBonus = 0.25
28333+ m_eUpgradeType = "EAddToScale"
28334+ m_eScaleStatFilter = "ETechPower"
28335+ },
28336+ {
28337+ m_strPropertyName = "DPS"
28338+ m_strBonus = 0.083333
2830128339 m_eUpgradeType = "EAddToScale"
2830228340 m_eScaleStatFilter = "ETechPower"
2830328341 },
@@ -28316,10 +28354,10 @@
2831628354 m_vecAbilityProperties =
2831728355 [
2831828356 {
28319- m_strImportantProperty = "ArmTime"
28357+ m_strImportantProperty = "ImpactDamage"
2832028358 },
2832128359 {
28322- m_strImportantProperty = "BarrelDamage"
28360+ m_strImportantProperty = "DPS"
2832328361 },
2832428362 {
2832528363 m_strImportantProperty = "StatusEffectDisplacement"
@@ -28329,6 +28367,11 @@
2832928367 ]
2833028368 },
2833128369 ]
28370+ m_vecBasicProperties =
28371+ [
28372+ "BurnDuration",
28373+ "ArmTime",
28374+ ]
2833228375 },
2833328376 ]
2833428377 }
@@ -28337,6 +28380,17 @@
2833728380 m_BarrelExplodeParticle = resource_name:"particles/abilities/astro/astro_barrel_explode.vpcf"
2833828381 m_MirvExplodeParticle = resource_name:"particles/abilities/engineer/engineer_barrage_explode.vpcf"
2833928382 m_BarrelBurnParticle = resource_name:"particles/abilities/astro/astro_barrel_rope_burn.vpcf"
28383+ m_BurnModifier = subclass:
28384+ {
28385+ _class = "modifier_base_dot"
28386+ _my_subclass_name = "barrel_burn"
28387+ m_nAttributes = "MODIFIER_ATTRIBUTE_MULTIPLE"
28388+ m_sDOTParticle = resource_name:"particles/abilities/inferno/inferno_afterburn_debuff.vpcf"
28389+ m_strParticleStatusEffect = resource_name:"particles/status_fx/status_fx_afterburn.vpcf"
28390+ m_sLocalizationName = "modifier_astro_barrel_burn"
28391+ m_eModifierDisplayLocaiton = "MODIFIER_DISPLAY_HEALTHBAR"
28392+ m_eDebuffType = "MODIFIER_DEBUFF_YES"
28393+ }
2834028394 m_strExplodeSound = soundevent:"Ability.Astro.ExpBarrels.Explode"
2834128395 m_strMirvExplodeSound = soundevent:"Ability.Astro.ExpBarrels.Explode"
2834228396 m_strRiccochetSound = soundevent:"Astro.ExpBarrels.Bullet.Ricochet"
@@ -48104,7 +48158,7 @@
4810448158 m_flSpreadPerShot = 0.15
4810548159 m_AimingShootSpreadPenalty = [ 0.0, 0.4 ]
4810648160 m_strBulletImpactSound = soundevent:"McGinnis.Wpn.Impact"
48107- m_flBulletDamage = 6.4
48161+ m_flBulletDamage = 6.08
4810848162 m_strFirstShotSound = soundevent:"McGinnis.Wpn.Fire.First"
4810948163 m_strShotReleaseSound = soundevent:"McGinnis.Wpn.Fire.Release"
4811048164 }
@@ -49182,8 +49236,8 @@
4918249236 m_vecPropertyUpgrades =
4918349237 [
4918449238 {
49185- m_strPropertyName = "SpiritResist"
49186- m_strBonus = "40"
49239+ m_strPropertyName = "AbilityDuration"
49240+ m_strBonus = "1.5"
4918749241 },
4918849242 ]
4918949243 },
@@ -49213,8 +49267,8 @@
4921349267 m_strBonus = "3m"
4921449268 },
4921549269 {
49216- m_strPropertyName = "AbilityDuration"
49217- m_strBonus = "1.5"
49270+ m_strPropertyName = "SpiritResist"
49271+ m_strBonus = "40"
4921849272 },
4921949273 ]
4922049274 },
@@ -49448,14 +49502,14 @@
4944849502 }
4944949503 TurretBaseHealth =
4945049504 {
49451- m_strValue = "90"
49505+ m_strValue = "100"
4945249506 m_strCSSClass = "health"
4945349507 m_subclassScaleFunction = subclass:
4945449508 {
4945549509 _class = "scale_function_single_stat"
4945649510 _my_subclass_name = "TurretBaseHealth_scale_function"
4945749511 m_eSpecificStatScaleType = "ELevelUpBoons"
49458- m_flStatScale = 7.8
49512+ m_flStatScale = 9
4945949513 }
4946049514 }
4946149515 TurretAttackRange =
@@ -49567,11 +49621,11 @@
4956749621 }
4956849622 DecayingResist =
4956949623 {
49570- m_strValue = "80"
49624+ m_strValue = "0"
4957149625 }
4957249626 DecayingResistDuration =
4957349627 {
49574- m_strValue = "6"
49628+ m_strValue = "0"
4957549629 }
4957649630 }
4957749631 m_bitsPostCastEnabledStateMask = "MODIFIER_STATE_BUSY_WITH_ACTION"
@@ -58259,7 +58313,7 @@
5825958313 },
5826058314 {
5826158315 m_strPropertyName = "ShockRadius"
58262- m_strBonus = "1.5m"
58316+ m_strBonus = "1.75m"
5826358317 m_strStreetBrawlBonus = "1.27m"
5826458318 },
5826558319 ]
@@ -63969,7 +64023,7 @@
6396964023 [
6397064024 {
6397164025 m_strPropertyName = "Damage"
63972- m_strBonus = "65"
64026+ m_strBonus = "45"
6397364027 },
6397464028 ]
6397564029 },
@@ -70786,8 +70840,8 @@
7078670840 m_flRecoilSpeed = 1
7078770841 m_flZoomFOV = 35.0
7078870842 m_flZoomFOV_Relative = -40.0
70789- m_flDamageFalloffStartRange = 787
70790- m_flDamageFalloffEndRange = 2264.0
70843+ m_flDamageFalloffStartRange = 708.66
70844+ m_flDamageFalloffEndRange = 2125.98
7079170845 m_flRange = 7000.0
7079270846 m_flBulletLifetime = 2
7079370847 m_flDamageFalloffStartScale = 1.0
@@ -98796,7 +98850,7 @@
9879698850 [
9879798851 {
9879898852 m_strPropertyName = "StunDuration"
98799- m_strBonus = "1"
98853+ m_strBonus = "0.75"
9880098854 m_strCSSClass = "duration"
9880198855 },
9880298856 {
@@ -110164,7 +110218,7 @@
110164110218 [
110165110219 {
110166110220 m_strPropertyName = "MagicDamagePerBullet"
110167- m_strBonus = "0.06"
110221+ m_strBonus = "0.045"
110168110222 m_eUpgradeType = "EAddToScale"
110169110223 },
110170110224 {
@@ -110430,7 +110484,7 @@
110430110484 }
110431110485 ClubSlowPercent =
110432110486 {
110433- m_strValue = "-30"
110487+ m_strValue = "30"
110434110488 m_strCSSClass = "slow"
110435110489 m_eProvidedPropertyType = "MODIFIER_VALUE_MOVEMENT_SPEED_SLOW_PERCENT"
110436110490 m_eStatsUsageFlags = "ConditionallyApplied"
@@ -110489,7 +110543,7 @@
110489110543 m_subclassScaleFunction = subclass:
110490110544 {
110491110545 _class = "scale_function_healing_spirit_scale"
110492- m_flStatScale = 1.0
110546+ m_flStatScale = 0.75
110493110547 _my_subclass_name = "heart_heal_sf"
110494110548 }
110495110549 m_strCSSClass = "healing"
@@ -110675,10 +110729,11 @@
110675110729 m_strPropertyName = "HeartHeal"
110676110730 m_strBonus = "0.5"
110677110731 m_eUpgradeType = "EAddToScale"
110732+ m_eScaleStatFilter = "ETechPower"
110678110733 },
110679110734 {
110680110735 m_strPropertyName = "ClubSlowPercent"
110681- m_strBonus = "-20"
110736+ m_strBonus = "20"
110682110737 },
110683110738 ]
110684110739 },
@@ -120994,7 +121049,7 @@
120994121049 }
120995121050 Radius =
120996121051 {
120997- m_strValue = "8m"
121052+ m_strValue = "12m"
120998121053 m_subclassScaleFunction = subclass:
120999121054 {
121000121055 _class = "scale_function_tech_range"
@@ -121003,7 +121058,7 @@
121003121058 }
121004121059 PetrifyDuration =
121005121060 {
121006- m_strValue = "2.0"
121061+ m_strValue = "2.2"
121007121062 m_subclassScaleFunction = subclass:
121008121063 {
121009121064 _class = "scale_function_tech_duration"
@@ -156907,7 +156962,7 @@
156907156962 {
156908156963 _class = "scale_function_tech_damage"
156909156964 _my_subclass_name = "attackdamagesf"
156910- m_flStatScale = 0.2
156965+ m_flStatScale = 0.3
156911156966 }
156912156967 m_bIsAbilityDamageProperty = true
156913156968 }
@@ -159627,7 +159682,7 @@
159627159682 }
159628159683 DoorwayDistance =
159629159684 {
159630- m_strValue = "70m"
159685+ m_strValue = "65m"
159631159686 m_subclassScaleFunction = subclass:
159632159687 {
159633159688 _class = "scale_function_multi_stats"
@@ -160374,6 +160429,14 @@
160374160429 _class = ""
160375160430 _my_subclass_name = ""
160376160431 }
160432+ m_StompIgnoreLingerModifier = subclass:
160433+ {
160434+ _class = "modifier_base"
160435+ _my_subclass_name = "luggage_drag_stomp_ignore_linger"
160436+ m_nEnabledStateMask = "MODIFIER_STATE_DOORMAN_LUGGAGE_DRAGGED"
160437+ m_bIsHidden = true
160438+ }
160439+ m_flStompIgnoreLingerDuration = 0.5
160377160440 m_sLocalizationName = "modifier_luggage_cart_drag"
160378160441 m_eHudDisplayLocation = "DISPLAY_HUD_CENTER"
160379160442 m_strHudMessageText = ""
@@ -163766,7 +163829,7 @@
163766163829 _my_subclass_name = "Damage_scale_function"
163767163830 _class = "scale_function_single_stat"
163768163831 m_eSpecificStatScaleType = "ETechPower"
163769- m_flStatScale = 1.0
163832+ m_flStatScale = 0.7
163770163833 }
163771163834 m_bIsAbilityDamageProperty = true
163772163835 }
@@ -164532,6 +164595,22 @@
164532164595 m_eSpecificStatScaleType = "ETechPower"
164533164596 }
164534164597 }
164598+ MaxHealthBuffPct =
164599+ {
164600+ m_strValue = "0"
164601+ m_strCSSClass = "health"
164602+ }
164603+ MaxHealthBuffDuration =
164604+ {
164605+ m_strValue = "0"
164606+ m_strCSSClass = "duration"
164607+ m_subclassScaleFunction = subclass:
164608+ {
164609+ _class = "scale_function_single_stat"
164610+ _my_subclass_name = "MaxHealthBuffDuration_scale_function"
164611+ m_eSpecificStatScaleType = "ETechDuration"
164612+ }
164613+ }
164535164614 }
164536164615 m_bitsPostCastEnabledStateMask = ""
164537164616 _editor =
@@ -164675,6 +164754,11 @@
164675164754 _class = "modifier_punkgoat_goatflip_damagebuff"
164676164755 _my_subclass_name = "damagebuff"
164677164756 }
164757+ m_MaxHealthBuff = subclass:
164758+ {
164759+ _class = "modifier_punkgoat_goatflip_maxhealthbuff"
164760+ _my_subclass_name = "maxhealthbuff"
164761+ }
164678164762 m_EmpowerMelee = subclass:
164679164763 {
164680164764 _class = "modifier_punkgoat_goatflip_empowermelee"
@@ -164711,13 +164795,12 @@
164711164795 m_vecPropertyUpgrades =
164712164796 [
164713164797 {
164714- m_strPropertyName = "DealMaxHealthDamagePct"
164715- m_strBonus = 7
164798+ m_strPropertyName = "MaxHealthBuffPct"
164799+ m_strBonus = 10
164716164800 },
164717164801 {
164718- m_strPropertyName = "DealMaxHealthDamagePct"
164719- m_strBonus = "0.03"
164720- m_eUpgradeType = "EAddToScale"
164802+ m_strPropertyName = "MaxHealthBuffDuration"
164803+ m_strBonus = 16
164721164804 },
164722164805 {
164723164806 m_strPropertyName = "AbilityCooldown"
@@ -164742,7 +164825,7 @@
164742164825 m_strImportantProperty = "Damage"
164743164826 },
164744164827 {
164745- m_strImportantProperty = "DealMaxHealthDamagePct"
164828+ m_strImportantProperty = "MaxHealthBuffPct"
164746164829 },
164747164830 ]
164748164831 },
@@ -167116,7 +167199,7 @@
167116167199 _class = "scale_function_tech_damage"
167117167200 _my_subclass_name = "BonusDamage_scale_function"
167118167201 m_eSpecificStatScaleType = "ETechPower"
167119- m_flStatScale = 1.7
167202+ m_flStatScale = 1.4
167120167203 }
167121167204 m_bIsAbilityDamageProperty = true
167122167205 m_strLocTokenOverride = "DrifterRend_SpiritDamage"
@@ -167335,7 +167418,7 @@
167335167418 {
167336167419 AbilityCooldown =
167337167420 {
167338- m_strValue = "24"
167421+ m_strValue = "26"
167339167422 m_strDisableValue = "0"
167340167423 m_strCSSClass = "cooldown"
167341167424 m_bCanSetTokenOverride = true
@@ -167644,7 +167727,7 @@
167644167727 },
167645167728 {
167646167729 m_strPropertyName = "AbilityCooldown"
167647- m_strBonus = "-12"
167730+ m_strBonus = "-10"
167648167731 },
167649167732 ]
167650167733 },
@@ -256615,7 +256698,7 @@
256615256698 }
256616256699 MeleeResistReduction =
256617256700 {
256618- m_strValue = "-22"
256701+ m_strValue = "-25"
256619256702 m_strCSSClass = "bullet_armor_down"
256620256703 m_eDisplayType = "EMeleeResist"
256621256704 m_eProvidedPropertyType = "MODIFIER_VALUE_MELEE_RESIST_REDUCTION"
@@ -256733,7 +256816,11 @@
256733256816 [
256734256817 {
256735256818 m_strPropertyName = "MeleeResistReduction"
256736- m_strBonus = "-30"
256819+ m_strBonus = "-25"
256820+ },
256821+ {
256822+ m_strPropertyName = "StunDuration"
256823+ m_strBonus = "0.4"
256737256824 },
256738256825 ]
256739256826 },
@@ -256742,11 +256829,11 @@
256742256829 [
256743256830 {
256744256831 m_strPropertyName = "TargetLifesteal"
256745- m_strBonus = "60"
256832+ m_strBonus = "75"
256746256833 },
256747256834 {
256748256835 m_strPropertyName = "TargetLifestealDuration"
256749- m_strBonus = "7"
256836+ m_strBonus = "13"
256750256837 },
256751256838 ]
256752256839 },
@@ -257777,7 +257864,7 @@
257777257864 m_nAbillityUnlocksCost = 1
257778257865 m_eAbilityType = "EAbilityType_Ultimate"
257779257866 m_iMaxLevel = 1
257780- m_bitsInterruptingStates = "MODIFIER_STATE_STUNNED | MODIFIER_STATE_IS_ASLEEP | MODIFIER_STATE_IMMOBILIZED"
257867+ m_bitsInterruptingStates = "MODIFIER_STATE_STUNNED | MODIFIER_STATE_IS_ASLEEP"
257781257868 m_PreviewPathParticle = resource_name:"particles/generic/generic_arc.vpcf"
257782257869 m_strAbilityOffCooldownSound = soundevent:""
257783257870 m_strAbilityChargeReadySound = soundevent:""