peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-07-31 06:37:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 'gui'

Browse Source 
# Conflicts:
#   Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java
#   Projekte/monopoly/model/src/main/resources/monopoly.properties
This commit is contained in:
Johannes Schmelz
2024-11-18 03:14:07 +00:00
parent 8698eed273 951b4c198c
commit fffd32e13c
53 changed files with 3611 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
View File

@@ -5,10 +5,10 @@
import com.simsilica.lemur.*
import com.simsilica.lemur.component.QuadBackgroundComponent
// Farben und allgemeine Stile
def bgColor = color(1, 1, 1, 1)
def buttonEnabledColor = color(0.8, 0.9, 1, 1)
def buttonDisabledColor = color(0.8, 0.9, 1, 0.2)
//def buttonBgColor = color(0, 0.75, 0.75, 1)
def sliderColor = color(0.6, 0.8, 0.8, 1)
def sliderBgColor = color(0.5, 0.75, 0.75, 1)
def gradientColor = color(1, 1, 1, 1)
@@ -16,7 +16,13 @@ def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1)
def playButtonBorderColor = color(1, 0.6, 0, 1) // For "Spielen" button
def blackColor = color(0, 0, 0, 1) // Define black color for border
// Hintergrundverläufe
def playButtonBorderColor = color(1, 0.6, 0, 1) // Orange border for "Spielen" button
def playButtonTextColor = color(0, 0, 0, 1) // Black text color for "Spielen" button
def buttonBgColor = color(1, 1, 1, 1) // White background for "Spiel beenden" and "Einstellungen" buttons
def buttonTextColor = color(0, 0, 0, 1) // Black text color for "Spiel beenden" and "Einstellungen" buttons
def borderColor = color(0, 0, 0, 1) // Black border for "Spiel beenden" and "Einstellungen"
def gradient = TbtQuadBackgroundComponent.create(
texture(name: "/com/simsilica/lemur/icons/bordered-gradient.png", generateMips: false),
1, 1, 1, 126, 126, 1f, false)
@@ -49,49 +55,24 @@ selector("slider", "pp") {
background = new QuadBackgroundComponent(sliderBgColor)
}
// Slider-Thumb Stil
selector("slider.thumb.button", "pp") {
text = "[]" // Symbol für den Thumb
color = sliderColor
insets = new Insets3f(2, 2, 2, 2)
selector("play-button", "pp") {
color = playButtonTextColor // Black text color
background = new QuadBackgroundComponent(playButtonBorderColor) // Orange border background
insets = new Insets3f(15, 25, 15, 25) // Padding for larger button size
background.setMargin(5, 5) // Thin border effect around the background color
fontSize = 36 // Larger font size for prominence
}
// Slider links/rechts Buttons
selector("slider.left.button", "pp") {
text = "-"
color = sliderColor
background = doubleGradient.clone()
insets = new Insets3f(5, 5, 5, 5)
}
selector("slider.right.button", "pp") {
text = "+"
color = sliderColor
background = doubleGradient.clone()
insets = new Insets3f(5, 5, 5, 5)
}
// Style für alle Buttons im Menü
selector("menu-button", "pp") {
color = color(0, 0, 0, 1) // Schwarzer Text
background = new QuadBackgroundComponent(bgColor)
insets = new Insets3f(10, 20, 10, 20)
fontSize = 24
color = buttonTextColor // Black text color
background = new QuadBackgroundComponent(buttonBgColor) // White background
insets = new Insets3f(10, 20, 10, 20) // Padding
background.setMargin(1, 1) // Thin black border
background.setColor(borderColor) // Set black border color
fontSize = 24 // Standard font size
}
// Apply border to all buttons in the "pp" style
selector("button", "pp") {
background = gradient.clone()
background.setColor(bgColor) // Set background color
background.setBorderColor(blackColor) // Set border color to black
background.setBorderSize(2) // Set border thickness (adjust as needed)
color = buttonEnabledColor
insets = new Insets3f(2, 2, 2, 2)
buttonCommands = stdButtonCommands
}
// Standard Button Commands (Animationseffekt)
def pressedCommand = new Command<Button>() {
void execute(Button source) {
if (source.isPressed())