Thr0lu5/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
14,177 Commits 4 Branches 0 Tags 588 MiB
cc-tmp-thr
Commit Graph

457 Commits

Author SHA1 Message Date
Crypto City
8354848ec8 custom item secondary descriptions can now be updated 2021-03-23 23:36:38 +00:00
Crypto City
20b806a964 rpc: add cc_is_custom_item_data RPC 2021-03-23 23:36:38 +00:00
mj-xmr
c836dc11c9 [CI] Use Python3 for funcional tests, instead of Python2 2021-03-20 10:30:57 +01:00
Crypto City
59da6694be rpc: add a cc_get_predefined_item_info RPC 2021-03-13 19:50:44 +00:00
Crypto City
6be4416f10 functional_tests: fix occasional failure from tx misordering 2021-03-13 10:45:46 +00:00
Crypto City
afc4f6f913 new cc_get_item_ownership RPC and daemon command 2021-03-13 10:45:46 +00:00
Crypto City
b8d4836f2a add optional hash and MIME type to custom items, and add cc_item_info command 2021-03-13 10:45:46 +00:00
Crypto City
3ffe13df7d extra land tax for lots left empty for more than 10 days 2021-03-13 10:45:46 +00:00
moneromooo-monero
b5209a09d2
functional_tests: hide check_missing_rpc_methods behind requests check 2021-02-23 20:10:03 +00:00
luigi1111
1614be4a41
Merge pull request #7371 
1aecdcf Increase timeout for the mining test 4 times (to 240s) (mj-xmr)
 2021-02-18 14:11:55 -05:00
mj-xmr
1aecdcf536 Increase timeout for the mining test 4 times (to 240s) 2021-02-11 13:42:43 +01:00
Kevin Barbour
85db1734e7
Remove unused variables in monero codebase 
There are quite a few variables in the code that are no longer
(or perhaps never were) in use. These were discovered by enabling
compiler warnings for unused variables and cleaning them up.

In most cases where the unused variables were the result
of a function call the call was left but the variable
assignment removed, unless it was obvious that it was
a simple getter with no side effects.
 2021-02-09 08:05:05 +01:00
Crypto City
49faf95c40 fix flag destruction not keeping full state 2021-02-03 16:26:08 +00:00
Crypto City
56d5455d9b functional_tests: fix some python2/python3 differences 2021-02-03 16:26:08 +00:00
Crypto City
d9e81d0c5b cc: remove obsolete transportation discoveries 2021-02-03 16:26:08 +00:00
Crypto City
4956a6aa5e Merge remote-tracking branch 'origin/master' into cc 2021-01-18 01:33:53 +00:00
Crypto City
a4f6efb6db add unlock levels for chat colours 2021-01-16 20:44:45 +00:00
Crypto City
e760d4b2ed cc: remove pig farming discoveries 2021-01-16 20:44:45 +00:00
Crypto City
7e87bcc711 fix functional tests 2021-01-16 20:44:45 +00:00
Crypto City
8c3d9ff405 functional_tests: fix trade tests after matchable fix 2021-01-16 20:44:45 +00:00
Crypto City
8599ef7f67 sort items before patents and gemstones 2020-12-01 12:54:08 +00:00
Crypto City
1c1e2827e4 functional_tests: default to fast city test 2020-11-29 23:38:03 +00:00
Crypto City
c50b571fa9 allow the game account to enable/disable scripts 2020-11-29 23:38:03 +00:00
Crypto City
171858da4c cc: balance changes 2020-11-29 23:38:02 +00:00
luigi1111
7a0334742a
Merge pull request #6937 
8a282f6 Add RELINK_TARGETS, monero_add_target_no_relink and use monero_add_executable/monero_add_library where possible (mj-xmr) Add monero_add_minimal_executable and use in tests (mj-xmr)
 2020-11-29 01:49:39 -06:00
Crypto City
e21f521283 functional_tests: fix occasional failure due to firewood burning 2020-11-26 19:48:41 +00:00
Crypto City
1d4273c31e add prestige ranking and bonus from subsidy 
also fix a couple bugs in coin collection scoring
 2020-11-26 19:48:41 +00:00
