From 82d21e65b2b76081ecc013e8e639e22372d3a5ad Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 26 Oct 2026 16:44:16 -0400 Subject: [PATCH] deploy(dev): open region 16 on 51f979a's image - even split, 130% collection Region 16 keeps region 15's tuning (100 seeded wildlife, triple food, half the bud fee) and adds feeding.split_evenly = 1 and feeding.collection_percent = 130: food sources share the matter limit equally between the nutrients they hold. Its 100 wildlife take IDs 900000003716-900000003815. The grant broker routes accounts to region 16; region 15 stays stored and 736bf98's build stays retained. Refreshes the session window. Co-Authored-By: Claude Opus 5.5 --- .../grant-broker-dev/deployment.yaml | 4 +-- .../region/dev-session-route/listener.yaml | 2 +- .../kubernetes/region/dev/kustomization.yaml | 4 +-- .../kubernetes/region/dev/region-values.yaml | 27 ++++++++++--------- .../region/dev/tuning/cellular-revamp.tuning | 6 +++++ .../kubernetes/stores/dev/kustomization.yaml | 2 +- tests/cellular_revamp_tuning_tests.cpp | 2 ++ 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/deploy/kubernetes/grant-broker-dev/deployment.yaml b/deploy/kubernetes/grant-broker-dev/deployment.yaml index 96b3181..5a53718 100644 --- a/deploy/kubernetes/grant-broker-dev/deployment.yaml +++ b/deploy/kubernetes/grant-broker-dev/deployment.yaml @@ -47,9 +47,9 @@ spec: - {name: BROKER_WORLD, value: "100"} - {name: BROKER_FRAME, value: "9"} # New accounts start here; an account with a live life goes to its region. - - {name: BROKER_DEFAULT_REGION, value: "15"} + - {name: BROKER_DEFAULT_REGION, value: "16"} # Space-separated REGION=HOST:PORT=TLS_NAME, every region a grant may name. - - {name: BROKER_ROUTES, value: "15=void.aeternalisgames.com:7400=void.aeternalisgames.com"} + - {name: BROKER_ROUTES, value: "16=void.aeternalisgames.com:7400=void.aeternalisgames.com"} # Must not exceed the region's REGION_M10_MAX_GRANT_LIFETIME. - {name: BROKER_GRANT_LIFETIME, value: "600"} - {name: BROKER_OIDC_ISSUER, value: "https://auth.aeternalisgames.com/realms/aeternalis"} diff --git a/deploy/kubernetes/region/dev-session-route/listener.yaml b/deploy/kubernetes/region/dev-session-route/listener.yaml index e4d13ba..e026c48 100644 --- a/deploy/kubernetes/region/dev-session-route/listener.yaml +++ b/deploy/kubernetes/region/dev-session-route/listener.yaml @@ -12,7 +12,7 @@ spec: env: - {name: REGION_SESSION, value: "dev"} - {name: REGION_SESSION_LISTEN, value: "0.0.0.0:7400"} - - {name: REGION_SESSION_WINDOW, value: "dev-20261026T195548-24751cee:1793058948"} + - {name: REGION_SESSION_WINDOW, value: "dev-20261026T204344-a7cbcef9:1793061824"} - {name: REGION_M10_MAX_GRANT_LIFETIME, value: "14400"} ports: # QUIC (ADR-0090): UDP only; nothing listens on TCP 7400. diff --git a/deploy/kubernetes/region/dev/kustomization.yaml b/deploy/kubernetes/region/dev/kustomization.yaml index 7ea8521..601f7cc 100644 --- a/deploy/kubernetes/region/dev/kustomization.yaml +++ b/deploy/kubernetes/region/dev/kustomization.yaml @@ -1,4 +1,4 @@ -# Region host for evolution-dev: world 100, region 15, frame 9 (cellular-v10 opening, rules 13). +# Region host for evolution-dev: world 100, region 16, frame 9 (cellular-v10 opening, rules 13). # The server image digest appears twice on purpose: as the image and as the build # identity the region records in every commit. The policy check requires they match. apiVersion: kustomize.config.k8s.io/v1beta1 @@ -13,7 +13,7 @@ components: images: - name: aevolution-server newName: registry.aeternalisgames.com/aeternalis/aevolution-server - digest: sha256:a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada + digest: sha256:222fa3dea0cb25335234678fa0d628222fc92c9ff38a1869330d973b8c4b4e53 patches: - path: region-values.yaml # The Git tuning files for the provision Job's liquid (rules 12) and revamp (rules 13) diff --git a/deploy/kubernetes/region/dev/region-values.yaml b/deploy/kubernetes/region/dev/region-values.yaml index 93e250e..1328e07 100644 --- a/deploy/kubernetes/region/dev/region-values.yaml +++ b/deploy/kubernetes/region/dev/region-values.yaml @@ -1,10 +1,10 @@ # Region identity and build (the server image digest without "sha256:"). -# Revamp playtests (rules 13, ADR-0179): region 15 holds a cellular-v10 opening, a 60 x 60 mm +# Revamp playtests (rules 13, ADR-0179): region 16 holds a cellular-v10 opening, a 60 x 60 mm # cellular-v7 genesis taken durably to rules 11 with light (trial 40 pJ per square um per # tick), to rules 12 with the currents, handling and moving food of the Git tuning file # (tuning/cellular.tuning), and to rules 13 with the revamp rules of -# tuning/cellular-revamp.tuning. Regions 1-14 stay in the stores untouched; they are simply -# not served while dev runs region 15. A region keeps the tuning it opened with, so a new +# tuning/cellular-revamp.tuning. Regions 1-15 stay in the stores untouched; they are simply +# not served while dev runs region 16. A region keeps the tuning it opened with, so a new # region opens when the tuning changes (until live retuning exists). apiVersion: apps/v1 kind: Deployment @@ -17,13 +17,13 @@ spec: - name: evo-server env: - {name: REGION_WORLD, value: "100"} - - {name: REGION_ID, value: "15"} - - {name: REGION_BUILD, value: a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada} + - {name: REGION_ID, value: "16"} + - {name: REGION_BUILD, value: 222fa3dea0cb25335234678fa0d628222fc92c9ff38a1869330d973b8c4b4e53} - {name: REGION_PROFILE, value: cellular} # The whole world's catalog: dev world 100 has only this region. - - {name: REGION_LIFE_ROUTES, value: "15=void.aeternalisgames.com:7400=void.aeternalisgames.com"} + - {name: REGION_LIFE_ROUTES, value: "16=void.aeternalisgames.com:7400=void.aeternalisgames.com"} # Keep the currently promoted build plus prior committed builds recoverable. - - {name: REGION_RETAINED, value: "f1183f4476bac87c09504a574112df4663931f67e88cc38dc08f867ce98ff726 815153514ca4a53967932bb46456ff4cb4e1784f9db247bc3b613b7e8365c59f 21507d4369cebef83ee05152daea5ac2f581ea86a9dc85276ef54e3f9f6388c5 5a77cf9e96e7a0e40ea07e9394a3fa458184ce54f8f774a8fb59cbec1db75c54 e17c62bc8dbad089da57e8b30adc391ff8b947cc7182b3160f5e2709103ded78 6c96629eb3c26513d55207b109fe2a9873a58f43510bd067b7d5422572e3fb42 7952185d5ef96504b5793b76fe72e42cbe9c9ac19149bf912adb2c3a735f8dbf f378a43d6146eeed864110b90848df0bec9672fa4c9941a2d04de249068a4a09 ecac8f9f2489c547ce58f12ed01baaa3939c8adbf8aed05c313abbf422cdc855 4af7209941643e0c6a100e2b4e2fef8a959b87fdbfac2173b7867cfc1808bd66 edb39f956df1f481d7ba724cac4ceb3a4fe494efc02f994d31d6c96dfae04a78 0ded41070dd3e0c0daa43e13dadc58c449865eec00530cfceff3c1579c66e916 754446fe4e5f33e9c0d5a1a74a02444a01de1700673442c90827c708aba62cee c597c0bac8b4a796e1e8b70344f9866cb047cc90cfb15af774d38860594ea27a e83c333a87056c678b5e835947647ef42370b43dbfc31997744f28d993f9c4aa db2b0e6a6071502381a768d70fd9bab8c08c64e4717fc23da45dbe8adc5fa3d6 cdc10712ff8bf956f8f5900709500046493523b51dc670d5b2d01eaf604bcd38 028571f257b485acafbe79b704a80f273d899485c4bb264d9c8137bf51e33217 566c29329433934f1436faf94652a7b925df8b4587ab04470322172f47c31c02 1dd640eba3e9dbdd10106698215a0a06df89c5cdf801c53c4c26fb923116552a faeb26fc5db5c4aae9ae9eb4388e807ab4d59499d7639fcab3d878843a740037 5e13e0096eb4010253c270ab98f0e9bbc11571c221eb779d428333e8cd63c955 e891f9427d5ec81b32595d70be9d00bb66c6d8223b4747d12be8c388c2fc0c8e 58aab8aaa538c0c6e5ad7281fd27e50374b489942aa317296dbf9c2ec5ca3434 4a8b0a9dc9f6be491e9eacb464aa7ef7c0d449de3018c4172c01448ce39a5108 3e5b8cef06838821113c8bba064e9415e8c627bca552fb978f830d40027b80f2 67e6bb3d138e7d489850ac99b5915ef8659178a68140b963e282b24020a288e2 f178f7f44251fdc9ae9ccaaecc5ea6f10aa534caa25d506abc3fbde21c69db17 6532f97e9b7d1492f1a17d1228ce7e563016c2187735f44e58ff1e9f786019aa 7c5462391a9bff4f7c25f2761098e7189b7ae204af0a7be61a652e4482f63e6a 9ba005f9216a2211491afd0e335ac5c6f20af1166fbb7518bcc8cec2e536f5ce 7eb84318234e23c223d4279ac01e925ba0b08d6d6950f7ba328f0ce909af8307 0fcdbf1518b677829322dc18e1feebd354a6e39700bd9cdb60ab47dc0465c3a6 801a9ae4fe1049dd27cfd9c356f21f29c6e07238448c201c08d288b5cc8e7e9a f0869be511179866f9a71a63a6a5f65e577e851fd7851184734bb5c56940b1a6 178cd8ffcdfe9fe14f39084d78341a8705ca72e78947bada31ab0356508fc232 0fd4807f67ab317561f115f12c0d8540e04596fdea389d7c2104e97dda5a0351 effea9180d802e50abed76a5da665374f3591eda8aeb99c0fff085ed6df618ae 7a35cc170b935508b9b88379f4fb581acb852ebe769ac269f1596861aca2ffa7 2d1307493202464773734b0a2d33f4a737b0a897cb179de05bdf433cbdb1aec1"} + - {name: REGION_RETAINED, value: "f1183f4476bac87c09504a574112df4663931f67e88cc38dc08f867ce98ff726 815153514ca4a53967932bb46456ff4cb4e1784f9db247bc3b613b7e8365c59f 21507d4369cebef83ee05152daea5ac2f581ea86a9dc85276ef54e3f9f6388c5 5a77cf9e96e7a0e40ea07e9394a3fa458184ce54f8f774a8fb59cbec1db75c54 e17c62bc8dbad089da57e8b30adc391ff8b947cc7182b3160f5e2709103ded78 6c96629eb3c26513d55207b109fe2a9873a58f43510bd067b7d5422572e3fb42 7952185d5ef96504b5793b76fe72e42cbe9c9ac19149bf912adb2c3a735f8dbf f378a43d6146eeed864110b90848df0bec9672fa4c9941a2d04de249068a4a09 ecac8f9f2489c547ce58f12ed01baaa3939c8adbf8aed05c313abbf422cdc855 4af7209941643e0c6a100e2b4e2fef8a959b87fdbfac2173b7867cfc1808bd66 edb39f956df1f481d7ba724cac4ceb3a4fe494efc02f994d31d6c96dfae04a78 0ded41070dd3e0c0daa43e13dadc58c449865eec00530cfceff3c1579c66e916 754446fe4e5f33e9c0d5a1a74a02444a01de1700673442c90827c708aba62cee c597c0bac8b4a796e1e8b70344f9866cb047cc90cfb15af774d38860594ea27a e83c333a87056c678b5e835947647ef42370b43dbfc31997744f28d993f9c4aa db2b0e6a6071502381a768d70fd9bab8c08c64e4717fc23da45dbe8adc5fa3d6 cdc10712ff8bf956f8f5900709500046493523b51dc670d5b2d01eaf604bcd38 028571f257b485acafbe79b704a80f273d899485c4bb264d9c8137bf51e33217 566c29329433934f1436faf94652a7b925df8b4587ab04470322172f47c31c02 1dd640eba3e9dbdd10106698215a0a06df89c5cdf801c53c4c26fb923116552a faeb26fc5db5c4aae9ae9eb4388e807ab4d59499d7639fcab3d878843a740037 5e13e0096eb4010253c270ab98f0e9bbc11571c221eb779d428333e8cd63c955 e891f9427d5ec81b32595d70be9d00bb66c6d8223b4747d12be8c388c2fc0c8e 58aab8aaa538c0c6e5ad7281fd27e50374b489942aa317296dbf9c2ec5ca3434 4a8b0a9dc9f6be491e9eacb464aa7ef7c0d449de3018c4172c01448ce39a5108 3e5b8cef06838821113c8bba064e9415e8c627bca552fb978f830d40027b80f2 67e6bb3d138e7d489850ac99b5915ef8659178a68140b963e282b24020a288e2 f178f7f44251fdc9ae9ccaaecc5ea6f10aa534caa25d506abc3fbde21c69db17 6532f97e9b7d1492f1a17d1228ce7e563016c2187735f44e58ff1e9f786019aa 7c5462391a9bff4f7c25f2761098e7189b7ae204af0a7be61a652e4482f63e6a 9ba005f9216a2211491afd0e335ac5c6f20af1166fbb7518bcc8cec2e536f5ce 7eb84318234e23c223d4279ac01e925ba0b08d6d6950f7ba328f0ce909af8307 0fcdbf1518b677829322dc18e1feebd354a6e39700bd9cdb60ab47dc0465c3a6 801a9ae4fe1049dd27cfd9c356f21f29c6e07238448c201c08d288b5cc8e7e9a f0869be511179866f9a71a63a6a5f65e577e851fd7851184734bb5c56940b1a6 178cd8ffcdfe9fe14f39084d78341a8705ca72e78947bada31ab0356508fc232 0fd4807f67ab317561f115f12c0d8540e04596fdea389d7c2104e97dda5a0351 effea9180d802e50abed76a5da665374f3591eda8aeb99c0fff085ed6df618ae 7a35cc170b935508b9b88379f4fb581acb852ebe769ac269f1596861aca2ffa7 2d1307493202464773734b0a2d33f4a737b0a897cb179de05bdf433cbdb1aec1 a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada"} --- apiVersion: batch/v1 kind: Job @@ -36,9 +36,9 @@ spec: - name: provision env: - {name: REGION_WORLD, value: "100"} - - {name: REGION_ID, value: "15"} - - {name: REGION_BUILD, value: a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada} - # Region 15 (rules 13): cellular-v10, 60 x 60 mm at 20 C, taken through one empty tick, + - {name: REGION_ID, value: "16"} + - {name: REGION_BUILD, value: 222fa3dea0cb25335234678fa0d628222fc92c9ff38a1869330d973b8c4b4e53} + # Region 16 (rules 13): cellular-v10, 60 x 60 mm at 20 C, taken through one empty tick, # the durable upgrades to rules 11 with light, the liquid upgrade from the mounted # tuning file (whose region size must match) and the revamp upgrade from the mounted # revamp tuning file. 9 pools (500 um radius; a pool feeds at a quarter rate; any in a @@ -53,16 +53,17 @@ spec: # sites, 3 mm from pools, are the fallback). # Genesis is written once: keep --commit stable so every sync resolves it. # ADR-0180: region 14 used IDs 900000003584-900000003615 for its 32 seeded wildlife; - # region 15 reserves 900000003616-900000003715 for its 100. Their + # region 15 used 900000003616-900000003715; region 16 reserves + # 900000003716-900000003815 for its 100. Their # resources come from the nursery, leaving its remainder for players. The # life allocator starts far above the unserved lineage region 1 identities (ADR-0123). - {name: REGION_OPENING, value: cellular-v10} - name: REGION_OPENING_ARGS value: >- - --frame 9 --source-id 1 --commit b2918c4d0f1e2a3b5c7d9e0f1a2b3c4e --light-pj 40 + --frame 9 --source-id 1 --commit c3a29d5e1f2b3a4c6d8e0f1a2b3c4d5f --light-pj 40 --tuning /etc/evo/tuning/cellular.tuning --revamp-tuning /etc/evo/tuning/cellular-revamp.tuning - --life-allocator-start 1000000000000 --playtest-wildlife-first-id 900000003616 + --life-allocator-start 1000000000000 --playtest-wildlife-first-id 900000003716 --width-um 60000 --height-um 60000 --ambient-temperature-mk 293150 --funding-energy-pj 2114355200 --funding-carbon-fg 1540096000 --funding-nitrogen-fg 344064000 --funding-phosphorus-fg 176128000 diff --git a/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning b/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning index 66489c2..7808221 100644 --- a/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning +++ b/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning @@ -24,6 +24,12 @@ energy.burn_other_pj_per_kfg = 2_000 # Feeding: collection lost per membrane point above the founder's 100 (5 points: -1%). feeding.membrane_collection_per_mille_per_point = 2 +# Every collection limit, per cent of the body's own (optional; 100 when absent). +feeding.collection_percent = 130 +# Matter from one source split evenly between the nutrients it holds (optional; 0 when +# absent): a carbon-only bubble gives the whole matter limit to carbon, carbon and +# phosphorus half each, all four a quarter each. +feeding.split_evenly = 1 # Predation (predation and defense plan). predation.engulf_ratio_milli = 1_500 # a predator needs 1.5x the prey's engulf mass diff --git a/deploy/kubernetes/stores/dev/kustomization.yaml b/deploy/kubernetes/stores/dev/kustomization.yaml index eb2121c..9db6190 100644 --- a/deploy/kubernetes/stores/dev/kustomization.yaml +++ b/deploy/kubernetes/stores/dev/kustomization.yaml @@ -15,7 +15,7 @@ images: digest: sha256:c99484a6bb4cc5a8366103bd180c337017a9cb866f19080793a3d7d0c2650ef4 - name: aevolution-server newName: registry.aeternalisgames.com/aeternalis/aevolution-server - digest: sha256:a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada + digest: sha256:222fa3dea0cb25335234678fa0d628222fc92c9ff38a1869330d973b8c4b4e53 patches: - target: kind: Job diff --git a/tests/cellular_revamp_tuning_tests.cpp b/tests/cellular_revamp_tuning_tests.cpp index be62cb4..944e85b 100644 --- a/tests/cellular_revamp_tuning_tests.cpp +++ b/tests/cellular_revamp_tuning_tests.cpp @@ -20,6 +20,8 @@ void check(bool condition, std::source_location at = std::source_location::curre CellularRevampTuning trial() { CellularRevampTuning t{.version = 1, .playtest_starting_wildlife_cells = 100, + .feeding_collection_percent = 130, + .feeding_split_evenly = 1, .body_essential_upkeep_per_mille = 250, .body_reserve_load_per_mille = 1'000, .body_growth_per_tick_centi_mille = 625,