Skip to content

Commit 6b79002

Browse files
Fixes save system and block selection dropdown
1 parent 61854a9 commit 6b79002

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

Blocktest/Assets/Scenes/MainScene.unity

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ MonoBehaviour:
875875
m_Name:
876876
m_EditorClassIdentifier:
877877
m_Navigation:
878-
m_Mode: 3
878+
m_Mode: 0
879879
m_WrapAround: 0
880880
m_SelectOnUp: {fileID: 0}
881881
m_SelectOnDown: {fileID: 0}
@@ -906,10 +906,10 @@ MonoBehaviour:
906906
m_OnClick:
907907
m_PersistentCalls:
908908
m_Calls:
909-
- m_Target: {fileID: 0}
910-
m_TargetAssemblyTypeName: PlayerUI, Assembly-CSharp
909+
- m_Target: {fileID: 1372863295}
910+
m_TargetAssemblyTypeName: BlockManager, Assembly-CSharp
911911
m_MethodName: PlayerSaveLevel
912-
m_Mode: 3
912+
m_Mode: 1
913913
m_Arguments:
914914
m_ObjectArgument: {fileID: 0}
915915
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1537,7 +1537,7 @@ MonoBehaviour:
15371537
m_Name:
15381538
m_EditorClassIdentifier:
15391539
m_Navigation:
1540-
m_Mode: 3
1540+
m_Mode: 0
15411541
m_WrapAround: 0
15421542
m_SelectOnUp: {fileID: 0}
15431543
m_SelectOnDown: {fileID: 0}
@@ -1568,10 +1568,10 @@ MonoBehaviour:
15681568
m_OnClick:
15691569
m_PersistentCalls:
15701570
m_Calls:
1571-
- m_Target: {fileID: 0}
1572-
m_TargetAssemblyTypeName: PlayerUI, Assembly-CSharp
1571+
- m_Target: {fileID: 1372863295}
1572+
m_TargetAssemblyTypeName: BlockManager, Assembly-CSharp
15731573
m_MethodName: PlayerLoadLevel
1574-
m_Mode: 3
1574+
m_Mode: 1
15751575
m_Arguments:
15761576
m_ObjectArgument: {fileID: 0}
15771577
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1749,7 +1749,7 @@ MonoBehaviour:
17491749
m_Name:
17501750
m_EditorClassIdentifier:
17511751
m_Navigation:
1752-
m_Mode: 3
1752+
m_Mode: 0
17531753
m_WrapAround: 0
17541754
m_SelectOnUp: {fileID: 0}
17551755
m_SelectOnDown: {fileID: 0}
@@ -2336,7 +2336,7 @@ MonoBehaviour:
23362336
m_Name:
23372337
m_EditorClassIdentifier:
23382338
m_Navigation:
2339-
m_Mode: 3
2339+
m_Mode: 0
23402340
m_WrapAround: 0
23412341
m_SelectOnUp: {fileID: 0}
23422342
m_SelectOnDown: {fileID: 0}
@@ -2375,8 +2375,8 @@ MonoBehaviour:
23752375
m_OnValueChanged:
23762376
m_PersistentCalls:
23772377
m_Calls:
2378-
- m_Target: {fileID: 0}
2379-
m_TargetAssemblyTypeName: PlayerUI, Assembly-CSharp
2378+
- m_Target: {fileID: 1372863295}
2379+
m_TargetAssemblyTypeName: BlockManager, Assembly-CSharp
23802380
m_MethodName: ChangeBlockSelection
23812381
m_Mode: 0
23822382
m_Arguments:

Blocktest/Assets/Scripts/Block System/BlockManager.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public class BlockManager : MonoBehaviour
2323
[SerializeField] private Tilemap backgroundTilemap;
2424
[SerializeField] public GameObject defaultPlayerPrefab;
2525

26-
2726
private void Awake()
2827
{
2928
// Add this to the global variable
@@ -60,4 +59,16 @@ where assemblyType.IsSubclassOf(typeof(Block))
6059
selectionDropdown.AddOptions(blockNames.ToList());
6160
WorldGen.GenerateMainMap(); // TODO: Move this to some sort of global initialization method
6261
}
62+
63+
// Code bandaid for saving
64+
public void PlayerLoadLevel() {
65+
SaveSystem.LoadGame(0);
66+
}
67+
68+
public void PlayerSaveLevel() {
69+
SaveSystem.SaveGame(0);
70+
}
71+
72+
// disgusting
73+
public void ChangeBlockSelection(int slot) => Globals.characterObject.GetComponent<PlayerUI>().ChangeBlockSelection(slot);
6374
}

Blocktest/Assets/Scripts/SaveSystem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static void SaveGame(int saveIndex) {
1010
string path = Application.persistentDataPath + "/savegame-" + saveIndex + ".bt";
1111

1212
FileStream stream = new FileStream(path, FileMode.Create);
13-
Vector3 playerPos3 = GameObject.Find("Player").transform.position;
13+
Vector3 playerPos3 = Globals.characterObject.transform.position;
1414
float[] playerPos = new float[3] {playerPos3.x, playerPos3.y, playerPos3.z};
1515

1616
SaveData save = new SaveData(playerPos, BuildSystem.currentWorld);
@@ -47,7 +47,7 @@ public static void LoadGame(int saveIndex) {
4747

4848
BuildSystem.PlaceIDsCells(blocksToPlaceFore, true, positions);
4949
BuildSystem.PlaceIDsCells(blocksToPlaceBack, false, positions);
50-
GameObject.Find("Player").transform.position = new Vector3(data.playerPosition[0], data.playerPosition[1], data.playerPosition[2]);
50+
Globals.characterObject.transform.position = new Vector3(data.playerPosition[0], data.playerPosition[1], data.playerPosition[2]);
5151
BuildSystem.currentWorld = data.worldData;
5252

5353
} else

0 commit comments

Comments
 (0)