atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marcus Huderle 2022-09-25 10:14:00 -05:00
commit 4beb275a51
2 changed files with 76 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docsrc/manual/scripting-capabilities.rst
View file

@ -178,7 +178,7 @@ Callbacks
.. js:function:: onMapViewTabChanged(oldTab, newTab) .. js:function:: onMapViewTabChanged(oldTab, newTab)
Called when the selected tab in the map view tab bar is changed. Tabs are indexed from left to right, starting at 0 (``0``: Metatiles, ``1``: Collision). Called when the selected tab in the map view tab bar is changed. Tabs are indexed from left to right, starting at 0 (``0``: Metatiles, ``1``: Collision, ``2``: Prefabs).
:param number oldTab: the index of the previously selected tab :param number oldTab: the index of the previously selected tab
:param number newTab: the index of the newly selected tab :param number newTab: the index of the newly selected tab
@ -1244,13 +1244,13 @@ All settings functions are callable via the global ``utility`` object.
.. js:function:: utility.getMapViewTab() .. js:function:: utility.getMapViewTab()
Gets the index of the currently selected map view tab. Tabs are indexed from left to right, starting at 0 (``0``: Metatiles, ``1``: Collision). Gets the index of the currently selected map view tab. Tabs are indexed from left to right, starting at 0 (``0``: Metatiles, ``1``: Collision, ``2``: Prefabs).
:returns number: current map view tab index :returns number: current map view tab index
.. js:function:: utility.setMapViewTab(tab) .. js:function:: utility.setMapViewTab(tab)
Sets the currently selected map view tab. Tabs are indexed from left to right, starting at 0 (``0``: Metatiles, ``1``: Collision). Sets the currently selected map view tab. Tabs are indexed from left to right, starting at 0 (``0``: Metatiles, ``1``: Collision, ``2``: Prefabs).
:param number tab: index of the tab to select :param number tab: index of the tab to select

102
resources/text/prefabs_default_firered.json
View file

@ -309,47 +309,47 @@
"width": 6, "width": 6,
"height": 5, "height": 5,
"primary_tileset": "gTileset_General", "primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_ViridianCity", "secondary_tileset": "",
"metatiles": [ "metatiles": [
{ {
"x": 0, "x": 0,
"y": 0, "y": 0,
"metatile_id": 685, "metatile_id": 313,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 1, "x": 1,
"y": 0, "y": 0,
"metatile_id": 686, "metatile_id": 314,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 2, "x": 2,
"y": 0, "y": 0,
"metatile_id": 686, "metatile_id": 314,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 3, "x": 3,
"y": 0, "y": 0,
"metatile_id": 686, "metatile_id": 314,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 4, "x": 4,
"y": 0, "y": 0,
"metatile_id": 686, "metatile_id": 314,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 5, "x": 5,
"y": 0, "y": 0,
"metatile_id": 687, "metatile_id": 315,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
@ -640,9 +640,9 @@
{ {
"name": "Gate", "name": "Gate",
"width": 6, "width": 6,
"height": 6, "height": 7,
"primary_tileset": "gTileset_General", "primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_ViridianCity", "secondary_tileset": "",
"metatiles": [ "metatiles": [
{ {
"x": 0, "x": 0,
@ -773,111 +773,153 @@
{ {
"x": 0, "x": 0,
"y": 3, "y": 3,
"metatile_id": 368, "metatile_id": 438,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 1, "x": 1,
"y": 3, "y": 3,
"metatile_id": 693, "metatile_id": 437,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 2, "x": 2,
"y": 3, "y": 3,
"metatile_id": 694, "metatile_id": 437,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 3, "x": 3,
"y": 3, "y": 3,
"metatile_id": 694, "metatile_id": 437,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 4, "x": 4,
"y": 3, "y": 3,
"metatile_id": 695, "metatile_id": 437,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 5, "x": 5,
"y": 3, "y": 3,
"metatile_id": 369, "metatile_id": 439,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 0, "x": 0,
"y": 4, "y": 4,
"metatile_id": 100, "metatile_id": 92,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 1, "x": 1,
"y": 4, "y": 4,
"metatile_id": 400, "metatile_id": 392,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 2, "x": 2,
"y": 4, "y": 4,
"metatile_id": 401, "metatile_id": 393,
"collision": 0, "collision": 1,
"elevation": 3 "elevation": 0
}, },
{ {
"x": 3, "x": 3,
"y": 4, "y": 4,
"metatile_id": 401, "metatile_id": 393,
"collision": 0, "collision": 1,
"elevation": 3 "elevation": 0
}, },
{ {
"x": 4, "x": 4,
"y": 4, "y": 4,
"metatile_id": 402, "metatile_id": 394,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 5, "x": 5,
"y": 4, "y": 4,
"metatile_id": 102, "metatile_id": 94,
"collision": 1,
"elevation": 0
},
{
"x": 0,
"y": 5,
"metatile_id": 100,
"collision": 1, "collision": 1,
"elevation": 0 "elevation": 0
}, },
{ {
"x": 1, "x": 1,
"y": 5, "y": 5,
"metatile_id": 408, "metatile_id": 400,
"collision": 0, "collision": 1,
"elevation": 3 "elevation": 0
}, },
{ {
"x": 2, "x": 2,
"y": 5, "y": 5,
"metatile_id": 409, "metatile_id": 401,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 3, "x": 3,
"y": 5, "y": 5,
"metatile_id": 409, "metatile_id": 401,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3
}, },
{ {
"x": 4, "x": 4,
"y": 5, "y": 5,
"metatile_id": 402,
"collision": 1,
"elevation": 0
},
{
"x": 5,
"y": 5,
"metatile_id": 102,
"collision": 1,
"elevation": 0
},
{
"x": 1,
"y": 6,
"metatile_id": 408,
"collision": 0,
"elevation": 3
},
{
"x": 2,
"y": 6,
"metatile_id": 409,
"collision": 0,
"elevation": 3
},
{
"x": 3,
"y": 6,
"metatile_id": 409,
"collision": 0,
"elevation": 3
},
{
"x": 4,
"y": 6,
"metatile_id": 410, "metatile_id": 410,
"collision": 0, "collision": 0,
"elevation": 3 "elevation": 3