diff --git a/objects/oMonster/Create_0.gml b/objects/oMonster/Create_0.gml index a0d1365..16ccb34 100644 --- a/objects/oMonster/Create_0.gml +++ b/objects/oMonster/Create_0.gml @@ -7,4 +7,9 @@ dir = 3; pv = 5; -attack = 1; \ No newline at end of file +attack = 1; + +enum typeMelee { + squelette, + blob +} \ No newline at end of file diff --git a/objects/oMonsterMelee/Create_0.gml b/objects/oMonsterMelee/Create_0.gml new file mode 100644 index 0000000..f966d8f --- /dev/null +++ b/objects/oMonsterMelee/Create_0.gml @@ -0,0 +1,17 @@ +event_inherited(); +randomize(); + +monType = choose(typeMelee.squelette, typeMelee.blob); +image_speed = 1; + +switch (monType) { + case typeMelee.squelette: + attack = 10; + sprite_index = sSkeletonR; + break; + case typeMelee.blob: + sprite_index = sBlobR; + break; + default: + break; +} \ No newline at end of file diff --git a/objects/oMonsterMelee/oMonsterMelee.yy b/objects/oMonsterMelee/oMonsterMelee.yy index 2ccb070..2e3e6f6 100644 --- a/objects/oMonsterMelee/oMonsterMelee.yy +++ b/objects/oMonsterMelee/oMonsterMelee.yy @@ -1,37 +1,39 @@ -{ - "spriteId": { - "name": "sMonsterMelee", - "path": "sprites/sMonsterMelee/sMonsterMelee.yy", - }, - "solid": false, - "visible": true, - "spriteMaskId": null, - "persistent": false, - "parentObjectId": { - "name": "oMonster", - "path": "objects/oMonster/oMonster.yy", - }, - "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": "Entity", - "path": "folders/Objects/Entity.yy", - }, - "resourceVersion": "1.0", - "name": "oMonsterMelee", - "tags": [], - "resourceType": "GMObject", +{ + "spriteId": { + "name": "sMonsterMelee", + "path": "sprites/sMonsterMelee/sMonsterMelee.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "oMonster", + "path": "objects/oMonster/oMonster.yy", + }, + "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": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Entity", + "path": "folders/Objects/Entity.yy", + }, + "resourceVersion": "1.0", + "name": "oMonsterMelee", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file