diff --git a/db/factories/momentum.txt b/db/factories/momentum.txt index 3e8f4585c..13778c53b 100644 --- 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 deleted file mode 100644 index 56aeb85d5..000000000 --- a/fgd/bases/Campaign.fgd +++ /dev/null @@ -1,7 +0,0 @@ -@BaseClass - appliesto(MOMENTUM) -= Campaign - [ - World(integer) : "World Number" : -1 : "The world number the stage is in. -1 (usually) defaults to the current world." - Stage(integer) : "Stage Number" : 0 : "The stage number." - ] diff --git a/fgd/bases/MomentumTrigger.fgd b/fgd/bases/MomentumTrigger.fgd deleted file mode 100644 index 9c19033f3..000000000 --- a/fgd/bases/MomentumTrigger.fgd +++ /dev/null @@ -1,5 +0,0 @@ -@BaseClass base(Trigger, TrackNum) - appliesto(MOMENTUM) -= MomentumTrigger - [ - ] diff --git a/fgd/bases/TrackNum.fgd b/fgd/bases/TrackNum.fgd deleted file mode 100644 index 727fc59c7..000000000 --- a/fgd/bases/TrackNum.fgd +++ /dev/null @@ -1,7 +0,0 @@ -@BaseClass - appliesto(MOMENTUM) -= TrackNum - [ - track_number(integer) : "Track Number" : -1 : "Track number that this entity belongs to." + - " -1 = all tracks, 0 = main map, > 0 = bonus zone (of that number)." - ] diff --git a/fgd/bases/ZoneTrigger.fgd b/fgd/bases/ZoneTrigger.fgd deleted file mode 100644 index f9cf9d542..000000000 --- a/fgd/bases/ZoneTrigger.fgd +++ /dev/null @@ -1,6 +0,0 @@ -@BaseClass base(MomentumTrigger) - appliesto(MOMENTUM) -= ZoneTrigger - [ - zone_number(integer) : "Zone Number" : 0 : "The zone number of this trigger. NOTE: 0 is reserved for invalid/stop trigger, 1 is reserved for start! 2+ are free for your stage/checkpoint triggers, so start at 2!" - ] diff --git a/fgd/brush/func/func_momentum_brush.fgd b/fgd/brush/func/func_momentum_brush.fgd deleted file mode 100644 index 0b6d7e590..000000000 --- a/fgd/brush/func/func_momentum_brush.fgd +++ /dev/null @@ -1,9 +0,0 @@ -@SolidClass base(func_brush, Campaign) - appliesto(MOMENTUM) -= func_momentum_brush : "Brush entity used for the final stages in the campaign. The brush activates when the given stage of the given world is beat (or not beat, if this brush is inverted)" - [ - Invert(boolean) : "Invert behavior" : 0 : "Set this to Yes if the behavior of the brush should be inverted (Yes = If the player has the stage beaten, the brush should be Disabled)." - - DisabledAlpha(integer) : "Disabled Alpha" : 102 : "The amount of translucency this brush has when disabled. 0 is transparent, 255 is opaque." - DisableUI(boolean) : "Disable UI Popup" : 0 : "If set to Yes, disables the UI popup/warning that occurs when the user touches the deactivated brush." - ] diff --git a/fgd/brush/trigger/trigger_momentum_campaign_changelevel.fgd b/fgd/brush/trigger/trigger_momentum_campaign_changelevel.fgd deleted file mode 100644 index 15e9007c2..000000000 --- a/fgd/brush/trigger/trigger_momentum_campaign_changelevel.fgd +++ /dev/null @@ -1,6 +0,0 @@ -@SolidClass base(MomentumTrigger, GameTypes, Campaign) - appliesto(MOMENTUM) -= trigger_momentum_campaign_changelevel : "Trigger that changes the level to the specified world's stage of a given gametype. World number of -1 will teleport to the Hub." - [ - map_name_override(string) : "Map Name Override" : "" : "If set, this trigger will load this specific map name." - ] diff --git a/fgd/brush/trigger/trigger_momentum_limitmovement.fgd b/fgd/brush/trigger/trigger_momentum_limitmovement.fgd index e36a5e1cf..129da7a36 100644 --- 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 index 43a589bd3..9984ad9a9 100644 --- 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 deleted file mode 100644 index 352325c10..000000000 --- a/fgd/point/filter/filter_momentum_campaign_progress.fgd +++ /dev/null @@ -1,5 +0,0 @@ -@FilterClass base(StaticTargetName, Campaign) - appliesto(MOMENTUM) -= filter_momentum_campaign_progress : "Filter that checks to see if the local player has beat the given stage of a given world." - [ - ] diff --git a/fgd/point/filter/filter_momentum_timer_progress.fgd b/fgd/point/filter/filter_momentum_timer_progress.fgd new file mode 100644 index 000000000..f261f3733 --- /dev/null +++ b/fgd/point/filter/filter_momentum_timer_progress.fgd @@ -0,0 +1,8 @@ +@FilterClass base(filter_base) + appliesto(MOMENTUM) += filter_momentum_timer_progress : "A filter that filters by the player's 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 deleted file mode 100644 index a810f9f4d..000000000 --- a/fgd/point/filter/filter_momentum_track_number.fgd +++ /dev/null @@ -1,5 +0,0 @@ -@FilterClass base(filter_base, TrackNum) - appliesto(MOMENTUM) -= filter_momentum_track_number : "Filter a player based on if their track number is the one defined here. -1 defaults to true." - [ - ] diff --git a/fgd/visgroups.cfg b/fgd/visgroups.cfg index 573fd36f3..6185a7b85 100644 --- a/fgd/visgroups.cfg +++ b/fgd/visgroups.cfg @@ -228,7 +228,6 @@ * `trigger_userinput` * `trigger_momentum_progress` * `trigger_momentum_teleport` - * `trigger_momentum_campaign_changelevel` * `trigger_momentum_promptinput` - Func Brush * `func_brush` @@ -236,7 +235,6 @@ * `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