curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 02:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

tile's platform-ness is now determined by their tag

Browse Source
This commit is contained in:
minjaesong
2022-07-20 18:21:16 +09:00
parent 0f4508986d
commit 6495e741e6
4 changed files with 130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/blockproperties/BlockCodex.kt
View File

@@ -175,6 +175,7 @@ class BlockCodex {
private fun setProp(modname: String, key: Int, record: CSVRecord) {
val prop = BlockProp()
prop.nameKey = record.get("name")
prop.tags = record.get("tags").split(',').map { it.trim() }.toHashSet()
prop.id = "$modname:$key"
prop.numericID = key
@@ -207,7 +208,10 @@ class BlockCodex {
//prop.isFluid = record.boolVal("fluid")
prop.isSolid = record.boolVal("solid")
//prop.isClear = record.boolVal("clear")
prop.isPlatform = record.boolVal("plat")
prop.isPlatform = prop.tags.contains("PLATFORM")
prop.isActorBlock = prop.tags.contains("ACTORBLOCK")
prop.isWallable = record.boolVal("wall")
prop.maxSupport = record.intVal("grav")
prop.isVertFriction = record.boolVal("fv")
@@ -216,7 +220,6 @@ class BlockCodex {
prop.reflectance = record.floatVal("refl")
prop.tags = record.get("tags").split(',').map { it.trim() }.toHashSet()
prop.material = record.get("mate")
blockProps[prop.id] = prop

3
src/net/torvald/terrarum/blockproperties/BlockProp.kt
View File

@@ -107,6 +107,5 @@ class BlockProp {
*/
val extra = Codex()
val isActorBlock: Boolean
get() = tags.contains("ACTORBLOCK")
var isActorBlock: Boolean = false
}

13
src/net/torvald/terrarum/debuggerapp/CSVEditor.java
View File

@@ -5,11 +5,12 @@ import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVRecord;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableModel;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.StringReader;
@@ -27,12 +28,12 @@ import java.util.Properties;
public class CSVEditor extends JFrame {
/** Default columns. When you open existing csv, it should overwrite this. */
private String[] columns = new String[]{"id", "drop", "world", "name", "shdr", "shdg", "shdb", "shduv", "str", "dsty", "mate", "solid", "plat", "wall", "grav", "dlfn", "fv", "fr", "lumr", "lumg", "lumb", "lumuv", "colour", "vscs", "refl","tags"};
private String[] columns = new String[]{"id", "drop", "world", "name", "shdr", "shdg", "shdb", "shduv", "str", "dsty", "mate", "solid", "wall", "grav", "dlfn", "fv", "fr", "lumr", "lumg", "lumb", "lumuv", "colour", "vscs", "refl","tags"};
private final int FOUR_DIGIT = 42;
private final int SIX_DIGIT = 50;
private final int TWO_DIGIT = 30;
private final int ARBITRARY = 240;
private int[] colWidth = new int[]{FOUR_DIGIT, FOUR_DIGIT, FOUR_DIGIT, ARBITRARY, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, TWO_DIGIT, FOUR_DIGIT, FOUR_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, FOUR_DIGIT * 2, TWO_DIGIT, SIX_DIGIT, ARBITRARY};
private int[] colWidth = new int[]{FOUR_DIGIT, FOUR_DIGIT, FOUR_DIGIT, ARBITRARY, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, TWO_DIGIT, FOUR_DIGIT, FOUR_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, FOUR_DIGIT * 2, TWO_DIGIT, SIX_DIGIT, ARBITRARY};
private final int UNDO_BUFFER_SIZE = 10;
@@ -537,7 +538,7 @@ public class CSVEditor extends JFrame {
colour=[Fluids] Colour of the block in hexadecimal RGBA.
vscs=[Fluids] Viscocity of the block. 16 for water.
refl=[NOT Fluids] Reflectance of the block, used by the light calculation. Valid range 0.0–1.0
tags=Tags used by the crafting system""";
tags=Tags used by the crafting system and the game's internals""";
/**
* ¤ is used as a \n marker