diff --git a/assets/prefabs/BendingSkills.prefab b/assets/prefabs/BendingSkills.prefab new file mode 100644 index 0000000..568d7fc --- /dev/null +++ b/assets/prefabs/BendingSkills.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "BendingSkills", + "shortName": "ASBL", + "description": "Don't know if it really is useful. But well. Good enough", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/CuttingSkill.prefab b/assets/prefabs/CuttingSkill.prefab new file mode 100644 index 0000000..886943b --- /dev/null +++ b/assets/prefabs/CuttingSkill.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "CuttingSkills", + "shortName": "CS", + "description": "To improve your ability to slice things. Like potatoes or animalss", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/IDLE2.prefab b/assets/prefabs/IDLE2.prefab new file mode 100644 index 0000000..489aa03 --- /dev/null +++ b/assets/prefabs/IDLE2.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "IDLE2", + "shortName": "ASBL", + "description": "To be the incarnation of sloth", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/NotAnyIdea.prefab b/assets/prefabs/NotAnyIdea.prefab new file mode 100644 index 0000000..66c6dc1 --- /dev/null +++ b/assets/prefabs/NotAnyIdea.prefab @@ -0,0 +1,8 @@ +{ + "EventualSkillDescription": { + "name": "Dunno", + "shortName": "IDLE", + "description": "Increases laziness by 20% per level.", + "prerequisiteSkills": [] + } +} \ No newline at end of file diff --git a/assets/prefabs/ReadingSkills.prefab b/assets/prefabs/ReadingSkills.prefab new file mode 100644 index 0000000..952bd8f --- /dev/null +++ b/assets/prefabs/ReadingSkills.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "ReadingSkills", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/RidingSkills.prefab b/assets/prefabs/RidingSkills.prefab new file mode 100644 index 0000000..15bdaf4 --- /dev/null +++ b/assets/prefabs/RidingSkills.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "BikingSkills", + "shortName": "BKS", + "description": "Increase your handsomeness on every animals with four legs.", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill1.prefab b/assets/prefabs/Skill1.prefab new file mode 100644 index 0000000..5a3316c --- /dev/null +++ b/assets/prefabs/Skill1.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill1", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill2.prefab b/assets/prefabs/Skill2.prefab new file mode 100644 index 0000000..b6d95bf --- /dev/null +++ b/assets/prefabs/Skill2.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill2", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill3.prefab b/assets/prefabs/Skill3.prefab new file mode 100644 index 0000000..1a21cbc --- /dev/null +++ b/assets/prefabs/Skill3.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill3", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill4.prefab b/assets/prefabs/Skill4.prefab new file mode 100644 index 0000000..10916c6 --- /dev/null +++ b/assets/prefabs/Skill4.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill4", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill5.prefab b/assets/prefabs/Skill5.prefab new file mode 100644 index 0000000..6190876 --- /dev/null +++ b/assets/prefabs/Skill5.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill5", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill6.prefab b/assets/prefabs/Skill6.prefab new file mode 100644 index 0000000..6843636 --- /dev/null +++ b/assets/prefabs/Skill6.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill6", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill7.prefab b/assets/prefabs/Skill7.prefab new file mode 100644 index 0000000..5a3316c --- /dev/null +++ b/assets/prefabs/Skill7.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill1", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/Skill8.prefab b/assets/prefabs/Skill8.prefab new file mode 100644 index 0000000..5a3316c --- /dev/null +++ b/assets/prefabs/Skill8.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "Skill1", + "shortName": "RS", + "description": "For the intellectuals", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/prefabs/ThrowingSkills.prefab b/assets/prefabs/ThrowingSkills.prefab new file mode 100644 index 0000000..17c844d --- /dev/null +++ b/assets/prefabs/ThrowingSkills.prefab @@ -0,0 +1,10 @@ +{ + "EventualSkillDescription": { + "name": "ThrowingSkills", + "shortName": "TS", + "description": "Increase the speed and the range of the projectile. Can be useful if you want to show your anger", + "prerequisiteSkills": { + "ManualLaborEventualSkills:CraftingSkill": 3 + } + } +} \ No newline at end of file diff --git a/assets/ui/EventualSkillsTraining.ui b/assets/ui/EventualSkillsTraining.ui index 8ae496f..4e04d24 100644 --- a/assets/ui/EventualSkillsTraining.ui +++ b/assets/ui/EventualSkillsTraining.ui @@ -6,10 +6,13 @@ "contents": [ { "type": "RelativeLayout", + "contents": [ { "type": "UIBox", "layoutInfo": { + "width": 550, + "height": 500, "position-top": { "target": "TOP", "widget": "mainContent", @@ -35,10 +38,11 @@ { "type": "MigLayout", "id": "mainContent", - "colConstraints": "[100::200][10::200][min!]", "layoutInfo": { - "use-content-width": true, - "use-content-height": true, + "height" : 480, + "width" : 530, + "use-content-width": false, + "use-content-height": false, "position-vertical-center": {}, "position-horizontal-center": {} }, @@ -59,13 +63,14 @@ }, { "type": "MigLayout", + "rowConstraints": "[10::20]10[10::20]10[10::20]10[10::20]10[10::20]10[10::20]10[10::20]10[10::100]10[10::20]", "layoutInfo": { - "use-content-width": true, - "use-content-height": true, + "use-content-width": false, + "use-content-height": false, "position-vertical-center": {}, "position-horizontal-center": {} }, - "rowConstraints": "[min!][10::20][10::40]", + "layoutConstraints": "wrap 1, align left", "contents": [ { diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml new file mode 100644 index 0000000..a687f07 --- /dev/null +++ b/src/test/resources/logback-test.xml @@ -0,0 +1,39 @@ + + + + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + +