all repos — RPG @ a40a52248252949030dbbef05eb6f438175b8d4e

Fully functional 3D turn based role playing game coded in C# and base Unity.

random fixes
Marco Andronaco andronacomarco@gmail.com
Sat, 18 Apr 2020 11:17:51 +0200
commit

a40a52248252949030dbbef05eb6f438175b8d4e

parent

7cec107e04b4d24c84fef2cc439da3a7f69c7a13

27 files changed, 306 insertions(+), 114 deletions(-)

jump to
M Assets/Models/Archer/BattleArcherAnimator.controller → Assets/Models/Archer/BattleArcherAnimator.controller 
@@ -20,7 +20,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.93589747
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
M Assets/Models/Boxer/BattleBoxerAnimator.controller → Assets/Models/Boxer/BattleBoxerAnimator.controller 
@@ -20,7 +20,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.93589747
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

@@ -208,43 +208,43 @@ m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Alive
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Corpse
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Attack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Damage
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Victory
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Heal
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
M Assets/Models/Ganfaul/Animations/ganfaul_m_aure@Idle.fbx.meta → Assets/Models/Ganfaul/Animations/ganfaul_m_aure@Idle.fbx.meta 
@@ -46,7 +46,7 @@ level: 0
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 0
+      loopTime: 1
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0
M Assets/Models/Mage/BattleMageAnimator.controller → Assets/Models/Mage/BattleMageAnimator.controller 
@@ -20,7 +20,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.93589747
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

@@ -211,49 +211,49 @@ m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Alive
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Corpse
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Attack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Damage
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Victory
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: MagicAttack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Heal
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
M Assets/Models/Mutant/Animations/mutant@Mutant Breathing Idle.fbx.meta → Assets/Models/Mutant/Animations/mutant@Mutant Breathing Idle.fbx.meta 
@@ -46,7 +46,7 @@ level: 0
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 0
+      loopTime: 1
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0
M Assets/Models/Paladin/BattlePaladinAnimator.controller → Assets/Models/Paladin/BattlePaladinAnimator.controller 
@@ -42,7 +42,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.93589747
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

@@ -261,43 +261,43 @@ m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Alive
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Corpse
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Attack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Damage
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Victory
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Heal
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
M Assets/Prefabs/Battle/Archer.prefab → Assets/Prefabs/Battle/Archer.prefab 
@@ -62,7 +62,7 @@ m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 827947636945789025}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &1766172125971990188
 SkinnedMeshRenderer:

@@ -167,7 +167,7 @@ m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1226455153629859807
 Transform:
   m_ObjectHideFlags: 0

@@ -175,13 +175,13 @@ m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 585199567582423679}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0.473, y: 1.42, z: -0.051}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 827947636945789025}
+  m_Father: {fileID: 2873609611795555851}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!33 &5825542786957024534
 MeshFilter:
   m_ObjectHideFlags: 0

@@ -444,7 +444,7 @@ m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 827947636945789025}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &1891557444506585371
 SkinnedMeshRenderer:

@@ -891,9 +891,10 @@ m_GameObject: {fileID: 2553446944188651054}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 1226455153629859807}
   m_Father: {fileID: 827947636945789025}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &3606706566463013819
 SkinnedMeshRenderer:

@@ -1065,7 +1066,7 @@ m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 827947636945789025}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &7173171142654846469
 SkinnedMeshRenderer:

@@ -2565,7 +2566,6 @@ m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1226455153629859807}
   - {fileID: 8313890275020307294}
   - {fileID: 2873609611795555851}
   - {fileID: 8131049323842005233}

@@ -2727,7 +2727,7 @@ m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 827947636945789025}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &1545027370276364956
 SkinnedMeshRenderer:
M Assets/Prefabs/Overworld/Girl.prefab → Assets/Prefabs/Overworld/Girl.prefab 
@@ -776,7 +776,7 @@ - "Hey, you. You're finally awake. You were trying to cross the border, right?
       Walked right into that Orc ambush and got easily defeated.\r"
     - Well, it's your lucky day. I found you unconscious and I brought you here to
       heal your wounds, now you should be ready to go.
-    - "What? You want to climb Peek Galeer? Then you need to prepare for battle. A
+    - "What? You want to climb Peak Galeer? Then you need to prepare for battle. A
       lot of weird orcs and mutants have been swarming the place recently, but as
       long as you stay together you should be fine.\r"
     - 'The real problem would be that demon Brady... He''s the cause of all our worries:
M Assets/Prefabs/Overworld/MainCamera.prefab → Assets/Prefabs/Overworld/MainCamera.prefab 
@@ -42,8 +42,8 @@ m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1559249300400504050}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0

@@ -98,4 +98,4 @@ m_Name:
   m_EditorClassIdentifier: 
   turnSpeed: 150
   player: {fileID: 0}
-  offset: {x: 3.5, y: 2.5, z: 3.5}
+  offset: {x: 4, y: 2.5, z: 4}
M Assets/Prefabs/UI/TutorialScreen.prefab → Assets/Prefabs/UI/TutorialScreen.prefab 
@@ -1902,7 +1902,7 @@ serializedVersion: 3
   m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
-  m_PixelPerfect: 0
+  m_PixelPerfect: 1
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0

@@ -1923,10 +1923,10 @@ m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
M Assets/Scenes/GameOver.unity → Assets/Scenes/GameOver.unity 
@@ -291,10 +291,10 @@ m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

@@ -313,7 +313,7 @@ serializedVersion: 3
   m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
-  m_PixelPerfect: 0
+  m_PixelPerfect: 1
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0

@@ -486,7 +486,7 @@ m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 953772826}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 

@@ -793,6 +793,10 @@ m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cc30c393fd81f4a359b99a3e944ddfd2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  loadPanel: {fileID: 0}
+  creditsPanel: {fileID: 0}
+  settingsPanel: {fileID: 0}
+  mixer: {fileID: 24100000, guid: 74b130e74b71401439101ad1b2c8ef5e, type: 2}
 --- !u!114 &1438616489
 MonoBehaviour:
   m_ObjectHideFlags: 0

@@ -1001,8 +1005,8 @@ m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1874530561}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
M Assets/Scenes/Level0.unity → Assets/Scenes/Level0.unity 
@@ -17467,13 +17467,18 @@ value:
       objectReference: {fileID: 2553804876603214695}
     - target: {fileID: 1559249301298402843, guid: 0b8a8754c45d39b44970a73a71b30aa1,
         type: 3}
-      propertyPath: offset.y
-      value: 1.7
+      propertyPath: offset.x
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559249301298402843, guid: 0b8a8754c45d39b44970a73a71b30aa1,
+        type: 3}
+      propertyPath: offset.z
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 1559249301298402843, guid: 0b8a8754c45d39b44970a73a71b30aa1,
         type: 3}
-      propertyPath: offset.x
-      value: 5
+      propertyPath: offset.y
+      value: 2.5
       objectReference: {fileID: 0}
     - target: {fileID: 7255813635939471790, guid: 0b8a8754c45d39b44970a73a71b30aa1,
         type: 3}
M Assets/Scenes/Level1.unity → Assets/Scenes/Level1.unity 
@@ -492,13 +492,13 @@ m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170076733}
-  m_LocalRotation: {x: 0.4221182, y: 0.044075467, z: -0.020552726, w: 0.90523547}
+  m_LocalRotation: {x: 0.8157153, y: 0.028064905, z: -0.039716776, w: 0.5764057}
   m_LocalPosition: {x: 0, y: 900, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 50, y: 5.5750003, z: 0}
+  m_LocalEulerAnglesHint: {x: 109.507996, y: 5.574997, z: -0.000015258789}
 --- !u!1001 &186653612
 PrefabInstance:
   m_ObjectHideFlags: 0

@@ -1588,16 +1588,6 @@ type: 3}
       propertyPath: player
       value: 
       objectReference: {fileID: 2553804876603214695}
-    - target: {fileID: 1559249301298402843, guid: 0b8a8754c45d39b44970a73a71b30aa1,
-        type: 3}
-      propertyPath: offset.y
-      value: 1.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 1559249301298402843, guid: 0b8a8754c45d39b44970a73a71b30aa1,
-        type: 3}
-      propertyPath: offset.x
-      value: 5
-      objectReference: {fileID: 0}
     - target: {fileID: 7255813635939471790, guid: 0b8a8754c45d39b44970a73a71b30aa1,
         type: 3}
       propertyPath: m_LocalPosition.x
M Assets/Scenes/Level2.unity → Assets/Scenes/Level2.unity 
@@ -219,12 +219,6 @@ value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e791e133869077e42a891c0c604af209, type: 3}
---- !u!1 &167929667 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: e791e133869077e42a891c0c604af209,
-    type: 3}
-  m_PrefabInstance: {fileID: 167929666}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &206791956
 GameObject:
   m_ObjectHideFlags: 0

@@ -916,10 +910,10 @@ m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

@@ -938,7 +932,7 @@ serializedVersion: 3
   m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
-  m_PixelPerfect: 0
+  m_PixelPerfect: 1
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0

@@ -978,7 +972,7 @@ m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 1205581140867820227, guid: 74b130e74b71401439101ad1b2c8ef5e,
     type: 2}
-  m_audioClip: {fileID: 8300000, guid: 01ce975a9fb8de441a50994e7532b7e6, type: 3}
+  m_audioClip: {fileID: 8300000, guid: c80314c45830db140ba5b4c5d7490131, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1

@@ -1168,12 +1162,6 @@ value:
       objectReference: {fileID: 9100000, guid: 5271627ad1a99d04d88f7425c5225a5d, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e485f3dc514613549b02e97bf3b5f22a, type: 3}
---- !u!1 &592821885 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: e485f3dc514613549b02e97bf3b5f22a,
-    type: 3}
-  m_PrefabInstance: {fileID: 592821884}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &623659573
 GameObject:
   m_ObjectHideFlags: 0

@@ -1426,12 +1414,6 @@ value:
       objectReference: {fileID: 9100000, guid: ead22014aca6f5c489d5e7dd9c535e1b, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5962a190f89e23e4fb5d5aab52d4a135, type: 3}
---- !u!1 &667823987 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 5962a190f89e23e4fb5d5aab52d4a135,
-    type: 3}
-  m_PrefabInstance: {fileID: 667823986}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &739725458
 GameObject:
   m_ObjectHideFlags: 0

@@ -2156,11 +2138,6 @@ - {fileID: 1915303003}
   - {fileID: 294986808}
   - {fileID: 834880547}
   scoreText: {fileID: 309761772}
-  goodGuys:
-  - {fileID: 167929667}
-  - {fileID: 667823987}
-  - {fileID: 592821885}
-  - {fileID: 1508564974}
 --- !u!1 &1358492070
 GameObject:
   m_ObjectHideFlags: 0

@@ -2637,12 +2614,6 @@ value:
       objectReference: {fileID: 9100000, guid: 1086e1ec7ddef9e47913f5691f1f30f9, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bc1a40783bcef6b45b4793f3faad860d, type: 3}
---- !u!1 &1508564974 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: bc1a40783bcef6b45b4793f3faad860d,
-    type: 3}
-  m_PrefabInstance: {fileID: 1508564973}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1866069896
 GameObject:
   m_ObjectHideFlags: 0
