OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-10-31 16:50:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
257 Commits 8 Branches 11 Tags
e03da83ff33dc028c6879740e205e4dcc6e2bda4
Commit Graph

257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dongresource
e03da83ff3 Rearranged the codebase a little. 
* Deleted empty Player.cpp
* Moved the helper functions from the obsolete CNStructs.cpp into
main.cpp and deleted it
* Renamed CombatManager to MobManager, as that will likely become it's
main focus soon
 2020-09-16 21:46:15 +02:00
dongresource
5efc8ac089 Switched getTime() to std::chrono on all platforms. 2020-09-16 20:14:00 +02:00
dongresource
efda6673b5 Print server version when starting up. 
Also added -ldl to fix cmake compilation on Unix systems.
 2020-09-16 20:12:56 +02:00
dongresource
f7571607ba Only send live checks when the connection has been silent for a while. 
Also:
* Made the timeout configurable
* Removed the stale randomcharacters config option
* Switched to time_t for time values, even though it doesn't really
matter that much
* Halved the keepAliveTimer frequency
 2020-09-16 17:45:53 +02:00
CakeLancelot
501d153894 Update README.md 
Inventories are now saved to DB
 2020-09-15 06:02:39 -05:00
dongresource
4d21410980 Merge PR #87 2020-09-14 18:42:03 +02:00
Gent
148d90f4f1 "Boosts and potions!" 
Fixed crate opening such that the item has an iOpt of 1.
 2020-09-14 18:36:50 +02:00
Gent
a976fef2b4 Implement vendor stack logic 2020-09-14 10:25:15 -04:00
Gent
da8c833587 Implement buyback 
Sellability tweak


Add additional item categories
 2020-09-14 10:25:15 -04:00
Gent
c91022030c Load item tables + price implementation 2020-09-14 10:25:15 -04:00
Gent
f55cc8f36d Load vendor tables 2020-09-14 10:24:55 -04:00
dongresource
9cc5f3e4d5 Cleaned up comment formatting. 
The incantation was: sed -i 's://\([^ ]\):// \1:' src/*.[ch]pp

Lines of code that was commented out were then manually reverted.
 2020-09-14 16:07:05 +02:00
dongresource
131997f34f Cleaned up all whitespace issues. 
The incantation was: sed -i 's/[ \t]*$//g' src/*.[ch]pp
 2020-09-14 16:07:05 +02:00
dongresource
ed86bc9160 Assorted cleanups and fixes. 
* Clean up spacing/indentation
* Proper enum formatting
* Fix nano dismissal (for real this time)
* Do not copy Player struct when a pointer is right there
* Stop looking after the trade partner has been found
* Make sure we're shifting unsigned values (and 64-bit when they need to be)
* Look for JSONs in tdata/
* Add a dbsaveinterval to the example config.ini, in the login category
 2020-09-14 16:07:05 +02:00
darkredtitan
38d5998a6e Sanity checks for creating and deleting characters. 
Co-authored-by: kamilprzyb <kamilprzybspam@wp.pl>
 2020-09-14 16:07:02 +02:00
kamilprzyb
c7189a5cef added saving missions 2020-09-14 16:07:02 +02:00
kamilprzyb
de15e2004b added bank functionality, refactored itemMoveHandler 
Co-authored-by: Cake Lancelot <CakeLancelot@users.noreply.github.com>
 2020-09-14 16:07:02 +02:00
darkredtitan
480cca82fa Make name checking case insensitive. 
Co-authored-by: kamilprzyb <kamilprzybspam@wp.pl>
 2020-09-14 16:06:57 +02:00
kamilprzyb
3d83f93167 added periodic DB saves, fixed some settings 2020-09-14 01:38:27 +02:00
kamilprzyb
1d9a7139a8 deleteing player deletes inventory and nanos, minor tweaks to settings 2020-09-14 01:38:27 +02:00
kamilprzyb
2fd7a8c6fc Implemented saving inventory and nanos 2020-09-14 01:38:27 +02:00
kamilprzyb
fc57cae37d added saving character when a connection with shard is killed 2020-09-14 01:38:04 +02:00
Gent Semaj
3cfec7aab3 Implement transportation framework + full S.C.A.M.P.E.R. functionality (#86) 
* Add transportation registration
* Add S.C.A.M.P.E.R. functionality

Co-authored-by: dongresource <dongresource@protonmail.com>
 2020-09-13 22:26:16 +02:00
CakeLancelot
29e53117e7 Merge pull request #72 from FinnHornhoover/msys-mingw-compile-fix 
Warnings and compile errors for MSYS2 MinGW64
 2020-09-13 07:35:32 -05:00
dongresource
c1ac2250a0 Minor changes. 
This was me fixing a few bugs and finding that Gent was working on some
of the same ones, then awkwardly merging the changes together.
 2020-09-12 22:43:04 +02:00
dongresource
a4716b0164 Merge pull request #82 from gsemaj/nanos 
Improve revival code
 2020-09-12 22:10:49 +02:00
FinnHornhoover
91f512d740 added version checking for GCC 2020-09-12 22:27:03 +03:00
Gent
4880e4af12 Revamp revival code 2020-09-12 14:21:36 -04:00
dongresource
fe370df534 Merge pull request #81 from gsemaj/auth 
Validate cookie data
 2020-09-12 18:03:26 +02:00
Gent
2b1a028b3d Validate cookie data 2020-09-12 11:41:31 -04:00
dongresource
be99714495 Possible fix for the login error bug. 2020-09-12 17:09:11 +02:00
dongresource
4c06163b51 Properly validate vendor logic. 
Also, iTimeLimit should be 0.
 2020-09-12 16:10:53 +02:00
dongresource
0c97969757 Merge pull request #80 from gsemaj/vendor2 
Add sell functionality to vendors
 2020-09-12 16:01:23 +02:00
Gent
4e7352da66 Add sell functionality to vendors 2020-09-11 22:04:23 -04:00
dongresource
5747c24479 [bugfix] Don't set iType on empty item slots. 
This confuses ItemManager::findFreeSlot().
 2020-09-12 02:25:45 +02:00
dongresource
579aa9d31d Save pointer to Player struct in CNSocket. 
This is an insignificant optimization now, but will be necessary when we
start switching around the the algorithms and datastructures used in
proximity detection.
 2020-09-12 01:22:58 +02:00
Ariii
3865249387 Vendors, set nano skill command + serverside command issues fixed (#74) 
Added basic shopkeeper functions, a player can buy the preset 3 items (cannonbolt set), all shopkeepers have the same items atm (need to check the shopkeeper tabledata), setting itemprice is something I didn't figure out.
Added set nano skill command
Implemented a switch for certain commands like health/taros/fusionmatter etc to be handled on the serverside aswell

Co-authored-by: dongresource <dongresource@protonmail.com>
 2020-09-11 23:19:03 +02:00
dongresource
468840c9ea Fixed gcc vs clang preprocessor tomfoolery. 2020-09-11 00:19:21 +02:00
dongresource
52f02168bc Implemented quest item cleanup and fixed a few bugs. 2020-09-11 00:19:21 +02:00
dongresource
ddb5f782b7 Refactored mission data and implemented quest item mob drops. 
Most future missions are now playable.
Quest items aren't being properly cleaned up yet.
 2020-09-11 00:19:21 +02:00
dongresource
3665dc2c93 [WIP] Incremental mission save 2 
This commit (and the previous one) exist to document the first approach I
took to storing mission data. It's only here for posterity. This comment
was added while rebasing.
 2020-09-11 00:19:19 +02:00
dongresource
ae654f996c [WIP] Incremental mission save 1 
This commit (and the next one) exist to document the first approach I
took to storing mission data. It's only here for posterity. This comment
was added while rebasing.
 2020-09-11 00:19:16 +02:00
dongresource
e33b7f20e9 [bugfix] Preserve Taros and FM when opening Crates. 2020-09-11 00:08:26 +02:00
dongresource
5b49e71de7 Implemented mission rewards. 
Might need to refactor item drops, especially after implementing
task-result quest item drops.
 2020-09-11 00:08:26 +02:00
dongresource
3172724596 Implemented the mob kill counter in missions and fixed a bug. 2020-09-11 00:08:26 +02:00
dongresource
8887c6349b Add support for cookie-based login back in. 2020-09-11 00:08:26 +02:00
CakeLancelot
6e0b101a76 Merge pull request #78 from JadeShrineMaiden/additions2 
Levelling up added to /nano
 2020-09-10 12:02:28 -05:00
JadeShrineMaiden
29cde56fb1 Levelling up added to /nano 
- Using /nano levels up Player, a player cannot level down.
 2020-09-10 17:51:52 +01:00
CPunch
e65f07780b Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-09-09 12:06:35 -05:00
CPunch
eb1ad6bb37 switched to dumped XDT & moved to a submodule 2020-09-09 12:06:22 -05:00