1.6 stuff!!

corecathx · Nov 29, 2023 · 92659df · 92659df
1 parent 5504608
commit 92659df
Show file tree

Hide file tree

Showing 59 changed files with 6,185 additions and 1,586 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,10 @@
 export/
 .vscode/
-APIStuff.hx
-ldingbackuplalaldasf.txt
-fpstatebackup.txt
-CreateCharacterBETATEST.hx
-CHARACTERHX-CHARCODE
 art/backupcodeshit/
-source/modding/StageEdit.hx
-docs/hscript.md
 todo.txt
 cdev-changelog.txt
 build.hxml
 vscode-project.hxml
-crash_handler/src
+hxformat.json
+crash_handler/src
+CHANGELOG.md
diff --git a/Modding.md b/Modding.md
diff --git a/Project.xml b/Project.xml
@@ -49,7 +49,7 @@
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
 
 	<!--CDEV Engine's define names-->
-	<define name="ALLOW_MODS" if="desktop"/>
+	<define name="ALLOW_MODS"/><!-- if="desktop"-->
 	<define name="CRASH_HANDLER" if="desktop"/>
 	<!--<define name="USE_VIDEOS"/>-->
 
@@ -126,8 +126,6 @@
 	<haxelib name="flixel-addons" />
 	<haxelib name="hscript" />
 
-
-
 	<!--In case you want to use the ui package-->
 	<haxelib name="flixel-ui" />
 	<haxelib name="faxe" if='switch'/>
@@ -192,8 +190,7 @@
 	<icon path="art/icon256.png" size='256'/>
 	<icon path="art/icon512.png" size='512'/>
 	<icon path="art/iconOG.png" />
-
-	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
+
 	<haxedef name="NG_LOGIN" if="newgrounds" />
 
 </project>
diff --git a/assets/fonts/diffic.ttf b/assets/fonts/diffic.ttf
diff --git a/docs/assets/pmf.ttf b/docs/assets/pmf.ttf
diff --git a/docs/assets/pmf2.ttf b/docs/assets/pmf2.ttf
diff --git a/docs/index.html b/docs/index.html
@@ -1,94 +1,25 @@
 <!DOCTYPE html>
 <html>
 <!--what are you looking at?-->
+<!--i'm bad at making html and stuff, still learning tho!-->
 <head>
     <meta charset="UTF-8">
     <title>CDEV Engine Docs</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
-    <style>
-        .body {
-            margin: 0px;
-            background-color: black;
-        }
-
-        .container {
-            display: grid;
-            grid-template-columns: 250px auto;
-        }
-
-        .tab-content {
-            display: none;
-            font-family: 'Roboto', sans-serif;
-            max-width: 80%;
-        }
-
-        .active-tab {
-            display: block;
-        }
-
-        table {
-            border-collapse: collapse;
-            width: 100%;
-        }
-
-        th,
-        td {
-            border: 1px solid rgb(139, 139, 139);
-            padding: 8px;
-            text-align: left;
-        }
-
-        code {
-            font-family: 'Monaco', 'Courier New', monospace;
-            /* Ganti 'Monaco' dengan jenis font yang Anda inginkan jika tidak tersedia di komputer pengguna */
-        }
-
-        #sidebar {
-            background-color: #2a3350;
-            padding: 20px;
-            min-height: 100vh;
-            overflow-y: auto;
-        }
-
-        #sidebar ul {
-            list-style-type: none;
-            padding: 0;
-        }
-
-        #sidebar ul li {
-            margin-bottom: 10px;
-        }
-
-        #sidebar ul li a {
-            text-decoration: none;
-            color: #a1a1a1;
-            font-family: 'Roboto', sans-serif;
-            display: block;
-        }
-
-        #content {
-            background-color: #161d33;
-            color: #FFFFFF;
-            padding: 20px;
-            font-family: 'Roboto', sans-serif;
-        }
-
-        #sidebar ul li a:hover {
-            background-color: #2b4d80;
-        }
-    </style>
+    <link rel="stylesheet" href="style.css">
 </head>
 
 <body>
     <div class="container">
         <div id="sidebar">
-            <h2 style="color: white; font-family: 'Roboto', sans-serif;">Basics</h2>
+            <h2 class="titlestuffsD">DOCS PAGES</h2>
+            <h2 class="titlestuffs">Basics</h2>
             <ul>
                 <li><a href="#welcome" onclick="showTab('welcome'); return false;">Welcome</a></li>
                 <li><a href="#new-mod" onclick="showTab('new-mod'); return false;">Making a new mod</a></li>
             </ul>
 
-            <h2 style="color: white; font-family: 'Roboto', sans-serif;">Modding Stuffs</h2>
+            <h2 class="titlestuffs">Modding Stuffs</h2>
             <ul>
                 <li><a href="#new-song" onclick="showTab('new-song'); return false;">Adding your song</a></li>
                 <li><a href="#new-character" onclick="showTab('new-character'); return false;">Adding a new
@@ -97,13 +28,13 @@ <h2 style="color: white; font-family: 'Roboto', sans-serif;">Modding Stuffs</h2>
                 <li><a href="#new-week" onclick="showTab('new-week'); return false;">Adding a new week</a></li>
             </ul>
 
-            <h2 style="color: white; font-family: 'Roboto', sans-serif;">HScript API</h2>
+            <h2 class="titlestuffs">HScript API</h2>
             <ul>
                 <li><a href="#script-ex" onclick="showTab('script-ex'); return false;">How scripting works here</a></li>
                 <li><a href="#scripts-used" onclick="showTab('scripts-used'); return false;">Variables</a></li>
             </ul>
 
-            <h2 style="color: white; font-family: 'Roboto', sans-serif;">Example Scripts</h2>
+            <h2 class="titlestuffs">Example Scripts</h2>
             <ul>
                 <li><a href="#song-scripts" onclick="showTab('song-scripts'); return false;">Song Scripts</a></li>
                 <li><a href="#stage-scripts" onclick="showTab('stage-scripts'); return false;">Stage Scripts</a></li>
@@ -278,7 +209,7 @@ <h2>Final Result</h2>
             <div class="tab-content" id="new-week">
                 <h1>Making a new week</h1>
                 <hr>
-                <p>wip haha cool swaggy ass</p>
+                <p>wip </p>
             </div>
 
             <!--

