Rework keeper powers (#3212)

as a preparation for user made keeper powers

Makefile

@@ -288,7 +288,6 @@ obj/player_computer.o \
 obj/player_computer_data.o \
 obj/player_data.o \
 obj/player_instances.o \
-obj/player_states.o \
 obj/player_utils.o \
 obj/power_hand.o \
 obj/power_process.o \

config/fxdata/magic.cfg

@@ -1396,7 +1396,8 @@ PlayerState = PLAYER_STATE_NONE
 ; Power which aggregates the current power, if set to existing power, makes current power part of a cast.
 ParentPower = NOPOWER
 ; Functions used to implement the power.
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = 
 
 [power1]
 Name = POWER_HAND
@@ -1414,7 +1415,8 @@ Artifact = SPELLBOOK_HOE
 Properties = INSTINCTIVE
 PlayerState = PLAYER_STATE_NONE
 ParentPower = NOPOWER
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_hand
 
 [power2]
 Name = POWER_IMP
@@ -1432,7 +1434,8 @@ Artifact = SPELLBOOK_IMP
 Properties = 
 PlayerState = PLAYER_STATE_CREATEDIGGER
 ParentPower = NOPOWER
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_imp
 
 [power3]
 Name = POWER_OBEY
@@ -1451,7 +1454,8 @@ Artifact = SPELLBOOK_OBEY
 Properties = 
 PlayerState = PLAYER_STATE_NONE
 ParentPower = NOPOWER
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_obey
 
 [power4]
 Name = POWER_SLAP
@@ -1470,7 +1474,8 @@ Artifact = SPELLBOOK_SLAP
 Properties = INSTINCTIVE
 PlayerState = PLAYER_STATE_NONE
 ParentPower = NOPOWER
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_slap_thing
 
 [power5]
 Name = POWER_SIGHT
@@ -1488,7 +1493,8 @@ Artifact = SPELLBOOK_SOE
 Properties = HAS_PROGRESS
 PlayerState = PLAYER_STATE_SIGHTOFEVIL
 ParentPower = NOPOWER
-Functions = sight_of_evil_expand
+CastExpandFunc = sight_of_evil_expand
+UseFunction = magic_use_power_sight
 
 [power6]
 Name = POWER_CALL_TO_ARMS
@@ -1508,7 +1514,8 @@ Artifact = SPELLBOOK_CTA
 Properties = HAS_PROGRESS
 PlayerState = PLAYER_STATE_CALLTOARMS
 ParentPower = NOPOWER
-Functions = call_to_arms_expand
+CastExpandFunc = call_to_arms_expand
+UseFunction = magic_use_power_call_to_arms
 
 [power7]
 Name = POWER_CAVE_IN
@@ -1527,7 +1534,8 @@ Artifact = SPELLBOOK_CAVI
 Properties = HAS_PROGRESS
 PlayerState = PLAYER_STATE_CAVEIN
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+UseFunction = magic_use_power_cave_in
 
 [power8]
 Name = POWER_HEAL_CREATURE
@@ -1546,7 +1554,9 @@ Artifact = SPELLBOOK_HEAL
 Properties = 
 PlayerState = PLAYER_STATE_HEAL
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_HEAL
+UseFunction = magic_use_power_heal
 
 [power9]
 Name = POWER_HOLD_AUDIENCE
@@ -1564,7 +1574,8 @@ Artifact = SPELLBOOK_HLDAUD
 Properties = 
 PlayerState = PLAYER_STATE_NONE
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+UseFunction = magic_use_power_hold_audience
 
 [power10]
 Name = POWER_LIGHTNING
@@ -1583,7 +1594,8 @@ Artifact = SPELLBOOK_LIGHTN
 Properties = 
 PlayerState = PLAYER_STATE_LIGHTNING
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+UseFunction = magic_use_power_lightning
 
 [power11]
 Name = POWER_SPEED
@@ -1602,7 +1614,9 @@ Artifact = SPELLBOOK_SPDC
 Properties = 
 PlayerState = PLAYER_STATE_SPEEDUP
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_SPEED
+UseFunction = magic_use_power_apply_spell
 
 [power12]
 Name = POWER_PROTECT
@@ -1620,7 +1634,9 @@ Artifact = SPELLBOOK_PROT
 Properties = 
 PlayerState = PLAYER_STATE_ARMOUR
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_ARMOUR
+UseFunction = magic_use_power_apply_spell
 
 [power13]
 Name = POWER_CONCEAL
@@ -1638,7 +1654,9 @@ Artifact = SPELLBOOK_CONCL
 Properties = 
 PlayerState = PLAYER_STATE_CONCEAL
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_INVISIBILITY
+UseFunction = magic_use_power_apply_spell
 
 [power14]
 Name = POWER_DISEASE
@@ -1656,7 +1674,9 @@ Artifact = SPELLBOOK_DISEASE
 Properties = 
 PlayerState = PLAYER_STATE_CASTDISEASE
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_DISEASE
+UseFunction = magic_use_power_apply_spell
 
 [power15]
 Name = POWER_CHICKEN
@@ -1675,7 +1695,9 @@ Artifact = SPELLBOOK_CHKN
 Properties = 
 PlayerState = PLAYER_STATE_TURNCHICKEN
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_CHICKEN
+UseFunction = magic_use_power_apply_spell
 
 [power16]
 Name = POWER_DESTROY_WALLS
@@ -1693,7 +1715,8 @@ Artifact = SPELLBOOK_DWAL
 Properties = 
 PlayerState = PLAYER_STATE_DESTROYWALLS
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+UseFunction = magic_use_power_destroy_walls
 
 [power17]
 Name = POWER_TIME_BOMB
@@ -1712,7 +1735,9 @@ Artifact = SPELLBOOK_TBMB
 Properties = 
 PlayerState = PLAYER_STATE_TIMEBOMB
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_TIME_BOMB
+UseFunction = magic_use_power_time_bomb
 
 [power18]
 Name = POWER_POSSESS
@@ -1730,7 +1755,8 @@ Artifact = SPELLBOOK_POSS
 Properties = 
 PlayerState = PLAYER_STATE_CTRLDIRECT
 ParentPower = NOPOWER
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_possess_thing
 
 [power19]
 Name = POWER_ARMAGEDDON
@@ -1748,7 +1774,8 @@ Artifact = SPELLBOOK_ARMG
 Properties = 
 PlayerState = PLAYER_STATE_NONE
 ParentPower = NOPOWER
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_armageddon
 
 [power20]
 Name = POWER_PICKUP_CREATURE
@@ -1766,7 +1793,8 @@ Artifact = NULL
 Properties = INSTINCTIVE
 PlayerState = PLAYER_STATE_NONE
 ParentPower = POWER_HAND
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_hand
 
 [power21]
 Name = POWER_PICKUP_GOLD
@@ -1784,7 +1812,8 @@ Artifact = NULL
 Properties = INSTINCTIVE
 PlayerState = PLAYER_STATE_NONE
 ParentPower = POWER_HAND
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_hand
 
 [power22]
 Name = POWER_PICKUP_FOOD
@@ -1802,7 +1831,8 @@ Artifact = NULL
 Properties = INSTINCTIVE
 PlayerState = PLAYER_STATE_NONE
 ParentPower = POWER_HAND
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+UseFunction = magic_use_power_hand
 
 [power23]
 Name = POWER_REBOUND
@@ -1822,7 +1852,9 @@ Properties =
 PlayerState = PLAYER_STATE_REBOUND
 ParentPower = NOPOWER
 ; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+Spell = SPELL_REBOUND
+UseFunction = magic_use_power_apply_spell
 
 [power24]
 Name = POWER_FREEZE
@@ -1843,7 +1875,10 @@ Properties =
 PlayerState = PLAYER_STATE_FREEZE
 ParentPower = NOPOWER
 ; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+Spell = SPELL_FREEZE
+Effect = EFFECT_FALLING_ICE_BLOCKS
+UseFunction = magic_use_power_apply_spell
 
 [power25]
 Name = POWER_SLOW
@@ -1863,7 +1898,10 @@ Properties =
 PlayerState = PLAYER_STATE_SLOW
 ParentPower = NOPOWER
 ; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+Spell = SPELL_SLOW
+Effect = EFFECT_SLOW_KEEPER_POWER
+UseFunction = magic_use_power_apply_spell
 
 [power26]
 Name = POWER_FLIGHT
@@ -1883,7 +1921,9 @@ Properties =
 PlayerState = PLAYER_STATE_FLIGHT
 ParentPower = NOPOWER
 ; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
-Functions = do_not_expand
+CastExpandFunc = do_not_expand
+Spell = SPELL_FLIGHT
+UseFunction = magic_use_power_apply_spell
 
 [power27]
 Name = POWER_VISION
@@ -1901,7 +1941,9 @@ Artifact = SPELLBOOK_VSN
 Properties = 
 PlayerState = PLAYER_STATE_VISION
 ParentPower = NOPOWER
-Functions = general_expand
+CastExpandFunc = general_expand
+Spell = SPELL_SIGHT
+UseFunction = magic_use_power_apply_spell
 
 ; Specials types.