Crypto City
accda4481e functional_tests: add test for the total amount of gold 2020-11-22 23:25:50 +00:00
Crypto City
cf6a626937 auction creation and bidding, auction flags on mortgage default 2020-11-22 23:25:50 +00:00
Crypto City
dd434d46d4 functional_tests: only mine past the coin minting window if necessary 2020-11-22 23:25:50 +00:00
Crypto City
4ba0fe2080 functional_tests: fix occasional discovery test failure 2020-11-22 23:25:50 +00:00
Crypto City
203ecd44d6 functional_tests: expand script test 2020-11-22 23:25:50 +00:00
Crypto City
182863edc9 blob deduplication for scripts 2020-11-22 23:25:49 +00:00
Crypto City
7bad65991c cc: every script state can now have actions 2020-11-22 23:25:49 +00:00
Crypto City
f6498b3f05 db_lmdb: set last service height to current height on construction 2020-11-22 23:25:49 +00:00
Crypto City
80195fb627 functional_tests: fix functional tests 2020-11-22 23:25:49 +00:00
Crypto City
dde3bf4c4a functional_tests: fix typo in item count retrieval 2020-11-22 15:27:07 +00:00
Crypto City
722fabc6d3 Higher economic powers now depend on civil engineering discoveries 2020-11-22 15:27:07 +00:00
Crypto City
402d9ce769 land can now be given 2020-11-22 15:27:06 +00:00
Crypto City
cb40955cc6 new custom language for scripts 2020-11-22 15:27:06 +00:00
Crypto City
933046c95d simpler large game update test 2020-11-22 15:27:06 +00:00
Crypto City
7b290450f4 functional_tests: give the discoveries test a bit more money 2020-11-22 15:27:06 +00:00
Crypto City
8687b9773f remove remnants of obsolete resource availability 2020-11-10 18:17:43 +00:00
Crypto City
25c78c4f5e functional_tests: more leeway for discovery tests 2020-11-01 18:59:15 +00:00
Crypto City
98d4ae7c2b land cost now costs more near the city center and far away 
also fix overflows in land/tax cost
 2020-11-01 17:34:31 +00:00
Crypto City
fa9a377279 add player script variables 2020-11-01 17:33:55 +00:00
Crypto City
86639dcd7d functional_tests: fix discoveries test after cost increase 2020-11-01 16:47:20 +00:00
mj-xmr
8a282f64c9 Add RELINK_TARGETS, monero_add_target_no_relink and use monero_add_executable/monero_add_library where possible (mj-xmr) 
Add monero_add_minimal_executable and use in tests

This is done in order not to have to relink targets, when just an .so changed, but not its interface.
 2020-10-28 20:08:26 +01:00
Crypto City
e349e5694e give higher level woods more heating power 2020-10-26 13:09:35 +00:00
Crypto City
f2808a6a39 more tile size optimization 
Tiles are now stored as a single packed byte stream,
including in the game, and unpacked/repacked as necessary
 2020-10-25 18:47:26 +00:00
selsta
e79c88e610
functional_tests: inrease mining timeout 2020-10-22 04:17:11 +02:00
Crypto City
34a4d2b618 fixes after monero merge 2020-10-19 12:17:51 +00:00
Crypto City
43b8112c1e Merge branch 'master' into cc 2020-10-18 00:33:51 +00:00
Crypto City
110e1d227e functional_tests: add an item count consistency check 2020-10-17 23:30:31 +00:00
Crypto City
da5d2a429a fix a few niggles with broken assert_exception in functional tests 2020-10-17 23:30:31 +00:00
Crypto City
c6fc32a423 functional_tests: fix typo testing balances and remove dead code 2020-10-17 23:30:30 +00:00
Crypto City
29fa6c7222 wood can now be chopped into firewood 2020-10-17 23:30:30 +00:00
Crypto City
7b51ad56bc WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
9b291c45b3 WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
f7bd04fc12 remove custom item amount field, it is now redundant 
since we track supply for all items
 2020-10-17 23:29:26 +00:00
