Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Yunzez committed Dec 17, 2023
1 parent 3585321 commit 66cbac4
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 8 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,8 @@ Thumbs.db


## fbx-conv
/fbx-conv-mac/
/fbx-conv-mac/
myKeyStore.jks
jdk*
FinalGame-*
```
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"java.configuration.updateBuildConfiguration": "interactive",
"java.configuration.updateBuildConfiguration": "automatic",
"java.debug.settings.onBuildFailureProceed": true,
"java.compile.nullAnalysis.mode": "automatic"
}
37 changes: 36 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ buildscript {


}

}

allprojects {
Expand Down Expand Up @@ -39,7 +40,24 @@ allprojects {

project(":desktop") {
apply plugin: "java-library"


jar {
// Set the duplicates strategy
duplicatesStrategy = DuplicatesStrategy.INCLUDE

// Include contents from runtime classpath
from {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}

// Exclude signature files
exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'

// Configure the manifest if needed
manifest {
attributes 'Main-Class': 'com.finalproject.game.DesktopLauncher'
}
}

dependencies {
implementation project(":core")
Expand All @@ -53,6 +71,23 @@ project(":desktop") {
project(":core") {
apply plugin: "java-library"

jar {
// Set the duplicates strategy
duplicatesStrategy = DuplicatesStrategy.INCLUDE

// Include contents from runtime classpath
from {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}

// Exclude signature files
exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'

// Configure the manifest if needed
manifest {
attributes 'Main-Class': 'com.finalproject.game.FinalProjectGame'
}
}

dependencies {
api "com.badlogicgames.gdx:gdx:$gdxVersion"
Expand Down
20 changes: 20 additions & 0 deletions config-packr-mac.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"platform": "mac",
"jdk": "/Users/yunzezhao/Code/finalProjectGame/jdk-21_macos-x64_bin.tar.gz",
"executable": "MemeVilliage",
"classpath": [
"/Users/yunzezhao/Code/finalProjectGame/desktop/build/libs/desktop-1.0.jar",
"/Users/yunzezhao/Code/finalProjectGame/core/build/libs/core-1.0.jar"
],
"mainclass": "com.finalproject.game.DesktopLauncher",

"vmArgs": [
"XstartOnFirstThread"
],
"resources": [
"assets"
],
"minimizeJre": "soft",
"output": "FinalGame-mac"
}

10 changes: 6 additions & 4 deletions config-packr.json → config-packr-win.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{
"platform": "windows64",
"jdk": "/Users/yunzezhao/Code/finalProjectGame/jdk-21_macos-aarch64_bin.tar.gz",
"jdk": "/Users/yunzezhao/Code/finalProjectGame/jdk-21_macos-x64_bin.tar.gz",
"executable": "MemeVilliage",
"classpath": [
"desktop/build/libs/desktop-1.0.jar"
"/Users/yunzezhao/Code/finalProjectGame/desktop/build/libs/desktop-1.0.jar",
"/Users/yunzezhao/Code/finalProjectGame/core/build/libs/core-1.0.jar"
],
"mainclass": "com.finalproject.game.DesktopLauncher",

"vmArgs": [
"Xmx1G"
"XstartOnFirstThread"
],
"resources": [
"assets"
],
"minimizeJre": "soft",
"output": "FinalGame"
"output": "FinalGame-win"
}

2 changes: 1 addition & 1 deletion core/src/com/finalproject/game/models/Item.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public enum Item {
"items/potion.png", new Buff("Elixir", BuffType.HEALTH, 20, 1)),
BUTTBOOK(ItemType.WEAPON, "Buttbook", 40,
"A weapon that can make opponent lost all their personal data, +20 damanges for next 2 rounds.",
"items/buttbook.png",
"items/ButtBook.png",
new Buff("Buttbook", BuffType.PLAYER_DAMAGE, 20, 2)),
BANANA_CAT(ItemType.POTION, "Banana Cat", 50,
"A potion that heal 50 points of your hp with the cuteness of banana cat.", "items/banana_cat.png",
Expand Down

0 comments on commit 66cbac4

Please sign in to comment.