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

3254 commits

Author SHA1 Message Date
Enno Rehling
9124a86e0e http://bugs.eressea.de/view.php?id=1527 
- status flee does not immediately remove the guard status,  but delayed.
 2009-07-10 19:36:26 +00:00
Enno Rehling
bfcba5e94e region owners always feed friends first. 2009-07-10 16:52:16 +00:00
Enno Rehling
51d8232998 - NAME ALLIANCE 2009-07-10 15:21:29 +00:00
Enno Rehling
3a7b0a6561 - alliance in the CR 
- migrants message removed from NR
 2009-07-10 14:54:09 +00:00
Enno Rehling
ab2b357f8c - fixing round world info leak 2009-07-08 20:42:17 +00:00
Enno Rehling
6116d79a60 - study_days fix for orcs 2009-07-08 13:45:25 +00:00
Enno Rehling
d4cf3cdee2 - fixed recruitment of demons costing peasants 2009-07-08 13:15:38 +00:00
Enno Rehling
bdcefcb135 recruiting and stuff 2009-07-08 12:27:01 +00:00
Enno Rehling
d569cc0088 - recruiting fixes 2009-07-08 12:16:27 +00:00
Enno Rehling
627947194e - race and tactics costs need fixing 2009-07-08 11:42:25 +00:00
Enno Rehling
1b2dcd4a65 apparently, I *do* have to do my homework for this to work. 2009-07-08 11:03:22 +00:00
Enno Rehling
ec25ae21f3 spells with new descriptions need to get new names, or i need to do my homework. 2009-07-08 10:56:59 +00:00
Enno Rehling
992d4d9331 spell descriptions 50 silver -> 25 silver 2009-07-08 10:53:53 +00:00
Enno Rehling
0248798655 - setting lastorders from lua 2009-07-08 10:39:13 +00:00
Enno Rehling
1c2bbbc21e - tolua defautl installations have very broken char* parameters. 
- fixed non-combined compilation
 2009-07-07 23:48:34 +00:00
Enno Rehling
9f8038ad6e - new potion spellinfo 
- some needed lua bindings
- some commands disabled
 2009-07-07 19:55:37 +00:00
Enno Rehling
0c61da36e0 - better leave() protection 
- unit.race_name = "smurf"
 2009-07-07 15:31:12 +00:00
Enno Rehling
4d79101a71 multi-punisher 2009-07-07 14:43:27 +00:00
Enno Rehling
0ca69bd8f4 - multiplayer region stealth-mode 
- fishing Mk. 1
 2009-07-07 14:09:20 +00:00
Enno Rehling
dd67aea012 delete fail 2009-07-07 09:34:02 +00:00
Enno Rehling
b72333c258 updated seeding algorithm a little 
new ship rules
building skill for markets=3
herb fixes
fixed taxation
 2009-07-04 11:53:52 +00:00
Enno Rehling
b571a2007c compilation fixes gcc 2009-07-04 11:51:12 +00:00
Enno Rehling
2d2563f521 Ready to rumble! 2009-07-01 16:03:49 +00:00
Enno Rehling
23b1d33f77 preloading lua files (for running tests.lua) from eressea.ini 
fixed building taxes test
 2009-07-01 11:51:21 +00:00
Enno Rehling
97daeead0c Lauter kleine Bugfixes vor dem Start. 2009-07-01 08:56:10 +00:00
Enno Rehling
d569b6bdcf splitting castles from buildings for different size levels in E3A 2009-07-01 07:48:43 +00:00
Enno Rehling
1fcee6572e separate the buildings 2009-07-01 07:34:26 +00:00
Enno Rehling
cb9f3f6671 renaming e2k9 -> e3a 2009-07-01 06:36:48 +00:00
Enno Rehling
7704f26673 renaming e2k9 -> e3a 2009-07-01 06:35:19 +00:00
Enno Rehling
51fbdbdd8f cosmetics 2009-07-01 01:26:16 +00:00
Enno Rehling
e2e00b974f kampfzauber 2009-07-01 01:22:12 +00:00
Enno Rehling
f614691713 - richtig viele bugfixes 2009-07-01 01:03:12 +00:00
Enno Rehling
3fc0e27776 cleaning the lua interface. 
world creation.
 2009-06-29 20:38:35 +00:00
Enno Rehling
7d79d0bc00 - new planes/torus code is (close to) finished and has bugs fixed. 
- new CR version
-  fixed E3 test for spells.
 2009-06-29 10:50:52 +00:00