Crypto City
9586a32958 WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
b033e75db0 add more user data space to custom items 2020-10-17 23:28:43 +00:00
Crypto City
5710bb74dd WIP - scripts 2020-10-17 23:28:43 +00:00
Crypto City
cd61a1024b functional_tests: fix game update tests going out of labour 2020-10-07 00:54:17 +00:00
Crypto City
bd20a169ec functional_tests: more city and game update tests 2020-09-29 12:14:10 +00:00
Crypto City
2ed24f1918 functional_tests: fix repairing from the wrong account in farming test 2020-09-28 21:09:07 +00:00
Crypto City
81ac18db00 rewrite city cost function 2020-09-28 21:09:07 +00:00
Crypto City
31e74fba63 tests: fix a few tests after recent changes 2020-09-28 21:09:07 +00:00
Crypto City
1aba8c4743 functional_tests: fix cc_repair arguments 2020-09-24 19:29:55 +00:00
Crypto City
b7c431c15e remove cost from buy_land command 2020-09-24 19:29:55 +00:00
iamamyth
163f83720f
functional_tests: rewrite mining code, clearer timeout info 2020-09-24 20:04:05 +02:00
Crypto City
21e095ab90 fix tests after price changes 2020-09-17 02:30:44 +00:00
Crypto City
a3ce8f4290 cc: double last resort prices 2020-09-13 22:16:07 +00:00
Riccardo Spagni
aefa7740c3
Merge pull request #6111 
d20ff4f64 functional_tests: add a large (many randomx epochs) p2p reorg test (moneromooo-monero)
6a0b3b1f8 functional_tests: add randomx tests (moneromooo-monero)
9d42649d5 core: fix mining from a block that's not the current top (moneromooo-monero)
 2020-09-06 15:49:37 +02:00
Crypto City
a8d494074b coins can now be different gold content based on type 2020-08-30 18:13:56 +00:00
Sarang Noether
fa06c39d97 Bind signature to full address and signing mode 2020-08-28 19:38:00 -04:00
moneromooo-monero
743608ec16 wallet: allow signing a message with spend or view key 2020-08-28 19:25:17 -04:00
moneromooo-monero
d20ff4f648
functional_tests: add a large (many randomx epochs) p2p reorg test 2020-08-27 15:13:04 +00:00
moneromooo-monero
6a0b3b1f8a
functional_tests: add randomx tests 2020-08-27 15:13:03 +00:00
moneromooo-monero
82ee01699c
Integrate CLSAGs into monero 
They are allowed from v12, and MLSAGs are rejected from v13.
 2020-08-27 12:44:04 +00:00
Alexander Blair
3f392341e7
Merge pull request #6660 
839e1f4ba functional_tests: add p2p functional tests (moneromooo-monero)
 2020-08-27 02:53:41 -07:00
moneromooo-monero
839e1f4bab
functional_tests: add p2p functional tests 
Tests tx/block propagation and reorgs
 2020-08-26 23:00:27 +00:00
Crypto City
16c084838f add yearly coins auto creation 2020-08-25 15:27:16 +00:00
Crypto City
3335f8d14f create collectible coins for player count and city levels 2020-08-25 15:27:16 +00:00
Crypto City
7aea6cbf93 add a daemon RPC to get new unused nonces 2020-08-25 13:20:15 +00:00
Crypto City
5b693a15b1 some material variants are now locked till a player level 2020-08-25 13:20:15 +00:00
Crypto City
c688079acb commands can now be cancelled 
if they're not mined yet, or only partially matched trades
 2020-08-25 13:20:14 +00:00
Crypto City
dc2cc4b6d5 item groups can now optionally be public 2020-08-25 13:20:14 +00:00
Crypto City
61aa85ad3b add collectible coins 2020-08-21 18:33:02 +00:00
Alexander Blair
9eebe01c58
Merge pull request #6593 
6f5411d30 tests: fix missing error on missing python entry point (moneromooo-monero)
c6dc2850c python-rpc: add missing sync_txpool python entry point (moneromooo-monero)
 2020-08-16 12:41:10 -07:00
