Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/DollyRamella/uni-rennes2D
Browse files Browse the repository at this point in the history
  • Loading branch information
@DollyRamella
DollyRamella committed Dec 13, 2024
2 parents 92a3f4f + af94af3 commit 6cafcea
Show file tree
Hide file tree
Showing 22 changed files with 1,460 additions and 97 deletions.
130 changes: 105 additions & 25 deletions maps/serpentard.tmj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 0, 0, 0, 0, 0, 3, 0, 0, 3, 3, 3, 3, 3, 0, 0, 3, 0, 0, 0, 0, 0, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 0, 3,
3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
Expand Down Expand Up @@ -405,10 +405,10 @@
"layers":[
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 20410, 20602, 0, 20410, 20602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20410, 20602, 0, 20410, 20602, 0,
0, 20474, 20666, 0, 20474, 20666, 0, 68486, 68487, 68488, 43733, 43734, 43735, 68486, 68487, 68488, 0, 20474, 20666, 0, 20474, 20666, 0,
0, 20538, 20730, 0, 20538, 20730, 0, 68498, 68499, 68500, 43796, 22, 43798, 68498, 68499, 68500, 0, 20538, 20730, 0, 20538, 20730, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43859, 88, 43861, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 20410, 20602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20410, 20602, 0,
0, 20474, 20666, 0, 34050, 34051, 0, 68486, 68487, 68488, 43733, 43734, 43735, 68486, 68487, 68488, 0, 34050, 34051, 0, 20474, 20666, 0,
0, 20538, 20730, 0, 34114, 34115, 0, 68498, 68499, 68500, 43796, 22, 43798, 68498, 68499, 68500, 0, 34114, 34115, 0, 20538, 20730, 0,
0, 0, 0, 0, 34178, 34179, 0, 0, 0, 0, 43859, 88, 43861, 0, 0, 0, 0, 34178, 34179, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 34537, 0, 0, 0, 0, 34533, 34534, 34535, 0, 0, 0, 0, 34536, 0, 0, 0, 0, 0,
0, 68436, 0, 0, 0, 34601, 0, 0, 0, 0, 34597, 34598, 34599, 0, 0, 0, 0, 34600, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -444,17 +444,17 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 35019, 0, 0, 0, 35019, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 68437, 68438, 68439, 0, 0, 0, 0, 0, 35083, 0, 0, 0, 35083, 0, 0, 0, 0, 0, 68437, 68438, 68439, 0,
0, 68449, 68450, 68451, 33250, 33251, 0, 0, 0, 68437, 0, 0, 0, 0, 0, 0, 0, 33250, 33251, 68449, 68450, 68451, 0,
0, 68461, 68462, 68463, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68461, 68462, 68463, 0,
0, 68473, 68474, 68475, 0, 68423, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68473, 68474, 68475, 0,
0, 68437, 68438, 68439, 0, 0, 0, 0, 0, 35083, 0, 0, 0, 35083, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 68449, 68450, 68451, 33250, 33251, 0, 0, 0, 68437, 0, 0, 0, 0, 0, 0, 0, 33250, 33251, 0, 0, 0, 0,
0, 68461, 68462, 68463, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68534, 68535, 68536, 0,
0, 68473, 68474, 68475, 0, 68423, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68537, 68538, 68539, 0,
0, 0, 0, 68423, 68423, 68423, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 68423, 68423, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68423, 0, 0,
0, 0, 0, 0, 68423, 0, 0, 0, 0, 0, 32129, 33374, 33375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33437, 33438, 33439, 0, 0, 0, 0, 0, 33189, 32801, 33191, 0, 0,
0, 0, 0, 34726, 34727, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 34790, 34791, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 34854, 34855, 0, 0, 0, 44271, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 34726, 34727, 0, 0, 0, 0, 0, 33189, 33190, 33191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 34790, 34791, 0, 0, 0, 0, 0, 33253, 33254, 33255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 34854, 34855, 0, 0, 0, 44271, 0, 33317, 33318, 33319, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 44460, 0, 33501, 0, 33503, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33565, 33566, 33567, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -489,7 +489,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33373, 33374, 33375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33437, 33438, 33439, 0, 0, 0, 0, 0, 0, 809, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32736, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32800, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32129, 0, 0, 0, 0, 0, 0, 32800, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35289, 32130, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32736, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44776, 0, 44651, 0, 0, 0, 0, 0, 0, 32800, 0, 0, 0,
Expand Down Expand Up @@ -522,7 +522,73 @@
"draworder":"topdown",
"id":2,
"name":"floorLayer",
"objects":[],
"objects":[
{
"height":76.8959757023541,
"id":26,
"name":"E2",
"rotation":0,
"type":"area",
"visible":true,
"width":128.226271829916,
"x":574.882428166088,
"y":208.399112816209
},
{
"height":121.808,
"id":28,
"name":"E1",
"rotation":0,
"type":"area",
"visible":true,
"width":107.421,
"x":570.388888562523,
"y":324.730496263438
},
{
"height":158,
"id":31,
"name":"E3",
"rotation":0,
"type":"area",
"visible":true,
"width":159.333333333333,
"x":289.333333333333,
"y":364.666666666667
},
{
"height":70,
"id":32,
"name":"E4",
"rotation":0,
"type":"area",
"visible":true,
"width":131.333333333333,
"x":304.666666666667,
"y":273.333333333333
},
{
"height":133.333333333333,
"id":33,
"name":"E4B",
"rotation":0,
"type":"area",
"visible":true,
"width":78.6666666666667,
"x":119.333333333333,
"y":66
},
{
"height":185,
"id":34,
"name":"E5",
"rotation":0,
"type":"area",
"visible":true,
"width":127,
"x":64,
"y":346
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
Expand Down Expand Up @@ -573,15 +639,15 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 68437, 68438, 68439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68437, 68438, 68439, 0,
0, 68449, 68450, 68451, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68449, 68450, 68451, 0,
0, 68437, 68438, 68439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68528, 68529, 68530, 0,
0, 68449, 68450, 68451, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68531, 68532, 68533, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33189, 33190, 33191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33189, 33190, 33191, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33189, 33190, 33191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 44271, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33189, 33190, 33191, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -617,8 +683,8 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35224, 35225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 809, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32736, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35227, 0, 0, 0, 0, 0, 0, 0, 32736, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35224, 35291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35289, 32130, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -647,8 +713,8 @@
"x":0,
"y":0
}],
"nextlayerid":82,
"nextobjectid":24,
"nextlayerid":84,
"nextobjectid":35,
"orientation":"orthogonal",
"properties":[
{
Expand All @@ -674,7 +740,7 @@
{
"name":"script",
"type":"string",
"value":"..\/src\/hp.ts"
"value":"..\/src\/EGFeminisme.ts"
}],
"renderorder":"right-down",
"tiledversion":"1.11.0",
Expand Down Expand Up @@ -6117,6 +6183,20 @@
"tilecount":120,
"tileheight":32,
"tilewidth":32
},
{
"columns":3,
"firstgid":68528,
"image":"..\/tilesets\/venus.png",
"imageheight":128,
"imagewidth":96,
"margin":0,
"name":"venus",
"spacing":0,
"tilecount":12,
"tileheight":32,
"tilewidth":32,
"transparentcolor":"#ff00ff"
}],
"tilewidth":32,
"type":"map",
Expand Down
Loading

0 comments on commit 6cafcea

Please sign in to comment.