Enno Rehling
5b6b638a37 - use of short for coordinates is a pain (if memory becomes an issue again, we fix it another way). 
- starting on work to have a wraparound world.
 2009-06-27 01:27:48 +00:00
Enno Rehling
a21dbbbadf - new and improved seeding (use oceans) 2009-06-26 05:29:25 +00:00
Enno Rehling
bb2397e141 - new rule for WoL 
- no damage for drifting ships
- finish delayed potions
- new natural armor rule
- better crossbows
 2009-06-26 03:42:39 +00:00
Enno Rehling
6a6df68b5d - delayed use of potions. 
- combat bonus for ships
- new ship types
- new capacity rules for ships
- E3 island smoothing
 2009-06-25 19:40:10 +00:00
Enno Rehling
8861fdfa7e terrains according to E3 rules. 2009-06-24 14:50:36 +00:00
Enno Rehling
fa2072b6e0 world generation algorithm for E3 2009-06-23 16:17:38 +00:00
Enno Rehling
27d8628084 stupidly named tolua_S renamed to just L, as is standard. 2009-06-21 19:54:14 +00:00
Enno Rehling
18e7e14fc9 - new: get_* functions accept base36 strings 
- new tests for that.
- some fixes for create() calls with illegal parameters
- removed unused growing_trees() function
 2009-06-21 08:29:36 +00:00
Enno Rehling
27493d6b8d - new new cavalry rule cap 2009-06-19 10:54:34 +00:00
Enno Rehling
5fb1a39f13 - three tier guardhouse 
- new new cavalry rule
 2009-06-18 22:26:26 +00:00
Enno Rehling
67a1e18723 ring-of-power bonus for elves in a forest 2009-06-14 22:06:35 +00:00
Enno Rehling
dc9c2d635a recruitment cost 2009-06-14 21:55:44 +00:00
Enno Rehling
1e4b799477 - food and taxes rule-fixes and tests. 
- region owner fixes
- building size fixes (bt_castle must die)
 2009-06-14 11:14:24 +00:00
Enno Rehling
cd0bc2b5e8 new tactics formula 2009-06-13 09:50:08 +00:00
Enno Rehling
bd71603561 WORK command produces minimum wage. 2009-06-13 08:40:19 +00:00
Enno Rehling
e4acd2874a Orc recruiting now for any race that is configured. 2009-06-13 07:25:18 +00:00
Enno Rehling
8480886f14 - herbalism disabled, better 2009-06-12 15:02:44 +00:00
Enno Rehling
301b9519f0 miscellaneous improvements to code that uses perception, if skill is disabled. 2009-06-12 14:45:32 +00:00
Enno Rehling
f2b4e4ad9e Found a lot of small bugs during testing. 2009-06-10 22:11:42 +00:00
Enno Rehling
faa7f6ac27 - removed herbalism skill 
- allowed rep.xbow to halflings
 2009-06-10 05:32:42 +00:00
Enno Rehling
c38c8e21fc - repeating crossbow 
- bugfix market deleting all items
 2009-06-08 18:09:42 +00:00
Enno Rehling
6e9e6b6928 - E2K9 gets low-power elven bows and laen swords 2009-06-08 09:42:52 +00:00
Enno Rehling
d0d17043e8 - goblins get only simple weapons. 2009-06-06 12:05:16 +00:00
Enno Rehling
e939b5fdc9 - vampirism 
- stamina -> nat. armor
 2009-06-05 22:54:50 +00:00
Enno Rehling
b0195fa4e6 - elves regenerate faster in a forest. 2009-06-05 21:27:25 +00:00
Enno Rehling
f28b252f6f - market bonus for halflings 2009-06-04 21:07:02 +00:00
Enno Rehling
b66dc40a85 double the morale for halflings 2009-06-04 20:56:15 +00:00
Enno Rehling
e2ef989497 armor and resources split into small xml files, for more customization. 2009-06-04 20:53:48 +00:00
Enno Rehling
72878c5788 - per-race morale improvements 
- data-driven peasant multiplier
- lower cavalry bonus against trolls
- armor-limitations (goblins&pp)
 2009-06-04 20:52:42 +00:00
Enno Rehling
e0d68bb4e3 http://bugs.eressea.de/view.php?id=1521 
"Flucht bei Schiffskampf und anschließendes Ertrinken"
- appeasement spell did not check for ocean region.
 2009-06-04 16:39:05 +00:00
