Skip to content

Commit

Permalink
New Toyos & Attacks, UI revamp, effects added
Browse files Browse the repository at this point in the history
-  Changed the battle UI
- Added more toyos and attacks, added effects to many attacks
  • Loading branch information
MoAzza98 committed Oct 12, 2023
1 parent 95c7f12 commit dfa35d4
Show file tree
Hide file tree
Showing 1,204 changed files with 159,326 additions and 964 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -164,19 +164,19 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: isDead
m_Type: 4
- m_Name: isHurt
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: isHurt
- m_Name: Casted
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Casted
- m_Name: Fainted
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
Expand Down Expand Up @@ -521,7 +521,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isDead
m_ConditionEvent: Fainted
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4068963660412557787}
Expand Down
12 changes: 8 additions & 4 deletions ToyoWorld/Assets/Game/Map Area.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 929499299132377468}
m_LocalRotation: {x: -0, y: -0.07004936, z: -0, w: 0.9975435}
m_LocalRotation: {x: 0, y: -0.07005254, z: 0, w: 0.9975434}
m_LocalPosition: {x: -13.50855, y: 11.93, z: -4.9330373}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Expand Down Expand Up @@ -59,8 +59,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 20.111818, y: 0.58778286, z: 10.827016}
m_Center: {x: 0, y: 0, z: -3.4707778}
m_Size: {x: 2, y: 2, z: 2}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &929499299132377464
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -77,9 +77,13 @@ MonoBehaviour:
- _base: {fileID: 11400000, guid: d31c6f72ff87779479154004af0c3be8, type: 2}
level: 5
- _base: {fileID: 11400000, guid: 367b69783d687164c8b3bd6e73c75f0d, type: 2}
level: 3
level: 4
- _base: {fileID: 11400000, guid: 66a117fce3f63c44aa83ceac320559b0, type: 2}
level: 5
- _base: {fileID: 11400000, guid: 8a0a3b15aa5c3d741a5b863fa90170a9, type: 2}
level: 5
- _base: {fileID: 11400000, guid: 3b62de8f0c738a5449b76631eacfa326, type: 2}
level: 7
--- !u!114 &929499299132377467
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29329,7 +29329,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3859912956259880029}
m_LocalRotation: {x: 0.3952979, y: 0.13189255, z: -0.05746904, w: 0.90721625}
m_LocalRotation: {x: 0.44518426, y: -0.23795027, z: 0.12399941, w: 0.854292}
m_LocalPosition: {x: 0, y: 23.554, z: 0.91}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19553,7 +19553,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7898358583556127077}
m_LocalRotation: {x: -0.2227184, y: -0.24381913, z: -0.05763798, w: 0.9421394}
m_LocalRotation: {x: -0.12013184, y: 0.13592587, z: 0.016606888, w: 0.9832684}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4907,7 +4907,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4513577245308850534}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0.2227184, y: -0.24381913, z: -0.05763798, w: 0.9421394}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Expand Down
24 changes: 24 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Challengers Strike.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Challengers Strike
m_EditorClassIdentifier:
moveName: Challenging Strike
description: The user strikes with immense energy, gauging their enemies power
level.
toyoType: 9
power: 120
accuracy: 100
pp: 10
isSpecial: 0
effect: {fileID: 3902912774187533837, guid: 395ef30debd76e842ac533ec3e5e76e2, type: 3}
_moveDestnation: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ToyoWorld/Assets/Game/Resources/Moves/Cleave.asset
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ MonoBehaviour:
accuracy: 100
pp: 25
isSpecial: 1
effect: {fileID: 3852037998298651247, guid: a4ca672ee3a938b48b158da19fb8c4fa, type: 3}
effect: {fileID: 5419247265236760002, guid: 7674c434b873331489aad47dcee6be62, type: 3}
_moveDestnation: 1
23 changes: 23 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Constrict.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Constrict
m_EditorClassIdentifier:
moveName: Constrict
description: The user constricts the enemy in wild thorns, damaging them.
toyoType: 5
power: 85
accuracy: 100
pp: 25
isSpecial: 0
effect: {fileID: 1094166033481867202, guid: 4ccd078ce01728f429fffb63637ca1a2, type: 3}
_moveDestnation: 1
8 changes: 8 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Constrict.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Dark Doctrine.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Dark Doctrine
m_EditorClassIdentifier:
moveName: Dark Doctrine
description: The user invokes dark thoughts, sharply boosting their special attack.
toyoType: 13
power: 0
accuracy: 0
pp: 0
isSpecial: 0
effect: {fileID: 0}
_moveDestnation: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Dark Wish.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Dark Wish
m_EditorClassIdentifier:
moveName: DarkWish
description: The user makes a forbidden wish. This moves accuracy is low, but the
damage is devastating.
toyoType: 10
power: 270
accuracy: 5
pp: 20
isSpecial: 1
effect: {fileID: 6589385767113089740, guid: 812a6c69288c13f4fa7b428833d56769, type: 3}
_moveDestnation: 1
8 changes: 8 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Dark Wish.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ToyoWorld/Assets/Game/Resources/Moves/Digitize.asset
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ MonoBehaviour:
accuracy: 100
pp: 10
isSpecial: 1
effect: {fileID: 6353739613531823181, guid: 89aaee91c333aaa408009b4a124a96a2, type: 3}
effect: {fileID: 2748775980906258134, guid: 3ad8f777eafd3804abea8c50bfe3ff7c, type: 3}
_moveDestnation: 1
2 changes: 1 addition & 1 deletion ToyoWorld/Assets/Game/Resources/Moves/Dismantle.asset
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ MonoBehaviour:
accuracy: 65
pp: 10
isSpecial: 1
effect: {fileID: 8087117292999587842, guid: 6cfdeb0ab68dcbd41926a44217e676af, type: 3}
effect: {fileID: 5912743102478726200, guid: 8cdd983bc8b8cff4282de83a1f209cc2, type: 3}
_moveDestnation: 1
24 changes: 24 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Final Gamble.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Final Gamble
m_EditorClassIdentifier:
moveName: Final Gamble
description: The user assumes a risky stance, striking with 110% of their power.
This moves accuracy is low.
toyoType: 1
power: 200
accuracy: 20
pp: 5
isSpecial: 0
effect: {fileID: 8765350373887584717, guid: ef01e2b1f85c37f4da9696822a685f10, type: 3}
_moveDestnation: 1
8 changes: 8 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Final Gamble.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ToyoWorld/Assets/Game/Resources/Moves/Flame Lash.asset
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ MonoBehaviour:
accuracy: 100
pp: 15
isSpecial: 1
effect: {fileID: 7898358583556127077, guid: e95e72535ed275d40a4e26804e329db6, type: 3}
effect: {fileID: 4597925975597660890, guid: 525129ba94e0e9b48b8cddca7e08b0f0, type: 3}
_moveDestnation: 1
24 changes: 24 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Floating point.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Floating point
m_EditorClassIdentifier:
moveName: Floating Point
description: The user attacks the enemy with digital precision, causing them to
take focused damage.
toyoType: 6
power: 85
accuracy: 90
pp: 20
isSpecial: 1
effect: {fileID: 6353739613531823181, guid: 89aaee91c333aaa408009b4a124a96a2, type: 3}
_moveDestnation: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ToyoWorld/Assets/Game/Resources/Moves/Granite Slam.asset
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ MonoBehaviour:
accuracy: 100
pp: 15
isSpecial: 0
effect: {fileID: 6353739613531823181, guid: 89aaee91c333aaa408009b4a124a96a2, type: 3}
effect: {fileID: 6620966694190176761, guid: 5553949e1595f7748aaa4583fece2ecd, type: 3}
_moveDestnation: 1
24 changes: 24 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Ice Crash.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Ice Crash
m_EditorClassIdentifier:
moveName: Ice Crash
description: The user hurtles endless icicles at the enemy, greatly damaging them
and slowing them
toyoType: 11
power: 120
accuracy: 70
pp: 15
isSpecial: 1
effect: {fileID: 6271983290402428565, guid: f3815a26ca0da534b997342265e6e6ee, type: 3}
_moveDestnation: 1
8 changes: 8 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Ice Crash.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Ice Edge.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04eac5d006ef6344f9dbee1c4a7844ed, type: 3}
m_Name: Ice Edge
m_EditorClassIdentifier:
moveName: Ice Edge
description: The user slashes at the enemy with sharpened ice, dealing cutting
damage
toyoType: 11
power: 75
accuracy: 100
pp: 20
isSpecial: 0
effect: {fileID: 5113482876390019511, guid: 7790f51da6c60a1439bfd51e32596ec6, type: 3}
_moveDestnation: 1
8 changes: 8 additions & 0 deletions ToyoWorld/Assets/Game/Resources/Moves/Ice Edge.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dfa35d4

Please sign in to comment.