Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
main path is done
Browse files Browse the repository at this point in the history
  • Loading branch information
@loglot
loglot committed Jul 30, 2024
1 parent bf906ec commit f375aee
Show file tree
Hide file tree
Showing 11 changed files with 384 additions and 132 deletions.
6 changes: 2 additions & 4 deletions imports/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ import { Map as MainGround } from "../system/map-player/map/mapCar
import { Death as MainLava } from "../system/map-player/map/mapCarryers/DeathMap.js"
import { Teleport as MainTeleport } from "../system/map-player/map/mapCarryers/Teleport.js"
import { Checkpoint as MainCheckpoint } from "../system/map-player/map/mapCarryers/checkpoint.js"
import { Enabler as MainEnabler } from "../system/map-player/map/mapCarryers/Enabler.js"
import { Door as MainDoor} from "../system/map-player/map/mapCarryers/Doors.js"
import { Enabler as MainEnabler } from "../system/map-player/map/mapCarryers/Enabler.js"

import { Map as ShortsGround } from "../system/map-player/map/mapCarryers/otherMaps/shorts/Map.js"
import { Death as ShortsLava } from "../system/map-player/map/mapCarryers/otherMaps/shorts/DeathMap.js"
import { Teleport as ShortsTeleport } from "../system/map-player/map/mapCarryers/otherMaps/shorts/Teleport.js"
import { Checkpoint as ShortsCheckpoint } from "../system/map-player/map/mapCarryers/otherMaps/shorts/checkpoint.js"
import { signMaker } from "../system/map-player/map/mapCarryers/signMap.js"
import { signMaker } from "../system/map-player/map/mapCarryers/signMap.js"

