buff burst rifle damage (this may be too much)

ReactiveDrop · Jun 13, 2024 · 39ada39 · 39ada39
1 parent 621dcf0
commit 39ada39
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/game/shared/swarm/asw_equipment_list.cpp b/src/game/shared/swarm/asw_equipment_list.cpp
@@ -559,7 +559,7 @@ static CASW_EquipItem s_RegularEquips[ASW_NUM_EQUIP_REGULAR] =
 		"swarm/EquipIcons/EquipShieldRifle",
 		&asw_ammo_count_rifle_burst, &asw_ammo_count_rifle_burst,
 		&asw_ammo_count_energy_shield, &asw_ammo_count_energy_shield_max,
-		6, 0.14f, 2.0f, 1, MARINE_CLASS_TECH,
+		17, 0.14f, 2.0f, 1, MARINE_CLASS_TECH,
 		false, false, false, ASW_OFFHAND_USE_IMMEDIATELY,
 		0.2f, 0.1f,
 	},

diff --git a/src/game/shared/swarm/asw_gamerules.cpp b/src/game/shared/swarm/asw_gamerules.cpp
@@ -5841,6 +5841,12 @@ bool CAlienSwarm::ShouldCollide( int collisionGroup0, int collisionGroup1 )
 	}
 #endif
 
+	// let energy shield touch debris, but not vice versa
+	if ( collisionGroup0 == ASW_COLLISION_GROUP_SHIELD && collisionGroup1 == COLLISION_GROUP_DEBRIS )
+	{
+		return true;
+	}
+
 	if ( collisionGroup0 > collisionGroup1 )
 	{
 		// swap so that lowest is always first

diff --git a/src/game/shared/swarm/asw_marine_skills.cpp b/src/game/shared/swarm/asw_marine_skills.cpp
@@ -176,7 +176,7 @@ ConVar asw_skill_accuracy_50calmg_dmg_step( "asw_skill_accuracy_50calmg_dmg_step
 ConVar asw_skill_accuracy_mining_laser_dmg_base( "asw_skill_accuracy_mining_laser_dmg_base", "0", FCVAR_REPLICATED | FCVAR_CHEAT );
 ConVar asw_skill_accuracy_mining_laser_dmg_step( "asw_skill_accuracy_mining_laser_dmg_step", "1", FCVAR_REPLICATED | FCVAR_CHEAT );
 ConVar asw_skill_accuracy_shield_rifle_dmg_base( "asw_skill_accuracy_shield_rifle_dmg_base", "0", FCVAR_REPLICATED | FCVAR_CHEAT );
-ConVar asw_skill_accuracy_shield_rifle_dmg_step( "asw_skill_accuracy_shield_rifle_dmg_step", "1", FCVAR_REPLICATED | FCVAR_CHEAT );
+ConVar asw_skill_accuracy_shield_rifle_dmg_step( "asw_skill_accuracy_shield_rifle_dmg_step", "2", FCVAR_REPLICATED | FCVAR_CHEAT );
 ConVar asw_skill_accuracy_cryo_dmg_base( "asw_skill_accuracy_cryo_dmg_base", "0", FCVAR_REPLICATED | FCVAR_CHEAT );
 ConVar asw_skill_accuracy_cryo_dmg_step( "asw_skill_accuracy_cryo_dmg_step", "0.5", FCVAR_REPLICATED | FCVAR_CHEAT );
 

diff --git a/src/game/shared/swarm/asw_weapon_energy_shield_shared.cpp b/src/game/shared/swarm/asw_weapon_energy_shield_shared.cpp
@@ -25,7 +25,7 @@ ConVar rd_energy_shield_holster_burst( "rd_energy_shield_holster_burst", "1", FC
 ConVar rd_energy_shield_holster_shield( "rd_energy_shield_holster_shield", "0", FCVAR_CHEAT | FCVAR_REPLICATED, "allow holstering to cancel shield" );
 ConVar rd_energy_shield_activation_blocks_shooting( "rd_energy_shield_activation_blocks_shooting", "0.5", FCVAR_CHEAT | FCVAR_REPLICATED, "minimum delay between activating shield and shooting next burst" );
 #ifdef GAME_DLL
-ConVar rd_energy_shield_touch_interval( "rd_energy_shield_touch_interval", "0.75", FCVAR_CHEAT, "time between damage ticks for the energy shield's electric dissolve" );
+ConVar rd_energy_shield_touch_interval( "rd_energy_shield_touch_interval", "0.2", FCVAR_CHEAT, "time between damage ticks for the energy shield's electric dissolve" );
 #endif
 extern ConVar rd_shield_rifle_dmg_base;