Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

finish House floor randomization #403

Merged
merged 21 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 62 additions & 1 deletion ItemProtosets.tres
Original file line number Diff line number Diff line change
Expand Up @@ -2937,7 +2937,8 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"generic_forest_finds\"
\"generic_forest_finds\",
\"destroyed_furniture_medium\"
]
}
},
Expand Down Expand Up @@ -3141,5 +3142,65 @@ json_data = "[
\"two_handed\": false,
\"volume\": 120,
\"weight\": 1.2
},
{
\"description\": \"A sturdy construction material, often used for building or crafting.\",
\"id\": \"brick\",
\"image\": \"./Mods/Core/Items/brick_32.png\",
\"max_stack_size\": 50,
\"name\": \"Brick\",
\"sprite\": \"brick_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
\"volume\": 60,
\"weight\": 2
},
{
\"description\": \"A brick with visible cracks and wear, still usable but not as durable.\",
\"id\": \"damaged_brick\",
\"image\": \"./Mods/Core/Items/brick_damaged_32.png\",
\"max_stack_size\": 50,
\"name\": \"Damaged Brick\",
\"sprite\": \"brick_damaged_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
\"volume\": 60,
\"weight\": 1.8
},
{
\"description\": \"A large concrete slab with visible cracks, useful for temporary construction or barricading.\",
\"id\": \"damaged_concrete_slab\",
\"image\": \"./Mods/Core/Items/concrete_slab_damaged_32.png\",
\"max_stack_size\": 1,
\"name\": \"Damaged Concrete Slab\",
\"sprite\": \"concrete_slab_damaged_32.png\",
\"stack_size\": 1,
\"two_handed\": true,
\"volume\": 400,
\"weight\": 20
},
{
\"description\": \"Sharp pieces of broken glass, dangerous but potentially useful in crafting.\",
\"id\": \"glass_shards\",
\"image\": \"./Mods/Core/Items/glass_shards_32.png\",
\"max_stack_size\": 100,
\"name\": \"Glass Shards\",
\"sprite\": \"glass_shards_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
\"volume\": 5,
\"weight\": 0.05
},
{
\"description\": \"Old metal sheets covered in rust, brittle but can still be used for makeshift repairs or crafting.\",
\"id\": \"rusted_metal_sheets\",
\"image\": \"./Mods/Core/Items/rusted_metal_sheets_32.png\",
\"max_stack_size\": 20,
\"name\": \"Rusted Metal Sheets\",
\"sprite\": \"rusted_metal_sheets_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
\"volume\": 150,
\"weight\": 5
}
]"
60 changes: 58 additions & 2 deletions Mods/Core/Furniture/Furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,9 @@
"references": {
"core": {
"maps": [
"Generichouse_00"
"Generichouse_00",
"generichouse_t",
"generichouse_cross"
]
}
},
Expand Down Expand Up @@ -829,7 +831,8 @@
"Generichouse",
"Generichouse_00",
"store_electronic_clothing",
"store_groceries"
"store_groceries",
"generichouse_t"
]
}
},
Expand Down Expand Up @@ -1207,5 +1210,58 @@
"width_scale": 100
},
"weight": 1
},
{
"Function": {
"is_container": true
},
"categories": [
"Urban",
"Store"
],
"description": "A set of shelves with broken planks and missing sections, but still usable for storing a few items.",
"destruction": {
"group": "destroyed_furniture_medium",
"sprite": "wreck_wood_generic_32.png"
},
"edgesnapping": "North",
"id": "damaged_shelves",
"moveable": false,
"name": "Damaged Shelves",
"sprite": "damaged_shelves_90_45.png",
"support_shape": {
"color": "d76c2eff",
"depth_scale": 95,
"height": 0.5,
"shape": "Box",
"transparent": false,
"width_scale": 95
},
"weight": 1
},
{
"categories": [
"Urban",
"Outdoor"
],
"description": "A fence reduced to broken posts, offering little protection but still marking boundaries.",
"destruction": {
"group": "destroyed_furniture_medium",
"sprite": "wreck_wood_generic_32.png"
},
"edgesnapping": "None",
"id": "destroyed_fence",
"moveable": false,
"name": "Destroyed Fence",
"sprite": "fence_destroyed_90_10.png",
"support_shape": {
"color": "c75a1cff",
"depth_scale": 95,
"height": 0.5,
"shape": "Box",
"transparent": true,
"width_scale": 95
},
"weight": 1
}
]
Binary file added Mods/Core/Furniture/damaged_shelves_90_45.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Mods/Core/Furniture/damaged_shelves_90_45.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bmmiiqbda1r1x"
path="res://.godot/imported/damaged_shelves_90_45.png-e14dcb3481960372d39f0e92fa3c584c.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Mods/Core/Furniture/damaged_shelves_90_45.png"
dest_files=["res://.godot/imported/damaged_shelves_90_45.png-e14dcb3481960372d39f0e92fa3c584c.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Mods/Core/Furniture/fence_destroyed_90_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Mods/Core/Furniture/fence_destroyed_90_10.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://d057ebpyhuoh1"
path="res://.godot/imported/fence_destroyed_90_10.png-e9e4d7a4f55f45c0e090b8862a64efdf.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Mods/Core/Furniture/fence_destroyed_90_10.png"
dest_files=["res://.godot/imported/fence_destroyed_90_10.png-e9e4d7a4f55f45c0e090b8862a64efdf.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading