Skip to content

Commit

Permalink
Skills in-game panel
Browse files Browse the repository at this point in the history
Skills panel in-game
Fixed: formulas only taking attributtes defined in slots
Fixed: in-game attribute value taked from formulas
  • Loading branch information
WyrnCael committed May 18, 2018
1 parent b19eb43 commit fe663c3
Show file tree
Hide file tree
Showing 23 changed files with 376 additions and 79 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ obj/
*.unityproj
*.booproj
.vs/TRPGMaker/xs/UserPrefs.xml
.vs/*

# ============ #
# OS generated #
Expand Down
24 changes: 12 additions & 12 deletions Assets/Scenes/test.unity
Original file line number Diff line number Diff line change
Expand Up @@ -16088,8 +16088,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
team: {fileID: 0}
character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
--- !u!114 &494325675
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -20933,8 +20933,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
team: {fileID: 0}
character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
--- !u!114 &651502395
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -34782,8 +34782,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
team: {fileID: 0}
character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
--- !u!114 &909185162
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -38924,8 +38924,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
team: {fileID: 0}
character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
--- !u!114 &1054756145
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -41551,8 +41551,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
team: {fileID: 0}
character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
--- !u!114 &1140926019
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -56883,8 +56883,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
team: {fileID: 0}
character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
--- !u!114 &1573021072
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/TRPGMaker/Database/Attributes.meta

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

17 changes: 17 additions & 0 deletions Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%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: f7f1e8c1c34b233449ea2318f93532d9, type: 3}
m_Name: New Attribute 000
m_EditorClassIdentifier:
name: New Attribute 000
id: X00
description:
isCore: 1

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

17 changes: 17 additions & 0 deletions Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%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: f7f1e8c1c34b233449ea2318f93532d9, type: 3}
m_Name: New Attribute 001
m_EditorClassIdentifier:
name: New Attribute 001
id: X01
description:
isCore: 1
10 changes: 10 additions & 0 deletions Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset.meta

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

17 changes: 17 additions & 0 deletions Assets/TRPGMaker/Database/Attributes/New Attribute 002.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%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: f7f1e8c1c34b233449ea2318f93532d9, type: 3}
m_Name: New Attribute 002
m_EditorClassIdentifier:
name: New Attribute 002
id: X02
description:
isCore: 0
10 changes: 10 additions & 0 deletions Assets/TRPGMaker/Database/Attributes/New Attribute 002.asset.meta

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.meta

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

49 changes: 49 additions & 0 deletions Assets/TRPGMaker/Database/Characters/NewCharacter.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
%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: 2d9fb3b8c5fa23c4e8313ab14ed5bdb8, type: 3}
m_Name: NewCharacter
m_EditorClassIdentifier:
name: NewCharacter
inventory: {fileID: 0}
Slots:
- slotType:
slotName:
_modifier: {fileID: 11400000, guid: 242d1289cf2bba54c88d032eafa8eec4, type: 2}
calculatedFormula: 1
attributes:
- _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
maxValue: 20
minValue: 0
value: 20
- _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
maxValue: 23
minValue: 0
value: 21
- _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
maxValue: 0
minValue: 0
value: 0
attributesWithFormulas:
- _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
maxValue: 0
minValue: 0
value: 0
- _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
maxValue: 0
minValue: 0
value: 21
- _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
maxValue: 0
minValue: 0
value: 0
specializedClasses:
- {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
specializedClassesCount: 1
10 changes: 10 additions & 0 deletions Assets/TRPGMaker/Database/Characters/NewCharacter.asset.meta

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

26 changes: 16 additions & 10 deletions Assets/TRPGMaker/Database/Database.asset
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ac61a1063e08024ab3d5b8eb07b7b40, type: 3}
m_Name: Database
m_EditorClassIdentifier:
attributes: []
attributes:
- {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
- {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
- {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
tags: []
slotTypes:
- slotName: Hand
items:
- {fileID: 11400000, guid: 242d1289cf2bba54c88d032eafa8eec4, type: 2}
- {fileID: 11400000, guid: 4c69bdc0758205346836ff1ddb49b90d, type: 2}
- {fileID: 11400000, guid: 7182cd41f7eb67743a3612a0fd7c9ac5, type: 2}
specializedClasses: []
characters: []
teams: []
specializedClasses:
- {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
characters:
- {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
teams:
- {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
skills: []
_TRPGOptions:
_gameType: 0
_turnType: 0
_healthAttribute: {fileID: 0}
_damageAttribute: {fileID: 0}
_moveRange: {fileID: 0}
_moveHeight: {fileID: 0}
_attackRange: {fileID: 0}
_attackHeight: {fileID: 0}
_healthAttribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
_damageAttribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
_moveRange: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
_moveHeight: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
_attackRange: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
_attackHeight: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
4 changes: 2 additions & 2 deletions Assets/TRPGMaker/Database/SpecializedClasses.meta

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

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_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4cfe1e2b18c9494b8e22325c9a32ff7, type: 3}
m_Name: NewSpecializedClass
m_EditorClassIdentifier:
name: New Specialized Class
tags: []
slots: []
attributes:
- _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
maxValue: 0
minValue: 0
value: 0
formula: {fileID: 0}
skills: []

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/Teams.meta

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

18 changes: 18 additions & 0 deletions Assets/TRPGMaker/Database/Teams/NewTeam.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%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: 4a7b1fcdece9778478b2575993f98a72, type: 3}
m_Name: NewTeam
m_EditorClassIdentifier:
name: NewTeam
id: 0
characters:
- {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
playable: 1
10 changes: 10 additions & 0 deletions Assets/TRPGMaker/Database/Teams/NewTeam.asset.meta

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

Loading

0 comments on commit fe663c3

Please sign in to comment.