From 24ec0a08a813f9daa20d5de555f3cd974ddfbf39 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Mon, 7 Mar 2016 13:44:48 +0900 Subject: [PATCH] successfully implemented fluidal movement resistance, batch command processing Former-commit-id: 64282c01aac622cce25cf7c9a79f53059d8f6547 Former-commit-id: d96a602887400c91bfee7660c29f12118858e6f3 --- .../Terrarum/Actors/ActorWithBody.class | Bin 18398 -> 18540 bytes .../ConsoleCommand/Authenticator.class | Bin 2193 -> 2197 bytes .../Terrarum/ConsoleCommand/Batch.class | Bin 0 -> 1819 bytes .../ConsoleCommand/CodexEdictis.class | Bin 3119 -> 3118 bytes .../Terrarum/ConsoleCommand/CommandDict.class | Bin 2772 -> 2965 bytes .../Terrarum/ConsoleCommand/Echo.class | Bin 1174 -> 2061 bytes .../Terrarum/ConsoleCommand/GetAV.class | Bin 3204 -> 3203 bytes .../ConsoleCommand/GetFactioning.class | Bin 3804 -> 3804 bytes .../Terrarum/ConsoleCommand/SetLocale.class | Bin 2495 -> 2494 bytes .../Terrarum/TileProperties/propdata.csv | 6 ++--- res/batchtest.txt | 4 +++ .../Terrarum/Actors/ActorWithBody.java | 20 +++++++++----- .../ConsoleCommand/Authenticator.java | 5 ++-- .../Terrarum/ConsoleCommand/Batch.java | 25 ++++++++++++++++++ .../Terrarum/ConsoleCommand/CommandDict.java | 3 +++ .../Torvald/Terrarum/ConsoleCommand/Echo.java | 13 ++++++--- .../Terrarum/TileProperties/propdata.csv | 6 ++--- 17 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Batch.class create mode 100644 res/batchtest.txt create mode 100644 src/com/Torvald/Terrarum/ConsoleCommand/Batch.java diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/ActorWithBody.class index 1ba4a221d65e10d56ee129ce07c3b0131d24a9f1..b6982e9c191f9aba9ecec4e56aad7beadf354bf9 100644 GIT binary patch literal 18540 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 CbmC(G diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class index fe83ed89a3d5cd868363110ef0ee6840daa62d76..8230c03b5b70b60958a8880d941b1bc665a55933 100644 GIT binary patch delta 97 zcmbOzI8|`NHa14>$=lg_?d=%&85kG@7}yvD8MqjPfIJZ(Das(hAjY81AkJV6Wce~k xGDI^-G2}8xGZZk$GL$gLGn6wZGE_4tPp)V0U{ssT!C}j)&A`f_Guey79RS!X4txLr delta 93 zcmbO#I8kuJHa14}$=lg_t*sdN7#J7?7}yvD8MqjP8Tc7Q86+6Q8PtKKF@q$7FM||A uG=nrlE`tn10fQVv34;PdIfD{IHG|6JX7&!CDLfputU3&=47!v3INSlYln!G6 diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Batch.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Batch.class new file mode 100644 index 0000000000000000000000000000000000000000..25c8fde3cfcd0097bc02841b42b16a4c0a943cd6 GIT binary patch literal 1819 zcma)6+j0{}5Iv*Y;`IuQ3APCYYz#rN6K^mM5JZ4jh~Pv95(x(?PovdHTD-fX+MRXT zf5RKkc`=t%_<&TtDV3hp2Fn*Hy-d%o&*?tX(|`Z_?md7NJTq||b0#ig-oPajm+_^E zD=1CU>C!lCd}E@Bs|J=$jA8B=u4%hs;9CRN4cuTT+;#(3-C@X<${P&1s%#5}6LmKb zk7BA=<0R4nNvMCVpyy@(zly3+~Qu_Zi+DEVeH#g8AQ?(Rq6XY zXxpn?IlT&lA-07RE5e*A{a$~;x47-`pldf&=myV+OhQ=Flolp%(!h5XZh>N&I2eY3+ZMjZ z9RqhQ+`|uaWmQTQsgU>Ah3d(6bfSRO2~^44pFqvR1N>;>)E z^<3bNE>VUH|BI3kbmG9#b({Q@*cTxMJ)P)sn4e_n$gsv8l4UlH;UggB4FiuXJVwJn zli}jtJG#M^+!S`5`>i&oGUgrbC>icBjQe{l1Jno#btyOFK7+Lu1R|_@Jc_hz{|x7! z;tf8;L;B>Nh%OBrD~DfhXlI{ebEhwcuaAB>p!~FN`l3mTNs+7E^BS%aB=_~ven!&4 z)&eEMekf=(@EgPBL&6><1jG4H-@_cW=;NTKOHDgVmO2xSx`o?h8QJ{8Yp_3PlEEn& z3(4jfKBKucxPa4`q7~H-X6Tl7-XgFJ+0x?s{7cNfL1rN2gh N1Pc`UBEG`c{{di`<-z~} literal 0 HcmV?d00001 diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class index 4b07552cd02012758426082e15acddc3b245ae78..33b5ac130de4979e8721307164ebce1a11b76c86 100644 GIT binary patch delta 32 ncmZ24u})$`B$KdEPGW9SN}@_ZQD$C=PiAq6is|NDrbC49^M ze}F=Qi5-WP3pZ}uxxha#?v1gkv0c1+=iI7Sx9)xQZOPQq(3d~&J^;nMP;8@9azJ6D z(@g^hT^y2hDPrg}L7$6mNsmI&>Ef`&uZT0)D>qQREstD>v5+JEXJV;F>bwg zSxI5iJKmBphpT-CM?$6<(&nsQcVo!l>N&EabA@4w^x8F1UmK=adr8#Sg(=m(KI$97 zlxg1>^-W>QwQr7k#SE1?X;sv#!_?^cE&n_vp*BpN4s11nH<4O)>9L;_D_P}-UXsEz zseIJ8=PS#ZCyk$^>(VkrJeeYcEK$e`QAxIFVWsF|l^DV+#>k;n@8enM0=wCx%}pEa r3mu{)(lLnD9mv%U_(c6{y~Kt|A7efvkJSHr5X)XVbWpG_vTXlfJJ+Gm delta 706 zcmYL`Sx-|z7>1wW0AJ5g!ALABN~zX}7y`=90C=3DF) z`ZNnIo-$37oc3`>II9WS+BxC8CT#J7a8a|&VqCbSDYw`!Bs3KkFAD>jDvMWytD0(y z*M#euI*T`io0@uygD$s7y4>cDk0If%CSudduy9YfpDIzWm9w24-lwd2`CHhk$m#D% zbPXt$dy^_$*w&M1X!rAghYBYik1JN#dMe@cD(4Z8y&u_=j?>-cO*mz#sT^13Kk@UF zXTozogS_wp(v%vJAywIEzB4HNm}AVl$ygTK%%d1{K2m*;wL5iCdd?}s(_FRvRGBJL`4Xz7M8Nh z?Dfy&U^jb=xwOzalabo#%#ddym78=QX?XkZ$XvUPvi~i}qhK%lOi|G`y=?zq^jm(Q diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Echo.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Echo.class index 7c8cb53b649d2d84758fd8a7084d4eeba554e85d..4734d85207d039a94e2480cfc9367957d1170fe7 100644 GIT binary patch literal 2061 zcma)8TXWk~5dMzsSc#(M($dm23`v!87`kBr?DH+$#|r5+x>R;+ub8S{^!v?fVc3KjuW`3;Z+^4 zq0omZO!r|1vpQbKoCY&GzI2kJm;3P!uISM4u7>wC6g6BG$X~TxJ6sUR7N*t&awV^( z1P05tt8TX%8_Hji8xD6)mOV>4Ytpx)b$c@xZrOprblLJ6=8EUN{n%LPDM?+%G?nJJNKdTQ{qrZ@cwkZTp>&=-X<7pWK+#E`(yv+5eI8Cbyk8a^;^9XB+T419=14L1$k!jizHRJv9J z3_@QvD=OUbYQbP09}l5C*n|EdOc4kTThXff(1&Iy?2CSqwmspujR6ld+P~AycU2e-0 zeKr;Sf8+&v>MC4iO`CPBte zA1Jq0Q9;yY8deRg;d6oWhXLB|j<>DMvTSVBBuiehGeXbbrE24FrQr*PS@yi`R+HDl zvg;~8rbdymC!Kdd8!u^|B$L5~M6uYxYx^eZ*y&PS*=?#$@#7yRCZDg{ncy~ZNjgr| z4izu#FWEvz_(_XLVEp-Vn1sPE19QkvLyiwGGp>d?GdT*5J<|^%e&Qs9==+h6Hw~QP z+(-oQ0#0+qs~j)#9V!2Uo)~UnWUs2XKFIeFf5SM-_c(nh(DoIM*JwNPXqr}a z?w!R5HNguw@hzI2!zjJ$#bvz2Sq5V~H<0-ox`uJ_7xkkECfX5HD3PJWaHoGWd+0x; zVjwm#LjKOtozd8VGl|kuv%_TgWkRx|DU*;hL)eJfBdkuw5DBZI4Uxqw6wTlQ?s3$q XxQ_eyjPbp}btF4aH{Rr5fVckxe4`uv delta 533 zcmZXPO-lk%6o%h>9lgysqmCa_W|{V>PBm7xinc+J5VQ;zL&;Etfg^7H1ua7GfAoPt zi)h`CsDBcjnK6~(a_>3!@Sf+K_bxGzYaidQZvbl8S0H0S#v<}EmQYYo#InGOS6)>R z#+tyoz=lBS{%DYs?6%`Fq|Q&S?XGRz*e%C8>$I<0&OyJ(F7i>R0%a8ym;#$Bwy-T= zsiim^2XCA*I2J}8}Jy?rSktN3{kh)x~w-{*LIpH zV1^cDP{@o#m*&$?qs*enD26L9U=NgV#ORIqMFnxnJt+y0fKHJii4=N4_bJIa71NL4 z&j<}6y(4T65g9^EU@?S9qtS^`Yutw#LEi{U1Uealdw7FhZ@2o0uK%GEy8F9mz)q4r mMXdA`TOYG^%wo=GXUD!x-wN58tQmODPI+cy&+{bb$o&AG={{5d diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class index 47e3483036443e883b8a710c2ca34db4a3f13499..692e95445a86c02b8a77fc022bb2f4b4a7e31740 100644 GIT binary patch delta 30 lcmZpXY?j=>$0R6_lbD;7lBkkek(yjulB!~|S%E2q3jmL12`&Ht delta 31 mcmZpcY?0i+$0Q_}lbD;7lBkkek(yjulB!~8uvwldg$n?fg$Y~$ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class index 41a49b5f7d60c21f2955d89e5ce733e3fbd79d80..549c1548f33b214c4dd296d1a2140fa040d07ca5 100644 GIT binary patch delta 65 zcmca3dq;M|QzlkpMh1J0$%brVlbG$)jTjjOauRcsQW8~CD^in7OHx$~F@+2^r!tpw F0|0!86OI4? delta 65 zcmca3dq;M|QzlkRMh1J0$%brVlbG$)Ef^UDauRcsQW8~CD^in7OHx(LF@?-Fr!tpw F0|0-Z6Q%$F diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class index 926768494c80b5b4a6ec2c42dc1741188f6637ab..8c51aa24fdc9acc25346a781af1cf2f448270ae4 100644 GIT binary patch delta 38 tcmdllyia(;M@CVBoW$Iulth)(iqz!Nl2jElMh1J0$$^Yon+=)z*Z~QH3@-ox delta 39 ucmdldykB_3M@BKhoW$Iulth)(iqz!Nl2jE#Lq-OBjmd$GTAK}+`q%*#Tnt16: sticky # Opacity/Lumcolor: 40-step RGB @@ -50,7 +50,7 @@ # movr: Movement resistance, (walkspeedmax) / (1 + (n/16)), 16 halves movement speed # spcg: specific gravity, aka density. [g/l] # Defalut torch should have a colour of 63412 (ffa44e) : real candlelight colour taken from properly configured camera. -# Assume magical ice as Ice-X. +# Magical ice: theoretical __metallic__ ice that might form under super-high pressure (> 5 TPa). Its density is a wild guess, exponential prediction. # References: # * Density of various woods : http://www.engineeringtoolbox.com/wood-density-d_40.html # * Density of various phases of ice : http://www1.lsbu.ac.uk/water/ice_phases.html \ No newline at end of file diff --git a/res/batchtest.txt b/res/batchtest.txt new file mode 100644 index 000000000..126f6c3e7 --- /dev/null +++ b/res/batchtest.txt @@ -0,0 +1,4 @@ +echo "Hello, world!" +echo "This is a batch test." +setav batch true +getav batch \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/Actors/ActorWithBody.java b/src/com/Torvald/Terrarum/Actors/ActorWithBody.java index 822905eba..39bcb8f11 100644 --- a/src/com/Torvald/Terrarum/Actors/ActorWithBody.java +++ b/src/com/Torvald/Terrarum/Actors/ActorWithBody.java @@ -255,7 +255,7 @@ public class ActorWithBody implements Actor, Visible, Glowing { veloY += clampCeil( ((W - D) / mass) * SI_TO_GAME_ACC * G_MUL_PLAYABLE_CONST - * mvmtRstcToMultiplier(fluidResistance) // eliminate shoot-up from fluids + // * mvmtRstcToMultiplier(fluidResistance) // eliminate shoot-up from fluids , VELO_HARD_LIMIT ); } @@ -493,7 +493,7 @@ public class ActorWithBody implements Actor, Visible, Glowing { veloY -= ((fluidDensity - this.density) * map.getGravitation() * submergedVolume * Math.pow(mass, -1) - * mvmtRstcToMultiplier(fluidResistance) // eliminate shoot-up + // * mvmtRstcToMultiplier(fluidResistance) // eliminate shoot-up * SI_TO_GAME_ACC); } } @@ -615,8 +615,8 @@ public class ActorWithBody implements Actor, Visible, Glowing { return density; } - private float mvmtRstcToMultiplier(int viscosity) { - return 1f / (1 + (viscosity / 16f)); + private float mvmtRstcToMultiplier(int movementResistanceValue) { + return 1f / (1 + (movementResistanceValue / 16f)); } private void clampHitbox() { @@ -634,9 +634,17 @@ public class ActorWithBody implements Actor, Visible, Glowing { } private void updateNextHitboxFromVelo() { + float fluidResistance = mvmtRstcToMultiplier(getTileMvmtRstc()); + nextHitbox.set( - Math.round(hitbox.getPosX() + veloX) - , Math.round(hitbox.getPosY() + veloY) + Math.round(hitbox.getPosX() + + (veloX + * (isNoSubjectToFluidResistance() ? 1 : fluidResistance) + )) + , Math.round(hitbox.getPosY() + + (veloY + * (isNoSubjectToFluidResistance() ? 1 : fluidResistance) + )) , Math.round(baseHitboxW * scale) , Math.round(baseHitboxH * scale) /** Full quantisation; wonder what havoc these statements would wreak... diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.java b/src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.java index 2eeebdee0..8d13a2e5d 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.java +++ b/src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.java @@ -15,11 +15,10 @@ public class Authenticator implements ConsoleCommand { public void execute(String[] args) { if (args.length == 2) { String pwd = args[1]; - String hashedPwd = DigestUtils.sha256Hex(pwd); - if ("54c5b3dd459d5ef778bb2fa1e23a5fb0e1b62ae66970bcb436e8f81a1a1a8e41".equalsIgnoreCase(hashedPwd)) { - // alpine + if ("54c5b3dd459d5ef778bb2fa1e23a5fb0e1b62ae66970bcb436e8f81a1a1a8e41" + .equalsIgnoreCase(hashedPwd)) { // alpine String msg = (a) ? "Locked" : "Authenticated"; new Echo().execute(msg); System.out.println("[Authenticator] " + msg); diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Batch.java b/src/com/Torvald/Terrarum/ConsoleCommand/Batch.java new file mode 100644 index 000000000..0837e34ed --- /dev/null +++ b/src/com/Torvald/Terrarum/ConsoleCommand/Batch.java @@ -0,0 +1,25 @@ +package com.Torvald.Terrarum.ConsoleCommand; + +import java.nio.file.FileSystems; +import java.nio.file.Files; + +/** + * Created by minjaesong on 16-03-07. + */ +public class Batch implements ConsoleCommand { + @Override + public void execute(String[] args) throws Exception { + if (args.length == 2) { + Files.lines(FileSystems.getDefault().getPath(args[1])).forEach + (CommandInterpreter::execute); + } + else { + printUsage(); + } + } + + @Override + public void printUsage() { + new Echo().execute("batch path/to/batch.txt"); + } +} diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java b/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java index 49f0236c8..ab937301a 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java +++ b/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java @@ -14,6 +14,7 @@ public class CommandDict { public CommandDict() { dict = new Hashtable<>(); + dict.put("echo", new Echo()); dict.put("setav", new SetAV()); dict.put("qqq", new QuitApp()); dict.put("codex", new CodexEdictis()); @@ -27,6 +28,7 @@ public class CommandDict { dict.put("setlocale", new SetLocale()); dict.put("zoom", new Zoom()); dict.put("teleport", new TeleportPlayer()); + dict.put("tp", dict.get("teleport")); dict.put("cat", new CatStdout()); dict.put("exportav", new ExportAV()); dict.put("gsontest", new GsonTest()); @@ -34,6 +36,7 @@ public class CommandDict { dict.put("getfaction", new GetFactioning()); dict.put("auth", Terrarum.game.auth); dict.put("spawnball", new SpawnPhysTestBall()); + dict.put("batch", new Batch()); } public static ConsoleCommand getCommand(String commandName) { diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Echo.java b/src/com/Torvald/Terrarum/ConsoleCommand/Echo.java index e6b3341d8..c2b38ef17 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Echo.java +++ b/src/com/Torvald/Terrarum/ConsoleCommand/Echo.java @@ -1,17 +1,24 @@ package com.Torvald.Terrarum.ConsoleCommand; -import com.Torvald.Terrarum.Game; import com.Torvald.Terrarum.Terrarum; import com.Torvald.Terrarum.UserInterface.ConsoleWindow; +import java.util.Arrays; +import java.util.List; + /** * Created by minjaesong on 16-01-16. */ class Echo implements ConsoleCommand { @Override public void execute(String[] args) { - ((ConsoleWindow) Terrarum.game.consoleHandler.getUI()) - .sendMessage(args.toString()); + String[] argsWoHeader = new String[args.length - 1]; + for (int i = 0; i < argsWoHeader.length; i++) + argsWoHeader[i] = args[i + 1]; + + Arrays.asList(argsWoHeader).forEach( + ((ConsoleWindow) Terrarum.game.consoleHandler.getUI())::sendMessage + ); } public void execute(String single_line) { diff --git a/src/com/Torvald/Terrarum/TileProperties/propdata.csv b/src/com/Torvald/Terrarum/TileProperties/propdata.csv index e9cf2b356..baee9e2e7 100644 --- a/src/com/Torvald/Terrarum/TileProperties/propdata.csv +++ b/src/com/Torvald/Terrarum/TileProperties/propdata.csv @@ -34,14 +34,14 @@ "9"; "0";"TILE_SNOW" ; "8205"; "6"; "500"; "0"; "0"; "1"; "1"; "0"; "1"; "9"; "0"; "0";"16" "9"; "1";"TILE_ICE_FRAGILE" ; "3282"; "1"; "930"; "0"; "0"; "1"; "0"; "0"; "0"; "9"; "1"; "0";"16" "9"; "2";"TILE_ICE_NATURAL" ; "6564"; "25"; "930"; "0"; "0"; "1"; "1"; "0"; "1"; "9"; "2"; "0"; "8" - "9"; "3";"TILE_ICE_CLEAR_MAGICAL" ; "8205"; "25";"2785"; "0"; "0"; "1"; "1"; "5009"; "0"; "9"; "3"; "0"; "8" + "9"; "3";"TILE_ICE_CLEAR_MAGICAL" ; "8205"; "25";"3720"; "0"; "0"; "1"; "1"; "5009"; "0"; "9"; "3"; "0"; "8" "10"; "0";"TILE_PLATFORM_STONE" ; "0"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "0"; "10"; "0"; "0";"16" "10"; "1";"TILE_PLATFORM_WOODEN" ; "0"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "0"; "10"; "1"; "0";"16" "10"; "2";"TILE_PLATFORM_EBONY" ; "0"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "0"; "10"; "2"; "0";"16" "10"; "3";"TILE_PLATFORM_BIRCH" ; "0"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "0"; "10"; "3"; "0";"16" "10"; "4";"TILE_PLATFORM_BLOODROSE" ; "0"; "1"; "N/A"; "0"; "0"; "0"; "0"; "0"; "0"; "10"; "4"; "0";"16" "11"; "0";"TILE_TORCH" ; "0"; "0"; "N/A"; "0"; "0"; "0"; "0"; "63412"; "0"; "11"; "0"; "0";"16" -"254"; "15";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "16"; "0"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" +"254"; "15";"TILE_WATER" ; "6522"; "100";"1000"; "1"; "12"; "0"; "0"; "0"; "0"; "N/A"; "N/A"; "0";"16" "255"; "15";"TILE_LAVA" ; "62358"; "100";"2600"; "1"; "48"; "0"; "0"; "48320"; "0"; "N/A"; "N/A"; "0";"16" # Friction: 0: frictionless, <16: slippery, 16: regular, >16: sticky # Opacity/Lumcolor: 40-step RGB @@ -50,7 +50,7 @@ # movr: Movement resistance, (walkspeedmax) / (1 + (n/16)), 16 halves movement speed # spcg: specific gravity, aka density. [g/l] # Defalut torch should have a colour of 63412 (ffa44e) : real candlelight colour taken from properly configured camera. -# Assume magical ice as Ice-X. +# Magical ice: theoretical __metallic__ ice that might form under super-high pressure (> 5 TPa). Its density is a wild guess. # References: # * Density of various woods : http://www.engineeringtoolbox.com/wood-density-d_40.html # * Density of various phases of ice : http://www1.lsbu.ac.uk/water/ice_phases.html \ No newline at end of file