0.4.2 demo update

.github/ISSUE_TEMPLATE/bugs.yml

@@ -0,0 +1,16 @@
+name: Bug report
+description: Report bugs with the engine here
+labels: [bug]
+body:
+  - type: textarea
+    attributes:
+      label: Bug report
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Did you edit anything? If so, mention or summarize your changes.
+      description: 'For example: "Yes, i edited PlayState.hx and tried to mess with how health icon animation frames are handled" or "No, everything is the same as the base engine!"'
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+blank_issues_enabled: false
+contact_links: []

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,9 @@
+name: Feature Request
+description: No, i won't add 6K/etc to the engine or winning icons, stop asking for it.
+labels: [enhancement]
+body:
+  - type: textarea
+    attributes:
+      label: What feature do you want to get added on the base engine?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/help.yml

@@ -0,0 +1,19 @@
+name: Help wanted
+description: If you need help using the engine.
+labels: [help wanted]
+body:
+
+  - type: dropdown
+    attributes:
+      label: Are you trying to code on Source Code (Haxe) or on the Downloaded Build (Lua)?
+      options:
+        - Source Code
+        - Downloaded Build
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Show an screenshot/video of your problem.
+      description: Put down here an screenshot of your compiling issue or whatever is happening to you.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/missing-docs.yml

@@ -0,0 +1,10 @@
+name: Missing Documentation
+description: Ask for documentation if something is missing.
+labels: [documentation]
+body:
+  - type: textarea
+    attributes:
+      label: What needs to be documented?
+      description: 'For example: "There is no page explaining how to create an Achievement!"'
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,9 @@
+name: Question
+description: Ask about something here.
+labels: [question]
+body:
+  - type: textarea
+    attributes:
+      label: What is your question?
+    validations:
+      required: true

.gitignore

@@ -1,3 +1,6 @@
 export/
 .vscode/
-APIStuff.hx
+APIStuff.hx
+art/build_x32-officialrelease.bat
+art/build_x64-officialrelease.bat
+art/test_x64-debug-officialrelease.bat

Project.xml

@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="PSYCH ENGINE BUGFIX" file="PsychEngine" packageName="com.shadowmario.psychengine" package="com.shadowmario.psychengine" main="Main" version="0.2.7" company="shadowmario" />
+	<app title="Friday Night Funkin': Psych Engine" file="PsychEngine" packageName="com.shadowmario.psychengine" package="com.shadowmario.psychengine" main="Main" version="0.2.7" company="ShadowMario" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -14,6 +14,8 @@
 
 	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
 	<set name="SWF_VERSION" value="11.8" />
+
+	<define name="dontUseManifest" if="desktop" />
 
 	<!-- ____________________________ Window Settings ___________________________ -->
 
@@ -33,34 +35,36 @@
 	<assets path="assets/shared/images/hitbox"/>
 
 	<!--Switch-specific-->
-	<window if="switch" orientation="landscape" fullscreen="true" width="1280" height="720" resizable="true" />
+	<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
 
 	<!-- _____________________________ Path Settings ____________________________ -->
 
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
-	<set name="BUILD_DIR" value="export/32bit" if="32bit" />
+	<set name="BUILD_DIR" value="export/32bit" if="32bits" />
 
 	<classpath name="source" />
 
 	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
 	<assets path="assets/preload" rename="assets" exclude="*.mp3"  unless="web"/>
 
 	<!-- PSYCH ENGINE CUSTOMIZATION -->
-	<define name="MODS_ALLOWED" if="mobile" />
-	<define name="LUA_ALLOWED" if="desktop" />
-	<define name="ONLY_WINDOWS" if="desktop" />
+	<define name="MODS_ALLOWED" if="desktop || mobile" />
+	<define name="LUA_ALLOWED" if="windows" />
 	<define name="ACHIEVEMENTS_ALLOWED" />
+	<define name="VIDEOS_ALLOWED" if="web || windows" unless="32bits"/>
+
+	<!-- DONT ENABLE THIS -->
+	<define name="CHECK_FOR_UPDATES" if="desktop officialBuild"/>
 
 	<!-- <define name="PRELOAD_ALL" /> -->
 	<define name="PRELOAD_ALL" unless="web" />
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
 
+	<!-- <library name="videos"        preload="true" /> -->
 	<section if="PRELOAD_ALL">
 		<library name="songs"         preload="true" />
 		<library name="shared"        preload="true" />
-		<library name="tutorial"      preload="true" />
-		<library name="week1"         preload="true" />
 		<library name="week2"         preload="true" />
 		<library name="week3"         preload="true" />
 		<library name="week4"         preload="true" />
@@ -71,23 +75,20 @@
 	<section if="NO_PRELOAD_ALL">
 		<library name="songs"         preload="false" />
 		<library name="shared"        preload="false" />
-		<library name="tutorial"      preload="false" />
-		<library name="week1"         preload="false" />
 		<library name="week2"         preload="false" />
 		<library name="week3"         preload="false" />
 		<library name="week4"         preload="false" />
 		<library name="week5"         preload="false" />
 		<library name="week6"         preload="false" />
 	</section>
 
