refactor: Removed TrackNum and Campaign bases and updated timer progr…

…ess filter
StrataSource · Aug 9, 2024 · f6891cc · f6891cc
1 parent e0afbbe
commit f6891cc
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 53 deletions.
diff --git a/db/factories/momentum.txt b/db/factories/momentum.txt
@@ -91,9 +91,9 @@ filter_activator_mass_greater
 filter_activator_model
 filter_activator_name
 filter_base
-filter_momentum_campaign_progress
 filter_momentum_collectibles
 filter_momentum_player_state
+filter_momentum_timer_progress
 filter_multi
 filter_velocity
 fish
@@ -118,7 +118,6 @@ func_illusionary
 func_instance_io_proxy
 func_ladderendpoint
 func_lod
-func_momentum_brush
 func_monitor
 func_movelinear
 func_nogrenades
@@ -339,7 +338,6 @@ trigger_hierarchy
 trigger_impact
 trigger_jumppad
 trigger_look
-trigger_momentum_campaign_changelevel
 trigger_momentum_limitmovement
 trigger_momentum_progress
 trigger_momentum_promptinput

diff --git a/fgd/bases/Campaign.fgd b/fgd/bases/Campaign.fgd
diff --git a/fgd/bases/MomentumTrigger.fgd b/fgd/bases/MomentumTrigger.fgd
diff --git a/fgd/bases/TrackNum.fgd b/fgd/bases/TrackNum.fgd
diff --git a/fgd/brush/func/func_momentum_brush.fgd b/fgd/brush/func/func_momentum_brush.fgd
diff --git a/fgd/brush/trigger/trigger_momentum_campaign_changelevel.fgd b/fgd/brush/trigger/trigger_momentum_campaign_changelevel.fgd
diff --git a/fgd/brush/trigger/trigger_momentum_limitmovement.fgd b/fgd/brush/trigger/trigger_momentum_limitmovement.fgd
@@ -1,4 +1,4 @@
-@SolidClass base(MomentumTrigger)
+@SolidClass base(Trigger)
 	appliesto(MOMENTUM)
 = trigger_momentum_limitmovement : "Trigger that prevents the player from doing specific keypress movements inside the volume."
 	[

diff --git a/fgd/brush/trigger/trigger_momentum_progress.fgd b/fgd/brush/trigger/trigger_momentum_progress.fgd
@@ -1,4 +1,4 @@
-@SolidClass base(MomentumTrigger)
+@SolidClass base(Trigger)
 	appliesto(MOMENTUM)
 = trigger_momentum_progress : "A trigger volume that sets the teleport destination the player will be sent to when they activate a progress teleport."
 	[

diff --git a/fgd/point/filter/filter_momentum_campaign_progress.fgd b/fgd/point/filter/filter_momentum_campaign_progress.fgd
diff --git a/fgd/point/filter/filter_momentum_timer_progress.fgd b/fgd/point/filter/filter_momentum_timer_progress.fgd
@@ -0,0 +1,8 @@
+@FilterClass base(filter_base)
+	appliesto(MOMENTUM)
+= filter_momentum_timer_progress : "Filter a player based on their current track, stage, and checkpoint."
+	[
+	track_number(integer) : "Track Number" : 0 : "The track number to check for. 0 = main map, 1+ = bonus number."
+	stage_number(integer) : "Stage Number" : 0 : "The stage number to check for. 0 = ignore, 1+ = stage number."
+	checkpoint_number(integer) : "Checkpoint Number" : 0 : "The checkpoint number to check for. 0 = ignore, 1 = stage start, 2+ = checkpoint number."
+	]
diff --git a/fgd/point/filter/filter_momentum_track_number.fgd b/fgd/point/filter/filter_momentum_track_number.fgd
diff --git a/fgd/visgroups.cfg b/fgd/visgroups.cfg
@@ -228,15 +228,13 @@
 			* `trigger_userinput`
 			* `trigger_momentum_progress`
 			* `trigger_momentum_teleport`
-			* `trigger_momentum_campaign_changelevel`
 			* `trigger_momentum_promptinput`
 		- Func Brush
 			* `func_brush`
 			* `func_bhop`
 			* `func_touch`
 			* `func_wall`
 			* `func_wall_toggle`
-			* `func_momentum_brush`
 		- Movement Brushes 
 			* `func_slick`
 			* `func_slide`
@@ -458,8 +456,7 @@
 			* `filter_player_held`
 			* `filter_momentum_collectibles`
 			* `filter_momentum_player_state`
-			* `filter_momentum_track_number`
-			* `filter_momentum_campaign_progress`
+			* `filter_momentum_timer_progress`
 			* `filter_paint_power`
 			* `filter_velocity`
 		- Globals