Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Popup asset configuration #52

Merged
merged 16 commits into from
May 24, 2022
Merged

Conversation

mhawryluk
Copy link
Collaborator

Description

Checklist

  • Included code to test these changes
  • Updated Jira

mhawryluk and others added 15 commits May 17, 2022 16:56
* feat: bound crossing is working

* chore: use more precise teleport

* fix: strange direction vector fix

* refact: remove redundant whitespace

* refact: remove redundant whitespace

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
* chore: created action for battle

* Update src/test/java/io/rpg/battle/BattleTest.java

Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>

* Update src/test/java/io/rpg/battle/BattleTest.java

Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>

* Update src/test/java/io/rpg/battle/BattleTest.java

Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>

* fix: removed player from battleAction

Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
* chore: add @NotNull annotation for Stage param in Initializer#ctor

This object is created by JavaFX and can not be null rn.

* chore: add ErrorMessageBuilder

Util class for comfort only. Allows easier construction of error
messages.

* refact: make use of ErrorMessageBuilder

* refact: move object description creation to separate class

* chore: add protype for ActionConfig

* chore: chanage actionTypeString field name in JSON to type

* docs: add docs for root.json file

* docs: add configuration docs

This is initial version. Many fixes & upgrades are still required. Feel
free to comment / develop.

* refact: Main

These changes should not be commited here, but I had to...

* chore: add no-args factory methods to Result class

* refact: rename Result#error -> Result#err

* refact: rename Result#getErrorValue -> Result#getErrValue

* refact: rename Result#isError -> Result#isErr

* docs: add missing JavaDoc comments in Result class

* chore: change nullability of result value in Result class

This is handy as IntelliJ can not detect that returned value is not null
after result has been checked with isOkValueNull...
This can be pulled off now, as isErrorValueNull && isOkValueNull methods
are exposed.

* chore: extend pool of working serialized names for config files

* feat: add detection of locations based on locations directory

* chore: add dependency on apache commons I/O

for removeExtension method

* chore: bump dependencies versions

* chore: add object externally declared in demo-config

* fix: data object description generation

* feat: allow for external object & location config specification

* chore: return error when object config loading fails

* chore: add better error handlig in object creation

* chore: remove binding between object-type and performed action

* fix: merge artifact

* chore: remove redundatn action type check

* feat: add more specific event types

onClick, onLeftClick, onRightClick

* chore: add description field to GamebObjectConfig

* refact: remove whitespace in GameEndAction

* chore: add possibility to update description

* chore: remove final modiers from ActionConfig

* feat: add before & after action hooks

* chore: update docs

* chore: remove leftover enum GameObject.Type

As there are no longer GameObject types (we moved towards action defined
    behaviours) this enum type is redundant

* feat: add fields for modeling all available action types (as for now)

* refact: rename ActionConfig -> ActionConfigBundle

* chore: add ActionType enum

* feat: add stub validation mdethods in ActionConfigBundle

* chore: change type of actionType field from String to ActionType (enum)

* fix: GameObject factory method

* chore: initial implementation of ActionFactory

* feat: add missing position field to ActionConfigBundle

* chore: add ActionFactory version alpha

* fix: open io.rpg.model.actions to google.gson

* fix: remove invalid assertion

* feat: set actions on actual GameObjects

* chore: add alternate name for question field in Question

* docs: update docs

* chore: remove comment

Text is already being loaded from config

* fix: add missing getStrength method

* fix: handle null config for action
Merge branch 'development' into @mhawryluk/RPG-7-popup-asset-config
@mhawryluk mhawryluk requested a review from kkafar as a code owner May 24, 2022 08:16
@kkafar kkafar changed the title @mhawryluk/rpg 7 popup asset config feat: Popup asset configuration May 24, 2022
Copy link
Collaborator

@kkafar kkafar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome

@kkafar kkafar merged commit cd840e6 into master May 24, 2022
@kkafar kkafar deleted the @mhawryluk/RPG-7-popup-asset-config branch May 24, 2022 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants