asdgasdg

ago%!(EXTRA string=1 year) · a4ae9b5665
parent 070fa3a00c
commit a4ae9b5665
24 changed files with 27 additions and 13 deletions
--- a/assets/planets/ASTEROID_BASE.png
+++ b/assets/planets/ASTEROID_BASE.png
--- a/assets/planets/ASTEROID_FIELD.png
+++ b/assets/planets/ASTEROID_FIELD.png
--- a/assets/planets/ENGINEERED_ASTEROID.png
+++ b/assets/planets/ENGINEERED_ASTEROID.png
--- a/assets/planets/GAS_GIANT.png
+++ b/assets/planets/GAS_GIANT.png
--- a/assets/planets/GRAVITY_WELL.png
+++ b/assets/planets/GRAVITY_WELL.png
--- a/assets/planets/ORBITAL_STATION.png
+++ b/assets/planets/ORBITAL_STATION.png
--- a/assets/planets/asteroid1.png
+++ b/assets/planets/asteroid1.png
--- a/assets/planets/asteroid2.png
+++ b/assets/planets/asteroid2.png
--- a/assets/planets/asteroid3.png
+++ b/assets/planets/asteroid3.png
--- a/assets/planets/asteroid4.png
+++ b/assets/planets/asteroid4.png
--- a/assets/planets/blackhole.png
+++ b/assets/planets/blackhole.png
--- a/assets/planets/jumpgate.png
+++ b/assets/planets/jumpgate.png
--- a/assets/planets/whitehole.png
+++ b/assets/planets/whitehole.png
--- a/assets/spaceships/SATELLITE.png~
+++ b/assets/spaceships/SATELLITE.png~
--- a/assets/spaceships/b_spaceships.png~
+++ b/assets/spaceships/b_spaceships.png~
--- a/css/contracts.css
+++ b/css/contracts.css
@ -52,6 +52,15 @@
  
 }

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

 .status-onhold {
--- a/css/global.css
+++ b/css/global.css
@ -35,11 +35,6 @@ input{
    color: var(--text-color);
 }

-select {
-    font-family: var(--text-familly);
-    color: var(--text-color);
-}
-
 #block-content{
    margin: 0;
    padding: 0;
@ -181,4 +176,6 @@ button:disabled, .button:disabled {
    border-radius: 3px;
    background-color: var(--sec-color);
    font-size: 15px;
+    font-family: var(--text-familly);
+    color: var(--text-color);
 }
--- a/css/system.css
+++ b/css/system.css
@ -11,5 +11,5 @@
 {
    border: 1px solid black;
    border-radius: 10px;
-    background-color: rgba(0, 0, 0, 0.233);
+    background-color: rgba(0, 0, 0, 0.822);
 }
--- a/html/template.html
+++ b/html/template.html
@ -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>
    // document.getElementById('audio').play();
 </script>
--- a/html/templates/contracts/contracts_modal.html
+++ b/html/templates/contracts/contracts_modal.html
@ -1,6 +1,6 @@
 <!-- Copyright © 2023 Entreprise SkamKraft -->

-<div class="my-modal">
+<div>
    <p class="modal-title">Contract</p>
    <p class="contract-id"></p>
    <p class="contract-faction"></p>
--- a/index.html
+++ b/index.html
@ -18,6 +18,8 @@
    <link rel="stylesheet" href="css/system.css">
  </head>
  <body>
-
+  <audio id="audio" controls loop style="display:none" crossorigin="anonymous">
+    <source src="/assets/sounds/skamkraft_main_theme.mp3" type="audio/mpeg">
+  </audio>
  </body>
 </html>
--- a/js/controllers/contracts.js
+++ b/js/controllers/contracts.js
@ -7,7 +7,7 @@ import { Modal } from "../skama_code/ui/modal.js";
 export default function contracts(temp_engine) {
  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) => {
    $("body").css("background-image", "url('/assets/contracts/screen_background.png')")
--- a/js/controllers/system.js
+++ b/js/controllers/system.js
@ -67,6 +67,15 @@ export default function system(temp_engine, sys_name) {
                    canvas.zoom(new Position(0, 0), 0.5);
                }, 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", () => {
                    canvas.resize((window.innerWidth/10)*9, (window.innerHeight/5)*4);
                });
--- a/js/skama_code
+++ b/js/skama_code
@ -1 +1 @@
-Subproject commit fb20b7d6d528044b9c94972086b8663c0b8362c4
+Subproject commit be28b11a3d79f39ccd759234fb053b637f19b984