add essence

2025-08-21 00:20:26 +08:00
parent 658f2aefdb
commit 25ff7c1c17
4 changed files with 330 additions and 43 deletions
--- a/tests/run_front.py
+++ b/tests/run_front.py
@@ -16,6 +16,7 @@ from src.classes.tile import Map, TileType
 from src.classes.avatar import Avatar, Gender
 from src.classes.calendar import Month, Year
 from src.classes.action import Move
+from src.classes.essence import Essence, EssenceType


 def clamp(value: int, lo: int, hi: int) -> int:
@@ -50,20 +51,16 @@ def build_rich_random_map(width: int = 30, height: int = 20, *, seed: int | None
        for x in range(0, desert_w):
            game_map.create_tile(x, y, TileType.DESERT)
            desert_tiles.append((x, y))
-    # 绿洲
-    for _ in range(random.randint(2, 3)):
-        cx = random.randint(1, max(1, desert_w - 1))
-        cy = random.randint(2, height - 3)
-        r = random.randint(1, 2)
-        for x, y in circle_points(cx, cy, r, width, height):
-            if x < desert_w:
-                game_map.create_tile(x, y, TileType.WATER)
+    # 移除绿洲，大漠里面不要有水

    # 3) 北部雪山与冰原（顶部宽带，覆盖整宽度）
    north_band = max(3, height // 5)
+    snow_mountain_tiles: List[Tuple[int, int]] = []
+    glacier_tiles: List[Tuple[int, int]] = []
    for y in range(0, north_band):
        for x in range(width):
            game_map.create_tile(x, y, TileType.SNOW_MOUNTAIN)
+            snow_mountain_tiles.append((x, y))
    # 局部冰川簇
    for _ in range(random.randint(2, 3)):
        cx = random.randint(1, width - 2)
@@ -72,6 +69,7 @@ def build_rich_random_map(width: int = 30, height: int = 20, *, seed: int | None
        for x, y in circle_points(cx, cy, r, width, height):
            if y < north_band:
                game_map.create_tile(x, y, TileType.GLACIER)
+                glacier_tiles.append((x, y))

    # 4) 南部热带雨林（底部宽带，覆盖整宽度）
    south_band = max(3, height // 5)
@@ -108,25 +106,57 @@ def build_rich_random_map(width: int = 30, height: int = 20, *, seed: int | None
            if x < sea_x0:
                game_map.create_tile(x, y, TileType.WATER)

-    # 7) 中部山脉：多条更长的链（避开海域和上下带）
-    for _ in range(random.randint(6, 10)):
-        length = random.randint(10, 20)
-        x = random.randint(desert_w + 1, sea_x0 - 2)
-        y = random.randint(north_band + 1, height - south_band - 2)
-        dx, dy = random.choice([(1, 0), (1, 1), (1, -1)])
+    # 7) 中部山脉：聚集成为一堆（避开海域和上下带，左移）
+    mountain_tiles: List[Tuple[int, int]] = []
+    # 左移山脉生成范围，从沙漠边缘开始，但不要延伸到太右边
+    mountain_end_x = sea_x0 - max(4, width // 8)  # 留出更多空间给东部
+    
+    # 选择一个中心点，让山脉围绕这个中心聚集
+    center_x = random.randint(desert_w + 3, mountain_end_x - 3)
+    center_y = random.randint(north_band + 3, height - south_band - 3)
+    
+    # 生成多条山脉链，都从中心点附近开始
+    for _ in range(random.randint(8, 12)):
+        length = random.randint(8, 15)
+        # 从中心点附近随机选择一个起始点
+        start_x = center_x + random.randint(-2, 2)
+        start_y = center_y + random.randint(-2, 2)
+        x, y = start_x, start_y
+        
+        # 随机选择方向，但倾向于向中心聚集
+        directions = [(1, 0), (1, 1), (1, -1), (-1, 0), (-1, 1), (-1, -1), (0, 1), (0, -1)]
+        dx, dy = random.choice(directions)
+        
        for _ in range(length):
-            if 0 <= x < sea_x0 and north_band <= y < height - south_band:
+            if 0 <= x < mountain_end_x and north_band <= y < height - south_band:
                game_map.create_tile(x, y, TileType.MOUNTAIN)
+                mountain_tiles.append((x, y))
+            # 随机改变方向，增加聚集效果
+            if random.random() < 0.3:
+                dx, dy = random.choice(directions)
            x += dx
            y += dy

-    # 8) 中部森林：几个圆斑
+    # 8) 中部森林：几个圆斑（调整范围与山脉一致）
+    mountain_end_x = sea_x0 - max(4, width // 8)  # 与山脉使用相同的结束位置
    for _ in range(random.randint(4, 7)):
-        cx = random.randint(desert_w + 1, sea_x0 - 2)
+        cx = random.randint(desert_w + 1, mountain_end_x - 2)
        cy = random.randint(north_band + 1, height - south_band - 2)
        r = random.randint(2, 4)
        for x, y in circle_points(cx, cy, r, width, height):
            game_map.create_tile(x, y, TileType.FOREST)
+    
+    # 8.5) 火山：在中央山脉附近生成一个火山
+    volcano_tiles: List[Tuple[int, int]] = []
+    # 在中央山脉的中心点附近生成火山
+    volcano_center_x = center_x + random.randint(-1, 1)
+    volcano_center_y = center_y + random.randint(-1, 1)
+    volcano_radius = random.randint(2, 3)
+    
+    for x, y in circle_points(volcano_center_x, volcano_center_y, volcano_radius, width, height):
+        if 0 <= x < mountain_end_x and north_band <= y < height - south_band:
+            game_map.create_tile(x, y, TileType.VOLCANO)
+            volcano_tiles.append((x, y))

    # 9) 城市：2~4个，尽量落在非极端地形
    cities = 0
@@ -136,32 +166,46 @@ def build_rich_random_map(width: int = 30, height: int = 20, *, seed: int | None
        x = random.randint(0, width - 1)
        y = random.randint(0, height - 1)
        t = game_map.get_tile(x, y)
-        if t.type not in (TileType.WATER, TileType.SEA, TileType.MOUNTAIN, TileType.GLACIER, TileType.SNOW_MOUNTAIN, TileType.DESERT):
+        if t.type not in (TileType.WATER, TileType.SEA, TileType.MOUNTAIN, TileType.GLACIER, TileType.SNOW_MOUNTAIN, TileType.DESERT, TileType.VOLCANO):
            game_map.create_tile(x, y, TileType.CITY)
            cities += 1

    # 10) 创建示例 Region（演示：底色可无 region；特意设立的带名字与描述）
    if desert_tiles:
-        game_map.create_region("大漠", "西部荒漠地带", 40, desert_tiles)
+        game_map.create_region("大漠", "西部荒漠地带", 
+            Essence(density={EssenceType.EARTH: 8, EssenceType.FIRE: 6, EssenceType.GOLD: 4, EssenceType.WOOD: 2, EssenceType.WATER: 1}), 
+            desert_tiles)
    if sea_tiles:
-        game_map.create_region("东海", "最东边的大海", 80, sea_tiles)
+        game_map.create_region("东海", "最东边的大海", 
+            Essence(density={EssenceType.WATER: 10, EssenceType.EARTH: 3, EssenceType.GOLD: 2, EssenceType.WOOD: 1, EssenceType.FIRE: 1}), 
+            sea_tiles)
    if rainforest_tiles:
-        game_map.create_region("南疆雨林", "南部潮湿炎热的雨林", 120, rainforest_tiles)
+        game_map.create_region("南疆雨林", "南部潮湿炎热的雨林", 
+            Essence(density={EssenceType.WOOD: 9, EssenceType.WATER: 7, EssenceType.FIRE: 5, EssenceType.EARTH: 3, EssenceType.GOLD: 2}), 
+            rainforest_tiles)

-    # 9.5) 生成一条横贯东西的长河（允许小幅上下摆动与随机加宽）
+    # 9.5) 生成一条横贯东西的长河（允许小幅上下摆动与随机加宽，避开沙漠和大海）
    river_tiles: List[Tuple[int, int]] = []
    # 选一条靠近中部的基准纬线，避开极北/极南带
    base_y = clamp(height // 2 + random.randint(-2, 2), north_band + 1, height - south_band - 2)
    y = base_y
    for x in range(0, width):
+        # 检查当前位置是否为沙漠或大海，如果是则跳过
+        current_tile = game_map.get_tile(x, y)
+        if current_tile.type in (TileType.DESERT, TileType.SEA):
+            continue
+            
        # 开凿主河道
        game_map.create_tile(x, y, TileType.WATER)
        river_tiles.append((x, y))
-        # 随机加宽 1 格（上下其一）
+        # 随机加宽 1 格（上下其一），但要避开沙漠和大海
        if random.random() < 0.45:
            wy = clamp(y + random.choice([-1, 1]), 0, height - 1)
-            game_map.create_tile(x, wy, TileType.WATER)
-            river_tiles.append((x, wy))
+            # 检查加宽位置是否为沙漠或大海
+            wide_tile = game_map.get_tile(x, wy)
+            if wide_tile.type not in (TileType.DESERT, TileType.SEA):
+                game_map.create_tile(x, wy, TileType.WATER)
+                river_tiles.append((x, wy))
        # 轻微摆动（-1, 0, 1），并缓慢回归基准线
        drift_choices = [-1, 0, 1]
        dy = random.choice(drift_choices)
@@ -203,22 +247,148 @@ def build_rich_random_map(width: int = 30, height: int = 20, *, seed: int | None
    # 组装所有地理信息到一个统一的配置 dict
    regions_cfg: List[Dict[str, Any]] = []
    if desert_tiles:
-        regions_cfg.append({"name": "大漠", "description": "西部荒漠地带", "qi": 40, "tiles": desert_tiles})
+        regions_cfg.append({
+            "name": "大漠", 
+            "description": "西部荒漠地带", 
+            "essence": Essence(density={
+                EssenceType.EARTH: 8, 
+                EssenceType.FIRE: 6, 
+                EssenceType.GOLD: 4, 
+                EssenceType.WOOD: 2, 
+                EssenceType.WATER: 1
+            }), 
+            "tiles": desert_tiles
+        })
    if sea_tiles:
-        regions_cfg.append({"name": "东海", "description": "最东边的大海", "qi": 80, "tiles": sea_tiles})
+        regions_cfg.append({
+            "name": "东海", 
+            "description": "最东边的大海", 
+            "essence": Essence(density={
+                EssenceType.WATER: 10, 
+                EssenceType.EARTH: 3, 
+                EssenceType.GOLD: 2, 
+                EssenceType.WOOD: 1, 
+                EssenceType.FIRE: 1
+            }), 
+            "tiles": sea_tiles
+        })
    if rainforest_tiles:
-        regions_cfg.append({"name": "南疆雨林", "description": "南部潮湿炎热的雨林", "qi": 120, "tiles": rainforest_tiles})
+        regions_cfg.append({
+            "name": "南疆雨林", 
+            "description": "南部潮湿炎热的雨林", 
+            "essence": Essence(density={
+                EssenceType.WOOD: 9, 
+                EssenceType.WATER: 7, 
+                EssenceType.FIRE: 5, 
+                EssenceType.EARTH: 3, 
+                EssenceType.GOLD: 2
+            }), 
+            "tiles": rainforest_tiles
+        })
    if river_tiles:
-        regions_cfg.append({"name": "大河", "description": "发源内陆，奔流入海", "qi": 100, "tiles": river_tiles})
+        regions_cfg.append({
+            "name": "大河", 
+            "description": "发源内陆，奔流入海", 
+            "essence": Essence(density={
+                EssenceType.WATER: 8, 
+                EssenceType.EARTH: 4, 
+                EssenceType.WOOD: 3, 
+                EssenceType.GOLD: 2, 
+                EssenceType.FIRE: 1
+            }), 
+            "tiles": river_tiles
+        })

+    # 添加山脉region（提高金属性灵气）
+    if mountain_tiles:
+        regions_cfg.append({
+            "name": "中央山脉", 
+            "description": "横贯大陆的中央山脉，蕴含丰富的金属性灵气", 
+            "essence": Essence(density={
+                EssenceType.GOLD: 10,  # 提高金属性灵气
+                EssenceType.EARTH: 9, 
+                EssenceType.FIRE: 5, 
+                EssenceType.WATER: 3, 
+                EssenceType.WOOD: 2
+            }), 
+            "tiles": mountain_tiles
+        })
+    
+    # 添加雪山region
+    if snow_mountain_tiles:
+        regions_cfg.append({
+            "name": "北境雪山", 
+            "description": "北部终年积雪的高山地带", 
+            "essence": Essence(density={
+                EssenceType.WATER: 9, 
+                EssenceType.EARTH: 8, 
+                EssenceType.GOLD: 6, 
+                EssenceType.FIRE: 2, 
+                EssenceType.WOOD: 1
+            }), 
+            "tiles": snow_mountain_tiles
+        })
+    
+    # 添加冰川region
+    if glacier_tiles:
+        regions_cfg.append({
+            "name": "极地冰川", 
+            "description": "北部极寒的冰川地带", 
+            "essence": Essence(density={
+                EssenceType.WATER: 10, 
+                EssenceType.EARTH: 7, 
+                EssenceType.GOLD: 5, 
+                EssenceType.FIRE: 1, 
+                EssenceType.WOOD: 1
+            }), 
+            "tiles": glacier_tiles
+        })
+    
+    # 添加火山region（火属性灵气最高）
+    if volcano_tiles:
+        regions_cfg.append({
+            "name": "火山", 
+            "description": "活跃的火山地带，火属性灵气极其浓郁", 
+            "essence": Essence(density={
+                EssenceType.FIRE: 10,  # 火属性灵气最高
+                EssenceType.EARTH: 8, 
+                EssenceType.GOLD: 6, 
+                EssenceType.WATER: 2, 
+                EssenceType.WOOD: 1
+            }), 
+            "tiles": volcano_tiles
+        })
+    
    for i, comp in enumerate(sorted(mountain_clusters, key=len, reverse=True), start=1):
-        regions_cfg.append({"name": f"高山{i}", "description": "山脉与高峰地带", "qi": 110, "tiles": comp})
+        regions_cfg.append({
+            "name": f"高山{i}", 
+            "description": "山脉与高峰地带", 
+            "essence": Essence(density={
+                EssenceType.EARTH: 9, 
+                EssenceType.GOLD: 7, 
+                EssenceType.FIRE: 4, 
+                EssenceType.WATER: 3, 
+                EssenceType.WOOD: 2
+            }), 
+            "tiles": comp
+        })
    for i, comp in enumerate(sorted(forest_clusters, key=len, reverse=True), start=1):
-        regions_cfg.append({"name": f"大林{i}", "description": "茂密幽深的森林", "qi": 90, "tiles": comp})
+        regions_cfg.append({
+            "name": f"大林{i}", 
+            "description": "茂密幽深的森林", 
+            "essence": Essence(density={
+                EssenceType.WOOD: 8, 
+                EssenceType.EARTH: 5, 
+                EssenceType.WATER: 4, 
+                EssenceType.FIRE: 2, 
+                EssenceType.GOLD: 1
+            }), 
+            "tiles": comp
+        })

    # 应用配置创建 Region，并把配置存到 map 上，方便前端/后续逻辑使用
    for r in regions_cfg:
-        game_map.create_region(r["name"], r["description"], r["qi"], r["tiles"])
+        game_map.create_region(r["name"], r["description"], r["essence"], r["tiles"])
    geo_config: Dict[str, Any] = {"regions": regions_cfg}
    setattr(game_map, "geo_config", geo_config)

@@ -244,7 +414,7 @@ def make_avatars(world: World, count: int = 12) -> list[Avatar]:
            x = random.randint(0, width - 1)
            y = random.randint(0, height - 1)
            t = world.map.get_tile(x, y)
-            if t.type not in (TileType.WATER, TileType.SEA, TileType.MOUNTAIN):
+            if t.type not in (TileType.WATER, TileType.SEA, TileType.MOUNTAIN, TileType.VOLCANO):
                break
        else:
            x, y = random.randint(0, width - 1), random.randint(0, height - 1)