Skip to content

bugfix: Demo Traps are no longer triggered by building proximity #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stubbjax merged 1 commit into from
Aug 2, 2026
Merged

bugfix: Demo Traps are no longer triggered by building proximity #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Generals/Data/INI/Object/Faction/GLA/Building/GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Object GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Data/INI/Object/Faction/GLA/Building/GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Object GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Data/INI/Object/Faction/GLADemolition/Building/Demo_GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Object Demo_GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Data/INI/Object/Faction/GLAStealth/Building/Slth_GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Object Slth_GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Data/INI/Object/Faction/GLAToxin/Building/Chem_GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Object Chem_GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
DetonateWhenKilled = YES
End
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Data/INI/Object/GC_Faction/GC_GLAStealth/Building/GC_Slth_GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Object GC_Slth_GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Data/INI/Object/GC_Faction/GC_GLAToxin/Building/GC_Chem_GLADemoTrap.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Object GC_Chem_GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 40.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down
2 changes: 1 addition & 1 deletion GeneralsZH/Maps/MD_GLA04/map.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ Object GLADemoTrap
ProximityModeWeaponSlot = SECONDARY ; The slot proximity mode is determined by (bogus weapon)
ManualModeWeaponSlot = TERTIARY ; The slot manual mode is determined by (bogus weapon)
TriggerDetonationRange = 30.0 ; Detonation range when in proximity mode (and must be on ground)
IgnoreTargetTypes = PROJECTILE UNATTACKABLE
IgnoreTargetTypes = PROJECTILE UNATTACKABLE STRUCTURE
AutoDetonationWithFriendsInvolved = YES ; GLA are low-tech
; DetonationWeapon = DemoTrapDetonationWeapon
DetonateWhenKilled = YES
Expand Down