6b577ed642
Merge pull request #116 from gsemaj/bugfix1
...
Fix client/server summoned nano discrepancy on revive
2020-09-25 15:05:40 -05:00
Gent
0931cf1fbc
Fix client/server summoned nano discrepancy on revive
2020-09-25 10:57:32 -04:00
kamilprzyb
805c64eff0
Merge branch 'master' of https://github.com/kamilprzyb/OpenFusion
2020-09-25 11:32:38 +02:00
kamilprzyb
8c63cd575c
quick fix for saving running nano missions
2020-09-25 11:30:59 +02:00
5068b38c5e
Merge pull request #100 from SengokuNadeko/master
...
Buddy System
2020-09-25 00:48:01 -05:00
231a4a441b
Merge pull request #112 from gsemaj/slider
...
Load NPC paths from JSON + update submodule ref
2020-09-25 00:37:53 -05:00
kamilprzyb
d4f1515f5d
Time to go, gumballs and nano potions ( #113 )
...
* set up "go to the time machine" button working
* warping to the past now sets PayZoneFlag and removes all active missions
* added gumballs functionality
* added nano potions functionality
* formatting fix
2020-09-25 00:35:27 -05:00
e5a24bcb70
Merge pull request #114 from gsemaj/bugfix1
...
Prevent player position from updating when flying on monkey
2020-09-25 00:33:42 -05:00
874479d1cf
fixed NPC spawning bug
2020-09-24 21:32:14 -05:00
8f84c4c2f8
updateNPCPosition now tracks chunks
2020-09-24 20:58:20 -05:00
kamilprzyb
320a82997a
formatting fix
2020-09-25 03:00:50 +02:00
kamilprzyb
d87306930d
added nano potions functionality
2020-09-25 02:39:30 +02:00
kamilprzyb
86c1cbd0f2
added gumballs functionality
2020-09-25 02:14:11 +02:00
279cb78d5f
Mob-related cleanup.
...
* NPCs now keep track of their chunk information like PlayerView does
for players
* NPCManager::sendToViewable() parallels PlayerManager::sendToViewable()
* Nano damage and debuffs now count as attacking a mob
* Mobs will de-aggro if something else killed their target
2020-09-25 02:00:26 +02:00
72d625fd8d
Summoned mobs are now actually treated as mobs.
...
Unfortunetly, this necessitated keeping around yet more JSON objects for
the duration of the server's runtime.
It also involved unifying the way NPC IDs are handled, such that they
may be allocated and deallocated out of order.
If any NPCID-related bugs occour, this commit should be regarded as
the prime suspect.
2020-09-25 00:51:18 +02:00
Gent
db33ca2bbb
Prevent player position from updating when flying
...
Only chunk is updated instead to maintain visibility
2020-09-24 18:43:58 -04:00
cfb3d25bc5
Lerp mob movement a little.
...
We'll lerp a little harder later. Also retreat if kited
too far.
2020-09-24 23:11:14 +02:00
1f18104a6f
Mobs fight back now.
...
There is still a lot of tuning, lerping and cleanup to do.
2020-09-24 23:11:14 +02:00
006d1000c7
Add Address Sanitizer suppression list.
...
This replaces the unnecessary deallocations on program termination.
Passing in the suppression list environment variable via setenv()
doesn't seem to work, so I've added a comment in the Makefile to explain
invocation.
2020-09-24 23:11:14 +02:00
kamilprzyb
1874f1081b
warping to the past now sets PayZoneFlag and removes all active missions
2020-09-24 22:32:09 +02:00
kamilprzyb
df936e8c9c
set up "go to the time machine" button working
2020-09-24 21:51:25 +02:00
Gent
72c16587e0
Load NPC paths from JSON
2020-09-24 10:32:46 -04:00
c33f218e56
updateFusionMatter now sets fusion matter
2020-09-23 16:04:58 -05:00
4caca07856
Merge pull request #109 from gsemaj/slider
...
Basic slider implementation
2020-09-23 14:49:26 -05:00
63c14aff58
Merge pull request #110 from kamilprzyb/vehicles_pr
...
Fixed Time and implemented vehicles expiring
2020-09-23 14:48:38 -05:00
78930916ad
added support for nano missions
2020-09-23 14:44:27 -05:00
SengokuNadeko
9cfced88c9
Stubbed buddy warping
...
After testing warping a lot I saw how buggy it is. I decided to stub it for this PR and work on it in a later PR.
2020-09-23 13:52:21 -04:00
Gent
f2596bfb6a
Add NPC chunk management + Generalize lerp
2020-09-23 12:06:25 -04:00
Gent
65bd2d120b
Add NPC pathing queues
2020-09-23 10:29:29 -04:00
kamilprzyb
7bcdc111da
fixed comments formating, added zeroing out player->toRemoveVehicle after removing vehicle
2020-09-23 11:21:32 +02:00
kamilprzyb
016c48645e
adjusted timestamp function to always return value in seconds
2020-09-23 11:05:18 +02:00
kamilprzyb
09f1f67778
implemented checking vehicle time limit on use
2020-09-23 10:20:47 +02:00
Gent
7dfc888552
Basic slider implementation
2020-09-23 00:08:51 -04:00
Gent
6f05f0f2c8
Add NPCClass enum
2020-09-22 23:41:43 -04:00
c722044bf5
The Sleep, Stun and Snare powers now affect mobs.
...
They currently don't expire after a set amount of time.
Attacking a sleeping monster does wake it up, but doesn't remove the
debuff status client-side yet.
2020-09-22 22:22:10 +02:00
kamilprzyb
076f89927d
changed vehicle iTimeLimit to be stored in seconds instead of miliseconds
2020-09-22 21:49:24 +02:00
95a79ec815
Switched MobManager::step() to the timer.
...
It doesn't really need to run on every shard step. This makes it a lot
less hot.
2020-09-22 21:31:08 +02:00
kamilprzyb
7ba9b9a54f
replaced high_resolution_clock with system_time for timestamps
2020-09-22 21:15:47 +02:00
ba5998d53a
Added a config option to disable mob movement and combat.
...
This will come in handy when gruntwork starts.
Also fixed a bug where the ACCLEVEL setting was read as a boolean.
2020-09-22 20:53:44 +02:00
ac1fd1e5be
Implemented mob roaming.
...
Will likely need further tuning.
Mobs in vacant chunks are skipped.
2020-09-22 20:33:10 +02:00
94ab5b8b64
Seed the random number generator.
2020-09-22 20:32:40 +02:00
SengokuNadeko
e0e474924d
Implemented buddy warping
...
Buddy warping now works, if anything else needs to be added/redone in regards to this feel free to let me know ^
2020-09-22 13:02:00 -04:00
8896a103ba
Merge pull request #107 from gsemaj/monkeys
...
Sync tabledata submodule + fix transport bugs
2020-09-22 16:38:07 +02:00
kamilprzyb
0931c88541
fixed size bug
2020-09-22 13:41:28 +02:00
kamilprzyb
5a58908462
vehicle has a proper expiration day when bought, implemented checking expired vehicles while login
2020-09-22 13:16:09 +02:00
kamilprzyb
00f64ce992
added sanity check for killing mission mobs
2020-09-22 10:18:29 +02:00
Gent
153b3a9ef5
Sync tabledata submodule + fix transportation bugs
2020-09-22 00:42:46 -04:00
CakeLancelot
adf017b07c
Move from isGM to Account Levels ( #106 )
...
Co-authored-by: dongresource <dongresource@protonmail.com>
2020-09-22 04:26:12 +02:00
5d8bb7f8a5
Merge pull request #95 from gsemaj/monkeys
...
Paths framework + Monkey Skyway System framework
2020-09-22 03:54:01 +02:00
Gent
2c8243e136
General MSS fixes + tweaks
...
Add alert message for unpathed skyway routes
Fix overflow during lerp + add Future routes
Add documentation for MSS
Fix potential MSS registration bug
Minor tweaks + styling
Update packet broadcast
2020-09-21 21:43:39 -04:00
