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

331 commits

Author SHA1 Message Date
Enno Rehling
4115b321b3 add tests for additional (race-related) production rules. 2017-03-30 21:00:35 +02:00
Enno Rehling
e50d5a812e remove unused error message. 2017-03-30 20:41:17 +02:00
Enno Rehling
f2bb51b3ab Merge branch 'master' into develop 
Conflicts:
	res/adamantium.xml
	res/core/resources/laen.xml
	scripts/tests/common.lua
	scripts/tests/e2/adamantium.lua
	scripts/tests/e2/e2features.lua
	scripts/tests/e2/items.lua
	scripts/tests/items.lua
	src/bind_unit.c
	src/economy.test.c
	src/kernel/resources.c
	src/util/attrib.c
 2017-03-26 21:01:21 +02:00
Enno Rehling
e114aa2854 also add +1 when producing adamantium in mines 2017-03-26 20:32:09 +02:00
Enno Rehling
39a5b55753 bugfix? mine grants +1 to laen production. 
not certain that this is actually a bug.
 2017-03-26 17:40:13 +02:00
Enno Rehling
27d66adc74 eliminate duplicate keyword warning 2017-03-18 21:33:47 +01:00
Enno Rehling
beb498d70c remove leftover code/data for artrewards. 2017-03-16 19:40:51 +01:00
Enno Rehling
b3e929891d Merge branch 'master' into develop 2017-03-11 07:22:49 +01:00
Enno Rehling
8b9f0f0894 BUG 2307: report mallorn trees as Mallorn in the CR. 
for legacy compatibility, we cannot call them Mallornbaeume.
 2017-03-10 23:18:09 +01:00
Enno Rehling
7022ae05bd Merge branch 'master' into develop 
Conflicts:
	src/kernel/item.c
	src/modules/arena.c
 2017-03-06 22:20:22 +01:00
Enno Rehling
4d07782e7d Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
 2017-03-06 06:27:31 +01:00
Enno Rehling
cdb65dfd36 Turns out: We did not have a singular form of sapling. 2017-03-05 18:57:28 +01:00
Enno Rehling
aa662e65d2 eliminate R_PERSON hack. 2017-03-05 13:58:11 +01:00
Enno Rehling
caa8159428 eliminate duplicate string definition 2017-03-05 09:52:17 +01:00
Enno Rehling
acfb666539 remove rtype->uget funpointer, and lua callbacks. 
fix a missing lua_pop that trashed the heap.
 2017-03-04 20:59:43 +01:00
Enno Rehling
50bdc71c1b kill lua_canuse_item and itype->canuse 2017-03-04 17:27:13 +01:00
Enno Rehling
d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
Enno Rehling
591a5b67d3 add missing files 2017-03-03 16:38:28 +01:00
Enno Rehling
6e8e163099 make item allow/deny XML easier to read, fix code 2017-03-03 09:56:27 +01:00
Enno Rehling
e2e602e7ba fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
Enno Rehling
2eb88c472c have I bollocksed up the deny/allow rules? looks like it 2017-02-28 14:22:59 +01:00
Enno Rehling
9871d6f23f remove unused files 2017-02-28 04:03:36 +01:00
Enno Rehling
75ce6fd23a regaura=1 is default 2017-02-28 03:49:47 +01:00
Enno Rehling
49d8a03eca remote the item_type.use funpointer. 2017-02-27 20:41:05 +01:00
Enno Rehling
9d09574d5e enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806 Test E2 items in E2 only. 
Remove eye of demon (broken item).
 2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b remove remainders of the arena. 
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
 2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398 tests for more items 2017-02-27 15:14:52 +01:00
Enno Rehling
60c2f1e807 test the birthday amulet 2017-02-27 14:01:41 +01:00
Enno Rehling
604b574d0f fix potion-use? need more testing 2017-02-27 11:39:55 +01:00
Enno Rehling
44c3838d79 WIP: itype->use elimination. 2017-02-27 04:22:28 +01:00
Enno Rehling
b8ffc20d87 remove item_useonother callbacks (use is fine). 
add a test for foolpotion.
 2017-02-26 19:54:58 +01:00
Enno Rehling
6e27adb892 remove pointless <resourcelimit/> wrapper from XML. 2017-02-26 14:00:20 +01:00
Enno Rehling
c3b0b9e8b3 fix missing limit-flags. 2017-02-26 13:47:22 +01:00
Enno Rehling
84c6a4b7b5 remove last vestiges of the rm_* material names 2017-02-25 21:25:55 +01:00
Enno Rehling
d039ca2b2e fix display of sapling and mallornsapling. 
remove mateiral from XML where it's not needed.
 2017-02-25 21:07:13 +01:00
Enno Rehling
25d3aacffa remove artrewards, they predate my backups 2017-02-24 14:38:08 +01:00
Enno Rehling
2d4b61afa9 the artacademy was E2-only 2017-02-24 14:32:18 +01:00
Enno Rehling
794dae11cf remove artsculpture and genericbuilding. 
deal with buildings having an unknown type.
 2017-02-24 14:29:14 +01:00
Enno Rehling
bd59271b71 Samen-Definition normalisiert (mit XML/Lua). 
Tests repariert.
MACHE Samen gibt es in E3 nicht.
 2017-02-23 22:30:19 +01:00
Enno Rehling
6ce487e485 MACHE Samen geht in E3 nicht. limited ist unnoetig 2017-02-23 22:19:48 +01:00
Enno Rehling
f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +01:00
Enno Rehling
5e2903258c kill old <guard/> element from XML 2017-02-23 14:45:19 +01:00
Enno Rehling
3274065004 reduce complexity of building_protection. 2017-02-22 19:38:46 +01:00
Enno Rehling
bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling
7e4b0ac717 fix XML file 2017-02-20 21:21:05 +01:00
Enno Rehling
a1dc3dc8e4 remove race.age from XML data (set in rc_create) 2017-02-20 21:19:58 +01:00
Enno Rehling
4bd295e3b2 remove the nearly unused illusion race 2017-02-20 20:42:31 +01:00
Enno Rehling
5ba3d76efb remove race.init_familiar funpointer 2017-02-20 09:32:03 +01:00
Enno Rehling
04154628e6 remove funpointer for spoils 2017-02-20 09:18:04 +01:00