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

309 Commits

Author SHA1 Message Date
Enno Rehling af7d059834 Merge branch 'master' of gitorious.org:eressea/server 2012-05-30 08:14:19 +02:00
Enno Rehling 46d02cf226 Merge branch 'release-774' 
Conflicts:
	shared/src/gamecode/market_test.c
	shared/src/kernel/item.c
	shared/src/kernel/item_test.c
	shared/src/tests.c
	shared/src/tests_test.c
 2012-05-30 08:12:46 +02:00
Enno Rehling 3e67e7fb4e Lua unit:cast_spell should only cast spells the unit knows. 
do not allow payment for spells cast at level <= 0
 2012-05-29 20:58:33 -07:00
Enno Rehling 44e5c60c96 test added: when a spell is not found, we do not have to pay for it 2012-05-29 20:44:25 -07:00
Enno Rehling 5e26d246a2 more Lua functions using the wrong stack index. 2012-05-29 20:13:54 -07:00
Enno Rehling cb0e406733 repair lua spells (bad stack index) 
add a whole bunch more spell tests
allow spell tests to disable fumbles
 2012-05-29 18:45:50 -07:00
Enno Rehling 347ff0dd77 snprintf is evil and dangerous. 2012-05-29 12:17:25 -07:00
Enno Rehling 330bc9c13b added slprintf and tests for the bsdstring functions 2012-05-29 10:46:48 -07:00
Enno Rehling 131efac393 add a test for f_regionid, catch missing zero-termination 2012-05-28 23:35:27 -07:00
Enno Rehling 7152ffd40f this spell school was misnamed. that's trouble. 2012-05-27 09:52:44 -07:00
Enno Rehling 131840054c giving ownerships over buildings was broken by a recent refactoring 2012-05-27 08:50:34 -07:00
Enno Rehling 36ad727394 avoid duplicate spells in spellbooks (it's a bit hackish) 2012-05-26 15:15:18 -07:00
Enno Rehling e4244f6282 Familiars and monsters should not get spells from the faction's list. 2012-05-26 14:50:00 -07:00
Enno Rehling 62a91f4558 kill tybied in E3, make common spells the source for random choices 2012-05-26 14:19:35 -07:00
Enno Rehling 2103c1725e Fix accidental parsing of empty strings (Bug 1917) 2012-05-26 12:23:22 -07:00
Enno Rehling 707262c61d fix region owner when a building transfers 2012-05-26 10:43:05 -07:00
Enno Rehling 5547893be7 fix create_roi function in E3 2012-05-26 10:16:39 -07:00
Enno Rehling 8a27917f27 we have one more famililar spell that got renamed 2012-05-26 09:57:07 -07:00
Enno Rehling 81f08b3121 remove spell-levels from XML file, we no longer read these or need these. 2012-05-26 09:41:21 -07:00
Enno Rehling da345f0cea only read spellbooks when they are specialized (familiars, monsters, E3 factions) 2012-05-26 09:38:34 -07:00
Enno Rehling 8619bd74a8 slow but working solution for getspell. rebuilding that radix tree for every call is insanity. 2012-05-26 09:05:03 -07:00
Enno Rehling 998549e687 mages have spellbooks now 2012-05-26 08:20:26 -07:00
Enno Rehling 409328a9c2 unit tests for setting combat spells 2012-05-26 07:27:59 -07:00
Enno Rehling 3b3343ae72 spells no longer have a level (or need one) 2012-05-26 00:57:13 -07:00
Enno Rehling d884446aea we do not require spell-levels in the xmlreader 2012-05-26 00:38:52 -07:00
Enno Rehling 9d1b62d463 updating spell-lists is a thing of the past now 
almost everything uses books, except sc_mage
 2012-05-26 00:33:55 -07:00
Enno Rehling c73297ba44 fix an indexing error in pick_random_spell 2012-05-25 23:47:24 -07:00
Enno Rehling 6ffe9cac33 these spells are only in the E2 and E3 source 2012-05-25 23:31:37 -07:00
Enno Rehling bc95ea80fb espionage messages will now report spellbooks 2012-05-25 23:01:21 -07:00
Enno Rehling 303dd7cc94 creport will now print spellbooks 2012-05-25 22:54:18 -07:00
Enno Rehling faa72b66b1 untangle the spaghetti a little bit 
struct spell is now in spell.h where it belongs
some functions have moved as a result
 2012-05-25 22:25:23 -07:00
Enno Rehling 8a4c71f430 unit_add_spell gets a level 
added two tests that fail for get_spellfromtoken if spell is not stored with the unit
 2012-05-25 21:49:15 -07:00
Enno Rehling a015d72add unit_add_spell gets a level 
added a test that fails for get_spellfromtoken if spell is not stored with the unit
 2012-05-25 21:07:26 -07:00
Enno Rehling d58e853074 allow setting a faction's magic school from Lua 2012-05-25 20:15:57 -07:00
Enno Rehling 24cba1bea7 testing spells in the example server also 
WIP: create_roi is broken until mages have spellbooks
 2012-05-25 19:55:47 -07:00
Enno Rehling 071f67ea7c use the reportpath from the config file, do not build your own 2012-05-25 18:50:14 -07:00
Enno Rehling fc259d232b fix spellbook entries in at_reportspell (crash) 2012-05-25 18:30:18 -07:00
Enno Rehling 58cbc3ccbc add some tests for pools, because I found a bug here and we don't want to have that happen again. 2012-05-25 16:15:21 -07:00
Enno Rehling 3b05e2e09e fix compilation on ubuntu 2012-05-25 15:40:03 -07:00
Enno Rehling fef92e4971 added more test for pay_spell so I don't break it. 2012-05-25 15:38:24 -07:00
Enno Rehling 88db0a8df7 change_resource did not return new value for some types 2012-05-25 15:35:11 -07:00
Enno Rehling ae9f12c904 added a test for pay_spell so I don't break it. 2012-05-25 12:46:00 -07:00
Enno Rehling f5b35a9a2b equipment sets that include spells now have levels on them and store in a spellbook. 
add some tests for equipment.
 2012-05-25 00:45:12 -07:00
Enno Rehling 8ecda7b203 factions have spellbooks and the read/write function for spellbooks is now accessible from other places (we'll need this for units) 2012-05-24 22:26:05 -07:00
Enno Rehling 707349d014 at_reportspell is now a message about a spellbook-entry, not just a spell 2012-05-24 22:10:18 -07:00
Enno Rehling 6cb4322c1d rename: spellbook_clear is more accurate 2012-05-24 21:57:23 -07:00
Enno Rehling b8d8bac9ae fix trying to add to null-spellbook. 
all unit tests pass.
 2012-05-24 20:35:13 -07:00
Enno Rehling 6417f55ec6 specify levels with magic attacks (step one to removing spell->level) 2012-05-24 10:24:37 -07:00
Enno Rehling 3514218dba factions have working spellbooks 
update of spellbooks for E3 should be functional
old data file is getting read, and levels guessed?
 2012-05-24 00:56:54 -07:00
Enno Rehling 5ddb77274a fix spellbook data for example server 
remove duplicate spells
 2012-05-23 22:24:31 -07:00