Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
5002 commits 10 branches 0 tags 41 MiB
Commit graph

678 commits

Author SHA1 Message Date
Enno Rehling
5b9eb9080f refactoring: move all monster-related code into monster.c 
make some features depend on being NPCs, not monster faction.
 2014-11-11 16:53:56 +01:00
Enno Rehling
b8306d42f5 remove unarmed damage bonus rule 2014-11-11 12:13:44 +01:00
CTD
f3cce58be5 smal fixes for Linux 2014-11-11 10:53:29 +01:00
CTD
9d3b2f3da9 Flieger und Bewache 
Flieger können nur noch durch andere Flieger aufgehalten werden.
Damit können Drachen auch in Bewachten Regionen plündern.
 2014-11-11 10:17:55 +01:00
Enno Rehling
ebd115b04a refactor of rc_specialdamage, and move it into battle, nothing else uses it. 2014-11-09 22:31:41 +01:00
Enno Rehling
a28cbc647a loot refactoring and a small armor/shield fix. 2014-11-09 14:39:48 +01:00
Enno Rehling
7bebea4f67 Merge branch 'master' of github.com:eressea/server 2014-11-09 00:25:06 +01:00
Enno Rehling
9c0a7c0e2e Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-11-08 22:56:53 +01:00
Enno Rehling
1556c07787 fix a crash when missing a token 2014-11-08 22:55:07 +01:00
Enno Rehling
85a5a433bb writing reports should not depend on the monster faction, this is silly. 2014-11-07 23:16:00 +01:00
Enno Rehling
e9084d9678 when free_gamedata, also unhash all factions. speed up is_monsters(). 2014-11-07 22:58:29 +01:00
Enno Rehling
d1f7fb571c fix test for get_monsters(), nobody needs the function to ever return NULL. 2014-11-07 21:28:58 +01:00
Enno Rehling
c8f2f33eab clean up some dealings with monsters and NPCs 2014-11-07 21:15:46 +01:00
Enno Rehling
49493fa630 fix typo in last commit. 
package is a standard lua module, not a good variable name.
log name of script.
 2014-11-06 07:53:15 +01:00
Enno Rehling
143fab9653 Some changes after talking to Don. 
moved locale change into its own module.
made monsters get a report by default.
reoved old creation.c code, it was dead.
 2014-11-06 07:15:53 +01:00
Enno Rehling
93e20ac7a9 clean up data files after tests are finished. 2014-11-04 08:06:46 +01:00
Enno Rehling
93cdec9ddc fix json test (null-terminate read) 2014-11-04 07:57:29 +01:00
Enno Rehling
8912a59ac4 fix json test. our fault, not the fault of storage 2014-11-04 07:50:33 +01:00
Enno Rehling
dbf60a7ce5 update to latest version of storage library. 2014-11-03 22:29:04 +01:00
Enno Rehling
f623133344 storage takes ownership of the FILE* (really need to change this API). 2014-11-03 19:03:44 +01:00
Enno Rehling
16c03a8e0e typo broke gcc build. 2014-11-03 18:44:49 +01:00
Enno Rehling
fecf3b04f8 bug 2041: group alliances are lost. 
added test coverage, too.
 2014-11-03 18:10:05 +01:00
Enno Rehling
d14a40b7e7 fix struct declarations. 2014-11-03 17:32:55 +01:00
Enno Rehling
835b0964ef fix gcc 2014-11-03 09:55:29 +01:00
Enno Rehling
b2140f54fd refactor, move give_cmd into give.c 2014-11-03 08:44:26 +01:00
Enno Rehling
38a0a02565 refactor tests for giving, add test for GIVE HERBS. 2014-11-03 08:33:07 +01:00
Enno Rehling
9a0268ac96 bug 2042, pools not working. 2014-11-03 07:52:00 +01:00
Enno Rehling
0b96cc7d13 fix previous commit 2014-11-02 12:54:49 +01:00
Enno Rehling
59075b7194 fixing the gcc build (switch warning) 2014-11-02 12:45:20 +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
2b596b40f6 Merge branch 'master' of github.com:eressea/server 2014-11-02 10:40:49 +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
367307575c Merge branch 'master' of github.com:eressea/server 2014-11-01 22:12:11 +01:00
Enno Rehling
14bcaf7d71 Merge branch 'version-3-3' 
Update build number
 2014-11-01 21:58:33 +01:00
Enno Rehling
dc7cbd886c fix the quit command, asserting the wrong keyword (probably copypasta). 2014-11-01 21:57:06 +01:00
Enno Rehling
59c1c23324 refactor config.c, move the find* functions into the modules they belong to. 2014-11-01 18:34:53 +01:00
Enno Rehling
27f94783bc fix gcc build, forward-declare structs in the header. 
MSVC allows structs to be declared in a function signature, gcc wants
to know about them earlier.
 2014-11-01 13:10:22 +01:00
Enno Rehling
1af315ebf2 move magic out of kernel, into src. 
clean up/remove a ton of includes, especially of types.h (include in header if you need it, not in every .c file).
 2014-11-01 12:57:01 +01:00
