Skip to content

Commit 1587c51

Browse files
iLPdeveterchun
andauthored
Development (#57)
* feat(mapper): 💄 add a few missing strural terrain types Armor Shop, Alchemist, Farming Store, Farmland, Abandoned Mine, Shrine, Grocery Store, Building, Tool Shop, Restaurant, and Clothing Shop * feat(mapper): 💄 add missing structural terrains add Books Shop, Leatherworker's Shop, and Weapon Shop. Also, fixes Armor Shop duplicating Wall terrain type ID * docs(readme): bring updates to terrain branch (#51) * docs(readme): fix badges * docs:(readme): restore all-contributors badge * docs(readme): move Contributors under Contributing heading * fix(mapper): 🐛 add Book Shop terrain Add "Book Shop" to complement "Books Shop" terrain on server * feat(mapper): 💄 add nexus terrains * fix(mapper): 🐛 color Auction House and Hall of Lessons * feat(mapper): 💄 add Hidden Grove terrains * Update Chat and Stats to retain sizing and eliminate startup errors These changes enable automatic position loading via the relevant APIs for Chat and Stats and also move window initialization until after GMCP data has been received to 1) eliminate some errors polluting the log at startup from the various bars based on GMCP data, and 2) allow for the Chat title to reflect the player name (I found a way to change the title for Stats but not for Chat). * Changes to Stats enabling load on event * Moving window open into an event handler * fix(dependency): update MDK resources to v2.8.1 * Changing Chat load to startup to avoid multiple map loads Delaying EMCO creation resulted in two map loads, one visible post-login. * Adding a title set after GMCP data is received Rather than loading the window when data is available, we change the title after load. * Do not show the XP gauge if the character is max level After 100 the percent measurement becomes irrelevant, so we can increase avoid showing the XP bar. * Updating max level check I had checked the wrong variable * feat(mapper): 💄 add Endless Sands terrain types * Update stat gauge display and updating Now listening for events to update bars rather than using a timer. Also added left padding to the text. * feat(mapper): 💄 add Frozen Peaks terrain types * Fixing a regression in XP bar Fixing issue where defaults were shown in the XP bar until changes to character xp totals. * Removing debug prints used to identify the XP bar issue * feat((mapper)): 💄 add Frozen Peaks terrain types Bait and Tackle + Riscacles Settlement * feat(mapper): 💄 add Frozen Peaks terrain types Temple Entrance, Frozen River, and overworld-wide Temple color to grey * feat(mapper): 💄 add Clearing terrain type * fix(mapper): 🐛 correct Foothills color * feat(mapper): 💄 add Frozen Peak terrain type --------- Co-authored-by: eterchun <[email protected]>
1 parent b254db2 commit 1587c51

File tree

8 files changed

+371
-176
lines changed

8 files changed

+371
-176
lines changed

MDK/LICENSE-MDK.lua

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
4646
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
4747
SOFTWARE.
4848
]]
49-
50-
51-
-- Testing uses luaunit. License below
52-
--[=[
53-
This software is distributed under the BSD License.
54-
55-
Copyright (c) 2005-2018, Philippe Fremy <phil at freehackers dot org>
56-
57-
All rights reserved.
58-
59-
Redistribution and use in source and binary forms, with or without modification,
60-
are permitted provided that the following conditions are met:
61-
62-
Redistributions of source code must retain the above copyright notice, this list
63-
of conditions and the following disclaimer.
64-
65-
Redistributions in binary form must reproduce the above copyright notice, this
66-
list of conditions and the following disclaimer in the documentation and/or other
67-
materials provided with the distribution.
68-
69-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
70-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
71-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
72-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
73-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
74-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
75-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
76-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
77-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
78-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
79-
© 2020 GitHub, Inc.
80-
--]=]

MDK/demontools.lua

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,9 @@ local DemonTools = {}
77
local cheatConsole = Geyser.MiniConsole:new({name = "DemonnicCheatConsole", width = 4000, wrapWidth = 10000, color = "black"})
88
cheatConsole:hide()
99
local function exists(path)
10-
path = path:gsub([[\]], "/")
11-
if path:ends("/") then
12-
path = path:sub(1,-2)
13-
end
14-
local ok, err, code = lfs.attributes(path)
15-
if ok then
16-
return true
17-
end
18-
if err:lower():find("no such file or directory") then
19-
return false
20-
end
21-
return ok, err, code
10+
path = path:gsub([[\$]], "")
11+
path = path:gsub([[/$]], "")
12+
return io.exists(path)
2213
end
2314

2415
local function isWindows()

0 commit comments

Comments
 (0)