cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-05-21 14:41:10 +00:00
Code Issues Releases Wiki Activity

goodbye scripts, hello notestyles!

Browse source
This commit is contained in:
anysad 2024-07-16 20:53:12 +03:00
parent aed100df47
commit f8a0627fd2
5 changed files with 132 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit e414ee618b4fa577dc3c3df4e156488e91c6348d Subproject commit ca4d97554f9e3853fda25733f21a5fa108c0b902

101
source/funkin/play/Countdown.hx
View file

@ -11,6 +11,8 @@ import funkin.modding.events.ScriptEvent.CountdownScriptEvent;
import flixel.util.FlxTimer; import flixel.util.FlxTimer;
import funkin.audio.FunkinSound; import funkin.audio.FunkinSound;
import openfl.utils.Assets; import openfl.utils.Assets;
import funkin.data.notestyle.NoteStyleRegistry;
import funkin.play.notes.notestyle.NoteStyle;
class Countdown class Countdown
{ {
@ -20,20 +22,13 @@ class Countdown
public static var countdownStep(default, null):CountdownStep = BEFORE; public static var countdownStep(default, null):CountdownStep = BEFORE;
/** /**
* Which alternate countdown sound effect to use. * Which alternate graphic/sound on countdown to use.
* You can set this via script. * This is set via the current notestyle.
* For example, in Week 6 it is `-pixel`. * For example, in Week 6 it is `pixel`.
*/ */
public static var soundSuffix:String = ''; static var noteStyle:NoteStyle;
/**
* Which alternate graphic on countdown to use.
* You can set this via script.
* For example, in Week 6 it is `-pixel`.
*/
public static var graphicSuffix:String = '';
static var isPixel:Bool = false;
/** /**
* The currently running countdown. This will be null if there is no countdown running. * The currently running countdown. This will be null if there is no countdown running.
@ -64,6 +59,11 @@ class Countdown
// @:privateAccess // @:privateAccess
// PlayState.instance.dispatchEvent(new SongTimeScriptEvent(SONG_BEAT_HIT, 0, 0)); // PlayState.instance.dispatchEvent(new SongTimeScriptEvent(SONG_BEAT_HIT, 0, 0));
var fetchedNoteStyle:NoteStyle = NoteStyleRegistry.instance.fetchEntry(PlayState.instance.currentChart.noteStyle);
if (fetchedNoteStyle == null) noteStyle = NoteStyleRegistry.instance.fetchDefault();
else noteStyle = fetchedNoteStyle;
if (noteStyle._data.assets.note.isPixel) isPixel = true;
// The timer function gets called based on the beat of the song. // The timer function gets called based on the beat of the song.
countdownTimer = new FlxTimer(); countdownTimer = new FlxTimer();
@ -81,10 +81,10 @@ class Countdown
// PlayState.instance.dispatchEvent(new SongTimeScriptEvent(SONG_BEAT_HIT, 0, 0)); // PlayState.instance.dispatchEvent(new SongTimeScriptEvent(SONG_BEAT_HIT, 0, 0));
// Countdown graphic. // Countdown graphic.
showCountdownGraphic(countdownStep, graphicSuffix.toLowerCase().contains('pixel')); showCountdownGraphic(countdownStep, noteStyle, isPixel);
// Countdown sound. // Countdown sound.
playCountdownSound(countdownStep); playCountdownSound(countdownStep, noteStyle);
// Event handling bullshit. // Event handling bullshit.
var cancelled:Bool = propagateCountdownEvent(countdownStep); var cancelled:Bool = propagateCountdownEvent(countdownStep);
@ -197,17 +197,31 @@ class Countdown
*/ */
public static function reset() public static function reset()
{ {
soundSuffix = ''; noteStyle = NoteStyleRegistry.instance.fetchDefault();
graphicSuffix = ''; isPixel = false;
} }
/** /**
* Retrieves the graphic to use for this step of the countdown. * Retrieves the graphic to use for this step of the countdown.
*/ */
public static function showCountdownGraphic(index:CountdownStep, isGraphicPixel:Bool):Void public static function showCountdownGraphic(index:CountdownStep, noteStyle:NoteStyle, isGraphicPixel:Bool):Void
{ {
var indexString:String = null;
switch (index)
{
case TWO:
indexString = 'ready';
case ONE:
indexString = 'set';
case GO:
indexString = 'go';
default:
// null
}
if (indexString == null) return;
var spritePath:String = null; var spritePath:String = null;
spritePath = resolveGraphicPath(graphicSuffix, index); spritePath = resolveGraphicPath(noteStyle, indexString);
if (spritePath == null) return; if (spritePath == null) return;
@ -215,12 +229,15 @@ class Countdown
countdownSprite.scrollFactor.set(0, 0); countdownSprite.scrollFactor.set(0, 0);
if (isGraphicPixel) countdownSprite.setGraphicSize(Std.int(countdownSprite.width * Constants.PIXEL_ART_SCALE)); if (isGraphicPixel) countdownSprite.setGraphicSize(Std.int(countdownSprite.width * Constants.PIXEL_ART_SCALE));
else countdownSprite.setGraphicSize(Std.int(countdownSprite.width * 0.7));
countdownSprite.antialiasing = !isGraphicPixel; countdownSprite.antialiasing = !isGraphicPixel;
countdownSprite.updateHitbox(); countdownSprite.updateHitbox();
countdownSprite.screenCenter(); countdownSprite.screenCenter();
countdownSprite.cameras = [PlayState.instance.camHUD];
// Fade sprite in, then out, then destroy it. // Fade sprite in, then out, then destroy it.
FlxTween.tween(countdownSprite, {y: countdownSprite.y += 100, alpha: 0}, Conductor.instance.beatLengthMs / 1000, FlxTween.tween(countdownSprite, {y: countdownSprite.y += 100, alpha: 0}, Conductor.instance.beatLengthMs / 1000,
{ {
@ -233,29 +250,18 @@ class Countdown
PlayState.instance.add(countdownSprite); PlayState.instance.add(countdownSprite);
} }
static function resolveGraphicPath(suffix:String, index:CountdownStep):Null<String> static function resolveGraphicPath(noteStyle:NoteStyle, index:String):Null<String>
{ {
var basePath:String = 'ui/countdown/'; var basePath:String = 'ui/countdown/';
var indexString:String = null;
switch (index) var spritePath:String = basePath + noteStyle.id + '/$index';
// If nothing is found, revert it to default notestyle skin
if (!Assets.exists(Paths.image(spritePath)))
{ {
case TWO: if (!isPixel) spritePath = basePath + Constants.DEFAULT_NOTE_STYLE + '/$index';
indexString = 'ready'; else spritePath = basePath + Constants.DEFAULT_PIXEL_NOTE_STYLE + '/$index';
case ONE:
indexString = 'set';
case GO:
indexString = 'go';
default:
// null
} }
basePath += indexString;
var spritePath:String = basePath + suffix;
while (!Assets.exists(Paths.image(spritePath)) && suffix.length > 0)
{
suffix = suffix.split('-').slice(0, -1).join('-');
spritePath = basePath + suffix;
}
if (!Assets.exists(Paths.image(spritePath))) return null;
trace('Resolved sprite path: ' + Paths.image(spritePath)); trace('Resolved sprite path: ' + Paths.image(spritePath));
return spritePath; return spritePath;
} }
@ -263,23 +269,24 @@ class Countdown
/** /**
* Retrieves the sound file to use for this step of the countdown. * Retrieves the sound file to use for this step of the countdown.
*/ */
public static function playCountdownSound(index:CountdownStep):Void public static function playCountdownSound(step:CountdownStep, noteStyle:NoteStyle):Void
{ {
FunkinSound.playOnce(resolveSoundPath(soundSuffix, index), Constants.COUNTDOWN_VOLUME); return FunkinSound.playOnce(Paths.sound(resolveSoundPath(noteStyle, step)), Constants.COUNTDOWN_VOLUME);
} }
static function resolveSoundPath(suffix:String, step:CountdownStep):Null<String> static function resolveSoundPath(noteStyle:NoteStyle, step:CountdownStep):Null<String>
{ {
var basePath:String = 'gameplay/countdown/intro'; if (step == CountdownStep.BEFORE || step == CountdownStep.AFTER) return null;
if (step != CountdownStep.BEFORE || step != CountdownStep.AFTER) basePath += step; var basePath:String = 'gameplay/countdown/';
var soundPath:String = Paths.sound(basePath + suffix); var soundPath:String = basePath + noteStyle.id + '/intro$step';
while (!Assets.exists(soundPath) && suffix.length > 0) // If nothing is found, revert it to default notestyle sound
if (!Assets.exists(Paths.sound(soundPath)))
{ {
suffix = suffix.split('-').slice(0, -1).join('-'); if (!isPixel) soundPath = basePath + Constants.DEFAULT_NOTE_STYLE + '/intro$step';
soundPath = Paths.sound(basePath + suffix); else soundPath = basePath + Constants.DEFAULT_PIXEL_NOTE_STYLE + '/intro$step';
} }
if (!Assets.exists(soundPath)) return null;
trace('Resolved sound path: ' + soundPath); trace('Resolved sound path: ' + soundPath);
return soundPath; return soundPath;
} }

75
source/funkin/play/components/PopUpStuff.hx
View file

@ -8,6 +8,8 @@ import funkin.graphics.FunkinSprite;
import funkin.play.PlayState; import funkin.play.PlayState;
import funkin.util.TimerUtil; import funkin.util.TimerUtil;
import openfl.utils.Assets; import openfl.utils.Assets;
import funkin.data.notestyle.NoteStyleRegistry;
import funkin.play.notes.notestyle.NoteStyle;
class PopUpStuff extends FlxTypedGroup<FlxSprite> class PopUpStuff extends FlxTypedGroup<FlxSprite>
{ {
@ -15,31 +17,35 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
/** /**
* Which alternate graphic on popup to use. * Which alternate graphic on popup to use.
* You can set this via script. * This is set via the current notestyle.
* For example, in Week 6 it is `-pixel`. * For example, in Week 6 it is `pixel`.
*/ */
public static var graphicSuffix:String = ''; static var noteStyle:NoteStyle;
static var isPixel:Bool = false;
override public function new() override public function new()
{ {
super(); super();
var fetchedNoteStyle:NoteStyle = NoteStyleRegistry.instance.fetchEntry(PlayState.instance.currentChart.noteStyle);
if (fetchedNoteStyle == null) noteStyle = NoteStyleRegistry.instance.fetchDefault();
else noteStyle = fetchedNoteStyle;
if (noteStyle._data.assets.note.isPixel) isPixel = true;
} }
static function resolveGraphicPath(suffix:String, index:String):Null<String> static function resolveGraphicPath(noteStyle:NoteStyle, index:String):Null<String>
{ {
var folder:String; var basePath:String = 'ui/popup/';
if (suffix != '')
folder = suffix.substring(0, suffix.indexOf("-")) + suffix.substring(suffix.indexOf("-") + 1); var spritePath:String = basePath + noteStyle.id + '/$index';
else // If nothing is found, revert it to default notestyle skin
folder = 'normal'; if (!Assets.exists(Paths.image(spritePath)))
var basePath:String = 'gameplay/popup/$folder/$index';
var spritePath:String = basePath + suffix;
while (!Assets.exists(Paths.image(spritePath)) && suffix.length > 0)
{ {
suffix = suffix.split('-').slice(0, -1).join('-'); if (!isPixel) spritePath = basePath + Constants.DEFAULT_NOTE_STYLE + '/$index';
spritePath = basePath + suffix; else spritePath = basePath + Constants.DEFAULT_PIXEL_NOTE_STYLE + '/$index';
} }
if (!Assets.exists(Paths.image(spritePath))) return null;
return spritePath; return spritePath;
} }
@ -49,7 +55,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
if (daRating == null) daRating = "good"; if (daRating == null) daRating = "good";
var ratingPath:String = resolveGraphicPath(graphicSuffix, daRating); var ratingPath:String = resolveGraphicPath(noteStyle, daRating);
//if (PlayState.instance.currentStageId.startsWith('school')) ratingPath = "weeb/pixelUI/" + ratingPath + "-pixel"; //if (PlayState.instance.currentStageId.startsWith('school')) ratingPath = "weeb/pixelUI/" + ratingPath + "-pixel";
@ -66,7 +72,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
add(rating); add(rating);
if (graphicSuffix.toLowerCase().contains('pixel')) if (isPixel)
{ {
rating.setGraphicSize(Std.int(rating.width * Constants.PIXEL_ART_SCALE * 0.7)); rating.setGraphicSize(Std.int(rating.width * Constants.PIXEL_ART_SCALE * 0.7));
rating.antialiasing = false; rating.antialiasing = false;
@ -99,7 +105,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
if (combo == null) combo = 0; if (combo == null) combo = 0;
var comboPath:String = resolveGraphicPath(graphicSuffix, Std.string(combo)); var comboPath:String = resolveGraphicPath(noteStyle, 'combo');
var comboSpr:FunkinSprite = FunkinSprite.create(comboPath); var comboSpr:FunkinSprite = FunkinSprite.create(comboPath);
comboSpr.y = (FlxG.camera.height * 0.44) + offsets[1]; comboSpr.y = (FlxG.camera.height * 0.44) + offsets[1];
comboSpr.x = (FlxG.width * 0.507) + offsets[0]; comboSpr.x = (FlxG.width * 0.507) + offsets[0];
@ -111,16 +117,10 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
// add(comboSpr); // add(comboSpr);
if (graphicSuffix.toLowerCase().contains('pixel')) if (isPixel) comboSpr.setGraphicSize(Std.int(comboSpr.width * Constants.PIXEL_ART_SCALE * 0.7));
{ else comboSpr.setGraphicSize(Std.int(comboSpr.width * 0.7));
comboSpr.setGraphicSize(Std.int(comboSpr.width * Constants.PIXEL_ART_SCALE * 0.7));
comboSpr.antialiasing = false; comboSpr.antialiasing = !isPixel;
}
else
{
comboSpr.setGraphicSize(Std.int(comboSpr.width * 0.7));
comboSpr.antialiasing = true;
}
comboSpr.updateHitbox(); comboSpr.updateHitbox();
FlxTween.tween(comboSpr, {alpha: 0}, 0.2, FlxTween.tween(comboSpr, {alpha: 0}, 0.2,
@ -148,18 +148,12 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
var daLoop:Int = 1; var daLoop:Int = 1;
for (i in seperatedScore) for (i in seperatedScore)
{ {
var numScore:FunkinSprite = FunkinSprite.create(0, comboSpr.y, resolveGraphicPath(graphicSuffix, 'num' + Std.int(i))); var numScore:FunkinSprite = FunkinSprite.create(0, comboSpr.y, resolveGraphicPath(noteStyle, 'num' + Std.int(i)));
if (graphicSuffix.toLowerCase().contains('pixel')) if (isPixel) numScore.setGraphicSize(Std.int(numScore.width * Constants.PIXEL_ART_SCALE * 0.7));
{ else numScore.setGraphicSize(Std.int(numScore.width * 0.45));
numScore.setGraphicSize(Std.int(numScore.width * Constants.PIXEL_ART_SCALE * 0.7));
numScore.antialiasing = false; numScore.antialiasing = !isPixel;
}
else
{
numScore.setGraphicSize(Std.int(numScore.width * 0.45));
numScore.antialiasing = true;
}
numScore.updateHitbox(); numScore.updateHitbox();
numScore.x = comboSpr.x - (36 * daLoop) - 65; //- 90; numScore.x = comboSpr.x - (36 * daLoop) - 65; //- 90;
@ -191,6 +185,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
*/ */
public static function reset() public static function reset()
{ {
graphicSuffix = ''; noteStyle = NoteStyleRegistry.instance.fetchDefault();
isPixel = false;
} }
} }

73
source/funkin/ui/transition/LoadingState.hx
View file

@ -291,46 +291,47 @@ class LoadingState extends MusicBeatSubState
FunkinSprite.preparePurgeCache(); FunkinSprite.preparePurgeCache();
FunkinSprite.cacheTexture(Paths.image('healthBar')); FunkinSprite.cacheTexture(Paths.image('healthBar'));
FunkinSprite.cacheTexture(Paths.image('menuDesat')); FunkinSprite.cacheTexture(Paths.image('menuDesat'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/combo')); // Lord have mercy on me and this caching -anysad
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num0')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/combo'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num1')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num0'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num2')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num1'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num3')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num2'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num4')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num3'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num5')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num4'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num6')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num5'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num7')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num6'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num8')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num7'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/num9')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num8'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/combo-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/funkin/num9'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num0-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/combo'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num1-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num0'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num2-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num1'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num3-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num2'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num4-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num3'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num5-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num4'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num6-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num5'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num7-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num6'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num8-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num7'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/num9-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num8'));
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num9'));
FunkinSprite.cacheTexture(Paths.image('notes', 'shared')); FunkinSprite.cacheTexture(Paths.image('notes', 'shared'));
FunkinSprite.cacheTexture(Paths.image('noteSplashes', 'shared')); FunkinSprite.cacheTexture(Paths.image('noteSplashes', 'shared'));
FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared')); FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared'));
FunkinSprite.cacheTexture(Paths.image('NOTE_hold_assets')); FunkinSprite.cacheTexture(Paths.image('NOTE_hold_assets'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/ready', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/ready', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/set', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/set', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/go', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/go', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/ready-pixel', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/pixel/ready', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/set-pixel', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/pixel/set', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/go-pixel', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/pixel/go', 'shared'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/sick')); FunkinSprite.cacheTexture(Paths.image('ui/popup/normal/sick'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/good')); FunkinSprite.cacheTexture(Paths.image('ui/popup/normal/good'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/bad')); FunkinSprite.cacheTexture(Paths.image('ui/popup/normal/bad'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/normal/shit')); FunkinSprite.cacheTexture(Paths.image('ui/popup/normal/shit'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/sick-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/sick'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/good-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/good'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/bad-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/bad'));
FunkinSprite.cacheTexture(Paths.image('gameplay/popup/pixel/shit-pixel')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/shit'));
FunkinSprite.cacheTexture(Paths.image('miss', 'shared')); // TODO: remove this FunkinSprite.cacheTexture(Paths.image('miss', 'shared')); // TODO: remove this
// List all image assets in the level's library. // List all image assets in the level's library.

5
source/funkin/util/Constants.hx
View file

@ -258,6 +258,11 @@ class Constants
*/ */
public static final DEFAULT_NOTE_STYLE:String = 'funkin'; public static final DEFAULT_NOTE_STYLE:String = 'funkin';
/**
* The default pixel note style for songs.
*/
public static final DEFAULT_PIXEL_NOTE_STYLE:String = 'pixel';
/** /**
* The default album for songs in Freeplay. * The default album for songs in Freeplay.
*/ */