Repair action & resource bundle #672

MaanooAk · 2016-11-27T17:29:55Z

Repair of units based on the doc/reverse_engineering/repair.md (file in pull request).

In order to continue:

~~A data structure for multiple resource costs should be implemented (game_resource_bundle ?)~~
The cost of the unit should be stored somewhere (inside unt_type ?)

~~Can I implement these? or just leave as it is and revisit after the nyan revolution?~~

EDIT: Also game_resource_bundle should replace the game_resource type, int value couples all over the place.

MaanooAk · 2016-11-27T17:30:53Z

libopenage/unit/action.cpp

-	    this->entity->has_attribute(attr_type::owner) &&
-	    this->entity->has_attribute(attr_type::attack) &&
-	    this->entity->get_attribute<attr_type::attack>().stance != attack_stance::do_nothing) {
+					this->entity->has_attribute(attr_type::owner) &&


Fixed these in the next commit

MaanooAk · 2016-11-27T19:34:52Z

ResourceBoundle could be like this (gist). Check the main for how its used.

EDIT: Closed it by accident...

MaanooAk · 2016-12-05T16:29:48Z

Implemented a ResourceBundle class and used it in player (kept old one with raw type and amount) and unit repair.

Next step is to add somewhere (unit type, unit attributes, ?) the cost of the unit. I have zero confidence implementing that so this is as far I can go (= removing WIP).

TheJJ · 2016-12-23T01:47:00Z

Sorry for the delay, university has kept me very busy (http://www.move2space.de/MOVE-II/)...

However, I just tested your code and I couldn't get my villagers to repair their town center or mill.

The resource bundle is a good idea, as it's capable of adding resource types at runtime easily. We'll need that in the future.

The cost of the unit is drawn from the gamedata of course, which is accessible through the std::vector<gamedata::empiresdat> gamedata; in libopenage/gamestate/game_spec.cpp. But this is all going to be replaced by nyan. But nyan is still quite far from being ready so adding just another dirty hardcoding for it is ok. You'll find the structure of that struct in openage/convert/gamedata where we extract it.

MaanooAk · 2016-12-23T10:24:37Z

I added the repair ability, that should do the work. I added and some other missing abilities while I was there.
And I implemented the repair gui button.

TheJJ

Looks good apart from minor stuff.

As we have quite a few ...Ability and ...Action classes, i think it might be time to pack those together in a separate namespace, so we have names like ability::Heal and action::Repair. This should reduce the verbosity a bit.

TheJJ · 2016-12-23T12:09:03Z

libopenage/unit/ability.cpp

+}
+
+void ConvertAbility::invoke(Unit &to_modify, const Command &cmd, bool play_sound) {
+	to_modify.log(MSG(dbg) << "invoke repair action");


copypasta :)

TheJJ · 2016-12-23T12:10:44Z

libopenage/unit/ability.h


+/*
+ * initiates a repair action when given a valid target
+ */


pls write /** so it's parsed by doxygen

TheJJ · 2016-12-23T12:11:05Z

libopenage/unit/ability.h

+
+/*
+ * initiates a heal action when given a valid target
+ */


TheJJ · 2016-12-23T12:11:17Z

libopenage/unit/ability.h

+ * initiates a research
+ * TODO implement
+ */
+class ResearchAbility: public UnitAbility {


TheJJ · 2016-12-23T12:11:25Z

libopenage/unit/ability.h

+ * initiates a patrol action when given a valid target
+ * TODO implement
+ */
+class PatrolAbility: public UnitAbility {


TheJJ · 2016-12-23T12:11:34Z

libopenage/unit/ability.h

+/*
+ * initiates a convert action when given a valid target
+ */
+class ConvertAbility: public UnitAbility {


TheJJ · 2016-12-23T12:12:49Z

libopenage/unit/action.h

+	float time;
+	float time_left;
+
+	ResourceBundle cost; // calculate and store the cost in the constructor


you can write /** stores the cost of the repair */ or whatever is more suitable above it so it's parsed by doxygen, too.

MaanooAk · 2016-12-23T12:42:24Z

The separate namespace should be done with a refactoring tool.
However I think the way attribute classes are defined is nice too.

TheJJ · 2016-12-28T11:27:31Z

You mean templating the attributes? Yes, could also be done :)
Do whatever you like better and think suits us more.

Shall I merge your stuff before that or do you wanna integrate it also in this pull?

MaanooAk · 2016-12-28T11:39:55Z

You should merge this (do you want me to rebase?)
I'm thinking of fixing the attributes first (more like #651) if that's ok.

TheJJ · 2016-12-28T19:35:41Z

No I don't think you need to rebase, it doesn't conflict with the master.
@ attributes, sure go ahead! It's another basic foundation for the game logic.

MaanooAk · 2016-12-29T23:22:08Z

I just realized I'm creating a ton of conflicts in my new pr (#683) with this one...
Can you merge this or you are not sure yet, can I do something?

TheJJ

I still can't get it to work, and I think it is because you don't add the repair ability to the villagers. Or does it work for you some other way?

TheJJ · 2016-12-30T11:42:42Z

libopenage/unit/ability.cpp

+}
+
+void HealAbility::invoke(Unit &to_modify, const Command &cmd, bool play_sound) {
+	to_modify.log(MSG(dbg) << "invoke repair action");


still the wrong message here

MaanooAk · 2016-12-30T12:34:30Z

I see... Just leave it, I will investigate and come back to you.
~~(May take some time, I have some serious Ubuntu craziness happening right now)~~

MaanooAk · 2016-12-30T20:52:28Z

Added the ability, added 1000 of each res to players (so they can repair) and made gaia the Gaia player (prev: name1 was Gaia and gaia was some civ)

(I will start testing more extensively before removing the WIP)

yani · 2016-12-31T09:33:02Z

I'd like to add to this that there's a bug in the original game which still exists where you can repair (and garrison) a building from a diagonal location. It's called the wall corner glitch and I'm wondering if this bug also exists within openage and if it should either be fixed, or stay exactly the same.

TheJJ · 2016-12-31T09:50:46Z

@Yanikore I think we'll have the same problem right now because we don't have any blocking physics currently, the pathfinder is really stupid and doesn't account for that. Go and help out at #366 :)

yani · 2016-12-31T10:13:02Z

@TheJJ I'd love to help out but I'm not capable for the C++/python side of this. I'm more a PHP developer than anything so I'll probably help out in the future when a website gets made. Right now I can only add some conceptual ideas to the situation.

TheJJ · 2016-12-31T14:25:48Z

yay it works :)
thank you very much @MaanooAk !

MaanooAk commented Nov 27, 2016

View reviewed changes

MaanooAk closed this Nov 27, 2016

MaanooAk reopened this Nov 27, 2016

TheJJ added lang: c++ Done in C++ code nice new thing ☺ A new feature that was not there before labels Dec 2, 2016

MaanooAk changed the title ~~[WIP] Repair action~~ Repair action & resource bundle Dec 5, 2016

MaanooAk force-pushed the repair branch from 3f0b518 to 5b3fcad Compare December 10, 2016 21:42

MaanooAk added 11 commits December 23, 2016 11:18

Added Repair doc

ef01bab

Repair basics

04c43d4

Comments and fixes

4285804

ResourceBoundle first draft

498253d

Resource bundle normalize

f6de08c

Resources in doubles and typos

60de7b6

Use ResourceBundle in player

0a9abf5

Use ResourceBundle in unit repair

eb9b0c5

Added reapir ability

31032a8

Changed repair ability button

2fd4341

Added missing abilities

7b1ecfc

MaanooAk force-pushed the repair branch from 5b3fcad to 7b1ecfc Compare December 23, 2016 10:22

TheJJ requested changes Dec 23, 2016

View reviewed changes

Doc additions

d68ad1f

TheJJ approved these changes Dec 28, 2016

View reviewed changes

TheJJ reviewed Dec 30, 2016

View reviewed changes

Player initial resources

34ac588

TheJJ merged commit 4330be8 into SFTtech:master Dec 31, 2016

MaanooAk deleted the repair branch December 31, 2016 15:09

Uh oh!

Repair action & resource bundle #672

Repair action & resource bundle #672

Uh oh!

Conversation

MaanooAk commented Nov 27, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaanooAk commented Nov 27, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MaanooAk commented Dec 5, 2016

Uh oh!

TheJJ commented Dec 23, 2016

Uh oh!

MaanooAk commented Dec 23, 2016

Uh oh!

TheJJ left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaanooAk commented Dec 23, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TheJJ commented Dec 28, 2016

Uh oh!

MaanooAk commented Dec 28, 2016

Uh oh!

TheJJ commented Dec 28, 2016

Uh oh!

MaanooAk commented Dec 29, 2016

Uh oh!

TheJJ left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaanooAk commented Dec 30, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MaanooAk commented Dec 30, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yani commented Dec 31, 2016

Uh oh!

TheJJ commented Dec 31, 2016

Uh oh!

yani commented Dec 31, 2016

Uh oh!

TheJJ commented Dec 31, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MaanooAk commented Nov 27, 2016 •

edited

Loading

MaanooAk commented Nov 27, 2016 •

edited

Loading

MaanooAk commented Dec 23, 2016 •

edited

Loading

MaanooAk commented Dec 30, 2016 •

edited

Loading

MaanooAk commented Dec 30, 2016 •

edited

Loading

TheJJ commented Dec 31, 2016 •

edited

Loading