rename collection methods

Elektryk-Andrzej · Elektryk-Andrzej · commit 5c096e751b1b · 2026-04-28T00:18:11.000+02:00
diff --git a/Code/ContextSystem/Contexts/Control/AttemptStatement.cs b/Code/ContextSystem/Contexts/Control/AttemptStatement.cs
@@ -18,10 +18,10 @@ public class AttemptStatement : StatementContext, IExtendableStatement, IKeyword
     public string[] Arguments => [];
     public string? Example =>
         """
-        &collection = EmptyCollection
+        &collection = Coll.Empty
         # swallows the error (doesn't stop the script)
         attempt
-            Print {CollectionFetch &collection 2}
+            Print {Coll.Fetch &collection 2}
             # throws because there's nothing at index 2
         end
         """;
diff --git a/Code/ContextSystem/Contexts/Control/Loops/RepeatLoop.cs b/Code/ContextSystem/Contexts/Control/Loops/RepeatLoop.cs
@@ -26,7 +26,7 @@ repeat 10
         
         # ========================================
         # you can also use a variable to define the amount of times to repeat
-        repeat {RandomNum 1 10 int}
+        repeat {Random 1 10 int}
             Print "hi"
         end
         
diff --git a/Code/ContextSystem/Contexts/Control/OnErrorStatement.cs b/Code/ContextSystem/Contexts/Control/OnErrorStatement.cs
@@ -21,9 +21,9 @@ public class OnErrorStatement : StatementContext, IStatementExtender, IKeywordCo
     public string[] Arguments => [];
     public string Example =>
         """
-        &collection = EmptyCollection
+        &collection = Coll.Empty
         attempt
-            Print {CollectionFetch &collection 2}
+            Print {Coll.Fetch &collection 2}
             # ERROR: there's nothing at index 2
             
             Print "Hello, world!"
diff --git a/Code/MethodSystem/BaseMethods/Method.cs b/Code/MethodSystem/BaseMethods/Method.cs
@@ -34,7 +34,7 @@ protected Method()
             .Replace("_", " ")
                    ?? "Unknown";
         
-        var name = type.Name;
+        var name = type.Name.Replace("_", ".");
         if (!name.EndsWith("Method"))
         {
             throw new AndrzejFuckedUpException($"Method class name '{name}' must end with 'Method'.");
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_ContainsMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_ContainsMethod.cs
@@ -7,7 +7,8 @@
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
 
 [UsedImplicitly]
-public class CollectionContainsMethod : ReturningMethod<BoolValue>
+// ReSharper disable once InconsistentNaming
+public class Coll_ContainsMethod : ReturningMethod<BoolValue>
 {
     public override string Description => "Returns true if the value exists in the collection";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_EmptyMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_EmptyMethod.cs
@@ -1,9 +1,13 @@
-﻿using SER.Code.ArgumentSystem.BaseArguments;
+﻿using JetBrains.Annotations;
+using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.ValueSystem;
 
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
-public class EmptyCollectionMethod : ReturningMethod<CollectionValue>
+
+[UsedImplicitly]
+// ReSharper disable once InconsistentNaming
+public class Coll_EmptyMethod : ReturningMethod<CollectionValue>
 {
     public override string Description => "Returns an empty collection.";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_FetchMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_FetchMethod.cs
@@ -9,7 +9,7 @@
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
 
 [UsedImplicitly]
-public class CollectionFetchMethod : ReturningMethod
+public class Coll_FetchMethod : ReturningMethod
 {
     public override string Description => "Returns a value from a collection variable at a given position.";
     public override TypeOfValue Returns => new UnknownTypeOfValue();
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_InsertMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_InsertMethod.cs
@@ -9,7 +9,8 @@
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
 
 [UsedImplicitly]
-public class CollectionInsertMethod : SynchronousMethod, IAdditionalDescription
+// ReSharper disable once InconsistentNaming
+public class Coll_InsertMethod : SynchronousMethod, IAdditionalDescription
 {
     public override string Description => "Adds a value to a collection variable";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_JoinMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_JoinMethod.cs
@@ -1,10 +1,14 @@
-﻿using SER.Code.ArgumentSystem.Arguments;
+﻿using JetBrains.Annotations;
+using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.ValueSystem;
 
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
-public class JoinCollectionsMethod : ReturningMethod<CollectionValue>
+
+[UsedImplicitly]
+// ReSharper disable once InconsistentNaming
+public class Coll_JoinMethod : ReturningMethod<CollectionValue>
 {
     public override string Description => "Returns a collection that has the combined values of all the given collections";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_RemoveAtMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_RemoveAtMethod.cs
@@ -8,7 +8,8 @@
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
 
 [UsedImplicitly]
-public class CollectionRemoveAtMethod : SynchronousMethod
+// ReSharper disable once InconsistentNaming
+public class Coll_RemoveAtMethod : SynchronousMethod
 {
     public override string Description => "Removes a value at the provided index from a collection variable";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_RemoveMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_RemoveMethod.cs
@@ -8,7 +8,8 @@
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
 
 [UsedImplicitly]
-public class CollectionRemoveMethod : SynchronousMethod
+// ReSharper disable once InconsistentNaming
+public class Coll_RemoveMethod : SynchronousMethod
 {
     public override string Description => "Removes a matching value from a collection variable";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_SubtractMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/Coll_SubtractMethod.cs
@@ -1,10 +1,14 @@
-﻿using SER.Code.ArgumentSystem.Arguments;
+﻿using JetBrains.Annotations;
+using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.ValueSystem;
 
 namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;
-public class SubtractCollectionsMethod : ReturningMethod<CollectionValue>
+
+[UsedImplicitly]
+// ReSharper disable once InconsistentNaming
+public class Coll_SubtractMethod : ReturningMethod<CollectionValue>
 {
     public override string Description => "Returns a collection that has the values of the first collection without the values of the latter";
 
diff --git a/Code/MethodSystem/Methods/CollectionVariableMethods/CollectionLengthMethod.cs b/Code/MethodSystem/Methods/CollectionVariableMethods/CollectionLengthMethod.cs
diff --git a/Example Scripts/attemptKeywordExample.ser b/Example Scripts/attemptKeywordExample.ser
@@ -1,6 +1,6 @@
-&collection = EmptyCollection
+&collection = Coll.Empty
 # swallows the error (doesn't stop the script)
 attempt
-    Print {CollectionFetch &collection 2}
+    Print {Coll.Fetch &collection 2}
     # throws because there's nothing at index 2
 end
diff --git a/Example Scripts/chaosCoin.ser b/Example Scripts/chaosCoin.ser
@@ -23,7 +23,7 @@ if {Chance 50%}
 end
 
 # select a random effect of the coin, from 9 available
-$effect = RandomNum 1 9 int
+$effect = Random 1 9 int
 
 # russian rulette with a full gun :trollface:
 if $effect is 1
@@ -34,7 +34,7 @@ end
 
 # HP change 
 if $effect is 2
-    $newHP = RandomNum 1 150 int
+    $newHP = Random 1 150 int
     SetHealth @evPlayer $newHP
     SetMaxHealth @evPlayer $newHP
 
@@ -110,7 +110,7 @@ if $effect is 5
     SetPlayerData @evPlayer "coin locked" true
 
     Countdown @evPlayer 15s "{$baseText}You can now open any keycard locked thing! (for %seconds% seconds)"
-    Bypass @evPlayer true
+    SetBypass @evPlayer true
 
     repeat 15
         wait 1s
@@ -121,7 +121,7 @@ if $effect is 5
         end
     end
 
-    Bypass @evPlayer false
+    SetBypass @evPlayer false
     SetPlayerData @evPlayer "coin locked" false
     stop
 end
@@ -156,7 +156,7 @@ end
 # change size
 if $effect is 8
     # set player size in every direction to a random number between 10% and 100%
-    SetSize @evPlayer {RandomNum 0.1 1 real} {RandomNum 0.1 1 real} {RandomNum 0.1 1 real}
+    SetSize @evPlayer {Random 0.1 1 real} {Random 0.1 1 real} {Random 0.1 1 real}
 
     Broadcast @evPlayer 5s "{$baseText}Your size has changed a little!"
     stop
diff --git a/Example Scripts/doorRestart.ser b/Example Scripts/doorRestart.ser
@@ -12,7 +12,7 @@ LockDoor * NoPower
 
 # cassie for spooky effect
 repeat 2
-    Cassie noJingle "pitch_{RandomNum 0.15 0.25 real} .g{RandomNum 1 6 int}"
+    Cassie noJingle "pitch_{Random 0.15 0.25 real} .g{Random 1 6 int}"
 end
 
 # duration of the restart
diff --git a/Example Scripts/healScpCommand.ser b/Example Scripts/healScpCommand.ser
@@ -12,7 +12,7 @@ end
 @randomScp = Take {Except @scpPlayers @scp079Players} 1
 
 # get 5% of the SCP's max health
-$healAmount = RoundNumber ({@randomScp -> maxHealth} * 0.05)
+$healAmount = Round ({@randomScp -> maxHealth} * 0.05)
 
 Heal @randomScp $healAmount
 Broadcast @randomScp 4s "{@sender -> name} healed you with {$healAmount} HP!"
diff --git a/Example Scripts/on_errorKeywordExample.ser b/Example Scripts/on_errorKeywordExample.ser
@@ -1,6 +1,6 @@
-&collection = EmptyCollection
+&collection = Coll.Empty
 attempt
-    Print {CollectionFetch &collection 2}
+    Print {Coll.Fetch &collection 2}
     # ERROR: there's nothing at index 2
     
     Print "Hello, world!"
diff --git a/Example Scripts/repeatKeywordExample.ser b/Example Scripts/repeatKeywordExample.ser
@@ -6,7 +6,7 @@ end
 
 # ========================================
 # you can also use a variable to define the amount of times to repeat
-repeat {RandomNum 1 10 int}
+repeat {Random 1 10 int}
     Print "hi"
 end
 
diff --git a/Example Scripts/safeStart.ser b/Example Scripts/safeStart.ser
@@ -6,4 +6,4 @@ end
 
 Print "SER enabled roundlock!"
 Broadcast @all 10s "<color=green>SER enabled roundlock!"
-RoundLock true
+LockRound true
diff --git a/README.md b/README.md
@@ -71,10 +71,10 @@ if {@sender -> team} is "SCPs"
 end
 
 # get a random SCP that is not a SCP-079
-@randomScp = LimitPlayers {RemovePlayers @scpPlayers @scp079Players} 1
+@randomScp = Take {Except @scpPlayers @scp079Players} 1
 
 # get 5% of the SCP's max health
-$healAmount = RoundNumber ({@randomScp -> maxHealth} * 0.05)
+$healAmount = Round ({@randomScp -> maxHealth} * 0.05)
 
 Heal @randomScp $healAmount
 Broadcast @randomScp 4s "{@sender -> name} healed you with {$healAmount} HP!"
diff --git a/llms-full.md b/llms-full.md
@@ -198,7 +198,7 @@ $name = ""  # empty text
 $num = 0  # zero
 $bool = false  # false
 @plrs = @empty  # empty player array
-&coll = EmptyCollection  # empty collection
+&coll = Coll.Empty  # empty collection
 ```
 
 ### Memory Scopes
@@ -742,13 +742,13 @@ SER includes several advanced systems you should explore:
 
 **Utility Methods:**
 - **AmountOf** - `AmountOf @players` - Returns count of players
-- **RoundLock** - `RoundLock true/false` - Locks/unlocks round
+- **LockRound** - `LockRound true/false` - Locks/unlocks round
 - **LobbyLock** - `LobbyLock true/false` - Locks/unlocks lobby
 - **SetPlayerData** - `SetPlayerData @player "key" value` - Stores custom player data
 - **GetPlayerData** - `GetPlayerData @player "key"` - Retrieves custom player data
 - **HasPlayerData** - `HasPlayerData @player "key"` - Checks if data exists
 - **LimitPlayers** - `LimitPlayers @players count` - Returns random subset
-- **RandomNum** - `RandomNum min max type` - Random number (int/real)
+- **Random** - `Random min max type` - Random number (int/real)
 - **Chance** - `Chance percentage` - Returns true with given chance
 - **VarExists** - `VarExists $variable` - Checks if variable exists
 - **ValidRef** - `ValidRef *reference` - Checks if reference is valid

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected Method()`
`34`	`34`	`.Replace("_", " ")`
`35`	`35`	`?? "Unknown";`
`36`	`36`
`37`		`- var name = type.Name;`
	`37`	`+ var name = type.Name.Replace("_", ".");`
`38`	`38`	`if (!name.EndsWith("Method"))`
`39`	`39`	`{`
`40`	`40`	`throw new AndrzejFuckedUpException($"Method class name '{name}' must end with 'Method'.");`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;`
`8`	`8`
`9`	`9`	`[UsedImplicitly]`
`10`		`-public class CollectionContainsMethod : ReturningMethod<BoolValue>`
	`10`	`+// ReSharper disable once InconsistentNaming`
	`11`	`+public class Coll_ContainsMethod : ReturningMethod<BoolValue>`
`11`	`12`	`{`
`12`	`13`	`public override string Description => "Returns true if the value exists in the collection";`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;`
`10`	`10`
`11`	`11`	`[UsedImplicitly]`
`12`		`-public class CollectionFetchMethod : ReturningMethod`
	`12`	`+public class Coll_FetchMethod : ReturningMethod`
`13`	`13`	`{`
`14`	`14`	`public override string Description => "Returns a value from a collection variable at a given position.";`
`15`	`15`	`public override TypeOfValue Returns => new UnknownTypeOfValue();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;`
`10`	`10`
`11`	`11`	`[UsedImplicitly]`
`12`		`-public class CollectionInsertMethod : SynchronousMethod, IAdditionalDescription`
	`12`	`+// ReSharper disable once InconsistentNaming`
	`13`	`+public class Coll_InsertMethod : SynchronousMethod, IAdditionalDescription`
`13`	`14`	`{`
`14`	`15`	`public override string Description => "Adds a value to a collection variable";`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`namespace SER.Code.MethodSystem.Methods.CollectionVariableMethods;`
`9`	`9`
`10`	`10`	`[UsedImplicitly]`
`11`		`-public class CollectionRemoveAtMethod : SynchronousMethod`
	`11`	`+// ReSharper disable once InconsistentNaming`
	`12`	`+public class Coll_RemoveAtMethod : SynchronousMethod`
`12`	`13`	`{`
`13`	`14`	`public override string Description => "Removes a value at the provided index from a collection variable";`
`14`	`15`