Commit Graph

248 Commits

Author SHA1 Message Date
Enno Rehling 402c19d8fc dn't warn new player about NMR.
newbie info text was no longer valid.
2016-09-11 16:35:55 +02:00
Enno Rehling 3a719226a2 Merge branch 'master' into develop
Conflicts:
	src/buildno.h
2016-09-01 21:55:52 +02:00
Enno Rehling a75b591784 Fix the nocostbuilding curse description.
https://bugs.eressea.de/view.php?id=2232
2016-09-01 20:49:05 +01:00
Enno Rehling ce7eb9663a remove dead phoenix feature. 2016-08-29 20:56:00 +01:00
Enno Rehling 4bc8817056 remove a TODO that was ill-advised. The reason that "resources" is a list is that it's built incrementally. 2016-08-29 18:15:20 +01:00
Enno Rehling ef44a4534e add a test for copying resources message arguments.
my plan is to add a new argument type for arrays of resources with fewer allocations.
2016-08-29 17:31:09 +01:00
Enno Rehling 33701ab891 make describe_braineater more generic (describe_race). 2016-08-28 20:44:45 +01:00
Enno Rehling a42bd9c3bf remove the BLD_WORKING flag.
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
2016-08-21 20:12:28 +02:00
Enno Rehling 43090e1492 remove any reference to old two-stage maintenance.
getting rid of a lot of dead code.
2016-08-21 20:02:20 +02:00
Enno Rehling 901cf97cb2 refactoring the "nocostbuilding" curse.
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
2016-08-21 20:02:19 +02:00
Enno Rehling 238a0e22f2 Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance
Conflicts:
	src/util/CMakeLists.txt
2016-08-08 08:46:09 +02:00
Enno Rehling e2808eeea9 reqsize defaults to 1.
remove default values from xml to make it smaller and simpler.
2016-08-06 13:53:07 +02:00
Enno Rehling db5b90e80b clarify building_type.maxsize and add error logging for bug 2221.
https://bugs.eressea.de/view.php?id=2221
2016-08-06 13:52:29 +02:00
Enno Rehling 3fa34f8238 Merge pull request #494 from stm2/bug_2193
fixed a few typos in E3 spells (bug 2193)
2016-07-08 10:31:39 +02:00
Steffen Mecke afdd20c4dd healing potion works once per battle with 100% 2016-06-12 23:23:22 +02:00
Steffen Mecke eaa94086eb one more fix 2016-06-12 00:05:19 +02:00
Enno Rehling 61acd40424 Merge pull request #512 from stm2/dragon_growl
Dragon growl
2016-06-11 23:16:23 +02:00
Steffen Mecke c5014fd766 integrated Ennos suggestions for dragon growls
Dragons now growl 20% more elegantly!
2016-06-11 13:47:38 +02:00
Enno Rehling 7fd1d3d616 remove ocean from coasts, SEA_REGION is enough 2016-06-10 20:50:22 +02:00
Steffen Mecke ce312afc95 fix dragon growl for regions with an apostrophe 2016-05-31 01:54:06 +02:00
Enno Rehling a834c486d9 fix a FIXME: setting default order through config, making test better.
this feature is not in use, so all this work is really pointless.
2016-04-09 19:05:28 +02:00
Enno Rehling be89aaeb83 Merge branch 'master' into develop
Conflicts:
	src/buildno.h
2016-03-26 22:28:14 +01:00
Enno Rehling bc8c39f4bb fix message-crash https://bugs.eressea.de/view.php?id=2199
release version 3.8.7
2016-03-26 22:09:21 +01:00
Enno Rehling 75f2be75d8 remove code for alp (non-functional)
remove code for removecurse trigger (only used by alp)
2016-03-25 21:18:57 +01:00
Steffen Mecke e143843b2c fixed a few typos in E3 spells (bug 2193) 2016-02-28 14:29:53 +01:00
Enno Rehling b646c9e22e duplicate definition of concealing_aura in E3 2016-01-24 11:44:18 +01:00
Enno Rehling 4f7b274bf6 Merge branch 'master' into develop
Conflicts:
	res/core/messages.xml
	src/buildno.h
2016-01-01 16:38:57 +01:00
Enno Rehling 4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Philipp Dreher 18f2cc1d70 cosmetic changes to iteminfo of skillpotion 2015-12-29 09:43:30 +01:00
Philipp Dreher 7b2aa821d0 Added iteminfo for snowglobe in DE+EN 2015-12-29 09:42:54 +01:00
Enno Rehling 2aafb841a5 Merge branch 'master' into develop
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
2015-12-26 14:46:20 +01:00
Enno Rehling cf90f8cf93 it's beginning to look a lot like christmas
Conflicts:
	scripts/eressea/xmas.lua
2015-12-22 18:46:57 +01:00
Enno Rehling 3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
2015-12-22 18:46:42 +01:00
Enno Rehling 810ad094af suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00
Enno Rehling acab4b3199 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2015-12-17 20:36:39 +01:00
Enno Rehling 30acc38d53 https://bugs.eressea.de/view.php?id=2174
fix terrain type in detectocean message.
2015-12-17 20:36:21 +01:00
Enno Rehling b700cb5a2c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-12-17 20:21:01 +01:00
Enno Rehling 02b2157fe5 move description from shared file to game-specific file
https://bugs.eressea.de/view.php?id=2177
2015-12-17 20:20:48 +01:00
Enno Rehling a02d71bfef https://bugs.eressea.de/view.php?id=2176
generate the reduced production message before writing reports, so it shows in the CR.
2015-12-17 12:40:22 +01:00
Enno Rehling cc88f56a26 no optioinal argument
http://bugs.eressea.de/view.php?id=2175#c6408
2015-12-15 07:59:55 +01:00
Enno Rehling 18bcf83d9b Merge pull request #432 from ennorehling/braineaters
no natural ac for braineaters
2015-12-10 22:12:38 +01:00
Enno Rehling d26cd57934 no natural ac for braineaters 2015-12-10 21:59:14 +01:00
Enno Rehling b854213be6 Merge pull request #429 from ennorehling/develop
break_curse spell description error message
2015-12-06 16:53:04 +01:00
Enno Rehling 6a20345b53 issue #428, fix writing spell description for break_curse 2015-12-06 16:45:31 +01:00
Steffen Mecke 864c875316 fix typo: fiery breath was icy 2015-12-05 22:27:03 +01:00
Enno Rehling b3e7fa63e0 Merge pull request #396 from stm2/spell_parameters
fixed treatment of spell parameters (bug 1867)
2015-12-03 11:04:57 +01:00
Steffen Mecke 9c076ba6b9 fix piracy_cmd for swimmers and flyers 2015-12-01 22:13:20 +01:00
Enno Rehling 4b7cb824bd Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload
Conflicts:
	src/move.c
	src/tests.c
2015-11-27 12:40:17 +01:00
Enno Rehling 6ad5db8e22 Merge pull request #397 from stm2/taxing_message
taxing without skill does not fail silently any more
2015-11-26 18:43:57 +01:00
Enno Rehling c85e489f4f Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers
Conflicts:
	src/kernel/unit.c
	src/laws.test.c
	src/monsters.c
2015-11-25 14:25:42 +01:00