Browse Source

rename OpenCC for OpenCombat

Bastien Sevajol 6 years ago
parent
commit
525a8e3feb
72 changed files with 59 additions and 60 deletions
  1. 3 3
      README.md
  2. 0 0
      opencombat/__init__.py
  3. 0 0
      opencombat/const.py
  4. 0 0
      opencombat/gui/__init__.py
  5. 0 0
      opencombat/gui/actor.py
  6. 15 15
      opencombat/gui/base.py
  7. 2 2
      opencombat/gui/fire.py
  8. 1 1
      opencombat/gui/move.py
  9. 0 0
      opencombat/maps/003/003.tmx
  10. 0 0
      opencombat/maps/003/actors/man.png
  11. 0 0
      opencombat/maps/003/actors/man_c1.png
  12. 0 0
      opencombat/maps/003/actors/man_c2.png
  13. 0 0
      opencombat/maps/003/actors/man_c3.png
  14. 0 0
      opencombat/maps/003/actors/man_c4.png
  15. 0 0
      opencombat/maps/003/actors/man_d1.png
  16. 0 0
      opencombat/maps/003/actors/man_w1.png
  17. 0 0
      opencombat/maps/003/actors/man_w10.png
  18. 0 0
      opencombat/maps/003/actors/man_w2.png
  19. 0 0
      opencombat/maps/003/actors/man_w3.png
  20. 0 0
      opencombat/maps/003/actors/man_w4.png
  21. 0 0
      opencombat/maps/003/actors/man_w5.png
  22. 0 0
      opencombat/maps/003/actors/man_w6.png
  23. 0 0
      opencombat/maps/003/actors/man_w7.png
  24. 0 0
      opencombat/maps/003/actors/man_w8.png
  25. 0 0
      opencombat/maps/003/actors/man_w9.png
  26. 0 0
      opencombat/maps/003/background.png
  27. 0 0
      opencombat/maps/003/background_interiors.png
  28. 0 0
      opencombat/maps/003/background_interiors.xcf
  29. 0 0
      opencombat/maps/003/interiors.png
  30. 0 0
      opencombat/maps/003/interiors.tsx
  31. 0 0
      opencombat/maps/003/terrain.png
  32. 0 0
      opencombat/maps/003/terrain.tsx
  33. 0 0
      opencombat/maps/003/trees_64x64.png
  34. 0 0
      opencombat/maps/003/trees_64x64.tsx
  35. 0 0
      opencombat/maps/004/004.tmx
  36. 0 0
      opencombat/maps/004/actors/man.png
  37. 0 0
      opencombat/maps/004/actors/man_c1.png
  38. 0 0
      opencombat/maps/004/actors/man_c2.png
  39. 0 0
      opencombat/maps/004/actors/man_c3.png
  40. 0 0
      opencombat/maps/004/actors/man_c4.png
  41. 0 0
      opencombat/maps/004/actors/man_w1.png
  42. 0 0
      opencombat/maps/004/actors/man_w10.png
  43. 0 0
      opencombat/maps/004/actors/man_w2.png
  44. 0 0
      opencombat/maps/004/actors/man_w3.png
  45. 0 0
      opencombat/maps/004/actors/man_w4.png
  46. 0 0
      opencombat/maps/004/actors/man_w5.png
  47. 0 0
      opencombat/maps/004/actors/man_w6.png
  48. 0 0
      opencombat/maps/004/actors/man_w7.png
  49. 0 0
      opencombat/maps/004/actors/man_w8.png
  50. 0 0
      opencombat/maps/004/actors/man_w9.png
  51. 0 0
      opencombat/maps/004/background.png
  52. 0 0
      opencombat/maps/004/terrain.png
  53. 0 0
      opencombat/maps/004/terrain.tsx
  54. 0 0
      opencombat/maps/004/trees_64x64.png
  55. 0 0
      opencombat/maps/004/trees_64x64.tsx
  56. 0 0
      opencombat/simulation/__init__.py
  57. 2 2
      opencombat/simulation/base.py
  58. 8 8
      opencombat/simulation/behaviour.py
  59. 0 0
      opencombat/simulation/event.py
  60. 0 0
      opencombat/simulation/fire.py
  61. 0 0
      opencombat/simulation/interior.py
  62. 1 1
      opencombat/simulation/mechanism.py
  63. 4 4
      opencombat/simulation/physics.py
  64. 5 5
      opencombat/simulation/subject.py
  65. 0 0
      opencombat/simulation/tmx.py
  66. 0 0
      opencombat/sounds/204010__duckduckpony__homemade-gunshot-2.ogg
  67. 0 0
      opencombat/terminal/__init__.py
  68. 8 8
      opencombat/terminal/base.py
  69. 0 0
      opencombat/user_action.py
  70. 0 1
      requirements.txt
  71. 9 9
      run.py
  72. 1 1
      tests/gui/test_interiors.py

+ 3 - 3
README.md View File

1
-# OpenCC
1
+# OpenCombat
2
 
2
 
3
 Open source close combat inspired game
3
 Open source close combat inspired game
4
 
4
 
5
 # Install
5
 # Install
6
 
6
 
7
-OpenCC is in development mode. Considering in your virtual environment, install synergine2:
7
+OpenCombat is in development mode. Considering in your virtual environment, install synergine2:
8
 
8
 
9
     git clone https://github.com/buxx/synergine2.git
9
     git clone https://github.com/buxx/synergine2.git
10
     cd synergine2
10
     cd synergine2
19
 
19
 
20
 Example run:
20
 Example run:
21
 
21
 
22
-    python run.py opencc/maps/003
22
+    python run.py opencombat/maps/003

opencc/__init__.py → opencombat/__init__.py View File


opencc/const.py → opencombat/const.py View File


opencc/gui/__init__.py → opencombat/gui/__init__.py View File


opencc/gui/actor.py → opencombat/gui/actor.py View File


opencc/gui/base.py → opencombat/gui/base.py View File

14
 from cocos.actions import MoveTo as BaseMoveTo
14
 from cocos.actions import MoveTo as BaseMoveTo
15
 from cocos.audio.pygame.mixer import Sound
15
 from cocos.audio.pygame.mixer import Sound
16
 
16
 
17
-from opencc.simulation.interior import InteriorManager
18
-from opencc.simulation.tmx import TileMap
19
-from opencc.user_action import UserAction
17
+from opencombat.simulation.interior import InteriorManager
18
+from opencombat.simulation.tmx import TileMap
19
+from opencombat.user_action import UserAction
20
 from synergine2.config import Config
20
 from synergine2.config import Config
21
 from synergine2.log import SynergineLogger
21
 from synergine2.log import SynergineLogger
22
 from synergine2.terminals import Terminal
22
 from synergine2.terminals import Terminal
32
 from synergine2_xyz.move.simulation import StartMoveEvent
32
 from synergine2_xyz.move.simulation import StartMoveEvent
33
 from synergine2_xyz.physics import Physics
33
 from synergine2_xyz.physics import Physics
34
 from synergine2_xyz.utils import get_angle
34
 from synergine2_xyz.utils import get_angle
35
-from opencc.simulation.event import NewVisibleOpponent
36
-from opencc.simulation.event import NoLongerVisibleOpponent
37
-from opencc.simulation.event import FireEvent
38
-from opencc.simulation.event import DieEvent
35
+from opencombat.simulation.event import NewVisibleOpponent
36
+from opencombat.simulation.event import NoLongerVisibleOpponent
37
+from opencombat.simulation.event import FireEvent
38
+from opencombat.simulation.event import DieEvent
39
 
39
 
40
 
40
 
41
 class EditLayer(BaseEditLayer):
41
 class EditLayer(BaseEditLayer):
45
         # TODO BS 20171213: Into other layer !
45
         # TODO BS 20171213: Into other layer !
46
         self.last_interior_draw = 0
46
         self.last_interior_draw = 0
47
         # FIXME BS: hardcoded (move into other layer)
47
         # FIXME BS: hardcoded (move into other layer)
48
-        self.interior_manager = InteriorManager(TileMap('opencc/maps/003/003.tmx'))
48
+        self.interior_manager = InteriorManager(TileMap('opencombat/maps/003/003.tmx'))
49
 
49
 
50
     def _on_key_press(self, k, m):
50
     def _on_key_press(self, k, m):
51
         if self.selection:
51
         if self.selection:
76
 
76
 
77
             if interiors:
77
             if interiors:
78
                 # FIXME: hardcoded
78
                 # FIXME: hardcoded
79
-                image = Image.open('opencc/maps/003/background.png')
79
+                image = Image.open('opencombat/maps/003/background.png')
80
                 image_fake_file = io.BytesIO()
80
                 image_fake_file = io.BytesIO()
81
                 # FIXME: tile height/width !
81
                 # FIXME: tile height/width !
82
                 self.interior_manager.update_image_for_interiors(image, interiors, 8, 8)
82
                 self.interior_manager.update_image_for_interiors(image, interiors, 8, 8)
128
             read_queue_interval=read_queue_interval,
128
             read_queue_interval=read_queue_interval,
129
             map_dir_path=map_dir_path,
129
             map_dir_path=map_dir_path,
130
         )
130
         )
131
-        self.sound_lib = AudioLibrary('opencc/sounds/')
131
+        self.sound_lib = AudioLibrary('opencombat/sounds/')
132
 
132
 
133
         self.terminal.register_event_handler(
133
         self.terminal.register_event_handler(
134
             FinishMoveEvent,
134
             FinishMoveEvent,
166
         self.move_crawl_duration_ref = float(self.config.resolve('game.move.crawl_ref_time'))
166
         self.move_crawl_duration_ref = float(self.config.resolve('game.move.crawl_ref_time'))
167
 
167
 
168
     def before_run(self) -> None:
168
     def before_run(self) -> None:
169
-        from opencc.gui.move import MoveActorInteraction
170
-        from opencc.gui.move import MoveFastActorInteraction
171
-        from opencc.gui.move import MoveCrawlActorInteraction
172
-        from opencc.gui.fire import FireActorInteraction
169
+        from opencombat.gui.move import MoveActorInteraction
170
+        from opencombat.gui.move import MoveFastActorInteraction
171
+        from opencombat.gui.move import MoveCrawlActorInteraction
172
+        from opencombat.gui.fire import FireActorInteraction
173
 
173
 
174
         self.layer_manager.interaction_manager.register(MoveActorInteraction, self.layer_manager)
174
         self.layer_manager.interaction_manager.register(MoveActorInteraction, self.layer_manager)
175
         self.layer_manager.interaction_manager.register(MoveFastActorInteraction, self.layer_manager)
175
         self.layer_manager.interaction_manager.register(MoveFastActorInteraction, self.layer_manager)
275
 
275
 
276
     def subject_die(self, event: DieEvent) -> None:
276
     def subject_die(self, event: DieEvent) -> None:
277
         killed_actor = self.layer_manager.subject_layer.subjects_index[event.shoot_subject_id]
277
         killed_actor = self.layer_manager.subject_layer.subjects_index[event.shoot_subject_id]
278
-        dead_image = pyglet.resource.image('opencc/maps/003/actors/man_d1.png')
278
+        dead_image = pyglet.resource.image('opencombat/maps/003/actors/man_d1.png')
279
         killed_actor.update_image(dead_image)
279
         killed_actor.update_image(dead_image)
280
         killed_actor.freeze()
280
         killed_actor.freeze()

opencc/gui/fire.py → opencombat/gui/fire.py View File

1
 # coding: utf-8
1
 # coding: utf-8
2
 import typing
2
 import typing
3
 
3
 
4
-from opencc.simulation.fire import RequestFireBehaviour
4
+from opencombat.simulation.fire import RequestFireBehaviour
5
 from synergine2_cocos2d.interaction import BaseActorInteraction
5
 from synergine2_cocos2d.interaction import BaseActorInteraction
6
-from opencc.user_action import UserAction
6
+from opencombat.user_action import UserAction
7
 from synergine2.simulation import SimulationBehaviour
7
 from synergine2.simulation import SimulationBehaviour
8
 from synergine2_cocos2d.actor import Actor
8
 from synergine2_cocos2d.actor import Actor
9
 from synergine2_cocos2d.gl import draw_line
9
 from synergine2_cocos2d.gl import draw_line

opencc/gui/move.py → opencombat/gui/move.py View File

2
 import typing
2
 import typing
3
 
3
 
4
 from synergine2_cocos2d.interaction import BaseActorInteraction
4
 from synergine2_cocos2d.interaction import BaseActorInteraction
5
-from opencc.user_action import UserAction
5
+from opencombat.user_action import UserAction
6
 from synergine2.simulation import SimulationBehaviour
6
 from synergine2.simulation import SimulationBehaviour
7
 from synergine2_cocos2d.actor import Actor
7
 from synergine2_cocos2d.actor import Actor
8
 from synergine2_cocos2d.gl import draw_line
8
 from synergine2_cocos2d.gl import draw_line

opencc/maps/003/003.tmx → opencombat/maps/003/003.tmx View File


opencc/maps/003/actors/man.png → opencombat/maps/003/actors/man.png View File


opencc/maps/003/actors/man_c1.png → opencombat/maps/003/actors/man_c1.png View File


opencc/maps/003/actors/man_c2.png → opencombat/maps/003/actors/man_c2.png View File


opencc/maps/003/actors/man_c3.png → opencombat/maps/003/actors/man_c3.png View File


opencc/maps/003/actors/man_c4.png → opencombat/maps/003/actors/man_c4.png View File


opencc/maps/003/actors/man_d1.png → opencombat/maps/003/actors/man_d1.png View File


opencc/maps/003/actors/man_w1.png → opencombat/maps/003/actors/man_w1.png View File


opencc/maps/003/actors/man_w10.png → opencombat/maps/003/actors/man_w10.png View File


opencc/maps/003/actors/man_w2.png → opencombat/maps/003/actors/man_w2.png View File


opencc/maps/003/actors/man_w3.png → opencombat/maps/003/actors/man_w3.png View File


opencc/maps/003/actors/man_w4.png → opencombat/maps/003/actors/man_w4.png View File


opencc/maps/003/actors/man_w5.png → opencombat/maps/003/actors/man_w5.png View File


opencc/maps/003/actors/man_w6.png → opencombat/maps/003/actors/man_w6.png View File


opencc/maps/003/actors/man_w7.png → opencombat/maps/003/actors/man_w7.png View File


opencc/maps/003/actors/man_w8.png → opencombat/maps/003/actors/man_w8.png View File


opencc/maps/003/actors/man_w9.png → opencombat/maps/003/actors/man_w9.png View File


opencc/maps/003/background.png → opencombat/maps/003/background.png View File


opencc/maps/003/background_interiors.png → opencombat/maps/003/background_interiors.png View File


opencc/maps/003/background_interiors.xcf → opencombat/maps/003/background_interiors.xcf View File


opencc/maps/003/interiors.png → opencombat/maps/003/interiors.png View File


opencc/maps/003/interiors.tsx → opencombat/maps/003/interiors.tsx View File


opencc/maps/003/terrain.png → opencombat/maps/003/terrain.png View File


opencc/maps/003/terrain.tsx → opencombat/maps/003/terrain.tsx View File


opencc/maps/003/trees_64x64.png → opencombat/maps/003/trees_64x64.png View File


opencc/maps/003/trees_64x64.tsx → opencombat/maps/003/trees_64x64.tsx View File


opencc/maps/004/004.tmx → opencombat/maps/004/004.tmx View File


opencc/maps/004/actors/man.png → opencombat/maps/004/actors/man.png View File


opencc/maps/004/actors/man_c1.png → opencombat/maps/004/actors/man_c1.png View File


opencc/maps/004/actors/man_c2.png → opencombat/maps/004/actors/man_c2.png View File


opencc/maps/004/actors/man_c3.png → opencombat/maps/004/actors/man_c3.png View File


opencc/maps/004/actors/man_c4.png → opencombat/maps/004/actors/man_c4.png View File


opencc/maps/004/actors/man_w1.png → opencombat/maps/004/actors/man_w1.png View File


opencc/maps/004/actors/man_w10.png → opencombat/maps/004/actors/man_w10.png View File


opencc/maps/004/actors/man_w2.png → opencombat/maps/004/actors/man_w2.png View File


opencc/maps/004/actors/man_w3.png → opencombat/maps/004/actors/man_w3.png View File


opencc/maps/004/actors/man_w4.png → opencombat/maps/004/actors/man_w4.png View File


opencc/maps/004/actors/man_w5.png → opencombat/maps/004/actors/man_w5.png View File


opencc/maps/004/actors/man_w6.png → opencombat/maps/004/actors/man_w6.png View File


opencc/maps/004/actors/man_w7.png → opencombat/maps/004/actors/man_w7.png View File


opencc/maps/004/actors/man_w8.png → opencombat/maps/004/actors/man_w8.png View File


opencc/maps/004/actors/man_w9.png → opencombat/maps/004/actors/man_w9.png View File


opencc/maps/004/background.png → opencombat/maps/004/background.png View File


opencc/maps/004/terrain.png → opencombat/maps/004/terrain.png View File


opencc/maps/004/terrain.tsx → opencombat/maps/004/terrain.tsx View File


opencc/maps/004/trees_64x64.png → opencombat/maps/004/trees_64x64.png View File


opencc/maps/004/trees_64x64.tsx → opencombat/maps/004/trees_64x64.tsx View File


opencc/simulation/__init__.py → opencombat/simulation/__init__.py View File


opencc/simulation/base.py → opencombat/simulation/base.py View File

1
 # coding: utf-8
1
 # coding: utf-8
2
-from opencc.const import COLLECTION_ALIVE
3
-from opencc.simulation.physics import TilePhysics
2
+from opencombat.const import COLLECTION_ALIVE
3
+from opencombat.simulation.physics import TilePhysics
4
 from synergine2.config import Config
4
 from synergine2.config import Config
5
 from synergine2.simulation import SubjectBehaviour
5
 from synergine2.simulation import SubjectBehaviour
6
 from synergine2_xyz.physics import Physics
6
 from synergine2_xyz.physics import Physics

opencc/simulation/behaviour.py → opencombat/simulation/behaviour.py View File

3
 import time
3
 import time
4
 import typing
4
 import typing
5
 
5
 
6
-from opencc.const import COLLECTION_ALIVE
7
-from opencc.simulation.base import AliveSubjectBehaviour
8
-from opencc.simulation.event import NoLongerVisibleOpponent
9
-from opencc.simulation.event import FireEvent
10
-from opencc.simulation.event import DieEvent
11
-from opencc.simulation.event import NewVisibleOpponent
12
-from opencc.simulation.mechanism import OpponentVisibleMechanism
13
-from opencc.user_action import UserAction
6
+from opencombat.const import COLLECTION_ALIVE
7
+from opencombat.simulation.base import AliveSubjectBehaviour
8
+from opencombat.simulation.event import NoLongerVisibleOpponent
9
+from opencombat.simulation.event import FireEvent
10
+from opencombat.simulation.event import DieEvent
11
+from opencombat.simulation.event import NewVisibleOpponent
12
+from opencombat.simulation.mechanism import OpponentVisibleMechanism
13
+from opencombat.user_action import UserAction
14
 from synergine2.config import Config
14
 from synergine2.config import Config
15
 from synergine2.simulation import Simulation
15
 from synergine2.simulation import Simulation
16
 from synergine2.simulation import Event
16
 from synergine2.simulation import Event

opencc/simulation/event.py → opencombat/simulation/event.py View File


opencc/simulation/fire.py → opencombat/simulation/fire.py View File


opencc/simulation/interior.py → opencombat/simulation/interior.py View File


opencc/simulation/mechanism.py → opencombat/simulation/mechanism.py View File

1
 # coding: utf-8
1
 # coding: utf-8
2
 import typing
2
 import typing
3
 
3
 
4
-from opencc.const import SIDE, COLLECTION_ALIVE
4
+from opencombat.const import SIDE, COLLECTION_ALIVE
5
 from synergine2_xyz.subjects import XYZSubject
5
 from synergine2_xyz.subjects import XYZSubject
6
 from synergine2_xyz.visible.simulation import VisibleMechanism
6
 from synergine2_xyz.visible.simulation import VisibleMechanism
7
 
7
 

opencc/simulation/physics.py → opencombat/simulation/physics.py View File

1
 # coding: utf-8
1
 # coding: utf-8
2
 import typing
2
 import typing
3
 
3
 
4
-from opencc.simulation.tmx import TileMap
5
-from opencc.simulation.tmx import TerrainTile
4
+from opencombat.simulation.tmx import TileMap
5
+from opencombat.simulation.tmx import TerrainTile
6
 from synergine2_xyz.physics import MoveCostComputer
6
 from synergine2_xyz.physics import MoveCostComputer
7
 from synergine2_xyz.physics import TMXPhysics
7
 from synergine2_xyz.physics import TMXPhysics
8
 from synergine2_xyz.subjects import XYZSubject
8
 from synergine2_xyz.subjects import XYZSubject
9
 
9
 
10
 if typing.TYPE_CHECKING:
10
 if typing.TYPE_CHECKING:
11
-    from opencc.simulation.base import BaseSubject
12
-    from opencc.simulation.subject import TileSubject
11
+    from opencombat.simulation.base import BaseSubject
12
+    from opencombat.simulation.subject import TileSubject
13
 
13
 
14
 
14
 
15
 class TileMoveCostComputer(MoveCostComputer):
15
 class TileMoveCostComputer(MoveCostComputer):

opencc/simulation/subject.py → opencombat/simulation/subject.py View File

1
 # coding: utf-8
1
 # coding: utf-8
2
-from opencc.const import COLLECTION_ALIVE, COMBAT_MODE_DEFENSE
3
-from opencc.simulation.base import BaseSubject
4
-from opencc.simulation.behaviour import MoveToBehaviour
5
-from opencc.simulation.behaviour import EngageOpponent
6
-from opencc.simulation.behaviour import LookAroundBehaviour
2
+from opencombat.const import COLLECTION_ALIVE, COMBAT_MODE_DEFENSE
3
+from opencombat.simulation.base import BaseSubject
4
+from opencombat.simulation.behaviour import MoveToBehaviour
5
+from opencombat.simulation.behaviour import EngageOpponent
6
+from opencombat.simulation.behaviour import LookAroundBehaviour
7
 from synergine2.share import shared
7
 from synergine2.share import shared
8
 
8
 
9
 
9
 

opencc/simulation/tmx.py → opencombat/simulation/tmx.py View File


opencc/sounds/204010__duckduckpony__homemade-gunshot-2.ogg → opencombat/sounds/204010__duckduckpony__homemade-gunshot-2.ogg View File


opencc/terminal/__init__.py → opencombat/terminal/__init__.py View File


opencc/terminal/base.py → opencombat/terminal/base.py View File

1
 # coding: utf-8
1
 # coding: utf-8
2
-from opencc.simulation.event import NewVisibleOpponent
3
-from opencc.simulation.event import FireEvent
4
-from opencc.simulation.event import DieEvent
5
-from opencc.simulation.event import NoLongerVisibleOpponent
6
-from opencc.simulation.physics import TilePhysics
7
-from opencc.simulation.subject import TileSubject as ManSubject
8
-from opencc.gui.actor import Man as ManActor
2
+from opencombat.simulation.event import NewVisibleOpponent
3
+from opencombat.simulation.event import FireEvent
4
+from opencombat.simulation.event import DieEvent
5
+from opencombat.simulation.event import NoLongerVisibleOpponent
6
+from opencombat.simulation.physics import TilePhysics
7
+from opencombat.simulation.subject import TileSubject as ManSubject
8
+from opencombat.gui.actor import Man as ManActor
9
 from synergine2_cocos2d.terminal import GameTerminal
9
 from synergine2_cocos2d.terminal import GameTerminal
10
 from synergine2_cocos2d.util import get_map_file_path_from_dir
10
 from synergine2_cocos2d.util import get_map_file_path_from_dir
11
 from synergine2_xyz.move.simulation import FinishMoveEvent
11
 from synergine2_xyz.move.simulation import FinishMoveEvent
33
         self.map_dir_path = map_dir_path
33
         self.map_dir_path = map_dir_path
34
 
34
 
35
     def run(self):
35
     def run(self):
36
-        from opencc.gui.base import Game
36
+        from opencombat.gui.base import Game
37
         from synergine2_cocos2d.gui import SubjectMapper
37
         from synergine2_cocos2d.gui import SubjectMapper
38
 
38
 
39
         self.gui = Game(
39
         self.gui = Game(

opencc/user_action.py → opencombat/user_action.py View File


+ 0 - 1
requirements.txt View File

14
 redis==2.10.6
14
 redis==2.10.6
15
 six==1.11.0
15
 six==1.11.0
16
 tmx==1.9.1
16
 tmx==1.9.1
17
-pytest
18
 git+https://github.com/buxx/synergine2.git@master
17
 git+https://github.com/buxx/synergine2.git@master
19
 git+https://github.com/buxx/cocos.git@tileset
18
 git+https://github.com/buxx/cocos.git@tileset

+ 9 - 9
run.py View File

11
 from synergine2.cycle import CycleManager
11
 from synergine2.cycle import CycleManager
12
 from synergine2.terminals import TerminalManager
12
 from synergine2.terminals import TerminalManager
13
 
13
 
14
-from opencc.const import FLAG, SIDE
15
-from opencc.const import FLAG_DE
16
-from opencc.const import DE_COLOR
17
-from opencc.const import URSS_COLOR
18
-from opencc.const import FLAG_URSS
19
-from opencc.simulation.subject import TileSubject
20
-from opencc.simulation.base import TileStrategySimulation
21
-from opencc.simulation.base import TileStrategySubjects
22
-from opencc.terminal.base import CocosTerminal
14
+from opencombat.const import FLAG, SIDE
15
+from opencombat.const import FLAG_DE
16
+from opencombat.const import DE_COLOR
17
+from opencombat.const import URSS_COLOR
18
+from opencombat.const import FLAG_URSS
19
+from opencombat.simulation.subject import TileSubject
20
+from opencombat.simulation.base import TileStrategySimulation
21
+from opencombat.simulation.base import TileStrategySubjects
22
+from opencombat.terminal.base import CocosTerminal
23
 
23
 
24
 
24
 
25
 def main(map_dir_path: str, seed_value: int=None):
25
 def main(map_dir_path: str, seed_value: int=None):

+ 1 - 1
tests/gui/test_interiors.py View File

2
 from synergine2_xyz.map import TMXMap
2
 from synergine2_xyz.map import TMXMap
3
 from PIL import Image
3
 from PIL import Image
4
 
4
 
5
-from opencc.simulation.interior import InteriorManager
5
+from opencombat.simulation.interior import InteriorManager
6
 
6
 
7
 
7
 
8
 def test_interior_zones__one_zone():
8
 def test_interior_zones__one_zone():