From 6c5ee14402d69154fad04e17764004cfa040385e Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 2 Mar 2024 18:24:58 +0900 Subject: [PATCH] platforms are lighter in weight --- assets/mods/basegame/blocks/blocks.csv | 10 +++++----- assets/mods/basegame/crafting/blocks_to_blocks.json | 8 ++++---- src/net/torvald/terrarum/ModMgr.kt | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/mods/basegame/blocks/blocks.csv b/assets/mods/basegame/blocks/blocks.csv index 0757f5292..403b2ba9d 100644 --- a/assets/mods/basegame/blocks/blocks.csv +++ b/assets/mods/basegame/blocks/blocks.csv @@ -67,7 +67,7 @@ "149";"149";"149";"BLOCK_GLASS_CLEAN";"0.0424";"0.0424";"0.0424";"0.0636";"5";"2203";"GLAS";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"GLASS,NORANDTILE" # platforms -"160";"160";"160";"BLOCK_PLATFORM_STONE";"0.0312";"0.0312";"0.0312";"0.0312";"5";"2400";"ROCK";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM" +"160";"160";"160";"BLOCK_PLATFORM_STONE";"0.0312";"0.0312";"0.0312";"0.0312";"5";"2400";"ROCK";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM," "161";"161";"161";"BLOCK_PLATFORM_WOODEN";"0.0312";"0.0312";"0.0312";"0.0312";"5";"740";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM,WOODEN" "162";"162";"162";"BLOCK_PLATFORM_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"5";"1200";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM,WOODEN" "163";"163";"163";"BLOCK_PLATFORM_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"5";"670";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM,WOODEN" @@ -125,10 +125,10 @@ "258";"258";"258";"BLOCK_DAYLIGHT_CAPACITOR";"0.1252";"0.1252";"0.1252";"0.1252";"1";"2500";"GLAS";"1";"0";"N/A";"3";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"LIGHT,NORANDTILE" # more platforms -"272";"272";"272";"BLOCK_SCAFFOLDING_NORMAL";"0.0312";"0.0312";"0.0312";"0.0312";"1";"740";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,NORANDTILE,WOODEN" -"273";"273";"273";"BLOCK_SCAFFOLDING_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1400";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,NORANDTILE,WOODEN" -"274";"274";"274";"BLOCK_SCAFFOLDING_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"1";"670";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,NORANDTILE,WOODEN" -"275";"275";"275";"BLOCK_SCAFFOLDING_ROSEWOOD";"0.0312";"0.0312";"0.0312";"0.0312";"1";"900";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,NORANDTILE,WOODEN" +"272";"272";"272";"BLOCK_SCAFFOLDING_NORMAL";"0.0312";"0.0312";"0.0312";"0.0312";"1";"740";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,SCAFFOLDING,NORANDTILE,WOODEN" +"273";"273";"273";"BLOCK_SCAFFOLDING_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1400";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,SCAFFOLDING,NORANDTILE,WOODEN" +"274";"274";"274";"BLOCK_SCAFFOLDING_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"1";"670";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,SCAFFOLDING,NORANDTILE,WOODEN" +"275";"275";"275";"BLOCK_SCAFFOLDING_ROSEWOOD";"0.0312";"0.0312";"0.0312";"0.0312";"1";"900";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM,SCAFFOLDING,NORANDTILE,WOODEN" # for future use "288";"288";"288";"BLOCK_PLASTIC_WHITE"; "0.0903";"0.0903";"0.0903";"0.1752";"36";"660";"PLST";"1";"1";"N/A";"0";"0";"16";"0";"0";"0";"0";"N/A";"N/A";"0.06";"THERMOPLASTIC,NORANDTILE" diff --git a/assets/mods/basegame/crafting/blocks_to_blocks.json b/assets/mods/basegame/crafting/blocks_to_blocks.json index ef13001f9..06244bbe7 100644 --- a/assets/mods/basegame/crafting/blocks_to_blocks.json +++ b/assets/mods/basegame/crafting/blocks_to_blocks.json @@ -32,25 +32,25 @@ "basegame:272": { /* scaffolding */ "workbench": "", "ingredients": [ - [1, 2, "item@basegame:18", 2, "basegame:161"] /* 2 sticks and 2 platform */ + [2, 2, "item@basegame:18", 2, "basegame:161"] /* 2 sticks and 2 platform */ ] }, "basegame:273": { /* scaffolding */ "workbench": "", "ingredients": [ - [1, 2, "item@basegame:18", 2, "basegame:162"] /* 2 sticks and 2 platform */ + [2, 2, "item@basegame:18", 2, "basegame:162"] /* 2 sticks and 2 platform */ ] }, "basegame:274": { /* scaffolding */ "workbench": "", "ingredients": [ - [1, 2, "item@basegame:18", 2, "basegame:163"] /* 2 sticks and 2 platform */ + [2, 2, "item@basegame:18", 2, "basegame:163"] /* 2 sticks and 2 platform */ ] }, "basegame:275": { /* scaffolding */ "workbench": "", "ingredients": [ - [1, 2, "item@basegame:18", 2, "basegame:164"] /* 2 sticks and 2 platform */ + [2, 2, "item@basegame:18", 2, "basegame:164"] /* 2 sticks and 2 platform */ ] } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt index 742a8988c..6d8659c64 100644 --- a/src/net/torvald/terrarum/ModMgr.kt +++ b/src/net/torvald/terrarum/ModMgr.kt @@ -569,7 +569,7 @@ object ModMgr { private fun makeNewItemObj(tile: BlockProp, isWall: Boolean) = object : GameItem( if (isWall) "wall@"+tile.id else tile.id ) { - override var baseMass: Double = tile.density / 100.0 + override var baseMass: Double = (tile.density / 100.0) * (if (tile.isPlatform) 0.5 else 1.0) override var baseToolSize: Double? = null override var inventoryCategory = if (isWall) Category.WALL else Category.BLOCK override var canBeDynamic = false