RSV_Studio/surprise_dungeon
Archived
4
0
Fork 0
Code Activity

Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git

Browse source 
Conflicts:
	Surprise Dungeon.yyp
This commit is contained in:
sOlaris38 2020-12-06 20:01:54 +01:00
commit b42dd58782
13 changed files with 267 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Surprise Dungeon.yyp
View file

@ -8,31 +8,31 @@
{"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":8,}, {"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":8,},
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,}, {"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
{"id":{"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},"order":2,}, {"id":{"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},"order":2,},
{"id":{"name":"snHit","path":"sounds/snHit/snHit.yy",},"order":1,},
{"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,}, {"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,},
{"id":{"name":"rWin","path":"rooms/rWin/rWin.yy",},"order":14,}, {"id":{"name":"rWin","path":"rooms/rWin/rWin.yy",},"order":14,},
{"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,}, {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,},
{"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,}, {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
{"id":{"name":"snAttack","path":"sounds/snAttack/snAttack.yy",},"order":2,}, {"id":{"name":"oChest","path":"objects/oChest/oChest.yy",},"order":0,},
{"id":{"name":"oChest","path":"objects/oChest/oChest.yy",},"order":7,},
{"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":5,}, {"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":5,},
{"id":{"name":"r11","path":"rooms/r11/r11.yy",},"order":15,}, {"id":{"name":"r11","path":"rooms/r11/r11.yy",},"order":15,},
{"id":{"name":"rOver","path":"rooms/rOver/rOver.yy",},"order":13,}, {"id":{"name":"rOver","path":"rooms/rOver/rOver.yy",},"order":13,},
{"id":{"name":"snFond","path":"sounds/snFond/snFond.yy",},"order":0,},
{"id":{"name":"r8","path":"rooms/r8/r8.yy",},"order":9,}, {"id":{"name":"r8","path":"rooms/r8/r8.yy",},"order":9,},
{"id":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"order":3,}, {"id":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"order":0,},
{"id":{"name":"rType","path":"rooms/rType/rType.yy",},"order":0,}, {"id":{"name":"rType","path":"rooms/rType/rType.yy",},"order":0,},
{"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":1,}, {"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":1,},
{"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,}, {"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,},
{"id":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"order":3,}, {"id":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"order":3,},
{"id":{"name":"sFlamDetect","path":"sprites/sFlamDetect/sFlamDetect.yy",},"order":3,},
{"id":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"order":1,}, {"id":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"order":1,},
{"id":{"name":"oOver","path":"objects/oOver/oOver.yy",},"order":4,}, {"id":{"name":"oOver","path":"objects/oOver/oOver.yy",},"order":4,},
{"id":{"name":"r4","path":"rooms/r4/r4.yy",},"order":5,}, {"id":{"name":"r4","path":"rooms/r4/r4.yy",},"order":5,},
{"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":7,}, {"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":7,},
{"id":{"name":"sTransition","path":"sprites/sTransition/sTransition.yy",},"order":0,}, {"id":{"name":"sTransition","path":"sprites/sTransition/sTransition.yy",},"order":0,},
{"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,}, {"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,},
{"id":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"order":6,}, {"id":{"name":"oFire","path":"objects/oFire/oFire.yy",},"order":3,},
{"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":5,}, {"id":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"order":1,},
{"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":2,},
{"id":{"name":"snFond","path":"sounds/snFond/snFond.yy",},"order":0,},
{"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":1,}, {"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":1,},
{"id":{"name":"r2","path":"rooms/r2/r2.yy",},"order":3,}, {"id":{"name":"r2","path":"rooms/r2/r2.yy",},"order":3,},
{"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,}, {"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
@ -44,7 +44,9 @@
{"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":4,}, {"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":4,},
{"id":{"name":"sSkeletonR","path":"sprites/sSkeletonR/sSkeletonR.yy",},"order":1,}, {"id":{"name":"sSkeletonR","path":"sprites/sSkeletonR/sSkeletonR.yy",},"order":1,},
{"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":4,}, {"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":4,},
{"id":{"name":"snAttack","path":"sounds/snAttack/snAttack.yy",},"order":1,},
{"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,}, {"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,},
{"id":{"name":"snHit","path":"sounds/snHit/snHit.yy",},"order":2,},
{"id":{"name":"r5","path":"rooms/r5/r5.yy",},"order":6,}, {"id":{"name":"r5","path":"rooms/r5/r5.yy",},"order":6,},
{"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,}, {"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
{"id":{"name":"sMonsterMelee","path":"sprites/sMonsterMelee/sMonsterMelee.yy",},"order":0,}, {"id":{"name":"sMonsterMelee","path":"sprites/sMonsterMelee/sMonsterMelee.yy",},"order":0,},
@ -102,6 +104,8 @@
{"folderPath":"folders/Sprites/Player.yy","order":15,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/Player.yy","order":15,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/SpecialsSprite.yy","order":18,"resourceVersion":"1.0","name":"SpecialsSprite","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/SpecialsSprite.yy","order":18,"resourceVersion":"1.0","name":"SpecialsSprite","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/Decors.yy","order":19,"resourceVersion":"1.0","name":"Decors","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/Decors.yy","order":19,"resourceVersion":"1.0","name":"Decors","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/Item.yy","order":8,"resourceVersion":"1.0","name":"Item","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/SpecialCase.yy","order":9,"resourceVersion":"1.0","name":"SpecialCase","tags":[],"resourceType":"GMFolder",},
], ],
"AudioGroups": [ "AudioGroups": [
{"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",}, {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},

5
objects/oChest/oChest.yy
View file

@ -22,13 +22,12 @@
"physicsShapePoints": [], "physicsShapePoints": [],
"eventList": [ "eventList": [
{"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oChest","path":"objects/oChest/oChest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oChest","path":"objects/oChest/oChest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oChest","path":"objects/oChest/oChest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
], ],
"properties": [], "properties": [],
"overriddenProperties": [], "overriddenProperties": [],
"parent": { "parent": {
"name": "Objects", "name": "Item",
"path": "folders/Objects.yy", "path": "folders/Objects/Item.yy",
}, },
"resourceVersion": "1.0", "resourceVersion": "1.0",
"name": "oChest", "name": "oChest",

31
objects/oFire/oFire.yy Normal file
View file

@ -0,0 +1,31 @@
{
"spriteId": null,
"solid": false,
"visible": true,
"spriteMaskId": null,
"persistent": false,
"parentObjectId": null,
"physicsObject": false,
"physicsSensor": false,
"physicsShape": 1,
"physicsGroup": 1,
"physicsDensity": 0.5,
"physicsRestitution": 0.1,
"physicsLinearDamping": 0.1,
"physicsAngularDamping": 0.1,
"physicsFriction": 0.2,
"physicsStartAwake": true,
"physicsKinematic": false,
"physicsShapePoints": [],
"eventList": [],
"properties": [],
"overriddenProperties": [],
"parent": {
"name": "SpecialCase",
"path": "folders/Objects/SpecialCase.yy",
},
"resourceVersion": "1.0",
"name": "oFire",
"tags": [],
"resourceType": "GMObject",
}

4
objects/oMaudit/oMaudit.yy
View file

@ -26,8 +26,8 @@
"properties": [], "properties": [],
"overriddenProperties": [], "overriddenProperties": [],
"parent": { "parent": {
"name": "Objects", "name": "Item",
"path": "folders/Objects.yy", "path": "folders/Objects/Item.yy",
}, },
"resourceVersion": "1.0", "resourceVersion": "1.0",
"name": "oMaudit", "name": "oMaudit",

4
objects/oTransition/oTransition.yy
View file

@ -30,8 +30,8 @@
], ],
"overriddenProperties": [], "overriddenProperties": [],
"parent": { "parent": {
"name": "Objects", "name": "SpecialCase",
"path": "folders/Objects.yy", "path": "folders/Objects/SpecialCase.yy",
}, },
"resourceVersion": "1.0", "resourceVersion": "1.0",
"name": "oTransition", "name": "oTransition",

4
objects/oTrou/oTrou.yy
View file

@ -26,8 +26,8 @@
"properties": [], "properties": [],
"overriddenProperties": [], "overriddenProperties": [],
"parent": { "parent": {
"name": "Objects", "name": "SpecialCase",
"path": "folders/Objects.yy", "path": "folders/Objects/SpecialCase.yy",
}, },
"resourceVersion": "1.0", "resourceVersion": "1.0",
"name": "oTrou", "name": "oTrou",

4
objects/oWall/oWall.yy
View file

@ -24,8 +24,8 @@
"properties": [], "properties": [],
"overriddenProperties": [], "overriddenProperties": [],
"parent": { "parent": {
"name": "Objects", "name": "SpecialCase",
"path": "folders/Objects.yy", "path": "folders/Objects/SpecialCase.yy",
}, },
"resourceVersion": "1.0", "resourceVersion": "1.0",
"name": "oWall", "name": "oWall",

2
sounds/snAttack/snAttack.yy
View file

@ -1,6 +1,6 @@
{ {
"compression": 0, "compression": 0,
"volume": 0.6, "volume": 0.44,
"preload": false, "preload": false,
"bitRate": 128, "bitRate": 128,
"sampleRate": 44100, "sampleRate": 44100,

2
sounds/snFond/snFond.yy
View file

@ -1,6 +1,6 @@
{ {
"compression": 0, "compression": 0,
"volume": 0.15, "volume": 0.2,
"preload": false, "preload": false,
"bitRate": 128, "bitRate": 128,
"sampleRate": 44100, "sampleRate": 44100,

2
sounds/snHit/snHit.yy
View file

@ -1,6 +1,6 @@
{ {
"compression": 0, "compression": 0,
"volume": 0.37, "volume": 0.3,
"preload": false, "preload": false,
"bitRate": 128, "bitRate": 128,
"sampleRate": 44100, "sampleRate": 44100,

BIN
sprites/sFlamDetect/281c6d9f-c99e-449e-95e4-ff13e798ffaf.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 203 B

BIN
sprites/sFlamDetect/layers/281c6d9f-c99e-449e-95e4-ff13e798ffaf/17fbaacd-e890-480f-bba7-e3d79bbf5469.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 203 B

78
sprites/sFlamDetect/sFlamDetect.yy Normal file
View file

@ -0,0 +1,78 @@
{
"bboxMode": 0,
"collisionKind": 1,
"type": 0,
"origin": 0,
"preMultiplyAlpha": false,
"edgeFiltering": false,
"collisionTolerance": 0,
"swfPrecision": 2.525,
"bbox_left": 0,
"bbox_right": 0,
"bbox_top": 0,
"bbox_bottom": 0,
"HTile": false,
"VTile": false,
"For3D": false,
"width": 64,
"height": 64,
"textureGroupId": {
"name": "Default",
"path": "texturegroups/Default",
},
"swatchColours": null,
"gridX": 0,
"gridY": 0,
"frames": [
{"compositeImage":{"FrameId":{"name":"281c6d9f-c99e-449e-95e4-ff13e798ffaf","path":"sprites/sFlamDetect/sFlamDetect.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
{"FrameId":{"name":"281c6d9f-c99e-449e-95e4-ff13e798ffaf","path":"sprites/sFlamDetect/sFlamDetect.yy",},"LayerId":{"name":"17fbaacd-e890-480f-bba7-e3d79bbf5469","path":"sprites/sFlamDetect/sFlamDetect.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
],"parent":{"name":"sFlamDetect","path":"sprites/sFlamDetect/sFlamDetect.yy",},"resourceVersion":"1.0","name":"281c6d9f-c99e-449e-95e4-ff13e798ffaf","tags":[],"resourceType":"GMSpriteFrame",},
],
"sequence": {
"spriteId": {"name":"sFlamDetect","path":"sprites/sFlamDetect/sFlamDetect.yy",},
"timeUnits": 1,
"playback": 1,
"playbackSpeed": 30.0,
"playbackSpeedType": 0,
"autoRecord": true,
"volume": 1.0,
"length": 1.0,
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
"tracks": [
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
{"id":"9eb59bed-4646-4eea-a0f7-ba53644624ff","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"281c6d9f-c99e-449e-95e4-ff13e798ffaf","path":"sprites/sFlamDetect/sFlamDetect.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
],
"visibleRange": null,
"lockOrigin": false,
"showBackdrop": true,
"showBackdropImage": false,
"backdropImagePath": "",
"backdropImageOpacity": 0.5,
"backdropWidth": 1366,
"backdropHeight": 768,
"backdropXOffset": 0.0,
"backdropYOffset": 0.0,
"xorigin": 0,
"yorigin": 0,
"eventToFunction": {},
"eventStubScript": null,
"parent": {"name":"sFlamDetect","path":"sprites/sFlamDetect/sFlamDetect.yy",},
"resourceVersion": "1.3",
"name": "sFlamDetect",
"tags": [],
"resourceType": "GMSequence",
},
"layers": [
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"17fbaacd-e890-480f-bba7-e3d79bbf5469","tags":[],"resourceType":"GMImageLayer",},
],
"parent": {
"name": "SpecialsSprite",
"path": "folders/Sprites/SpecialsSprite.yy",
},
"resourceVersion": "1.0",
"name": "sFlamDetect",
"tags": [],
"resourceType": "GMSprite",
}