Skip to content

Commit

Permalink
IA and fixes
Browse files Browse the repository at this point in the history
IA turn manager first approach
IA attack implemented by max health value
TeamEditor fixed
CharacterScript fixed
Mouse over health bar fixed
Test scene changed
  • Loading branch information
WyrnCael committed Apr 10, 2018
1 parent 2723297 commit 88ae815
Show file tree
Hide file tree
Showing 29 changed files with 3,501 additions and 1,713 deletions.
4,283 changes: 2,711 additions & 1,572 deletions Assets/Scenes/test.unity

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions Assets/Soldier.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3}
m_Name: Soldier
m_EditorClassIdentifier:
realTexture: {fileID: 2800000, guid: 9b30d6f97a0696b4e8e605b97d99b1dc, type: 3}
nrows: 4
ncols: 9

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

16 changes: 16 additions & 0 deletions Assets/Soldier1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3}
m_Name: Soldier1
m_EditorClassIdentifier:
realTexture: {fileID: 2800000, guid: 550a814be0b480d459af1595d358b6b5, type: 3}
nrows: 4
ncols: 15

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

4 changes: 2 additions & 2 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ MonoBehaviour:
- name: Health
id: HP
description:
maxValue: 300
maxValue: 250
minValue: 0
value: 300
value: 250
isCore: 1
- name: Move Height
id: MVH
Expand Down
47 changes: 43 additions & 4 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,47 @@ MonoBehaviour:
name: NewCharacter(2)
inventory: {fileID: 0}
Slots: []
attributes: []
attributes:
- name: Health
id: HP
description:
maxValue: 250
minValue: 0
value: 250
isCore: 1
- name: Move Range
id: MVR
description:
maxValue: 4
minValue: 4
value: 4
isCore: 1
- name: Move Height
id: MVH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Attack Range
id: ATR
description:
maxValue: 3
minValue: 3
value: 3
isCore: 1
- name: AttackHeight
id: ATH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Agility
id:
description:
maxValue: 100
minValue: 0
value: 0
isCore: 1
specializedClass: []
height: 0
distance: 0
attackRange: 0
19 changes: 13 additions & 6 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(3).asset
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ MonoBehaviour:
- name: Health
id: HP
description:
maxValue: 3
minValue: 3
value: 3
maxValue: 300
minValue: 0
value: 300
isCore: 1
- name: Move Range
id: MVR
Expand All @@ -39,9 +39,9 @@ MonoBehaviour:
- name: Attack Range
id: ATR
description:
maxValue: 3
minValue: 3
value: 3
maxValue: 20
minValue: 0
value: 10
isCore: 1
- name: AttackHeight
id: ATH
Expand All @@ -50,4 +50,11 @@ MonoBehaviour:
minValue: 2
value: 2
isCore: 1
- name: Agility
id:
description:
maxValue: 100
minValue: 0
value: 0
isCore: 1
specializedClass: []
47 changes: 43 additions & 4 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,47 @@ MonoBehaviour:
name: NewCharacter(4)
inventory: {fileID: 0}
Slots: []
attributes: []
attributes:
- name: Health
id: HP
description:
maxValue: 300
minValue: 0
value: 250
isCore: 1
- name: Move Range
id: MVR
description:
maxValue: 4
minValue: 4
value: 4
isCore: 1
- name: Move Height
id: MVH
description:
maxValue: 8
minValue: 0
value: 8
isCore: 1
- name: Attack Range
id: ATR
description:
maxValue: 20
minValue: 3
value: 5
isCore: 1
- name: AttackHeight
id: ATH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Agility
id:
description:
maxValue: 100
minValue: 0
value: 0
isCore: 1
specializedClass: []
height: 0
distance: 0
attackRange: 0
47 changes: 43 additions & 4 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,47 @@ MonoBehaviour:
name: NewCharacter(5)
inventory: {fileID: 0}
Slots: []
attributes: []
attributes:
- name: Health
id: HP
description:
maxValue: 300
minValue: 0
value: 300
isCore: 1
- name: Move Range
id: MVR
description:
maxValue: 4
minValue: 4
value: 4
isCore: 1
- name: Move Height
id: MVH
description:
maxValue: 8
minValue: 0
value: 8
isCore: 1
- name: Attack Range
id: ATR
description:
maxValue: 20
minValue: 3
value: 5
isCore: 1
- name: AttackHeight
id: ATH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Agility
id:
description:
maxValue: 100
minValue: 0
value: 0
isCore: 1
specializedClass: []
height: 0
distance: 0
attackRange: 0
47 changes: 43 additions & 4 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(6).asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,47 @@ MonoBehaviour:
name: NewCharacter(6)
inventory: {fileID: 0}
Slots: []
attributes: []
attributes:
- name: Health
id: HP
description:
maxValue: 300
minValue: 0
value: 300
isCore: 1
- name: Move Range
id: MVR
description:
maxValue: 4
minValue: 4
value: 4
isCore: 1
- name: Move Height
id: MVH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Attack Range
id: ATR
description:
maxValue: 3
minValue: 3
value: 3
isCore: 1
- name: AttackHeight
id: ATH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Agility
id:
description:
maxValue: 100
minValue: 0
value: 0
isCore: 1
specializedClass: []
height: 0
distance: 0
attackRange: 0
47 changes: 43 additions & 4 deletions Assets/TRPGMaker/Database/Characters/NewCharacter(7).asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,47 @@ MonoBehaviour:
name: NewCharacter(7)
inventory: {fileID: 0}
Slots: []
attributes: []
attributes:
- name: Health
id: HP
description:
maxValue: 300
minValue: 0
value: 300
isCore: 1
- name: Move Range
id: MVR
description:
maxValue: 4
minValue: 4
value: 4
isCore: 1
- name: Move Height
id: MVH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Attack Range
id: ATR
description:
maxValue: 3
minValue: 3
value: 3
isCore: 1
- name: AttackHeight
id: ATH
description:
maxValue: 2
minValue: 2
value: 2
isCore: 1
- name: Agility
id:
description:
maxValue: 100
minValue: 0
value: 0
isCore: 1
specializedClass: []
height: 0
distance: 0
attackRange: 0
11 changes: 6 additions & 5 deletions Assets/TRPGMaker/Database/Database.asset
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ MonoBehaviour:
- name: Health
id: HP
description:
maxValue: 3
minValue: 3
value: 3
maxValue: 300
minValue: 0
value: 300
isCore: 1
- name: Move Range
id: MVR
description:
maxValue: 4
minValue: 4
minValue: 0
value: 4
isCore: 1
- name: Move Height
Expand Down Expand Up @@ -89,7 +89,8 @@ MonoBehaviour:
- {fileID: 11400000, guid: 496024b31fb8d604ba8b12317f0d4762, type: 2}
- {fileID: 11400000, guid: bac31a58c9f786c4a9d5b67034ba5482, type: 2}
teams:
- {fileID: 11400000, guid: c7870a66a01c2a54e90fa9d468b19807, type: 2}
- {fileID: 11400000, guid: 6997cfd5caffcfe4c874c9f0ac22d59b, type: 2}
- {fileID: 11400000, guid: 6c8f21e3fb66c0346a2b2cc371eb3219, type: 2}
_TRPGOptions:
_gameType: 0
_turnType: 0
Expand Down
Loading

0 comments on commit 88ae815

Please sign in to comment.