Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,012 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

523 Commits

Author SHA1 Message Date
Enno Rehling 2be1868ff0 Antiemagiekristall Meldung geht an die Region. 
Nicht nur an die Partei, die es zaubert.
http://bugs.eressea.de/view.php?id=1987
 2017-02-03 21:48:03 +01:00
Enno Rehling 7750297dc2 express race.magres as percentage, not probability (double->int) 2017-02-03 10:57:32 +01:00
Enno Rehling 784a934c47 Fix snotling XML (no recruiting). 2017-02-02 19:17:01 +01:00
Enno Rehling b08b1544f4 snotling is not a player race 2017-02-02 16:55:07 +01:00
Enno Rehling 30665f874a fix game_name, remove it from rules 2017-01-22 20:32:54 +01:00
Enno Rehling 9ccaab6516 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-22 20:19:32 +01:00
Enno Rehling aa66e5d39f remove unused equipment sets (from an unrealized feature). 2017-01-22 19:06:37 +01:00
Enno Rehling 2c6ae9baef remove ERESSEA keyword from "bad password" message. 2017-01-22 12:43:48 +01:00
Enno Rehling d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling 9c69963477 change error message categories. 
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
 2017-01-20 22:39:38 +01:00
Enno Rehling 3533291711 remove at_hurting, it was only used by the Temple of Pain, which is no longer in the game. 2016-11-13 18:33:47 +01:00
Enno Rehling 28aa2a56b8 Entferne unbenutztes "Szepter der Tränen". 
Was für eine saublöde Idee.
 2016-11-13 17:49:16 +01:00
Enno Rehling b9f6a3f620 skillpotion appears as a vial to other players. 
https://bugs.eressea.de/view.php?id=2254
 2016-11-05 19:58:18 +01:00
Enno Rehling fec9945458 Fixing Bugs 2246 & 2251 
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
 2016-11-05 18:20:56 +01:00
Enno Rehling 2c0f708d1b WIP: remove at_guard, GUARD_TREES and GUARD_MINING 
TODO: fix tests
TODO: write new guard coverage
 2016-10-30 09:18:19 +01:00
Enno Rehling 38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling 530e47efae Tippfehler bei Steinkreis-Weihung. 
https://bugs.eressea.de/view.php?id=2240
 2016-10-01 16:59:19 +00:00
Enno Rehling cbd1e8c457 Fixing https://bugs.eressea.de/view.php?id=2234 
remove the MTF_VITAL materials flag.
remove remaining BLD_MAINTAINED vs BLD_WORKING code.
 2016-10-01 18:34:38 +02:00
Enno Rehling 37a5954c20 NPC races cannot be recruited (and provide no score). 2016-09-22 20:11:14 +02:00
Enno Rehling 5ccb2c3dc8 remove recruitcost from non-player races. 
make score not call old_race.
fix orcs don't get scored.
https://bugs.eressea.de/view.php?id=2241
delete some unused race-enums.
delete centaurs.
 2016-09-22 18:28:37 +02:00
Enno Rehling ac4f8d6e7b make monsters scaring peasants a per-race configuration. 
reduce the number of old_race calls that monster.c makes.
 2016-09-22 09:34:23 +02:00
Enno Rehling ff83d5108a remove old_race call form heal_factor 2016-09-22 09:08:02 +02:00
Enno Rehling a7fbe4901b eliminate old_race. make the catdragon act like a dragon. 2016-09-19 18:42:14 +02:00
Enno Rehling 6ec99af4d6 mark all three major dragon types as RCF_DRAGON. 
use RCF_DRGON flag to detemine BP_DRAGON speed.
 2016-09-19 15:53:31 +02:00
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
Enno Rehling f7698d92a9 change how migrant quota is configured for a race, eliminate the related rule caching 2015-11-22 15:53:50 +01:00
Steffen Mecke a6757ecf9d Merge branch 'develop' into massive_overload 
Conflicts:
	src/move.test.c
 2015-11-19 14:54:14 +01:00
Steffen Mecke 742a30cc39 fix seaserpents 
seaserpents could not do piracy
seaserpents should be able to attack after move
 2015-11-17 12:17:28 +01:00
Enno Rehling d07f359acb fix a minor warning, get ready for 3.7 release 2015-11-16 14:12:51 +01:00
Philipp Dreher 1562439ca9 Moved the description of skillpotion to another namespace 
Skillpotion isn't actually defined as a potion (or part of the
alchemy-system), therefore the description needs to be moved to the
namespace "iteminfo" to be found.
 2015-11-16 03:22:19 +01:00