Enno Rehling
81bfb598d0 refactoring modules, cleaning out the config.c kitchen sink. 
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
 2014-11-01 12:09:56 +01:00
Enno Rehling
a29e6a7f40 fix segmentation fault in new assert (units without a faction) 2014-10-31 22:20:07 +01:00
Enno Rehling
17e86ab6cd Merge branch 'master' of github.com:badgerman/eressea 2014-10-31 22:11:09 +01:00
Enno Rehling
af616b5b09 fix segmentation fault in test. 2014-10-31 22:10:52 +01:00
Enno Rehling
5b6663cad7 Assert that magicians are single-person units in a few places. 
Bug 2028 claims that this is not always the case, though I cannot prove it.
 2014-10-31 22:03:00 +01:00
Enno Rehling
483a2ba3de add missing tests for groups. 2014-10-31 19:15:26 +01:00
Enno Rehling
1d7c193de6 more test coverage for resource pooling. 2014-10-31 19:01:13 +01:00
Enno Rehling
2a77f77745 Merge pull request #47 from badgerman/master 
refactoring, tests, old datafile compatibility.
 2014-10-31 17:32:13 +01:00
Enno Rehling
6e24fe9be2 fix gcc build, ebable new test. 2014-10-31 16:51:57 +01:00
Enno Rehling
9848ba08d0 fix gcc and clang builds: missing include 2014-10-31 15:54:25 +01:00
Enno Rehling
997d1ffd4b Fix some crashes that happened while debugging an old data file. 2014-10-31 15:52:40 +01:00
Enno Rehling
838155179f fix backwards compatible code for at_permission. 2014-10-31 15:38:53 +01:00
Enno Rehling
cf110d7788 fix allies with null faction (to be resolved later). 2014-10-31 15:38:37 +01:00
Enno Rehling
f27a77d288 refactoring: use add_ally instead of manually crating the structure all over the code. 2014-10-31 15:13:05 +01:00
Enno Rehling
c8d5d52412 add test for pool, fix a problem with (unused) feature that pools from allies. 2014-10-31 07:51:57 +01:00
Enno Rehling
e9c13cc328 cosmetic changes, quick and easy assert to prevent too many magicians. 2014-10-30 17:48:02 +01:00
Enno Rehling
aa4a93435e add missing tests for contacting during a siege. 2014-10-30 07:50:01 +01:00
Enno Rehling
526c561b90 some minor cleanup in laws.h 2014-10-29 21:08:16 +01:00
Enno Rehling
fe5ea49506 Merge pull request #46 from badgerman/master 
German keywords in the imperative.
 2014-10-29 20:38:26 +01:00
Enno Rehling
9f2d2e0f92 fix broken test that didn't like the new init_locale() requirements. 2014-10-29 20:01:55 +01:00
Enno Rehling
6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling
f9c5d58f41 read json config file if available. 
missed an include, broke the build.
 2014-10-29 08:30:07 +01:00
Enno Rehling
0aec5592a0 allow json config to contain a list of config files (includes). 2014-10-29 07:50:06 +01:00
Enno Rehling
209776b751 Merge pull request #45 from badgerman/master 
Bug 2032: Rename FIGHT -> COMBAT, again
 2014-10-26 21:38:22 +01:00
Enno Rehling
b67d42b45e Merge branch 'version-3-3' 2014-10-26 21:19:16 +01:00
Enno Rehling
f3e54e103a fix a crash when selling nothing. 
build 687
 2014-10-25 23:54:01 +02:00
Enno Rehling
0a1209d031 verify that my plan for making the German infinitive an optional alias will work. 2014-10-23 16:37:00 +02:00
Enno Rehling
f788f19f6c fix tests that relied on translation structures being statically cached. 
clean up static cache, add test for German imperative (WIP)
 2014-10-23 16:14:01 +02:00
Enno Rehling
96d5544b1f Bug 2032: rename FIGHT back to COMBAT 2014-10-20 17:13:32 +02:00
Enno Rehling
356697e44e improve test for attrib::nexttype correctness. 2014-10-19 20:02:06 +02:00
Enno Rehling
eb1d73e2c2 basic test for tolower function. 2014-10-19 06:42:40 +02:00
Enno Rehling
aadd9377c2 update build number 2014-10-18 21:43:04 +02:00
Enno Rehling
adcd4ec1c6 increase build number. 2014-10-18 21:40:56 +02:00
Enno Rehling
79c8c4a034 fix a crash when testing for the RESHOW ANY command. 
E2 crashed when no parameter was given.
 2014-10-18 21:40:25 +02:00
Enno Rehling
f069df2345 Merge branch 'master' of github.com:eressea/server 2014-10-18 21:37:40 +02:00
Enno Rehling
58547969f8 fix a crash when testing for the RESHOW ANY command. 
E2 crashed when no parameter was given.
 2014-10-18 21:36:46 +02:00
Enno Rehling
c337d3f505 Merge pull request #40 from CTD1/Fix-0001865-for-E2 
Bug 1865: largest building or region owner pays for certain empty buildings. Fix for E2,
 2014-10-18 20:35:51 +02:00
