Refactor scripting

README.rst

@@ -56,19 +56,12 @@ view the ``examples/froge directory`` for a generated pymodd project
     @script(triggers=[Trigger.EVERY_SECOND])
     class EverySecond():
         def _build(self):
-            self.actions = [
-                if_else((NumberOfUnitsOfUnitType(UnitTypes.FROG) < 5), [
-                    create_unit_for_player_at_position_with_rotation(UnitTypes.FROG, Variables.AI, RandomPositionInRegion(EntireMapRegion()), 0),
-                ], [
-                    if_else((NumberOfUnitsOfUnitType(UnitTypes.FROG_BOSS) == 0), [
-                        if_else((Variables.BOSS_TIMER <= 0), [
-                            create_unit_for_player_at_position_with_rotation(UnitTypes.FROG_BOSS, Variables.AI, RandomPositionInRegion(EntireMapRegion()), 0),
-                            update_ui_target_for_player_for_miliseconds(UiTarget.CENTER, 'BOSS SPAWNED', Undefined(), 5000),
-                            set_variable(Variables.BOSS_TIMER, 200),
-                        ], [
-                        ]),
-                        decrease_variable_by_number(Variables.BOSS_TIMER, 1),
-                    ], [
-                    ]),
-                ]),
-            ]
+            if NumberOfUnitsOfUnitType(UnitTypes.FROG) < 5:
+                create_unit_for_player_at_position_with_rotation(UnitTypes.FROG, Variables.AI, RandomPositionInRegion(EntireMapRegion()), 0)
+            else:
+                if NumberOfUnitsOfUnitType(UnitTypes.FROG_BOSS) == 0:
+                    if Variables.BOSS_TIMER <= 0:
+                        create_unit_for_player_at_position_with_rotation(UnitTypes.FROG_BOSS, Variables.AI, RandomPositionInRegion(EntireMapRegion()), 0)
+                        update_ui_target_for_player_for_miliseconds(UiTarget.CENTER, 'BOSS SPAWNED', Undefined(), 5000)
+                    decrease_variable_by_number(Variables.BOSS_TIMER, 1)
+

examples/froge/entity_scripts.py

@@ -17,18 +17,12 @@ def _build(self):
 	@script(triggers=[])
 	class UseItem():
 		def _build(self):
-			self.actions = [
-				use_item_continuously_until_stopped(ItemCurrentlyHeldByUnit(ThisEntity())),
-
-			]
+			use_item_continuously_until_stopped(ItemCurrentlyHeldByUnit(ThisEntity()))
 
 	@script(triggers=[])
 	class StopUsingItem():
 		def _build(self):
-			self.actions = [
-				stop_using_item(ItemCurrentlyHeldByUnit(ThisEntity())),
-
-			]
+			stop_using_item(ItemCurrentlyHeldByUnit(ThisEntity()))
 
 
 class Frog(EntityScripts):
@@ -42,9 +36,6 @@ def _build(self):
 	@script(triggers=[])
 	class NewScript():
 		def _build(self):
-			self.actions = [
-				comment('wdwadawd'),
-
-			]
+			comment('wdwadawd')
 
 

examples/froge/game_variables.py

@@ -1,92 +1,92 @@
-from pymodd.functions import UnitType, PlayerType, ItemType, Variable, EntityVariable, AnimationType, AttributeType, State, Shop, Music
-
-
-class UnitTypes:
-	FROG_BOSS = UnitType("TyaKyQzgKc")
-	POOPER = UnitType("fighter")
-	FROG = UnitType("oTDQ3jlcMa")
-
-
-class PlayerTypes:
-	AI = PlayerType("eA9ZwoweVz")
-	PLAYER = PlayerType("humanPlayer")
+from pymodd.variable_types import ItemType, ProjectileType, UnitType, PlayerType, Variable, Variable, Variable, EntityVariable, PlayerVariable, Variable, Shop, Dialogue, Music, Sound, State, AnimationType, AttributeType, DataType
 
 
 class ItemTypes:
-	BOSS_FROG_TONGUE = ItemType("AqrGZUYBdS")
-	FROG_TONGUE = ItemType("BBCDO38dr7")
-	KNIFE = ItemType("bMDJQyFACm")
-	FROG_SWORD = ItemType("tmAlzggQX4")
+	BOSS_FROG_TONGUE = ItemType('AqrGZUYBdS', name='Boss Frog Tongue')
+	FROG_TONGUE = ItemType('BBCDO38dr7', name='Frog Tongue')
+	KNIFE = ItemType('bMDJQyFACm', name='Knife')
+	FROG_SWORD = ItemType('tmAlzggQX4', name='Frog Sword')
 
 
 class ProjectileTypes:
 	pass
 
 
