curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-09 13:21:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

variable tool reach wip

Browse Source
This commit is contained in:
minjaesong
2022-01-12 17:30:30 +09:00
parent bf31cbb556
commit 53645925ba
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
assets/mods/basegame/materials/materials.csv
View File

@@ -1,17 +1,17 @@
"idst";"tens";"impf";"dsty";"fmod";"endurance";"tcond";"comments"
"ROCK"; "15"; "210";"3000"; "1"; "0.42"; "1.0";"data is that of marble"
"OORE"; "15"; "210";"3000"; "1"; "0.42"; "1.0";"data is that of marble"
"OGEM"; "15"; "210";"3000"; "1"; "0.42"; "1.0";"data is that of marble"
"CUPR"; "210"; "770";"8960"; "2"; "1.00";"401.0";"copper"
"EGLS"; "33";"1000";"2325"; "4"; "0.82"; "1.0";"elven glass/moldavite"
"IRON"; "350";"1085";"7874"; "5"; "1.42"; "1.0";"not wrought iron; just natural iron"
"ARGN"; "170"; "595";"10490"; "9"; "0.91"; "1.0";"argentum/silver"
"STAL"; "531";"2520";"7874"; "14"; "1.73"; "1.0";"steel"
"EAUR"; "768"; "0";"8192"; "21"; "1.36"; "1.0";"elven aurichalcum"
"TIAL"; "900"; "0";"4420"; "33"; "2.16"; "1.0";"titanium alloy (Ti6Al4V)"
"ADMT";"2000";"4090";"2700"; "71"; "3.42"; "1.0";"adamant"
"OOZE"; "20"; "0";"1000"; "1"; "0.08"; "0.5";"genetic ooze; data is about human skin"
"BONE"; "130"; "0";"2000"; "1"; "0.23"; "0.55";"data is that of bovine bone"
"idst";"tens";"impf";"dsty";"fmod";"endurance";"tcond";"reach";"comments"
"ROCK"; "15"; "210";"3000"; "1"; "0.42"; "1.0"; "5";"data is that of marble"
"OORE"; "15"; "210";"3000"; "1"; "0.42"; "1.0"; "5";"data is that of marble"
"OGEM"; "15"; "210";"3000"; "1"; "0.42"; "1.0"; "5";"data is that of marble"
"CUPR"; "210"; "770";"8960"; "2"; "1.00";"401.0"; "5";"copper"
"EGLS"; "33";"1000";"2325"; "4"; "0.82"; "1.0"; "6";"elven glass/moldavite"
"IRON"; "350";"1085";"7874"; "5"; "1.42"; "1.0"; "6";"not wrought iron; just natural iron"
"ARGN"; "170"; "595";"10490"; "9"; "0.91"; "1.0"; "6";"argentum/silver"
"STAL"; "531";"2520";"7874"; "14"; "1.73"; "1.0"; "7";"steel"
"EAUR"; "768"; "0";"8192"; "21"; "1.36"; "1.0"; "7";"elven aurichalcum"
"TIAL"; "900"; "0";"4420"; "33"; "2.16"; "1.0"; "8";"titanium alloy (Ti6Al4V)"
"ADMT";"2000";"4090";"2700"; "71"; "3.42"; "1.0"; "8";"adamant"
"OOZE"; "20"; "0";"1000"; "1"; "0.08"; "0.5"; "0";"genetic ooze; data is about human skin"
"BONE"; "130"; "0";"2000"; "1"; "0.23"; "0.55"; "4";"data is that of bovine bone"
# idst: ID_STRING, ALL CAPS
#
@@ -31,6 +31,8 @@
#
# tcond: thermal conductivity
#
# reach: Tool Reach in blocks. Default is 6 (iron)
#
# Comments: do nothing; do not parse
#
1 idst tens impf dsty fmod endurance tcond reach comments
2 ROCK 15 210 3000 1 0.42 1.0 5 data is that of marble
3 OORE 15 210 3000 1 0.42 1.0 5 data is that of marble
4 OGEM 15 210 3000 1 0.42 1.0 5 data is that of marble
5 CUPR 210 770 8960 2 1.00 401.0 5 copper
6 EGLS 33 1000 2325 4 0.82 1.0 6 elven glass/moldavite
7 IRON 350 1085 7874 5 1.42 1.0 6 not wrought iron; just natural iron
8 ARGN 170 595 10490 9 0.91 1.0 6 argentum/silver
9 STAL 531 2520 7874 14 1.73 1.0 7 steel
10 EAUR 768 0 8192 21 1.36 1.0 7 elven aurichalcum
11 TIAL 900 0 4420 33 2.16 1.0 8 titanium alloy (Ti6Al4V)
12 ADMT 2000 4090 2700 71 3.42 1.0 8 adamant
13 OOZE 20 0 1000 1 0.08 0.5 0 genetic ooze; data is about human skin
14 BONE 130 0 2000 1 0.23 0.55 4 data is that of bovine bone
15 # idst: ID_STRING, ALL CAPS
16 #
17 # tens: tensile strength (= ultimate stringth)
31 # tcond: thermal conductivity
32 #
33 # Comments: do nothing # reach: Tool Reach in blocks. Default is 6 (iron)
34 #
35 # Comments: do nothing do not parse
36 #
37 ## These values are being used by the phys simulator (blocks) and for attack power calculation (items)
38

3
src/net/torvald/terrarum/itemproperties/Material.kt
View File

@@ -28,6 +28,8 @@ class Material {
var identifier: String = "Name not set"
var toolReach: Int = 6
/**
* Mainly intended to be used by third-party modules
*/
@@ -68,6 +70,7 @@ class MaterialCodex {
prop.enduranceMod = it.floatVal("endurance")
prop.thermalConductivity = it.floatVal("tcond")
prop.identifier = it.get("idst").toUpperCase()
prop.toolReach = it.intVal("reach")
materialProps[prop.identifier] = prop