anulax
/
skamkraft.anulax.ch
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

asdgasdg

Browse Source
main
Ambigapathy Vinayak ago%!(EXTRA string=10 months)
parent 070fa3a00c
commit a4ae9b5665
24 changed files with 27 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      assets/planets/ASTEROID_BASE.png
  2. BIN
      assets/planets/ASTEROID_FIELD.png
  3. BIN
      assets/planets/ENGINEERED_ASTEROID.png
  4. BIN
      assets/planets/GAS_GIANT.png
  5. BIN
      assets/planets/GRAVITY_WELL.png
  6. BIN
      assets/planets/ORBITAL_STATION.png
  7. BIN
      assets/planets/asteroid1.png
  8. BIN
      assets/planets/asteroid2.png
  9. BIN
      assets/planets/asteroid3.png
  10. BIN
      assets/planets/asteroid4.png
  11. BIN
      assets/planets/blackhole.png
  12. BIN
      assets/planets/jumpgate.png
  13. BIN
      assets/planets/whitehole.png
  14. BIN
      assets/spaceships/SATELLITE.png~
  15. BIN
      assets/spaceships/b_spaceships.png~
  16. 9
      css/contracts.css
  17. 7
      css/global.css
  18. 2
      css/system.css
  19. 3
      html/template.html
  20. 2
      html/templates/contracts/contracts_modal.html
  21. 4
      index.html
  22. 2
      js/controllers/contracts.js
  23. 9
      js/controllers/system.js
  24. 2
      js/skama_code

BIN
assets/planets/ASTEROID_BASE.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 19 KiB

BIN
assets/planets/ASTEROID_FIELD.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
assets/planets/ENGINEERED_ASTEROID.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
assets/planets/GAS_GIANT.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
assets/planets/GRAVITY_WELL.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 944 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/planets/ORBITAL_STATION.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 752 B

BIN
assets/planets/asteroid1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/planets/asteroid2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/planets/asteroid3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/planets/asteroid4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/planets/blackhole.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 65 KiB

BIN
assets/planets/jumpgate.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 800 B

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
assets/planets/whitehole.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
assets/spaceships/SATELLITE.png~
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 879 B

BIN
assets/spaceships/b_spaceships.png~
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

9
css/contracts.css
Unescape View File

@ -52,6 +52,15 @@
} }
#contracts-modal
{
background-color: rgba(0, 0, 255, 0.5);
border: none;
border-radius: 10px;
padding: 40px;
color: white;
}
/* Modal */ /* Modal */
.status-onhold { .status-onhold {

7
css/global.css
Unescape View File

@ -35,11 +35,6 @@ input{
color: var(--text-color); color: var(--text-color);
} }
select {
font-family: var(--text-familly);
color: var(--text-color);
}
#block-content{ #block-content{
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -181,4 +176,6 @@ button:disabled, .button:disabled {
border-radius: 3px; border-radius: 3px;
background-color: var(--sec-color); background-color: var(--sec-color);
font-size: 15px; font-size: 15px;
font-family: var(--text-familly);
color: var(--text-color);
} }

2
css/system.css
Unescape View File

@ -11,5 +11,5 @@
{ {
border: 1px solid black; border: 1px solid black;
border-radius: 10px; border-radius: 10px;
background-color: rgba(0, 0, 0, 0.233); background-color: rgba(0, 0, 0, 0.822);
} }

3
html/template.html
Unescape View File

@ -1,6 +1,3 @@
<audio id="audio" controls loop style="display:none" crossorigin="anonymous">
<!-- <source src="/assets/sounds/skamkraft_main_theme.mp3" type="audio/mpeg"> -->
</audio>
<script> <script>
// document.getElementById('audio').play(); // document.getElementById('audio').play();
</script> </script>

2
html/templates/contracts/contracts_modal.html
Unescape View File

@ -1,6 +1,6 @@
<!-- Copyright © 2023 Entreprise SkamKraft --> <!-- Copyright © 2023 Entreprise SkamKraft -->
<div class="my-modal"> <div>
<p class="modal-title">Contract</p> <p class="modal-title">Contract</p>
<p class="contract-id"></p> <p class="contract-id"></p>
<p class="contract-faction"></p> <p class="contract-faction"></p>

4
index.html
Unescape View File

@ -18,6 +18,8 @@
<link rel="stylesheet" href="css/system.css"> <link rel="stylesheet" href="css/system.css">
</head> </head>
<body> <body>
<audio id="audio" controls loop style="display:none" crossorigin="anonymous">
<source src="/assets/sounds/skamkraft_main_theme.mp3" type="audio/mpeg">
</audio>
</body> </body>
</html> </html>

2
js/controllers/contracts.js
Unescape View File

@ -7,7 +7,7 @@ import { Modal } from "../skama_code/ui/modal.js";
export default function contracts(temp_engine) { export default function contracts(temp_engine) {
temp_engine.after_render(menu_mod); temp_engine.after_render(menu_mod);
let modal = new Modal("contract-modal", temp_engine); let modal = new Modal("contracts-modal", temp_engine);
temp_engine.after_render((temp_engine) => { temp_engine.after_render((temp_engine) => {
$("body").css("background-image", "url('/assets/contracts/screen_background.png')") $("body").css("background-image", "url('/assets/contracts/screen_background.png')")

9
js/controllers/system.js
Unescape View File

@ -67,6 +67,15 @@ export default function system(temp_engine, sys_name) {
canvas.zoom(new Position(0, 0), 0.5); canvas.zoom(new Position(0, 0), 0.5);
}, true); }, true);
canvas.on("mouse:wheel", (opt) => {
if (opt.e.deltaY < 0)
{
canvas.zoom(canvas.rel_pos(new Position(opt.e.clientX, opt.e.clientY)), 1.1)
} else {
canvas.zoom(canvas.rel_pos(new Position(opt.e.clientX, opt.e.clientY)), 0.9090)
}
});
$(window).on("resize", () => { $(window).on("resize", () => {
canvas.resize((window.innerWidth/10)*9, (window.innerHeight/5)*4); canvas.resize((window.innerWidth/10)*9, (window.innerHeight/5)*4);
}); });

2
js/skama_code

@ -1 +1 @@
Subproject commit fb20b7d6d528044b9c94972086b8663c0b8362c4 Subproject commit be28b11a3d79f39ccd759234fb053b637f19b984
Write Preview
Loading…
Cancel
Save