Update XML, fix several scripts that were broken by field name changes

develop
Quietust 2014-04-14 12:30:34 -05:00
parent ddd56d8ea6
commit 22dab5d807
4 changed files with 8 additions and 8 deletions

@ -1 +1 @@
Subproject commit 600e464d439d91c49c19419a45c6a0218992fceb
Subproject commit 48df338f38c263bd374d512c635fe1767e3b8abc

@ -43,7 +43,7 @@ class AutoFarm
}
counts.keys.each { |i|
if df.ui.tasks.known_plants[i]
if df.ui.tasks.discovered_plants[i]
plant = df.world.raws.plants.all[i]
if is_plantable(plant)
plantable[i] = :Surface if (plant.underground_depth_min == 0 || plant.underground_depth_max == 0)

@ -26,10 +26,10 @@ if not civ_stats then
civ.activity_stats = {
new = true,
created_weapons = { resize = #ui_stats.created_weapons },
known_creatures1 = { resize = #ui_stats.known_creatures1 },
known_creatures = { resize = #ui_stats.known_creatures },
known_plants1 = { resize = #ui_stats.known_plants1 },
known_plants = { resize = #ui_stats.known_plants },
discovered_creature_foods = { resize = #ui_stats.discovered_creature_foods },
discovered_creatures = { resize = #ui_stats.discovered_creatures },
discovered_plant_foods = { resize = #ui_stats.discovered_plant_foods },
discovered_plants = { resize = #ui_stats.discovered_plants },
}
civ_stats = civ.activity_stats
end

@ -50,11 +50,11 @@ function enum_populations()
end
table.insert(entry.records, v)
entry.known = entry.known or v.known
entry.known = entry.known or v.flags.discovered
if v.quantity < 10000001 then
entry.count = entry.count + v.quantity
if v.known then
if v.flags.discovered then
entry.known_count = entry.known_count + v.quantity
end
else