Skip to content
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.

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

CL more bug fixes & features #171

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
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
Next Next commit
TitanTarget should be Networked
  • Loading branch information
oryxoik committed Oct 19, 2024
commit 736d79d15f06bcc9cf94085687ce83249e2d094a
2 changes: 1 addition & 1 deletion Assets/Resources/Data/Info/MapPrefabList.json
Original file line number Diff line number Diff line change
@@ -843,7 +843,7 @@
{"Name": "Horse1", "Asset": "Interact/Horse1", "CollideWith": "All", "Static": false, "Components": ["Animal|WalkAnimation:horse_WALK|IdleAnimations:horse_idle0|ActionAnimations:horse_idle1/horse_idle2/horse_idle3/horse_crazy|ActionSounds:None/Idle2Sound/Idle3Sound/CrazySound,Rigidbody|Mass:5.0|Gravity:0.0/-20.0/0.0|FreezeRotation:true"]},
{"Name": "Dog1", "Asset": "Interact/Dog1", "CollideWith": "All", "Static": false, "Components": ["Animal|WalkAnimation:Walk|IdleAnimations:Idle0/Lie1/Lie2/Lie3/Sit1/Sit2/Sleep/Stand|ActionAnimations:Itch/Stretch/Shake,Rigidbody|Mass:5.0|Gravity:0.0/-20.0/0.0|FreezeRotation:true"]},
{"Name":"Destructible Trigger", "Asset":"Geometry/Cube1", "Visible": false, "Static": false, "Networked": true, "CollideMode": "Region", "CollideWith": "Hitboxes", "Components": ["DestructibleTrigger|"]},
{"Name":"Titan Target", "Components": ["TitanTarget|"]}
{"Name":"Titan Target", "Static": false, "Networked": true, "Components": ["TitanTarget|"]}
]
},
"Legacy": {
2 changes: 1 addition & 1 deletion Assets/Resources/Data/Modes/BaseLogic.txt
Original file line number Diff line number Diff line change
@@ -748,7 +748,7 @@ component TitanTarget

function Init()
{
self._targetable = self.MapObject.AddSphereTarget("Human", Vector3(0), 10.1);
self._targetable = self.MapObject.AddSphereTarget("Human", Vector3(0), 0.1);
self._targetable.Enabled = self.EnabledByDefault;

self.MapObject.AddSphereCollider("Region", "Characters", Vector3(0), self.PlayerPriorityRange);