gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
Yoshman29
2022-11-04 15:12:58 +01:00
parent 930d6833ef
commit ccf0c833b2
8 changed files with 103 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/charts/test/modchart.hx
+3
View File
@@ -0,0 +1,3 @@
function create() {
importScript("data/scripts/pixel");
}
assets/data/scripts/pixel.hx
+3
View File
@@ -9,7 +9,9 @@ var daPixelZoom = 6;
// strum.animation.add("scroll", [6 + strum.ID]);
// }
var song = PlayState.SONG.song.toLowerCase();
function onNoteCreation(event) {
if (song == "test" && event.note.mustPress) return;
event.cancel();
var note = event.note;
@@ -25,6 +27,7 @@ function onNoteCreation(event) {
note.updateHitbox();
}
function onStrumCreation(event) {
if (song == "test" && event.player == 1) return;
event.cancel();
var strum = event.strum;
assets/images/game/NOTE_assets.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 697 KiB

assets/images/game/NOTE_assets.xml
+89 -50
View File
@@ -1,53 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="NOTE_assets.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- Created with Adobe Animate version 21.0.1.37179 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrowDOWN0000" x="0" y="235" width="157" height="153"/>
<SubTexture name="arrowLEFT0000" x="310" y="235" width="153" height="157"/>
<SubTexture name="arrowRIGHT0000" x="157" y="235" width="153" height="157"/>
<SubTexture name="arrowUP0000" x="784" y="232" width="157" height="153"/>
<SubTexture name="blue0000" x="1850" y="154" width="157" height="154"/>
<SubTexture name="blue hold end0000" x="1170" y="447" width="50" height="64"/>
<SubTexture name="blue hold piece0000" x="1370" y="449" width="50" height="44"/>
<SubTexture name="down confirm0000" x="0" y="0" width="238" height="235"/>
<SubTexture name="down confirm0001" x="238" y="0" width="238" height="235"/>
<SubTexture name="down confirm0002" x="1176" y="230" width="219" height="208" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down confirm0003" x="1176" y="230" width="219" height="208" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down press0000" x="149" y="392" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0001" x="149" y="392" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0002" x="0" y="388" width="149" height="146"/>
<SubTexture name="down press0003" x="0" y="388" width="149" height="146"/>
<SubTexture name="green0000" x="1850" y="0" width="157" height="154"/>
<SubTexture name="green hold end0000" x="1120" y="442" width="50" height="64"/>
<SubTexture name="green hold piece0000" x="1320" y="447" width="50" height="44"/>
<SubTexture name="left confirm0000" x="948" y="0" width="228" height="231"/>
<SubTexture name="left confirm0001" x="1402" y="228" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0002" x="1402" y="0" width="225" height="221" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0003" x="1402" y="0" width="225" height="221" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left press0000" x="291" y="392" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0001" x="291" y="392" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0002" x="463" y="389" width="146" height="149"/>
<SubTexture name="left press0003" x="463" y="389" width="146" height="149"/>
<SubTexture name="pruple end hold0000" x="1220" y="447" width="50" height="64"/>
<SubTexture name="purple0000" x="630" y="232" width="154" height="157"/>
<SubTexture name="purple hold piece0000" x="1420" y="449" width="50" height="44"/>
<SubTexture name="red0000" x="476" y="232" width="154" height="157"/>
<SubTexture name="red hold end0000" x="1070" y="442" width="50" height="64"/>
<SubTexture name="red hold piece0000" x="1270" y="447" width="50" height="44"/>
<SubTexture name="right confirm0000" x="1627" y="0" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0001" x="1627" y="226" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0002" x="1176" y="0" width="226" height="230"/>
<SubTexture name="right confirm0003" x="1176" y="0" width="226" height="230"/>
<SubTexture name="right press0000" x="932" y="442" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0001" x="932" y="442" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0002" x="784" y="385" width="148" height="151"/>
<SubTexture name="right press0003" x="784" y="385" width="148" height="151"/>
<SubTexture name="up confirm0000" x="476" y="0" width="236" height="232"/>
<SubTexture name="up confirm0001" x="712" y="0" width="236" height="232"/>
<SubTexture name="up confirm0002" x="948" y="231" width="214" height="206" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up confirm0003" x="948" y="231" width="214" height="206" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up press0000" x="609" y="389" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="609" y="389" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="1850" y="308" width="153" height="150"/>
<SubTexture name="up press0003" x="1850" y="308" width="153" height="150"/>
<SubTexture name="arrowDOWN0000" x="2" y="2" width="157" height="154" pivotX="0.05" pivotY="0.05"/>
<SubTexture name="arrowLEFT0000" x="161" y="2" width="154" height="157" pivotX="-1.35" pivotY="1.45"/>
<SubTexture name="arrowRIGHT0000" x="317" y="2" width="154" height="156" pivotX="-1.45" pivotY="1.65"/>
<SubTexture name="arrowUP0000" x="473" y="2" width="157" height="154" pivotX="0" pivotY="0"/>
<SubTexture name="blue0000" x="632" y="2" width="157" height="154" pivotX="0" pivotY="0"/>
<SubTexture name="blue hold end0000" x="791" y="2" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="blue hold piece0000" x="843" y="2" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="down confirm0000" x="895" y="2" width="238" height="235" pivotX="31.15" pivotY="37.3"/>
<SubTexture name="down confirm0001" x="1135" y="2" width="238" height="235"/>
<SubTexture name="down confirm0002" x="1375" y="2" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down confirm0003" x="1375" y="2" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down press0000" x="1597" y="2" width="142" height="140" pivotX="0" pivotY="0" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0001" x="1597" y="2" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0002" x="1741" y="2" width="149" height="146"/>
<SubTexture name="down press0003" x="1741" y="2" width="149" height="146"/>
<SubTexture name="green0000" x="2" y="239" width="157" height="154" pivotX="0" pivotY="0"/>
<SubTexture name="green hold end0000" x="161" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="green hold piece0000" x="213" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="left confirm0000" x="265" y="239" width="228" height="231" pivotX="31.3" pivotY="31"/>
<SubTexture name="left confirm0001" x="495" y="239" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0002" x="715" y="239" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0003" x="715" y="239" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left press0000" x="942" y="239" width="140" height="142" pivotX="0" pivotY="0" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0001" x="942" y="239" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0002" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0003" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0004" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0005" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0006" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0007" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0008" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0009" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0010" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0011" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0012" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0013" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0014" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0015" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0016" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0017" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0018" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0019" x="1084" y="239" width="146" height="149"/>
<SubTexture name="pruple end hold0000" x="1232" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="purple0000" x="1284" y="239" width="154" height="157" pivotX="0" pivotY="0"/>
<SubTexture name="purple hold piece0000" x="1440" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="red0000" x="1492" y="239" width="154" height="157" pivotX="0" pivotY="0"/>
<SubTexture name="red hold end0000" x="1648" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="red hold piece0000" x="1700" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="right confirm0000" x="1752" y="239" width="223" height="226" pivotX="30.9" pivotY="31" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0001" x="2" y="472" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0002" x="227" y="472" width="226" height="230"/>
<SubTexture name="right confirm0003" x="227" y="472" width="226" height="230"/>
<SubTexture name="right press0000" x="455" y="472" width="138" height="141" pivotX="0" pivotY="0" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0001" x="455" y="472" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0002" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0003" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0004" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0005" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0006" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0007" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0008" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0009" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0010" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0011" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0012" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0013" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0014" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0015" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0016" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0017" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0018" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0019" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0020" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0021" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0022" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0023" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0024" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0025" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0026" x="595" y="472" width="148" height="151"/>
<SubTexture name="up confirm0000" x="745" y="472" width="236" height="232" pivotX="35" pivotY="34.95"/>
<SubTexture name="up confirm0001" x="983" y="472" width="236" height="232"/>
<SubTexture name="up confirm0002" x="1221" y="472" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up confirm0003" x="1221" y="472" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up press0000" x="1437" y="472" width="144" height="141" pivotX="0" pivotY="0" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="1437" y="472" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="1583" y="472" width="153" height="150"/>
<SubTexture name="up press0003" x="1583" y="472" width="153" height="150"/>
</TextureAtlas>
assets/songs/test/Voices.mp3
BIN
View File
Binary file not shown.
assets/songs/test/Voices.ogg
BIN
View File
Binary file not shown.
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
1095
1102
source/funkin/game/Note.hx
+7 -1
View File
@@ -1,5 +1,6 @@
package funkin.game;
import flixel.FlxG;
import flixel.FlxCamera;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
@@ -209,8 +210,13 @@ class Note extends FlxSprite
// is long sustain
lastScrollSpeed = scrollSpeed;
scale.y = stepLength / 100 * 1.5 * scrollSpeed * 0.7;
// scale.y = stepLength / 100 * 1.5 * scrollSpeed * 0.7;
scale.y = (stepLength * (0.45 * FlxMath.roundDecimal(scrollSpeed, 2))) / frameHeight;
updateHitbox();
if (antialiasing && !FlxG.forceNoAntialiasing) {
// dumbass antialiasing
scale.y += 3 / frameHeight;
}
}
if (!wasGoodHit) return;