Merge branch 'main' of https://inf.pirckheimer-gymnasium.de/kebab/kebab

README.md

@@ -148,6 +148,7 @@ Kleine Indie-Company. Sehr bescheiden. Wir machen. Döner. Revolutionär.
 ## Credits
 
 - [Font: Bitcount Grid Double](https://fonts.google.com/share?selection.family=Bitcount+Grid+Double:wght@100..900)
+- [PixUI icon pack](https://opengameart.org/content/pixui-asset-pack-1-ctatz)
 - Natürlich: [engine-pi](https://github.com/engine-pi/)
 
 

src/main/java/project/scenes/LoadingScene.java

@@ -1,28 +1,25 @@
 package project.scenes;
 
-import pi.Camera;
+import pi.Controller;
 import pi.Scene;
 import pi.Text;
 import pi.actor.Image;
-import pi.event.FrameListener;
 
 import static pi.Controller.fonts;
 import java.awt.Font;
 
-public class LoadingScene extends Scene implements FrameListener
+public class LoadingScene extends Scene
 {
     private Text title;
     private Text subtitle;
     private String subtitle_content;
     private Image tatli;
-    private double lastUpdated;
     
     public LoadingScene() {
         title = new Text("Royal Kebab");
         subtitle_content = "Loading";
         subtitle = new Text(subtitle_content);
         tatli = new Image("images/kebab-pack/tatli-ekmek-256x256.png");
-        lastUpdated = System.currentTimeMillis();
         
         Font font = fonts.get("Fonts/BitcountGridDouble-Regular.ttf");
         title.center(0, 3);
@@ -36,13 +33,16 @@ public class LoadingScene extends Scene implements FrameListener
         add(title);
         add(subtitle);
         add(tatli);
-    }
 
-    public void onFrame(double pastTime)
-    {
-        if(System.currentTimeMillis() - lastUpdated > 300) {
+        repeat(0.5, 4, (int i)->{
+            remove(subtitle);
             subtitle_content = subtitle_content + ".";
-            subtitle.content(subtitle_content);   
-        }
-    }    
+            subtitle = new Text(subtitle_content);
+            subtitle.center(0, -3);
+            subtitle.font(font);
+            add(subtitle);
+        }, (int i)->{
+            Controller.transitionToScene(new StartScene());
+        });
+    }
 }

src/main/java/project/utils/Bestellsystem

@@ -1,23 +0,0 @@
-public class Ordersystem {
-    private int money = 0;
-    private int kebabPrice = 5;
-    private int upgradeLevel = 0;
-    private int kebabSold = 0;
-
-    public void sellKebab() {
-        Money += kebabPrice;
-        kebabSold++;
-    }
-    public int getMoney(){
-        return money;
-    }
-
-    public int getKebabSold(){
-        return kebabSold;
-    }
-    public void setKebabPrice(int price){
-        kebabPrice = price;
-    }
-
-}
-

src/main/java/project/utils/Ordersystem.java

@@ -0,0 +1,108 @@
+package project.utils;
+
+public class Ordersystem {
+    private int money = 0;
+    private int kebabPrice = 5;
+    private int upgradeLevel = 0;
+    private int kebabSold = 0;
+    private int workers = 0;
+    private int waitingCustomers = 0;
+    private int totalEarned = 0;
+
+
+    public int getMoney(){
+        return money;
+    }
+
+    public int getKebabSold(){
+        return kebabSold;
+    }
+    public void setKebabPrice(int price){
+        kebabPrice = price;
+    }
+    public boolean buyUpgrade() {
+        int cost = (upgradeLevel + 1) * 50;
+
+        if(money >= cost) {
+            money -= cost;
+            upgradeLevel++;
+            kebabPrice += 2;
+            return true;
+        }
+
+        return false;
+    }
+
+    public int getUpgradeLevel() {
+        return upgradeLevel;
+    }
+
+    public boolean buyWorker() {
+    
+        int cost = getWorkerCost();
+
+        if(money >= cost) {
+            money -= cost;
+            workers++;
+            return true;
+        }
+
+        return false;
+    }
+
+    public int getWorkers() {
+            return workers;
+        }
+
+   
+
+    public void addCustomer() {
+        waitingCustomers++;
+    }
+
+    public boolean sellKebab() {
+        if(waitingCustomers > 0) {
+            waitingCustomers--;
+            money += kebabPrice;
+            totalEarned += kebabPrice;
+            kebabSold++;
+            return true;
+                
+        }
+
+        return false;
+
+    }
+
+    public int getTotalIncome() {
+        return totalEarned;
+    }
+
+    public int getWaitingCustomers() {
+
+        return waitingCustomers;
+    }
+
+    public int getKebabPrice() {
+        return kebabPrice;
+    }
+
+    public int getUpgradeCost() {
+        return (upgradeLevel + 1) * 50;
+    }
+
+    public int getWorkerCost() {
+        return 100 + workers * 50;
+    }
+
+    public void workerSellKebabs() {
+        for(int i = 0; i < workers; i++) {
+            if (waitingCustomers > 0) {
+                sellKebab();
+            }
+        }
+
+    }
+
+}
+