diff --git a/Assets/motivations/1.motivate b/Assets/motivations/1.motivate new file mode 100644 index 0000000..fd5139e --- /dev/null +++ b/Assets/motivations/1.motivate @@ -0,0 +1,10 @@ +{ + "Portraits": [ + "motivations/photo_2024-03-13_03-12-24.jpg" + ], + "Messages": [ + "\u0417\u0430 \u0440\u0430\u0431\u043E\u0442\u0443!" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/2.motivate b/Assets/motivations/2.motivate new file mode 100644 index 0000000..c76e5bf --- /dev/null +++ b/Assets/motivations/2.motivate @@ -0,0 +1,10 @@ +{ + "Portraits": [ + "motivations/photo_2024-05-17_21-21-49.jpg" + ], + "Messages": [ + "\u0415\u0449\u0435 \u043D\u0435\u043C\u043D\u043E\u0433\u043E!" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/3.motivate b/Assets/motivations/3.motivate new file mode 100644 index 0000000..2d3be92 --- /dev/null +++ b/Assets/motivations/3.motivate @@ -0,0 +1,12 @@ +{ + "Portraits": [ + "motivations/photo_2024-07-04_14-27-10.jpg" + ], + "Messages": [ + "\u041A\u043E\u0433\u0434\u0430 \u043D\u0438\u0431\u0443\u0434\u044C", + "\u0438 \u0443 \u0442\u0435\u0431\u044F", + "\u0431\u0443\u0434\u0443\u0442 \u0442\u0430\u043A\u0438\u0435!" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/4.motivate b/Assets/motivations/4.motivate new file mode 100644 index 0000000..58c89e0 --- /dev/null +++ b/Assets/motivations/4.motivate @@ -0,0 +1,10 @@ +{ + "Portraits": [ + "motivations/photo_2024-07-08_01-51-47.jpg" + ], + "Messages": [ + "\u041D\u0435 \u0441\u043E\u0441\u0430\u0442\u044C!" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/5.motivate b/Assets/motivations/5.motivate new file mode 100644 index 0000000..5d37af1 --- /dev/null +++ b/Assets/motivations/5.motivate @@ -0,0 +1,10 @@ +{ + "Portraits": [ + "motivations/photo_2024-07-16_21-25-41.jpg" + ], + "Messages": [ + "\u041F\u043E\u0447\u0442\u0438 \u0433\u043E\u0442\u043E\u0432\u041E\u041E\u041E\u041E\u041E\u041E" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/6.motivate b/Assets/motivations/6.motivate new file mode 100644 index 0000000..e01b976 --- /dev/null +++ b/Assets/motivations/6.motivate @@ -0,0 +1,11 @@ +{ + "Portraits": [ + "motivations/photo_2024-08-30_19-41-21.jpg" + ], + "Messages": [ + "\u0411\u0443\u0434\u0435\u0448\u044C \u043A\u0430\u043A \u043E\u043D,", + "\u043A\u043E\u0433\u0434\u0430 \u0434\u043E\u0434\u0435\u043B\u0430\u0435\u0448\u044C?" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/7.motivate b/Assets/motivations/7.motivate new file mode 100644 index 0000000..3899d9d --- /dev/null +++ b/Assets/motivations/7.motivate @@ -0,0 +1,10 @@ +{ + "Portraits": [ + "motivations/photo_2024-10-16_19-52-21.jpg" + ], + "Messages": [ + "\u041D\u0430\u0447\u0430\u0442\u044C \u0438 \u043A\u043E\u043D\u0447\u0438\u0442\u044C!" + ], + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/motivations/photo_2024-03-13_03-12-24.jpg b/Assets/motivations/photo_2024-03-13_03-12-24.jpg new file mode 100644 index 0000000..aa2a403 Binary files /dev/null and b/Assets/motivations/photo_2024-03-13_03-12-24.jpg differ diff --git a/Assets/motivations/photo_2024-05-17_21-21-49.jpg b/Assets/motivations/photo_2024-05-17_21-21-49.jpg new file mode 100644 index 0000000..83fcc4c Binary files /dev/null and b/Assets/motivations/photo_2024-05-17_21-21-49.jpg differ diff --git a/Assets/motivations/photo_2024-07-04_14-27-10.jpg b/Assets/motivations/photo_2024-07-04_14-27-10.jpg new file mode 100644 index 0000000..7eb5c90 Binary files /dev/null and b/Assets/motivations/photo_2024-07-04_14-27-10.jpg differ diff --git a/Assets/motivations/photo_2024-07-08_01-51-47.jpg b/Assets/motivations/photo_2024-07-08_01-51-47.jpg new file mode 100644 index 0000000..94ebc29 Binary files /dev/null and b/Assets/motivations/photo_2024-07-08_01-51-47.jpg differ diff --git a/Assets/motivations/photo_2024-07-16_21-25-41.jpg b/Assets/motivations/photo_2024-07-16_21-25-41.jpg new file mode 100644 index 0000000..4b4edfa Binary files /dev/null and b/Assets/motivations/photo_2024-07-16_21-25-41.jpg differ diff --git a/Assets/motivations/photo_2024-08-30_19-41-21.jpg b/Assets/motivations/photo_2024-08-30_19-41-21.jpg new file mode 100644 index 0000000..eda64cd Binary files /dev/null and b/Assets/motivations/photo_2024-08-30_19-41-21.jpg differ diff --git a/Assets/motivations/photo_2024-09-27_15-53-24.jpg b/Assets/motivations/photo_2024-09-27_15-53-24.jpg new file mode 100644 index 0000000..e7b613e Binary files /dev/null and b/Assets/motivations/photo_2024-09-27_15-53-24.jpg differ diff --git a/Assets/motivations/photo_2024-09-27_15-53-52.jpg b/Assets/motivations/photo_2024-09-27_15-53-52.jpg new file mode 100644 index 0000000..f2fdacd Binary files /dev/null and b/Assets/motivations/photo_2024-09-27_15-53-52.jpg differ diff --git a/Assets/motivations/photo_2024-09-29_19-58-40.jpg b/Assets/motivations/photo_2024-09-29_19-58-40.jpg new file mode 100644 index 0000000..19ac99b Binary files /dev/null and b/Assets/motivations/photo_2024-09-29_19-58-40.jpg differ diff --git a/Assets/motivations/photo_2024-09-30_11-35-30.jpg b/Assets/motivations/photo_2024-09-30_11-35-30.jpg new file mode 100644 index 0000000..9905ff4 Binary files /dev/null and b/Assets/motivations/photo_2024-09-30_11-35-30.jpg differ diff --git a/Assets/motivations/photo_2024-10-16_19-52-21.jpg b/Assets/motivations/photo_2024-10-16_19-52-21.jpg new file mode 100644 index 0000000..1a588c1 Binary files /dev/null and b/Assets/motivations/photo_2024-10-16_19-52-21.jpg differ diff --git a/Assets/motivations/photo_2024-10-22_12-08-42.jpg b/Assets/motivations/photo_2024-10-22_12-08-42.jpg new file mode 100644 index 0000000..2caca7e Binary files /dev/null and b/Assets/motivations/photo_2024-10-22_12-08-42.jpg differ diff --git a/Assets/untitled.motivate b/Assets/motivations/untitled.motivate similarity index 100% rename from Assets/untitled.motivate rename to Assets/motivations/untitled.motivate diff --git a/Code/Kal.cs b/Code/Kal.cs index 5837fbf..d80ca5b 100644 --- a/Code/Kal.cs +++ b/Code/Kal.cs @@ -1,4 +1,5 @@ using Sandbox.Citizen; +using Sandbox.Network; using ShrimpleCharacterController; public sealed class Kal : Component @@ -70,6 +71,8 @@ public sealed class Kal : Component { Controller.Punch(Vector3.Up * JumpStrength); AnimationHelper?.TriggerJump(); + + getLobbies(); } if (!AnimationHelper.IsValid()) return; @@ -80,13 +83,19 @@ public sealed class Kal : Component AnimationHelper.IsGrounded = Controller.IsOnGround; } + async void getLobbies() + { + List lobbies; + lobbies = await Networking.QueryLobbies("koptilnya.kakozuzo_2"); + + Log.Info(lobbies.Count); + } + protected override void OnUpdate() { base.OnUpdate(); if ( !Network.IsOwner ) return; - - Log.Info(Controller.WishVelocity); EyeAngles += Input.AnalogLook; EyeAngles = EyeAngles.WithPitch(MathX.Clamp(EyeAngles.pitch, -10f, 40f)); diff --git a/Libraries/badandbest.youcandoit/Editor/MotivationManager.cs b/Libraries/badandbest.youcandoit/Editor/MotivationManager.cs index 9122027..513d690 100644 --- a/Libraries/badandbest.youcandoit/Editor/MotivationManager.cs +++ b/Libraries/badandbest.youcandoit/Editor/MotivationManager.cs @@ -21,10 +21,10 @@ public static class MotivationManager } var notice = new MotivationNotice(); - NoticeManager.Remove( notice, 30 ); + NoticeManager.Remove( notice, 6 ); - const int MIN_MINUTES = 15; - const int MAX_MINUTES = 30; + const int MIN_MINUTES = 2; + const int MAX_MINUTES = 5; Cooldown = 60 * Game.Random.Next( MIN_MINUTES, MAX_MINUTES ); } diff --git a/kakozuzo_2.sbproj b/kakozuzo_2.sbproj index 4cd9f17..e18e16e 100644 --- a/kakozuzo_2.sbproj +++ b/kakozuzo_2.sbproj @@ -4,7 +4,7 @@ "Org": "koptilnya", "Ident": "kakozuzo_2", "Schema": 1, - "IncludeSourceFiles": false, + "IncludeSourceFiles": true, "Resources": null, "PackageReferences": [], "EditorReferences": null, @@ -24,6 +24,6 @@ "CsProjName": "", "StartupScene": "scenes/minimal.scene", "MapStartupScene": "scenes/minimal.scene", - "LaunchMode": "Normal" + "LaunchMode": "QuickPlay" } } \ No newline at end of file diff --git a/kakozuzo_2.sln.DotSettings.user b/kakozuzo_2.sln.DotSettings.user index ffa24d6..4f29b3b 100644 --- a/kakozuzo_2.sln.DotSettings.user +++ b/kakozuzo_2.sln.DotSettings.user @@ -1,4 +1,5 @@  True True + ForceIncluded \ No newline at end of file