Steffen Mecke 3a18384ddb overfull ships do not drift but take damage 
http://bugs.eressea.de/view.php?id=2157
removed exploit:
ships more than 2 times over their ship type's capacity do not drift but take 30% to 100% damage
 2015-11-15 12:43:05 +01:00
Steffen Mecke 493b45c832 taxing without skill does not fail silently any more 
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
 2015-11-14 15:36:14 +01:00
Steffen Mecke 4ab92e3caf fixed descriptions of spells with parameters (bug #2060+1867) 2015-11-13 00:57:14 +01:00
Enno Rehling 4eb4ff40ac https://bugs.eressea.de/view.php?id=2155 
monsters do not attack units inside a castle or watch
dragons do not attack guards
 2015-11-11 14:36:56 +01:00
Enno Rehling 5aa5d52022 Merge pull request #362 from TurnerSE/bug/#2104 
ohne die alle gelesen zu haben, akzeptiere ich das mal. Ist auf jeden Fall besser als keine Beschreibung, da bin ich sicher.
 2015-11-04 07:45:00 +01:00
Philipp Dreher 56aeae4fbe one last, but big, translation... 2015-11-04 00:40:24 +01:00
Philipp Dreher 42d0a1beef more spells translated 2015-11-03 22:43:26 +01:00
Philipp Dreher d6bcc8345b translated some more spells 2015-11-03 16:41:57 +01:00
Philipp Dreher 8d70a07901 added english descriptions for a few spells 2015-11-03 13:22:44 +01:00
Enno Rehling 0b00bfecdf Merge pull request #342 from TurnerSE/bug/CID22449 
Bug/cid22449
 2015-11-02 15:55:44 +01:00
Philipp Dreher 153db447de removed obsolete messages 2015-11-02 13:09:45 +01:00
Philipp Dreher de970b4ba9 changed the description for the spell "airship" in DE and EN 2015-11-01 19:12:14 +01:00
Philipp Dreher 597aadbac3 small textual corrections 2015-10-31 17:09:39 +01:00
TurnerSE df92ed03cf added descriptions for skillpotion in EN and DE 2015-10-31 02:48:04 +01:00
Enno Rehling 9e49e10d11 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/unit.test.c
 2015-10-10 22:55:29 +02:00
Enno Rehling 6162d0f16c fixing bug 2141 2015-09-25 11:31:43 +02:00
Enno Rehling 84a92124bd Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters 
Conflicts:
	conf/e3/config.xml
 2015-09-19 13:35:53 +02:00
Enno Rehling bd1b568da2 Präfix Erz 2015-09-12 14:13:45 +02:00
Enno Rehling c57918ede0 replace XML terrains for E3 and E4 with JSON configuration 2015-09-11 22:43:08 +02:00
Enno Rehling 7e8fef01af forgot some flags for volcano terrain, caused integration test to crash. neat. 2015-09-11 22:18:57 +02:00
Enno Rehling b4971dd651 replace all of the E2 terrains with JSON data (no more XML!) 2015-09-11 22:11:59 +02:00
Enno Rehling db4cb2618b transfer most core and all game-specific terrains for E2 from XML to JSON. 2015-09-11 21:14:10 +02:00
Enno Rehling 8860244f1c Merge branch 'link-seen-duplicate' into feature/feature-json-terrains 2015-09-11 11:12:30 +02:00
Enno Rehling aefc74c2fb New German spelling : daß -> dass 2015-09-09 09:04:00 +02:00
Enno Rehling b8df3f3a5f increase the datatype for scores from int to long long 
this fixes https://bugs.eressea.de/view.php?id=2136
 2015-09-06 19:04:04 +02:00
Enno Rehling d08959f9a8 fix German spelling in a message, 
add a test for is_guarded.
 2015-08-30 14:52:42 +02:00
Enno Rehling 7bb882b15b add a spell for igjarjuk (WIP) 2015-08-30 10:57:08 +02:00
Enno Rehling a9ecd1f55e replace all at_travelunit code with travelthru_map calls. 
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
 2015-08-19 14:37:51 +02:00
Enno Rehling b50c1720cf several monster_attack fixes. 
1. do not try to attack other monsters.
2. monsters outside of a building can attack units outside of buildings.
3. dragons can guard without weapons.
 2015-08-16 16:18:59 +02:00
Enno Rehling 398579c293 remove duplication, fix a stray blank space in the NR. 2015-08-07 16:17:11 +02:00
Enno Rehling 816243d2d7 magicians can always identify their own curse-effects. 
magic-resistance on a building is always visible to anybody, just like it is on units.
 2015-08-07 15:52:10 +02:00
Enno Rehling afbc4c816b refactoring ship speed, extract total skills of sailors into a function. 2015-08-07 12:43:18 +02:00
Enno Rehling 4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling 034d1d5433 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 19:03:45 +02:00
Enno Rehling b8e17839a7 eliminate some spammy warnings. 2015-07-08 18:27:27 +02:00
Enno Rehling 05f444bab1 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 17:53:09 +02:00
Enno Rehling 6abf8f7adb bug 1692: rewrite of magicresistance curse-info, especially for buildings (homestome spell). 2015-07-08 05:12:26 +02:00
Enno Rehling c8ffe8da7a Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
Enno Rehling cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling 17fb05b167 Merge pull request #253 from badgerman/feature/bug-1692-magicresistance-visibility 
bug 1692: magicresistance visibility
 2015-07-06 17:59:16 +02:00
Enno Rehling 960e0f8024 do not show magic resistance effects to other than the unit's own faction. 
https://bugs.eressea.de/view.php?id=1692
 2015-07-06 16:13:22 +02:00
Enno Rehling 40cd6b3bc4 Merge pull request #248 from badgerman/feature/bug-1838-deathcloud-duration 
Bug 1838: deathcloud duration and messages
 2015-07-03 18:32:25 +02:00
Enno Rehling af004bb27b individual poison damage messages 2015-07-03 18:27:10 +02:00
Enno Rehling 979f3460d6 Bug 1805: re-enable NMR warnings 
https://bugs.eressea.de/view.php?id=1805
move warnings to the top of the list of errors in the NR
 2015-07-03 15:31:57 +02:00
Enno Rehling c634a01a3f Bug 1949: Zauberbeutelverhalten (magic bag tests & config changes) 
https://bugs.eressea.de/view.php?id=1949
 2015-07-01 22:13:24 +02:00
Enno Rehling 2967cd59cf replace pushnumber with pushinteger where applicable (prep for Lua 5.3). 
also kill an unreferenced string.
 2015-06-08 20:53:40 +02:00
Enno Rehling 3e48b9b966 libxml 1.9.x seems to be a bit pickier about how XML catalogs are written. 2015-06-08 16:51:41 +02:00
Enno Rehling 0fb547f7c2 Beispiel Trolle -> Schlümpfe 
Test des Atom Editors
 2015-05-12 08:41:14 -07:00
Enno Rehling 94929be51f Merge pull request #187 from badgerman/develop 
Convert all XML files to UTF-8
 2015-05-11 23:29:28 -07:00
Enno Rehling a0c6bbb9aa fix encoding conversion errors from previous commit 2015-05-11 23:20:32 -07:00
Enno Rehling a4774be652 Convert all XML files to UTF-8, to allow editing with Atom. 2015-05-11 16:55:11 -07:00
Steffen Mecke ca89213295 fixed mallorn curse message 2015-05-07 17:51:44 +02:00
Steffen Mecke 94ae774fed fix spelling of spell titles 2015-05-07 17:51:43 +02:00
Steffen Mecke 9407b4c9c0 fixed crash of analyze magic 
because of missing spell/curse description
 2015-05-07 17:51:43 +02:00
Steffen Mecke 2cc8c1f871 trying to solve spy message bug #1604 
Conflicts:
	src/kernel/CMakeLists.txt
 2015-05-04 14:30:59 +02:00
Steffen Mecke a9a14a79d0 fixed messed up english strings for wounds 2015-04-30 15:47:29 +02:00
Steffen Mecke 81e96c121a typo 2015-04-27 15:14:42 +02:00
Enno Rehling 38fe2b1144 Hier hat ein commit aus dem github-Editor das Encoding zerstört, scheint mir. 2015-04-26 23:02:37 +02:00
Enno Rehling fdb0a79c07 https://bugs.eressea.de/view.php?id=2085 
Tippfehler
 2015-04-20 19:05:26 +02:00
Enno Rehling e31b671b84 https://bugs.eressea.de/view.php?id=2092 
Tippfehler
 2015-04-20 19:03:53 +02:00
Enno Rehling 3b6add91e6 https://bugs.eressea.de/view.php?id=2091 
Tippfehler
 2015-04-20 19:01:49 +02:00
Enno Rehling 2c40a9f593 https://bugs.eressea.de/view.php?id=2090 
Tippfehler
 2015-04-20 19:00:52 +02:00
Enno Rehling 71d0558403 Bug 2089: remove the giveitem restriction from all races. 
https://bugs.eressea.de/view.php?id=2089
 2015-04-19 09:49:52 +02:00
Enno Rehling 7e92e6501c remove the (broken) summon_alp spell, by request 
https://bugs.eressea.de/view.php?id=2086
 2015-04-04 11:02:56 +02:00
Enno Rehling 491f6f2cb3 re-enable silver weight 2015-03-07 13:56:31 +01:00
Enno Rehling b7de307385 Merge branch 'message_fix' of https://github.com/stm2/server into stm2-message_fix 2015-02-20 20:05:44 +01:00
Steffen Mecke b5f8be8a95 fix heroes must not recruit 2015-02-10 18:17:58 +01:00
Steffen Mecke 7fd32e425a fix spy and volcano messages 2015-02-09 09:15:43 +01:00
Enno Rehling a2e071d35b Fix broken syntax in message about effects on units. 
Add some missing descriptions.
Bump version number.
 2015-02-08 13:09:04 +01:00
Enno Rehling 5c975655b1 remove french messages that are not french 2015-02-02 21:45:47 +01:00
Steffen Mecke d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling ba26897872 Merge branch 'master' of github.com:eressea/server 2015-02-01 12:25:35 +01:00
Enno Rehling 9a395127ac Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix 
Conflicts:
	src/report.c
 2015-02-01 12:24:19 +01:00
Enno Rehling c75012b61d Merge pull request #119 from stm2/giant_message_typo_fix 
translated English messages and fixed a ton of typos
 2015-02-01 11:44:18 +01:00
Enno Rehling 03cddee6b7 Small plural/singular fix in German message. 2015-02-01 10:39:36 +01:00
Enno Rehling df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Steffen Mecke 4c391ae6f6 implemented Enno's suggestions for peasant growth 2015-01-29 23:55:02 +01:00
Enno Rehling 87735c6c8e Merge pull request #121 from badgerman/version-3-4 
Version 3.4 final preparations before launch
 2015-01-29 18:08:58 +01:00
Enno Rehling c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling 7527e6e903 disable silver weight for the initial rollout of version 3.4 
two weeks after launch, revert this commit
 2015-01-29 16:56:21 +01:00
Steffen Mecke ec6560a281 adding a nice region message 2015-01-15 03:48:19 +01:00
Enno Rehling 6fb23af66a test that ships are encumbered by money. define money in XML, not just in code. 2015-01-14 17:56:12 +01:00
Steffen Mecke 039ee159cb a bunch of messages in the NR where not localized 2015-01-14 16:17:21 +01:00
Steffen Mecke e727f9e9d4 translated English messages and fixed a ton of typos 2015-01-14 01:59:10 +01:00
Steffen Mecke 9142b79614 fixed message (bug #1506) 2015-01-14 01:58:26 +01:00
Enno Rehling 4f2d9260d1 add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
CTD 34fc1b3d34 Variablen leserlicher gemacht 2015-01-12 10:55:07 +01:00
CTD ac3195851a Erstmal nur der Burgenbonus 
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
 2015-01-09 15:53:14 +01:00
Enno Rehling 90dd700487 BREED/PLANT/GROW are technically the same command, merge them. 
The new parser makes this easy.
 2015-01-04 15:11:49 +01:00
Enno Rehling 66ba288bae type in spell description (bug 2061). 
https://bugs.eressea.de/view.php?id=2061
 2014-12-31 22:43:08 +01:00
Enno Rehling b3bec13051 report the unit limit in NR and CR. 
this implements https://bugs.eressea.de/view.php?id=2055
 2014-12-19 19:57:24 +01:00
Enno Rehling 4b1ac68446 let the snowman give items to other units. 
this fixes https://bugs.eressea.de/view.php?id=1924
 2014-12-14 20:09:43 +01:00
Enno Rehling 27b1d55350 enhancement: buildings without an owner report their lack of upkeep to the entire region. 
https://bugs.eressea.de/view.php?id=1713
 2014-12-14 11:48:15 +01:00
Enno Rehling dd87907566 bugfix: making clones help with upkeep. 
https://bugs.eressea.de/view.php?id=1560
 2014-12-13 23:37:42 +01:00
Enno Rehling ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling ecc3b1b441 Dragons re using the new LOOT command. 
Fixing the income message (missing ")").
 2014-11-02 11:10:26 +01:00
Enno Rehling bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 2014-11-02 10:02:30 +01:00
Enno Rehling 6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling 96d5544b1f Bug 2032: rename FIGHT back to COMBAT 2014-10-20 17:13:32 +02:00
Enno Rehling f4f9e74e90 Merge branch 'master' of github.com:eressea/server 2014-10-19 05:56:41 +02:00
CTD 1c7075573b Plündern 
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
 2014-10-16 14:45:21 +02:00
Enno Rehling 595dc1334e fix new harbor code, add tests. 
- alliances were checked in the opposite direction
- code crashed when harbor has no owner
 2014-10-03 21:26:11 +02:00
Enno Rehling 68730749fb fix astral space special direction, vortex (translation issue). 2014-09-29 21:19:07 +02:00
Enno Rehling 3e829e2880 support for itoab with smaller bases and larger numbers. 
also a missing English message (museum-related)
 2014-09-29 18:32:12 +02:00
Enno Rehling baffbbf154 Merge branch 'master' of github.com:eressea/server 2014-09-04 21:20:15 +02:00
Enno Rehling c0230d2662 In the game, there is only ever one special direction, and it is for the astral space. 
less XML, more code.
cleaning up the special direction parsing a bit.
 2014-08-28 19:50:38 +02:00
Enno Rehling 2211111b29 Remove a German-only piece of text, to reduce the footprint of fleets in the report a little. 
Fix English score message in NR.
Small fixes to meet Visual Studio warning level 4.
 2014-08-25 00:45:32 +02:00
Enno Rehling e87b1cf372 an experiment to have deterministic sort order for known factions in the report. 2014-08-25 00:06:33 +02:00
Enno Rehling 5befbad7c7 Merge branch 'version-3-1' 
Conflicts:
	src/laws.c
 2014-08-24 00:30:12 +02:00
Enno Rehling beacb850c6 fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:37:33 +02:00
Enno Rehling b2dc6a3a9d fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:35:06 +02:00
Enno Rehling 1dcb14cfb9 Revert "silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013" 
This reverts commit 911992b04d.
 2014-08-22 20:15:44 +02:00
Enno Rehling a84e628522 Repair MAKE, which broke when I changed MAKE TEMP. 
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
 2014-08-21 07:31:28 +02:00
Enno Rehling fb7c8a898f add a test for get_monsters(). 
I want to make sure I don't break this in the future.
 2014-08-20 08:18:47 +02:00
Enno Rehling acfe72f24e add a test for get_monsters(). 
I want to make sure I don't break this in the future.
 2014-08-20 07:00:58 +02:00
Enno Rehling 308b5ca358 Merge branch 'master' of https://github.com/eressea/server 2014-08-18 20:30:20 +02:00
Enno Rehling 41e8c13a0c I do not like contractions. 2014-08-17 18:20:04 +02:00
Enno Rehling 59ccf23db6 Repair MAKE, which broke when I changed MAKE TEMP. 
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
 2014-08-17 14:47:39 +02:00
Enno Rehling a289eee06f Merge branch 'master' of github.com:eressea/server 2014-08-17 12:15:26 +02:00
Enno Rehling f8ad9e92e7 Fix some English message translations. 
clean up and improve some scripts, too.
 2014-08-17 11:19:04 +02:00
Enno Rehling 8f09ab73d9 fix display of alliance status, some English translation hiccups. 2014-08-17 00:14:50 +02:00
Enno Rehling c79dd33bfb smarter processing of MAKE TEMP. 
the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state.
 2014-08-16 11:41:19 +02:00
Enno Rehling 9ca206ec3f remove reference to thieves and spies from this spell for non-E2 games. 
this fixes https://bugs.eressea.de/view.php?id=1548
 2014-08-14 07:05:12 +02:00
Enno Rehling 7eb21611ce Adjust the weight of young dragons to be less than regular dragons. 
This fixes https://bugs.eressea.de/view.php?id=1677
 2014-08-14 06:29:45 +02:00
Enno Rehling 911992b04d silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013 
this broke when I replaced the new_itemtype function. I owe a test for it.
 2014-08-14 03:48:39 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts). 
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
 2014-07-28 14:27:30 +02:00
Enno Rehling 018d4ca38e fix quest keys to work again. 
add a function to walk borders with a callback.
 2014-07-22 10:59:47 +02:00
Enno Rehling d7803eb318 trying to fix the museum. WIP. 2014-07-21 11:13:16 +02:00
Enno Rehling fbe9822e9c mpve sceipts tp the roght place. 2014-07-19 23:55:41 +02:00
Enno Rehling 5c78a3883e cleaning up terrains, reading race flags from a JSON array 2014-06-16 22:43:40 -07:00
Enno Rehling 58fa2d4454 Merge branch 'master' of github.com:eressea/server 2014-06-07 09:26:38 +02:00
Enno Rehling 115d3a8f86 some specialized equipment 2014-06-03 07:35:45 -07:00
Enno Rehling fa256360b9 eliminate kill_nonstarters 2014-06-03 06:29:33 +02:00
Enno Rehling e17a3fc8fa eliminate remaining traces of the wisps spell 2014-06-02 07:22:07 +02:00
Enno Rehling 1f41131593 remove invalid skills from E3 races 2014-06-02 00:01:24 +02:00
Enno Rehling 41c6b13111 familiars with differnt skills for different games 2014-05-10 13:50:16 -07:00
Enno Rehling 1318c8976a e4 startup 2014-05-03 19:53:59 +02:00
Enno Rehling 75b7ac3064 new turn processing script, 
add adamantium to config
 2014-04-27 02:59:02 +02:00
Enno Rehling 921ab4947e fixing xml config for e2 and e3 2014-04-24 06:24:35 -07:00
Enno Rehling a485f65562 new config files 2014-04-24 09:14:29 +02:00
Enno Rehling fa5dc43b98 reorganizing the way configuration data is read (WIP) 2014-04-20 09:36:25 -07:00
Enno Rehling 31b083a19f E3 hatte keine flammenschwerter 
Fixing http://bugs.eressea.de/view.php?id=1925
 2013-12-27 05:47:11 +01:00
Enno Rehling 75c540992b fix the default arda server's configuration 2013-12-27 01:58:35 +01:00
Enno Rehling bef560d92a Fix xml catalog references for E2 and E3. 
Fix a bug in the new get_arg function.
 2013-12-27 01:54:02 +01:00
Enno Rehling ca79c28eaf kill empty folder 2013-12-27 01:07:55 +01:00
Enno Rehling b532673f89 remove deprecated commands 2012-06-17 20:22:01 +02:00
Enno Rehling bff66773cf update the arda server to use submodules and new cmake layout 2012-06-07 12:44:25 -07:00
Enno Rehling 10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling a65a176ba0 rename the example world. It is now called "Arda" (another Tolkien name) 2012-06-01 17:40:25 -07:00
Enno Rehling 9f06268acd gray magic needs to contain all of the spells that any monster could cast, so add all of them for now. 2012-05-26 15:48:02 -07:00
Enno Rehling 6362d26e50 kill tybied in E3, make common spells the source for random choices 2012-05-26 14:20:01 -07:00
Enno Rehling 1ba2ed200b remove spell-levels from XML file, we no longer read these or need these. 2012-05-26 09:41:32 -07:00
Enno Rehling 6482b748c8 remove leveled resources from fixed-level spells 2012-05-25 23:32:03 -07:00
Enno Rehling c3cd519152 specify levels with magic attacks (step one to removing spell->level) 2012-05-24 01:45:13 -07:00
Enno Rehling 42a0fae762 fix spellbook data for example server 
remove duplicate spells
 2012-05-23 22:24:31 -07:00
Enno Rehling 1296e45109 fix spellbook data for E2 and E3 2012-05-23 22:24:00 -07:00
Enno Rehling d4d39b43e9 add xml spellbooks for the magic schools in E2 and E3 
this is being read, but not used by the code yet.
 2012-05-23 21:50:59 -07:00
Enno Rehling 2550f7fee3 eressea-pbem.de no longer exists 2012-05-16 13:06:50 -07:00
Enno Rehling ea7eaf87aa spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:23:40 -07:00
Enno Rehling 99fddaf81b stop warnings when starting example server 2012-04-17 05:51:54 +02:00
Enno Rehling c070d999a3 fix the stealht settings for E3 
http://bugs.eressea.de/view.php?id=1898
 2012-03-19 05:49:32 +01:00
Enno Rehling 71d9f68b3e faction stealth is only selectively enabled in E3 
do not show spell messages when no items are given (in seduce)
 2012-03-04 19:24:27 -08:00
Enno Rehling 929ee605e1 insects trying to land in glaciers should not damage ships (cf. #1729) 2011-03-09 21:00:26 +01:00
Enno Rehling 7fc1b4ae8c fixed two bugs: harbours were not unique and multiple instances of unique buildings could still be built 2011-03-09 00:28:37 +01:00
Enno Rehling 02921d0148 removed all unused items 2011-03-04 20:44:30 +01:00
Enno Rehling 7d4205a3d1 Fix carts in E3. 
Store fighters in a quicklist, not a cvector.
 2011-02-27 12:04:29 -08:00
Enno Rehling 9b06900d75 unit and magician limit extended in E2 2010-10-02 15:37:06 -07:00
Enno Rehling e5967dd13d these spells need at least one argument 2010-10-02 12:48:09 -07:00
Enno Rehling 22ab8ae620 frost / packice has no land_region strucutre (no peasants, no name and all that jazz) 2010-09-11 19:38:32 -07:00
Enno Rehling 92f0ba6dcf frost / packice 2010-09-11 19:30:19 -07:00
Enno Rehling be2d7d203d frost module: during winter, some oceans freeze over 2010-09-11 18:48:08 -07:00
Enno Rehling 6551236544 E3: no anonymous sides in combat. 2010-08-28 23:05:09 -07:00
Enno Rehling 6e4a38ee65 enable faction stealth for E3 2010-08-28 18:03:29 -07:00
Enno Rehling 201ae39a4d re-enable stealth faction (anon) 2010-08-28 17:54:15 -07:00
Enno Rehling d8414ea262 small fixes to directories and hings 2010-08-08 11:28:47 +02:00
Enno 7aa0e85917 small fixes to directories and hings 2010-08-08 11:28:43 +02:00
Enno Rehling 44804c2074 undo more CRLF screwups. 2010-08-08 01:14:01 -07:00
Enno 0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00
Enno Rehling e608d40e7a moving to a new repository layout. 
step 3: the example server that anyone can use
 2010-08-07 22:17:11 -07:00
Enno Rehling 0b4f92e312 fix crash when missing all spell targets 2010-07-03 13:00:37 -07:00
Enno Rehling 621430b7f0 http://bugs.eressea.de/view.php?id=1743 
- resist magic: do not apply power to quantity. it's already in the quality of the equation.
 2010-05-31 00:13:19 -07:00
Enno Rehling 10947e3659 http://bugs.eressea.de/view.php?id=1773 
- this is a precombat spell
 2010-05-31 00:07:07 -07:00
Enno Rehling 20b915151d halfling bonus removed 
new e3 rule for dwarven castles
 2010-03-24 23:14:46 -07:00
Enno Rehling 8a3d1cd219 http://bugs.eressea.de/view.php?id=1751 
fixing spells that need to look for units that the mage cannot see.
 2010-03-22 21:43:46 -07:00
Enno Rehling 412b7addea remove old orcs 
fix give-person test for new rules
 2010-03-22 19:53:45 -07:00
Enno Rehling be729e8856 new rules for morale 
no more uruks (it's all orcs now)
 2010-03-21 23:45:18 -07:00
Enno Rehling 569e38cbd4 Do not destroy buildings when NMR. 2010-03-14 18:07:32 -07:00
Enno Rehling 623c660df1 http://bugs.eressea.de/view.php?id=1737 
dwarves are not saving iron anymore.
 2010-03-14 17:29:08 -07:00
Enno Rehling c8d6ef2dd2 http://bugs.eressea.de/view.php?id=1749 
added a missing irongolem/stonegolem flag to those races.
 2010-03-14 16:39:12 -07:00
Enno Rehling 235c7df589 http://bugs.eressea.de/view.php?id=1728 
"E3 Personen wurden übergeben"
changed configuration and added tests
 2010-03-10 21:01:55 -08:00
Enno Rehling 275476aaf6 fixing directories and stuff. 2010-03-08 23:16:11 -08:00
Enno Rehling dd3f204a69 removing and moving to make a clean eressea-only repo 2010-03-06 14:32:20 -08:00