Skip to content

Commit c618fac

Browse files
lidavidmlidavidm
authored
Merge pull request #119 from HaliteChallenge/hallotheme
Hallotheme
2 parents 7c82f6a + 87bf8ae commit c618fac

File tree

4 files changed

+383
-0
lines changed

4 files changed

+383
-0
lines changed

‎libhaliteviz/assets/hallotheme.json‎

Lines changed: 335 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,335 @@
1+
{
2+
"frames": {
3+
"bat_green_1.png": {
4+
"frame": {
5+
"x": 1,
6+
"y": 1,
7+
"w": 215,
8+
"h": 215
9+
},
10+
"rotated": false,
11+
"trimmed": false,
12+
"spriteSourceSize": {
13+
"x": 0,
14+
"y": 0,
15+
"w": 215,
16+
"h": 215
17+
},
18+
"sourceSize": {
19+
"w": 215,
20+
"h": 215
21+
}
22+
},
23+
"bat_green_3.png": {
24+
"frame": {
25+
"x": 218,
26+
"y": 1,
27+
"w": 215,
28+
"h": 215
29+
},
30+
"rotated": false,
31+
"trimmed": false,
32+
"spriteSourceSize": {
33+
"x": 0,
34+
"y": 0,
35+
"w": 215,
36+
"h": 215
37+
},
38+
"sourceSize": {
39+
"w": 215,
40+
"h": 215
41+
}
42+
},
43+
"bat_green_2.png": {
44+
"frame": {
45+
"x": 435,
46+
"y": 1,
47+
"w": 215,
48+
"h": 215
49+
},
50+
"rotated": false,
51+
"trimmed": false,
52+
"spriteSourceSize": {
53+
"x": 0,
54+
"y": 0,
55+
"w": 215,
56+
"h": 215
57+
},
58+
"sourceSize": {
59+
"w": 215,
60+
"h": 215
61+
}
62+
},
63+
"greenbase.png": {
64+
"frame": {
65+
"x": 652,
66+
"y": 1,
67+
"w": 184,
68+
"h": 187
69+
},
70+
"rotated": false,
71+
"trimmed": false,
72+
"spriteSourceSize": {
73+
"x": 0,
74+
"y": 0,
75+
"w": 184,
76+
"h": 187
77+
},
78+
"sourceSize": {
79+
"w": 184,
80+
"h": 187
81+
}
82+
},
83+
"bat_orange_1.png": {
84+
"frame": {
85+
"x": 1,
86+
"y": 218,
87+
"w": 215,
88+
"h": 215
89+
},
90+
"rotated": false,
91+
"trimmed": false,
92+
"spriteSourceSize": {
93+
"x": 0,
94+
"y": 0,
95+
"w": 215,
96+
"h": 215
97+
},
98+
"sourceSize": {
99+
"w": 215,
100+
"h": 215
101+
}
102+
},
103+
"bat_orange_3.png": {
104+
"frame": {
105+
"x": 218,
106+
"y": 218,
107+
"w": 215,
108+
"h": 215
109+
},
110+
"rotated": false,
111+
"trimmed": false,
112+
"spriteSourceSize": {
113+
"x": 0,
114+
"y": 0,
115+
"w": 215,
116+
"h": 215
117+
},
118+
"sourceSize": {
119+
"w": 215,
120+
"h": 215
121+
}
122+
},
123+
"bat_orange_2.png": {
124+
"frame": {
125+
"x": 435,
126+
"y": 218,
127+
"w": 215,
128+
"h": 215
129+
},
130+
"rotated": false,
131+
"trimmed": false,
132+
"spriteSourceSize": {
133+
"x": 0,
134+
"y": 0,
135+
"w": 215,
136+
"h": 215
137+
},
138+
"sourceSize": {
139+
"w": 215,
140+
"h": 215
141+
}
142+
},
143+
"orangebase.png": {
144+
"frame": {
145+
"x": 652,
146+
"y": 190,
147+
"w": 184,
148+
"h": 187
149+
},
150+
"rotated": false,
151+
"trimmed": false,
152+
"spriteSourceSize": {
153+
"x": 0,
154+
"y": 0,
155+
"w": 184,
156+
"h": 187
157+
},
158+
"sourceSize": {
159+
"w": 184,
160+
"h": 187
161+
}
162+
},
163+
"bat_purp_1.png": {
164+
"frame": {
165+
"x": 1,
166+
"y": 435,
167+
"w": 215,
168+
"h": 215
169+
},
170+
"rotated": false,
171+
"trimmed": false,
172+
"spriteSourceSize": {
173+
"x": 0,
174+
"y": 0,
175+
"w": 215,
176+
"h": 215
177+
},
178+
"sourceSize": {
179+
"w": 215,
180+
"h": 215
181+
}
182+
},
183+
"bat_purp_3.png": {
184+
"frame": {
185+
"x": 218,
186+
"y": 435,
187+
"w": 215,
188+
"h": 215
189+
},
190+
"rotated": false,
191+
"trimmed": false,
192+
"spriteSourceSize": {
193+
"x": 0,
194+
"y": 0,
195+
"w": 215,
196+
"h": 215
197+
},
198+
"sourceSize": {
199+
"w": 215,
200+
"h": 215
201+
}
202+
},
203+
"bat_purp_2.png": {
204+
"frame": {
205+
"x": 435,
206+
"y": 435,
207+
"w": 215,
208+
"h": 215
209+
},
210+
"rotated": false,
211+
"trimmed": false,
212+
"spriteSourceSize": {
213+
"x": 0,
214+
"y": 0,
215+
"w": 215,
216+
"h": 215
217+
},
218+
"sourceSize": {
219+
"w": 215,
220+
"h": 215
221+
}
222+
},
223+
"purpbase.png": {
224+
"frame": {
225+
"x": 652,
226+
"y": 379,
227+
"w": 184,
228+
"h": 187
229+
},
230+
"rotated": false,
231+
"trimmed": false,
232+
"spriteSourceSize": {
233+
"x": 0,
234+
"y": 0,
235+
"w": 184,
236+
"h": 187
237+
},
238+
"sourceSize": {
239+
"w": 184,
240+
"h": 187
241+
}
242+
},
243+
"bat_white_1.png": {
244+
"frame": {
245+
"x": 838,
246+
"y": 1,
247+
"w": 215,
248+
"h": 215
249+
},
250+
"rotated": false,
251+
"trimmed": false,
252+
"spriteSourceSize": {
253+
"x": 0,
254+
"y": 0,
255+
"w": 215,
256+
"h": 215
257+
},
258+
"sourceSize": {
259+
"w": 215,
260+
"h": 215
261+
}
262+
},
263+
"bat_white_3.png": {
264+
"frame": {
265+
"x": 838,
266+
"y": 218,
267+
"w": 215,
268+
"h": 215
269+
},
270+
"rotated": false,
271+
"trimmed": false,
272+
"spriteSourceSize": {
273+
"x": 0,
274+
"y": 0,
275+
"w": 215,
276+
"h": 215
277+
},
278+
"sourceSize": {
279+
"w": 215,
280+
"h": 215
281+
}
282+
},
283+
"bat_white_2.png": {
284+
"frame": {
285+
"x": 838,
286+
"y": 435,
287+
"w": 215,
288+
"h": 215
289+
},
290+
"rotated": false,
291+
"trimmed": false,
292+
"spriteSourceSize": {
293+
"x": 0,
294+
"y": 0,
295+
"w": 215,
296+
"h": 215
297+
},
298+
"sourceSize": {
299+
"w": 215,
300+
"h": 215
301+
}
302+
},
303+
"whitebase.png": {
304+
"frame": {
305+
"x": 1,
306+
"y": 652,
307+
"w": 184,
308+
"h": 187
309+
},
310+
"rotated": false,
311+
"trimmed": false,
312+
"spriteSourceSize": {
313+
"x": 0,
314+
"y": 0,
315+
"w": 184,
316+
"h": 187
317+
},
318+
"sourceSize": {
319+
"w": 184,
320+
"h": 187
321+
}
322+
}
323+
},
324+
"meta": {
325+
"app": "http://www.codeandweb.com/texturepacker",
326+
"version": "1.0",
327+
"image": "spritesheet.png",
328+
"format": "RGBA8888",
329+
"size": {
330+
"w": 1054,
331+
"h": 840
332+
},
333+
"scale": "1"
334+
}
335+
}

