Browse Source

move gui constants

Bastien Sevajol 6 years ago
parent
commit
7d41e6f21a
3 changed files with 14 additions and 15 deletions
  1. 3 13
      opencombat/gui/actor.py
  2. 9 0
      opencombat/gui/const.py
  3. 2 2
      opencombat/gui/weapon.py

+ 3 - 13
opencombat/gui/actor.py View File

@@ -3,25 +3,15 @@ import typing
3 3
 
4 4
 from PIL import Image
5 5
 from synergine2.config import Config
6
-
7 6
 from synergine2.simulation import Subject
8 7
 from synergine2_cocos2d.actor import Actor
9 8
 
10 9
 from opencombat.exception import UnknownWeapon
11
-from opencombat.gui.animation import ANIMATION_WALK
12 10
 from opencombat.gui.animation import ANIMATION_CRAWL
13
-from opencombat.gui.weapon import WeaponImageApplier
11
+from opencombat.gui.animation import ANIMATION_WALK
12
+from opencombat.gui.const import MAN_STAND_UP
14 13
 from opencombat.gui.weapon import RIFFLE
15
-
16
-FLAG_DE = 'DE'
17
-FLAG_URSS = 'URSS'
18
-
19
-FLAG_COLORS = {
20
-    FLAG_DE
21
-}
22
-
23
-MAN_STAND_UP = 'MAN_STAND_UP'
24
-MAN_CRAWLING = 'MAN_CRAWLING'
14
+from opencombat.gui.weapon import WeaponImageApplier
25 15
 
26 16
 
27 17
 class BaseActor(Actor):

+ 9 - 0
opencombat/gui/const.py View File

@@ -0,0 +1,9 @@
1
+# coding: utf-8
2
+
3
+MAN_STAND_UP = 'MAN_STAND_UP'
4
+MAN_CRAWLING = 'MAN_CRAWLING'
5
+FLAG_DE = 'DE'
6
+FLAG_COLORS = {
7
+    FLAG_DE
8
+}
9
+FLAG_URSS = 'URSS'

+ 2 - 2
opencombat/gui/weapon.py View File

@@ -6,6 +6,8 @@ from synergine2.config import Config
6 6
 from synergine2_cocos2d.util import PathManager
7 7
 
8 8
 from opencombat.exception import UnknownWeapon
9
+from opencombat.gui.const import MAN_STAND_UP
10
+from opencombat.gui.const import MAN_CRAWLING
9 11
 
10 12
 if typing.TYPE_CHECKING:
11 13
     from opencombat.gui.actor import BaseActor
@@ -29,8 +31,6 @@ class WeaponImageApplier(ImageApplier):
29 31
         self._cache = {}  # type: typing.Dict[str, Image.Image]
30 32
 
31 33
     def get_images_scheme(self) -> typing.Dict[str, typing.Dict[str, str]]:
32
-        from opencombat.gui.actor import MAN_STAND_UP
33
-        from opencombat.gui.actor import MAN_CRAWLING
34 34
         return {
35 35
             MAN_STAND_UP: {
36 36
                 RIFFLE: [