mirror of
https://github.com/yairm210/Unciv.git
synced 2024-12-22 23:14:25 +07:00
31931d3849
* Added ConditionalWhenBetweenStatResource unique
* Currently the ConditionalBetweenHappiness function only applies to Happiness. Wouldn't it be more better if it could also be extended to other stats and resources. 😊
* Resolved the issue with ConditionalWhenAboveStatResource, ConditionalWhenBelowStatResource, and their modified speed versions not functioning properly on city-level stats (food & production).
This new unique has been tested using the following examples:
1. In GlobalUniques.json:
- "[+12]% [Gold] [in all cities] <when between [1] to [100] [Gold]>",
- "[+24]% [Gold] [in all cities] <when between [1] to [100] [Gold] (modified by game speed)>",
2. In Buildings.json:
- "[+12]% [Production] [in this city] <when between [1] to [5] [Production]>",
- "[+12]% [Food] [in this city] <when between [1] to [5] [Food]>",
* Update uniques.md
* Correct english mistake of the new unique
* Refactor checkResourceOrStatAmount function
* Unified all related functions into one
169 lines
2.6 KiB
Plaintext
169 lines
2.6 KiB
Plaintext
## Java
|
|
|
|
*.class
|
|
*.war
|
|
*.ear
|
|
hs_err_pid*
|
|
|
|
## Robovm
|
|
/ios/robovm-build/
|
|
|
|
## GWT
|
|
/html/war/
|
|
/html/gwt-unitCache/
|
|
.apt_generated/
|
|
.gwt/
|
|
gwt-unitCache/
|
|
www-test/
|
|
.gwt-tmp/
|
|
|
|
## Android Studio and Intellij and Android in general
|
|
/android/libs/armeabi/
|
|
/android/libs/armeabi-v7a/
|
|
/android/libs/arm64-v8a/
|
|
/android/libs/x86/
|
|
/android/libs/x86_64/
|
|
/android/gen/
|
|
.idea/*
|
|
!/.idea/inspectionProfiles
|
|
/.idea/inspectionProfiles/*
|
|
!/.idea/inspectionProfiles/Project_Default.xml
|
|
*.ipr
|
|
*.iws
|
|
*.iml
|
|
/android/out/
|
|
com_crashlytics_export_strings.xml
|
|
|
|
## Eclipse
|
|
|
|
.classpath
|
|
.project
|
|
.metadata/
|
|
/tests/bin/
|
|
/android/bin/
|
|
/core/bin/
|
|
/desktop/bin/
|
|
/server/bin/
|
|
/html/bin/
|
|
/ios/bin/
|
|
/ios-moe/bin/
|
|
*.tmp
|
|
*.bak
|
|
*.swp
|
|
*~.nib
|
|
.settings/
|
|
.loadpath
|
|
.externalToolBuilders/
|
|
*.launch
|
|
|
|
## NetBeans
|
|
|
|
/nbproject/private/
|
|
/android/nbproject/private/
|
|
/core/nbproject/private/
|
|
/desktop/nbproject/private/
|
|
/server/nbproject/private/
|
|
/html/nbproject/private/
|
|
/ios/nbproject/private/
|
|
/ios-moe/nbproject/private/
|
|
|
|
/build/
|
|
/android/build/
|
|
/core/build/
|
|
/desktop/build/
|
|
/server/build/
|
|
/html/build/
|
|
/ios/build/
|
|
/ios-moe/build/
|
|
/buildSrc/build
|
|
|
|
/nbbuild/
|
|
/android/nbbuild/
|
|
/core/nbbuild/
|
|
/desktop/nbbuild/
|
|
/server/nbbuild/
|
|
/html/nbbuild/
|
|
/ios/nbbuild/
|
|
/ios-moe/nbbuild/
|
|
|
|
/dist/
|
|
/android/dist/
|
|
/core/dist/
|
|
/desktop/dist/
|
|
/server/dist/
|
|
/html/dist/
|
|
/ios/dist/
|
|
/ios-moe/dist/
|
|
|
|
/nbdist/
|
|
/android/nbdist/
|
|
/core/nbdist/
|
|
/desktop/nbdist/
|
|
/server/nbdist/
|
|
/html/nbdist/
|
|
/ios/nbdist/
|
|
/ios-moe/nbdist/
|
|
|
|
nbactions.xml
|
|
nb-configuration.xml
|
|
|
|
## Gradle
|
|
|
|
/local.properties
|
|
.gradle/
|
|
gradle-app.setting
|
|
|
|
## OS Specific
|
|
.DS_Store
|
|
Thumbs.db
|
|
|
|
## iOS
|
|
/ios/xcode/*.xcodeproj/*
|
|
!/ios/xcode/*.xcodeproj/xcshareddata
|
|
!/ios/xcode/*.xcodeproj/project.pbxproj
|
|
/ios/xcode/native/
|
|
|
|
/ios-moe/xcode/*.xcodeproj/*
|
|
!/ios-moe/xcode/*.xcodeproj/xcshareddata
|
|
!/ios-moe/xcode/*.xcodeproj/project.pbxproj
|
|
/ios-moe/xcode/native/
|
|
android/android-release.apk
|
|
android/release/output.json
|
|
android/release/android-release.apk
|
|
android/release/release/android.aab
|
|
android/release/android.aab
|
|
android/release/android.aab.sig
|
|
android/release/android-release.aab
|
|
tests/build/
|
|
desktop/packr/
|
|
desktop/packrCache/
|
|
server/packr/
|
|
server/packrCache/
|
|
deploy/
|
|
android/release/
|
|
|
|
# Transient Unciv files
|
|
android/assets/GameSettings.json
|
|
android/assets/lasterror.txt
|
|
android/assets/fonts/
|
|
android/assets/maps/
|
|
android/assets/mods/
|
|
android/assets/MultiplayerGames/
|
|
android/assets/music/
|
|
android/assets/SaveFiles/
|
|
android/assets/scenarios/
|
|
SaveFiles/
|
|
|
|
# Visual Studio Code
|
|
.vscode/
|
|
/.github/workflows/node_modules/*
|
|
|
|
# node.js (we only need these temporarily for the release build)
|
|
node_modules/
|
|
package-lock.json
|
|
package.json
|
|
|
|
# Unsorted additions
|
|
# Detekt
|
|
detekt/reports.html
|