Rework programs for trainingssites
Bug #1831066 reported by
Toni Förster
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| widelands |
Won't Fix
|
Undecided
|
Unassigned | ||
Bug Description
During my sleep time unification I figured out that there are some flaws with the programs for trainingssites.
Some sites have work animations some don't. That means sites without work animations have to wait 30s before they can fail because they miss food or a soldier has been removed. While those with a working animation, only have to wait 15 seconds.
Also in case of the barbarians battle arena. The working animation comes before the soldier training and after consume. This means that within a window of 15 seconds a soldier can be removed from the building without even being trained.
We should change it to a program flow like in the mines. Here a pseudo code example for the barbarians battle arena.
main prog
{ sleep 5000
call=sleep
call=
call=animate
call=sleep
call=
call=working
return=no_stats
}
sleep prog {
sleep 15000
return=no_stats
}
working animate {
animate=working 15000
return=no_stats
}
evade0 prog {
check soldier
consum wares
train soldier
}
I would add this to the unification branch
evade1 prog {
check soldier
consum wares
train soldier
}
Related branches
lp:~widelands-dev/widelands/unify_sleep_time
- hessenfarmer: Approve (code review)
-
Diff: 2821 lines (+346/-267)146 files modifieddata/tribes/buildings/productionsites/atlanteans/bakery/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/barracks/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua (+4/-4)
data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua (+3/-3)
data/tribes/buildings/productionsites/atlanteans/farm/init.lua (+4/-4)
data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/fishers_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/foresters_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/hunters_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/atlanteans/mill/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/quarry/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/scouts_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua (+1/-2)
data/tribes/buildings/productionsites/atlanteans/spiderfarm/init.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua (+2/-2)
data/tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/bakery/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/barracks/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/big_inn/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/coalmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/farm/init.lua (+5/-4)
data/tribes/buildings/productionsites/barbarians/fishers_hut/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/goldmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/granitemine/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/hunters_hut/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/inn/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/ironmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/lumberjacks_hut/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/quarry/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/rangers_hut/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua (+4/-4)
data/tribes/buildings/productionsites/barbarians/scouts_hut/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/shipyard/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/tavern/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/bakery/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/barracks/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/charcoal_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/coalmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/farm/init.lua (+4/-4)
data/tribes/buildings/productionsites/empire/fishers_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/foresters_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/goldmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/hunters_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/inn/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/ironmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/lumberjacks_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/marblemine/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/mill/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/piggery/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/quarry/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/sawmill/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/scouts_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/sheepfarm/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/shipyard/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/stonemasons_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/tavern/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/vineyard/init.lua (+4/-4)
data/tribes/buildings/productionsites/empire/weaving_mill/init.lua (+1/-2)
data/tribes/buildings/productionsites/empire/winery/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/bakery/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/barracks/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/berry_farm/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/clay_pit/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/coalmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/farm/init.lua (+3/-3)
data/tribes/buildings/productionsites/frisians/fishers_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/foresters_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/goldmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/hunters_house/init.lua (+10/-10)
data/tribes/buildings/productionsites/frisians/ironmine/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/quarry/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/recycling_center/init.lua (+3/-3)
data/tribes/buildings/productionsites/frisians/reed_farm/init.lua (+4/-4)
data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua (+3/-3)
data/tribes/buildings/productionsites/frisians/scouts_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/sewing_room/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/shipyard/init.lua (+1/-2)
data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/tavern/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua (+2/-2)
data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua (+13/-1)
data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua (+13/-1)
data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua (+9/-5)
data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+24/-1)
data/tribes/buildings/trainingsites/empire/arena/init.lua (+3/-1)
data/tribes/buildings/trainingsites/empire/colosseum/init.lua (+5/-1)
data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua (+24/-1)
data/tribes/buildings/trainingsites/frisians/training_arena/init.lua (+19/-1)
data/tribes/buildings/trainingsites/frisians/training_camp/init.lua (+16/-1)
data/tribes/workers/atlanteans/blackroot_farmer/init.lua (+3/-3)
data/tribes/workers/atlanteans/farmer/init.lua (+2/-2)
data/tribes/workers/atlanteans/fisher/init.lua (+1/-1)
data/tribes/workers/atlanteans/forester/init.lua (+3/-3)
data/tribes/workers/atlanteans/stonecutter/init.lua (+1/-1)
data/tribes/workers/atlanteans/woodcutter/init.lua (+1/-1)
data/tribes/workers/barbarians/farmer/init.lua (+4/-4)
data/tribes/workers/barbarians/fisher/init.lua (+1/-1)
data/tribes/workers/barbarians/gardener/init.lua (+3/-4)
data/tribes/workers/barbarians/lumberjack/init.lua (+1/-1)
data/tribes/workers/barbarians/ranger/init.lua (+3/-3)
data/tribes/workers/barbarians/stonemason/init.lua (+1/-1)
data/tribes/workers/empire/farmer/init.lua (+2/-2)
data/tribes/workers/empire/fisher/init.lua (+1/-1)
data/tribes/workers/empire/forester/init.lua (+2/-2)
data/tribes/workers/empire/lumberjack/init.lua (+1/-1)
data/tribes/workers/empire/stonemason/init.lua (+2/-2)
data/tribes/workers/empire/vinefarmer/init.lua (+2/-2)
data/tribes/workers/frisians/stonemason/init.lua (+1/-1)
data/tribes/workers/frisians/woodcutter/init.lua (+1/-1)
test/maps/plain.wmf/scripting/test_casern.lua (+2/-2)
| tags: | added: tribes |
Revision history for this message
| GunChleoc (gunchleoc) wrote | #1 |
| Changed in widelands: | |
| milestone: | none → build21-rc1 |
Revision history for this message
| GunChleoc (gunchleoc) wrote | #2 |
| Changed in widelands: | |
| status: | New → Won't Fix |
To post a comment you must log in.
Is this fixed?