diff options
| author | Nao Pross <naopross@thearcway.org> | 2018-02-16 21:11:12 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2018-02-16 21:11:12 +0100 |
| commit | eb74c43d4cd2526c513b1861d3daf01d12c63054 (patch) | |
| tree | 41364f3aebb1834273a6fe483ca95bd7d4e21340 /src/main | |
| parent | Add basic widget implementation (not usable) and configure cmake (diff) | |
| parent | Add resources xml templates, call Scene::click on mouseclick (diff) | |
| download | Subconscious-old-eb74c43d4cd2526c513b1861d3daf01d12c63054.tar.gz Subconscious-old-eb74c43d4cd2526c513b1861d3daf01d12c63054.zip | |
Merge branch 'dev' of ssh://git.thearcway.org:2222/naopross/subconscious into dev
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/cpp/Subconscious.cpp | 1 | ||||
| -rw-r--r-- | src/main/resources/effects/effects_template.xml | 11 | ||||
| -rw-r--r-- | src/main/resources/items/items_template.xml | 55 |
3 files changed, 67 insertions, 0 deletions
diff --git a/src/main/cpp/Subconscious.cpp b/src/main/cpp/Subconscious.cpp index 5d04e5c..f1d4e79 100644 --- a/src/main/cpp/Subconscious.cpp +++ b/src/main/cpp/Subconscious.cpp @@ -67,6 +67,7 @@ void Subconscious::run() /*** Mouse Events ***/ case sf::Event::MouseButtonPressed: + _currentScene->click(event.mouseButton); break; case sf::Event::MouseButtonReleased: diff --git a/src/main/resources/effects/effects_template.xml b/src/main/resources/effects/effects_template.xml new file mode 100644 index 0000000..fe577b0 --- /dev/null +++ b/src/main/resources/effects/effects_template.xml @@ -0,0 +1,11 @@ +<!-- EFFECTS +Available modifications: + - speed + - attackDamage +--!> + +<effect modifies=""> + <name></name> + <value></value> +</effect> + diff --git a/src/main/resources/items/items_template.xml b/src/main/resources/items/items_template.xml new file mode 100644 index 0000000..0810f45 --- /dev/null +++ b/src/main/resources/items/items_template.xml @@ -0,0 +1,55 @@ +<!-- ITEMS +Available item types: + - stick + - weapon + - medicine + - food +--!> + +<item type=""> + <name></name> + <maxAmount></maxAmount> +</item> + + +<item type="stick"> + <!-- item --!> + <name></name> + <maxAmount></maxAmount> + + <!-- stick --!> + <requiredLevel></reqiredLevel> + <requiredClass>Wizard</requiredClass> +</item> + + +<item type="medicine"> + <!-- item --!> + <name></name> + <maxAmount></maxAmount> + + <!-- medicine --!> + <heal></heal> + <requiredLevel></reqiredLevel> +</item> + + +<item type="food"> + <!-- item --!> + <name></name> + <maxAmount></maxAmount> + + <!-- food --!> + <heal></heal> +<\item> + + +<item type="weapon"> + <!-- item --!> + <name></name> + <maxAmount></maxAmount> + + <!-- weapon --!> + <damage></damage> + <requiredLevel></reqiredLevel> +</item> |