From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 19 Jan 2019 14:05:20 +0000 (+0100)
Subject: Add FOV optimization ideas. Toggle Hex indentation.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/condition_descriptions?a=commitdiff_plain;h=6cb020dfca859185a4ad60a2bb236c2bb7c909c9;p=plomrogue2-experiments

Add FOV optimization ideas. Toggle Hex indentation.
---

diff --git a/client.py b/client.py
index 11d33cc..db525ad 100755
--- a/client.py
+++ b/client.py
@@ -23,7 +23,7 @@ class MapSquare(game_common.Map):
 class MapHex(game_common.Map):
 
     def list_terrain_to_lines(self, terrain_as_list):
-        new_terrain_list = []
+        new_terrain_list = [' ']
         x = 0
         y = 0
         for c in terrain_as_list:
@@ -33,7 +33,7 @@ class MapHex(game_common.Map):
                 new_terrain_list += ['\n']
                 x = 0
                 y += 1
-                if y % 2 != 0:
+                if y % 2 == 0:
                     new_terrain_list += [' ']
         return ''.join(new_terrain_list)
 
diff --git a/server_/map_.py b/server_/map_.py
index d1aa538..444566d 100644
--- a/server_/map_.py
+++ b/server_/map_.py
@@ -83,25 +83,25 @@ class MapHex(Map):
     #    return False
 
     def move_UPLEFT(self, start_pos):
-        if start_pos[0] % 2 == 0:
+        if start_pos[0] % 2 == 1:
             return [start_pos[0] - 1, start_pos[1] - 1]
         else:
             return [start_pos[0] - 1, start_pos[1]]
 
     def move_UPRIGHT(self, start_pos):
-        if start_pos[0] % 2 == 0:
+        if start_pos[0] % 2 == 1:
             return [start_pos[0] - 1, start_pos[1]]
         else:
             return [start_pos[0] - 1, start_pos[1] + 1]
 
     def move_DOWNLEFT(self, start_pos):
-        if start_pos[0] % 2 == 0:
+        if start_pos[0] % 2 == 1:
             return [start_pos[0] + 1, start_pos[1] - 1]
         else:
             return [start_pos[0] + 1, start_pos[1]]
 
     def move_DOWNRIGHT(self, start_pos):
-        if start_pos[0] % 2 == 0:
+        if start_pos[0] % 2 == 1:
             return [start_pos[0] + 1, start_pos[1]]
         else:
             return [start_pos[0] + 1, start_pos[1] + 1]
@@ -118,6 +118,7 @@ class MapFovHex(MapHex):
         self.circle_out(yx, self.shadow_process_hex)
 
     def shadow_process_hex(self, yx, distance_to_center, dir_i, hex_i):
+        # TODO: If no shadow_angles yet and self[yx] == '.', skip all.
         CIRCLE = 360  # Since we'll float anyways, number is actually arbitrary.
 
         def correct_angle(angle):
@@ -155,7 +156,7 @@ class MapFovHex(MapHex):
             if under_shadow_angle(angle):
                 return
             self[yx] = '.'
-            if not self.source_map[yx] == '.':
+            if self.source_map[yx] != '.':
                 #print('DEBUG throws shadow', angle)
                 unmerged = True
                 while merge_angle(angle):
@@ -168,6 +169,7 @@ class MapFovHex(MapHex):
         number_steps = dir_i * distance_to_center + hex_i
         left_angle = correct_angle(-(step_size/2) - step_size*number_steps)
         right_angle = correct_angle(left_angle - step_size)
+        # TODO: derive left_angle from prev right_angle where possible
         if right_angle > left_angle:
             eval_angle([left_angle, 0])
             eval_angle([CIRCLE, right_angle])
@@ -185,6 +187,7 @@ class MapFovHex(MapHex):
                 return False
             return True
 
+        # TODO: Start circling only in earliest obstacle distance.
         directions = ('DOWNLEFT', 'LEFT', 'UPLEFT', 'UPRIGHT', 'RIGHT', 'DOWNRIGHT')
         circle_in_map = True
         distance = 1