M Assets/Scenes/Tutorial.unity → Assets/Scenes/Tutorial.unity 
@@ -360,6 +360,81 @@ type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 6769868182180520881, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6769868182469476527, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6769868182173309371, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6769868182180520882, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 43.69995
+      objectReference: {fileID: 0}
+    - target: {fileID: 6769868182469476512, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 43.69995
+      objectReference: {fileID: 0}
+    - target: {fileID: 6769868182173309372, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 43.69995
+      objectReference: {fileID: 0}
+    - target: {fileID: 8174944550152113831, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 1024893700303147876, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 476836062896294880, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 3553101760829369390, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 126108521905743222, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 8970084283381237129, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 3675139716283797659, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 1113776685816587180, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
+    - target: {fileID: 1156182254721149979, guid: 154d2c6885d09314ab1231d4519ee852,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: a3e762b00d63e6e43aeb396c6064106d, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 154d2c6885d09314ab1231d4519ee852, type: 3}
 --- !u!1001 &1776782249
M Assets/Scripts/Battle/Fighters/Brady.cs → Assets/Scripts/Battle/Fighters/Brady.cs 
@@ -18,6 +18,7 @@ }
     
     public override string Combat_AI()
     {
+        this.stats.MP = this.stats.MaxMP;
         bool output;
         int res;
         Ability ability;
M Assets/Scripts/Utility/GameMaster.cs → Assets/Scripts/Utility/GameMaster.cs 
@@ -49,9 +49,7 @@ initParty(partyNames);
 
         //create inventory
         inventory = new Inventory();
-        inventory.generateItem(new ItemInfo(new BottledBlessing(), 2));
-        inventory.generateItem(new ItemInfo(new BottledMiracle(), 1));
-        inventory.generateItem(new ItemInfo(new Potion(), 1));
+        inventory.generateItem(new ItemInfo(new BottledBlessing(), 1));
 
         SceneManager.sceneLoaded += sceneChanged;
     }
M Assets/Scripts/Utility/Stats.cs → Assets/Scripts/Utility/Stats.cs 
@@ -80,14 +80,13 @@ abilities.Add(new Defend());
                 break;
             case "Archer":
                 hp = maxHP = 400;
-                mp = maxMP = 400;
+                mp = maxMP = 200;
                 atk = maxATK = 30;
                 def = maxDEF = 50;
                 agl = maxAGL = 35;
                 lck = maxLCK = 40;
                 abilities.Add(new Defend());
                 abilities.Add(new Heal());
-                abilities.Add(new ReviveHalf());
                 break;
             case "Boxer":
                 hp = maxHP = 600;

@@ -105,9 +104,10 @@ atk = maxATK = 5;
                 def = maxDEF = 50;
                 agl = maxAGL = 32;
                 lck = maxLCK = 5;
+                abilities.Add(new Defend());
                 abilities.Add(new HealBig());
                 abilities.Add(new FireBall());
-                abilities.Add(new ReviveFull());
+                abilities.Add(new ReviveHalf());
                 break;
             case "Orc":
                 hp = maxHP = 700;

@@ -136,7 +136,7 @@ abilities.Add(new FireBall());
                 abilities.Add(new HealBig());
                 break;
             case "Ganfaul":
-                hp = maxHP = 2750;
+                hp = maxHP = 2000;
                 mp = maxMP = 660;
                 atk = maxATK = 55;
                 def = maxDEF = 60;
A Assets/Sounds/Music/Celtic Music - Prophecy.mp3 
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d85ba85bbed9f2e7b662750f85505b9fd80629630a0e5e55b8ea9547f0f8c4a0
+size 8040626
M Assets/Sounds/Music/John_Dreamer - Rise.mp3 → Assets/Sounds/Music/John Dreamer - Rise.mp3 

          

          

        
          

            

            
            
            
            M
            
          
          Assets/Sounds/Music/John_Dreamer - Rise.mp3.meta
          
            → 
            Assets/Sounds/Music/John Dreamer - Rise.mp3.meta
          
          
            

          

          

        
          

            

            
            
            D
            
            
          
          Assets/Sounds/Music/Xenoblade_Chronicles_OST_-_You_Will_Know_Our_Names.mp3
          
          
            
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9117db62bf9ce5c3a28bf17f3c15a4694edad7a4037fd3d0f3e9ae6907fd7a5
-size 2920686


          

          

        
          

            

            
            
            
            M
            
          
          Assets/Sounds/Music/Xenoblade_Chronicles_OST_-_You_Will_Know_Our_Names.mp3.meta
          
            → 
            Assets/Sounds/Music/Celtic Music - Prophecy.mp3.meta
          
          
            
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ae633889d7296254a9fef72803c16e6c
+guid: c80314c45830db140ba5b4c5d7490131
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6


          

          

        
          
        
          

            

            
            A
            
            
            
          
          Assets/Textures/icon.png
            
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79eb0837517387f57b3c1df08ebf39f98abb96c36ae175bb1ac14949d6f61bc3
+size 66110


          

          

        
          

            

            
            A
            
            
            
          
          Assets/Textures/icon.png.meta
            
@@ -0,0 +1,103 @@
+fileFormatVersion: 2
+guid: 76b0e7f282fe0314f8b4e19469c289fc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 


          

          

        
          

            

            
            
            
            M
            
          
          ProjectSettings/ProjectSettings.asset
          
            → 
            ProjectSettings/ProjectSettings.asset
          
          
            
@@ -275,7 +275,49 @@ androidGamepadSupportLevel: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
   resolutionDialogBanner: {fileID: 0}
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: Standalone
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 76b0e7f282fe0314f8b4e19469c289fc, type: 3}
+      m_Width: 1024
+      m_Height: 1024
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 512
+      m_Height: 512
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 256
+      m_Height: 256
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 64
+      m_Height: 64
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 32
+      m_Height: 32
+      m_Kind: 0
+    - serializedVersion: 2
+      m_Icon: {fileID: 0}
+      m_Width: 16
+      m_Height: 16
+      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone