Skip to content

Commit b239aa7

Browse files
committed
things I like to do
1 parent 534a476 commit b239aa7

39 files changed

+6424
-6109
lines changed

Project.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@
128128
<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
129129
<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->
130130
<haxelib name="flixel-ui" />
131+
132+
<!--Uncomment if you want to use moonchart, which allows usage of chart formats from other rhythm games and fnf engines-->
133+
<haxelib name="moonchart" version="git" if="native"/>
131134

132135
<!--Psych stuff needed-->
133136
<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
@@ -206,10 +209,20 @@
206209
<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
207210

208211
<!--Used for Izzy Engine's crash handler-->
209-
<haxedef name="HXCPP_CHECK_POINTER" if="CRASH_HANDLER" />
210-
<haxedef name="HXCPP_STACK_LINE" if="CRASH_HANDLER" />
211-
<haxedef name="HXCPP_STACK_TRACE" if="CRASH_HANDLER" />
212-
<haxedef name="openfl-enable-handle-error" />
212+
<section if="cpp">
213+
<haxedef name="HXCPP_CHECK_POINTER" />
214+
<haxedef name="HXCPP_STACK_LINE" />
215+
<haxedef name="HXCPP_STACK_TRACE" />
216+
<haxedef name="HXCPP_CATCH_SEGV" />
217+
<haxedef name="HXCPP_GC_DISABLE" />
218+
</section>
219+
220+
<section if="desktop">
221+
<!--Enable Handle Error-->
222+
<haxedef name="openfl_enable_handle_error" if="${openfl &ge; 9.4.0}" />
223+
<!--Undefinitions-->
224+
<undefine name="openfl-disable-handle-error" if="debug" unless="${openfl &ge; 9.4.0}" />
225+
</section>
213226

214227
<!--Allow working memory greater than 1 Gig-->
215228
<haxedef name="HXCPP_GC_BIG_BLOCKS"/>
708 KB
Loading
3.01 KB
Loading
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="chart_quant.png">
3+
<!-- Created with Adobe Animate version 21.0.5.40714 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="chart_quant0000" x="1" y="1" width="26" height="20"/>
6+
<SubTexture name="chart_quant0001" x="28" y="1" width="26" height="20"/>
7+
<SubTexture name="chart_quant0002" x="55" y="1" width="26" height="20"/>
8+
<SubTexture name="chart_quant0003" x="82" y="1" width="26" height="20"/>
9+
<SubTexture name="chart_quant0004" x="1" y="22" width="26" height="20"/>
10+
<SubTexture name="chart_quant0005" x="28" y="22" width="26" height="20"/>
11+
<SubTexture name="chart_quant0006" x="55" y="22" width="26" height="20"/>
12+
<SubTexture name="chart_quant0007" x="82" y="22" width="26" height="20"/>
13+
<SubTexture name="chart_quant0008" x="1" y="43" width="26" height="20"/>
14+
<SubTexture name="chart_quant0009" x="1" y="22" width="26" height="20"/>
15+
<SubTexture name="chart_quant0010" x="1" y="22" width="26" height="20"/>
16+
</TextureAtlas>

source/archipelago/APInfo.hx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class APInfo {
3939
"<asterisk>" => "*",
4040
"<percent>" => "%",
4141
"<at>" => "@",
42-
"<asterisk>" => "*",
4342
];
4443

4544
public static function get_hintPoints():Int {

source/archipelago/APItem.hx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,9 @@ class APItem {
241241
}, true, false);
242242
case "Chart Modifier Trap":
243243
return new APChartModifier();
244+
case "Nothing":
245+
popup('...For now...', "APItem: Nothing");
246+
return null;
244247
default:
245248
throw "Unknown item name: " + name;
246249
}
@@ -287,7 +290,8 @@ class APItem {
287290
"Ghost Chat",
288291
"Shield",
289292
"Max HP Up",
290-
"Tutorial Trap"
293+
"Tutorial Trap",
294+
"Nothing"
291295
];
292296
for (name in itemNames) {
293297
createItemByName(name);

source/archipelago/APPlayState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,7 @@ class APPlayState extends PlayState {
22652265
{
22662266
if (note.isMine || note.isFakeHeal)
22672267
{
2268-
songMisses++;
2268+
comboManager.songMisses++;
22692269
health -= FlxG.random.float(0.2, 1) * dmgMultiplier;
22702270
if (note.isMine)
22712271
FlxG.sound.play(Paths.sound('streamervschat/mine'));
@@ -2301,7 +2301,7 @@ class APPlayState extends PlayState {
23012301
}
23022302
else if (note.isFreeze)
23032303
{
2304-
songMisses++;
2304+
comboManager.songMisses++;
23052305
FlxG.sound.play(Paths.sound('streamervschat/freeze'));
23062306
frozenInput++;
23072307
for (sprite in playerField.strumNotes)

source/backend/ClientPrefs.hx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,13 @@ import states.TitleState;
166166
public var freeplayMenu:String = 'Mixtape';
167167
public var showMods:Bool = false;
168168
public var checkAPWorld:Bool = true;
169+
public var skipMode:String = 'First Note';
170+
public var skipWhen:String = 'Freeplay';
171+
public var audioDisplayQuality:Int = 1;
172+
public var audioDisplayUpdate:Int = 50;
173+
public var allowVis:Bool = true;
174+
public var healthVis:Bool = true;
175+
public var visOpacity:Float = 0.7;
169176
}
170177

171178
class ClientPrefs {

0 commit comments

Comments
 (0)