Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tome
Tales of MajEyal
Commits
f7fde413
Commit
f7fde413
authored
9 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
Fixed scrolling
parent
ad092f68
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/class/uiset/Minimalist.lua
+12
-12
12 additions, 12 deletions
game/modules/tome/class/uiset/Minimalist.lua
game/modules/tome/settings.lua
+3
-3
3 additions, 3 deletions
game/modules/tome/settings.lua
with
15 additions
and
15 deletions
game/modules/tome/class/uiset/Minimalist.lua
+
12
−
12
View file @
f7fde413
...
...
@@ -615,18 +615,18 @@ function _M:computePadding(what, x1, y1, x2, y2)
-- This is Marson's code to make you not get stuck under UI elements
-- I have tested and love it but I don't understand it very well, may be oversights
--if config.settings.marson.view_scrolling == "No Hiding" then
if
x2
<=
Map
.
viewport
.
width
/
4
then
Map
.
viewport_padding_4
=
math.max
(
Map
.
viewport_padding_4
,
math.ceil
(
x2
/
Map
.
tile_w
))
end
if
x1
>=
(
Map
.
viewport
.
width
/
4
)
*
3
then
Map
.
viewport_padding_6
=
math.max
(
Map
.
viewport_padding_6
,
math.ceil
((
Map
.
viewport
.
width
-
x1
)
/
Map
.
tile_w
))
end
if
y2
<=
Map
.
viewport
.
height
/
4
then
Map
.
viewport_padding_8
=
math.max
(
Map
.
viewport_padding_8
,
math.ceil
(
y2
/
Map
.
tile_h
))
end
if
y1
>=
(
Map
.
viewport
.
height
/
4
)
*
3
then
Map
.
viewport_padding_2
=
math.max
(
Map
.
viewport_padding_2
,
math.ceil
((
Map
.
viewport
.
height
-
y1
)
/
Map
.
tile_h
))
end
--
if x2 <= Map.viewport.width / 4 then
--
Map.viewport_padding_4 = math.max(Map.viewport_padding_4, math.ceil(x2 / Map.tile_w))
--
end
--
if x1 >= (Map.viewport.width / 4) * 3 then
--
Map.viewport_padding_6 = math.max(Map.viewport_padding_6, math.ceil((Map.viewport.width - x1) / Map.tile_w))
--
end
--
if y2 <= Map.viewport.height / 4 then
--
Map.viewport_padding_8 = math.max(Map.viewport_padding_8, math.ceil(y2 / Map.tile_h))
--
end
--
if y1 >= (Map.viewport.height / 4) * 3 then
--
Map.viewport_padding_2 = math.max(Map.viewport_padding_2, math.ceil((Map.viewport.height - y1) / Map.tile_h))
--
end
if
x1
<=
0
then
size
.
orient
=
"right"
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/settings.lua
+
3
−
3
View file @
f7fde413
...
...
@@ -31,9 +31,9 @@ if type(config.settings.tome.twitch_move) == "nil" then config.settings.tome.twi
if
not
config
.
settings
.
tome
.
gfx
then
local
w
,
h
=
core
.
display
.
size
()
config
.
settings
.
tome
.
gfx
=
{
size
=
"64x64"
,
tiles
=
"shockbolt"
}
--
if w >= 1000 then config.settings.tome.gfx = {size="64x64", tiles="shockbolt"}
--
else config.settings.tome.gfx = {size="48x48", tiles="shockbolt"}
--
end
if
w
>=
1000
then
config
.
settings
.
tome
.
gfx
=
{
size
=
"64x64"
,
tiles
=
"shockbolt"
}
else
config
.
settings
.
tome
.
gfx
=
{
size
=
"48x48"
,
tiles
=
"shockbolt"
}
end
end
if
config
.
settings
.
tome
.
gfx
.
tiles
==
"mushroom"
then
config
.
settings
.
tome
.
gfx
.
tiles
=
"shockbolt"
end
if
type
(
config
.
settings
.
tome
.
weather_effects
)
==
"nil"
then
config
.
settings
.
tome
.
weather_effects
=
true
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment