diff --git a/deploy/kubernetes/grant-broker-dev/deployment.yaml b/deploy/kubernetes/grant-broker-dev/deployment.yaml index 91f53ef..96b3181 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: "14"} + - {name: BROKER_DEFAULT_REGION, value: "15"} # Space-separated REGION=HOST:PORT=TLS_NAME, every region a grant may name. - - {name: BROKER_ROUTES, value: "14=void.aeternalisgames.com:7400=void.aeternalisgames.com"} + - {name: BROKER_ROUTES, value: "15=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 50a779e..5865b13 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-20261026T191314-bce3e436:1793056394"} + - {name: REGION_SESSION_WINDOW, value: "dev-20261026T191917-ee4c5e16:1793056757"} - {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 1f93a94..7ea8521 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 14, frame 9 (cellular-v10 opening, rules 13). +# Region host for evolution-dev: world 100, region 15, 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 diff --git a/deploy/kubernetes/region/dev/region-values.yaml b/deploy/kubernetes/region/dev/region-values.yaml index 479b20f..93e250e 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 14 holds a cellular-v10 opening, a 60 x 60 mm +# Revamp playtests (rules 13, ADR-0179): region 15 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-13 stay in the stores untouched; they are simply -# not served while dev runs region 14. A region keeps the tuning it opened with, so a new +# 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 # region opens when the tuning changes (until live retuning exists). apiVersion: apps/v1 kind: Deployment @@ -17,11 +17,11 @@ spec: - name: evo-server env: - {name: REGION_WORLD, value: "100"} - - {name: REGION_ID, value: "14"} + - {name: REGION_ID, value: "15"} - {name: REGION_BUILD, value: a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada} - {name: REGION_PROFILE, value: cellular} # The whole world's catalog: dev world 100 has only this region. - - {name: REGION_LIFE_ROUTES, value: "14=void.aeternalisgames.com:7400=void.aeternalisgames.com"} + - {name: REGION_LIFE_ROUTES, value: "15=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"} --- @@ -36,47 +36,49 @@ spec: - name: provision env: - {name: REGION_WORLD, value: "100"} - - {name: REGION_ID, value: "14"} + - {name: REGION_ID, value: "15"} - {name: REGION_BUILD, value: a5b70d945b63618a2897a848320e9af6b73a1a4f3bf8fb052d8286a93f6f8ada} - # Region 14 (rules 13): cellular-v10, 60 x 60 mm at 20 C, taken through one empty tick, + # Region 15 (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 # current moves to the nearest still water), 1,200 single-nutrient bubbles (240 per - # channel: 7e7 pJ energy, 4.2e6 fg C, 9.4e5 N, 4.9e5 P, 2e6 other each) and 2,400 - # mixed bubbles holding every nutrient in the founder recipe's proportions (1.4e7 pJ, - # 8.4e5 fg C, 2.52e5 N, 8.4e4 P, 5.04e5 other), scattered from the genesis commit: - # about the same food as the earlier 3,600 single bubbles. The format-2 genesis holds - # at most 4,096 deposits. The current seed comes from the - # commit. The nursery funds 64 primitive founders; rules-12 founders start at random spots - # (the 9 sites, 3 mm from pools, are the fallback). + # channel: 2.1e8 pJ energy, 1.26e7 fg C, 2.82e6 N, 1.47e6 P, 6e6 other each) and 2,400 + # mixed bubbles holding every nutrient in the founder recipe's proportions (4.2e7 pJ, + # 2.52e6 fg C, 7.56e5 N, 2.52e5 P, 1.512e6 other), scattered from the genesis commit: + # three times region 14's food in every pool and bubble. The format-2 genesis holds + # at most 4,096 deposits. The current seed comes from the commit. The nursery funds + # 256 primitive founders' worth (100 go to the seeded wildlife, the rest to player + # births, each new life included); rules-12 founders start at random spots (the 9 + # sites, 3 mm from pools, are the fallback). # Genesis is written once: keep --commit stable so every sync resolves it. - # ADR-0180 reserves IDs 900000003584-900000003615 for the 32 seeded wildlife. Their + # ADR-0180: region 14 used IDs 900000003584-900000003615 for its 32 seeded wildlife; + # region 15 reserves 900000003616-900000003715 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 a1807b3c9e1f2a4b6c8d0e1f2a3b4c5d --light-pj 40 + --frame 9 --source-id 1 --commit b2918c4d0f1e2a3b5c7d9e0f1a2b3c4e --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 900000003584 + --life-allocator-start 1000000000000 --playtest-wildlife-first-id 900000003616 --width-um 60000 --height-um 60000 --ambient-temperature-mk 293150 - --funding-energy-pj 528588800 --funding-carbon-fg 385024000 - --funding-nitrogen-fg 86016000 --funding-phosphorus-fg 44032000 - --funding-other-fg 181248000 + --funding-energy-pj 2114355200 --funding-carbon-fg 1540096000 + --funding-nitrogen-fg 344064000 --funding-phosphorus-fg 176128000 + --funding-other-fg 724992000 --site 12000,12000 --site 12000,27000 --site 12000,42000 --site 27000,12000 --site 27000,27000 --site 27000,42000 --site 42000,12000 --site 42000,27000 --site 42000,42000 - --pool 15000,15000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 15000,30000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 15000,45000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 30000,15000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 30000,30000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 30000,45000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 45000,15000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 45000,30000,500,2,2800000000,167000000,38000000,19600000,80000000 - --pool 45000,45000,500,2,2800000000,167000000,38000000,19600000,80000000 - --motes 1200,2,70000000,4200000,940000,490000,2000000 - --mixed-motes 2400,2,14000000,840000,252000,84000,504000 + --pool 15000,15000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 15000,30000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 15000,45000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 30000,15000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 30000,30000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 30000,45000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 45000,15000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 45000,30000,500,2,8400000000,501000000,114000000,58800000,240000000 + --pool 45000,45000,500,2,8400000000,501000000,114000000,58800000,240000000 + --motes 1200,2,210000000,12600000,2820000,1470000,6000000 + --mixed-motes 2400,2,42000000,2520000,756000,252000,1512000 volumeMounts: - {name: tuning, mountPath: /etc/evo/tuning, readOnly: true} volumes: diff --git a/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning b/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning index 63b3eda..66489c2 100644 --- a/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning +++ b/deploy/kubernetes/region/dev/tuning/cellular-revamp.tuning @@ -6,7 +6,7 @@ tuning.version = 1 # DEV opening fixture only (ADR-0180). Zero disables seeding; never replenished on restart. # Requires an audited --playtest-wildlife-first-id range below --life-allocator-start. -playtest.starting_wildlife_cells = 32 +playtest.starting_wildlife_cells = 100 # Body (body and maintenance plan). body.essential_upkeep_per_mille = 250 # share of upkeep no upkeep-efficiency trait reduces @@ -59,7 +59,7 @@ reproduction.bud_fee_c_fg = 100_000 reproduction.bud_fee_n_fg = 30_000 reproduction.bud_fee_p_fg = 10_000 reproduction.bud_fee_o_fg = 60_000 -reproduction.bud_fee_scale_percent = 100 # 0 disables the fee; 100 charges the listed amounts +reproduction.bud_fee_scale_percent = 50 # 0 disables the fee; 100 charges the listed amounts reproduction.organism_cap = 256 # births refused at this many lives (an organism counts once) # Multicellular organisms (reproduction plan section 6). diff --git a/tests/cellular_revamp_tuning_tests.cpp b/tests/cellular_revamp_tuning_tests.cpp index 857dd97..be62cb4 100644 --- a/tests/cellular_revamp_tuning_tests.cpp +++ b/tests/cellular_revamp_tuning_tests.cpp @@ -19,7 +19,7 @@ void check(bool condition, std::source_location at = std::source_location::curre CellularRevampTuning trial() { CellularRevampTuning t{.version = 1, - .playtest_starting_wildlife_cells = 32, + .playtest_starting_wildlife_cells = 100, .body_essential_upkeep_per_mille = 250, .body_reserve_load_per_mille = 1'000, .body_growth_per_tick_centi_mille = 625, @@ -55,7 +55,7 @@ CellularRevampTuning trial() { .reproduction_bud_fee_n_fg = 30'000, .reproduction_bud_fee_p_fg = 10'000, .reproduction_bud_fee_o_fg = 60'000, - .reproduction_bud_fee_scale_percent = 100, + .reproduction_bud_fee_scale_percent = 50, .reproduction_organism_cap = 256, .organism_load_per_mille = 500, .organism_emerge_members = 8,