Skip to content

Commit

Permalink
Update restrictions for Kaiju Hunt minigame
Browse files Browse the repository at this point in the history
  • Loading branch information
daniellochner committed Jul 4, 2023
1 parent 34f118c commit 7acedfa
Show file tree
Hide file tree
Showing 7 changed files with 286 additions and 43 deletions.
26 changes: 13 additions & 13 deletions Assets/Game/Worlds/City/Scenes/City.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 139955300}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -40.32, y: 0, z: 230.42}
m_LocalPosition: {x: -40.32, y: 0.2, z: 230.42}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -2434,7 +2434,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213643017}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -13.86, y: 0, z: 266.26}
m_LocalPosition: {x: -13.86, y: 0.2, z: 266.26}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -3061,7 +3061,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 294262464}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -13.86, y: 0, z: 256.8}
m_LocalPosition: {x: -13.86, y: 0.2, z: 256.8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -3905,7 +3905,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8123047122262091971, guid: cbcd26a283602234fb68594a99a118b4, type: 3}
propertyPath: m_LocalPosition.z
value: 21.802383
value: 21.802399
objectReference: {fileID: 0}
- target: {fileID: 8123047122262091971, guid: cbcd26a283602234fb68594a99a118b4, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -8540,7 +8540,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2028492288858584343, guid: c9ca56e46e6c0dc41a1509924bd2f741, type: 3}
propertyPath: m_LocalPosition.z
value: -49.25595
value: -49.25592
objectReference: {fileID: 0}
- target: {fileID: 2028492288858584343, guid: c9ca56e46e6c0dc41a1509924bd2f741, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -10004,7 +10004,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915725932}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -40.3, y: 0, z: 292.42}
m_LocalPosition: {x: -40.3, y: 0.2, z: 292.42}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -13478,7 +13478,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1298038409}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -49.76, y: 0, z: 230.42}
m_LocalPosition: {x: -49.76, y: 0.2, z: 230.42}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -26317,7 +26317,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6972332719255171345, guid: 40b0fb78a7b423d46a680bddc31c1260, type: 3}
propertyPath: m_LocalPosition.z
value: -90.34201
value: -90.34204
objectReference: {fileID: 0}
- target: {fileID: 6972332719255171345, guid: 40b0fb78a7b423d46a680bddc31c1260, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -26731,7 +26731,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6043750895415794564, guid: 7aca0a1c7c1569840a80afc794409f0d, type: 3}
propertyPath: m_LocalPosition.z
value: -41.193863
value: -41.19388
objectReference: {fileID: 0}
- target: {fileID: 6043750895415794564, guid: 7aca0a1c7c1569840a80afc794409f0d, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -27085,7 +27085,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1571400942}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -76.06, y: 0, z: 256.5}
m_LocalPosition: {x: -76.06, y: 0.2, z: 256.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -28046,7 +28046,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677678449}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -76.06, y: 0, z: 266.06}
m_LocalPosition: {x: -76.06, y: 0.2, z: 266.06}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -32555,7 +32555,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4914346983782262246, guid: 895dd451feb74ce4d86a18fd75991bec, type: 3}
propertyPath: m_LocalPosition.z
value: -85.65485
value: -85.65483
objectReference: {fileID: 0}
- target: {fileID: 4914346983782262246, guid: 895dd451feb74ce4d86a18fd75991bec, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -36835,7 +36835,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2092380001}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -49.74, y: 0, z: 292.42}
m_LocalPosition: {x: -49.74, y: 0.2, z: 292.42}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Worlds/City/Scripts/Runtime/KaijuHunt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ protected override void OnApplyRestrictions()
foreach (var obj in DatabaseManager.GetDatabase("Body Parts").Objects)
{
BodyPart bodyPart = obj.Value as BodyPart;
if (bodyPart.Abilities.Find(x => (x.Level > 1) || (x is Abilities.Spit || x is Abilities.Spin || x is Abilities.Shoot)))
if (bodyPart.Abilities.Find(x => x is Abilities.Launch || x is Abilities.Spin || (x is Abilities.Bite && x.Level > 1)))
{
bodyParts.Add(obj.Key);
}
Expand Down
Binary file modified Assets/Localization/Data/Windows/addressables_content_state.bin
Binary file not shown.
64 changes: 59 additions & 5 deletions Assets/Resources/Fonts & Materials/NotoSans.asset

Large diffs are not rendered by default.

45 changes: 36 additions & 9 deletions Assets/Resources/Fonts & Materials/NotoSansKR.asset

Large diffs are not rendered by default.

39 changes: 33 additions & 6 deletions Assets/Resources/Fonts & Materials/NotoSansSC.asset

Large diffs are not rendered by default.

153 changes: 144 additions & 9 deletions Assets/Resources/Fonts & Materials/NotoSansThai.asset

Large diffs are not rendered by default.

0 comments on commit 7acedfa

Please sign in to comment.