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

531 Commits

Author SHA1 Message Date
Enno Rehling 87a71d24e6 some english message fixes 2020-01-18 17:23:51 +01:00
Enno Rehling 2e054f27cc Bug 2630: Drachen 
1. Jungdrachen sind Drachen (RCF_DRAGON)
2. Ein Monster das nicht kämpfen kann, braucht nicht zu plündern.
3. make code more readable.
4. Wer schon bewacht, braucht keinen BEWACHE Befehl.
 2020-01-07 19:24:10 +01:00
Enno Rehling fb21d6d932 kill ancient godcursezone code. 
add some tests for planting seeds.
 2020-01-04 12:22:14 +01:00
Enno Rehling 4785829d7f Typo 2020-01-03 18:02:42 +01:00
Enno Rehling e337b8b494 Bug 2626: Korrekter Meldungstext. 2020-01-03 17:14:44 +01:00
Enno Rehling dcf9b9df26 bug 2626: fehlende neue messages nachtragen 2020-01-02 11:34:26 +01:00
Enno Rehling 1c358b9982 bug 2263: skeletons and undead can guard and desert. 2019-10-22 18:56:04 +02:00
Enno Rehling 12491ffc16 GIB 0 an Land kann alle Schiffe geben, auf Ozean nicht. 2019-10-10 20:24:18 +02:00
Enno Rehling 1d405e2ef8 GIB 0 n SCHIFFE 
Keine Boote erlauben
Übergabe an eigene Besatzung.
 2019-10-10 20:17:25 +02:00
Enno Rehling 1e0afdc961 spells can only be cast on single ships. 2019-10-08 21:08:33 +02:00
Enno Rehling 43094e8bf9 plural strings for ships. 2019-10-08 05:15:23 +02:00
Enno Rehling f4011af784 GIB unit n SCHIFF implementiert. 2019-10-07 21:50:52 +02:00
Enno Rehling bb408d617f typo in message definition 2019-09-28 20:54:30 +02:00
Enno Rehling 3ac343a997 Pestmeldung, Regionen Singular/Plural. 2019-09-22 13:51:02 +02:00
Enno Rehling 6c73a58608 Bug 2607: BEnutze format_list für Schemen. 2019-09-21 22:16:46 +02:00
Enno Rehling 1db703f579 Galeone mit einem L 2019-08-21 15:36:36 +02:00
Enno Rehling e616449fd0 Leuchttürme zeigen minimale Info über Landregionen an. 
https://bugs.eressea.de/view.php?id=2490
Neues Schiff Galleone
https://bugs.eressea.de/view.php?id=2542
 2019-08-17 22:48:14 +02:00
Enno Rehling 0281ebc44b Bug 2596: Crash durch leeres Banner 
https://bugs.eressea.de/view.php?id=2596
 2019-07-14 09:26:32 +02:00
Enno Rehling f677a21541 disable QUIT FACTION with ifdef QUIT_WITH_TRANSFER 2019-07-06 12:02:52 +02:00
Enno Rehling 0e888c264f halflings take more hunger damage. 
nobody can die after one week of hunger .
 2019-05-26 19:51:32 +02:00
Enno Rehling bc6f38d9bc remove superfluous race definitions that are not used anywhere. 2019-05-18 20:32:56 +02:00
Enno Rehling 5c7788ecdd Merge branch '2541-quit' into develop 2019-05-04 12:01:55 +02:00
Enno Rehling 0daa0ec04e Rechtschreibung 2019-05-01 20:10:20 +02:00
Enno Rehling bbcb2113d7 WIP feature: STIRB <password> [PARTEI <nr>] 2019-04-30 18:40:24 +02:00
Enno Rehling 75dfed8082 Leerzeichen aus Beschreibungen trimmen. 2019-04-24 13:09:59 +02:00
Enno Rehling 3f021b21cd Bug 1982: disable the clone spell. 2019-04-07 17:55:04 +02:00
Enno Rehling d56eee9687 BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-02-16 20:14:34 +01:00
Enno Rehling 0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling f96e88e3e0 write a warning in the template about password replacement. 
for new factions, put the generated password into the template.
normalize and secure password generation.
 2019-01-12 21:26:48 +01:00
