From fa256360b9d808780ffb897813597f0beef9f51c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 3 Jun 2014 06:29:33 +0200 Subject: [PATCH] eliminate kill_nonstarters --- conf/e4/config.xml | 2 +- core/scripts/multis.lua | 8 -------- res/e4/main.lua | 3 --- scripts/e3a/main.lua | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/conf/e4/config.xml b/conf/e4/config.xml index 5be267426..f4818c715 100644 --- a/conf/e4/config.xml +++ b/conf/e4/config.xml @@ -93,7 +93,7 @@ - - + diff --git a/core/scripts/multis.lua b/core/scripts/multis.lua index e7157a40f..45ad97ff2 100644 --- a/core/scripts/multis.lua +++ b/core/scripts/multis.lua @@ -1,11 +1,3 @@ -function kill_nonstarters() - for f in factions() do - if f.lastturn==0 then - kill_faction(f, true) - end - end -end - function kill_multis(multis, destructive) for idx, fno in ipairs(multis) do local f = get_faction(fno) diff --git a/res/e4/main.lua b/res/e4/main.lua index 813e0f55a..00f0ec27e 100644 --- a/res/e4/main.lua +++ b/res/e4/main.lua @@ -36,9 +36,6 @@ function process(orders) spawn_dragons() spawn_undead() - if get_turn()>=config.kill_after then - kill_nonstarters() - end -- post-turn updates: update_guards() update_scores() diff --git a/scripts/e3a/main.lua b/scripts/e3a/main.lua index 5faa300c1..33bd371d1 100644 --- a/scripts/e3a/main.lua +++ b/scripts/e3a/main.lua @@ -42,7 +42,6 @@ function process(orders) -- spawn_braineaters(0.25) -- spawn_ents() - kill_nonstarters() -- post-turn updates: update_guards() update_scores()