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

5619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
d67ecdb8cf Merge pull request #64 from CTD1/Bauern 
Bauern in leeren Regionen
 2014-12-19 20:08:42 +01:00
Enno Rehling
e9dda0d702 Merge pull request #85 from badgerman/master 
remove some more code.feature: show unit limit in NR & CR
 2014-12-19 20:07:26 +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
2966e1ea3d remove igetstrtoken, a confusing helper function that was hardly used at all. 2014-12-18 17:47:49 +01:00
CTD
c914c83947 Grenze für E2 
auf 500 Bauern erhöht.
 2014-12-18 11:57:30 +01:00
Enno Rehling
da1d3c49c3 ongoing config.c cleanup: getid() 2014-12-18 07:09:22 +01:00
Enno Rehling
e51811df3b Merge pull request #84 from badgerman/master 
added tests: region owners can set PAY NOT <id> for empty buildings if ...
 2014-12-17 21:37:56 +01:00
Enno Rehling
484e52d491 added a test: region owners can set PAY NOT <id> for empty buildings if they are in region_owner_pay_building. 2014-12-17 21:31:02 +01:00
Enno Rehling
d7899a392a Merge pull request #81 from CTD1/BEZAHLE_NICHT_ID 
BEZAHLE NICHT ID
 2014-12-17 20:18:08 +01:00
Enno Rehling
83f014047b Merge pull request #83 from badgerman/master 
cleaning up in config.c and adding tests for pay_cmd
 2014-12-17 20:17:20 +01:00
Enno Rehling
bd6b9761b0 add simple tests for pay_cmd. 2014-12-17 20:00:55 +01:00
Enno Rehling
077af5c52c Merge pull request #82 from badgerman/remove-at-gm 
remove old at_gm feature (player-operated quests)
 2014-12-17 19:35:58 +01:00
Enno Rehling
916271ef3a gcc/clang want structs to be defined before used in an argument list 2014-12-17 18:47:01 +01:00
Enno Rehling
bc8f8c74f9 gcc/clang want structs to be defined before used in an argument list 2014-12-17 17:46:21 +01:00
Enno Rehling
1050daac19 remove strlist from config.c, move it to reports.c (where it is used primarily). 
this is not the best data structure there is, should replace it some day.
 2014-12-17 17:40:36 +01:00
Enno Rehling
2759114414 remove unused header for an attribute that I do not even remember. 2014-12-17 17:35:10 +01:00
Enno Rehling
2a3fdab394 remove the obsolete at_gm attribute. 
The code did almost nothing, and player-operated quests are no longer something I want to do.
 2014-12-17 17:32:32 +01:00
CTD
aa536a943d BEZAHLE NICHT ID 
Man kann jetzt eine Gebäudenummer hinter Bezahle nicht angeben.
Wenn man keine angibt bleibt alles wie es war, sonst wird überprüft ob
man der Besitzer dieses Gebäudes ist, und wenn ja wird für diese Gebäude
der Unterhalt abgeschaltet. Wenn für ein Gebäude die Option das der
Regionsbesitzer  es Bezahlen kann an ist (und es leer ist) ist der
Regionsbesitzer auch automatisch Gebäudebesitzer.
Wenn man ein BEZAHLE NICHT für die Burg des Regionsbesitzers (E2 die
größte Burg) absetzt (implizit oder explizit) werden alle Gebäude in der
Region abgeschaltet, die vom Regionsbesitzer verwaltet werden.
 2014-12-17 17:22:26 +01:00
Enno Rehling
8971f59ecc move more things out of config.c. 
- lighthouses into their own module.
- lastregion/firstregion into reports.c.
 2014-12-17 17:22:26 +01:00
Enno Rehling
fb0eb4dce6 refactoring: moving plagues out of config.c 
cleaning up the code, moving chance into the random event code, it is not used by the plague spell (reduce signature by one argument)
 2014-12-16 14:18:29 +01:00
Enno Rehling
f11a4a2cb3 Merge pull request #74 from eressea/version-3-3 
updated preview scripts to check for lockfiles and failed turns
 2014-12-15 14:23:29 +01:00
CTD
cc09e95887 Bauerngrenze angepasst 
Maximum Bauerngrenze bei der noch zusätzlich Bauern hinzukommen können
auf 90 erhöht und auch gleich Konfigurierbar gemacht.
Das sollte immer noch zu wenig sein um ernsthaft missbrauch damit zu
betreiben.
 2014-12-15 13:07:39 +01:00
