diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 23b8459..71b6ef0 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -126,6 +126,11 @@ class PageController extends Controller return view('pages.gamepage'); } + public function thomasgame() + { + return view('pages.thomasgame'); + } + public function avatar() { return view('pages.avatar'); diff --git a/public/asset/400 b/public/asset/400 new file mode 100644 index 0000000..6a600d8 Binary files /dev/null and b/public/asset/400 differ diff --git a/public/asset/401 b/public/asset/401 new file mode 100644 index 0000000..bae60af --- /dev/null +++ b/public/asset/401 @@ -0,0 +1,10 @@ + + null + nil + + + Clothing + http://morblox.us/asset/?id=400 + + + \ No newline at end of file diff --git a/public/bootstrapper/ARCHBLOXBootstrapper-32bit.exe b/public/bootstrapper/ARCHBLOXBootstrapper-32bit.exe index 78bf496..713014d 100644 Binary files a/public/bootstrapper/ARCHBLOXBootstrapper-32bit.exe and b/public/bootstrapper/ARCHBLOXBootstrapper-32bit.exe differ diff --git a/public/bootstrapper/ARCHBLOXBootstrapper-64bit.exe b/public/bootstrapper/ARCHBLOXBootstrapper-64bit.exe index 635c908..127c145 100644 Binary files a/public/bootstrapper/ARCHBLOXBootstrapper-64bit.exe and b/public/bootstrapper/ARCHBLOXBootstrapper-64bit.exe differ diff --git a/public/css/app.css b/public/css/app.css index 5a5da54..194d006 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -538,13 +538,25 @@ iframe { } .leftgamecontainer { + height: 270px; text-align: center; padding-left: 5px; padding-right: 5px; - width: inherit; + width: 70%; } .rightgamecontainer { + height: 270px; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + display: flex; + flex-direction: column; + align-content: space-around; + justify-content: space-between; + align-items: flex-end; + flex-wrap: nowrap; text-align: right; padding-left: 5px; padding-right: 5px; diff --git a/public/game/join.php b/public/game/join.php index 3b85fab..113638b 100644 --- a/public/game/join.php +++ b/public/game/join.php @@ -1,5 +1,5 @@ diff --git a/resources/views/client/CharacterFetch.blade.php b/resources/views/client/CharacterFetch.blade.php index e28874f..ecbb33c 100644 --- a/resources/views/client/CharacterFetch.blade.php +++ b/resources/views/client/CharacterFetch.blade.php @@ -2,13 +2,23 @@ header("content-type:application/xml"); ob_start(); $userId = addslashes($_GET["userId"]); -$hat1 = 300; -$hat2 = 0; -$hat3 = 0; -$shirt = 0; -$pants = 0; -$shirtgraphic = 303; -$face = 0; +if ($userId == 0) { + $hat1 = 300; + $hat2 = 0; + $hat3 = 0; + $shirt = 401; + $pants = 0; + $shirtgraphic = 0; + $face = 0; +} else { + $hat1 = 300; + $hat2 = 0; + $hat3 = 0; + $shirt = 0; + $pants = 0; + $shirtgraphic = 303; + $face = 0; +} //TODO: add catalog + avatar system @endphp http://morblox.us/Asset/BodyColors.ashx?userId=@php echo $userId @endphp;http://morblox.us/asset/?id=@php echo $hat1 @endphp;http://morblox.us/asset/?id=@php echo $hat2 @endphp;http://morblox.us/asset/?id=@php echo $hat3 @endphp;http://morblox.us/asset/?id=@php echo $shirt @endphp;http://morblox.us/asset/?id=@php echo $pants @endphp;http://morblox.us/asset/?id=@php echo $shirtgraphic @endphp;http://morblox.us/asset/?id=@php echo $face @endphp \ No newline at end of file diff --git a/resources/views/client/join.blade.php b/resources/views/client/join.blade.php index 68acd0a..32f5a52 100644 --- a/resources/views/client/join.blade.php +++ b/resources/views/client/join.blade.php @@ -8,14 +8,18 @@ $port = addslashes($_GET["port"]); $id = addslashes($_GET["id"]); $app = addslashes($_GET["app"]);*/ +$authorised = 0; + if (Auth::check()) { $username = addslashes(Auth::user()->name); + $authorised = 1; $id = addslashes(Auth::id()); $app = 'http://morblox.us/Asset/CharacterFetch.ashx?userId=' . addslashes(Auth::id()); } else { $randName = mt_rand(1, 9999); $username = "Guest " . $randName; - $id = 0; + $authorised = 0; + $id = mt_rand(1000, 9999); $app = 'http://morblox.us/Asset/CharacterFetch.ashx?userId=0'; } $ip = addslashes($_GET["ip"]); @@ -116,10 +120,10 @@ function setMessage(message) end -- Check if client is not logged in -if == 0 then - setMessage("You are not logged in. (ID: 400)", "Kick", "Kick") - error("Not logged in") -end +--if "" == "0" then +-- setMessage("You are not logged in. (ID: 400)", "Kick", "Kick") +-- error("Not logged in") +--end function showErrorWindow(message, errorType, errorCategory) game:SetMessage(message) @@ -226,10 +230,20 @@ local success, err = pcall(function() playerConnectSucces, player = pcall(function() return client:PlayerConnect(, "", , 0, threadSleepTime) end) - player:SetSuperSafeChat(false) - pcall(function() player:SetUnder13(false) end) - pcall(function() player:SetMembershipType(Enum.MembershipType.None) end) - pcall(function() player:SetAccountAge(365) end) + if "" == "0" then + -- guest + player:SetSuperSafeChat(true) + pcall(function() player:SetUnder13(true) end) + pcall(function() player:SetMembershipType(Enum.MembershipType.None) end) + pcall(function() player:SetAccountAge(0) end) + else + -- user + player:SetSuperSafeChat(false) + pcall(function() player:SetUnder13(false) end) + pcall(function() player:SetMembershipType(Enum.MembershipType.None) end) + pcall(function() player:SetAccountAge(365) end) + end + player.Idled:connect(onPlayerIdled) -- Overriden diff --git a/resources/views/client/stampertools.blade.php b/resources/views/client/stampertools.blade.php index e21f244..f398114 100644 --- a/resources/views/client/stampertools.blade.php +++ b/resources/views/client/stampertools.blade.php @@ -30,4 +30,4 @@ echo "Copy failed."; $textbox = ($id . "+" . $width[1] . "+" . $height[1] ); header("Location: http://www.morblox.us/stamper/icons/{$textbox}"); exit(); -@endphp \ No newline at end of file +@endphp \ No newline at end of file diff --git a/resources/views/pages/download.blade.php b/resources/views/pages/download.blade.php index 3ccc5be..f20ee78 100644 --- a/resources/views/pages/download.blade.php +++ b/resources/views/pages/download.blade.php @@ -14,15 +14,15 @@

You must be logged in to join games. Use studio to log in to your account.


Requires .NET Framework 4.0, and Windows XP or newer. Not recommended for anything running Windows 7 or newer.

-

Windows XP/Vista Launcher v1.2 | Windows XP/Vista Studio v1.1

+

Windows XP/Vista Launcher v1.3 | Windows XP/Vista Studio v1.2


The below downloads require Windows 7 or newer and they require .NET Core 3.1. These are recommended for anything running Windows 7 or newer.


-

ARCHBLOX Launcher v2.8

+

ARCHBLOX Launcher v2.9

32 Bit | 64 Bit


-

ARCHBLOX Studio Bootstrapper v1.4

+

ARCHBLOX Studio Bootstrapper v1.5

32 Bit | 64 Bit


diff --git a/resources/views/pages/gamepage.blade.php b/resources/views/pages/gamepage.blade.php index e9204e5..a482d4e 100644 --- a/resources/views/pages/gamepage.blade.php +++ b/resources/views/pages/gamepage.blade.php @@ -19,18 +19,20 @@
-

Natural Disaster Survival

-

By ARCHBLOX

-

+

+

Natural Disaster Survival

+

By ARCHBLOX

+
+
-

+

-

Test place.

+

Natural Disaster Survival is a game where you survive disasters.


-

Created: 28/8/2022 | Last updated: 28/8/2022

+

Created: 28/8/2022 | Last updated: 22/10/2022

@endsection \ No newline at end of file diff --git a/resources/views/pages/games.blade.php b/resources/views/pages/games.blade.php index e93297b..658172e 100644 --- a/resources/views/pages/games.blade.php +++ b/resources/views/pages/games.blade.php @@ -9,10 +9,6 @@ @endsection -@section('alert') -
Note that this page does not support joining yet. If you would like to play your own game that you are currently hosting, click here.
-@endsection - @section('content')

Games

@@ -33,10 +29,10 @@

By ARCHBLOX

- +
- PLACEHOLDER -

By ARCHBLOX

+ dummy place +

By Thomas

diff --git a/resources/views/pages/thomasgame.blade.php b/resources/views/pages/thomasgame.blade.php new file mode 100644 index 0000000..2be3b3e --- /dev/null +++ b/resources/views/pages/thomasgame.blade.php @@ -0,0 +1,34 @@ +@extends('layouts.app') +@section('title') + dummy place - {{ env('APP_NAME') }} +@endsection +@section('titlediscord') + +@endsection +@section('descdiscord') + +@endsection + +@section('content') +
+
+ +
+
+
+

dummy place

+

By Thomas

+
+
+

This place requires Radmin VPN.

+ +
+
+
+
+

Test joining place. Will not be open forever.

+
+
+

Created: 22/10/2022 | Last updated: 22/10/2022

+
+@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 6b1b81c..ff0d5eb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -31,6 +31,10 @@ Route::get('/incomplete', [App\Http\Controllers\PageController::class, 'incomple Route::get('/not-approved', [App\Http\Controllers\PageController::class, 'notapproved'])->name('notapproved'); Route::get('/maintenance', [App\Http\Controllers\PageController::class, 'maintenance'])->name('maintenance'); Route::get('/buttonhell', [App\Http\Controllers\PageController::class, 'buttonhell'])->name('buttonhell'); + // games & game page + Route::get('/games', [App\Http\Controllers\PageController::class, 'games'])->name('games'); + Route::get('/games/1', [App\Http\Controllers\PageController::class, 'gamepage'])->name('gamepage'); + Route::get('/games/2', [App\Http\Controllers\PageController::class, 'thomasgame'])->name('thomasgame'); // Must be logged in Route::middleware(['auth'])->group(function () { @@ -42,11 +46,6 @@ Route::middleware(['auth'])->group(function () { // avatar Route::get('/my/avatar', [App\Http\Controllers\PageController::class, 'avatar'])->name('avatar'); - // games & game page - Route::get('/games', [App\Http\Controllers\PageController::class, 'games'])->name('games'); - Route::get('/games/1', [App\Http\Controllers\PageController::class, 'gamepage'])->name('gamepage'); - - // Rate limit + auth Route::middleware(['throttle:feed_post'])->group(function () { Route::post('/home', [App\Http\Controllers\HomeController::class, 'feed_post'])->name('feed_post'); // Posting to the feed