rename OpenCC for OpenCombat

README.md

@@ -1,10 +1,10 @@
-# OpenCC
+# OpenCombat
 
 Open source close combat inspired game
 
 # Install
 
-OpenCC is in development mode. Considering in your virtual environment, install synergine2:
+OpenCombat is in development mode. Considering in your virtual environment, install synergine2:
 
     git clone https://github.com/buxx/synergine2.git
     cd synergine2
@@ -19,4 +19,4 @@ Then install additional or specific version of development environment:
 
 Example run:
 
-    python run.py opencc/maps/003
+    python run.py opencombat/maps/003

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

@@ -14,9 +14,9 @@ from pyglet.window import key
 from cocos.actions import MoveTo as BaseMoveTo
 from cocos.audio.pygame.mixer import Sound
 
-from opencc.simulation.interior import InteriorManager
-from opencc.simulation.tmx import TileMap
-from opencc.user_action import UserAction
+from opencombat.simulation.interior import InteriorManager
+from opencombat.simulation.tmx import TileMap
+from opencombat.user_action import UserAction
 from synergine2.config import Config
 from synergine2.log import SynergineLogger
 from synergine2.terminals import Terminal
@@ -32,10 +32,10 @@ from synergine2_xyz.move.simulation import FinishMoveEvent
 from synergine2_xyz.move.simulation import StartMoveEvent
 from synergine2_xyz.physics import Physics
 from synergine2_xyz.utils import get_angle
-from opencc.simulation.event import NewVisibleOpponent
-from opencc.simulation.event import NoLongerVisibleOpponent
-from opencc.simulation.event import FireEvent
-from opencc.simulation.event import DieEvent
+from opencombat.simulation.event import NewVisibleOpponent
+from opencombat.simulation.event import NoLongerVisibleOpponent
+from opencombat.simulation.event import FireEvent
+from opencombat.simulation.event import DieEvent
 
 
 class EditLayer(BaseEditLayer):
@@ -45,7 +45,7 @@ class EditLayer(BaseEditLayer):
         # TODO BS 20171213: Into other layer !
         self.last_interior_draw = 0
         # FIXME BS: hardcoded (move into other layer)
-        self.interior_manager = InteriorManager(TileMap('opencc/maps/003/003.tmx'))
+        self.interior_manager = InteriorManager(TileMap('opencombat/maps/003/003.tmx'))
 
     def _on_key_press(self, k, m):
         if self.selection:
@@ -76,7 +76,7 @@ class EditLayer(BaseEditLayer):
 
             if interiors:
                 # FIXME: hardcoded
-                image = Image.open('opencc/maps/003/background.png')
+                image = Image.open('opencombat/maps/003/background.png')
                 image_fake_file = io.BytesIO()
                 # FIXME: tile height/width !
                 self.interior_manager.update_image_for_interiors(image, interiors, 8, 8)
@@ -128,7 +128,7 @@ class Game(TMXGui):
             read_queue_interval=read_queue_interval,
             map_dir_path=map_dir_path,
         )
-        self.sound_lib = AudioLibrary('opencc/sounds/')
+        self.sound_lib = AudioLibrary('opencombat/sounds/')
 
         self.terminal.register_event_handler(
             FinishMoveEvent,
@@ -166,10 +166,10 @@ class Game(TMXGui):
         self.move_crawl_duration_ref = float(self.config.resolve('game.move.crawl_ref_time'))
 
     def before_run(self) -> None:
-        from opencc.gui.move import MoveActorInteraction
-        from opencc.gui.move import MoveFastActorInteraction
-        from opencc.gui.move import MoveCrawlActorInteraction
-        from opencc.gui.fire import FireActorInteraction
+        from opencombat.gui.move import MoveActorInteraction
+        from opencombat.gui.move import MoveFastActorInteraction
+        from opencombat.gui.move import MoveCrawlActorInteraction
+        from opencombat.gui.fire import FireActorInteraction
 
         self.layer_manager.interaction_manager.register(MoveActorInteraction, self.layer_manager)
         self.layer_manager.interaction_manager.register(MoveFastActorInteraction, self.layer_manager)
@@ -275,6 +275,6 @@ class Game(TMXGui):
 
     def subject_die(self, event: DieEvent) -> None:
         killed_actor = self.layer_manager.subject_layer.subjects_index[event.shoot_subject_id]
-        dead_image = pyglet.resource.image('opencc/maps/003/actors/man_d1.png')
+        dead_image = pyglet.resource.image('opencombat/maps/003/actors/man_d1.png')
         killed_actor.update_image(dead_image)
         killed_actor.freeze()

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

@@ -1,9 +1,9 @@
 # coding: utf-8
 import typing
 
-from opencc.simulation.fire import RequestFireBehaviour
+from opencombat.simulation.fire import RequestFireBehaviour
 from synergine2_cocos2d.interaction import BaseActorInteraction
-from opencc.user_action import UserAction
+from opencombat.user_action import UserAction
 from synergine2.simulation import SimulationBehaviour
 from synergine2_cocos2d.actor import Actor
 from synergine2_cocos2d.gl import draw_line

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

@@ -2,7 +2,7 @@
 import typing
 
 from synergine2_cocos2d.interaction import BaseActorInteraction
-from opencc.user_action import UserAction
+from opencombat.user_action import UserAction
 from synergine2.simulation import SimulationBehaviour
 from synergine2_cocos2d.actor import Actor
 from synergine2_cocos2d.gl import draw_line

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

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

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

@@ -3,14 +3,14 @@ import random
 import time
 import typing
 
-from opencc.const import COLLECTION_ALIVE
-from opencc.simulation.base import AliveSubjectBehaviour
-from opencc.simulation.event import NoLongerVisibleOpponent
-from opencc.simulation.event import FireEvent
-from opencc.simulation.event import DieEvent
-from opencc.simulation.event import NewVisibleOpponent
-from opencc.simulation.mechanism import OpponentVisibleMechanism
-from opencc.user_action import UserAction
+from opencombat.const import COLLECTION_ALIVE
+from opencombat.simulation.base import AliveSubjectBehaviour
+from opencombat.simulation.event import NoLongerVisibleOpponent
+from opencombat.simulation.event import FireEvent
+from opencombat.simulation.event import DieEvent
+from opencombat.simulation.event import NewVisibleOpponent
+from opencombat.simulation.mechanism import OpponentVisibleMechanism
+from opencombat.user_action import UserAction
 from synergine2.config import Config
 from synergine2.simulation import Simulation
 from synergine2.simulation import Event

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

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

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

@@ -1,15 +1,15 @@
 # coding: utf-8
 import typing
 
-from opencc.simulation.tmx import TileMap
-from opencc.simulation.tmx import TerrainTile
+from opencombat.simulation.tmx import TileMap
+from opencombat.simulation.tmx import TerrainTile
 from synergine2_xyz.physics import MoveCostComputer
 from synergine2_xyz.physics import TMXPhysics
 from synergine2_xyz.subjects import XYZSubject
 
 if typing.TYPE_CHECKING:
-    from opencc.simulation.base import BaseSubject
-    from opencc.simulation.subject import TileSubject
+    from opencombat.simulation.base import BaseSubject
+    from opencombat.simulation.subject import TileSubject
 
 
 class TileMoveCostComputer(MoveCostComputer):

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

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

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

@@ -1,11 +1,11 @@
 # coding: utf-8
-from opencc.simulation.event import NewVisibleOpponent
-from opencc.simulation.event import FireEvent
-from opencc.simulation.event import DieEvent
-from opencc.simulation.event import NoLongerVisibleOpponent
-from opencc.simulation.physics import TilePhysics
-from opencc.simulation.subject import TileSubject as ManSubject
-from opencc.gui.actor import Man as ManActor
+from opencombat.simulation.event import NewVisibleOpponent
+from opencombat.simulation.event import FireEvent
+from opencombat.simulation.event import DieEvent
+from opencombat.simulation.event import NoLongerVisibleOpponent
+from opencombat.simulation.physics import TilePhysics
+from opencombat.simulation.subject import TileSubject as ManSubject
+from opencombat.gui.actor import Man as ManActor
 from synergine2_cocos2d.terminal import GameTerminal
 from synergine2_cocos2d.util import get_map_file_path_from_dir
 from synergine2_xyz.move.simulation import FinishMoveEvent
@@ -33,7 +33,7 @@ class CocosTerminal(GameTerminal):
         self.map_dir_path = map_dir_path
 
     def run(self):
-        from opencc.gui.base import Game
+        from opencombat.gui.base import Game
         from synergine2_cocos2d.gui import SubjectMapper
 
         self.gui = Game(

requirements.txt

@@ -14,6 +14,5 @@ PyYAML==3.12
 redis==2.10.6
 six==1.11.0
 tmx==1.9.1
-pytest
 git+https://github.com/buxx/synergine2.git@master
 git+https://github.com/buxx/cocos.git@tileset

run.py

@@ -11,15 +11,15 @@ from synergine2.core import Core
 from synergine2.cycle import CycleManager
 from synergine2.terminals import TerminalManager
 
-from opencc.const import FLAG, SIDE
-from opencc.const import FLAG_DE
-from opencc.const import DE_COLOR
-from opencc.const import URSS_COLOR
-from opencc.const import FLAG_URSS
-from opencc.simulation.subject import TileSubject
-from opencc.simulation.base import TileStrategySimulation
-from opencc.simulation.base import TileStrategySubjects
-from opencc.terminal.base import CocosTerminal
+from opencombat.const import FLAG, SIDE
+from opencombat.const import FLAG_DE
+from opencombat.const import DE_COLOR
+from opencombat.const import URSS_COLOR
+from opencombat.const import FLAG_URSS
+from opencombat.simulation.subject import TileSubject
+from opencombat.simulation.base import TileStrategySimulation
+from opencombat.simulation.base import TileStrategySubjects
+from opencombat.terminal.base import CocosTerminal
 
 
 def main(map_dir_path: str, seed_value: int=None):

tests/gui/test_interiors.py

@@ -2,7 +2,7 @@
 from synergine2_xyz.map import TMXMap
 from PIL import Image
 
-from opencc.simulation.interior import InteriorManager
+from opencombat.simulation.interior import InteriorManager
 
 
 def test_interior_zones__one_zone():