Enno Rehling
78db167802 Merge branch 'master' of github.com:badgerman/eressea 2014-10-18 19:57:50 +02:00
Enno Rehling
837227f69c PR code review comments. 
- make study rule an enum, for easier debugging
- change parameter name (it's not a type)
 2014-10-18 19:53:13 +02:00
Enno Rehling
a09b53c0c4 Merge branch 'Autolehrer' of github.com:CTD1/eressea-server-bugfixing into CTD1-Autolehrer 2014-10-18 19:46:26 +02:00
Enno Rehling
7e1cec33a2 Remove unused gmcmd attributes. 
use the at_deprecated feature that was built for this purpose.
remove final external dependency on a_free in the code.
 2014-10-18 19:23:36 +02:00
Enno Rehling
539d2673f7 fix a crash in E2 caused by the recent removal of FFL_TIMEOUT. 2014-10-18 19:19:21 +02:00
Enno Rehling
5626abd8dc refactor and kill dead code. 
indentation normalization, copyright update.
 2014-10-18 18:37:44 +02:00
Enno Rehling
a58afb9d15 added test for removal of atributes. 
refactor existing tests a bit, free up memory.
 2014-10-18 17:51:07 +02:00
Enno Rehling
b37e8ac138 add a test for attrib->nexttype. 
fix gcc build.
 2014-10-18 17:12:43 +02:00
Enno Rehling
8f57adaf5b declare types (gcc failure). 2014-10-18 14:30:07 +02:00
Enno Rehling
74a6bd72c2 additional testing. 2014-10-18 14:16:26 +02:00
Enno Rehling
a86c2d88ab Test: After a faction is eliminated, nobody should have it as an ally. 2014-10-17 19:56:26 +02:00
CTD
1c8488f2b4 Wenn man 1/2 schreibt 
sollte auch 1/2 im Code stehen.
 2014-10-17 13:54:07 +02:00
CTD
aa07c550ab Auto Lehrer 
Config via study.speedup (sollte in E2 und E3 schon mit dem Wert 0 in
der XML stehen)
Wert 1:
Wenn das gerade gelernte Talent wenig Lerntage hat als 1/3 der max.
möglichen (ohne Bonus wie Akademie) hat,  dann gibt es die doppelten
Lerntage. Entspricht etwa dem alten Lehrer Schema.
Wert 2: Es werden die Lerntage aller Talente der Einheit als
Vergleichswert genommen, dann aber gegen den halben maximalen
Lerntagewert.
Es werden niemals die Lerntage der aktuellen Stufe mit eingerechnet,
sondern nur die durchschnittlichen Lerntage der bereits fertig gelernten
Stufen.
In E2 sollte der Lehre Befehl deaktiviert werden wenn diese Option
aktiviert wird.
 2014-10-17 13:54:00 +02:00
CTD
3d6c499431 Fixeing GCC 
Das es nicht gut ist wenn max als int in der Funktion definiert ist und
gleichzeitig global als Funktion existiert ist OK, aber warum Travis
chance() nicht kennt verstehe ich nicht, das ist in der rand.h als
extern definiert, sollte also kein Problem sein. Jetzt halt mit
rng_int().
 2014-10-17 11:23:49 +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
CTD
88b9d3c583 Fix für Leere Gebäude 
Der check war sinnlos, denn u->building wobei u der Besitzer ist, gibt
ja im Fall das er der "Besitzer der größten Burg in der Region" ist eben
diese Burg zurück.

So geht das dann auch in E2.
 2014-10-16 14:40:22 +02:00
Enno Rehling
c6b6883477 Merge pull request #36 from CTD1/Workingplace 
Arbeitsplätze

It's weird. It worked on this PR, probably because it is based on a revision of master where the .travis.yml file already exists. For older PRs that were created before that file was in master, it doesn't work. We don't have many open ones, so it's not actually worth investigating how to fix that :-)
 2014-10-16 14:05:49 +02:00
Enno Rehling
9c6e380ea0 Merge pull request #35 from CTD1/Monster_EMail 
Wird schon richtig sein :-)
 2014-10-16 11:53:45 +02:00
Enno Rehling
ac65d83ba2 test that empty factions are removed, but not monsters. 2014-10-16 09:03:57 +02:00
Enno Rehling
440aca34ea test special treatment for spells in remove_empty_units. 2014-10-16 08:06:44 +02:00
Enno Rehling
559f1f905a Eliminate dead code: FFL_NOTIMEOUT. 
old feature for time-limited factions, not used anywhere.
 2014-10-16 07:46:08 +02:00
Enno Rehling
7df47fd25c remove bad configuration caching (TODO: cache inside get_param). 
move remove_empty_* functions out of config.c
add basic tests for remove_empty_units (no special units yet).
 2014-10-16 07:41:49 +02:00
Enno Rehling
1c19a6948c kill some dead code. 2014-10-15 18:19:16 +02:00
Enno Rehling
9ce996051d Merge branch 'master' of github.com:badgerman/eressea 2014-10-14 23:02:56 +02:00
Enno Rehling
403c1ad6a9 fix errors and warnings that clang reports. 2014-10-14 22:57:02 +02:00