+	<!-- <assets path="plugins/"             rename=''               if="VIDEOS_ALLOWED windows" />
+	<assets path="dlls/"                rename=''               if="VIDEOS_ALLOWED windows" />
+	<assets path="assets/videos"        library="videos"        if="VIDEOS_ALLOWED"/> -->
 	<assets path="assets/songs"         library="songs"         exclude="*.ogg" if="web"/>
 	<assets path="assets/songs"         library="songs"         exclude="*.mp3" unless="web"/>
 	<assets path="assets/shared"        library="shared"        exclude="*.ogg" if="web"/>
 	<assets path="assets/shared"        library="shared"        exclude="*.mp3" unless="web"/>
-	<assets path="assets/tutorial"      library="tutorial"      exclude="*.ogg" if="web"/>
-	<assets path="assets/tutorial"      library="tutorial"      exclude="*.mp3" unless="web"/>
-	<assets path="assets/week1"         library="week1"         exclude="*.ogg" if="web"/>
-	<assets path="assets/week1"         library="week1"         exclude="*.mp3" unless="web"/>
 	<assets path="assets/week2"         library="week2"         exclude="*.ogg" if="web"/>
 	<assets path="assets/week2"         library="week2"         exclude="*.mp3" unless="web"/>
 	<assets path="assets/week3"         library="week3"         exclude="*.ogg" if="web"/>

README.md

