Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Commit

Permalink
Final(?) bug fixes
Browse files Browse the repository at this point in the history
i don't usually do these long commit messages, but this is such a big one, felt like i need to point it out.
Fixed:
- when you press run continuously when in mentor battle, text box will print it multiple times and it will look glitched, now it prohibits further input
- when a battle background is changed because of a mentor battle, when you then enter a wild uniteon battle, the battle background is still active and not the normal/default wild uniteon battle background. this is because the sprite is not changed back afterwards. it is now.
- when printing any text to a dialog box, when a word is too long for a line, it tries to print that line first and if it doesn't fit it skips the word to the next line, that looks kinda awkward because the word moved places. fixed it.
- in mentor battles, even if they have more uniteon remaining, after level up, battle ends as won
- moves without effect would still show damage animation, now it shows "no effect"
- fire and ghost types in chart had errors in effectiveness, fixed now
- adding extra Uniteon to party after having battled before, and then opening party screen, crashed the game, now no longer
- no music when going from Route 113 > Eterna City, last commit I said I fixed it, I didn't
- when losing against Ho-Oh, then battling any mentor, you get the last Uniteon added to your party if you win, now no longer
- #4
- #5
- #6
- #7
  • Loading branch information
RillJ committed Jul 3, 2023
1 parent a4e84a1 commit a18d1b9
Show file tree
Hide file tree
Showing 30 changed files with 11,316 additions and 11,232 deletions.
76 changes: 45 additions & 31 deletions Assets/Game/Prefabs/Main/BaseObjects.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 4793920548822447176}
- component: {fileID: 4793920548822447287}
- component: {fileID: 4793920548822447285}
- component: {fileID: 2274316300779723453}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -70,7 +71,7 @@ Camera:
m_TargetDisplay: 0
m_TargetEye: 0
m_HDR: 1
m_AllowMSAA: 0
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
Expand All @@ -84,6 +85,19 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4793920548822447284}
m_Enabled: 1
--- !u!114 &2274316300779723453
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4793920548822447284}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f661f854e6aaa54786f9e0e2b63c476, type: 3}
m_Name:
m_EditorClassIdentifier:
targetAspect: 1.3333334
--- !u!1 &4793920548894620482
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1669,6 +1683,7 @@ GameObject:
- component: {fileID: 4793920549429329518}
- component: {fileID: 4793920549429329516}
- component: {fileID: 4793920549429329517}
- component: {fileID: 4092806178119676014}
m_Layer: 0
m_Name: BattleCamera
m_TagString: Untagged
Expand Down Expand Up @@ -1700,7 +1715,7 @@ Camera:
m_GameObject: {fileID: 4793920549429329515}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
Expand Down Expand Up @@ -1731,7 +1746,7 @@ Camera:
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &4793920549429329517
Expand All @@ -1742,6 +1757,19 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4793920549429329515}
m_Enabled: 1
--- !u!114 &4092806178119676014
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4793920549429329515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f661f854e6aaa54786f9e0e2b63c476, type: 3}
m_Name:
m_EditorClassIdentifier:
targetAspect: 1.3333334
--- !u!1 &4793920549431670477
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2617,7 +2645,7 @@ RectTransform:
- {fileID: 4793920550673673641}
- {fileID: 4793920550401252729}
m_Father: {fileID: 4793920550622984661}
m_RootOrder: 4
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand All @@ -2633,16 +2661,16 @@ Canvas:
m_GameObject: {fileID: 4793920549725608739}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_RenderMode: 1
m_Camera: {fileID: 4793920548822447287}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingLayerID: 1097057301
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &4793920549725608741
Expand Down Expand Up @@ -2853,7 +2881,6 @@ GameObject:
- component: {fileID: 4793920549945905600}
- component: {fileID: 4793920549945905602}
- component: {fileID: 4793920549945905604}
- component: {fileID: 3226721161354636500}
- component: {fileID: 4793920549945905605}
- component: {fileID: 4793920549945905606}
- component: {fileID: 4793920549945905624}
Expand All @@ -2874,7 +2901,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4793920549945905615}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.5, y: 2.8, z: 0}
m_LocalPosition: {x: -4.5, y: -1.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -2968,34 +2995,21 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
uniteons:
- uniteonBase: {fileID: 11400000, guid: c1a4a01995a150646a9945ee467a9285, type: 2}
level: 99
healthPoints: 0
- uniteonBase: {fileID: 11400000, guid: 14e8cc068eb8177498bf6c3f49e6df63, type: 2}
level: 7
healthPoints: 0
- uniteonBase: {fileID: 11400000, guid: 6dbd16654a5094f4ab1fd566e9d95b00, type: 2}
level: 1
- uniteonBase: {fileID: 11400000, guid: 004a74598f3d5854cb376999c15c89a1, type: 2}
level: 17
healthPoints: 0
- uniteonBase: {fileID: 11400000, guid: 88b273f333a13c343a952472ed3bf99e, type: 2}
level: 39
healthPoints: 0
- uniteonBase: {fileID: 11400000, guid: 6aff78bd22906c546901e6f1ec7cf710, type: 2}
level: 15
healthPoints: 0
--- !u!114 &3226721161354636500
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4793920549945905615}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 10d6ba082588b6e48862cb9809de6d3f, type: 3}
m_Name:
m_EditorClassIdentifier:
uniteons: []
- uniteonBase: {fileID: 11400000, guid: c1a4a01995a150646a9945ee467a9285, type: 2}
level: 47
healthPoints: 0
--- !u!114 &4793920549945905605
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4383,9 +4397,9 @@ Transform:
m_Children:
- {fileID: 4793920549945905601}
- {fileID: 4793920549960532996}
- {fileID: 4793920550817096556}
- {fileID: 4793920550521101413}
- {fileID: 4793920549725608743}
- {fileID: 4793920550521101413}
- {fileID: 4793920550817096556}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -4645,7 +4659,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Sample dialog box text for testing the dialog box, duh
m_Text: It's super effective on Oshawott! Great!
--- !u!1 &4793920550751639165
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5030,7 +5044,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4793920550622984661}
m_RootOrder: 2
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4793920550817096555
MonoBehaviour:
Expand Down
2 changes: 2 additions & 0 deletions Assets/Game/Resources/Uniteons/483 Dialga.asset
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,6 @@ MonoBehaviour:
level: 25
- moveBase: {fileID: 11400000, guid: 410ebe0965f0e6e459ffa429c9b90139, type: 2}
level: 48
- moveBase: {fileID: 11400000, guid: c77bb84254cf42e47951e0c5faa08dad, type: 2}
level: 50
cry: {fileID: 8300000, guid: f4887ad8422a14e499382e02d7619431, type: 3}
Loading

0 comments on commit a18d1b9

Please sign in to comment.