fixes.
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
"executable": "Tick's Tales",
|
"executable": "Tick's Tales",
|
||||||
"classpath": ["target/advent-standalone.jar"],
|
"classpath": ["target/advent-standalone.jar"],
|
||||||
"mainclass": "advent.core.desktop_launcher",
|
"mainclass": "advent.core.desktop_launcher",
|
||||||
"resources": ["steam_appid.txt"],
|
"resources": ["steam_appid.txt", "resources/icon"],
|
||||||
"minimizejre": "soft",
|
"minimizejre": "soft",
|
||||||
"output": "target/linux/amd64"
|
"output": "target/linux/amd64"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"executable": "Tick's Tales",
|
"executable": "Tick's Tales",
|
||||||
"classpath": ["target/advent-standalone.jar"],
|
"classpath": ["target/advent-standalone.jar"],
|
||||||
"mainclass": "advent.core.desktop_launcher",
|
"mainclass": "advent.core.desktop_launcher",
|
||||||
"resources": ["steam_appid.txt"],
|
"resources": ["steam_appid.txt", "resources/icon"],
|
||||||
"minimizejre": "soft",
|
"minimizejre": "soft",
|
||||||
"output": "target/linux/amd64"
|
"output": "target/linux/amd64"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"jdk": "./jvms/windows64.zip",
|
"jdk": "./jvms/windows64.zip",
|
||||||
"executable": "TicksTales",
|
"executable": "TicksTales",
|
||||||
"mainclass": "advent.core.desktop_launcher",
|
"mainclass": "advent.core.desktop_launcher",
|
||||||
"resources": ["steam_appid.txt"],
|
"resources": ["steam_appid.txt", "resources/icon"],
|
||||||
"classpath": ["target/advent-standalone.jar"],
|
"classpath": ["target/advent-standalone.jar"],
|
||||||
"minimizejre": "soft",
|
"minimizejre": "soft",
|
||||||
"output": "target/windows/"
|
"output": "target/windows/"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"jdk": "./jvms/windows64.zip",
|
"jdk": "./jvms/windows64.zip",
|
||||||
"executable": "TicksTales",
|
"executable": "TicksTales",
|
||||||
"mainclass": "advent.core.desktop_launcher",
|
"mainclass": "advent.core.desktop_launcher",
|
||||||
"resources": ["steam_appid.txt"],
|
"resources": ["steam_appid.txt", "resources/icon"],
|
||||||
"classpath": ["target/advent-standalone.jar"],
|
"classpath": ["target/advent-standalone.jar"],
|
||||||
"minimizejre": "soft",
|
"minimizejre": "soft",
|
||||||
"output": "target/windows/"
|
"output": "target/windows/"
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,4 @@
|
|||||||
crashhandler.dylib,327168;1608260582;4072705574
|
crashhandler.dylib,269664;1626824210;2541537603
|
||||||
Frameworks/Breakpad.framework/,-1;1477950302;0
|
Frameworks/Breakpad.framework/,-1;1477950302;0
|
||||||
Frameworks/Breakpad.framework/Breakpad,-2;1283201464;1199629470
|
Frameworks/Breakpad.framework/Breakpad,-2;1283201464;1199629470
|
||||||
Frameworks/Breakpad.framework/Headers,-2;1283201464;2393740531
|
Frameworks/Breakpad.framework/Headers,-2;1283201464;2393740531
|
||||||
@@ -60,44 +60,44 @@ Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Conte
|
|||||||
Frameworks/Breakpad.framework/Versions/A/Resources/Info.plist,1228;1477950302;2088164349
|
Frameworks/Breakpad.framework/Versions/A/Resources/Info.plist,1228;1477950302;2088164349
|
||||||
Frameworks/Breakpad.framework/Versions/A/Resources/Inspector,55700;1477950302;3995236228
|
Frameworks/Breakpad.framework/Versions/A/Resources/Inspector,55700;1477950302;3995236228
|
||||||
Frameworks/Breakpad.framework/Versions/Current,-2;1283201464;3554254475
|
Frameworks/Breakpad.framework/Versions/Current,-2;1283201464;3554254475
|
||||||
libaudio.dylib,281872;1608260582;1615657088
|
libaudio.dylib,196176;1626824210;3914268500
|
||||||
libsteaminput.dylib,89872;1528433788;2801920434
|
libsteaminput.dylib,89872;1528433788;2801920434
|
||||||
libtier0_s.dylib,417408;1608260582;1458381962
|
libtier0_s.dylib,366512;1626824210;2142114133
|
||||||
libvstdlib_s.dylib,609088;1608260582;4175414582
|
libvstdlib_s.dylib,525328;1626824212;1153798541
|
||||||
public/,-1;1600458368;0
|
public/,-1;1615498476;0
|
||||||
public/steambootstrapper_brazilian.txt,4586;1599787342;435265056
|
public/steambootstrapper_brazilian.txt,4579;1610589776;2945962788
|
||||||
public/steambootstrapper_bulgarian.txt,6462;1599787342;871101403
|
public/steambootstrapper_bulgarian.txt,6450;1615498476;573256223
|
||||||
public/steambootstrapper_czech.txt,4776;1599787342;2517150828
|
public/steambootstrapper_czech.txt,4769;1610589774;3540247094
|
||||||
public/steambootstrapper_danish.txt,4337;1599787342;3747600605
|
public/steambootstrapper_danish.txt,4330;1610589774;1603943118
|
||||||
public/steambootstrapper_dutch.txt,4339;1599787342;2658776387
|
public/steambootstrapper_dutch.txt,4332;1610589774;1823643073
|
||||||
public/steambootstrapper_english.txt,4042;1567106948;705636240
|
public/steambootstrapper_english.txt,4113;1610129318;2002058579
|
||||||
public/steambootstrapper_finnish.txt,4569;1599787342;1100477458
|
public/steambootstrapper_finnish.txt,4562;1610589774;4160826347
|
||||||
public/steambootstrapper_french.txt,4824;1599787342;263383177
|
public/steambootstrapper_french.txt,4817;1610589774;1705022547
|
||||||
public/steambootstrapper_german.txt,4730;1599787342;2471385224
|
public/steambootstrapper_german.txt,4723;1610589774;806216237
|
||||||
public/steambootstrapper_greek.txt,6210;1599787342;2897296743
|
public/steambootstrapper_greek.txt,6203;1610589774;655592863
|
||||||
public/steambootstrapper_hungarian.txt,4764;1600458368;1931668746
|
public/steambootstrapper_hungarian.txt,4757;1610589774;158680991
|
||||||
public/steambootstrapper_italian.txt,4686;1599787342;131070742
|
public/steambootstrapper_italian.txt,4679;1610589776;3717497750
|
||||||
public/steambootstrapper_japanese.txt,5457;1599787342;2112085630
|
public/steambootstrapper_japanese.txt,5455;1612564870;262655608
|
||||||
public/steambootstrapper_korean.txt,4776;1599787342;2541923810
|
public/steambootstrapper_korean.txt,4769;1610561412;614365656
|
||||||
public/steambootstrapper_koreana.txt,4776;1599787342;2541923810
|
public/steambootstrapper_koreana.txt,4769;1610561412;614365656
|
||||||
public/steambootstrapper_latam.txt,4650;1599787342;2818400559
|
public/steambootstrapper_latam.txt,4643;1610589776;3044857096
|
||||||
public/steambootstrapper_norwegian.txt,4319;1599787342;3178737914
|
public/steambootstrapper_norwegian.txt,4312;1610589774;2157669839
|
||||||
public/steambootstrapper_polish.txt,4549;1600458368;2131648902
|
public/steambootstrapper_polish.txt,4542;1610589774;2472231859
|
||||||
public/steambootstrapper_portuguese.txt,4540;1599787342;1537129431
|
public/steambootstrapper_portuguese.txt,4533;1610589774;4032431559
|
||||||
public/steambootstrapper_romanian.txt,4577;1599787342;1945477159
|
public/steambootstrapper_romanian.txt,4570;1610589776;2606193458
|
||||||
public/steambootstrapper_russian.txt,6084;1599787342;79310862
|
public/steambootstrapper_russian.txt,6077;1610589776;935885346
|
||||||
public/steambootstrapper_schinese.txt,4079;1599787342;3710048221
|
public/steambootstrapper_schinese.txt,4072;1610589774;879153330
|
||||||
public/steambootstrapper_spanish.txt,4649;1599787342;1348116077
|
public/steambootstrapper_spanish.txt,4642;1610589776;1362390230
|
||||||
public/steambootstrapper_swedish.txt,4343;1599787342;395261697
|
public/steambootstrapper_swedish.txt,4336;1610589776;1780188147
|
||||||
public/steambootstrapper_tchinese.txt,4056;1599787342;4236189440
|
public/steambootstrapper_tchinese.txt,4049;1610589774;745943745
|
||||||
public/steambootstrapper_thai.txt,7358;1599787342;1672752677
|
public/steambootstrapper_thai.txt,7351;1610589776;1905597739
|
||||||
public/steambootstrapper_turkish.txt,4502;1599787342;3593600711
|
public/steambootstrapper_turkish.txt,4495;1610589776;3145753921
|
||||||
public/steambootstrapper_ukrainian.txt,6142;1599787342;546430067
|
public/steambootstrapper_ukrainian.txt,6135;1610589776;937082620
|
||||||
public/steambootstrapper_vietnamese.txt,4937;1599787342;3536082544
|
public/steambootstrapper_vietnamese.txt,4930;1610589776;400653706
|
||||||
steamclient.dylib,90285552;1608260584;2907061343
|
steamclient.dylib,96625916;1626824212;1455111241
|
||||||
steamcmd,4649616;1608260584;3739166325
|
steamcmd,4602256;1626824212;1006338243
|
||||||
steamcmd.sh,1173;1606003422;3451214996
|
steamcmd.sh,1173;1606003422;3451214996
|
||||||
steamconsole.dylib,460960;1608260584;3702974498
|
steamconsole.dylib,358304;1626824212;2028804471
|
||||||
OSVER=-83
|
OSVER=-83
|
||||||
VERSION=3
|
VERSION=3
|
||||||
SHA1=1E2C8ECDDE51B6F49C69D151D14D37F363234E24
|
SHA1=B22E139D678D48DCA7687428A2C587B960637FEE
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
"osx"
|
"osx"
|
||||||
{
|
{
|
||||||
"version" "1608497921"
|
"version" "1626823972"
|
||||||
"steamcmd_public_all"
|
"steamcmd_public_all"
|
||||||
{
|
{
|
||||||
"file" "steamcmd_public_all.zip.e61ce36efab3810390b5b5f55ee433f1fc7a04af"
|
"file" "steamcmd_public_all.zip.716674556427db82df7272603a00b5affcd9bb7b"
|
||||||
"size" "49303"
|
"size" "49247"
|
||||||
"sha2" "74901c1f1b77aca874f3ecef4410223731cfe80e33f45f1d7e30abf5e0ef0ea0"
|
"sha2" "ad8cec394baab88aaad803421ca64af61f8b2d6a80a2abdc9cbdd07fbdc0abdd"
|
||||||
}
|
}
|
||||||
"steamcmd_bins_osx"
|
"steamcmd_bins_osx"
|
||||||
{
|
{
|
||||||
"file" "steamcmd_bins_osx.zip.3fcb619cc295c28bf18ee03080fbf6768be50ad8"
|
"file" "steamcmd_bins_osx.zip.15f160164451aa813be1546bb08d72a968782a1a"
|
||||||
"size" "24170688"
|
"size" "25973618"
|
||||||
"sha2" "5fd242786d0cf05c8c80d8ade25d73f842f5f1cf06e552a3274cb24f8887c9f8"
|
"sha2" "fb9d6ab5ac932563802bbbfc705a8b81aa1b751305fd51f3bbaab6053450dfc3"
|
||||||
"zipvz" "steamcmd_bins_osx.zip.vz.9eb383d43056b1e8ab9ac1b0292344fb1ea4f99b_15178433"
|
"zipvz" "steamcmd_bins_osx.zip.vz.bf1b6aba14e68f4a70fd5287013639beacece52e_16458149"
|
||||||
"sha2vz" "a5b08572a9362b2ad468970caeb3fd67fa8f3067fdb272e096a313420f4fc397"
|
"sha2vz" "bd83cbcb54b21000c199f0fdcaa3b40e45dfd5ed649000391f05fa7c7c3536b4"
|
||||||
}
|
}
|
||||||
"steamcmd_breakpad_osx"
|
"steamcmd_breakpad_osx"
|
||||||
{
|
{
|
||||||
@@ -25,19 +25,19 @@
|
|||||||
}
|
}
|
||||||
"steamcmd_osx"
|
"steamcmd_osx"
|
||||||
{
|
{
|
||||||
"file" "steamcmd_osx.zip.9c00dd9d312e75dba7c0315fb2ef8b0b063703f2"
|
"file" "steamcmd_osx.zip.7f44a675f3c221dd94daf97555a51834dec10131"
|
||||||
"size" "1835272"
|
"size" "2022601"
|
||||||
"sha2" "08d15ac3fb894d2f3e40c768c2f361d512a080fef17e73a43fac2a0dd37bf356"
|
"sha2" "95b4a8198d709d0038732af7b5bd553cd563f59fd1f6ee4904df5a584e7a3e95"
|
||||||
"zipvz" "steamcmd_osx.zip.vz.05364999561c00efc46fc902a93b07475dbe013b_1469691"
|
"zipvz" "steamcmd_osx.zip.vz.105071527934d4edecbd30685bb49e1133b2cc86_1641691"
|
||||||
"sha2vz" "d559a743435c5c17215f5d4b990c5b74e487627ddd5e7f0074c604202399d8d8"
|
"sha2vz" "54b09d50129e0e5820f85536bf31df1d9f41a754eef81b8f3267a9aae3cd7675"
|
||||||
"IsBootstrapperPackage" "1"
|
"IsBootstrapperPackage" "1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"kvsign2"
|
"kvsign2"
|
||||||
{
|
{
|
||||||
"osx" "ecb07ed1192132587afedc36b62e7cc9c92a2cd640c38e248a5bed2deb0ab914cbf088dd11454bf4c0f656504335df6b8132061f2feddf5a810f9f1938893707"
|
"osx" "dd8213b467791e75c082e4cae8b559932f47ce37940275264c9e1e8efddc03da60f12700417dfde540442d2172b03bc0d1215db379cd4884fdd7340670c4fb06"
|
||||||
}
|
}
|
||||||
"kvsignatures"
|
"kvsignatures"
|
||||||
{
|
{
|
||||||
"osx" "ad77fb4e7292bfac0435752c0c8afa61ba6e175d59b3143836124ab0109903a7eb0109560a9f11f06b92dd4df4f1f19fb51934443feaf3d32b23f20b8f3aaf19641d90aa2653ccee330c2a13362e68643846434a6366d65f1fc00a413976c02fe3fcab82ec7b6a44d1efb01c9814e1a0c76e9a5212719bc9c37e30803a93a147"
|
"osx" "9d29674c2e3903796f08bedc312377f867ca992eb51e06797a8fa6901e98442f6745cdf002187f7834c6815af71f79fa8da94405e50e3152b5646c06efd81b8986fc229c0ab8947dc9e8366bdd1fb8bbbd0d2723838b8ea9bc8bba5768c3390563a529484ba8503d16bae61377ac3a62eaa9f54f5e1c6301942b30ec5d36529f"
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -4,11 +4,11 @@
|
|||||||
"SteamBootstrapper_UpdatingSteam" "Обновяване на %appname%…"
|
"SteamBootstrapper_UpdatingSteam" "Обновяване на %appname%…"
|
||||||
"SteamBootstrapper_ElevationPrompt" "%appname% трябва да се обнови преди пускането."
|
"SteamBootstrapper_ElevationPrompt" "%appname% трябва да се обнови преди пускането."
|
||||||
"SteamBootstrapper_ReadOnlyInstallOSX" "%appname% няма възможност да записва в папката си. Уверете се, че не се опитвате да стартирате от изображението на диска."
|
"SteamBootstrapper_ReadOnlyInstallOSX" "%appname% няма възможност да записва в папката си. Уверете се, че не се опитвате да стартирате от изображението на диска."
|
||||||
"SteamBootstrapper_RunFromDiskImageOSX" "Моля, преместете %appname% във Вашата папка с приложения, преди да го пуснете."
|
"SteamBootstrapper_RunFromDiskImageOSX" "Моля, провлачете %appname% в папката Ви с приложения, преди да го пуснете."
|
||||||
"SteamBootstrapper_ReadOnlyInstall" "%appname% няма възможност да записва в папката си."
|
"SteamBootstrapper_ReadOnlyInstall" "%appname% няма възможност да записва в папката си."
|
||||||
"SteamBootstrapper_InstallDirNotASCII" "%appname% не може да бъде пуснато от папка, чийто път съдържа символи, които не са на английски. Моля, преинсталирайте %appname% в папката по подразбиране"
|
"SteamBootstrapper_InstallDirNotASCII" "%appname% не може да бъде пуснато от папка, чийто път съдържа символи, които не са на английски. Моля, преинсталирайте %appname% в папката по подразбиране"
|
||||||
"SteamBootstrapper_InstallDirIncompatible" "%appname% не може да се пусне от папка, съдържаща символи, които не са ASCII, в тази версия на Windows. Моля, преинсталирайте %appname% към папката по подразбиране или направете инсталация на Windows 7 или по-нова версия."
|
"SteamBootstrapper_InstallDirIncompatible" "%appname% не може да се пусне от папка, съдържаща символи, които не са ASCII, в тази версия на Windows. Моля, преинсталирайте %appname% към папката по подразбиране или направете инсталация на Windows 7 или по-нова версия."
|
||||||
"SteamBootstrapper_InsufficientDiskSpace" "%appname% се нуждае от %nMegaBytes%MB свободно място, за да бъде обновено."
|
"SteamBootstrapper_InsufficientDiskSpace" "%appname% се нуждае от %nMegaBytes% MB свободно дисково пространство, за да бъде обновено."
|
||||||
"SteamBootstrapper_FailedManifestLoad" "Неуспешно зареждане на манифеста за пакета."
|
"SteamBootstrapper_FailedManifestLoad" "Неуспешно зареждане на манифеста за пакета."
|
||||||
"SteamBootstrapper_FailedManifestVerify" "Неуспешно потвърждаване на манифеста за пакета."
|
"SteamBootstrapper_FailedManifestVerify" "Неуспешно потвърждаване на манифеста за пакета."
|
||||||
"SteamBootstrapper_FailedManifestSave" "Неуспешно запазване на манифеста за пакета."
|
"SteamBootstrapper_FailedManifestSave" "Неуспешно запазване на манифеста за пакета."
|
||||||
@@ -16,8 +16,8 @@
|
|||||||
"SteamBootstrapper_CorruptPackageFile" "Повреден файл на пакета (%pkgName%)."
|
"SteamBootstrapper_CorruptPackageFile" "Повреден файл на пакета (%pkgName%)."
|
||||||
"SteamBootstrapper_FailedPackageUnzip" "Неуспешно разархивиране на пакета (%pkgName%)."
|
"SteamBootstrapper_FailedPackageUnzip" "Неуспешно разархивиране на пакета (%pkgName%)."
|
||||||
"SteamBootstrapper_UpdateApplyFail" "Неуспешно прилагане на обновлението, връщане…"
|
"SteamBootstrapper_UpdateApplyFail" "Неуспешно прилагане на обновлението, връщане…"
|
||||||
"SteamBootstrapper_UpdateCleanup" "Почистване…"
|
"SteamBootstrapper_UpdateCleanup" "Разчистване…"
|
||||||
"SteamBootstrapper_UpdateCleanupFail" "Неуспешно почистване след обновяването, продължаване…"
|
"SteamBootstrapper_UpdateCleanupFail" "Неуспешно разчистване след обновяването, продължаване…"
|
||||||
"SteamBootstrapper_UpdateFinalizeFail" "Неуспешно записване на манифеста за инсталацията."
|
"SteamBootstrapper_UpdateFinalizeFail" "Неуспешно записване на манифеста за инсталацията."
|
||||||
"SteamBootstrapper_UpdateComplete" "Обновяването е завършено, пускане на %appname%..."
|
"SteamBootstrapper_UpdateComplete" "Обновяването е завършено, пускане на %appname%..."
|
||||||
"SteamBootstrapper_UpdateChecking" "Проверяване за достъпни обновления…"
|
"SteamBootstrapper_UpdateChecking" "Проверяване за достъпни обновления…"
|
||||||
@@ -29,12 +29,12 @@
|
|||||||
"SteamBootstrapper_InstallVerify" "Потвърждаване на инсталацията…"
|
"SteamBootstrapper_InstallVerify" "Потвърждаване на инсталацията…"
|
||||||
"SteamBootstrapper_DownloadComplete" "Свалянето е завършено."
|
"SteamBootstrapper_DownloadComplete" "Свалянето е завършено."
|
||||||
"SteamBootstrapper_PercentComplete" "%percent%%% завършено"
|
"SteamBootstrapper_PercentComplete" "%percent%%% завършено"
|
||||||
"SteamBootstrapper_NoNetwork" "%appname% трябва да е на линия, за да се обнови. Моля, проверете интернет връзката си и опитайте отново."
|
"SteamBootstrapper_NoNetwork" "Нужно е %appname% да бъде на линия, за да се обнови. Моля, проверете своята интернет връзка и опитайте отново."
|
||||||
"SteamBootstrapper_FailedMkdir" "Неуспешно създаване на директория %dirname%, получена грешка %errno%"
|
"SteamBootstrapper_FailedMkdir" "Неуспешно създаване на директория %dirname%, получена грешка %errno%"
|
||||||
"SteamBootstrapper_FailedDownloadHTTPError" "Свалянето е неуспешно: http грешка %errno%"
|
"SteamBootstrapper_FailedDownloadHTTPError" "Свалянето е неуспешно: http грешка %errno%"
|
||||||
"SteamBootstrapper_AlreadyRunningError" "Инстанция на %appname% вече е пусната от този компютър, но под различен потребителски акаунт."
|
"SteamBootstrapper_AlreadyRunningError" "Инстанция на %appname% вече е пусната от този компютър, но под различен потребителски акаунт."
|
||||||
"SteamBootstrapper_MoveContentDir_DestExists" "%appname% е променило къде се запазва съдържанието за играта от „~/Documents/%appname% Content“ на „~/Library/Application Support/%appname%/%appname%Apps“. Имате игрални файлове в първоначалното местонахождение и %appname% не успя да премести файловете, тъй като вече съществуват други такива в новото място. Възможно е да се наложи ръчното им преместване или изтриването на старите и игрите да бъдат свалени отново. Продължаване въпреки това?"
|
"SteamBootstrapper_MoveContentDir_DestExists" "%appname% промени къде съхранява игралното съдържание от „~/Documents/Steam Content“ на „~/Library/Application Support/Steam/SteamApps“. Разполагате с игрални файлове в първоначалното местонахождение, а Steam не успя да ги премести, тъй като вече съществуват други такива в новото място. Възможно е да се наложи ръчното им преместване или изтриването на старите файлове, а игрите да бъдат свалени отново. Продължаване въпреки това?"
|
||||||
"SteamBootstrapper_MoveContentDir_CopyError" "%appname% е променило къде се запазва съдържанието за играта от „~/Documents/%appname% Content“ на „~/Library/Application Support/%appname%/%appname%Apps“. Имате игрални файлове в първоначалното местонахождение и %appname% нямаше възможност да премести файловете. Възможно е да се наложи ръчното им преместване или изтриването на старите и игрите да бъдат свалени отново. Продължаване въпреки това?"
|
"SteamBootstrapper_MoveContentDir_CopyError" "Steam промени къде съхранява игралното съдържание от „~/Documents/Steam Content“ на „~/Library/Application Support/Steam/SteamApps“. Разполагате с игрални файлове в първоначалното местонахождение, а Steam не успя да ги премести. Възможно е да се наложи ръчното им преместване или изтриването на старите файлове, а игрите да бъдат свалени отново. Продължаване въпреки това?"
|
||||||
"SteamBootstrapper_OK" "Добре"
|
"SteamBootstrapper_OK" "Добре"
|
||||||
"SteamBootstrapper_Cancel" "Отказ"
|
"SteamBootstrapper_Cancel" "Отказ"
|
||||||
"SteamBootstrapper_WindowTitle" "%appname%"
|
"SteamBootstrapper_WindowTitle" "%appname%"
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ SteamBootstrapper_DownloadComplete "Download complete."
|
|||||||
SteamBootstrapper_PercentComplete "%percent%%% complete"
|
SteamBootstrapper_PercentComplete "%percent%%% complete"
|
||||||
SteamBootstrapper_NoNetwork "%appname% needs to be online to update. Please confirm your network connection and try again."
|
SteamBootstrapper_NoNetwork "%appname% needs to be online to update. Please confirm your network connection and try again."
|
||||||
SteamBootstrapper_FailedMkdir "Couldn't create directory %dirname%, got error %errno%"
|
SteamBootstrapper_FailedMkdir "Couldn't create directory %dirname%, got error %errno%"
|
||||||
|
SteamBootstrapper_NotWriteable "Directory %dirname% not writable."
|
||||||
SteamBootstrapper_FailedDownloadHTTPError "Download failed: http error %errno%"
|
SteamBootstrapper_FailedDownloadHTTPError "Download failed: http error %errno%"
|
||||||
SteamBootstrapper_AlreadyRunningError "An instance of %appname% is already running on this computer, under a different user account."
|
SteamBootstrapper_AlreadyRunningError "An instance of %appname% is already running on this computer, under a different user account."
|
||||||
SteamBootstrapper_MoveContentDir_DestExists "%appname% has changed where it stores game content from '~/Documents/Steam Content' to '~/Library/Application Support/Steam/SteamApps'. You have game files in the original location, and Steam was not able to move the files because files already exist at the new location. You may need to move the files manually, or delete the old files and download your games again. Continue anyway?"
|
SteamBootstrapper_MoveContentDir_DestExists "%appname% has changed where it stores game content from '~/Documents/Steam Content' to '~/Library/Application Support/Steam/SteamApps'. You have game files in the original location, and Steam was not able to move the files because files already exist at the new location. You may need to move the files manually, or delete the old files and download your games again. Continue anyway?"
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
"SteamBootstrapper_ReadOnlyInstallOSX" "インストール ディレクトリに書き込むことができません。ディスク イメージから起動していないかご確認ください。"
|
"SteamBootstrapper_ReadOnlyInstallOSX" "インストール ディレクトリに書き込むことができません。ディスク イメージから起動していないかご確認ください。"
|
||||||
"SteamBootstrapper_RunFromDiskImageOSX" "起動する前に%appname%をアプリケーションフォルダにドラッグしてください。"
|
"SteamBootstrapper_RunFromDiskImageOSX" "起動する前に%appname%をアプリケーションフォルダにドラッグしてください。"
|
||||||
"SteamBootstrapper_ReadOnlyInstall" "インストール ディレクトリに書き込めません。"
|
"SteamBootstrapper_ReadOnlyInstall" "インストール ディレクトリに書き込めません。"
|
||||||
"SteamBootstrapper_InstallDirNotASCII" "%appname% は英語以外の文字が含まれるフォルダパス名から実行することはできません。 %appname% を標準のフォルダに再インストールしてください。"
|
"SteamBootstrapper_InstallDirNotASCII" "%appname%は英語以外の文字が含まれるフォルダーパス名から実行することはできません。 %appname%を標準のフォルダーに再インストールしてください。"
|
||||||
"SteamBootstrapper_InstallDirIncompatible" "%appname% は、このバージョンの Windows 上では ASCII 以外の文字が含まれるフォルダパス名から実行することはできません。 %appname% を標準のフォルダに再インストールするか、Windows 7 以降にインストールしてください。"
|
"SteamBootstrapper_InstallDirIncompatible" "%appname%は、このバージョンのWindows上ではASCII以外の文字が含まれるフォルダーパス名から実行することはできません。 %appname%を標準のフォルダーに再インストールするか、Windows 7以降にインストールしてください。"
|
||||||
"SteamBootstrapper_InsufficientDiskSpace" "%appname% の更新には、ディスク領域に%nMegaBytes%MB の空き容量が必要です。"
|
"SteamBootstrapper_InsufficientDiskSpace" "%appname% の更新には、ディスク領域に%nMegaBytes%MB の空き容量が必要です。"
|
||||||
"SteamBootstrapper_FailedManifestLoad" "パッケージ リストを読み込めませんでした。"
|
"SteamBootstrapper_FailedManifestLoad" "パッケージ リストを読み込めませんでした。"
|
||||||
"SteamBootstrapper_FailedManifestVerify" "パッケージ リストを検証できませんでした。"
|
"SteamBootstrapper_FailedManifestVerify" "パッケージ リストを検証できませんでした。"
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
"SteamBootstrapper_NoNetwork" "%appname% の更新にはインターネットにアクセスする必要があります。ネットワーク接続をご確認のうえ、もう一度お試しください。"
|
"SteamBootstrapper_NoNetwork" "%appname% の更新にはインターネットにアクセスする必要があります。ネットワーク接続をご確認のうえ、もう一度お試しください。"
|
||||||
"SteamBootstrapper_FailedMkdir" "ディレクトリ \"%dirname%\" を作成できませんでした。エラー %errno%"
|
"SteamBootstrapper_FailedMkdir" "ディレクトリ \"%dirname%\" を作成できませんでした。エラー %errno%"
|
||||||
"SteamBootstrapper_FailedDownloadHTTPError" "ダウンロードできませんでした:http エラー %errno%"
|
"SteamBootstrapper_FailedDownloadHTTPError" "ダウンロードできませんでした:http エラー %errno%"
|
||||||
"SteamBootstrapper_AlreadyRunningError" "このコンピュータでは、既に %appname% が別のユーザーアカウントで実行されています。"
|
"SteamBootstrapper_AlreadyRunningError" "このコンピューターでは、すでに%appname%が別のユーザーアカウントで実行されています。"
|
||||||
"SteamBootstrapper_MoveContentDir_DestExists" "%appname% のゲームコンテンツ保管場所が '~/Documents/Steam Content' から '~/Library/Application Support/Steam/SteamApps' に変更されました。変更前の場所にゲームファイルがあるため自動で新しい場所に移動しようとしましたが、すでに新しい場所にファイルがあるために移動できませんでした。手動でファイルを移動するか、古いファイルを削除してゲームをダウンロードしなおす必要がある可能性があります。このまま続けますか?"
|
"SteamBootstrapper_MoveContentDir_DestExists" "%appname% のゲームコンテンツ保管場所が '~/Documents/Steam Content' から '~/Library/Application Support/Steam/SteamApps' に変更されました。変更前の場所にゲームファイルがあるため自動で新しい場所に移動しようとしましたが、すでに新しい場所にファイルがあるために移動できませんでした。手動でファイルを移動するか、古いファイルを削除してゲームをダウンロードしなおす必要がある可能性があります。このまま続けますか?"
|
||||||
"SteamBootstrapper_MoveContentDir_CopyError" "%appname%のゲームコンテンツ保管場所が '~/Documents/Steam Content' から '~/Library/Application Support/Steam/SteamApps' に変更されました。変更前の場所にゲームファイルがあるため自動で新しい場所に移動しようとしましたが、できませんでした。手動でファイルを移動するか、古いファイルを削除してゲームをダウンロードしなおす必要がある可能性があります。このまま続けますか?"
|
"SteamBootstrapper_MoveContentDir_CopyError" "%appname%のゲームコンテンツ保管場所が '~/Documents/Steam Content' から '~/Library/Application Support/Steam/SteamApps' に変更されました。変更前の場所にゲームファイルがあるため自動で新しい場所に移動しようとしましたが、できませんでした。手動でファイルを移動するか、古いファイルを削除してゲームをダウンロードしなおす必要がある可能性があります。このまま続けますか?"
|
||||||
"SteamBootstrapper_OK" "OK"
|
"SteamBootstrapper_OK" "OK"
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -8,7 +8,13 @@
|
|||||||
{
|
{
|
||||||
"steamglobal"
|
"steamglobal"
|
||||||
{
|
{
|
||||||
"steamcdn-a.akamaihd.net"
|
"cdn.akamai.steamstatic.com"
|
||||||
|
{
|
||||||
|
"base_url" "/client/"
|
||||||
|
"weight" "100"
|
||||||
|
"https" "1"
|
||||||
|
}
|
||||||
|
"cdn.cloudflare.steamstatic.com"
|
||||||
{
|
{
|
||||||
"base_url" "/client/"
|
"base_url" "/client/"
|
||||||
"weight" "100"
|
"weight" "100"
|
||||||
@@ -17,7 +23,7 @@
|
|||||||
"media.st.dl.pinyuncloud.com"
|
"media.st.dl.pinyuncloud.com"
|
||||||
{
|
{
|
||||||
"base_url" "/client/"
|
"base_url" "/client/"
|
||||||
"weight" "1000"
|
"weight" "10000"
|
||||||
"country_codes" "CN"
|
"country_codes" "CN"
|
||||||
"https" "1"
|
"https" "1"
|
||||||
}
|
}
|
||||||
@@ -36,12 +42,12 @@
|
|||||||
}
|
}
|
||||||
"kvsign2"
|
"kvsign2"
|
||||||
{
|
{
|
||||||
"Hosts" "10de01f6c02b907028ab21d756018843e4615f71554a461ed4ae8f799c6a2a2829429b17410eea5332ec188c648a873b961ac41a3456687c8f9d4b87a840ff01"
|
"Hosts" "0da3ef8e55a58afb9fa5466255eb9017abcb3f4b0d7df33dc5a886d86584adbba4c23558df23771b20e07a5086d5c3fe743fd2907b194befa9dd26fecaf8ea04"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"ClientInfo"
|
"ClientInfo"
|
||||||
{
|
{
|
||||||
"valid_until" "1611062209"
|
"valid_until" "1630963824"
|
||||||
"ip_country_code" "US"
|
"ip_country_code" "US"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
21
|
27
|
||||||
|
|||||||
@@ -67,18 +67,18 @@
|
|||||||
:aot :all
|
:aot :all
|
||||||
|
|
||||||
:warn-on-reflection true}
|
:warn-on-reflection true}
|
||||||
:steam {:dependencies [[com.code-disaster.steamworks4j/steamworks4j "1.2.2"]]
|
:steam {:dependencies [[com.code-disaster.steamworks4j/steamworks4j "1.2.3"]]
|
||||||
:jvm-opts ["-Dis-desktop=true" "-Dui_scale=1.0" "-Dplatform=desktop"]}
|
:jvm-opts ["-Dis-desktop=true" "-Dui_scale=1.0" "-Dplatform=desktop"]}
|
||||||
:non-steam { :jvm-opts ["-Dis-desktop=true" "-Dui_scale=1.0" "-Dplatform=desktop"]}
|
:non-steam { :jvm-opts ["-Dis-desktop=true" "-Dui_scale=1.0" "-Dplatform=desktop"]}
|
||||||
:steam-dev {
|
:steam-dev {
|
||||||
:source-paths ["src" "src-common" "src-dev"]
|
:source-paths ["src" "src-common" "src-dev"]
|
||||||
:jvm-opts ["-Duse-repl=true" "-Dui_scale=1.0" "-Dis-desktop=true" "-Dplatform=desktop"]
|
:jvm-opts ["-Duse-repl=true" "-Dui_scale=1.0" "-Dis-desktop=true" "-Dplatform=desktop" "-XstartOnFirstThread" ]
|
||||||
:dependencies [[com.badlogicgames.gdx/gdx-tools "1.9.5"]
|
:dependencies [#_[com.badlogicgames.gdx/gdx-tools "1.9.5"]
|
||||||
[org.clojure/tools.nrepl "0.2.7"]
|
[org.clojure/tools.nrepl "0.2.7"]
|
||||||
[play-clj-nrepl "0.1.0" :exclusions [play-clj]]
|
[play-clj-nrepl "0.1.0" :exclusions [play-clj]]
|
||||||
[slamhound "1.5.5"]
|
[slamhound "1.5.5"]
|
||||||
[org.clojure/data.csv "0.1.3"]
|
[org.clojure/data.csv "0.1.3"]
|
||||||
[com.code-disaster.steamworks4j/steamworks4j "1.2.2"]]
|
[com.code-disaster.steamworks4j/steamworks4j "1.2.3"]]
|
||||||
|
|
||||||
:aot :all
|
:aot :all
|
||||||
:warn-on-reflection true}
|
:warn-on-reflection true}
|
||||||
|
|||||||
@@ -756,6 +756,7 @@
|
|||||||
:none))
|
:none))
|
||||||
(log/info "Entering room " new-background )
|
(log/info "Entering room " new-background )
|
||||||
(screen! dialogue/talking-screen :stop-talk { :id :bg-actions})
|
(screen! dialogue/talking-screen :stop-talk { :id :bg-actions})
|
||||||
|
|
||||||
(run-action entities
|
(run-action entities
|
||||||
(begin [this screen entities]
|
(begin [this screen entities]
|
||||||
(utils/stop-all-sounds! entities)
|
(utils/stop-all-sounds! entities)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
(ns advent.saves)
|
(ns advent.saves)
|
||||||
|
|
||||||
(def chapters
|
(def chapters
|
||||||
{:chapter-1 nil
|
{:chapter-1 {:state {:y 54.93726516381327, :active? true, :plaques-read #{}, :time :intro, :inventory [], :seen-intro? false, :clues #{}, :hud-active? false, :x 139.7490606552531, :last-room :dream, :mints-eaten 0, :object nil, :obtained-items #{}}}
|
||||||
:chapter-2 nil
|
:chapter-2 nil
|
||||||
:chapter-3 nil
|
:chapter-3 nil
|
||||||
:chapter-4 nil
|
:chapter-4 nil
|
||||||
|
|||||||
@@ -319,8 +319,9 @@
|
|||||||
:cursor :hand
|
:cursor :hand
|
||||||
:label "Suspicous looking rock"
|
:label "Suspicous looking rock"
|
||||||
:script (actions/get-script entities
|
:script (actions/get-script entities
|
||||||
(when (and (actions/has-obtained? entities :note-1)
|
(if (and (actions/has-obtained? entities :note-1)
|
||||||
(not (actions/has-obtained? entities :walkie-talkies)))
|
(not (actions/has-obtained? entities :walkie-talkies)))
|
||||||
|
(do
|
||||||
(actions/walk-to entities :ego [85 99])
|
(actions/walk-to entities :ego [85 99])
|
||||||
(actions/play-animation entities :ego :squat)
|
(actions/play-animation entities :ego :squat)
|
||||||
(actions/do-dialogue entities
|
(actions/do-dialogue entities
|
||||||
@@ -335,7 +336,12 @@
|
|||||||
(actions/play-animation entities :ego :squat)
|
(actions/play-animation entities :ego :squat)
|
||||||
(actions/give entities :walkie-talkies)
|
(actions/give entities :walkie-talkies)
|
||||||
(actions/talk entities :ego "Tin cans connected with string?")
|
(actions/talk entities :ego "Tin cans connected with string?")
|
||||||
(actions/do-dialogue entities :ego "I wonder what all of these magic devices do.")))}
|
(actions/do-dialogue entities :ego "I wonder what all of these magic devices do."))
|
||||||
|
(do
|
||||||
|
(actions/walk-to entities :ego [85 99])
|
||||||
|
(actions/play-animation entities :ego :squat)
|
||||||
|
(actions/do-dialogue entities
|
||||||
|
:ego "I've looted everything in here!"))))}
|
||||||
:grass {:box [26 105 60 160]
|
:grass {:box [26 105 60 160]
|
||||||
:cursor :hand
|
:cursor :hand
|
||||||
:label "Grass"
|
:label "Grass"
|
||||||
@@ -492,6 +498,54 @@
|
|||||||
:flask-water-flies (try-flask)
|
:flask-water-flies (try-flask)
|
||||||
:flask-flies-ash (try-flask)
|
:flask-flies-ash (try-flask)
|
||||||
:spell-component (try-flask)
|
:spell-component (try-flask)
|
||||||
|
:glass-eye (actions/get-script entities
|
||||||
|
(cond
|
||||||
|
(actions/has-obtained? entities :feather)
|
||||||
|
(do (actions/walk-to entities :ego [141 54] :face :right)
|
||||||
|
(actions/do-dialogue entities
|
||||||
|
:ego "Could you use this as a monocle?"
|
||||||
|
:owl "You already gave me my monocle, silly boy!"))
|
||||||
|
(get-in @entities [:state :wants-monocle?])
|
||||||
|
(do
|
||||||
|
(actions/walk-to entities :ego [141 54] :face :right)
|
||||||
|
(actions/do-dialogue entities
|
||||||
|
:ego "Could you use this glass eye as a monocle?"
|
||||||
|
:owl "It is the choicest of eyes."
|
||||||
|
:owl "But a human eye won't fit.")
|
||||||
|
(do-puke entities))
|
||||||
|
|
||||||
|
:else
|
||||||
|
(actions/talk entities :ego "Why would an owl want that?")))
|
||||||
|
|
||||||
|
:motivational-tapes (actions/get-script entities
|
||||||
|
(cond
|
||||||
|
(get-in @entities [:state :wants-monocle?])
|
||||||
|
(do
|
||||||
|
(actions/walk-to entities :ego [141 54] :face :right)
|
||||||
|
(actions/do-dialogue entities
|
||||||
|
:ego "Could these motivational tapes help you hunt?"
|
||||||
|
:owl "I already have the strength of will."
|
||||||
|
:owl "Just not the strength of stomach.")
|
||||||
|
(do-puke entities))
|
||||||
|
|
||||||
|
:else
|
||||||
|
(actions/talk entities :ego "Why would an owl want that?")))
|
||||||
|
|
||||||
|
:earplugs (actions/get-script entities
|
||||||
|
(cond
|
||||||
|
(get-in @entities [:state :wants-monocle?])
|
||||||
|
(do
|
||||||
|
(actions/walk-to entities :ego [141 54] :face :right)
|
||||||
|
(actions/do-dialogue entities
|
||||||
|
:ego "Could these earplugs help you hunt?"
|
||||||
|
:owl "No, I rely on my hearing too much.")
|
||||||
|
(do-puke entities))
|
||||||
|
|
||||||
|
:else
|
||||||
|
(actions/talk entities :ego "Why would an owl want that?")))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
:flask-1-strength (actions/get-script entities
|
:flask-1-strength (actions/get-script entities
|
||||||
(cond
|
(cond
|
||||||
|
|||||||
@@ -123,6 +123,7 @@
|
|||||||
(fn [screen entities]
|
(fn [screen entities]
|
||||||
(tween/tween :arm-y screen [:room :entities :arm :y] 240 70 3.0 :ease tween/ease-linear)))
|
(tween/tween :arm-y screen [:room :entities :arm :y] 240 70 3.0 :ease tween/ease-linear)))
|
||||||
|
|
||||||
|
|
||||||
(actions/transition-background entities :tongue-fight [141 240])
|
(actions/transition-background entities :tongue-fight [141 240])
|
||||||
(actions/walk-straight-to entities :ego [141 110] :anim :tongue-idle :speed 4.0))
|
(actions/walk-straight-to entities :ego [141 110] :anim :tongue-idle :speed 4.0))
|
||||||
|
|
||||||
|
|||||||
@@ -140,7 +140,7 @@
|
|||||||
:script (actions/get-script entities
|
:script (actions/get-script entities
|
||||||
(actions/talk entities :ego "That's my house. I'd rather play outside."))}
|
(actions/talk entities :ego "That's my house. I'd rather play outside."))}
|
||||||
:sherrif-house {:box [138 143 160 168]
|
:sherrif-house {:box [138 143 160 168]
|
||||||
:label "Sherriff's house"
|
:label "Sheriff's house"
|
||||||
:cursor :look
|
:cursor :look
|
||||||
:script (actions/get-script entities
|
:script (actions/get-script entities
|
||||||
(actions/do-dialogue entities
|
(actions/do-dialogue entities
|
||||||
|
|||||||
@@ -364,6 +364,7 @@
|
|||||||
:scale-fn (constantly 1.0)
|
:scale-fn (constantly 1.0)
|
||||||
:start-pos [141 110]
|
:start-pos [141 110]
|
||||||
:apply-state (fn [screen e]
|
:apply-state (fn [screen e]
|
||||||
|
(screen! @(resolve 'advent.screens.scene/hud) :on-tongue-fight {})
|
||||||
(-> e
|
(-> e
|
||||||
(update-in [:room :entities :ego] #(actions/start-animation screen % :tongue-idle))
|
(update-in [:room :entities :ego] #(actions/start-animation screen % :tongue-idle))
|
||||||
(assoc-in [:room :entities :ego :stand-override] :tongue-idle)
|
(assoc-in [:room :entities :ego :stand-override] :tongue-idle)
|
||||||
|
|||||||
@@ -1515,7 +1515,6 @@
|
|||||||
)))
|
)))
|
||||||
|
|
||||||
:on-tap (fn [screen entities options]
|
:on-tap (fn [screen entities options]
|
||||||
(println "tapping")
|
|
||||||
(when utils/mobile?
|
(when utils/mobile?
|
||||||
(handle-touch-up screen entities options)))
|
(handle-touch-up screen entities options)))
|
||||||
|
|
||||||
@@ -1551,6 +1550,7 @@
|
|||||||
(screen! toast-screen :on-toast { :message (str "Saved \"" save-name "\"")}))))
|
(screen! toast-screen :on-toast { :message (str "Saved \"" save-name "\"")}))))
|
||||||
|
|
||||||
:on-menu (fn [{:keys [viewport] :as screen} entities options]
|
:on-menu (fn [{:keys [viewport] :as screen} entities options]
|
||||||
|
(println "HERE TESTTTT")
|
||||||
(when-not (or (get-in entities [:tweens :fade-out])
|
(when-not (or (get-in entities [:tweens :fade-out])
|
||||||
(get-in entities [:tweens :fade-in]))
|
(get-in entities [:tweens :fade-in]))
|
||||||
|
|
||||||
@@ -1621,7 +1621,7 @@
|
|||||||
(let [scene-entities (-> scene :entities deref)]
|
(let [scene-entities (-> scene :entities deref)]
|
||||||
(and (not (get-in scene-entities [:fg-actions :script-running?]))
|
(and (not (get-in scene-entities [:fg-actions :script-running?]))
|
||||||
(get-in scene-entities [:state :active?])
|
(get-in scene-entities [:state :active?])
|
||||||
(not= (get-in scene-entities [:state :last-room]) :tongue-fight)
|
|
||||||
(= 0.0 (get-in scene-entities [:fade :opacity])))))
|
(= 0.0 (get-in scene-entities [:fade :opacity])))))
|
||||||
|
|
||||||
(defmulti transition-hud (fn [screen entities new-state state-data]
|
(defmulti transition-hud (fn [screen entities new-state state-data]
|
||||||
@@ -1960,11 +1960,15 @@
|
|||||||
:x (- 320 (* utils/ui-scale 16) 4) :y 240
|
:x (- 320 (* utils/ui-scale 16) 4) :y 240
|
||||||
:origin-x 16 :origin-y 16
|
:origin-x 16 :origin-y 16
|
||||||
:width 16 :height 16
|
:width 16 :height 16
|
||||||
|
:enabled? (not= (get-in (-> scene :entities deref) [:state :last-room])
|
||||||
|
:tongue-fight)
|
||||||
:baseline 9000
|
:baseline 9000
|
||||||
:opacity 0.8)
|
:opacity 0.8)
|
||||||
:inventory (assoc (utils/atlas->texture global-atlas "inventory") :x (* 21 utils/ui-scale ) :y (* 27 utils/ui-scale ) :baseline 9000
|
:inventory (assoc (utils/atlas->texture global-atlas "inventory") :x (* 21 utils/ui-scale ) :y (* 27 utils/ui-scale ) :baseline 9000
|
||||||
:intersect-width 42 :intersect-height 48
|
:intersect-width 42 :intersect-height 48
|
||||||
:width 42 :height 56
|
:width 42 :height 56
|
||||||
|
:enabled? (not= (get-in (-> scene :entities deref) [:state :last-room])
|
||||||
|
:tongue-fight)
|
||||||
:origin-x 21 :origin-y 27
|
:origin-x 21 :origin-y 27
|
||||||
:scale-x utils/ui-scale :scale-y utils/ui-scale
|
:scale-x utils/ui-scale :scale-y utils/ui-scale
|
||||||
:open (utils/flip (doto (utils/make-anim-seq global-atlas "open-inventory" [42 56] 0.055 (flatten [(range 6) 6 7 8 7 ]))
|
:open (utils/flip (doto (utils/make-anim-seq global-atlas "open-inventory" [42 56] 0.055 (flatten [(range 6) 6 7 8 7 ]))
|
||||||
@@ -1981,6 +1985,13 @@
|
|||||||
:fps (->> (assoc (label "" (color :white) ) :y 10 :x 280 :baseline 0 :opacity 0.1)
|
:fps (->> (assoc (label "" (color :white) ) :y 10 :x 280 :baseline 0 :opacity 0.1)
|
||||||
(utils/add-actor-to-stage screen))}))
|
(utils/add-actor-to-stage screen))}))
|
||||||
|
|
||||||
|
:on-tongue-fight
|
||||||
|
(fn [screen entities options]
|
||||||
|
(println "OPTIONS ARE" screen)
|
||||||
|
(-> entities
|
||||||
|
(assoc-in [:inventory :enabled?] false)
|
||||||
|
(assoc-in [:save :enabled?] false)))
|
||||||
|
|
||||||
:on-render
|
:on-render
|
||||||
(fn [{:keys [^FitViewport viewport] :as screen} entities options]
|
(fn [{:keys [^FitViewport viewport] :as screen} entities options]
|
||||||
(.apply viewport)
|
(.apply viewport)
|
||||||
@@ -2008,17 +2019,22 @@
|
|||||||
(update-in entities [:save] assoc :r 0.75 :g 0.75 :b 0.75)
|
(update-in entities [:save] assoc :r 0.75 :g 0.75 :b 0.75)
|
||||||
(grow-hud screen entities :save false)))
|
(grow-hud screen entities :save false)))
|
||||||
|
|
||||||
entities (or (process-fsm screen entities) entities)]
|
entities (or (process-fsm screen entities) entities)
|
||||||
|
on-tongue-fight? (= :tongue-fight
|
||||||
|
(get-in (-> scene :entities deref) [:state :last-room]))]
|
||||||
#_(label! (:fps entities) :set-text (str (game :fps)))
|
#_(label! (:fps entities) :set-text (str (game :fps)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
(when (:enabled? (:save entities))
|
||||||
(render-one screen (if (and hud-interactable? (not (:already-saved? entities)))
|
(render-one screen (if (and hud-interactable? (not (:already-saved? entities)))
|
||||||
(:save entities)
|
(:save entities)
|
||||||
(assoc (:save entities) :opacity 0.5)))
|
(assoc (:save entities) :opacity 0.5))))
|
||||||
|
|
||||||
|
(when (:enabled? (:inventory entities))
|
||||||
(render-one screen (if hud-interactable?
|
(render-one screen (if hud-interactable?
|
||||||
(:inventory entities)
|
(:inventory entities)
|
||||||
(assoc (:inventory entities) :opacity 0.5)))
|
(assoc (:inventory entities) :opacity 0.5))))
|
||||||
(render-one screen (:selected-item entities))
|
(render-one screen (:selected-item entities))
|
||||||
(render-one screen (:close entities))
|
(render-one screen (:close entities))
|
||||||
entities))
|
entities))
|
||||||
@@ -2116,6 +2132,7 @@
|
|||||||
|
|
||||||
:on-tap
|
:on-tap
|
||||||
(fn [screen entities options]
|
(fn [screen entities options]
|
||||||
|
(println "is enabled?" (:enabled? (:inventory entities)))
|
||||||
(if (= (button-code :left) (:button options))
|
(if (= (button-code :left) (:button options))
|
||||||
(let [[x y] (utils/unproject screen options)]
|
(let [[x y] (utils/unproject screen options)]
|
||||||
(cond
|
(cond
|
||||||
@@ -2123,7 +2140,8 @@
|
|||||||
nil
|
nil
|
||||||
|
|
||||||
|
|
||||||
(utils/intersects? (:inventory entities) [x y])
|
(and (utils/intersects? (:inventory entities) [x y])
|
||||||
|
(:enabled? (:inventory entities)))
|
||||||
|
|
||||||
(if (= :selected (get-in entities [:inv-fsm :state]))
|
(if (= :selected (get-in entities [:inv-fsm :state]))
|
||||||
(update-in entities [:inv-fsm :pending-states] conj [:none (get-in entities [:inv-fsm :state-data])])
|
(update-in entities [:inv-fsm :pending-states] conj [:none (get-in entities [:inv-fsm :state-data])])
|
||||||
@@ -2135,7 +2153,7 @@
|
|||||||
(utils/intersects? (:close entities) [x y])
|
(utils/intersects? (:close entities) [x y])
|
||||||
(screen! scene :on-menu {})
|
(screen! scene :on-menu {})
|
||||||
|
|
||||||
(and (not (:already-saved? entities)) (utils/intersects? (:save entities) [x y]) (hud-interactable?))
|
(and (not (:already-saved? entities)) (utils/intersects? (:save entities) [x y]) (hud-interactable?) (:enabled? (:save entities)))
|
||||||
(do
|
(do
|
||||||
(screen! scene :on-save {})
|
(screen! scene :on-save {})
|
||||||
(assoc entities :already-saved? true))
|
(assoc entities :already-saved? true))
|
||||||
|
|||||||
@@ -36,11 +36,14 @@
|
|||||||
#_(.setForegroundFPS 60)
|
#_(.setForegroundFPS 60)
|
||||||
(.setHdpiMode Lwjgl3ApplicationConfiguration$HdpiMode/Pixels)
|
(.setHdpiMode Lwjgl3ApplicationConfiguration$HdpiMode/Pixels)
|
||||||
(.setTitle "Tick's Tales: Up All Knight")
|
(.setTitle "Tick's Tales: Up All Knight")
|
||||||
(.setWindowIcon (into-array ["icon/icon128x128.png"
|
(.setWindowIcon (into-array ["icon/icon_128x128.png"
|
||||||
"icon/icon32x32.png"
|
"icon/icon_32x32.png"
|
||||||
"icon/icon16x16.png"])))
|
"icon/icon_16x16.png"]))
|
||||||
|
(.setWindowedMode (* 640 2) (* 480 2)))
|
||||||
#_(set! (.foregroundFPS cfg) 60)
|
#_(set! (.foregroundFPS cfg) 60)
|
||||||
#_(set! (.backgroundFPS cfg) 60)
|
#_(set! (.backgroundFPS cfg) 60)
|
||||||
|
#_(set! (.windowWidth cfg) (* 640 2))
|
||||||
|
#_(set! (.windowHeight cfg) (* 480 2))
|
||||||
(System/setProperty "org.lwjgl.opengl.Display.enableHighDPI" "false")
|
(System/setProperty "org.lwjgl.opengl.Display.enableHighDPI" "false")
|
||||||
(System/setProperty "org.lwjgl.opengl.Display.disableOSXFullscreenModeAPI" "true")
|
(System/setProperty "org.lwjgl.opengl.Display.disableOSXFullscreenModeAPI" "true")
|
||||||
#_(System/setProperty "org.lwjgl.opengl.Window.undecorated", "true")
|
#_(System/setProperty "org.lwjgl.opengl.Window.undecorated", "true")
|
||||||
|
|||||||
@@ -17,11 +17,11 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>2.0.12</string>
|
<string>2.0.18</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>149</string>
|
<string>151</string>
|
||||||
<key>CFBundleIconName</key>
|
<key>CFBundleIconName</key>
|
||||||
<string>AppIcon</string>
|
<string>AppIcon</string>
|
||||||
<key>MinimumOSVersion</key>
|
<key>MinimumOSVersion</key>
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
(def version (str "2.0." (clojure.string/trim-newline (slurp "../desktop/last-release")) "-snapshot"))
|
(def version (str "2.0." (clojure.string/trim-newline (slurp "../desktop/last-release")) "-snapshot"))
|
||||||
(defproject advent version
|
(defproject advent version
|
||||||
:description "FIXME: write description"
|
:description "FIXME: write description"
|
||||||
:dependencies [[com.badlogicgames.gdx/gdx "1.9.4"]
|
:dependencies [[com.badlogicgames.gdx/gdx "1.9.5"]
|
||||||
[com.badlogicgames.gdx/gdx-backend-robovm "1.9.4"]
|
[com.badlogicgames.gdx/gdx-backend-robovm "1.9.5"]
|
||||||
[org.clojure/core.async "0.2.385"]
|
[org.clojure/core.async "0.2.385"]
|
||||||
[org.clojars.notid/tools.logging "0.3.2-SNAPSHOT"]
|
[org.clojars.notid/tools.logging "0.3.2-SNAPSHOT"]
|
||||||
[log4j/log4j "1.2.16"]
|
[log4j/log4j "1.2.16"]
|
||||||
|
|||||||
Reference in New Issue
Block a user