export class Map{
ground
Expand Down Expand Up @@ -41,7 +40,6 @@ export class Map{
this.checkpoint = new MainCheckpoint() //-438, -509
this.enabler = new MainEnabler()
this.sign = new signMaker()
this.door = new MainDoor()


}
Expand Down
30 changes: 30 additions & 0 deletions system/map-player/map/mapCarryers/Background.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,36 @@ export class Background {
this.layer1[453] = new Hitbox(-4066,-8514,80,603 )
this.layer1[454] = new Hitbox(-4800,-8514,815,66 )
this.layer1[455] = new Hitbox(-4796,-9115,106,619 )
this.layer1[456] = new Hitbox(4945,-10693,1472,106 )
this.layer1[457] = new Hitbox(6318,-10886,100,298 )
this.layer1[458] = new Hitbox(6318,-10886,2562,124 )
this.layer1[459] = new Hitbox(8795,-10882,85,759 )
this.layer1[460] = new Hitbox(8856,-10211,2257,87 )
this.layer1[461] = new Hitbox(11014,-10942,101,769 )
this.layer1[462] = new Hitbox(11014,-10942,592,100 )
this.layer1[463] = new Hitbox(11500,-11808,106,966 )
this.layer1[464] = new Hitbox(11500,-11808,896,104 )
this.layer1[465] = new Hitbox(12313,-13310,83,1606 )
this.layer1[466] = new Hitbox(11766,-13311,581,71 )
this.layer1[467] = new Hitbox(11766,-14835,140,1594 )
this.layer1[468] = new Hitbox(11888,-14836,1365,126 )
this.layer1[469] = new Hitbox(13122,-15435,132,721 )
this.layer1[470] = new Hitbox(13116,-17095,137,2381 )
this.layer1[471] = new Hitbox(12017,-15674,87,876 )
this.layer1[472] = new Hitbox(9114,-15674,2926,123 )
this.layer1[473] = new Hitbox(11839,-13655,1771,96 )
this.layer1[474] = new Hitbox(13532,-14272,96,718 )
this.layer1[475] = new Hitbox(13613,-14272,1759,89 )
this.layer1[476] = new Hitbox(14551,-15253,113,1027 )
this.layer1[477] = new Hitbox(14647,-15253,534,79 )
this.layer1[478] = new Hitbox(15087,-16228,94,1054 )
this.layer1[479] = new Hitbox(15087,-16230,1351,81 )
this.layer1[480] = new Hitbox(16362,-17496,75,1348 )
this.layer1[481] = new Hitbox(13225,-15967,918,113 )
this.layer1[482] = new Hitbox(14028,-16941,115,1087 )
this.layer1[483] = new Hitbox(14030,-16938,2400,83 )
this.layer1[484] = new Hitbox(13930,-15070,659,115 )
this.layer1[485] = new Hitbox(13930,-15877,83,922 )

}

Expand Down
228 changes: 228 additions & 0 deletions system/map-player/map/mapCarryers/DeathMap.js
View file

Large diffs are not rendered by default.

40 changes: 0 additions & 40 deletions system/map-player/map/mapCarryers/Doors.js
View file

This file was deleted.

88 changes: 88 additions & 0 deletions system/map-player/map/mapCarryers/Map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,93 @@ export class Map {
this.hitboxes[this.hitboxes.length] = new Hitbox(16843,-19040,3512,6090 )
this.hitboxes[this.hitboxes.length] = new Hitbox(21112,-23015,255,155 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22555,-24138,308,168 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22045,-23346,255,138 )
this.hitboxes[this.hitboxes.length] = new Hitbox(23194,-25090,183,157 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22290,-27446,279,918 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22889,-28021,442,1181 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22153,-27446,183,919 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22166,-28468,187,200 )
this.hitboxes[this.hitboxes.length] = new Hitbox(26206,-27021,677,349 )
this.hitboxes[this.hitboxes.length] = new Hitbox(26206,-27021,677,349 )
this.hitboxes[this.hitboxes.length] = new Hitbox(23189,-28887,200,153 )
this.hitboxes[this.hitboxes.length] = new Hitbox(23428,-31640,154,109 )
this.hitboxes[this.hitboxes.length] = new Hitbox(22387,-32142,157,111 )
this.hitboxes[this.hitboxes.length] = new Hitbox(20948,-31911,479,177 )
this.hitboxes[this.hitboxes.length] = new Hitbox(20950,-32253,147,517 )
this.hitboxes[this.hitboxes.length] = new Hitbox(21086,-32253,347,102 )
this.hitboxes[this.hitboxes.length] = new Hitbox(20709,-32253,377,519 )
this.hitboxes[this.hitboxes.length] = new Hitbox(27548,-28411,345,121 )
this.hitboxes[this.hitboxes.length] = new Hitbox(27780,-28550,113,260 )
this.hitboxes[this.hitboxes.length] = new Hitbox(27999,-29951,117,355, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(27654,-29955,126,353, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(27656,-30373,464,132, false, true )

this.hitboxes[this.hitboxes.length] = new Hitbox(28735,-30414,330,57, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(28808,-30975,247,58 )
this.hitboxes[this.hitboxes.length] = new Hitbox(27503,-31428,389,57 )
this.hitboxes[this.hitboxes.length] = new Hitbox(28437,-32315,279,75 )
this.hitboxes[this.hitboxes.length] = new Hitbox(27399,-31650,119,279 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29059,-32591,253,64 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29274,-32906,253,381 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29065,-32906,462,62 )
this.hitboxes[this.hitboxes.length] = new Hitbox(28895,-29212,187,149 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29077,-26221,170,55 )
this.hitboxes[this.hitboxes.length] = new Hitbox(28247,-25120,245,58 )
this.hitboxes[this.hitboxes.length] = new Hitbox(28876,-25518,119,117 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29367,-25579,259,68 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29023,-26142,228,55, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(29331,-24302,328,60 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29175,-25058,274,79 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29930,-25063,172,64 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30053,-25830,81,366 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30053,-25913,406,257 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30374,-25913,85,445 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29852,-24685,130,91 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29801,-29872,200,72 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30854,-29196,370,74 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31631,-29588,113,119 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29658,-31023,198,98 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30969,-31506,164,70 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30865,-31840,153,66 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30706,-32124,81,228 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30521,-32788,168,94 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30026,-33112,83,292 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29327,-33554,342,55 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29327,-33848,187,349 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29508,-33848,168,57 )
this.hitboxes[this.hitboxes.length] = new Hitbox(32314,-28866,204,136 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31691,-28344,157,117 )
this.hitboxes[this.hitboxes.length] = new Hitbox(32911,-29636,98,596 )
this.hitboxes[this.hitboxes.length] = new Hitbox(33570,-30307,170,109 )
this.hitboxes[this.hitboxes.length] = new Hitbox(33320,-30868,185,94 )
this.hitboxes[this.hitboxes.length] = new Hitbox(32641,-30993,455,60 )
this.hitboxes[this.hitboxes.length] = new Hitbox(32641,-31329,247,396 )
this.hitboxes[this.hitboxes.length] = new Hitbox(32881,-31329,219,53 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31890,-27859,347,70 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31582,-27735,236,106 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31585,-26799,289,81 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30757,-26366,258,200 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31562,-26251,77,402 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31628,-26251,419,204 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31971,-26066,75,219 )


this.hitboxes[this.hitboxes.length] = new Hitbox(23969,-30060,926,219, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(23972,-30743,932,168, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(23971,-31167,159,497, false, true )

this.hitboxes[this.hitboxes.length] = new Hitbox(26721,-27989,406,441, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(25354,-28392,1773,421, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(25357,-27559,561,1320, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(25356,-27605,1006,68, false, true )
this.hitboxes[this.hitboxes.length] = new Hitbox(26133,-27979,128,381, false, true, "D", 0,-1 )
this.hitboxes[this.hitboxes.length] = new Hitbox(25985,-27979,104,381, false, true, "E", 0,-1 )
this.hitboxes[this.hitboxes.length] = new Hitbox(25819,-27979,89,381, false, true, "F", 0,-1 )
this.hitboxes[this.hitboxes.length] = new Hitbox(25665,-27979,98,381, false, true, "G", 0,-1 )
this.hitboxes[this.hitboxes.length] = new Hitbox(25533,-27979,75,381, false, true, "H", 0,-1 )
this.hitboxes[this.hitboxes.length] = new Hitbox(25383,-27979,91,381, false, true, "I", 0,-1 )




this.stairs(11865,-2135,746,4, 200, 1)
Expand Down Expand Up @@ -303,6 +387,10 @@ export class Map {
this.hitboxes[this.hitboxes.length] = new Hitbox(-14874,6199,118,113 )
this.hitboxes[this.hitboxes.length] = new Hitbox(-14870,6729,115,118 )

this.hitboxes[this.hitboxes.length] = new Hitbox(1899,7138,1400,1816 )
this.hitboxes[this.hitboxes.length] = new Hitbox(6,5625,2000,2722 )
this.hitboxes[this.hitboxes.length] = new Hitbox(1764,5114,1550,1478 )
this.hitboxes[this.hitboxes.length] = new Hitbox(268,5114,3044,585 )



Expand Down
8 changes: 6 additions & 2 deletions system/map-player/map/mapCarryers/Teleport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ export class Teleport {
// 0, 0
//);

this.hitboxes[this.hitboxes.length] = new Hitbox(-16439,4729,445,146,false, 15812, -5161)
this.hitboxes[this.hitboxes.length] = new Hitbox(-16865,4757,421,104,false, 15812, -5161)
this.hitboxes[this.hitboxes.length] = new Hitbox(-17439,4729,574,132,false, 15812, -5161)
this.hitboxes[this.hitboxes.length] = new Hitbox(-17933,4729,494,122,false, 15812, -5161)

this.hitboxes[this.hitboxes.length] = new Hitbox(-16865,4757,421,104,false, -2607, -7134)
this.hitboxes[this.hitboxes.length] = new Hitbox(-16439,4729,445,146,false, -26327, 28442)
this.hitboxes[this.hitboxes.length] = new Hitbox(-15996,4729,593,151,false, -7888, 20589)

this.hitboxes[this.hitboxes.length] = new Hitbox(-15538,4875,141,490,false, 14991, -6661)
this.hitboxes[this.hitboxes.length] = new Hitbox(-14837,6204,85,563,false, 15812, -5161)

this.hitboxes[this.hitboxes.length] = new Hitbox(14105,-14842,270,326, false, -11143, 22107 )
this.hitboxes[this.hitboxes.length] = new Hitbox(11357,-26575,270,326, false, -11143, 22107 )

this.hitboxes[this.hitboxes.length] = new Hitbox(26428,-27213,226,213, false, -2607, -7134 )
this.hitboxes[this.hitboxes.length] = new Hitbox(1918,6470,217,726, false, -438, -511 )




Expand Down
12 changes: 12 additions & 0 deletions system/map-player/map/mapCarryers/Triggers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ export class Trigger {
this.hitboxes[this.hitboxes.length] = new Hitbox(6499,-21181,473,897, true, "door", "A", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(14105,-14842,270,326, true, "door", "B", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(11357,-26575,270,326, false, "door", "C", true )

this.hitboxes[this.hitboxes.length] = new Hitbox(21088,-32178,238,285, false, "door", "D", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(29147,-32868,151,294, false, "door", "E", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(30097,-25700,311,157, false, "door", "F", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(29449,-33820,160,285, false, "door", "G", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(32863,-31295,181,321, false, "door", "H", true )
this.hitboxes[this.hitboxes.length] = new Hitbox(31596,-26090,396,183, false, "door", "I", true )



this.hitboxes[this.hitboxes.length] = new Hitbox(26428,-27213,226,213, false, "door", "FINAL", true )




Expand Down
16 changes: 15 additions & 1 deletion system/map-player/map/mapCarryers/checkpoint.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,22 @@ export class Checkpoint {
this.hitboxes[this.hitboxes.length] = new Hitbox(11029,-22340,228,338 )
this.hitboxes[this.hitboxes.length] = new Hitbox(14477,-17248,276,91 )
this.hitboxes[this.hitboxes.length] = new Hitbox(16488,-21803,219,553 )
this.hitboxes[this.hitboxes.length] = new Hitbox(21088,-32178,238,285 )
this.hitboxes[this.hitboxes.length] = new Hitbox(23211,-25159,155,94 )
this.hitboxes[this.hitboxes.length] = new Hitbox(25419,-28440,1558,91 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29147,-32868,151,294 )
this.hitboxes[this.hitboxes.length] = new Hitbox(28812,-30512,159,115 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30097,-25700,311,157 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29466,-25693,111,126 )

this.hitboxes[this.hitboxes.length] = new Hitbox(30896,-31965,89,149 )
this.hitboxes[this.hitboxes.length] = new Hitbox(28935,-29364,108,166 )
this.hitboxes[this.hitboxes.length] = new Hitbox(29449,-33820,160,285 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31947,-27974,238,138 )
this.hitboxes[this.hitboxes.length] = new Hitbox(32863,-31295,181,321 )
this.hitboxes[this.hitboxes.length] = new Hitbox(30814,-26494,143,145 )
this.hitboxes[this.hitboxes.length] = new Hitbox(31596,-26090,396,183 )


/*
this.hitboxes[6] = new Hitbox(7824.600652535286,-594.7523150074721,370.9999875076246,473.92704492161954 )
this.hitboxes[3] = new Hitbox(6554.600640036759,-3115.8253071301892,394.02956252528475,226.461460671424 )
Expand Down
1 change: 1 addition & 0 deletions system/map-player/map/otherParts/Keys.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export class Keys {

this.drawImage(this.door,7030,-20273, 200, 200)
this.drawImage(this.door,11888+50,-21774, 200, 200) // 11357,-26575
this.drawImage(this.door,20865-50,-32125, 200, 200)

this.drawImage(this.door,14175 - 40,-14777,200,200)
this.drawImage(this.door,11357 + 40,-26575 + 70,200,200)
Expand Down
5 changes: 2 additions & 3 deletions system/variousParts/GameDisplayer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ export class GameDisplayer {
}
this.drawTheBeanPeople()

this.map.door.nDraw(this.camera);
this.map.lava.nDraw(this.camera);
this.map.checkpoint.nDraw(this.camera)
this.map.enabler.nDraw(this.camera);
Expand Down Expand Up @@ -192,8 +191,8 @@ export class GameDisplayer {
this.signTextPos = ((this.signDisplayPos * 12) + 800 )/ 13
}
}
this.drawUtils.Rect(0, 675 + this.signDisplayPos, 10000, 10000, "#33363f", uictx)
this.drawUtils.Rect(0, 700 + this.signDisplayPos, 10000, 10000, "#d8d8d8", uictx)
this.drawUtils.Rect(0, 675 + this.signDisplayPos, 2514, 1377 - 675, "#33363f", uictx)
this.drawUtils.Rect(0, 700 + this.signDisplayPos, 2514, 1377 - 700, "#d8d8d8", uictx)
for(let j = 0; j < 6; j++){
this.drawUtils.Text(this.signText[j], 100, (800 + (100 * j)) + this.signTextPos *(j/2 + 1),"#73767f", "#33363f", uictx)
}
Expand Down
82 changes: 0 additions & 82 deletions yoink.js
View file

This file was deleted.

0 comments on commit f375aee

Please sign in to comment.