From 005beb224df7f2df172d72192a0a6244e003367e Mon Sep 17 00:00:00 2001
From: Kanewersa <30356293+Kanewersa@users.noreply.github.com>
Date: Sat, 19 Jun 2021 00:04:34 +0200
Subject: [PATCH] Fix names in OnCollisionComponent

---
 .../{OnCollisionComponent.py => on_collision_component.py} | 4 ++--
 survival/generators/player_generator.py                    | 2 +-
 survival/generators/resource_generator.py                  | 4 ++--
 survival/systems/collision_system.py                       | 7 +++----
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename survival/components/{OnCollisionComponent.py => on_collision_component.py} (82%)

diff --git a/survival/components/OnCollisionComponent.py b/survival/components/on_collision_component.py
similarity index 82%
rename from survival/components/OnCollisionComponent.py
rename to survival/components/on_collision_component.py
index 49e3feb..0f30f00 100644
--- a/survival/components/OnCollisionComponent.py
+++ b/survival/components/on_collision_component.py
@@ -7,9 +7,9 @@ class OnCollisionComponent:
             callbacks = []
         self.callbacks = callbacks
 
-    def callAll(self):
+    def call_all(self):
         for func in self.callbacks:
             func()
 
-    def addCallback(self, fn, **kwargs):
+    def add_callback(self, fn, **kwargs):
         self.callbacks.append(partial(fn, **kwargs))
diff --git a/survival/generators/player_generator.py b/survival/generators/player_generator.py
index 246d4ec..9f1f033 100644
--- a/survival/generators/player_generator.py
+++ b/survival/generators/player_generator.py
@@ -1,4 +1,4 @@
-from survival.components.OnCollisionComponent import OnCollisionComponent
+from survival.components.on_collision_component import OnCollisionComponent
 from survival.components.camera_target_component import CameraTargetComponent
 from survival.components.consumption_component import ConsumptionComponent
 from survival.components.input_component import InputComponent
diff --git a/survival/generators/resource_generator.py b/survival/generators/resource_generator.py
index 043c0e9..fecde0d 100644
--- a/survival/generators/resource_generator.py
+++ b/survival/generators/resource_generator.py
@@ -1,7 +1,7 @@
 import random
 
 from survival import GameMap
-from survival.components.OnCollisionComponent import OnCollisionComponent
+from survival.components.on_collision_component import OnCollisionComponent
 from survival.components.inventory_component import InventoryComponent
 from survival.components.learning_component import LearningComponent
 from survival.components.position_component import PositionComponent
@@ -35,7 +35,7 @@ class ResourceGenerator:
             resource_type = random.choice(list(ResourceType))
             sprite = SpriteComponent(sprites[resource_type])
             col = OnCollisionComponent()
-            col.addCallback(self.remove_resource, world=self.world, game_map=self.map, resource_ent=obj, player=player)
+            col.add_callback(self.remove_resource, world=self.world, game_map=self.map, resource_ent=obj, player=player)
             self.world.add_component(obj, pos)
             self.world.add_component(obj, sprite)
             self.world.add_component(obj, col)
diff --git a/survival/systems/collision_system.py b/survival/systems/collision_system.py
index 377a072..b3cdd0b 100644
--- a/survival/systems/collision_system.py
+++ b/survival/systems/collision_system.py
@@ -1,10 +1,9 @@
 import operator
 
 from survival import esper
-from survival.components.OnCollisionComponent import OnCollisionComponent
+from survival.components.on_collision_component import OnCollisionComponent
 from survival.components.moving_component import MovingComponent
 from survival.components.position_component import PositionComponent
-from survival.components.learning_component import LearningComponent
 from survival.enums import Direction
 
 
@@ -24,14 +23,14 @@ class CollisionSystem(esper.Processor):
             moving.direction_vector = vector
             if self.check_collision(moving.target):
                 self.world.remove_component(ent, MovingComponent)
-                onCol.callAll()
+                onCol.call_all()
                 colliding_object: int = self.map.get_entity(moving.target)
 
                 if colliding_object is None or not self.world.entity_exists(colliding_object):
                     continue
 
                 if self.world.has_component(colliding_object, OnCollisionComponent):
-                    self.world.component_for_entity(colliding_object, OnCollisionComponent).callAll()
+                    self.world.component_for_entity(colliding_object, OnCollisionComponent).call_all()
 
             else:
                 self.map.move_entity(pos.grid_position, moving.target)