Enno Rehling e7b6bff827 order atoi36 conditions by likeliness. 2018-12-15 18:14:36 +01:00
Enno Rehling e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. 2018-12-06 20:04:45 +01:00
Enno Rehling 0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. 2018-12-03 19:19:06 +01:00
Enno Rehling d7a8a9b406 fix that catastrophic merge, make struct ally module-private 2018-10-26 21:49:58 +02:00
Enno Rehling 2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling 67089aeb8c Bug 2487: Fix LERNE AUTO translations 
Also disallow autolearning expensive skills.
 2018-09-09 15:13:20 +02:00
Enno Rehling 3c99677723
Merge pull request #802 from ennorehling/master 
Fix E2 crashing 2018-09-08
 2018-09-09 07:48:29 +02:00
Enno Rehling 6f5f1651c7 fix crashes when trying to trade on ocean. 
fix missing message sections.
 2018-09-09 07:41:30 +02:00
Enno Rehling 3880960acf BUG 2458: fix insect recruit warnings. 2018-08-02 13:53:41 +02:00
Enno Rehling e89fe69d58 simplicate the sink_ship function, do not rescue units. 2018-08-01 11:55:57 +02:00
Enno Rehling 5309c84224 BUG 2465 Kein Item-Teleport bei Lied der Verfuehrung. 2018-07-25 19:42:48 +02:00
Enno Rehling b1b4654b0e Bug 2445: duplicate strings warnings. 2018-07-07 12:21:42 +02:00
Enno Rehling a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling af898c29a3 BUG 2443: spaces for list of roads, again! 2018-06-10 10:36:34 +02:00
Enno Rehling 9d693d08e4 BUG 2443, list of roads missing whitespace. 2018-06-10 10:16:34 +02:00
Enno Rehling 2d05a99e7d Renaming a message is more complicated now. I got it wrong with these. 2018-06-09 21:42:21 +02:00
Enno Rehling b353de43de BUG 2443: missing spaces in NR. 2018-05-24 16:35:39 +02:00
Enno Rehling 9b3b376579 BUG 2443: Fehlende Leerzeile im Kampfreport. 2018-05-24 16:31:01 +02:00
Enno Rehling 4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling adfc4ad7ce add a header to po files, charset UTF-8 2018-05-18 21:54:46 +02:00
Enno Rehling c11a020846 remove the text from messages.xml 2018-05-18 21:24:08 +02:00
Enno Rehling 6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling 87914a7b5b delete XML Strings. 2018-05-17 23:27:29 +02:00
Enno Rehling bad58eeef4 remove superfluous keywords from e3 strings. 2018-05-17 23:19:54 +02:00
Enno Rehling 6f6f2c1c2e Additional strings used by E3 only. 2018-05-17 23:05:03 +02:00
Enno Rehling 615dfe7ec5 Get the NR message text from locale. 2018-05-17 22:47:16 +02:00
Enno Rehling c0ed53b679 last of the duplicate names. battles have lost their separators, though. 2018-05-17 22:15:24 +02:00
Enno Rehling 7a10a58605 1. nrmessage is locale-independent, uses locale_getstring 
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
 2018-05-17 19:04:25 +02:00
Enno Rehling 9ca945cb2c add a string escaping function. 
start some work on nrmessage.c.
 2018-05-17 16:53:56 +02:00
Enno Rehling 35c3d4cda0 export messages and strings into separate .po files 
commit the exported files.
 2018-05-17 10:43:23 +02:00
Enno Rehling 0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling 269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +02:00
Enno Rehling 9dd38a6593 convert E2 familiars from XML to Lua 2018-05-15 06:58:07 +02:00
Enno Rehling e46cfa5e77 remove even more equipment xml to Lua 
only familiars still TBD, I think.
 2018-05-14 22:01:32 +02:00