Crypto City
be0b26ef25 add item groups 2020-08-15 15:12:35 +00:00
Crypto City
20427ca382 functional_tests: add new city test 2020-08-15 15:12:35 +00:00
Crypto City
18da33a330 funtional_tests: guard against special events destroying buildings 2020-08-15 15:12:35 +00:00
Sarang Noether
6bfcd31015 Updates InProofV1, OutProofV1, and ReserveProofV1 to new V2 variants that include all public proof parameters in Schnorr challenges, along with hash function domain separators. Includes new randomized unit tests. 2020-08-09 18:42:15 -04:00
Crypto City
1e9af40f21 functional_tests: add some more farming tests 2020-08-07 00:41:08 +00:00
Crypto City
105c45df20 functional_tests: run with CC_FASTER_POW 2020-08-05 14:09:06 +00:00
Crypto City
3b23655a5f functional_tests: fix game update messing up checks 2020-08-05 14:09:06 +00:00
Crypto City
fb5dd77afa Farming 2020-08-05 14:09:06 +00:00
Crypto City
db93803916 functional_tests: ensure the resized flag has no building 2020-08-01 17:05:19 +00:00
Crypto City
34856d0808 keep track of the item supply 2020-07-25 22:43:58 +00:00
Crypto City
b268c5b8c7 add elevation bonus 2020-07-25 22:43:58 +00:00
Crypto City
c598cfec0a remove building within range of resource generators constraint 2020-07-25 22:43:58 +00:00
Crypto City
ac171bf477 cc: rewrite potential system and add more potentials 2020-07-24 15:36:50 +00:00
Alexander Blair
a0d179e528
Merge pull request #6512 
5ef0607da Update copyright year to 2020 (SomaticFanatic)
 2020-07-19 03:32:59 -07:00
luigi1111
3057f52f89
Merge pull request #6599 
6e4a55b rpc: fix relay_tx error return mixup (moneromooo-monero)
9b86e14 functional_tests: add simple relay_tx test (moneromooo-monero)
 2020-07-08 17:20:29 -05:00
Crypto City
63a3230fdb add ignore tests 2020-06-30 11:06:08 +00:00
Crypto City
dc140ff2fc functional_tests: add some more data in get_state 2020-06-29 22:16:08 +00:00
Crypto City
fffeb1bdae cc: allow hunting with a population less than actual 2020-06-29 22:16:08 +00:00
Crypto City
09c272a064 tests: add test for building with palette change 2020-06-22 22:15:13 +00:00
Crypto City
6f4fc81b1d functional_tests: add chat tests 2020-06-22 22:15:13 +00:00
Crypto City
5d30d10b68 functional_tests: add some more invitations tests 2020-06-22 22:15:13 +00:00
Crypto City
3e05ee54fe tx_pool: do not allow more than one (non kept by block) hunt command at once 2020-06-21 01:18:30 +00:00
Crypto City
ef2c7bcca8 functional_tests: use fast pow 2020-06-21 01:18:29 +00:00
Crypto City
f112b180e3 cc: fix unlocking discoveries bug 2020-06-21 01:18:29 +00:00
Crypto City
206b30cb8f functional_tests: add reorg test 2020-06-21 01:18:29 +00:00
moneromooo-monero
2743357518 functional_tests: add p2p functional tests 
Tests tx/block propagation and reorgs
 2020-06-21 01:18:29 +00:00
Crypto City
b945e80261 functional_tests: add randomx tests 2020-06-21 01:18:29 +00:00
selsta
58e1c8b031
repo: update donation fund address 2020-06-09 12:19:39 +02:00
Crypto City
2a90a3df6b fixes after merge 2020-05-31 00:41:03 +00:00
Crypto City
396157b032 Merge remote-tracking branch 'origin/master' into cc 2020-05-30 18:55:11 +00:00
Crypto City
eb6be814ef functional_tests: processes can now run in a new terminal (off by default) 2020-05-29 23:20:51 +00:00
Crypto City
c22e54b850 unlock_time is now valid only for coinbase txes 2020-05-29 23:20:50 +00:00
Crypto City
4d819324dc tests: fix missing error on missing python entry point 2020-05-29 23:20:50 +00:00
Crypto City
e98aa10308 cc: don't give an attribute point before levelling up 2020-05-29 23:20:50 +00:00
Crypto City
828bb1ba41 allow destroying a flag 2020-05-29 23:20:50 +00:00
Crypto City
0cc8c0c675 game balance updates after all the recent changes 2020-05-29 23:20:50 +00:00
Crypto City
d2949eb3ff Change the address prefix from CC to TF 2020-05-29 23:20:49 +00:00
Crypto City
ce07516176 mine only one tx per account per block 2020-05-29 23:20:49 +00:00
Crypto City
cfcae9094d claim cost in firefighting, flag resizing and city founding 2020-05-29 23:20:49 +00:00
Crypto City
2f77fc4051 invitations 2020-05-29 23:20:49 +00:00
Crypto City
f661248740 functional_tests: add hunt test 2020-05-29 23:20:49 +00:00
Crypto City
e21b669517 functional_tests: fix discovery tests after new discovery additions 2020-05-29 23:20:49 +00:00
moneromooo-monero
9b86e14c5a
functional_tests: add simple relay_tx test 2020-05-28 12:49:17 +00:00
moneromooo-monero
6f5411d305
tests: fix missing error on missing python entry point 2020-05-27 13:11:01 +00:00
Crypto City
6a18101b1a add invitation system 2020-05-26 16:22:42 +00:00
SomaticFanatic
5ef0607da6 Update copyright year to 2020 
Update copyright year to 2020
 2020-05-06 22:36:54 -04:00
Lee Clagett
afe5a55e96 Revert functional test changes in babf25d2e and 571546067 2020-04-24 18:30:23 -04:00
luigi1111
c846c8650e
Merge pull request #6445 
5715460 Always reject duplicate key-images from second txid (vtnerd)
babf25d Allow unrestricted rpc calls to get full txpool info (vtnerd)
 2020-04-21 09:03:37 -05:00
Crypto City
3b87070a5d add hunt system 2020-04-13 17:23:54 +00:00
Crypto City
a0b6a6e8aa add a dice roll command, for use in story/roleplaying 2020-04-10 01:51:27 +00:00
Crypto City
287fd9cfd1 Add player attributes for storytelling/role playing purposes 2020-04-08 00:15:51 +00:00
moneromooo-monero
7326b691d3
functional_tests: ensure signatures never reuse a timestamp 2020-04-06 16:11:36 +00:00
moneromooo-monero
082dd2c373
functional_tests: ensure signed timestamps are fresh 
This fixes a test failure now that timestamps are more constrained
 2020-04-06 14:06:36 +00:00
Crypto City
3891353d7e add a new command to destroy owned items 2020-04-04 23:41:15 +00:00
luigi1111
0bd2c14bbb
Merge pull request #6309 
e69acff functional_tests: update cookie at 10 seconds interval (moneromooo-monero)
f5a11f0 functional_tests: speed up signature generation (moneromooo-monero)
 2020-04-04 12:35:02 -05:00
Crypto City
b3c3647cb9 add food consumption 2020-04-03 15:43:35 +00:00
Crypto City
a5d2eb2138 store badge award height 2020-04-03 15:43:35 +00:00
xiphon
6d6af701ec cryptonote_basic: drop unused verification_context::m_not_rct field 2020-03-31 21:58:25 +00:00
Lee Clagett
571546067f Always reject duplicate key-images from second txid 2020-03-30 17:52:42 +00:00
Lee Clagett
babf25d2ec Allow unrestricted rpc calls to get full txpool info 2020-03-30 17:52:42 +00:00