Skip to content

Commit

Permalink
screw it i'll just hand place them
Browse files Browse the repository at this point in the history
finalize anneel egg tooltip (thank you budwheizzah)
add credits for egg models
add "hint" command
  • Loading branch information
Govorunb committed May 18, 2024
1 parent d13e268 commit fa3c8aa
Show file tree
Hide file tree
Showing 13 changed files with 140 additions and 58 deletions.
30 changes: 30 additions & 0 deletions SCHIZO/ConsoleCommands/ConsoleCommands.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using JetBrains.Annotations;
using Nautilus.Commands;
using SCHIZO.Helpers;
using SCHIZO.Tweaks;
using UnityEngine;
using Object = UnityEngine.Object;

Expand Down Expand Up @@ -50,6 +51,35 @@ public static void OnConsoleCommand_say(params string[] args)
ErrorMessage.AddMessage(string.Join(" ", args));
}

[ConsoleCommand("say2"), UsedImplicitly]
public static string OnConsoleCommand_say2(params string[] args)
{
if (args is []) return "say2 [duration] <message>";
string message;
if (float.TryParse(args[0], out float duration))
{
message = string.Join(" ", args.Skip(1));
}
else
{
duration = 5;
message = string.Join(" ", args);
}
MessageHelpers.ShowHint(duration, message);
return null;
}