diff --git a/docs/style.css b/docs/style.css
@@ -0,0 +1,97 @@
+@font-face {
+    font-family: funkinFont;
+    src: url(assets/pmf.ttf);
+}
+@font-face {
+    font-family: funkinDiff;
+    src: url(assets/pmf2.ttf);
+}
+
+body {
+    background-color: black;
+}
+body, html {
+    margin: 0;
+    padding: 0;
+}
+.container {
+    display: grid;
+    grid-template-columns: 300px auto;
+}
+
+.tab-content {
+    display: none;
+    font-family: funkinFont;
+    max-width: 85%;
+}
+
+.active-tab {
+    display: block;
+}
+
+table {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+th,
+td {
+    border: 1px solid rgb(139, 139, 139);
+    padding: 8px;
+    text-align: left;
+}
+
+code {
+    font-family: Consolas,"courier new";
+    background-color: black;
+}
+
+#sidebar {
+    background-color: #111111;
+    padding: 20px;
+    min-height: 100vh;
+    overflow-y: auto;
+}
+
+#sidebar ul {
+    list-style-type: none;
+    padding: 0;
+}
+
+#sidebar ul li {
+    margin-bottom: 10px;
+}
+
+#sidebar ul li a {
+    text-decoration: none;
+    color: #a1a1a1;
+    font-family: funkinFont;
+    display: block;
+    letter-spacing: 0.5px;
+}
+
+#content {
+    background-color: #000000;
+    color: #FFFFFF;
+    padding: 20px;
+    font-family: funkinFont;
+    letter-spacing: 0.5px;
+    line-height: 120%;
+}
+
+#sidebar ul li a:hover {
+    background-color: #353535;
+}
+
+.titlestuffs{
+    color: white; 
+    font-family: funkinDiff;
+    font-size: 24px;
+    letter-spacing: 2px;
+}
+
+.titlestuffsD{
+    color: white; 
+    font-family: funkinFont;
+    font-size: 34px;
+}
diff --git a/example_mods/FNF Test Mod/data/charts/mod-test/script.hx b/example_mods/FNF Test Mod/data/charts/mod-test/script.hx
@@ -24,11 +24,11 @@ function onStartSong() {
 function update(elapsed) {
     // This function will be executed on frame update.
     // 'elapsed' - Float - How many times does this Function called.
-    PlayState.iconP1.angle = FlxMath.lerp(0,PlayState.iconP1.angle,FlxMath.bound(1-(elapsed*3),0,1));
-    PlayState.iconP2.angle = FlxMath.lerp(0,PlayState.iconP2.angle,FlxMath.bound(1-(elapsed*3),0,1));
+    PlayState.iconP1.angle = FlxMath.lerp(0,PlayState.iconP1.angle,FlxMath.bound(1-(elapsed*12),0,1));
+    PlayState.iconP2.angle = FlxMath.lerp(0,PlayState.iconP2.angle,FlxMath.bound(1-(elapsed*12),0,1));
 
     for (i in 0...PlayState.playerStrums.members.length){
-        if (CDevConfig.downscroll){
+        if (CDevConfig.saveData.downscroll){
             PlayState.playerStrums.members[i].y = FlxMath.lerp(FlxG.height - 160,PlayState.playerStrums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
         } else{
             PlayState.playerStrums.members[i].y = FlxMath.lerp(70,PlayState.playerStrums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
@@ -37,7 +37,7 @@ function update(elapsed) {
     }
 
     for (i in 0...PlayState.p2Strums.members.length){
-        if (CDevConfig.downscroll){
+        if (CDevConfig.saveData.downscroll){
             PlayState.p2Strums.members[i].y = FlxMath.lerp(FlxG.height - 160,PlayState.p2Strums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
         } else{
             PlayState.p2Strums.members[i].y = FlxMath.lerp(70,PlayState.p2Strums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
@@ -51,7 +51,7 @@ function p1NoteHit(noteData,isSustain) {
     // 'isSustain' - Boolean - Is it a sustain note?
 
     if (!isSustain){
-        if (CDevConfig.downscroll){
+        if (CDevConfig.saveData.downscroll){
             PlayState.playerStrums.members[noteData].y += 20;
         } else{
             PlayState.playerStrums.members[noteData].y -= 20;  
@@ -72,7 +72,7 @@ function p2NoteHit(noteData,isSustain) {
     // 'isSustain' - Boolean - Is it a sustain note?
 
     if (!isSustain){
-        if (CDevConfig.downscroll){
+        if (CDevConfig.saveData.downscroll){
             PlayState.p2Strums.members[noteData].y += 20;
         } else{
             PlayState.p2Strums.members[noteData].y -= 20;  

diff --git a/example_mods/FNF Test Mod/images/checker.png b/example_mods/FNF Test Mod/images/checker.png
diff --git a/example_mods/FNF Test Mod/images/gfDanceTitle.png b/example_mods/FNF Test Mod/images/gfDanceTitle.png
diff --git a/example_mods/FNF Test Mod/images/gfDanceTitle.xml b/example_mods/FNF Test Mod/images/gfDanceTitle.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="gfDanceTitle.png">
+	<!-- Created with Adobe Animate version 21.0.6.41649 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="GF Dancing Beat blue0000" x="0" y="0" width="699" height="634" frameX="-2" frameY="-14" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0001" x="754" y="0" width="703" height="634" frameX="0" frameY="-14" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0002" x="1512" y="0" width="703" height="632" frameX="0" frameY="-16" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0003" x="2270" y="0" width="699" height="632" frameX="-2" frameY="-16" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0004" x="3024" y="0" width="699" height="635" frameX="-2" frameY="-13" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0005" x="0" y="690" width="699" height="635" frameX="-2" frameY="-13" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0006" x="754" y="690" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0007" x="1508" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0008" x="1508" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0009" x="1508" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0010" x="2262" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0011" x="2262" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0012" x="2262" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0013" x="3016" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0014" x="3016" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0015" x="0" y="1393" width="699" height="636" frameX="-2" frameY="-12" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0016" x="754" y="1393" width="703" height="636" frameX="0" frameY="-12" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0017" x="1512" y="1393" width="703" height="636" frameX="0" frameY="-12" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0018" x="2270" y="1393" width="699" height="636" frameX="-2" frameY="-12" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0019" x="3024" y="1393" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0020" x="0" y="2085" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0021" x="754" y="2085" width="699" height="638" frameX="-2" frameY="-10" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0022" x="1508" y="2085" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0023" x="1508" y="2085" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0024" x="1508" y="2085" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0025" x="2262" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0026" x="2262" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0027" x="2262" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0028" x="3016" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
+	<SubTexture name="GF Dancing Beat blue0029" x="3016" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
+</TextureAtlas>
diff --git a/example_mods/FNF Test Mod/images/logoBumpin.png b/example_mods/FNF Test Mod/images/logoBumpin.png
diff --git a/example_mods/FNF Test Mod/images/logoBumpin.xml b/example_mods/FNF Test Mod/images/logoBumpin.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="logoBumpin.png">
+	<!-- Created with Adobe Animate version 21.0.6.41649 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="logo bumpin0000" x="10" y="10" width="808" height="440" frameX="-19" frameY="-9" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0001" x="833" y="10" width="849" height="463"/>
+	<SubTexture name="logo bumpin0002" x="1697" y="10" width="839" height="458" frameX="-5" frameY="-2" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0003" x="2551" y="10" width="832" height="453" frameX="-8" frameY="-4" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0004" x="10" y="488" width="826" height="450" frameX="-11" frameY="-5" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0005" x="851" y="488" width="822" height="448" frameX="-13" frameY="-6" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0006" x="1688" y="488" width="820" height="447" frameX="-14" frameY="-6" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0007" x="2523" y="488" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0008" x="10" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0009" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0010" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0011" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0012" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0013" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+	<SubTexture name="logo bumpin0014" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
+</TextureAtlas>
diff --git a/example_mods/FNF Test Mod/images/newgrounds_logo.png b/example_mods/FNF Test Mod/images/newgrounds_logo.png
diff --git a/example_mods/FNF Test Mod/images/titleEnter.png b/example_mods/FNF Test Mod/images/titleEnter.png