Skip to content
This repository was archived by the owner on Dec 19, 2025. It is now read-only.

Commit 4d373ab

Browse files
committed
OK
1 parent 1321292 commit 4d373ab

File tree

8 files changed

+133
-115
lines changed

8 files changed

+133
-115
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ you can use it to make your mod more powerful!
99

1010
---
1111
### What is HyPsych Engine?
12-
It's a fork of [Psych Engine](https://github.com/shadowMario/FNF-PsychEngine), but with a lot of new features and improvements.
12+
It's a fork of [Psych Engine 1.0.4](https://github.com/shadowMario/FNF-PsychEngine), but with a lot of new features and improvements.
1313

1414
### Features:
1515
- **HScript on Lua [Beta]**

assets/shared/data/introText.txt

Lines changed: 110 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,110 @@
1-
shoutouts to tom fulp--lmao
2-
Ludum dare--extraordinaire
3-
cyberzone--coming soon
4-
love to thriftman--swag
5-
ultimate rhythm gaming--probably
6-
dope ass game--playstation magazine
7-
in loving memory of--henryeyes
8-
dancin--forever
9-
funkin--forever
10-
ritz dx--rest in peace lol
11-
rate five--pls no blam
12-
rhythm gaming--ultimate
13-
game of the year--forever
14-
you already know--we really out here
15-
rise and grind--love to luis
16-
like parappa--but cooler
17-
album of the year--chuckie finster
18-
free gitaroo man--with love to wandaboy
19-
better than geometry dash--fight me robtop
20-
kiddbrute for president--vote now
21-
play dead estate--on newgrounds
22-
this is a god damn prototype--we workin on it okay
23-
women are real--this is official
24-
too over exposed--newgrounds cant handle us
25-
Hatsune Miku--biggest inspiration
26-
too many people--my head hurts
27-
newgrounds--forever
28-
refined taste in music--if i say so myself
29-
his name isnt keith--dumb eggy lol
30-
his name isnt evan--silly tiktok
31-
stream chuckie finster--on spotify
32-
never forget to--pray to god
33-
dont play rust--we only funkin
34-
good bye--my penis
35-
dababy--biggest inspiration
36-
fashionably late--but here it is
37-
yooooooooooo--yooooooooo
38-
pico funny--pico funny
39-
updates each friday--on time every time
40-
shoutouts to mason--for da homies
41-
bonk--get in the discord call
42-
this isn't a copy of ke--*vine boom*
43-
we do a little trolling--h
44-
sexiest engine--in da block
45-
he's named evilsk8er--not evilsker
46-
actual functional--input system
47-
its nerf--or nothing
48-
penis--balls even
49-
fnf is not for kids--go outside
50-
little herobrine--im cumming in your mom
51-
what you know about--rolling down in the deep
52-
oh god i'm white--and i'm on twitter
53-
i gotta--bucket of chicken
54-
dream stans--literally scare me
55-
weeg mod--check it out
56-
what da dog--doin
57-
go mango go--go mango go
58-
go pico yeah yeah--*twerks cutely*
59-
forever engine--my beloved
60-
wash your hands--stay safe bro
61-
wear a mask--even if vaccinated
62-
you dont understand--i hate society as a whole
63-
psych engine port--fatherless behavior
64-
i made a psych port--free clout yay
65-
wanna work on my fnf--fnf mod
66-
gazozoz--sickest bomb recoveries
67-
atvdriver--the rats are coming
68-
pessy--pure perfection
69-
pessy mod--coming soon
70-
maliciousbunny--biggest cutie in the world
71-
luquinhas--voce eh a coisa mais feliz
72-
mansour says--fnf is shit lol
73-
medodecordas self promote--watch?v=dQw4w9WgXcQ
74-
ezhalt says--olha a bombaaa
75-
stevan--love cats
1+
watch it--watch?v=Z_PzwWDbiI0
2+
i love--my mom
3+
CCCAAAAATTTTT CCCCAAAAAATTTTTTT CATTTTTTTTTTTTTTTT--CCCCCCAAAAAAAATTTTT CCCCCCCAAAAAAAAATTTTTTTT CCCCCCCCCAAAAAAAAAAAAAATTT
4+
O I I a I a o I I I a I I--O I I a I a o I I I a
5+
A a a a I I--A a a a
6+
A a a a I I--A a a I a o I I I a I
7+
Never Gonna Give You Up--Never Gonna Let You Down
8+
I know your ip address--I know your location, just kidding
9+
GET OUT--FROM MY HEAD A SPINNING CAT
10+
your ip address is 92.28.211.234--just kidding
11+
while True:-- print("bark")
12+
i am in your home--just kidding
13+
404--brain not found
14+
i fixed the bug--by deleting the feature
15+
AI will take your job--unless it's JavaScript
16+
undefined is not a function--undefined is your life
17+
i wrote clean code--2 hours later i rewrote it
18+
console.log("hello")--world says goodbye
19+
this line--does nothing
20+
@:build--i don’t know what this does
21+
macro broke--again
22+
haxe.Exception--is my new therapist
23+
“Unknown identifier”--but I just defined you
24+
i cast it--now it's broken
25+
@:enum abstract--black magic begins
26+
it works in neko--but not in cpp
27+
@:forward--to madness
28+
@:native--to chaos
29+
Dead code elimination--killed my dreams
30+
git commit -m "final" --5 more commits later--final_final_v2
31+
merge conflict--my worst enemy
32+
git pull--and pray
33+
i fixed it--with git reset --hard
34+
force push--forgive me team
35+
git log--reveals my sins
36+
git blame--always points to me
37+
git is easy--until it's not
38+
i added comments--they say "idk why this works"
39+
stash now--cry later
40+
nil--again?
41+
i printed a table--got memory address
42+
metatable--more like mega pain
43+
Lua is simple--until it's not
44+
require("module")--module not found
45+
table.insert--into madness
46+
one global variable--ruined everything
47+
true or false--depends on the typo
48+
the button works--if you click it twice
49+
player got stuck--but it looks funny
50+
camera shaking--like my anxiety
51+
animations work--until they don’t
52+
ui overlaps--because why not
53+
frame drop--in the main menu
54+
i spent 10 hours--on a health bar
55+
this is placeholder--forever
56+
game is done--just needs polish (10 years later)
57+
gl_Position--pray it shows up
58+
my shader compiles--but everything's pink
59+
fragColor--more like fragMySoul
60+
why is everything inverted--oops gl_FrontFacing
61+
i touched normals--everything exploded
62+
shader bug--can't reproduce, can't ignore
63+
gl_FragCoord--does not spark joy
64+
everything is purple--I am fear itself
65+
discard;--now you see me, now you don't
66+
my model--turned into spaghetti
67+
why is it stretching--oh no UVs
68+
vec3(1.0)--too bright, too powerful
69+
normal.xyz--summoned a demon
70+
depth buffer--more like depression buffer
71+
lightDir--coming from the void
72+
float time--the illusion of control
73+
nil is a value--of infinite pain
74+
local function--who needs scope anyway?
75+
pairs()--the chaos generator
76+
_"attempt to index nil"_--my favorite horror story
77+
print("debug")--never prints
78+
Lua coroutine--I coroutine'd my brain
79+
idle animation--never idle
80+
hitbox--does not hit
81+
jump feels floaty--gravity is a lie
82+
UI scale--scales your sadness
83+
“polish pass”--year 5
84+
frame 0--where nightmares live
85+
button hover--but never clicks
86+
screen fade--straight to blackhole
87+
placeholder.png--is the final asset
88+
haxe --main Main--but which Main?
89+
Null<Object>--Null<Hope>
90+
@:build macro--summons ghosts
91+
deadlock--but single thread
92+
Git conflict--with myself
93+
force push--like a Jedi mistake
94+
git pull--regret begins
95+
merge hell--population: me
96+
commit message: “fix”--no idea what I fixed
97+
@:enum abstract--are you sure this is legal?
98+
it compiles--but does it live?
99+
bug fixed itself--I'm scared
100+
not a bug--a feature from hell
101+
worked yesterday--I swear
102+
I am become error--destroyer of builds
103+
every pixel--cries in silence
104+
who needs sleep--when you have shaders?
105+
this is fine--everything is fine
106+
i am the bug--the bug is me
107+
this is not a bug--it's an undocumented feature
108+
i am the error--the error is me
109+
English or Spanish--whoever moves first is gay
110+
bug to feature--it's a feature now

gitVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.4
1+
1

source/backend/CoolUtil.hx

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,37 @@ package backend;
22

33
import openfl.utils.Assets;
44
import lime.utils.Assets as LimeAssets;
5+
import hypsychenging.hyper.HttpClient;
56

67
class CoolUtil
78
{
89
public static function checkForUpdates(url:String = null):String {
910
if (url == null || url.length == 0)
10-
url = "https://raw.githubusercontent.com/ShadowMario/FNF-PsychEngine/main/gitVersion.txt";
11+
// https://raw.githubusercontent.com/Paopun20/FNF-HyPsych-Engine/main/gitVersion.txt
12+
url = "https://raw.githubusercontent.com/Paopun20/FNF-HyPsych-Engine/main/gitVersion.txt";
1113
var version:String = states.MainMenuState.psychEngineVersion.trim();
1214
if(ClientPrefs.data.checkForUpdates) {
1315
trace('checking for updates...');
1416
var http = new haxe.Http(url);
1517
http.onData = function (data:String)
1618
{
17-
var newVersion:String = data.split('\n')[0].trim();
18-
trace('version online: $newVersion, your version: $version');
19-
if(newVersion != version) {
20-
trace('versions arent matching! please update');
21-
version = newVersion;
22-
http.onData = null;
23-
http.onError = null;
24-
http = null;
25-
}
19+
HttpClient.getRequest(url, function(suss, data) {
20+
if(data != null && data.length > 0) {
21+
var newVersion:String = data.split('\n')[0].trim();
22+
trace('version online: $newVersion, your version: $version');
23+
if(newVersion != version) {
24+
trace('versions arent matching! please update');
25+
version = newVersion;
26+
}
27+
}
28+
});
2629
}
2730
http.onError = function (error) {
2831
trace('error: $error');
2932
}
3033
http.request();
34+
35+
3136
}
3237
return version;
3338
}

source/hypsychenging/Init.hx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ import hypsychenging.hyper.UrlGen;
88
import hypsychenging.hyper.WindowManager;
99
import haxe.ds.IntMap;
1010

11-
#if LUA_ALLOWED
12-
import psychlua.FunkinLua;
13-
#end
14-
1511
var tagUrlGen: Map<String, UrlGen> = new Map();
1612
var windowManagerMap:Map<String, WindowManager> = new Map();
1713

source/states/CreditsState.hx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,8 @@ class CreditsState extends MusicBeatState
3838
#end
3939

4040
var defaultList:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color
41-
["Psych Engine Team"],
42-
["Shadow Mario", "shadowmario", "Main Programmer and Head of Psych Engine", "https://ko-fi.com/shadowmario", "444444"],
43-
["Riveren", "riveren", "Main Artist/Animator of Psych Engine", "https://x.com/riverennn", "14967B"],
44-
[""],
45-
["Former Engine Members"],
46-
["bb-panzu", "bb", "Ex-Programmer of Psych Engine", "https://x.com/bbsub3", "3E813A"],
47-
[""],
48-
["Engine Contributors"],
49-
["crowplexus", "crowplexus", "Linux Support, HScript Iris, Input System v3, and Other PRs", "https://twitter.com/IamMorwen", "CFCFCF"],
50-
["Kamizeta", "kamizeta", "Creator of Pessy, Psych Engine's mascot.", "https://www.instagram.com/cewweey/", "D21C11"],
51-
["MaxNeton", "maxneton", "Loading Screen Easter Egg Artist/Animator.", "https://bsky.app/profile/maxneton.bsky.social","3C2E4E"],
52-
["Keoiki", "keoiki", "Note Splash Animations and Latin Alphabet", "https://x.com/Keoiki_", "D2D2D2"],
53-
["SqirraRNG", "sqirra", "Crash Handler and Base code for\nChart Editor's Waveform", "https://x.com/gedehari", "E1843A"],
54-
["EliteMasterEric", "mastereric", "Runtime Shaders support and Other PRs", "https://x.com/EliteMasterEric", "FFBD40"],
55-
["MAJigsaw77", "majigsaw", ".MP4 Video Loader Library (hxvlc)", "https://x.com/MAJigsaw77", "5F5F5F"],
56-
["iFlicky", "flicky", "Composer of Psync and Tea Time\nAnd some sound effects", "https://x.com/flicky_i", "9E29CF"],
57-
["KadeDev", "kade", "Fixed some issues on Chart Editor and Other PRs", "https://x.com/kade0912", "64A250"],
58-
["superpowers04", "superpowers04", "LUA JIT Fork", "https://x.com/superpowers04", "B957ED"],
59-
["CheemsAndFriends", "cheems", "Creator of FlxAnimate", "https://x.com/CheemsnFriendos", "E1E1E1"],
41+
["HyPsych Engine"],
42+
["Paopun20", "missing_icon", "Solo Dev :skull:", "https://www.youtube.com/@Paopun20", "FFD700"],
6043
[""],
6144
["Funkin' Crew"],
6245
["ninjamuffin99", "ninjamuffin99", "Programmer of Friday Night Funkin'", "https://x.com/ninja_muffin99", "CF2D2D"],

source/states/MainMenuState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ enum MainMenuColumn {
1414

1515
class MainMenuState extends MusicBeatState
1616
{
17-
public static var psychEngineVersion:String = '1.0.4'; // This is also used for Discord RPC
17+
public static var psychEngineVersion:String = '1'; // This is also used for Discord RPC
1818
public static var curSelected:Int = 0;
1919
public static var curColumn:MainMenuColumn = CENTER;
2020
var allowMouse:Bool = true; //Turn this off to block mouse movement in menus
@@ -94,7 +94,7 @@ class MainMenuState extends MusicBeatState
9494
rightItem.x -= rightItem.width;
9595
}
9696

97-
var psychVer:FlxText = new FlxText(12, FlxG.height - 44, 0, "Psych Engine v" + psychEngineVersion, 12);
97+
var psychVer:FlxText = new FlxText(12, FlxG.height - 44, 0, "HyPsych Engine v" + psychEngineVersion, 12);
9898
psychVer.scrollFactor.set();
9999
psychVer.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
100100
add(psychVer);

source/states/TitleState.hx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,10 +527,9 @@ class TitleState extends MusicBeatState
527527
FlxG.sound.playMusic(Paths.music('freakyMenu'), 0);
528528
FlxG.sound.music.fadeIn(4, 0, 0.7);
529529
case 2:
530-
createCoolText(['Psych Engine by'], 40);
530+
createCoolText(['HyPsych Engine by'], 40);
531531
case 4:
532-
addMoreText('Shadow Mario', 40);
533-
addMoreText('Riveren', 40);
532+
addMoreText('Paopun20', 40);
534533
case 5:
535534
deleteCoolText();
536535
case 6:

0 commit comments

Comments
 (0)