@@ -1,19 +1,30 @@
-<p align="center"> 
-<img src="https://user-images.githubusercontent.com/59097731/121178442-29003c00-c867-11eb-8851-b07d2c5ca7b6.png" width="600" />
-</p>
-
-This is the repository for Psych Engine, original game by "NinjaMuffin99".
+# Friday Night Funkin' - Psych Engine
+Engine originally used on [Mind Games Mod](https://gamebanana.com/mods/301107), intended to be a fix for the vanilla version's many issues while keeping the casual play aspect of it. Also aiming to be an easier alternative to newbie coders.
 
-Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin
-Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371
-Support the project on the itch.io page: https://ninja-muffin24.itch.io/funkin
+## Installation:
+Follow a Friday Night Funkin' source code compilation tutorial, after this you will need to install LuaJIT.
 
-IF YOU MAKE A MOD AND DISTRIBUTE A MODIFIED / RECOMIPLED VERSION, YOU MUST OPEN SOURCE YOUR MOD AS WELL
+You can do this with: `haxelib install linc_luajit` on a Command prompt/PowerShell
+
+...Or if you don't want your mod to be able to run .lua scripts, delete the "LUA_ALLOWED" line on Project.xml
+
+## Credits:
+* Shadow Mario - Coding
+* RiverOaken - Arts and Animations
+
+### Special Thanks
+* Keoiki - Note Splash Animations
+
+WARNING: This engine is still very early in development! You can request new features though
+_____________________________________
+
+# Features
 
 ## Attractive animated dialogue boxes:
 
 ![](https://user-images.githubusercontent.com/44785097/127706669-71cd5cdb-5c2a-4ecc-871b-98a276ae8070.gif)
 
+
 ## Atleast one change to every week:
 ### Week 1:
   * New Dad Left sing sprite 
@@ -35,71 +46,41 @@ IF YOU MAKE A MOD AND DISTRIBUTE A MODIFIED / RECOMIPLED VERSION, YOU MUST OPEN
   * On Thorns, the HUD is hidden during the cutscene
   * Also there's the Background girls being spooky during the "Hey!" parts of the Instrumental
 
-# download
-
-https://github.com/kviks/Psych-Engine-Android/releases/
-
-
-# screenshots
-<div>
-<img src="https://user-images.githubusercontent.com/59097731/104103630-31eae280-52b4-11eb-90a4-5bdb1b39fc53.jpg" width="200" />
-<img src="https://user-images.githubusercontent.com/59097731/104103635-34e5d300-52b4-11eb-96f8-13910580fbc8.jpg" width="200" />
-<img src="https://user-images.githubusercontent.com/59097731/104103636-36af9680-52b4-11eb-8740-f7be0c098265.jpg" width="200" />
-<img src="https://user-images.githubusercontent.com/59097731/104103637-37e0c380-52b4-11eb-8f84-87892f3e5d85.jpg" width="200" />
-</div>
-
-# Build instructions (by luckydog7)
-
-1. first of all we need to set up haxe and haxeflixel read more here - https://github.com/ninjamuffin99/Funkin
-
-  - Install haxe 4.2.2 instead of 4.1.5
-  - if you updated it dont forget execute this command `haxelib upgrade` and press 'y' everywhere
-  - Also get extension-webm using this command: `haxelib git extension-webm https://github.com/KlavierGayming/extension-webm`
-  - the reason we use a different repo again is cuz of a lil error that happens with the audio sync, just adds a "public var renderedFrames" instead of "var renderedFrames", that's all extra that's needed
-
-
-2. after that, download Android studio, Jdk, Ndk revision 15c from these sites
-
-  - jdk - https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html
-
-  - android studio - https://developer.android.com/studio
-
-  - ndk - https://developer.android.com/ndk/downloads/older_releases?hl=fi
-
-
-3.install jdk, android studio 
-  - unzip ndk (ndk does not need to be installed)
-
-
-4. we need to set up android studio for this go to android studio and find android sdk (in settings -> Appearance & Behavior -> system settings -> android sdk)
-![andr](https://user-images.githubusercontent.com/59097731/104179652-44346000-541d-11eb-8ad1-1e4dfae304a8.PNG)
-![andr2](https://user-images.githubusercontent.com/59097731/104179943-a9885100-541d-11eb-8f69-7fb5a4bfdd37.PNG)
-
-
-5.and run command `lime setup android`
-  - you need to insert the program paths
-
-  - as in this picture (use jdk, not jre)
-![lime](https://user-images.githubusercontent.com/59097731/104179268-9e80f100-541c-11eb-948d-a00d85317b1a.PNG)
-
-  - Now do "lime rebuild extension-webm windows" (in the command line), if you're planning to build for windows. If you're plannin to build for android (which you obviously are), use "lime rebuild extension-webm android". If you get an error, download [this](https://www.mediafire.com/file/8jteungeq2bzc3l/Android.zip/file) and put the folder inside it in C:/HaxeToolkit/haxe/lib/extension-webm/git/ndll
-
-
-7. open project in command line `cd (path to fnf source)`
-  - and run command `haxelib install linc-luajit`
-  - and run command `lime build android`
-  - apk will be generated in this path (path to source)\export\release\android\bin\app\build\outputs\apk\debug\Funkin-debug.apk
-
-
-## Credits
-- Shadow Mario - Coding Psych Engine
-- RiverOaken - Arts and Animations Psych Engine
-- Keoiki - Note Splash Animations Psych Engine
-- ninjamuffin99 - Programmer original FNF
-- PhantomArcade3K - Art original FNF
-- Evilsk8r - Art original FNF
-- Kawaisprite- Musician original FNF
-- luckydog - original android port
-- kviks (me!) - psych engine port
-
-This game was made with love to Newgrounds and it's community. Extra love to Tom Fulp.
+## Cool new Chart Editor changes and countless bug fixes
+![](https://i.imgur.com/h6Ja7eT.png)
+* You can now chart "Event" notes, which are bookmarks that trigger specific actions that usually were hardcoded on the vanilla version of the game.
+* Your song's BPM can now have decimal values
+* You can manually adjust a Note's strum time if you're really going for milisecond precision
+* You can change a note's type on the Editor, it comes with two example types:
+  * Alt Animation: Forces an alt animation to play, useful for songs like Ugh/Stress
+  * Hey: Forces a "Hey" animation instead of the base Sing animation, if Boyfriend hits this note, Girlfriend will do a "Hey!" too.
+
+## Improved Animation Debug menu (Press 8 in-game on a Debug build)
+![](https://user-images.githubusercontent.com/44785097/127721062-f912853c-2513-41b8-bd66-fd80d9d4ee0f.png)
+* You can now press Save Offsets to save a .txt file with the editted offsets
+* You can also now change the characters while on the Menu
+* Go back to the game by pressing Escape
+NOTE: This should be used for fixing your character floating or being slightly under the ground! It's not for texture editting.
+
+## Story mode menu rework:
+![](https://i.imgur.com/UB2EKpV.png)
+* Added a different BG to every song (less Tutorial)
+* All menu characters are now in individual spritesheets, makes modding it easier.
+
+## Credits menu
+![](https://i.imgur.com/NdIQt3d.png)
+* You can add a head icon, name, description and a Redirect link for when the player presses Enter while the item is currently selected.
+
+## Awards/Achievements
+* The engine comes with 16 example achievements that you can mess with and learn how it works (Check Achievements.hx and search for "checkForAchievement" on PlayState.hx)
+
+## Options menu:
+* You can change Note colors, Controls and Preferences there.
+ * On Preferences you can toggle Downscroll, Anti-Aliasing, Framerate, Low Quality, Note Splashes, Hide Hud elements, Flashing Lights, etc.
+
+## Other gameplay features:
+* When the enemy hits a note, it plays the note hit animation on their strum, just like when the player hits a note.
+* Lag doesn't impact the camera movement and player icon scaling anymore.
+* Some stuff based on Week 7's changes has been put in (Background colors on Freeplay, Note splashes)
+* You can reset your Score on Freeplay/Story Mode by pressing Reset button.
+* You can listen to a song on Freeplay by pressing Space once.

art/build_x32.bat

@@ -2,9 +2,9 @@
 color 0a
 cd ..
 echo BUILDING GAME
-lime build windows -release -32
+lime build windows -32 -release -D 32bits
 echo.
 echo done.
 pause
 pwd
-explorer.exe export\release\windows\bin
+explorer.exe export\32bit\windows\bin