Skip to content
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

feat: synchronizing commits with the official rme repository #36

Merged
merged 46 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
cc5b172
Show indicators for pickupable and moveable items
beats-dh Apr 4, 2023
eb95ea9
Fix: drawing always refreshing ui
beats-dh Apr 4, 2023
c0a6a4d
Fix crash on invalid friend for wallbrush
beats-dh Apr 4, 2023
0309b2a
Option to remove empty spawns
beats-dh Apr 4, 2023
7634d6d
Draws position indicator, some code cleanup
beats-dh Apr 4, 2023
ab65bc5
Teleport copy/paste improvements
beats-dh Apr 4, 2023
d371035
Fix flood fill
beats-dh Apr 4, 2023
5fb26bc
Add function to get minimap/8bit color
beats-dh Apr 4, 2023
c620771
Small code cleanup
beats-dh Apr 4, 2023
877385e
Cleanup Position
beats-dh Apr 4, 2023
2fc26fa
Code cleanup and small optimizations
beats-dh Apr 4, 2023
a220678
Code cleanup
beats-dh Apr 5, 2023
3e32dc2
Code cleanup and small optimizations (#406)
beats-dh Apr 5, 2023
ffad4a6
Cleanup and cast functions.
beats-dh Apr 5, 2023
bca8e83
Avoid adding a new Unique ID if it already exists
beats-dh Apr 5, 2023
a727aee
Code cleanup and small optimizations
beats-dh Apr 6, 2023
d9cb000
More changes and cleanup
beats-dh Apr 6, 2023
6ddc115
Changes and cleanup
beats-dh Apr 6, 2023
ffeca4d
Some changes
beats-dh Apr 6, 2023
7444683
Fix copy position.
beats-dh Apr 6, 2023
9d82e8c
Only show uid/aid alert if it really changed
beats-dh Apr 6, 2023
e5a73e1
Add actions history panel
beats-dh Apr 6, 2023
66798d0
Does not draw tooltips on minimap mode
Mignari Jan 28, 2023
e3d35ce
Use constexpr
beats-dh Apr 6, 2023
f813867
Replace items fix (#408)
beats-dh Apr 6, 2023
57cae03
Draw grid small optimization
Mignari Feb 4, 2023
ac505ff
Small change in selection box and Fix #409
Mignari Feb 4, 2023
a27f423
Fix some xpm
Mignari Feb 11, 2023
64f5a32
Ingame box improvements, add lights support.
Mignari Feb 11, 2023
ba7b73f
Fix go to previous position (#410)
maattch Feb 22, 2023
b94b741
Fix depot crash (#411)
maattch Mar 1, 2023
16af847
Fix XPMs
Mignari Mar 26, 2023
adacd12
Export minimap as .otmm (otclient format) or .png (#413)
Mignari Mar 27, 2023
afc9615
Fix glitch after drawing secondary map
beats-dh Apr 6, 2023
fc54eec
fix
beats-dh Apr 9, 2023
b22a051
Update about_window.cpp
beats-dh Jun 24, 2023
35986c4
sonar
beats-dh Jun 24, 2023
ad9f892
fix Minimap and progress bar
beats-dh Jun 25, 2023
f627fe1
fix erro load items.xml
beats-dh Jun 25, 2023
40f9c07
fix
beats-dh Jun 28, 2023
895c5df
fix doodad brush
majestyotbr Sep 29, 2023
8ff1e8e
fix: slightly more accurate house size estimation
luan Sep 4, 2023
40f1edc
feat: update items.otb and items.xml
majestyotbr Sep 29, 2023
e51724d
Merge remote-tracking branch 'upstream/main' into pr/36
luan Oct 8, 2023
974919c
fix: bad merge
luan Oct 8, 2023
5bc98a0
Revert "feat: update items.otb and items.xml"
luan Oct 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/items/items.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<items>
<!-- Liquids -->
<!-- Fluid type 0 is same as water (id="1") -->

<!-- RME vai dar erro por causa desses items abaixo-->
<item id="1" name="water" />
<item id="2" name="wine" />
<item id="3" name="beer" />
Expand All @@ -20,6 +22,8 @@
<item id="16" name="mead" />
<item id="17" name="tea" />
<item id="18" name="ink" />
<!-- RME vai dar erro por causa desses items acima-->

<!-- 12.85 last fluid is 18, 19+ is a loop from 0 to 18 over and over again -->

<item id="100" name="void"/>
Expand Down
16 changes: 13 additions & 3 deletions data/menubar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@
<item name="Ra$ndomize Selection" action="RANDOMIZE_SELECTION" help="Randomizes the ground tiles of the selected area."/>
<item name="$Randomize Map" action="RANDOMIZE_MAP" help="Randomizes all tiles of the entire map."/>
</menu>
<menu name="$Other Options">
<menu name="$Tools">
<item name="$Remove Items by ID..." action="MAP_REMOVE_ITEMS" help="Removes all items with the selected ID from the map."/>
<item name="Remove $all corpses..." action="MAP_REMOVE_CORPSES" help="Removes all corpses from the map."/>
<item name="Remove all $unreachable tiles..." action="MAP_REMOVE_UNREACHABLE_TILES" help="Removes all tiles that cannot be reached (or seen) by the player from the map."/>
<item name="Remove empty monsters spawns" action="MAP_REMOVE_EMPTY_MONSTERS_SPAWNS" help="Removes all empty monsters spawns from the map."/>
<item name="Remove empty npcs spawns" action="MAP_REMOVE_EMPTY_NPCS_SPAWNS" help="Removes all empty npcs spawns from the map."/>
<item name="$Clear Invalid Houses" action="CLEAR_INVALID_HOUSES" help="Clears house tiles not belonging to any house."/>
<item name="Clear $Modified State" action="CLEAR_MODIFIED_STATE" help="Clears the modified state from all tiles."/>
</menu>
Expand Down Expand Up @@ -118,7 +120,10 @@
<item name="Show $all floors" hotkey="Ctrl+W" action="SHOW_ALL_FLOORS" help="If not checked other floors are hidden."/>
<item name="Ghost $loose items" hotkey="G" action="GHOST_ITEMS" help="Ghost items (except ground)."/>
<item name="Ghost $higher floors" hotkey="Ctrl+L" action="GHOST_HIGHER_FLOORS" help="Ghost floors."/>
<item name="Show $Ingame Box" hotkey="Shift+I" action="SHOW_INGAME_BOX" help="Shadows out areas not visible ingame (from the center of the screen)."/>
<menu name="$Ingame Box">
<item name="Show $client box" hotkey="Shift+I" action="SHOW_INGAME_BOX" help="Shadows out areas not visible ingame (from the center of the screen)."/>
<item name="Show $lights" hotkey="Shift+I" action="SHOW_LIGHTS" help="Show lights."/>
</menu>
<item name="Show $Grid" hotkey="Shift+G" action="SHOW_GRID" help="Shows a grid over all items."/>
<item name="H$ighlight items" hotkey="V" action="HIGHLIGHT_ITEMS" help="Highlight tiles with items on them."/>
<separator/>
Expand All @@ -134,10 +139,15 @@
<item name="Show $pathing" hotkey="O" action="SHOW_PATHING" help="Show pathing grid (blocking tiles)."/>
<item name="Show T$ooltips" hotkey="Y" action="SHOW_TOOLTIPS" help="Show tooltips."/>
<item name="Show Previe$w" hotkey="L" action="SHOW_PREVIEW" help="Show animations and lights preview."/>
<item name="Show Wall Hoo$ks" hotkey="K" action="SHOW_WALL_HOOKS" help="Show indicators for wall hooks."/>
<menu name="Show Indicators">
<item name="Show Wall Hoo$ks" hotkey="K" action="SHOW_WALL_HOOKS" help="Show indicators for wall hooks."/>
<item name="Show Pickupables" action="SHOW_PICKUPABLES" help="Show indicators for pickupable items."/>
<item name="Show Moveables" action="SHOW_MOVEABLES" help="Show indicators for moveable items."/>
</menu>
</menu>
<menu name="$Window">
<item name="$Minimap" hotkey="M" action="WIN_MINIMAP" help="Displays the minimap window."/>
<item name="$Actions History" action="WIN_ACTIONS_HISTORY" help="Displays the actions history window."/>
<item name="$New Palette" action="NEW_PALETTE" help="Creates a new palette."/>
<separator/>
<item name="$Terrain Palette" hotkey="T" action="SELECT_TERRAIN" help="Select the Terrain palette."/>
Expand Down
Binary file added icons/house_exit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions icons/house_exit.xpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* XPM */
static const char *house_exit_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1 ",
" c black",
". c magenta",
"X c white",
/* pixels */
"................................",
"................................",
"..... ....",
"..... XXX X X X XXX ....",
"..... X X X X X ....",
"..... XX X X X ....",
"..... X X X X X ....",
"..... XXX X X X X ....",
"..... ....",
"................................",
"................................",
"........... ...........",
"........... XXXXXX ..........",
"........... XXXXX ..........",
"........... XXXX ..........",
"........... XXX ..........",
"........... XX ..........",
"........... XX ..........",
"........... XX ..........",
"........... XX ..........",
"........... XX ..........",
"........... XX ..........",
"........... XX ..........",
"........... XX ..........",
"............ XX ..........",
"............. ...........",
".............. .............",
"............... .............",
"................ .............",
"................. .............",
".................. .............",
"................................"
};
Binary file added icons/mini_borderize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions icons/mini_borderize.xpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* XPM */
static const char *mini_borderize_xpm[] = {
"16 16 2 1",
" c None",
". c #26B48D",
" ",
" .... .... .... ",
" .... .... .... ",
" .... .... ",
" ... ... ",
" ",
" .. .. ",
" .. .. ",
" .. .. ",
" .. .. ",
" ",
" ... ... ",
" .... .... ",
" .... .... .... ",
" .... .... .... ",
" "};
Binary file added icons/mini_change.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 116 additions & 0 deletions icons/mini_change.xpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/* XPM */
static const char *mini_change_xpm[] = {
"16 16 97 2",
" c None",
". c #6CBC60",
"+ c #69B95E",
"@ c #66B55B",
"# c #63B158",
"$ c #6EBF62",
"% c #87C87C",
"& c #A1D396",
"* c #AAD8A0",
"= c #A7D69E",
"- c #99CE90",
"; c #78BA70",
"> c #58A34F",
", c #6DBF62",
"' c #8CCA82",
") c #ABD8A1",
"! c #A2D499",
"~ c #A6D59C",
"{ c #A4D49B",
"] c #9BD092",
"^ c #9ED196",
"/ c #79B871",
"( c #509947",
"_ c #85C77B",
": c #A9D7A0",
"< c #A0D197",
"[ c #81C077",
"} c #7EBC75",
"| c #97CC8E",
"1 c #9BCF93",
"2 c #98CE90",
"3 c #69AB61",
"4 c #6ABA5F",
"5 c #9DD194",
"6 c #A6D59D",
"7 c #5DAA53",
"8 c #59A650",
"9 c #56A14D",
"0 c #529C4A",
"a c #90C989",
"b c #8CC885",
"c c #84C07D",
"d c #43893C",
"e c #66B65C",
"f c #63B259",
"g c #60AE56",
"h c #5CA953",
"i c #4E9746",
"j c #6FAF67",
"k c #8FC988",
"l c #3E8438",
"m c #55A04C",
"n c #499142",
"o c #6AAB63",
"p c #8AC783",
"q c #88C582",
"r c #3A7E34",
"s c #549F4B",
"t c #509A48",
"u c #499141",
"v c #458C3E",
"w c #84C17C",
"x c #7EC177",
"y c #77B771",
"z c #367930",
"A c #539E4B",
"B c #6CAE63",
"C c #68AA60",
"D c #489040",
"E c #61A35A",
"F c #87C581",
"G c #85C47E",
"H c #82C27C",
"I c #54964E",
"J c #539D4A",
"K c #6AAD63",
"L c #8FC987",
"M c #8BC785",
"N c #89C682",
"O c #87C47F",
"P c #7CBF75",
"Q c #82C27B",
"R c #5B9D55",
"S c #31732C",
"T c #4E9846",
"U c #66A95F",
"V c #8BC683",
"W c #85C37E",
"X c #74B56D",
"Y c #52954D",
"Z c #468D3F",
"` c #5EA157",
" . c #5A9E55",
".. c #3B7F35",
"+. c #377B31",
"@. c #33762E",
"#. c #3E8337",
" ",
" ",
" . + @ # ",
" $ % & * = - ; > ",
" , ' ) ! ~ { ] ^ / ( ",
" _ : = < [ } | 1 2 3 ",
" 4 5 6 1 7 8 9 0 a b c d ",
" e f g h i j k b l ",
" m n o p q r ",
" s t u v w x y z ",
" A B C D E F G H I ",
" J K L M N O P Q R S ",
" T U V F W H X Y S ",
" Z ` ...+.@. ",
" #.r ",
" z "};
Binary file added icons/mini_copy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 126 additions & 0 deletions icons/mini_copy.xpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
/* XPM */
static const char *mini_copy_xpm[] = {
"16 16 107 2",
" c None",
". c #0F6DFF",
"+ c #227DFF",
"@ c #2480FF",
"# c #2280FF",
"$ c #2380FF",
"% c #237EFF",
"& c #1B7AFF",
"* c #0770FF",
"= c #0056EE",
"- c #1F7CFF",
"; c #FFFFFF",
"> c #E7F3FF",
", c #E8F3FF",
"' c #E5F2FF",
") c #DEEFFF",
"! c #E2F3FF",
"~ c #73BCFF",
"{ c #257AFF",
"] c #0058F1",
"^ c #ECF5FF",
"/ c #C2DEFF",
"( c #C3E0FF",
"_ c #BCDCFF",
": c #AAD3FF",
"< c #F2F9FF",
"[ c #BFE2FF",
"} c #80C1FF",
"| c #0C74FF",
"1 c #217DFF",
"2 c #EFF6FF",
"3 c #CAE2FF",
"4 c #CAE3FF",
"5 c #C3DEFF",
"6 c #B4D9FF",
"7 c #D3E9FF",
"8 c #E6F3FF",
"9 c #EFF9FF",
"0 c #3391FF",
"a c #F0F7FF",
"b c #CFE5FF",
"c c #CEE4FF",
"d c #C8E2FF",
"e c #BEDCFF",
"f c #88C3FF",
"g c #7DC0FF",
"h c #77BBFF",
"i c #3EA1FF",
"j c #3E9DFF",
"k c #2C96FF",
"l c #207DFF",
"m c #F2F7FF",
"n c #D4E7FF",
"o c #C5E0FF",
"p c #7CBEFF",
"q c #FEFFFF",
"r c #D5E7FF",
"s c #D2E6FF",
"t c #CDE4FF",
"u c #78BAFF",
"v c #1D7BFF",
"w c #F1F7FF",
"x c #D9E9FF",
"y c #DBEAFF",
"z c #D7E7FF",
"A c #1E79FF",
"B c #1F78FF",
"C c #EAF5FF",
"D c #B2D6FF",
"E c #A3D1FF",
"F c #DFEFFF",
"G c #257DFF",
"H c #2376FF",
"I c #D9FFF7",
"J c #76BBFF",
"K c #BEDEFF",
"L c #247EFF",
"M c #176EFF",
"N c #E9F3FF",
"O c #E3F1FF",
"P c #E2F0FF",
"Q c #E5F0FF",
"R c #E6F2FF",
"S c #76B9FF",
"T c #C7E3FF",
"U c #BDDBFF",
"V c #237CFF",
"W c #126BFF",
"X c #146AFF",
"Y c #0E66FF",
"Z c #0D66FF",
"` c #D2E5FF",
" . c #CBE2FF",
".. c #217BFF",
"+. c #EBF7FF",
"@. c #2277FF",
"#. c #DBFFF4",
"$. c #2572FF",
"%. c #116BFF",
"&. c #E7F1FF",
"*. c #ECF4FF",
"=. c #1F72FF",
"-. c #0864FF",
";. c #0C66FF",
">. c #0F65FF",
",. c #0A65FF",
"'. c #1E71FF",
". + @ # $ % & * = ",
"- ; > , ' ) ! ~ { ] ",
"+ ^ / ( _ : < [ } | ",
"1 2 3 4 5 6 7 8 9 0 ",
"1 a b c d e f g h h i j k * = ",
"l m n n b o p q > , ' ) ! ~ { ] ",
"- a r n s t u ^ / ( _ : < [ } | ",
"v w x y x z h 2 3 4 5 6 7 8 9 A ",
"B C x y x z h a b c d e D E F G ",
"H I x y x z J m n n b o K 6 ' L ",
"M N O P Q R S a r n s t T U > V ",
"W X Y Z Y Z v w x y x z ` .w ..",
" B C x y x z ` .+.@.",
" H I x y x z ` .#.$.",
" %.N O P Q R R &.*.=.",
" -.;.Y Z Y Z Z >.,.'."};
Binary file added icons/mini_cut.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading