Skip to content

Commit fe0e630

Browse files
committed
gamestate: Add missing definitions for already implemented abilities.
1 parent 5ea4b34 commit fe0e630

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

libopenage/gamestate/api/definitions.h

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,30 @@ namespace openage::gamestate::api {
2525
* Maps internal ability types to nyan API values.
2626
*/
2727
static const auto ABILITY_DEFS = datastructure::create_const_map<ability_t, nyan::ValueHolder>(
28+
std::pair(ability_t::ACTIVITY,
29+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Activity"))),
2830
std::pair(ability_t::APPLY_CONTINUOUS_EFFECT,
2931
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.ApplyContinuousEffect"))),
3032
std::pair(ability_t::APPLY_DISCRETE_EFFECT,
3133
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.ApplyDiscreteEffect"))),
32-
std::pair(ability_t::RANGED_CONTINUOUS_EFFECT,
33-
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.RangedContinuousEffect"))),
34-
std::pair(ability_t::RANGED_DISCRETE_EFFECT,
35-
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.RangedDiscreteEffect"))),
36-
std::pair(ability_t::RESISTANCE,
37-
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Resistance"))),
3834
std::pair(ability_t::IDLE,
3935
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Idle"))),
4036
std::pair(ability_t::MOVE,
4137
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Move"))),
38+
std::pair(ability_t::LINE_OF_SIGHT,
39+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.LineOfSight"))),
4240
std::pair(ability_t::LIVE,
4341
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Live"))),
42+
std::pair(ability_t::RANGED_CONTINUOUS_EFFECT,
43+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.RangedContinuousEffect"))),
44+
std::pair(ability_t::RANGED_DISCRETE_EFFECT,
45+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.RangedDiscreteEffect"))),
46+
std::pair(ability_t::RESISTANCE,
47+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Resistance"))),
48+
std::pair(ability_t::SELECTABLE,
49+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Selectable"))),
4450
std::pair(ability_t::TURN,
45-
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Turn"))),
46-
std::pair(ability_t::LINE_OF_SIGHT,
47-
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.LineOfSight"))));
51+
nyan::ValueHolder(std::make_shared<nyan::ObjectValue>("engine.ability.type.Turn"))));
4852

4953
/**
5054
* Maps internal effect types to nyan API values.

libopenage/gamestate/api/types.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ namespace openage::gamestate::api {
99
* Types of abilities for API objects.
1010
*/
1111
enum class ability_t {
12+
ACTIVITY,
1213
APPLY_CONTINUOUS_EFFECT,
1314
APPLY_DISCRETE_EFFECT,
14-
RANGED_CONTINUOUS_EFFECT,
15-
RANGED_DISCRETE_EFFECT,
16-
RESISTANCE,
1715
IDLE,
16+
LINE_OF_SIGHT,
1817
LIVE,
1918
MOVE,
19+
RANGED_CONTINUOUS_EFFECT,
20+
RANGED_DISCRETE_EFFECT,
21+
RESISTANCE,
22+
SELECTABLE,
2023
TURN,
21-
LINE_OF_SIGHT,
2224

2325
// TODO
2426
};

0 commit comments

Comments
 (0)