-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Initial implementation of Map Zones #8100
Open
aleos89
wants to merge
54
commits into
master
Choose a base branch
from
feature/map_zones
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+8,941
−11,159
Commits on Jan 12, 2024
-
Initial implementation of Map Zones
* Implements Map Zones which allows easier configuration of map settings. * The restricted mapflag has been removed as they will no longer be needed. * General cleanups and optimizations.
Configuration menu - View commit details
-
Copy full SHA for 39f6e14 - Browse repository at this point
Copy the full SHA 39f6e14View commit details -
Configuration menu - View commit details
-
Copy full SHA for e60e3e8 - Browse repository at this point
Copy the full SHA e60e3e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 004dcf5 - Browse repository at this point
Copy the full SHA 004dcf5View commit details -
* Convert a few more PK damage checks that got missed from a merge conflict.
Configuration menu - View commit details
-
Copy full SHA for 82e362e - Browse repository at this point
Copy the full SHA 82e362eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 997e457 - Browse repository at this point
Copy the full SHA 997e457View commit details -
Configuration menu - View commit details
-
Copy full SHA for c186c03 - Browse repository at this point
Copy the full SHA c186c03View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c24cc4 - Browse repository at this point
Copy the full SHA 5c24cc4View commit details
Commits on Jan 13, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 7717070 - Browse repository at this point
Copy the full SHA 7717070View commit details
Commits on Jan 14, 2024
-
Implements mapflag MF_FLEE_PENALTY
* Deprecate the bg_flee_penalty and gvg_flee_penalty battle configs. * Removes hardcoded restrictions limiting to only BG and GvG maps.
Configuration menu - View commit details
-
Copy full SHA for 1e4a219 - Browse repository at this point
Copy the full SHA 1e4a219View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6568ccf - Browse repository at this point
Copy the full SHA 6568ccfView commit details -
Configuration menu - View commit details
-
Copy full SHA for e405a39 - Browse repository at this point
Copy the full SHA e405a39View commit details -
Configuration menu - View commit details
-
Copy full SHA for 53b2a0c - Browse repository at this point
Copy the full SHA 53b2a0cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 08068bf - Browse repository at this point
Copy the full SHA 08068bfView commit details -
Adds a function to assist with PK damage
* Re-implement battle_calc_pk_damage to help determine when to adjust damage when PK mode is enabled. * Implement INF2_IGNOREPKREDUCTION skill flag to make skills bypass the damage adjustments.
Configuration menu - View commit details
-
Copy full SHA for 31cc8c5 - Browse repository at this point
Copy the full SHA 31cc8c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for e3eefb6 - Browse repository at this point
Copy the full SHA e3eefb6View commit details
Commits on Jan 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 34065e4 - Browse repository at this point
Copy the full SHA 34065e4View commit details -
* Remove a possible timer even if passing an invalid time value.
Configuration menu - View commit details
-
Copy full SHA for 772c6f3 - Browse repository at this point
Copy the full SHA 772c6f3View commit details -
Adds object type check to isStatusDisabled
* Check by object type rather than passing arbitrary integers to compare against.
Configuration menu - View commit details
-
Copy full SHA for e9beffe - Browse repository at this point
Copy the full SHA e9beffeView commit details
Commits on Jan 17, 2024
-
Adds ability to clear mapflags
* Added the Clear label to allow mapflags to be removed for importing use. * Converts mapflag storage into multimap.
Configuration menu - View commit details
-
Copy full SHA for 941085e - Browse repository at this point
Copy the full SHA 941085eView commit details -
Configuration menu - View commit details
-
Copy full SHA for c178f03 - Browse repository at this point
Copy the full SHA c178f03View commit details -
* Adds back an accidental removal for mapflag name lookup.
Configuration menu - View commit details
-
Copy full SHA for e34973a - Browse repository at this point
Copy the full SHA e34973aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4a48b64 - Browse repository at this point
Copy the full SHA 4a48b64View commit details -
* Display a notice when a map doesn't have a zone with a suggestion to assign one. * Avoiding a default zone as many maps are added from updates and may not get their proper zones until the requisite data is found.
Configuration menu - View commit details
-
Copy full SHA for 10e28ba - Browse repository at this point
Copy the full SHA 10e28baView commit details -
Configuration menu - View commit details
-
Copy full SHA for cbe0d8f - Browse repository at this point
Copy the full SHA cbe0d8fView commit details -
Configuration menu - View commit details
-
Copy full SHA for d3ea299 - Browse repository at this point
Copy the full SHA d3ea299View commit details
Commits on Jan 18, 2024
-
Fixes atcommands for PvP and GvG toggle
* Fixes atcommands pvpon, pvpoff, gvgon, and gvgoff to properly toggle the current map with the appropriate zone. * Atcommand pvpon will assign the MAPTYPE_NOPENALTY_FREEPKZONE zone. * Atcommand gvgon will assign the MAPTYPE_EVENT_GUILDWAR zone. * Adds getMapZone() to return a map's zone. * Adds setZone() to set a map's zone. Thanks to @Atemo!
Configuration menu - View commit details
-
Copy full SHA for fc3cc3c - Browse repository at this point
Copy the full SHA fc3cc3cView commit details
Commits on Jan 23, 2024
-
* Revert atcommand pvpon/pvpoff. * Revert atcommand gvgon/gvgoff.
Configuration menu - View commit details
-
Copy full SHA for f56c45c - Browse repository at this point
Copy the full SHA f56c45cView commit details
Commits on Feb 9, 2024
-
Configuration menu - View commit details
-
Copy full SHA for fc7a553 - Browse repository at this point
Copy the full SHA fc7a553View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9973a89 - Browse repository at this point
Copy the full SHA 9973a89View commit details
Commits on Apr 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 1e4c6ff - Browse repository at this point
Copy the full SHA 1e4c6ffView commit details
Commits on May 3, 2024
-
Configuration menu - View commit details
-
Copy full SHA for b43cd4c - Browse repository at this point
Copy the full SHA b43cd4cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 61b7f33 - Browse repository at this point
Copy the full SHA 61b7f33View commit details -
Configuration menu - View commit details
-
Copy full SHA for 849f1ec - Browse repository at this point
Copy the full SHA 849f1ecView commit details -
* Adjust to class to avoid duplication of definitions. * Rename prefix to match "class".
Configuration menu - View commit details
-
Copy full SHA for 060629b - Browse repository at this point
Copy the full SHA 060629bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 074fdfb - Browse repository at this point
Copy the full SHA 074fdfbView commit details
Commits on May 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 477c845 - Browse repository at this point
Copy the full SHA 477c845View commit details -
Configuration menu - View commit details
-
Copy full SHA for 92b6879 - Browse repository at this point
Copy the full SHA 92b6879View commit details -
Merge branch 'master' into feature/map_zones
# Conflicts: # conf/msg_conf/map_msg.conf
Configuration menu - View commit details
-
Copy full SHA for 6ffcedc - Browse repository at this point
Copy the full SHA 6ffcedcView commit details -
Configuration menu - View commit details
-
Copy full SHA for c62395f - Browse repository at this point
Copy the full SHA c62395fView commit details
Commits on May 31, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 2553658 - Browse repository at this point
Copy the full SHA 2553658View commit details
Commits on Jun 21, 2024
-
Configuration menu - View commit details
-
Copy full SHA for f0a1847 - Browse repository at this point
Copy the full SHA f0a1847View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73ea1ac - Browse repository at this point
Copy the full SHA 73ea1acView commit details
Commits on Jun 26, 2024
-
* Change the lookup method for getMapZone to utilize the value stored in the map_data rather than looking through map_zone memory bringing faster results.
Configuration menu - View commit details
-
Copy full SHA for 394d502 - Browse repository at this point
Copy the full SHA 394d502View commit details
Commits on Jun 29, 2024
-
Configuration menu - View commit details
-
Copy full SHA for e648d02 - Browse repository at this point
Copy the full SHA e648d02View commit details
Commits on Aug 1, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 142505f - Browse repository at this point
Copy the full SHA 142505fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ac2975 - Browse repository at this point
Copy the full SHA 8ac2975View commit details
Commits on Aug 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 14aa844 - Browse repository at this point
Copy the full SHA 14aa844View commit details -
Configuration menu - View commit details
-
Copy full SHA for 06c595c - Browse repository at this point
Copy the full SHA 06c595cView commit details
Commits on Aug 19, 2024
-
Removed renewal maps from pre-re Improved map descriptions Fixed pre-re bossnia maptype (It's actually 24)
Configuration menu - View commit details
-
Copy full SHA for a9d3ebd - Browse repository at this point
Copy the full SHA a9d3ebdView commit details
Commits on Sep 6, 2024
-
Configuration menu - View commit details
-
Copy full SHA for eacd54b - Browse repository at this point
Copy the full SHA eacd54bView commit details
Commits on Sep 9, 2024
-
Add back player_invincible_time battle config
* Resolves an issue where the invincible time as not getting applied to maps without the MF_INVINCIBLE_TIME flag. * Move the logic checks for MF_INVINCIBLE_TIME, MF_FLEE_PENALTY, MF_WEAPON_DAMAGE_RATE, MF_MAGIC_DAMAGE_RATE, MF_MISC_DAMAGE_RATE, MF_LONG_DAMAGE_RATE, and MF_SHORT_DAMAGE_RATE to map_setmapflag_sub() from npc_parse_mapflag(). * Update the mapflag documentation.
Configuration menu - View commit details
-
Copy full SHA for 69df753 - Browse repository at this point
Copy the full SHA 69df753View commit details
Commits on Sep 20, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 3a0b3cc - Browse repository at this point
Copy the full SHA 3a0b3ccView commit details -
Adjust map ID lookup to be primary
* Resolves a few cases of where a map may be defined in the index/cache but not enabled from the config. * Comment out a few pre-renewal maps that are not enabled.
Configuration menu - View commit details
-
Copy full SHA for a01b87a - Browse repository at this point
Copy the full SHA a01b87aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 857d6e3 - Browse repository at this point
Copy the full SHA 857d6e3View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.