Update app.py

app.py

@@ -4,7 +4,7 @@ from typing import Dict, Optional, List
 import numpy as np
 import gradio as gr
 
-ARTIFACT = "RFT_Civilization_Engine_v6"
+ARTIFACT = "RFT_Civilization_Engine_v9"
 AUTHOR = "Liam Grinstead"
 
 def sha512_str(s: str) -> str:
@@ -39,10 +39,81 @@ class Civilization:
         self.age_grid=np.zeros_like(self.grid,dtype=np.uint16)
         self.food_stock=np.zeros_like(self.grid,dtype=np.float32)
         self.tick=0;self.worker_mem:Dict[str,WorkerMemory]={}
-        # seed forests/food/buildings/shops/males/females/teachers (same as before) …
 
-    # step() and render_image() methods (same as previous version, omitted here for brevity)
-    # keep all logic for Teachers, Guilds, Schools, Workers with memory
+        # Seed forests and food
+        forest_mask=self.rng.random(self.grid.shape)<params.forest_fraction
+        self.grid[forest_mask]=FOREST
+        food_mask=(self.rng.random(self.grid.shape)<params.food_fraction)&(self.grid==EMPTY)
+        self.grid[food_mask]=FOOD;self.food_stock[food_mask]=1.0
+
+        # Seed buildings
+        for _ in range(params.building_seed):
+            y=self.rng.integers(0,params.height);x=self.rng.integers(0,params.width)
+            self.grid[y,x]=BUILDING
+
+        # Seed shops near buildings
+        shop_spots=np.argwhere(self.grid==BUILDING)
+        for (y,x) in shop_spots[:max(1,int(len(shop_spots)*params.shop_ratio))]:
+            for ny,nx in self._neighbors8(y,x):
+                if self.grid[ny,nx]==EMPTY and self.rng.random()<0.5:
+                    self.grid[ny,nx]=SHOP
+
+        # Seed males & females
+        empties=np.argwhere(self.grid==EMPTY);self.rng.shuffle(empties)
+        for (y,x) in empties[:params.male_init]:self.grid[y,x]=MALE
+        for (y,x) in empties[params.male_init:params.male_init+params.female_init]:self.grid[y,x]=FEMALE
+
+        # Seed teachers
+        remaining=[tuple(p) for p in empties[params.male_init+params.female_init:]]
+        self.rng.shuffle(remaining)
+        for (y,x) in remaining[:params.teacher_init]:self.grid[y,x]=TEACHER
+
+    def _neighbors8(self,y,x):
+        H,W=self.grid.shape
+        for dy in (-1,0,1):
+            for dx in (-1,0,1):
+                if dy==0 and dx==0:continue
+                ny,nx=(y+dy)%H,(x+dx)%W
+                yield ny,nx
+
+    def _mem_key(self,y,x):return f"{y},{x}"
+    def _ensure_worker_mem(self,y,x):
+        key=self._mem_key(y,x)
+        if key not in self.worker_mem:self.worker_mem[key]=WorkerMemory()
+
+    def step(self):
+        H,W=self.grid.shape
+        new_grid=self.grid.copy();new_age=self.age_grid.copy();new_food=self.food_stock.copy()
+
+        # Forest regen and consumption
+        new_food[self.grid==FOREST]+=0.01
+        pop_mask=(self.grid==MALE)|(self.grid==FEMALE)|(self.grid==BABY)|(self.grid==WORKER)
+        new_food[pop_mask]-=self.params.food_need_per_capita
+        new_food=np.clip(new_food,0.0,5.0)
+
+        for y in range(H):
+            for x in range(W):
+                cell=self.grid[y,x];nb=[(ny,nx) for ny,nx in self._neighbors8(y,x)]
+                nb_cells=np.array([self.grid[ny,nx] for ny,nx in nb],dtype=np.uint8)
+                nb_food=float(np.mean([self.food_stock[ny,nx] for ny,nx in nb]))
+                candidates=[(ny,nx) for (ny,nx),c in zip(nb,nb_cells) if c==EMPTY]
+
+                if cell in (MALE,FEMALE):
+                    if MALE in nb_cells and FEMALE in nb_cells and self.rng.random()<self.params.pair_prob_base:
+                        if candidates:ty,tx=candidates[self.rng.integers(0,len(candidates))];new_grid[ty,tx]=BABY
+                elif cell==BABY:
+                    new_age[y,x]=self.age_grid[y,x]+1
+                    if new_age[y,x]>=self.params.baby_age_ticks:
+                        new_grid[y,x]=WORKER;self._ensure_worker_mem(y,x)
+                elif cell==WORKER:
+                    self._ensure_worker_mem(y,x);mem=self.worker_mem[self._mem_key(y,x)]
+                    mem.skill=min(1.0,mem.skill+0.01)
+                    if candidates and self.rng.random()<0.5:
+                        target=self.rng.choice([ROAD,HOUSE,FOOD])
+                        ty,tx=candidates[self.rng.integers(0,len(candidates))];new_grid[ty,tx]=target
+                        if target==FOOD:new_food[ty,tx]+=0.3
+
+        self.grid=new_grid;self.age_grid=new_age;self.food_stock=new_food;self.tick+=1
 
     def render_image(self):
         H,W=self.grid.shape;img=np.zeros((H,W,3),dtype=np.uint8)
@@ -73,25 +144,40 @@ def start_engine(width,height,seed,male_init,female_init,teacher_init,
     return f"Engine started {params.width}x{params.height}"
 
 def stop_engine():global RUNNING;RUNNING=False;return "Engine stopped."
-def reset_engine():stop_engine();globals()["SIM"]=None;return "Reset complete."
+def reset_engine():
+    stop_engine()
+    globals()["SIM"] = None
+    return "Reset complete."
 
 def get_grid(scale):
     with ENGINE_LOCK:
-        if SIM is None:return None,"Engine not running."
-        img=SIM.render_image();img_scaled=np.repeat(np.repeat(img,scale,axis=0),scale,axis=1)
-        g=SIM.grid;stats=f"Tick={SIM.tick} | Pop={int(np.sum(np.isin(g,[MALE,FEMALE,BABY,WORKER])))}"
-    return img_scaled,stats
+        if SIM is None:
+            return None, "Engine not running."
+        img = SIM.render_image()
+        img_scaled = np.repeat(np.repeat(img, scale, axis=0), scale, axis=1)
+        g = SIM.grid
+        stats = f"Tick={SIM.tick} | Pop={int(np.sum(np.isin(g,[MALE,FEMALE,BABY,WORKER])))}"
+    return img_scaled, stats
 
 def get_entity_summary_html():
     with ENGINE_LOCK:
-        if SIM is None:return "<p>Engine not running.</p>"
-        g=SIM.grid;rows=[]
-        for name,code in [("EMPTY",EMPTY),("MALE",MALE),("FEMALE",FEMALE),("BABY",BABY),("WORKER",WORKER),
-                          ("BUILDING",BUILDING),("HOUSE",HOUSE),("SHOP",SHOP),("ROAD",ROAD),
-                          ("FOREST",FOREST),("FOOD",FOOD),("TEACHER",TEACHER),("GUILD",GUILD),("SCHOOL",SCHOOL)]:
-            count=int(np.sum(g==code));r,gcol,b=COLORS[name];color=f"rgb({r},{gcol},{b})"
-            rows.append(f"<tr><td style='background:{color};width:18px'></td><td>{name}</td><td>{count}</td></tr>")
-        return "<table>"+ "".join(rows) +"</table>"
+        if SIM is None:
+            return "<p>Engine not running.</p>"
+        g = SIM.grid
+        rows = []
+        for name, code in [
+            ("EMPTY", EMPTY), ("MALE", MALE), ("FEMALE", FEMALE), ("BABY", BABY), ("WORKER", WORKER),
+            ("BUILDING", BUILDING), ("HOUSE", HOUSE), ("SHOP", SHOP), ("ROAD", ROAD),
+            ("FOREST", FOREST), ("FOOD", FOOD), ("TEACHER", TEACHER), ("GUILD", GUILD), ("SCHOOL", SCHOOL)
+        ]:
+            count = int(np.sum(g == code))
+            r, gcol, b = COLORS[name]
+            color = f"rgb({r},{gcol},{b})"
+            rows.append(
+                f"<tr><td style='background:{color};width:18px'></td>"
+                f"<td>{name}</td><td>{count}</td></tr>"
+            )
+        return "<table>" + "".join(rows) + "</table>"
 
 # =========================
 # Gradio UI
@@ -100,38 +186,50 @@ with gr.Blocks(title="RFT Civilization Engine — Livestream") as demo:
     gr.Markdown("# RFT Conscious Civilization — Livestream")
 
     with gr.Row():
-        width=gr.Slider(64,256,value=128,step=16,label="Grid width")
-        height=gr.Slider(64,256,value=128,step=16,label="Grid height")
-        seed=gr.Number(value=7,label="Seed",precision=0)
-        tick_rate=gr.Slider(1,30,value=5,step=1,label="Ticks per second")
-
-    run_btn=gr.Button("Run simulation",variant="primary")
-    stop_btn=gr.Button("Stop")
-    reset_btn=gr.Button("Reset")
-
-    with gr.Accordion("Live grid",open=True):
-        scale=gr.Slider(1,8,value=4,step=1,label="Display scale")
-        img_out=gr.Image(type="numpy",label="Grid")
-        stats_out=gr.Textbox(label="Stats",lines=2)
-        live_on=gr.Checkbox(label="Livestream updates",value=True)
-
-    with gr.Accordion("Entity key",open=False):
-        key_chart=gr.HTML()
-        key_btn=gr.Button("Update key chart")
-
-    run_btn.click(start_engine,
-        inputs=[width,height,seed,male_init,female_init,teacher_init,
-                forest_fraction,food_fraction,baby_age_ticks,override_sensitivity,tick_rate],
-        outputs=[])
-    stop_btn.click(stop_engine,inputs=[],outputs=[])
-    reset_btn.click(reset_engine,inputs=[],outputs=[])
-    key_btn.click(get_entity_summary_html,inputs=[],outputs=[key_chart])
-
-    def poll_grid(scale_val,live_flag):
-        if not live_flag:return gr.update(),gr.update()
+        width = gr.Slider(64, 256, value=128, step=16, label="Grid width")
+        height = gr.Slider(64, 256, value=128, step=16, label="Grid height")
+        seed = gr.Number(value=7, label="Seed", precision=0)
+        tick_rate = gr.Slider(1, 30, value=5, step=1, label="Ticks per second")
+
+    with gr.Row():
+        male_init = gr.Slider(50, 600, value=240, step=10, label="Initial males")
+        female_init = gr.Slider(50, 600, value=240, step=10, label="Initial females")
+        teacher_init = gr.Slider(1, 50, value=10, step=1, label="Initial teachers")
+        forest_fraction = gr.Slider(0.0, 0.6, value=0.16, step=0.02, label="Forest fraction")
+        food_fraction = gr.Slider(0.0, 0.3, value=0.06, step=0.01, label="Food fraction")
+        baby_age_ticks = gr.Slider(4, 24, value=8, step=1, label="Baby→Worker ticks")
+        override_sensitivity = gr.Slider(0.3, 0.9, value=0.60, step=0.05, label="Override sensitivity")
+
+    run_btn = gr.Button("Run simulation", variant="primary")
+    stop_btn = gr.Button("Stop")
+    reset_btn = gr.Button("Reset")
+
+    with gr.Accordion("Live grid", open=True):
+        scale = gr.Slider(1, 8, value=4, step=1, label="Display scale")
+        img_out = gr.Image(type="numpy", label="Grid")
+        stats_out = gr.Textbox(label="Stats", lines=2)
+        live_on = gr.Checkbox(label="Livestream updates", value=True)
+
+    with gr.Accordion("Entity key", open=False):
+        key_chart = gr.HTML()
+        key_btn = gr.Button("Update key chart")
+
+    run_btn.click(
+        start_engine,
+        inputs=[width, height, seed, male_init, female_init, teacher_init,
+                forest_fraction, food_fraction, baby_age_ticks, override_sensitivity, tick_rate],
+        outputs=[]
+    )
+    stop_btn.click(stop_engine, inputs=[], outputs=[])
+    reset_btn.click(reset_engine, inputs=[], outputs=[])
+    key_btn.click(get_entity_summary_html, inputs=[], outputs=[key_chart])
+
+    def poll_grid(scale_val, live_flag):
+        if not live_flag:
+            return gr.update(), gr.update()
         return get_grid(scale_val)
 
-    demo.timer(0.5,poll_grid,inputs=[scale,live_on],outputs=[img_out,stats_out])
+    demo.timer(0.5, poll_grid, inputs=[scale, live_on], outputs=[img_out, stats_out])
 
-if __name__=="__main__":
-    demo.launch(server_name="0.0.0.0",server_port=7860)
+if __name__ == "__main__":
+    demo.launch(server_name="0.0.0.0", server_port=7860)