CTD
7f39763ee1 Konfigurierbar 
Ich habe zumindest mal fix eine eigene Funktion draus gemacht und es mit
einer XML Option versehen. Es ist Default an, da auch in E3 die Bauern
rückläufig sind, und da E4 auf den selben Regeln aufbaut es auch da
sinnvoll wäre "tote" Regionen wiederzubeleben.
 2014-12-15 09:48:43 +01:00
Enno Rehling
d770eec549 Merge pull request #80 from badgerman/bug-1924 
let the snowman give items to other units.
 2014-12-14 20:16:02 +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
d6ce30a9a9 Merge pull request #78 from badgerman/bug-2052 
bugfix: could not GIVE to TEMP units.
 2014-12-14 16:31:48 +01:00
Enno Rehling
2a113bcd04 Merge pull request #79 from badgerman/bug-2054 
Bug 2054: monsters trying to STUDY when they cannot.
 2014-12-14 16:29:56 +01:00
Enno Rehling
c5774e652a also prevent monsters from studying unarmed combat if they cannot learn things. 
refactor the unit_can_study functionality into a separate function, we are now using it in multiple places.
 2014-12-14 16:17:01 +01:00
Enno Rehling
595dc35fb0 bugfix: monster races that cannot learn skills, will not try to study. 
This fixes https://bugs.eressea.de/view.php?id=2054
 2014-12-14 15:59:20 +01:00
Enno Rehling
684f779501 Merge pull request #77 from badgerman/bug-1660 
Bug 1660
 2014-12-14 15:43:15 +01:00
Enno Rehling
0645578305 bugfix: could not GIVE to TEMP units. 
https://bugs.eressea.de/view.php?id=2052
 2014-12-14 15:23:28 +01:00
Enno Rehling
42d75c334d WIP: Familiars check for combat spells in the magician's list of spells, too. 
https://bugs.eressea.de/view.php?id=1660
This does not work, because set_combatspell later uses knowsspell to make sure the spell is one the familiar has.
 2014-12-14 12:57:09 +01:00
Enno Rehling
b506bed4d9 fix a crash in the parser for USE orders when no item name was given. 2014-12-14 12:56:36 +01:00
Enno Rehling
d89d7cc118 Merge pull request #75 from badgerman/bug-1713 
enhancement: buildings without an owner report their lack of upkeep to t...
 2014-12-14 12:13:07 +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
c98447ba9e check for lockfile before running 2014-12-14 07:02:06 +01:00
Enno Rehling
3ac407407a check for lockfile before running 2014-12-14 07:01:22 +01:00
Enno Rehling
ded6cf14bf check for reports.txt before trying to send reports 2014-12-14 06:58:16 +01:00
Enno Rehling
65b48a7996 check for reports.txt before trying to send reports 2014-12-14 06:57:45 +01:00
Enno Rehling
9d1b9d01f9 Merge pull request #73 from badgerman/master 
ongoing bugfixing
 2014-12-14 06:14:30 +01:00
Enno Rehling
dca9d7e9cb bugfixe give_cmd (cannot give more persons than the unit has). 2014-12-14 06:02:08 +01:00
Enno Rehling
4ac7258f96 Merge remote-tracking branch 'eressea/master' 2014-12-13 23:40:37 +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
9ac90dd6a5 bugfix: USE snowman did not check that the unit actually owned a snowman, causing a unit to have negative snowmen in turn 629 (exploit). 2014-12-13 23:20:10 +01:00
Enno Rehling
455b3dc90e ignore obsolete "lua" attributes in ancient data files. 
fix a small bug in the mechanism for reading deprecated attrib_types.
 2014-12-13 22:08:57 +01:00
Enno Rehling
968304db96 Merge pull request #72 from badgerman/master 
fix two crashes, and undead heroes
 2014-12-13 20:42:16 +01:00
Enno Rehling
1ae44db7ca Bugfix: Untote Helden bekamen keine Beute. 
https://bugs.eressea.de/view.php?id=1962
 2014-12-13 20:16:25 +01:00
Enno Rehling
a3099ed507 Merge pull request #71 from badgerman/module-rename 
Update wormholes to the module naming convention.
 2014-12-13 18:56:02 +01:00
Enno Rehling
3a1e4ab7f5 fix crash when a GIVE order has no arguments. 2014-12-13 18:40:15 +01:00
Enno Rehling
a12958dac0 Merge pull request #70 from badgerman/master 
fix broken chaoscount attributes loading
 2014-12-13 18:23:45 +01:00