//[ConsoleCommand("duh")]
[UsedImplicitly]
public static void DevMode()
{
DevConsole.SendConsoleCommand("fastswim");
DevBinds existing = Player.main.gameObject.GetComponent<DevBinds>();
if (existing)
GameObject.Destroy(existing);
else
Player.main.gameObject.AddComponent<DevBinds>();
}
#region FMOD
public static string OnConsoleCommand_banks()
{
Expand Down
12 changes: 11 additions & 1 deletion SCHIZO/Helpers/MessageHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;

namespace SCHIZO.Helpers;
Expand All @@ -20,6 +21,15 @@ public static string GetCommandOutput(string message, bool? suppressOutput = nul
public static string TechTypeNotFound(string techTypeName)
{
IEnumerable<string> techTypeNamesSuggestion = TechTypeExtensions.GetTechTypeNamesSuggestion(techTypeName);
return MessageHelpers.GetCommandOutput($"Could not find tech type for '{techTypeName}'. Did you mean:\n{string.Join("\n", techTypeNamesSuggestion)}");
return GetCommandOutput($"Could not find tech type for '{techTypeName}'. Did you mean:\n{string.Join("\n", techTypeNamesSuggestion)}");
}

internal static void ShowHint(float duration, string message)
{
if (!Hint.main) return;
uGUI_PopupMessage uiPopup = Hint.main.message;
if (!uiPopup) return;
uiPopup.SetText(message, UnityEngine.TextAnchor.UpperCenter);
uiPopup.Show(duration);
}
}
14 changes: 14 additions & 0 deletions SCHIZO/Tweaks/DevBinds.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using UnityEngine;

namespace SCHIZO.Tweaks;

internal class DevBinds : MonoBehaviour
{
public void Update()
{
if (DevConsole.instance.inputField.isFocused) return;

if (Input.GetKeyDown(KeyCode.G))
DevConsole.SendConsoleCommand("ghost");
}
}
4 changes: 2 additions & 2 deletions Unity/Assets/Mod/Anneel/Anneel egg.asset
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MonoBehaviour:
id: 0
classId: anneelEgg
displayName: Anneel Egg
tooltip: 'A small egg from a fox eel. Occasionally emits an ultrasonic hic.
tooltip: '<size=50%>hic</size> <size=50%>erm</size>
<size=75%>(Model
by Toasted3)</size>'
Expand All @@ -29,7 +29,7 @@ MonoBehaviour:
craftingTime: 2.5
pdaEncyInfo: {fileID: 0}
knownTechInfo: {fileID: 0}
spawnData: {fileID: 11400000, guid: b54acfb85a3dc5847925efdcebbc3774, type: 2}
spawnData: {fileID: 0}
unlockAtStart: 1
registerInSN: 1
recipeSN: {fileID: 0}
Expand Down
1 change: 1 addition & 0 deletions Unity/Assets/Mod/Anneel/Anneel.asset
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ MonoBehaviour:
registryItems:
- {fileID: 11400000, guid: 87067f32545a0f74b95731190912dcd3, type: 2}
- {fileID: 11400000, guid: ef85ee4ab6033a740a30a10548f6e664, type: 2}
- {fileID: 11400000, guid: d66bd2f5dcb4e714abc33bdc677e125f, type: 2}
35 changes: 35 additions & 0 deletions Unity/Assets/Mod/Anneel/Egg Spawns Manual.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6ccb8c039e34e44ebdee40c7d89e4a4, type: 3}
m_Name: Egg Spawns Manual
m_EditorClassIdentifier:
spawns:
- game: 2
locations:
- position: {x: 53.57, y: -93.51, z: -885.8}
rotation: {x: 346.6, y: 55.3, z: 337.1}
- position: {x: 291.5, y: -239.7, z: -1297.6}
rotation: {x: 339, y: 4.3, z: 7.6}
- position: {x: 286.85, y: -227.2, z: -1285.2}
rotation: {x: 6.6, y: 163.15, z: 343.6}
- position: {x: 35.56, y: -92.3, z: -877.6}
rotation: {x: 355.5, y: 85.3, z: 342.1}
- position: {x: 290.2, y: -223.9, z: -1265.1}
rotation: {x: 357, y: 356.1, z: 25.65}
- position: {x: 253, y: -253.1, z: -1289.25}
rotation: {x: 336.25, y: 347, z: 19.3}
- position: {x: 481.3, y: -158.8, z: -649.2}
rotation: {x: 359.7, y: 0.44, z: 6.5}
item:
isCustom: 1
techType: 0
itemData: {fileID: 11400000, guid: ef85ee4ab6033a740a30a10548f6e664, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 0 additions & 26 deletions Unity/Assets/Mod/Anneel/Egg Spawns.asset

This file was deleted.

43 changes: 43 additions & 0 deletions Unity/Assets/Mod/Ermshark/Egg Spawns Manual.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6ccb8c039e34e44ebdee40c7d89e4a4, type: 3}
m_Name: Egg Spawns Manual
m_EditorClassIdentifier:
spawns:
- game: 2
locations:
- position: {x: 607.7, y: -456.1, z: -1150.5}
rotation: {x: 0.15, y: 358.3, z: 16.85}
- position: {x: 696.3, y: -481, z: -1030}
rotation: {x: 20.3, y: 1, z: 5.6}
- position: {x: 566.5, y: -485.5, z: -932.2}
rotation: {x: 354.8, y: 150.3, z: 349.4}
- position: {x: 466.4, y: -535.4, z: -879.5}
rotation: {x: 333.7, y: 3.1, z: 355.9}
- position: {x: 390, y: -584.2, z: -1006.55}
rotation: {x: 9.6, y: 0.5, z: 13.4}
- position: {x: 510.6, y: -599.85, z: -978.1}
rotation: {x: 324.6, y: 351.4, z: 10.65}
- position: {x: 551.15, y: -626.2, z: -1141.7}
rotation: {x: 0, y: 355, z: 0}
- position: {x: 412.3, y: -597.6, z: -931.8}
rotation: {x: 340.46, y: 359.8, z: 1.2}
- position: {x: 577.4, y: -562.8, z: -896.46}
rotation: {x: 327, y: 320, z: 19.3}
- position: {x: 555.7, y: -509.6, z: -810.2}
rotation: {x: 7.1, y: 318.1, z: 1.1}
- position: {x: 545.2, y: -488.7, z: -1094.4}
rotation: {x: 0.6, y: 359.6, z: 348.4}
item:
isCustom: 1
techType: 0
itemData: {fileID: 11400000, guid: 3c39cd24ddaaa5340a4528d2ede7d218, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 0 additions & 26 deletions Unity/Assets/Mod/Ermshark/Egg Spawns.asset

This file was deleted.

2 changes: 1 addition & 1 deletion Unity/Assets/Mod/Ermshark/Ermshark Egg.asset
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ MonoBehaviour:
craftingTime: 2.5
pdaEncyInfo: {fileID: 0}
knownTechInfo: {fileID: 0}
spawnData: {fileID: 11400000, guid: 35a911b79bbe1f9459216187bea1ce21, type: 2}
spawnData: {fileID: 0}
unlockAtStart: 1
registerInSN: 1
recipeSN: {fileID: 0}
Expand Down
1 change: 1 addition & 0 deletions Unity/Assets/Mod/Ermshark/Ermshark.asset
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ MonoBehaviour:
registryItems:
- {fileID: 11400000, guid: 5159b45dc6c3d83449b9eb96602c772c, type: 2}
- {fileID: 11400000, guid: 3c39cd24ddaaa5340a4528d2ede7d218, type: 2}
- {fileID: 11400000, guid: 55fb58a3558507b408e13a5bf767b3d1, type: 2}

0 comments on commit fa3c8aa

Please sign in to comment.