Skip to content

Commit 82c8299

Browse files
dycerondyceron
authored
Merge pull request #12 from MetroidPrimeModding/dev
Renamed internal files
2 parents 49fe0da + 4cffc61 commit 82c8299

File tree

5 files changed

+136
-136
lines changed

5 files changed

+136
-136
lines changed

‎electron/mainForm.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ function goToFullP(w) {
150150
/* function goToSimple1(w) {
151151
w = w || mainWindow;
152152
w.setSize(400, 511)
153-
w.loadURL('file://' + __dirname + '/../html/simple-prime1-full-alt.html');
153+
w.loadURL('file://' + __dirname + '/../html/simple-prime1-simple.html');
154154
} */
155155

156156
function goToCompactP(w) {
157157
w = w || mainWindow;
158158
w.setSize(496, 320)
159-
w.loadURL('file://' + __dirname + '/../html/simple-prime1-simplified.html');
159+
w.loadURL('file://' + __dirname + '/../html/simple-prime1-compact.html');
160160
}
161161

162162
function goToExpansionsP(w) {
@@ -174,7 +174,7 @@ function goToFullE(w) {
174174
/* function goToSimplifiedE(w) {
175175
w = w || mainWindow;
176176
w.setSize(496, 360)
177-
w.loadURL('file://' + __dirname + '/../html/simple-prime2-simplified.html');
177+
w.loadURL('file://' + __dirname + '/../html/simple-prime2-simple.html');
178178
}*/
179179

180180
function goToCompactE(w) {

‎html/simple-prime1-compact.html‎

Lines changed: 18 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -22,92 +22,32 @@
2222
<script type="text/javascript" src="../libs/webcomponents-lite.js"></script>
2323
<script type="text/javascript" src="../js/simple-tracker.js"></script>
2424
<link type="text/css" rel="stylesheet" href="../css/simple-tracker.css"/>
25-
<link type="text/css" rel="stylesheet" href="../css/simple-tracker-prime1-simple.css"/>
25+
<link type="text/css" rel="stylesheet" href="../css/simple-tracker-prime1-game.css"/>
2626
<title>Prime Item Tracker</title>
2727
</head>
2828
<body>
2929
<div center>
3030
<div flex-column>
3131
<div flex-row>
32-
<item-counter big item="etank-count" max="14">
33-
<span counter></span>
34-
</item-counter>
35-
<item-counter big item="missile-count" max="250" increment="5">
36-
<span counter></span>
37-
</item-counter>
38-
<item-counter big item="pb-count" max="8">
39-
<span counter></span>
40-
</item-counter>
41-
</div>
42-
<div flex-row>
43-
<item-counter item="missile"></item-counter>
44-
<item-counter item="super-missile"></item-counter>
45-
<item-counter item="wavebuster"></item-counter>
46-
<item-counter item="ice-spreader"></item-counter>
47-
<item-counter item="flamethrower"></item-counter>
48-
</div>
49-
<div flex-row>
32+
<item-counter item="charge"></item-counter>
5033
<item-counter item="morph"></item-counter>
51-
<item-counter item="bombs"></item-counter>
52-
<item-counter item="boost"></item-counter>
53-
<item-counter item="spider"></item-counter>
54-
<item-counter item="power-bombs"></item-counter>
55-
</div>
56-
<div flex-row>
57-
<item-counter item="charge"></item-counter>
34+
<item-counter item="bombs"></item-counter>
5835
<item-counter item="wave"></item-counter>
59-
<item-counter item="ice"></item-counter>
60-
<item-counter item="plasma"></item-counter>
61-
<item-counter item="grapple"></item-counter>
62-
</div>
63-
<div flex-row>
64-
<div flex-column>
65-
<div artifact-wrapper>
66-
<item-counter artifact item="truth"></item-counter>
67-
<item-counter artifact item="strength"></item-counter>
68-
<item-counter artifact item="elder"></item-counter>
69-
<item-counter artifact item="wild"></item-counter>
70-
<item-counter artifact item="lifegiver"></item-counter>
71-
<item-counter artifact item="warrior"></item-counter>
72-
<item-counter artifact item="chozo"></item-counter>
73-
<item-counter artifact item="nature"></item-counter>
74-
<item-counter artifact item="sun"></item-counter>
75-
<item-counter artifact item="world"></item-counter>
76-
<item-counter artifact item="spirit"></item-counter>
77-
<item-counter artifact item="newborn"></item-counter>
78-
</div>
79-
</div>
80-
<div flex-column>
81-
<div flex-row>
82-
<item-counter item="space-jump"></item-counter>
83-
<item-counter item="thermal"></item-counter>
84-
<item-counter item="xray"></item-counter>
85-
</div>
86-
<div flex-row>
87-
<item-counter item="varia"></item-counter>
88-
<item-counter item="gravity"></item-counter>
89-
<item-counter item="phazon"></item-counter>
90-
</div>
91-
</div>
92-
</div>
93-
<div flex-row top-pad>
94-
<item-toggle item="truth">Truth</item-toggle>
95-
<item-toggle item="strength">Strength</item-toggle>
96-
<item-toggle item="elder">Elder</item-toggle>
97-
<item-toggle item="wild">Wild</item-toggle>
98-
<item-toggle item="lifegiver">Lifegiver</item-toggle>
99-
<item-toggle item="warrior">Warrior</item-toggle>
100-
</div>
101-
<div flex-row>
102-
<item-toggle item="chozo">Chozo</item-toggle>
103-
<item-toggle item="nature">Nature</item-toggle>
104-
<item-toggle item="sun">Sun</item-toggle>
105-
<item-toggle item="world">World</item-toggle>
106-
<item-toggle item="spirit">Spirit</item-toggle>
107-
<item-toggle item="newborn">Newborn</item-toggle>
108-
</div>
109-
<div flex-row>
110-
<newtab-link>Toolbar-less Window</newtab-link>
36+
<item-counter item="thermal"></item-counter>
37+
</div>
38+
<div flex-row>
39+
<item-counter item="super-missile"></item-counter>
40+
<item-counter item="boost"></item-counter>
41+
<item-counter item="space-jump"></item-counter>
42+
<item-counter item="ice"></item-counter>
43+
<item-counter item="xray"></item-counter>
44+
</div>
45+
<div flex-row>
46+
<item-counter item="suits" max="3"></item-counter>
47+
<item-counter item="spider"></item-counter>
48+
<item-counter item="grapple"></item-counter>
49+
<item-counter item="plasma"></item-counter>
50+
<item-counter item="artifacts" max="12"></item-counter>
11151
</div>
11252
</div>
11353
</div>

‎html/simple-prime1-simple.html‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head lang="en">
4+
<meta charset="UTF-8">
5+
<!-- Google Analytics -->
6+
<script type="text/javascript">
7+
(function (i, s, o, g, r, a, m) {
8+
i['GoogleAnalyticsObject'] = r;
9+
i[r] = i[r] || function () {
10+
(i[r].q = i[r].q || []).push(arguments)
11+
}, i[r].l = 1 * new Date();
12+
a = s.createElement(o),
13+
m = s.getElementsByTagName(o)[0];
14+
a.async = 1;
15+
a.src = g;
16+
m.parentNode.insertBefore(a, m)
17+
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
18+
19+
ga('create', 'UA-53207226-1', 'auto');
20+
ga('send', 'pageview');
21+
</script>
22+
<script type="text/javascript" src="../libs/webcomponents-lite.js"></script>
23+
<script type="text/javascript" src="../js/simple-tracker.js"></script>
24+
<link type="text/css" rel="stylesheet" href="../css/simple-tracker.css"/>
25+
<link type="text/css" rel="stylesheet" href="../css/simple-tracker-prime1-simple.css"/>
26+
<title>Prime Item Tracker</title>
27+
</head>
28+
<body>
29+
<div center>
30+
<div flex-column>
31+
<div flex-row>
32+
<item-counter big item="etank-count" max="14">
33+
<span counter></span>
34+
</item-counter>
35+
<item-counter big item="missile-count" max="250" increment="5">
36+
<span counter></span>
37+
</item-counter>
38+
<item-counter big item="pb-count" max="8">
39+
<span counter></span>
40+
</item-counter>
41+
</div>
42+
<div flex-row>
43+
<item-counter item="missile"></item-counter>
44+
<item-counter item="super-missile"></item-counter>
45+
<item-counter item="wavebuster"></item-counter>
46+
<item-counter item="ice-spreader"></item-counter>
47+
<item-counter item="flamethrower"></item-counter>
48+
</div>
49+
<div flex-row>
50+
<item-counter item="morph"></item-counter>
51+
<item-counter item="bombs"></item-counter>
52+
<item-counter item="boost"></item-counter>
53+
<item-counter item="spider"></item-counter>
54+
<item-counter item="power-bombs"></item-counter>
55+
</div>
56+
<div flex-row>
57+
<item-counter item="charge"></item-counter>
58+
<item-counter item="wave"></item-counter>
59+
<item-counter item="ice"></item-counter>
60+
<item-counter item="plasma"></item-counter>
61+
<item-counter item="grapple"></item-counter>
62+
</div>
63+
<div flex-row>
64+
<div flex-column>
65+
<div artifact-wrapper>
66+
<item-counter artifact item="truth"></item-counter>
67+
<item-counter artifact item="strength"></item-counter>
68+
<item-counter artifact item="elder"></item-counter>
69+
<item-counter artifact item="wild"></item-counter>
70+
<item-counter artifact item="lifegiver"></item-counter>
71+
<item-counter artifact item="warrior"></item-counter>
72+
<item-counter artifact item="chozo"></item-counter>
73+
<item-counter artifact item="nature"></item-counter>
74+
<item-counter artifact item="sun"></item-counter>
75+
<item-counter artifact item="world"></item-counter>
76+
<item-counter artifact item="spirit"></item-counter>
77+
<item-counter artifact item="newborn"></item-counter>
78+
</div>
79+
</div>
80+
<div flex-column>
81+
<div flex-row>
82+
<item-counter item="space-jump"></item-counter>
83+
<item-counter item="thermal"></item-counter>
84+
<item-counter item="xray"></item-counter>
85+
</div>
86+
<div flex-row>
87+
<item-counter item="varia"></item-counter>
88+
<item-counter item="gravity"></item-counter>
89+
<item-counter item="phazon"></item-counter>
90+
</div>
91+
</div>
92+
</div>
93+
<div flex-row top-pad>
94+
<item-toggle item="truth">Truth</item-toggle>
95+
<item-toggle item="strength">Strength</item-toggle>
96+
<item-toggle item="elder">Elder</item-toggle>
97+
<item-toggle item="wild">Wild</item-toggle>
98+
<item-toggle item="lifegiver">Lifegiver</item-toggle>
99+
<item-toggle item="warrior">Warrior</item-toggle>
100+
</div>
101+
<div flex-row>
102+
<item-toggle item="chozo">Chozo</item-toggle>
103+
<item-toggle item="nature">Nature</item-toggle>
104+
<item-toggle item="sun">Sun</item-toggle>
105+
<item-toggle item="world">World</item-toggle>
106+
<item-toggle item="spirit">Spirit</item-toggle>
107+
<item-toggle item="newborn">Newborn</item-toggle>
108+
</div>
109+
<div flex-row>
110+
<newtab-link>Toolbar-less Window</newtab-link>
111+
</div>
112+
</div>
113+
</div>
114+
</body>
115+
</html>

‎html/simple-prime1-simplified.html‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

html/simple-prime2-simplified.html renamed to html/simple-prime2-simple.html

File renamed without changes.

0 commit comments

Comments
 (0)