Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion preload/scripts/characters/nene-pixel.hxc
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class NenePixelCharacter extends SparrowCharacter
abotSpeakerShader.updateFrameInfo(abotSpeaker.frame);
});

abotSpeakerShader.loadAltMask(Paths.image('weeb/erect/masks/aBotPixelSpeaker_mask'));
abotSpeakerShader.loadAltMask(Paths.image('masks/abot-pixel'));
abotSpeakerShader.maskThreshold = 0;
abotSpeakerShader.useAltMask = true;

Expand Down
23 changes: 1 addition & 22 deletions preload/scripts/stages/schoolErect.hxc
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,7 @@ class SchoolErectStage extends Stage
rim.angle = 90;
character.shader = rim;

if (character.characterId == 'pico-pixel')
{
rim.loadAltMask(Paths.image('weeb/erect/masks/picoPixel_mask'));
}
else
{
rim.loadAltMask(Paths.image('weeb/erect/masks/bfPixel_mask'));
}

rim.maskThreshold = 1;
rim.useAltMask = true;

character.animation.onFrameChange.add(function() {
if (getBoyfriend() != null)
Expand All @@ -69,18 +59,9 @@ class SchoolErectStage extends Stage
rim.distance = 3;
rim.threshold = 0.3;

if (character.characterId == 'nene-pixel')
{
rim.loadAltMask(Paths.image('weeb/erect/masks/nenePixel_mask'));
character.addSunsetShaders();
}
else
{
rim.loadAltMask(Paths.image('weeb/erect/masks/gfPixel_mask'));
}
if (character.characterId == 'nene-pixel') character.addSunsetShaders();

rim.maskThreshold = 1;
rim.useAltMask = true;

character.animation.onFrameChange.add(function() {
if (getGirlfriend() != null)
Expand All @@ -93,9 +74,7 @@ class SchoolErectStage extends Stage
rim.angle = 90;
character.shader = rim;

rim.loadAltMask(Paths.image('weeb/erect/masks/senpai_mask'));
rim.maskThreshold = 1;
rim.useAltMask = true;

character.animation.onFrameChange.add(function() {
if (getDad() != null)
Expand Down
10 changes: 1 addition & 9 deletions preload/scripts/stages/tankmanBattlefieldErect.hxc
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,7 @@ class TankmanBattlefieldErectStage extends Stage
case CharacterType.GF:
rim.angle = 90;

if (getGirlfriend().characterId == 'gf-tankmen' || getGirlfriend().characterId == 'nene-tankmen')
{
if (getGirlfriend().characterId == 'gf-tankmen') rim.loadAltMask(Paths.image('erect/masks/gfTankmen_mask'));
else
rim.loadAltMask(Paths.image('erect/masks/neneTankmen_mask'));
rim.maskThreshold = 0.4;
rim.useAltMask = true;
}
rim.maskThreshold = 0.4;

getNamedProp('tankBricks').setPosition(445, 774);

Expand All @@ -64,7 +57,6 @@ class TankmanBattlefieldErectStage extends Stage

if (getDad().characterId == 'tankman-bloody')
{
rim.loadAltMask(Paths.image('erect/masks/tankmanCaptainBloody_mask'));
rim.maskThreshold = 1;
rim.useAltMask = false;
}
Expand Down
Binary file added shared/images/masks/senpai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shared/images/masks/tankman-bloody.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed week7/images/erect/masks/neneTankmen_mask.png
Binary file not shown.
Binary file not shown.