external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2715 from Simisays/adventurebis

Browse Source 
Xira's Hive collision improvements + removal horse overworld
This commit is contained in:
Anthony Calosa
2023-03-21 07:04:53 +08:00
committed by GitHub
parent 1ecede7726 652f799ec3
commit e0493f1556
3 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
forge-gui/res/adventure/Shandalar/maps/main.tiled-session
View File

@@ -3,13 +3,13 @@
"height": 4300, "height": 4300,
"width": 2 "width": 2
}, },
"activeFile": "", "activeFile": "map/cave_6.tmx",
"automapping.whileDrawing": false, "automapping.whileDrawing": false,
"expandedProjectPaths": [ "expandedProjectPaths": [
"tileset",
"map/main_story",
"map", "map",
"obj" "obj",
"map/main_story",
"tileset"
], ],
"file.lastUsedOpenFilter": "All Files (*)", "file.lastUsedOpenFilter": "All Files (*)",
"fileStates": { "fileStates": {
@@ -110,24 +110,24 @@
"scale": 3, "scale": 3,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 279.5, "x": 240,
"y": 217.5 "y": 136.16666666666663
} }
}, },
"map/castle_plains_2.tmx": { "map/castle_plains_2.tmx": {
"scale": 1.5, "scale": 1.5,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 359.66666666666663, "x": 240,
"y": 295.33333333333326 "y": 136.33333333333334
} }
}, },
"map/castle_plains_3.tmx": { "map/castle_plains_3.tmx": {
"scale": 2, "scale": 2,
"selectedLayer": 4, "selectedLayer": 3,
"viewCenter": { "viewCenter": {
"x": 240, "x": 240,
"y": 136 "y": 136.25
} }
}, },
"map/catlair_1.tmx": { "map/catlair_1.tmx": {
@@ -174,8 +174,8 @@
"scale": 4, "scale": 4,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 240, "x": 187.5,
"y": 239.875 "y": 316.625
} }
}, },
"map/cave_1.tmx": { "map/cave_1.tmx": {
@@ -428,8 +428,8 @@
"scale": 2, "scale": 2,
"selectedLayer": 4, "selectedLayer": 4,
"viewCenter": { "viewCenter": {
"x": 240.25, "x": 135,
"y": 136 "y": 119.75
} }
}, },
"map/cave_20.tmx": { "map/cave_20.tmx": {
@@ -1356,16 +1356,19 @@
"scale": 2, "scale": 2,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 240.25, "x": 240,
"y": 136 "y": 136.25
} }
}, },
"map/cave_4.tmx": { "map/cave_4.tmx": {
"scale": 1, "expandedObjectLayers": [
"selectedLayer": 2, 4
],
"scale": 2,
"selectedLayer": 3,
"viewCenter": { "viewCenter": {
"x": 220, "x": 145,
"y": 135 "y": 151.75
} }
}, },
"map/cave_5.tmx": { "map/cave_5.tmx": {
@@ -1373,15 +1376,15 @@
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 232, "x": 232,
"y": 136 "y": 136.25
} }
}, },
"map/cave_6.tmx": { "map/cave_6.tmx": {
"scale": 2, "scale": 2,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 232, "x": 337,
"y": 136 "y": 152.75
} }
}, },
"map/cave_6N1.tmx": { "map/cave_6N1.tmx": {
@@ -3206,10 +3209,10 @@
4 4
], ],
"scale": 2, "scale": 2,
"selectedLayer": 4, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 390.5, "x": 329.5,
"y": 221.75 "y": 204.25
} }
}, },
"map/yule_town.tmx": { "map/yule_town.tmx": {
@@ -3251,22 +3254,31 @@
"map.tileWidth": 16, "map.tileWidth": 16,
"map.width": 90, "map.width": 90,
"openFiles": [ "openFiles": [
"map/xira.tmx",
"map/castle_plains_1.tmx",
"map/castle_plains_2.tmx",
"map/castle_plains_3.tmx",
"map/cave_2.tmx",
"map/cave_3.tmx",
"map/cave_4.tmx",
"map/cave_5.tmx",
"map/cave_6.tmx"
], ],
"project": "main.tiled-project", "project": "main.tiled-project",
"property.type": "string", "property.type": "string",
"recentFiles": [ "recentFiles": [
"map/main_story/templeofchandra.tmx",
"map/tibalt.tmx",
"map/tibalt_f1.tmx",
"map/xira.tmx", "map/xira.tmx",
"map/nahiricave.tmx", "map/castle_plains_1.tmx",
"map/nahiri.tmx", "map/castle_plains_2.tmx",
"map/grolnok.tmx", "map/castle_plains_3.tmx",
"map/tibalt_f2.tmx", "map/cave_2.tmx",
"map/cursed_swamp.tmx", "map/cave_3.tmx",
"map/slobad_factory.tmx", "map/cave_4.tmx",
"map/main_story/blue_castle_f1.tmx", "map/cave_5.tmx",
"map/kiora_island.tmx" "map/cave_6.tmx",
"map/cave_1..tmx",
"map/main_story/templeofchandra.tmx",
"map/tibalt.tmx"
], ],
"resizeMap.removeObjects": true, "resizeMap.removeObjects": true,
"textEdit.monospace": true "textEdit.monospace": true

2
forge-gui/res/adventure/Shandalar/maps/map/xira.tmx
View File

@@ -10,7 +10,7 @@
<tileset firstgid="10113" source="../tileset/buildings.tsx"/> <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="11" name="Collision" width="40" height="26"> <layer id="11" name="Collision" width="40" height="26">
<data encoding="base64" compression="zlib"> <data encoding="base64" compression="zlib">
eJzVlUkOgCAMRdl6Me9/JFcmhkCHP2hswgp++0pbOI8xzh+tlb2lj3SIVbURRyevbtz7LGORPspJ4b+i/ZIv85P1oKK2We9UOJ+aiI+ZlZ3fynxX+Jxs816kc/KtajHzIf5Ud6c2BZ8rN0fvKQydLSbeM+7M4GBD3l12ddm6+VffPwVfplH1DlNf9M9C4nT/N3aeunF2nNFfhDJltXfNDcOInGHjZ+cqewo+5/2z86uu/8p/961w9ucuhnsxDBe0OnBV eJzVl11uwkAMhHnMPsBtegWKckDOgNqehjOgwjHIKrLqjDz+WZUHRhopJNn1F6/3h2Pb7Y5v5NPi7+nPXZX2uq12tq2WfuYpionfg0IO65nV1sqdvh9pTr53a1sjQ+a7Ti3XZoSPSWLflbN8+NviiPgidhy/DB/jxVhz8+tAP2Pv4Liz2hQei81jZHPCm6OePD6PDd+NYjCmbL4rfJU84JhafDh/u9j6lGWTa0vn/WqMgzG99ZGpwhf18XGoxa6yZfis2rweVr+Sy1tTIr5MPN0f67vCZvWB7BHTf9tbVzSflY8Kl9SD5VG+aNwz+cvUqWbFfrJ8LHcsjrBpXabVkTAXbMxG1h3Nqpku6twYcbJ9ITN3qvJq65PUDzLgPTlXjKwrFcYMX/fXkuufactm7ZeZ+Jb6WEv/3p7LWHueZnXNpM+60XpiKbsPsxpj7YULc47nzJHcix7kO3/b9n+AZdZOz03L7DvRjO3V9sYt8hMoNu4z
</data> </data>
</layer> </layer>
<layer id="8" name="Background" width="40" height="26"> <layer id="8" name="Background" width="40" height="26">

1
forge-gui/res/adventure/Shandalar/world/white.json
View File

@@ -45,7 +45,6 @@
"Fox", "Fox",
"Frost Titan", "Frost Titan",
"Griffin", "Griffin",
"Horse",
"Horseman", "Horseman",
"Human", "Human",
"Human elite", "Human elite",