Enno Rehling
a55871a6aa e2k9 lua script 
race-limited weapons
 2009-06-03 21:57:56 +00:00
Enno Rehling
0bdb05270e limiting items to specific races 2009-06-03 21:56:57 +00:00
Enno Rehling
37fa742bae chance auf Projektil-Treffer wird von Turmschilden um 30% reduziert. 2009-06-03 21:13:12 +00:00
Enno Rehling
8cdfa37ca4 New feature: learning speed 
- final version and parameters for e2k9
 2009-06-03 20:48:03 +00:00
Enno Rehling
52127ced69 New feature: learning speed 
- final version and parameters for e2k9
 2009-06-03 20:47:18 +00:00
Enno Rehling
d871101994 New feature: learning speed 2009-06-03 20:03:03 +00:00
Enno Rehling
7b24248ac2 - added a storage interface for Lua- adde towershields for e2k9 
- added new test for storage
 2009-06-02 22:12:29 +00:00
Enno Rehling
93e34d979d - displaying markets in the report. 2009-06-02 12:22:20 +00:00
Enno Rehling
4b5882b450 just fixes 2009-05-30 14:28:48 +00:00
Enno Rehling
a5a0b6d46c - neue Lerntage-Regel 
- Dämonenhunger (Bauernhunger = kein Schaden)
- Keine Schilde mit Bihändern
 2009-05-30 14:21:32 +00:00
Enno Rehling
ad9dc82cfd - herbs do not rot 
- hungry demons can only go down
 2009-05-30 12:16:08 +00:00
Enno Rehling
3ca03e3145 - potion-spells for E2K9 
- ring of quick fingers increases production by 5 (xML config)
- implementation of module.markets
- give ondeath: dead factions can give items.
- Lua: building-aging (currently unused)
 2009-05-30 10:44:01 +00:00
Enno Rehling
cf30ac9f46 gcc compile fixes 2009-05-26 18:22:14 +00:00
Enno Rehling
708a6ceb8e new spell lists for E2K9 
new magic code for E2K9
 2009-05-26 18:11:20 +00:00
Enno Rehling
591c85d4c7 - per-faction spellbook 
- new rules for gray magic
 2009-05-24 11:17:16 +00:00
Enno Rehling
9b972601f7 - Fixing the alliance code, proper tests. 
- reorganizing weapons xml files
 2009-05-21 14:57:03 +00:00
Enno Rehling
f9946ff7f8 - new alliances + commands 2009-05-20 22:44:19 +00:00
Enno Rehling
71b34b434a - fix recruit 
- skill costs configurable
- function to write spells to a file
 2009-05-19 15:49:05 +00:00
Enno Rehling
98f8f1a1f8 gcc fixes 2009-05-18 22:14:16 +00:00
Enno Rehling
93dbfa0cec More horsing around with I_HORSE 2009-05-18 21:07:07 +00:00
Enno Rehling
637486d95e new file 2009-05-18 20:50:39 +00:00
Enno Rehling
120508716e - equipping newly recruited units 
- cavalry skill bonus
- chargers
- configurable hunger
 2009-05-18 20:50:19 +00:00
Enno Rehling
bb50d7a9ef - construction can have building-requirements 2009-05-18 14:52:35 +00:00
Enno Rehling
9a9ff08302 Configuration files for Eressea 1.1 2009-05-18 13:06:31 +00:00
Enno Rehling
cf5cad9b87 - largestbuilding() can take a filter 
- morale (light) implemented
- rider bonus on weapons is configurable by XML
- wooden guard house
- help status can be masked
- shipspeed configurable (per race or via skill-level)
- tax-creating buildings configurable by XML
- bugfix: castles have no protection
 2009-05-18 13:00:09 +00:00
Enno Rehling
418f611dcb available help statuses can be masked by XML settings 2009-05-16 13:43:42 +00:00
Enno Rehling
43bf73a01b - recruiting secondary races 
- some archetype changes
- new looting rules
 2009-05-14 20:19:13 +00:00
Enno Rehling
0181fa3c25 http://bugs.eressea.de/view.php?id=1503 
Dauer von Feuerwänden
- fixed expired firewalls
 2009-05-14 20:17:50 +00:00
Enno Rehling
73efa3b703 http://bugs.eressea.de/view.php?id=1512 
Fehlerhafte Zauber-Meldung Schattenmeisterbeschwörung
- show true amount
 2009-05-10 16:08:31 +00:00