Enno Rehling 2a026da1fd Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-14 19:27:41 +02:00
Enno Rehling 40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling cadb374ab8 re-add accidentally deleted undead and dracoid equipment. 2018-05-13 22:01:51 +02:00
Enno Rehling 2be0e9bd41 customize equipment for each game, in Lua. 
no more equipment.xml for e3
 2018-05-13 21:58:01 +02:00
Enno Rehling a741eaca97 equip new orcs in e2 with lua and a hacky callback. 2018-05-13 21:23:54 +02:00
Enno Rehling 4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling 666d5715ab BUG 2439 Strassenbau Fehlermeldung (Region/Richtung). 2018-05-13 13:03:47 +02:00
Enno Rehling 40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling 85cf8da383 rename canteach/canlearn to teach/learn 
race/function is never used (and there is no namedragon function).
 2018-05-10 20:37:37 +02:00
Enno Rehling 94769a66f8 teach vs canteach mixup 2018-05-10 20:18:56 +02:00
Enno Rehling ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling b0012eeae0 familiars do not need the default value in XML (bad XML). 2018-05-10 20:02:53 +02:00
Enno Rehling 907348adfc merge race xml changes (teach, migrants, floating point) 2018-05-09 22:21:50 +02:00
Enno Rehling c05a65b881 expat parses (most of) races. 
fix canteach flag in XML.
 2018-05-09 22:16:30 +02:00
Enno Rehling 8c7b890f3e set the default unarmed modifiers for races. 2018-05-09 20:56:38 +02:00
Enno Rehling f2e6825dab Merge branch 'develop' 2018-05-08 23:22:31 +02:00
Enno Rehling 3f9b3219fe BUG 2348: bad XML 2018-05-08 23:22:05 +02:00
Enno Rehling c9b9bac2ac Merge branch 'develop' 2018-05-08 23:11:14 +02:00
Enno Rehling ae3c0b099f spells do not have a function element in XML 2018-05-08 23:10:51 +02:00
Enno Rehling 371335ab95 spell flag merge conflicts 2018-05-08 21:45:21 +02:00
Enno Rehling ccf09770e3 rename global target flag, invert logic 2018-05-08 21:43:13 +02:00
Enno Rehling 17ea7a224a spell ranks cannot be negative 2018-05-06 09:02:27 +02:00
Enno Rehling cd2435dbb0 spell xml does not define an index attribute 2018-05-06 09:00:11 +02:00
Enno Rehling 85509cdf65 fix some bugs in reading weapons. 2018-05-04 18:41:59 +02:00
Enno Rehling 75aff73e9a Merge branch 'develop' 2018-05-03 23:01:42 +02:00
Enno Rehling 20b82fee51 old spellbooks no longer used anywhere 2018-05-02 21:55:17 +02:00
Enno Rehling 1ef57ef4f0 merge conflicts, race masking. 2018-04-29 13:50:56 +02:00
Enno Rehling 837ab325f9 XML simplificatio: unified system for masking races on modifiers. 2018-04-29 13:46:17 +02:00
Enno Rehling 3cb1d1a071 simplify race masking for weapon modifiers. 2018-04-29 13:13:10 +02:00
Enno Rehling 0b22b50013 the presspass is cursed, attribute needs to be on item, not resource. 2018-04-28 11:38:11 +02:00
Enno Rehling 346f56ebdb merge conflict description namespace vs. xinclude removal and new potion names. 2018-03-11 09:19:16 +01:00
Enno Rehling bf21f24f98 BUG 2426: E3 hat kein RC_TEMPLATE, split potion names and descriptions 2018-03-11 09:02:02 +01:00
Enno Rehling cb537b1a93 missing translations are the worst. 2018-02-17 21:08:58 +01:00
Enno Rehling 06f3e337b6 missing plural for lifepotion 2018-02-17 20:56:40 +01:00
Enno Rehling 6c572c6287 rename potion: p14 to healing 
fix use_item message crash
 2018-02-17 20:35:00 +01:00
Enno Rehling d065cbfca7 use_item message with amount instead of usepotion without. 2018-02-17 15:30:38 +01:00