Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Degrees of Lewdity
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vrelnir
Degrees of Lewdity
Commits
7e13ec1b
Commit
7e13ec1b
authored
9 months ago
by
xao
Browse files
Options
Downloads
Patches
Plain Diff
Override can now show tooltips
parent
bec5bd56
No related branches found
No related tags found
5 merge requests
!2856
Combat Renderer - Continuation
,
!2855
Canvas changes & Spring cleaning
,
!2843
Bugfixes
,
!2840
Bugfixes
,
!2833
Bugfixes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/03-JavaScript/weather/02-main/02-temperature.js
+12
-7
12 additions, 7 deletions
game/03-JavaScript/weather/02-main/02-temperature.js
game/03-JavaScript/weather/03-canvas/01-src/01-main/02-tooltips.js
+9
-1
9 additions, 1 deletion
...avaScript/weather/03-canvas/01-src/01-main/02-tooltips.js
with
21 additions
and
8 deletions
game/03-JavaScript/weather/02-main/02-temperature.js
+
12
−
7
View file @
7e13ec1b
...
...
@@ -349,25 +349,30 @@ Weather.Temperature = (() => {
add
,
override
:
{
increase
:
{
inside
(
value
)
{
inside
(
value
,
tooltip
)
{
T
.
temperatureOverride
=
{
inside
:
(
T
.
temperatureOverride
?.
inside
??
Weather
.
insideTemperature
)
+
value
};
T
.
temperatureOverrideTooltip
=
`<span class="orange">
${
tooltip
}
</span>`
;
},
outside
(
value
)
{
outside
(
value
,
tooltip
)
{
T
.
temperatureOverride
=
{
outside
:
(
T
.
temperatureOverride
?.
outside
??
Weather
.
temperature
)
+
value
};
T
.
temperatureOverrideTooltip
=
`<span class="orange">
${
tooltip
}
</span>`
;
},
water
(
value
)
{
water
(
value
,
tooltip
)
{
T
.
temperatureOverride
=
{
water
:
(
T
.
temperatureOverride
?.
water
??
Weather
.
waterTemperature
)
+
value
};
T
.
temperatureOverrideTooltip
=
`<span class="orange">
${
tooltip
}
</span>`
;
},
},
decrease
:
{
inside
(
value
)
{
inside
(
value
,
tooltip
)
{
T
.
temperatureOverride
=
{
inside
:
(
T
.
temperatureOverride
?.
inside
??
Weather
.
insideTemperature
)
-
value
};
},
outside
(
value
)
{
T
.
temperatureOverrideTooltip
=
`<span class="teal">
${
tooltip
}
</span>`
;
outside
(
value
,
tooltip
)
{
T
.
temperatureOverride
=
{
outside
:
(
T
.
temperatureOverride
?.
outside
??
Weather
.
temperature
)
-
value
};
T
.
temperatureOverrideTooltip
=
`<span class="teal">
${
tooltip
}
</span>`
;
},
water
(
value
)
{
water
(
value
,
tooltip
)
{
T
.
temperatureOverride
=
{
water
:
(
T
.
temperatureOverride
?.
water
??
Weather
.
waterTemperature
)
-
value
};
T
.
temperatureOverrideTooltip
=
`<span class="teal">
${
tooltip
}
</span>`
;
},
},
get
outside
()
{
...
...
This diff is collapsed.
Click to expand it.
game/03-JavaScript/weather/03-canvas/01-src/01-main/02-tooltips.js
+
9
−
1
View file @
7e13ec1b
...
...
@@ -35,6 +35,7 @@ Weather.Tooltips = (() => {
const
tempDescription
=
Weather
.
TooltipDescriptions
.
bodyTemperature
();
const
waterDescription
=
Weather
.
TooltipDescriptions
.
waterTemperature
();
const
tempChangeDescription
=
Weather
.
TooltipDescriptions
.
bodyTemperatureChanges
();
const
overrideDescription
=
T
.
temperatureOverrideTooltip
;
const
fatigueModifier
=
categorise
(
Weather
.
BodyTemperature
.
fatigueModifier
,
1
,
Weather
.
tempSettings
.
effects
.
maxFatigueGainMultiplier
,
4
);
const
arousalModifier
=
categorise
(
Weather
.
BodyTemperature
.
arousalModifier
,
1
,
Weather
.
tempSettings
.
effects
.
maxArousalGainMultiplier
,
4
);
const
painModifier
=
categorise
(
Weather
.
BodyTemperature
.
painModifier
,
1
,
Weather
.
tempSettings
.
effects
.
maxPainGainMultiplier
,
4
);
...
...
@@ -57,7 +58,14 @@ Weather.Tooltips = (() => {
<br><span class="blue">Target temperature (current clothing)</span> <span class="yellow">
${
Weather
.
toSelectedString
(
Weather
.
BodyTemperature
.
target
)}
</span>`
:
""
;
Weather
.
Thermometer
.
tooltipElement
.
tooltip
({
message
:
tempDescription
+
(
waterDescription
?
"
<br>
"
+
waterDescription
:
""
)
+
"
<br>
"
+
tempChangeDescription
+
modifiers
+
debug
,
message
:
tempDescription
+
(
waterDescription
?
"
<br>
"
+
waterDescription
:
""
)
+
"
<br>
"
+
tempChangeDescription
+
(
overrideDescription
?
"
<br>
"
+
overrideDescription
:
""
)
+
modifiers
+
debug
,
delay
:
200
,
position
:
"
cursor
"
,
});
...
...
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