Skip to content

Commit 959b198

Browse files
committed
Fix typos
1 parent 18682ed commit 959b198

File tree

15 files changed

+85
-29
lines changed

15 files changed

+85
-29
lines changed

.vscode/settings.json

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"autosetup",
66
"backbuffer",
77
"basicfont",
8+
"bytecode",
89
"cheggaaa",
910
"dofile",
11+
"dont",
1012
"Downscales",
1113
"downscaling",
1214
"DPMM",
@@ -23,21 +25,33 @@
2325
"lann",
2426
"ldflags",
2527
"linearize",
28+
"longleg",
2629
"lowram",
30+
"luanxml",
2731
"manifoldco",
2832
"mapcap",
33+
"Metamethods",
34+
"metaobject",
35+
"Metatable",
2936
"nfnt",
3037
"Niccoli",
3138
"noita",
39+
"Nolla",
3240
"NXML",
41+
"pixelated",
3342
"polymorphed",
3443
"promptui",
3544
"rasterizer",
45+
"Regen",
46+
"respawn",
3647
"savegames",
3748
"schollz",
49+
"screenshake",
3850
"svenstaro",
3951
"tcnksm",
4052
"tdewolff",
53+
"unstitchable",
54+
"upscaled",
4155
"Vogel",
4256
"Voronoi",
4357
"xmax",
@@ -50,5 +64,47 @@
5064
"Lua.format.defaultConfig": {
5165
"max_line_length": "512"
5266
},
53-
"Lua.workspace.ignoreSubmodules": false
67+
"Lua.workspace.ignoreSubmodules": false,
68+
"cSpell.enabledLanguageIds": [
69+
"asciidoc",
70+
"c",
71+
"cpp",
72+
"csharp",
73+
"css",
74+
"elixir",
75+
"erlang",
76+
"git-commit",
77+
"go",
78+
"graphql",
79+
"handlebars",
80+
"haskell",
81+
"html",
82+
"jade",
83+
"java",
84+
"javascript",
85+
"javascriptreact",
86+
"json",
87+
"jsonc",
88+
"jupyter",
89+
"latex",
90+
"less",
91+
"markdown",
92+
"php",
93+
"plaintext",
94+
"python",
95+
"pug",
96+
"restructuredtext",
97+
"rust",
98+
"scala",
99+
"scss",
100+
"scminput",
101+
"swift",
102+
"text",
103+
"typescript",
104+
"typescriptreact",
105+
"vue",
106+
"yaml",
107+
"yml",
108+
"lua"
109+
]
54110
}

files/capture.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ local function captureModifyEntities(file, modify, x, y, radius)
350350
file:write(",\n\t", JSON.Marshal(rootEntity), "\n", "]")
351351
end
352352

353-
-- Disabling this component will prevent entites from being killed/reset when they go offscreen.
353+
-- Disabling this component will prevent entities from being killed/reset when they go offscreen.
354354
-- If they are reset, all tags will be reset and we may capture these entities multiple times.
355355
-- This has some side effects, like longleg.xml and zombie_weak.xml will respawn every revisit, as their spawner doesn't get deleted. (Or something similar to this)
356356
local components = rootEntity:GetComponents("CameraBoundComponent")

files/check.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function Check:Regular(interval)
4747
self.Counter = interval
4848

4949
-- Remove some messages, so they will automatically disappear when the problem is solved.
50-
Message:CloseAutoclose()
50+
Message:CloseAutoClose()
5151

5252
-- Compare Noita config and actual window resolution.
5353
local topLeft, bottomRight = ScreenCap.GetRect() -- Actual window client area.
@@ -83,7 +83,7 @@ function Check:Regular(interval)
8383
if config["screenshake_intensity"] then
8484
local expected = config.screenshake_intensity
8585
if expected ~= self.StartupConfig.screenshake_intensity then
86-
Message:ShowSetNoitaSettings(Modification.AutoSet, string.format("Screenshake intensity is %s, expected %s.", self.StartupConfig.screenshake_intensity, expected))
86+
Message:ShowSetNoitaSettings(Modification.AutoSet, string.format("Screen shake intensity is %s, expected %s.", self.StartupConfig.screenshake_intensity, expected))
8787
end
8888
end
8989

files/libraries/coordinates.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function Coords:PixelScale()
126126
end
127127

128128
---Converts the given virtual/world coordinates into window/screen coordinates.
129-
---@param world Vec2 -- World coordiante, origin is near the cave entrance.
129+
---@param world Vec2 -- World coordinate, origin is near the cave entrance.
130130
---@param viewportCenter Vec2|nil -- Result of `GameGetCameraPos()`. Will be queried automatically if set to nil.
131131
---@return Vec2 window
132132
function Coords:ToWindow(world, viewportCenter)

files/libraries/memory.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ Memory.PAGE_WRITECOMBINE = 0x400
4747
---@param newProtect integer
4848
---@return ffi.cdata* oldProtect
4949
function Memory.VirtualProtect(addr, size, newProtect)
50-
local oldprotect = ffi.new('DWORD[1]')
51-
if not ffi.C.VirtualProtect(addr, size, newProtect, oldprotect) then
50+
local oldProtect = ffi.new('DWORD[1]')
51+
if not ffi.C.VirtualProtect(addr, size, newProtect, oldProtect) then
5252
error(string.format("failed to call VirtualProtect(%s, %s, %s)", addr, size, newProtect))
5353
end
5454

55-
return oldprotect
55+
return oldProtect
5656
end
5757

5858
return Memory

files/libraries/noita-api/camera.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local CameraAPI = {}
1818
---
1919
---@param strength number
2020
---@param position Vec2|nil -- Defaults to camera position if not set.
21-
function CameraAPI.Screenshake(strength, position)
21+
function CameraAPI.ScreenShake(strength, position)
2222
if position == nil then
2323
return GameScreenshake(strength)
2424
end

files/libraries/noita-api/compatibility.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ local oldRequire = require
6464
local recursionSet = {}
6565

6666
---Emulated require function in case the Lua API is restricted.
67-
---It's probably good enough for most usecases.
67+
---It's probably good enough for most use cases.
6868
---
6969
---We need to override the default require in any case, as only dofile and loadfile can access stuff in the virtual filesystem.
7070
---@param modName string

files/libraries/noita-api/component.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function NoitaComponent:SetValue(fieldName, ...)
6464
return ComponentSetValue2(self.ID, fieldName, ...) -- TODO: Rework Noita API to handle vectors, and use a vector instead of shitty multi value arguments
6565
end
6666

67-
---Returns one or many values matching the type or subtypes of the requested field in a component subobject.
67+
---Returns one or many values matching the type or subtypes of the requested field in a component sub-object.
6868
---Reports error and returns nil if the field type is not supported or 'object_name' is not a metaobject.
6969
---
7070
---Reporting errors means that it spams the stdout with messages, instead of using the lua error handling. Thanks Nolla.
@@ -75,7 +75,7 @@ function NoitaComponent:ObjectGetValue(objectName, fieldName)
7575
return ComponentObjectGetValue2(self.ID, objectName, fieldName) -- TODO: Rework Noita API to handle vectors, and return a vector instead of some shitty multi value result
7676
end
7777

78-
---Sets the value of a field in a component subobject. Value(s) should have a type matching the field type.
78+
---Sets the value of a field in a component sub-object. Value(s) should have a type matching the field type.
7979
---Reports error if the values weren't given in correct type, the field type is not supported or 'object_name' is not a metaobject.
8080
---@param objectName string
8181
---@param fieldName string

files/libraries/noita-api/debug.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ end
4848

4949
---Enables the trailer mode and some other things:
5050
---
51-
--- - Disables ingame GUI.
51+
--- - Disables in-game GUI.
5252
--- - Opens fog of war everywhere (Not the same as disabling it completely).
5353
--- - Enables `mTrailerMode`, whatever that does.
5454
---

files/libraries/noita-api/entity.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ end
327327

328328
---Creates a component of type 'component_type_name' and adds it to 'entity_id'.
329329
---'table_of_component_values' should be a string-indexed table, where keys are field names and values are field values of correct type.
330-
---The value setting works like ComponentObjectSetValue2(), with the exception that multivalue types are not supported.
330+
---The value setting works like ComponentObjectSetValue2(), with the exception that multi value types are not supported.
331331
---Additional supported values are _tags:comma_separated_string and _enabled:bool, which basically work like the those fields work in entity XML files.
332332
---Returns the created component, if creation succeeded, or nil.
333333
---@param componentTypeName string

0 commit comments

Comments
 (0)