[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands
Continuous integration builds have changed state: Travis build 1936. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200727452. Appveyor build 1771. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1657117_fishbreeder_messages-1771. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1657117-fishbreeder-messages/+merge/317028 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands
Continuous integration builds have changed state: Travis build 1935. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200727015. Appveyor build 1770. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1661220_campaigns_barracks-1770. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1661220-campaigns-barracks/+merge/317033 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/less_compilers into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/less_compilers into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/less_compilers/+merge/316897 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/less_compilers. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands
The diff looks good to me and Travis says it compiles. So I guess it can be merged. Just out of curiosity: Does anyone now by chance where "The metaserver was unable to connect to your game." is coming from in the current game version? I wasn't able to find the message in the source of the game or the metaserver. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-networking-messages/+merge/316974 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/notifications_economy_window into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/notifications_economy_window into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/notifications_economy_window/+merge/311572 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/notifications_economy_window. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1634736-victory-gamespeed/+merge/316973 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website
Diff comments: > > === modified file 'settings.py' > --- settings.py 2017-01-21 12:39:23 + > +++ settings.py 2017-02-11 21:31:29 + > @@ -245,7 +232,7 @@ > ### > # Sphinx (Search prog) Config # > ### > -USE_SPHINX = True > +USE_SPHINX = False I did disable sphinx, because I did not configure it in this setup. We could easily add a third container that runs sphinx and always use it. > SPHINX_API_VERSION = 0x116 > > -- https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Description changed to: Experimental branch, not sure if this should be merged. I set up a docker workflow to run the website against a real mysql database on any development system (windows, mac, linux) easily. The goals here are 1) get rid of installing dependencies (like the python modules) on dev machines. 2) make sure all devs have always the exactly same set of python modules and python version, 3) dev workflows can use external tools (like wl_map_info) also on their dev machine, i.e. less differences between production and dev, 4) quicker setup for new devs. How does this work? The flow is based around a tool named Docker (https://www.docker.com/). Docker runs containers and links them together. You can think of a container as a zero-cost virtual Linux machine (when running on Linux). A container is described by a Dockerfile - which is a Build rule for assembling these virtual machines. And the core of this patch is a Dockerfile for the website. The idea is now to run a container with a mysql database[1], then build the website docker container and run it against this mysql. This means you run the full setup of the website on your dev machine. Read the patch starting from the Makefile, then into the Dockerfile. The workflow to get this up and running is this: 1) Install docker and do the docker tutorial[2] to get a basic understanding of docker. 2) bring up in one terminal the mysql database (make run_mysql). 3) build an image from the dockerfile: make docker 4) initialize the database and create a superuser: make init 5) run the website and try to upload a map: make serve [1] https://hub.docker.com/_/mysql/ [2] https://docs.docker.com/engine/getstarted/ For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Description changed to: Experimental branch, not sure if this should be merged. I set up a docker workflow to run the website against a real mysql database on any development system (windows, mac, linux) easily. The goals here are 1) get rid of installing dependencies (like the python modules) on dev machines. 2) make sure all devs have always the exactly same set of python modules and python version, 3) dev workflows can use external tools (like wl_map_info) also on their dev machine, i.e. less differences between production and dev, 4) quicker setup for new devs. How does this work? The flow is based around a tool named Docker (https://www.docker.com/). Docker runs containers and links them together. You can think of a container as a zero-cost virtual Linux machine (when running on Linux). A container is described by a Dockerfile - which is a Build rule for assembling these virtual machines. And the core of this patch is a Dockerfile for the website. The idea is now to run a Dockercontainer that runs a mysql database[1], then build the website docker container and run it against this mysql. This means you run the full setup of the website on your dev machine. Read the patch starting from the Makefile, then into the Dockerfile. The workflow to get this up and running is this: 1) Install docker and do the docker tutorial[2] to get a basic understanding of docker. 2) bring up in one terminal the mysql database (make run_mysql). 3) build an image from the dockerfile: make docker 4) initialize the database and create a superuser: make init 5) run the website and try to upload a map: make serve [1] https://hub.docker.com/_/mysql/ [2] https://docs.docker.com/engine/getstarted/ For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Description changed to: Experimental branch, not sure if this should be merged. I set up a docker workflow to run the website against a real mysql database on any development system (windows, mac, linux) easily. The goals here are 1) get rid of installing dependencies (like the python modules) on dev machines. 2) make sure all devs have always the exactly same set of python modules and python version, 3) dev workflows can use external tools (like wl_map_info) also on their dev machine, i.e. less differences between production and dev, 4) quicker setup for new devs. How does this work? The flow is based around a tool named Docker (https://www.docker.com/) which is the new hotness since a few years. Docker runs containers and links them together. You can think of a container as a zero-cost virtual Linux machine (when running on Linux). A container is described by a Dockerfile - which is a Build rule for assembling these virtual machines. And the core of this patch is a Dockerfile for the website. The idea is now to run a Dockercontainer that runs a mysql database[1], then build the website docker container and run it against this mysql. This means you run the full setup of the website on your dev machine. Read the patch starting from the Makefile, then into the Dockerfile. The workflow to get this up and running is this: 1) Install docker and do the docker tutorial[2] to get a basic understanding of docker. 2) bring up in one terminal the mysql database (make run_mysql). 3) build an image from the dockerfile: make docker 4) initialize the database and create a superuser: make init 5) run the website and try to upload a map: make serve [1] https://hub.docker.com/_/mysql/ [2] https://docs.docker.com/engine/getstarted/ For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Most of the diff looks good to me. Two nits: - "Ctrl + +" and "Ctrl + -" just look strange. But I haven't any better idea. - I would split up the "Ctrl + 1-9" help text into a "Ctrl + 1-9"-line for storing and a "1-9"-line for restoring the positions. Maybe also add a comment that the zoom level is stored, too? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website
SirVer has proposed merging
lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036
Experimental branch, not sure if this should be merged.
I set up a docker workflow to run the website against a real mysql database on
any development system (windows, mac, linux) easily. The goals here are
1) get rid of installing dependencies (like the python modules) on dev machines.
2) make sure all devs have always the exactly same set of python modules and
python version,
3) dev workflows can use external tools (like wl_map_info) also no their dev
machine, i.e. less differences between production and dev,
4) quicker setup for new devs.
How does this work? The flow is based around a tool named Docker
(https://www.docker.com/) which is the new hotness since a few years. Docker
runs containers and links them together. You can think of a container as a
zero-cost virtual Linux machine (when running on Linux).
A container is described by a Dockerfile - which is a Build rule for assembling
these virtual machines. And the core of this patch is a Dockerfile for the
website. The idea is now to run a Dockercontainer that runs a mysql
database[1], then build the website docker container and run it against this
mysql. This means you run the full setup of the website on your dev machine.
Read the patch starting from the Makefile, then into the Dockerfile.
The workflow to get this up and running is this:
1) Install docker and do the docker tutorial[2] to get a basic understanding of
docker.
2) bring up in one terminal the mysql database (make run_mysql).
3) build an image from the dockerfile: make docker
4) initialize the database and create a superuser: make init
5) run the website and try to upload a map: make serve
[1] https://hub.docker.com/_/mysql/
[2] https://docs.docker.com/engine/getstarted/
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website.
=== added file 'Dockerfile'
--- Dockerfile 1970-01-01 00:00:00 +
+++ Dockerfile 2017-02-11 21:23:11 +
@@ -0,0 +1,37 @@
+FROM ubuntu:zesty
+ENV PYTHONUNBUFFERED 1
+
+ARG UID
+ARG GID
+RUN useradd user -u $UID -g $GID -m -s /bin/bash
+
+RUN apt-get update && apt-get install -y \
+ software-properties-common
+
+RUN add-apt-repository ppa:widelands-dev/widelands-daily
+
+RUN apt-get update && apt-get install -y \
+ git \
+ libjpeg-dev \
+ libmysqlclient-dev \
+ libpng-dev \
+ python \
+ python-pip \
+ widelands \
+ xvfb \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /src/ && mkdir /code && chown -R user /src /code
+
+ADD pip_requirements.txt /code
+RUN pip install -r /code/pip_requirements.txt
+
+ENV PATH /usr/games:$PATH
+ADD run_docker.sh /code
+
+EXPOSE 8000
+# TODO(sirver): this should be enabled, but leads to wrong writes
+# USER user
+WORKDIR /code
+
+CMD ["sh", "run_docker.sh"]
=== added file 'Makefile'
--- Makefile 1970-01-01 00:00:00 +
+++ Makefile 2017-02-11 21:23:11 +
@@ -0,0 +1,34 @@
+DOCKER_RUN:=docker run -it --rm \
+ --link db:db \
+ -p 8000:8000 \
+ -v $(shell pwd):/code \
+ wlwebsite
+
+# Bring up a mysql server. The database will be completely empty.
+run_mysql:
+ docker run -it \
+ --name db \
+ -e MYSQL_DATABASE=wl_django \
+ -e MYSQL_ROOT_PASSWORD=bluba \
+ -e MYSQL_USER=widelands \
+ -e MYSQL_PASSWORD=widelands \
+ -p 3306:3306 \
+ mysql
+
+# Creates a super user and runs ./manage.py migrate
+init:
+ $(DOCKER_RUN) ./manage.py migrate
+ $(DOCKER_RUN) ./manage.py createsuperuser
+
+
+docker:
+ docker build . -t wlwebsite \
+ --build-arg UID=$(shell id -u) \
+ --build-arg GID=$(shell id -g)
+
+# This will execute the CMD in the Dockerfile which runs the django debug server.
+serve:
+ $(DOCKER_RUN)
+
+cmd:
+ $(DOCKER_RUN) ${CMD}
=== modified file 'pip_requirements.txt'
--- pip_requirements.txt 2017-01-21 12:39:23 +
+++ pip_requirements.txt 2017-02-11 21:23:11 +
@@ -24,4 +24,3 @@
untokenize==0.1.1
-e git://github.com/kerin/django-sphinx.git#egg=django-sphinx
bleach==1.4.3
-
=== added file 'run_docker.sh'
--- run_docker.sh 1970-01-01 00:00:00 +
+++ run_docker.sh 2017-02-11 21:23:11 +
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+Xvfb :99 -screen 0 1024x768x16 &> xvfb.log &
+export DISPLAY=:99.0
+
+python manage.py runserver 0.0.0.0:8000
=== modified file 'settings.py'
--- settings.py 2017-01-21 12:39:23 +
+++ settings.py 2017-02-11 21:23:11 +
@@ -12,19 +12,6 @@
MANAGERS = ADMINS
-DATABASES = {
-'default': {
-'ENGINE': 'django.db.backends.sqlite3',
-'NAME': 'dev.db',
-'USER': '', # Not used with sqlite3.
-'PASSWORD': '', # Not used with sqlite3.
-# Set to empty string for localhost. Not used with sqlite3.
-'HOST': '',
-#
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/disambiguate_production_program_names into lp:widelands
I only looked at the diff and the lua-changes look good to me. I also like the extended documentation. I can't say much about the source code change. The code itself looks okay but I have no idea what exactly _() and pgettext_exp() are doing. -- https://code.launchpad.net/~widelands-dev/widelands/disambiguate_production_program_names/+merge/316933 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/disambiguate_production_program_names into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/notifications_economy_window into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/notifications_economy_window/+merge/311572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/notifications_economy_window. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1634736-victory-gamespeed/+merge/316973 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1661220 in widelands: "Review campaigns in regard of needed barracks"
https://bugs.launchpad.net/widelands/+bug/1661220
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1661220-campaigns-barracks/+merge/317033
Added an objective to build a barracks to the atlanteans campaign. Is triggered
as soon as the mining industry is finished and before the training-objective is
called.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands.
=== modified file 'data/campaigns/atl01.wmf/scripting/mission_thread.lua'
--- data/campaigns/atl01.wmf/scripting/mission_thread.lua 2016-11-30 08:32:29 +
+++ data/campaigns/atl01.wmf/scripting/mission_thread.lua 2017-02-11 20:25:29 +
@@ -94,6 +94,19 @@
}) do sleep(3478) end
set_objective_done(o)
+ run(build_barracks)
+end
+
+function build_barracks()
+
+ msg_boxes(barracks_story)
+
+ local o = add_campaign_objective(obj_build_barracks)
+ while not check_for_buildings(p1, {
+ atlanteans_barracks = 1,
+ }) do sleep(3784) end
+ set_objective_done(o)
+
sleep(15 * 60 * 1000) -- sleep a while
run(build_training)
end
=== modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
--- data/campaigns/atl01.wmf/scripting/texts.lua 2016-12-28 22:11:45 +
+++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-11 20:25:29 +
@@ -94,6 +94,16 @@
)
}
+obj_build_barracks = {
+ name = "obj_build_barracks",
+ title = _"Build a barracks",
+ number = 1,
+ body = objective_text(_"Recruiting new soldiers",
+ _[[Now that weapons are forged new soldiers can be recruited. For this, a light trident and a tabard have to be delivered to the barracks. There, a recruit from the warehouse receives them together with some basic training and becomes a soldier.]] .. paragraphdivider() ..
+ listitem_bullet(_[[Build a barracks]])
+ )
+}
+
obj_make_training_buildings = {
name = "obj_make_training_buildings",
title = _"Build training sites for soldiers",
@@ -302,6 +312,16 @@
},
}
+barracks_story = {
+ {
+ title = _"Jundlina Writes a Letter",
+ body = jundlina(_"Jundlina",
+ -- TRANSLATORS: Jundlina
+ _([[I received words that our mining industry started working. Now that we are forging weapons, I will send a letter to Sidolus that its time to build a barracks and start training soldiers.]]))
+ .. new_objectives(obj_build_barracks)
+ }
+}
+
training_story = {
{
title = _"Jundlina Summons Sidolus",
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1658456-quantity-empire-soldier/+merge/317026 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands
Continuous integration builds have changed state: Travis build 1927. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200615715. Appveyor build 1762. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1658456_quantity_empire_soldier-1762. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658456-quantity-empire-soldier/+merge/317026 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands.
Commit message:
Fish Breeder's Houses no longer display a "Can’t find any more resources!"
tooltip when the fishing rounds are full. We have the following behaviour
instead:
1. Working normally: Don't display anything.
2. Fishing grounds are full: Show tooltip
2. No fields with fish in them in the work area: Show tooltip and send "Out of
Resources" message.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1657117 in widelands: "differentiating fish breeder messages "
https://bugs.launchpad.net/widelands/+bug/1657117
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1657117-fishbreeder-messages/+merge/317028
See commit message. The linked bug has a savegame with an empty fish pond for
testing.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-11-02 05:48:00 +
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2017-02-11 12:22:38 +
@@ -82,6 +82,11 @@
--productivity_threshold = 30
--},
--
+--**resource_not_needed_message**.
+--*Optional*. This string defines the tooltip shown by the productionsite
+--to the player if all resources have been replenished by its worker in full.
+--Look at the Atlantean Fish Breeder's House for an example.
+--
tribes:new_productionsite_type {
msgctxt = "atlanteans_building",
name = "atlanteans_armorsmithy",
=== modified file 'data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2015-12-11 16:54:00 +
+++ data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2017-02-11 12:22:38 +
@@ -46,4 +46,14 @@
}
},
},
+
+ out_of_resource_notification = {
+ -- Translators: Short for "Out of ..." for a resource
+ title = _"No Fish",
+ heading = _"Out of Fish",
+ message = pgettext("atlanteans_building", "The fish breeder working out of this fish breeder’s house can’t find any fish in his work area. Remember that you can only regenerate your fish resources if there are some fish left to breed."),
+ productivity_threshold = 60
+ },
+ -- Translators: Productivity tooltip for Atlantean fish breeders when all water fields are already full of fish
+ resource_not_needed_message = _"The fishing grounds are full";
}
=== modified file 'src/logic/findnode.cc'
--- src/logic/findnode.cc 2017-01-28 19:55:25 +
+++ src/logic/findnode.cc 2017-02-11 12:22:38 +
@@ -116,14 +116,35 @@
if (resource != coord.field->get_resources()) {
return false;
}
- if (coord.field->get_resources_amount() < coord.field->get_initial_res_amount()) {
- return true;
+ switch(strictness) {
+ case AnimalBreedable::kDefault:
+ // We test actual breedability
+ if (coord.field->get_resources_amount() < coord.field->get_initial_res_amount()) {
+ return true;
+ }
+ break;
+ case AnimalBreedable::kAnimalFull:
+ // We test potential breedability, just resources are now full
+ if (coord.field->get_resources_amount() == coord.field->get_initial_res_amount()) {
+ return true;
+ }
+ break;
}
for (Direction dir = FIRST_DIRECTION; dir <= LAST_DIRECTION; ++dir) {
const FCoords neighb = map.get_neighbour(coord, dir);
- if (resource == neighb.field->get_resources() &&
- neighb.field->get_resources_amount() < neighb.field->get_initial_res_amount()) {
- return true;
+ switch(strictness) {
+ case AnimalBreedable::kDefault:
+ if (resource == neighb.field->get_resources() &&
+ neighb.field->get_resources_amount() < neighb.field->get_initial_res_amount()) {
+return true;
+ }
+ break;
+ case AnimalBreedable::kAnimalFull:
+ if (resource == neighb.field->get_resources() &&
+ neighb.field->get_resources_amount() == neighb.field->get_initial_res_amount()) {
+return true;
+ }
+ break;
}
}
return false;
=== modified file 'src/logic/findnode.h'
--- src/logic/findnode.h 2017-01-28 19:58:00 +
+++ src/logic/findnode.h 2017-02-11 12:22:38 +
@@ -28,6 +28,8 @@
namespace Widelands {
+enum class AnimalBreedable {kDefault, kAnimalFull};
+
struct FCoords;
class Map;
@@ -174,15 +176,16 @@
DescriptionIndex resource;
};
-/// Accepts a node if it has the given resource type and remaining capacity.
+/// Accepts a node if it has the given resource type and a) has remaining capacity, b) is full
struct FindNodeResourceBreedable {
- FindNodeResourceBreedable(DescriptionIndex res) : resource(res) {
+ FindNodeResourceBreedable(DescriptionIndex r
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/notifications_economy_window into lp:widelands
The new comment is much better, thank you :) -- https://code.launchpad.net/~widelands-dev/widelands/notifications_economy_window/+merge/311572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/notifications_economy_window. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands
Thanks for the test and review! The NOCOM was an old note that needed to go. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1634736-victory-gamespeed/+merge/316973 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/less_compilers into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/less_compilers/+merge/316897 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/less_compilers. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/less_compilers into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/less_compilers into lp:widelands has been updated. Commit Message changed to: Removed clang 3.6, clang 3.7 and gcc 4.7 from .travis.yml. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/less_compilers/+merge/316897 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/less_compilers. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands
Review: Approve testing Played the first tutorial and it works as expected. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1634736-victory-gamespeed/+merge/316973 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands
Review: Approve Nic find! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658456-quantity-empire-soldier/+merge/317026 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
I think clang 4 is a sensible addition, gcc 7 does not seem to be supported yet, so this should be removed again. -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1658456 in widelands: "Imperials: Soldier target quantity not changable"
https://bugs.launchpad.net/widelands/+bug/1658456
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1658456-quantity-empire-soldier/+merge/317026
Fixed bug that the empire soldier target quantity could not be changed. Turned
out to be a simple copy&paste bug: The worker id was compared against the known
ware ids. The carrier animals and the other soldiers just got lucky and were
accepted since there exists wares with the same id.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into
lp:widelands.
=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc 2017-01-25 18:55:59 +
+++ src/logic/playercommand.cc 2017-02-11 09:53:49 +
@@ -1309,7 +1309,7 @@
void CmdSetWorkerTargetQuantity::execute(Game& game) {
Player& player = game.player(sender());
- if (economy() < player.get_nr_economies() && game.tribes().ware_exists(ware_type())) {
+ if (economy() < player.get_nr_economies() && game.tribes().worker_exists(ware_type())) {
player.get_economy_by_number(economy())->set_worker_target_quantity(
ware_type(), permanent_, duetime());
}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/less_compilers into lp:widelands
Review: Approve Instead of dropping gcc 4.9, I suggest making gcc 4.7 not-supported anymore. Ubuntu 14.04 LTS ships with gcc 4.8 and that is a reasonable lower bound to support. Afaik there is no supported linux distribution that still ships with 4.7. otherwise lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/less_compilers/+merge/316897 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/less_compilers. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands
Code looks good to me and in single player it works as wanted. What do you mean with your NOCOM? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1634736-victory-gamespeed/+merge/316973 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/notifications_economy_window into lp:widelands
Review: Approve I added a tiny rewording of a comment, otherwise lgtm. Please merge when happy. -- https://code.launchpad.net/~widelands-dev/widelands/notifications_economy_window/+merge/311572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/notifications_economy_window. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands
Continuous integration builds have changed state: Travis build 1926. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200408939. Appveyor build 1761. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1634736_victory_gamespeed-1761. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1634736-victory-gamespeed/+merge/316973 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