-class Regions:
-	pass
-
-
-class Variables:
-	AI = Variable("AI", variable_type='player')
-	BOSS_TIMER = Variable("bossTimer", variable_type='number')
-	DWADAWD = Variable("dwadawd", variable_type='unitGroup')
-	TEMP_UNIT = Variable("tempUnit", variable_type='unit')
-	TIMER = Variable("timer", variable_type='number')
+class UnitTypes:
+	FROG_BOSS = UnitType('TyaKyQzgKc', name='Frog Boss')
+	POOPER = UnitType('fighter', name='Pooper')
+	FROG = UnitType('oTDQ3jlcMa', name='Frog')
 
 
-class EntityVariables:
-	SENSOR_RADIUS = EntityVariable("sensorRadius", variable_type='number')
-	TARGET_UNIT = EntityVariable("targetUnit", variable_type='unit')
+class PlayerTypes:
+	AI = PlayerType('eA9ZwoweVz', name='ai')
+	PLAYER = PlayerType('humanPlayer', name='Player')
 
 
-class PlayerVariables:
-	pass
+class ItemTypeGroups:
+	RANDOMGROUP = Variable('randomgroup', DataType.ITEM_TYPE_GROUP)
 
 
-class AnimationTypes:
-	TONGUE_OUT = AnimationType("B1cWOYKvNL")
-	DEFAULT = AnimationType("default")
-	DROPPED = AnimationType("dropped")
-	USE = AnimationType("use")
+class UnitTypeGroups:
+	UNITTYPEGROUP = Variable('unittypegroup', DataType.UNIT_TYPE_GROUP)
 
 
-class AttributeTypes:
-	MOVE = AttributeType("G3adwzJecn")
-	HEALTH = AttributeType("health")
-	SPEED = AttributeType("speed")
-	FROG_KILLS = AttributeType("yjdyHZbWpA")
+class Variables:
+	AI = Variable('AI', DataType.PLAYER)
+	BOSS_TIMER = Variable('bossTimer', DataType.NUMBER)
+	DWADAWD = Variable('dwadawd', DataType.UNIT_GROUP)
+	TEMP_UNIT = Variable('tempUnit', DataType.UNIT)
+	TIMER = Variable('timer', DataType.NUMBER)
 
 
-class ItemTypeGroups:
-	RANDOMGROUP = Variable("randomgroup", variable_type='itemTypeGroup')
+class EntityVariables:
+	SENSOR_RADIUS = EntityVariable('sensorRadius', DataType.NUMBER)
+	TARGET_UNIT = EntityVariable('targetUnit', DataType.UNIT)
 
 
-class UnitTypeGroups:
-	UNITTYPEGROUP = Variable("unittypegroup", variable_type='unitTypeGroup')
+class PlayerVariables:
+	TARGET_UNIT = PlayerVariable('targetUnit', DataType.UNIT)
 
 
-class States:
-	DEFAULT = State("default")
-	DROPPED = State("dropped")
-	TONGUE_OUT = State("r60qiEIvyt")
-	SELECTED = State("selected")
-	UNSELECTED = State("unselected")
+class Regions:
+	pass
 
 
 class Shops:
-	FROGE_SHOP = Shop("OJbEQyc7is")
+	FROGE_SHOP = Shop('OJbEQyc7is', name='Froge Shop')
 
 
 class Dialogues:
 	pass
 
 
 class Musics:
-	D = Music("iJ8RoRfyeu")
+	D = Music('iJ8RoRfyeu', name='d')
 
 
 class Sounds:
 	pass
 
 
+class States:
+	DEFAULT = State('default', name='default')
+	DROPPED = State('dropped', name='dropped')
+	TONGUE_OUT = State('r60qiEIvyt', name='tongue out')
+	SELECTED = State('selected', name='selected')
+	UNSELECTED = State('unselected', name='unselected')
+
+
+class AnimationTypes:
+	TONGUE_OUT = AnimationType('B1cWOYKvNL', name='tongue out')
+	DEFAULT = AnimationType('default', name='default')
+	DROPPED = AnimationType('dropped', name='dropped')
+	USE = AnimationType('use', name='use')
+
+
+class AttributeTypes:
+	MOVE = AttributeType('G3adwzJecn', name='move')
+	HEALTH = AttributeType('health', name='health ')
+	SPEED = AttributeType('speed', name='speed')
+	FROG_KILLS = AttributeType('yjdyHZbWpA', name='frog kills')
+
+