From 13b830dd7efb716b6e6e8e037f469c69274d3669 Mon Sep 17 00:00:00 2001
From: Andrew Sliwinski <andrewsliwinski@acm.org>
Date: Thu, 21 Jun 2018 17:07:01 -0400
Subject: [PATCH] Various fixes from PR review
---
src/lib/libraries/backdrops.json | 6 +-
src/lib/libraries/costumes.json | 97 +++++++++++++--------
src/lib/libraries/sprites.json | 140 ++++++++++++++++++++++++-------
3 files changed, 176 insertions(+), 67 deletions(-)
diff --git a/src/lib/libraries/backdrops.json b/src/lib/libraries/backdrops.json
index 2af538993..014568cf4 100644
--- a/src/lib/libraries/backdrops.json
+++ b/src/lib/libraries/backdrops.json
@@ -246,8 +246,8 @@
]
},
{
- "name": "Jurassic ",
- "md5": "2d59bed41204445ae9dbcb963b8da14f.svg",
+ "name": "Jurassic",
+ "md5": "ad5bd6c10d2afb79d298817ec24a47fd.svg",
"type": "backdrop",
"tags": [
"outdoors",
@@ -603,7 +603,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"outdoors",
"haunted",
"forest",
diff --git a/src/lib/libraries/costumes.json b/src/lib/libraries/costumes.json
index 5ea06cb69..37dcce456 100644
--- a/src/lib/libraries/costumes.json
+++ b/src/lib/libraries/costumes.json
@@ -432,17 +432,17 @@
},
{
"name": "Baseball",
- "md5": "6e13ef53885d2cfca9a54cc5c3f6c20f.svg",
+ "md5": "ae05a2a1fc22ce5929b8a67f695bfc9c.svg",
"type": "costume",
"tags": [
+ "baseball",
"sports",
- "round",
- "summer",
- "things"
+ "ball",
+ "alex eben meyer"
],
"info": [
- 34,
- 31,
+ 28,
+ 28,
1
]
},
@@ -468,7 +468,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bat",
"animals",
"alex eben meyer"
@@ -486,7 +486,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bat",
"animals",
"alex eben meyer"
@@ -504,7 +504,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bat",
"animals",
"alex eben meyer"
@@ -522,7 +522,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bat",
"animals",
"alex eben meyer"
@@ -1514,20 +1514,17 @@
},
{
"name": "Cat2",
- "md5": "3696356a03a8d938318876a593572843.svg",
+ "md5": "01ae57fd339529445cb890978ef8a054.svg",
"type": "costume",
"tags": [
- "animals",
- "cat",
- "kitten",
"kitty",
- "mammal",
- "orange",
- "scratch cat"
+ "kitten",
+ "animals",
+ "mammal"
],
"info": [
- 47,
- 55,
+ 87,
+ 39,
1
]
},
@@ -3256,7 +3253,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"frankenstein",
"monster",
"alex eben meyer"
@@ -3274,7 +3271,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"frankenstein",
"monster",
"alex eben meyer"
@@ -3292,7 +3289,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"frankenstein",
"monster",
"alex eben meyer"
@@ -3310,7 +3307,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"frankenstein",
"monster",
"alex eben meyer"
@@ -3360,7 +3357,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"ghoul",
"monster",
"alex eben meyer"
@@ -3378,7 +3375,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"ghoul",
"monster",
"alex eben meyer"
@@ -3396,7 +3393,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"ghoul",
"monster",
"alex eben meyer"
@@ -3414,7 +3411,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"ghoul",
"monster",
"alex eben meyer"
@@ -6613,6 +6610,38 @@
},
{
"name": "Shark-a",
+ "md5": "4ca6776e9c021e8b21c3346793c9361d.svg",
+ "type": "costume",
+ "tags": [
+ "animals",
+ "underwater",
+ "ipzy",
+ "fish"
+ ],
+ "info": [
+ 150,
+ 60,
+ 1
+ ]
+ },
+ {
+ "name": "Shark-b",
+ "md5": "0bb623f0bbec53ee9667cee0b7ad6d47.svg",
+ "type": "costume",
+ "tags": [
+ "animals",
+ "underwater",
+ "ipzy",
+ "fish"
+ ],
+ "info": [
+ 150,
+ 60,
+ 1
+ ]
+ },
+ {
+ "name": "Shark2-a",
"md5": "7c0a907eae79462f69f8e2af8e7df828.svg",
"type": "costume",
"tags": [
@@ -6631,7 +6660,7 @@
]
},
{
- "name": "Shark-b",
+ "name": "Shark2-b",
"md5": "cff9ae87a93294693a0650b38a7a33d2.svg",
"type": "costume",
"tags": [
@@ -6650,7 +6679,7 @@
]
},
{
- "name": "Shark-c",
+ "name": "Shark2-c",
"md5": "afeae3f998598424f7c50918507f6ce6.svg",
"type": "costume",
"tags": [
@@ -6817,7 +6846,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bones",
"monster",
"alex eben meyer"
@@ -6835,7 +6864,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bones",
"monster",
"alex eben meyer"
@@ -6853,7 +6882,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bones",
"monster",
"alex eben meyer"
@@ -6871,7 +6900,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bones",
"monster",
"alex eben meyer"
@@ -6889,7 +6918,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bones",
"monster",
"alex eben meyer"
diff --git a/src/lib/libraries/sprites.json b/src/lib/libraries/sprites.json
index b03b2c517..966d9be3a 100644
--- a/src/lib/libraries/sprites.json
+++ b/src/lib/libraries/sprites.json
@@ -539,13 +539,13 @@
},
{
"name": "Baseball",
- "md5": "6e13ef53885d2cfca9a54cc5c3f6c20f.svg",
+ "md5": "ae05a2a1fc22ce5929b8a67f695bfc9c.svg",
"type": "sprite",
"tags": [
+ "baseball",
"sports",
- "round",
- "summer",
- "things"
+ "ball",
+ "alex eben meyer"
],
"info": [
0,
@@ -568,15 +568,15 @@
{
"costumeName": "baseball",
"baseLayerID": -1,
- "baseLayerMD5": "6e13ef53885d2cfca9a54cc5c3f6c20f.svg",
+ "baseLayerMD5": "ae05a2a1fc22ce5929b8a67f695bfc9c.svg",
"bitmapResolution": 1,
- "rotationCenterX": 34,
- "rotationCenterY": 31
+ "rotationCenterX": 28,
+ "rotationCenterY": 28
}
],
"currentCostumeIndex": 0,
- "scratchX": 49,
- "scratchY": -23,
+ "scratchX": 173,
+ "scratchY": -89,
"scale": 1,
"direction": 90,
"rotationStyle": "normal",
@@ -639,7 +639,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bat",
"animals",
"alex eben meyer"
@@ -4764,7 +4764,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"frankenstein",
"monster",
"alex eben meyer"
@@ -4934,7 +4934,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"ghoul",
"monster",
"alex eben meyer"
@@ -10319,6 +10319,62 @@
},
{
"name": "Shark",
+ "md5": "4ca6776e9c021e8b21c3346793c9361d.svg",
+ "type": "sprite",
+ "tags": [
+ "animals",
+ "underwater",
+ "ipzy",
+ "fish"
+ ],
+ "info": [
+ 0,
+ 2,
+ 1
+ ],
+ "json": {
+ "objName": "Shark",
+ "sounds": [
+ {
+ "soundName": "pop",
+ "soundID": -1,
+ "md5": "83a9787d4cb6f3b7632b4ddfebf74367.wav",
+ "sampleCount": 258,
+ "rate": 11025,
+ "format": ""
+ }
+ ],
+ "costumes": [
+ {
+ "costumeName": "shark-a",
+ "baseLayerID": 8,
+ "baseLayerMD5": "4ca6776e9c021e8b21c3346793c9361d.svg",
+ "bitmapResolution": 1,
+ "rotationCenterX": 150,
+ "rotationCenterY": 60
+ },
+ {
+ "costumeName": "shark-b",
+ "baseLayerID": 9,
+ "baseLayerMD5": "0bb623f0bbec53ee9667cee0b7ad6d47.svg",
+ "bitmapResolution": 1,
+ "rotationCenterX": 150,
+ "rotationCenterY": 60
+ }
+ ],
+ "currentCostumeIndex": 0,
+ "scratchX": -5,
+ "scratchY": 54,
+ "scale": 1,
+ "direction": 90,
+ "rotationStyle": "normal",
+ "isDraggable": false,
+ "visible": true,
+ "spriteInfo": {}
+ }
+ },
+ {
+ "name": "Shark 2",
"md5": "7c0a907eae79462f69f8e2af8e7df828.svg",
"type": "sprite",
"tags": [
@@ -10336,7 +10392,7 @@
1
],
"json": {
- "objName": "Shark",
+ "objName": "Shark 2",
"sounds": [
{
"soundName": "pop",
@@ -10349,7 +10405,7 @@
],
"costumes": [
{
- "costumeName": "shark-a",
+ "costumeName": "shark2-a",
"baseLayerID": -1,
"baseLayerMD5": "7c0a907eae79462f69f8e2af8e7df828.svg",
"bitmapResolution": 1,
@@ -10357,7 +10413,7 @@
"rotationCenterY": 75
},
{
- "costumeName": "shark-b",
+ "costumeName": "shark2-b",
"baseLayerID": -1,
"baseLayerMD5": "cff9ae87a93294693a0650b38a7a33d2.svg",
"bitmapResolution": 1,
@@ -10365,7 +10421,7 @@
"rotationCenterY": 75
},
{
- "costumeName": "shark-c",
+ "costumeName": "shark2-c",
"baseLayerID": -1,
"baseLayerMD5": "afeae3f998598424f7c50918507f6ce6.svg",
"bitmapResolution": 1,
@@ -10778,7 +10834,7 @@
"tags": [
"fantasy",
"spooky",
- "holloween",
+ "halloween",
"bones",
"monster",
"alex eben meyer"
@@ -12513,19 +12569,19 @@
},
{
"name": "Witch",
- "md5": "c991196a708294535a1dbdce7189c23c.svg",
+ "md5": "cbc54e15cd62f0c16369587377636099.svg",
"type": "sprite",
"tags": [
"fantasy",
- "broom",
- "wart",
- "flying",
- "hat",
+ "people",
+ "ipzy",
+ "castle",
+ "emotions",
"magic"
],
"info": [
0,
- 1,
+ 4,
1
],
"json": {
@@ -12542,17 +12598,41 @@
],
"costumes": [
{
- "costumeName": "witch",
- "baseLayerID": -1,
- "baseLayerMD5": "c991196a708294535a1dbdce7189c23c.svg",
+ "costumeName": "witch-a",
+ "baseLayerID": 36,
+ "baseLayerMD5": "cbc54e15cd62f0c16369587377636099.svg",
"bitmapResolution": 1,
- "rotationCenterX": 74,
- "rotationCenterY": 59
+ "rotationCenterX": 65,
+ "rotationCenterY": 140
+ },
+ {
+ "costumeName": "witch-b",
+ "baseLayerID": 37,
+ "baseLayerMD5": "64d2c4c51e6cb6008cd5e93f77e6f591.svg",
+ "bitmapResolution": 1,
+ "rotationCenterX": 65,
+ "rotationCenterY": 140
+ },
+ {
+ "costumeName": "witch-c",
+ "baseLayerID": 38,
+ "baseLayerMD5": "00b768c3da5b4ee3efddf05d1eb88de2.svg",
+ "bitmapResolution": 1,
+ "rotationCenterX": 65,
+ "rotationCenterY": 140
+ },
+ {
+ "costumeName": "witch-d",
+ "baseLayerID": 39,
+ "baseLayerMD5": "4fe4c0ee34a9028f2c6988b7294a61c1.svg",
+ "bitmapResolution": 1,
+ "rotationCenterX": 65,
+ "rotationCenterY": 140
}
],
"currentCostumeIndex": 0,
- "scratchX": -86,
- "scratchY": -49,
+ "scratchX": -47,
+ "scratchY": 33,
"scale": 1,
"direction": 90,
"rotationStyle": "normal",
--
GitLab