Skip to content

fix: Crossbow positions #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Thomlam merged 4 commits into from
Oct 23, 2024
Merged

fix: Crossbow positions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4eb8b45
fix: Fix the placement of the crossbows
AyakorK Oct 22, 2024
584527a
feat: Add hitboxes to crossbows
AyakorK Oct 22, 2024
e97b29d
fix: Remove useless traps spawns
AyakorK Oct 22, 2024
ae38a84
fix: Reorder correctly the crossbow prefabs
AyakorK Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Prefabs/RoomSystem/Corridor/Room.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,8 +1148,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
trapPrefabs:
- {fileID: 6097000079642511365, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3}
- {fileID: 7646078152559978388, guid: 40bc1f37707e62f4297f85bf5c7b01b4, type: 3}
- {fileID: 6762149095286452822, guid: d7c2a5ac1f23afe428f872343ed56d71, type: 3}
- {fileID: 7646078152559978388, guid: 40bc1f37707e62f4297f85bf5c7b01b4, type: 3}
--- !u!1 &4171805761210331374
GameObject:
m_ObjectHideFlags: 0
Expand Down
47 changes: 46 additions & 1 deletion Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ GameObject:
- component: {fileID: 5795171091198292367}
- component: {fileID: -203823895052494}
- component: {fileID: 35751912918643136}
- component: {fileID: 7871202529601744935}
m_Layer: 0
m_Name: crossbow_down_prefab
m_TagString: trap
Expand Down Expand Up @@ -192,5 +193,49 @@ MonoBehaviour:
m_EditorClassIdentifier:
arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3}
firePoint: {fileID: 281168768424784037}
fireRate: 1
arrowDirection: {x: 0, y: -1, z: 0}
--- !u!61 &7871202529601744935
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6097000079642511365}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.02706647, y: 0.046013117}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.8484273, y: 0.90797377}
m_EdgeRadius: 0
48 changes: 47 additions & 1 deletion Assets/Prefabs/Traps/Crossbow/crossbow_side_prefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ GameObject:
- component: {fileID: 676389503062817133}
- component: {fileID: 5286258800020939821}
- component: {fileID: 8832289385422847377}
- component: {fileID: 6359678448919576393}
m_Layer: 0
m_Name: crossbow_side_prefab
m_TagString: trap
Expand Down Expand Up @@ -229,4 +230,49 @@ MonoBehaviour:
m_EditorClassIdentifier:
arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3}
firePoint: {fileID: 3203241062154977645}
arrowDirection: {x: 1, y: 0, z: 0}
arrowDirection: {x: -1, y: 0, z: 0}
--- !u!61 &6359678448919576393
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7646078152559978388}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.0053215027, y: 0.023946047}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.9255028, y: 0.9521079}
m_EdgeRadius: 0
48 changes: 47 additions & 1 deletion Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ GameObject:
- component: {fileID: 6986723495591371066}
- component: {fileID: 5634049128496068952}
- component: {fileID: 7794495536740116109}
- component: {fileID: 1962896055783386486}
m_Layer: 0
m_Name: crossbow_up_prefab
m_TagString: Untagged
m_TagString: trap
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -199,6 +200,51 @@ MonoBehaviour:
arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3}
firePoint: {fileID: 6072291834429057557}
arrowDirection: {x: 0, y: 1, z: 0}
--- !u!61 &1962896055783386486
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6762149095286452822}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.02851978, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.87958354, y: 1}
m_EdgeRadius: 0
--- !u!1 &7709142573957286560
GameObject:
m_ObjectHideFlags: 0
Expand Down
3 changes: 1 addition & 2 deletions Assets/Scripts/Trap/TrapManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ async void Start()

clientSocket = SocketManager.Instance.ClientSocket;

// Start processing the placement queue
StartCoroutine(ProcessPlacementQueue());

await clientSocket.EmitAsync("traps:reload");
Expand Down Expand Up @@ -91,7 +90,7 @@ private void SpawnTrapAtPosition(int x, int y, string trapType)
{

// Instantiate the prefab at the calculated position
Vector3 spawnPosition = new Vector3(x, y, 0);
Vector3 spawnPosition = new Vector3(x + 0.5f, y - 0.25f, 0);
GameObject spawnedTrap = Instantiate(prefabToSpawn, spawnPosition, Quaternion.identity);

// Mark the grid spot as occupied
Expand Down