Enno Rehling
1cf495b713 http://bugs.eressea.de/view.php?id=1497 
Bäume produzieren keine Samen
- changed parameters to work.
 2009-05-10 15:21:21 +00:00
Enno Rehling
68decb58b2 indentation only 2009-05-10 15:20:43 +00:00
Enno Rehling
290bac3082 typo 2009-05-10 08:21:38 +00:00
Enno Rehling
0907203821 - merge with revision 4032 of eressea-1.0 
- begin to implement morale
 2009-02-14 09:53:20 +00:00
Enno Rehling
ef883c23e0 Set populationdamage=0 
rename to rules.combat.populationdamage
 2009-02-08 18:54:36 +00:00
Enno Rehling
56e7060c2f abuse of sprintf 2009-02-08 18:09:28 +00:00
Enno Rehling
83d72028c2 - fixing spell syntax + parameters 
- adding components to spells.xml
- astralspace default=1
 2009-02-01 09:41:29 +00:00
Enno Rehling
090ee58090 2009-02-01 09:05:24 +00:00
Enno Rehling
57de6ab6e1 Even when not init_spell, we must still register. 
Fixing serious (and old) armor bug
 2009-01-31 14:08:23 +00:00
Enno Rehling
0d068f6aa6 missing file for jamfile build 2009-01-31 13:59:12 +00:00
Enno Rehling
3a3628d3a9 extremely old bug in encounters() 2009-01-31 10:50:35 +00:00
Enno Rehling
080a85021f Eressea 1.5 WIP 
- astral space is optional (modules.astralspace)
- spells can be disabled (spells.xml, init_spells)
- hitpoints/stamina configuration (rules.stamina)
- rules.combat_turns (default=5)
 2009-01-30 23:15:36 +00:00
Enno Rehling
00d399f03d add rules configuration for no GIVE to other factions. 
Eressea 1.5:
- skill limit 10
- disable stealth/espionage/perception
- less peasants per region
- disable STEALTH command
- reduce available races
- disable ENTERTAIN, WORK, TAX, TEACH, SELL
 2009-01-27 10:13:12 +00:00
Enno Rehling
3e2922666f faction.age and region.age 2009-01-21 09:48:12 +00:00
Enno Rehling
4e2abeb559 lua: resource-level, read_game w/ one parameter 2009-01-21 08:25:43 +00:00
Enno Rehling
93bb27fb07 - test case for production and renaming of items (old aliases) 
- splitting items over several files
 2009-01-15 22:03:13 +00:00
Enno Rehling
b122c96a68 added atoi36 to jamfile 2008-12-31 15:24:25 +00:00
Enno Rehling
24182c4d06 - new test case (recruiting) 
- logging and compilation fixes
 2008-12-31 11:30:44 +00:00
Enno Rehling
5ea74d8bd8 project files for vc++ 2008 2008-12-31 11:29:35 +00:00
Enno Rehling
591eb201b3 fixes 2008-12-21 10:52:42 +00:00
Enno Rehling
87c931ca18 using dlmalloc = good 2008-12-21 08:08:57 +00:00
Enno Rehling
e3b7068bc9 combined = default 
tolua = default
 2008-12-20 23:41:33 +00:00
Enno Rehling
ff8c715b4c offering two alternatives for bindings now 2008-12-20 23:11:09 +00:00
Enno Rehling
5904d0b3f1 let's not use tolua++ since there are even fewer packages for it. 2008-12-20 22:52:42 +00:00
Enno Rehling
22cfb0d5d1 - neues handling von verbosity fuer weniger spam 
- tests fuer event-handler (die jetzt auch klappen)
- mehr funktionen (und etwas TODO)

commit #4000 !
 2008-12-20 22:31:18 +00:00
Enno Rehling
71f5bc7b6f at_variable is as good as gone (just a stub for compat) 2008-12-20 20:58:35 +00:00
Enno Rehling
15d08ab901 making combined compiling work again 
fixing some warnings that happen in release mode only
 2008-12-20 20:11:38 +00:00