‎libhaliteviz/assets/hallotheme.png‎

162 KB
Loading

‎libhaliteviz/src/assets.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,40 @@ export function setAssetRoot(path) {
236236
BASE_SPRITES.push(sheet.textures["gt.png"]);
237237
}));
238238
}
239+
else if (theme.selectedTheme === "Halloween") {
240+
promises.push(loadSpritesheet(
241+
require("../assets/hallotheme.json"),
242+
ASSET_ROOT + require("../assets/hallotheme.png"),
243+
).then((sheet) => {
244+
SHEETS.push(sheet);
245+
246+
BASE_SPRITES.push(sheet.textures["greenbase.png"]);
247+
BASE_SPRITES.push(sheet.textures["orangebase.png"]);
248+
BASE_SPRITES.push(sheet.textures["purpbase.png"]);
249+
BASE_SPRITES.push(sheet.textures["whitebase.png"]);
250+
251+
TURTLE_SPRITES.push([
252+
sheet.textures["bat_green_3.png"],
253+
sheet.textures["bat_green_2.png"],
254+
sheet.textures["bat_green_1.png"],
255+
]);
256+
TURTLE_SPRITES.push([
257+
sheet.textures["bat_orange_3.png"],
258+
sheet.textures["bat_orange_2.png"],
259+
sheet.textures["bat_orange_1.png"],
260+
]);
261+
TURTLE_SPRITES.push([
262+
sheet.textures["bat_purp_3.png"],
263+
sheet.textures["bat_purp_2.png"],
264+
sheet.textures["bat_purp_1.png"],
265+
]);
266+
TURTLE_SPRITES.push([
267+
sheet.textures["bat_white_3.png"],
268+
sheet.textures["bat_white_2.png"],
269+
sheet.textures["bat_white_1.png"],
270+
]);
271+
}));
272+
}
239273
else {
240274
promises.push(loadSpritesheet(
241275
require("../assets/turtle.json"),

‎libhaliteviz/src/theme.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,20 @@ export const THEMES = {
7272
playerColors: [0x800000, 0x008000, 0x808000, 0x800080],
7373
colorTheme: "ANSI",
7474
},
75+
"Halloween": {
76+
tintFactory: false,
77+
tintShip: false,
78+
rotateShip: true,
79+
scaleMapSprite: true,
80+
bloom: true,
81+
scale: {
82+
ship: 1,
83+
base: 1,
84+
dropoff: 1,
85+
},
86+
playerColors: [0x16FF05, 0xFF7B05, 0xdA05FF, 0xcdcdcd],
87+
colorTheme: "Colorblind",
88+
},
7589
};
7690

7791

0 commit comments

Comments
 (0)