Enno Rehling
ba644a2e68 making tostring() work 2008-12-20 19:45:51 +00:00
Enno Rehling
a3ba0166cf crashfix 2008-12-20 19:41:02 +00:00
Enno Rehling
b981e0e26e more functions for bind_region 2008-12-20 19:18:45 +00:00
Enno Rehling
1cab3ce7f1 fixing the code to work on ubuntu 2008-12-20 18:54:55 +00:00
Enno Rehling
aa2d227f39 tst 2008-12-20 17:23:27 +00:00
Enno Rehling
e00286ee38 broken english messagetype 2008-12-20 17:14:26 +00:00
Enno Rehling
c23da92768 fixing luabind 2008-12-20 17:06:05 +00:00
Enno Rehling
e32eebfd15 familiar-fix 2008-12-20 15:28:50 +00:00
Enno Rehling
d91c3a792f - tolua bindings for the editor 
- more integration tests
- fixed equipment for familiars
 2008-12-20 15:06:15 +00:00
Enno Rehling
b01d9fc685 more tolua bindings 
started work on an alternate tolua code generator
 2008-12-19 16:30:31 +00:00
Enno Rehling
9dbee69544 alternative bindings for tolua 2008-12-16 09:17:59 +00:00
Enno Rehling
3fa54cbb47 crash 2008-11-30 15:19:31 +00:00
Enno Rehling
8a673d8481 disabling build of old projects 2008-11-12 22:12:26 +00:00
Enno Rehling
f18edc3651 combining files to improve compilation speed 2008-11-12 22:07:23 +00:00
Enno Rehling
d305e983b2 http://bugs.eressea.de/view.php?id=1499 
MACHEN Adamantium

- Adamantium and Laen require a mine (and this is now a xml-configuration)
- everything compiles with the latest luabind/boost/lua version
- fixed a broken assert
 2008-10-31 17:50:19 +00:00
Enno Rehling
12574ac5b5 some cleaning up with regard to luabind/boost 
solution files for vc 2008
 2008-10-28 10:51:36 +00:00
Enno Rehling
3ea0d50caf http://bugs.eressea.de/view.php?id=1488 
"Verhalten fliehender Einheiten auf Ozean"
disable flight from ships on ocean
 2008-09-08 19:03:26 +00:00
Enno Rehling
b212f0b666 http://bugs.eressea.de/view.php?id=1485 
"Fehlermeldung enthält aus heiterem Himmel die Angabe "1 Adamantium""
fixed string termination (slight off-by-one error)
Issue: 1485
 2008-09-06 15:46:28 +00:00
Enno Rehling
90b7bbdfbe compile fix 
spelling fix
 2008-09-01 16:01:40 +00:00
Enno Rehling
500d0a212c http://bugs.eressea.de/view.php?id=1460 
"Mahlstrom (grösstenteils) harmlos"
reduced the effect of sailing skill a little bit
Issue: 1460
 2008-09-01 16:01:01 +00:00
Enno Rehling
e4720c53e8 http://bugs.eressea.de/view.php?id=1477 
"Fehler bei Todeswolke"
FFL_SELECT was not initialized prior to using it
 2008-09-01 15:21:02 +00:00
Enno Rehling
a8ff535f0c http://bugs.eressea.de/view.php?id=1464 
"falsche Fehlermeldung bei zu geringem Handelstalent"
wrote a clearer message
 2008-08-29 06:40:40 +00:00
Enno Rehling
eeac273e97 %s for %u 2008-08-28 21:33:43 +00:00
Enno Rehling
18c1971e2e http://bugs.eressea.de/view.php?id=1466 
"Vertrauter wurde zu Magier, kann jetzt nicht mehr zaubern"
necessary fixes for familiars.
 2008-08-28 21:29:05 +00:00
Enno Rehling
17bcb2d7a7 http://bugs.eressea.de/view.php?id=1481 
"Merkwürdiges Supermegamonster frisst Region leer"
fixed error in mistletoe-zombie creation
 2008-08-28 19:01:36 +00:00
Enno Rehling
3c0d17e568 calling remove_unit() instead of set_number() in tidal waves. 2008-08-28 18:03:33 +00:00
Enno Rehling
7114b4f467 http://bugs.eressea.de/view.php?id=1471 
"Vertrauter verschwindet spurlos"
telling players some more about tidal waves
Issue: 1471
 2008-08-28 17:58:54 +00:00
Enno Rehling
802b9332c7 http://bugs.eressea.de/view.php?id=1461 
"Tragekapazität von Monstern zu hoch"
throwing away carts because monsters don't know what to do with them.
 2008-08-28 15:16:13 +00:00
Enno Rehling
38ff80892f locale change 2008-08-28 13:25:33 +00:00
Enno Rehling
79d0f255e2 improve some output, remove some error messages. 2008-08-28 13:23:24 +00:00