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

Road connections #431

Merged
merged 15 commits into from
Oct 30, 2024
32 changes: 26 additions & 6 deletions ItemProtosets.tres
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"kitchen_cupboard\"
\"kitchen_cupboard\",
\"urban_litter\"
],
\"items\": [
\"screwdriver\"
Expand Down Expand Up @@ -671,7 +672,8 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"vending_machine_snacks\"
\"vending_machine_snacks\",
\"urban_litter\"
]
}
},
Expand Down Expand Up @@ -795,6 +797,13 @@ json_data = "[
\"image\": \"./Mods/Core/Items/survival_guide_32.png\",
\"max_stack_size\": 5,
\"name\": \"Basic survival guide\",
\"references\": {
\"core\": {
\"itemgroups\": [
\"urban_litter\"
]
}
},
\"sprite\": \"survival_guide_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
Expand Down Expand Up @@ -1463,7 +1472,8 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"debris_urban\"
\"debris_urban\",
\"urban_litter\"
]
}
},
Expand Down Expand Up @@ -1501,7 +1511,8 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"debris_urban\"
\"debris_urban\",
\"urban_litter\"
]
}
},
Expand Down Expand Up @@ -2033,6 +2044,13 @@ json_data = "[
\"image\": \"./Mods/Core/Items/stale_bread_32.png\",
\"max_stack_size\": 5,
\"name\": \"Stale Bread\",
\"references\": {
\"core\": {
\"itemgroups\": [
\"urban_litter\"
]
}
},
\"sprite\": \"stale_bread_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
Expand Down Expand Up @@ -2892,7 +2910,8 @@ json_data = "[
\"itemgroups\": [
\"generic_field_finds\",
\"generic_forest_finds\",
\"debris_rock\"
\"debris_rock\",
\"urban_litter\"
]
}
},
Expand Down Expand Up @@ -3251,7 +3270,8 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"debris_urban\"
\"debris_urban\",
\"urban_litter\"
]
}
},
Expand Down
105 changes: 94 additions & 11 deletions Mods/Core/Furniture/Furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"Generichouse_00",
"RockyHill_SW",
"abandoned_building",
"generichouse_end"
"generichouse_end",
"city_square"
]
}
},
Expand Down Expand Up @@ -55,7 +56,8 @@
"RockyHill_SW",
"abandoned_building",
"RockyHill_NE",
"generichouse_end"
"generichouse_end",
"city_square"
]
}
},
Expand Down Expand Up @@ -142,7 +144,9 @@
"forest_road_straight",
"forest_road_corner",
"forest_road_t",
"forest_road_cross"
"forest_road_cross",
"subway_station",
"city_square"
]
}
},
Expand Down Expand Up @@ -187,7 +191,9 @@
"forest_road_straight",
"forest_road_corner",
"forest_road_t",
"forest_road_cross"
"forest_road_cross",
"subway_station",
"city_square"
]
}
},
Expand Down Expand Up @@ -235,7 +241,9 @@
"forest_road_straight",
"forest_road_corner",
"forest_road_t",
"forest_road_cross"
"forest_road_cross",
"subway_station",
"city_square"
]
}
},
Expand Down Expand Up @@ -309,7 +317,8 @@
"Generichouse",
"Generichouse_00",
"store_groceries",
"generichouse_end"
"generichouse_end",
"city_square"
]
}
},
Expand Down Expand Up @@ -574,7 +583,9 @@
"core": {
"maps": [
"Generichouse",
"store_electronic_clothing"
"store_electronic_clothing",
"subway_station",
"city_square"
]
}
},
Expand Down Expand Up @@ -1016,7 +1027,7 @@
},
{
"Function": {
"container_group": "refridgerator",
"container_group": "vending_machine_drinks",
"is_container": true
},
"categories": [
Expand All @@ -1035,7 +1046,9 @@
"core": {
"maps": [
"store_electronic_clothing",
"store_groceries"
"store_groceries",
"subway_station",
"city_square"
]
}
},
Expand Down Expand Up @@ -1173,7 +1186,9 @@
"generichouse_corner",
"store_electronic_clothing",
"store_groceries",
"generichouse_end"
"generichouse_end",
"subway_station",
"city_square"
]
}
},
Expand Down Expand Up @@ -1307,7 +1322,9 @@
"references": {
"core": {
"maps": [
"abandoned_building"
"abandoned_building",
"parking_garage",
"city_square"
]
}
},
Expand All @@ -1321,5 +1338,71 @@
"width_scale": 95
},
"weight": 1
},
{
"categories": [
"Urban",
"Rail",
"Infrastructure"
],
"description": "Supporting beams to put in between rail sections",
"destruction": {
"group": "destroyed_furniture_medium",
"sprite": "wreck_wood_generic_32.png"
},
"edgesnapping": "None",
"id": "railroad_midsection",
"moveable": false,
"name": "Railroad midsection",
"references": {
"core": {
"maps": [
"subway_station"
]
}
},
"sprite": "railroad_midsection.png",
"support_shape": {
"color": "a65a2eff",
"depth_scale": 100,
"height": 0.5,
"shape": "Box",
"transparent": false,
"width_scale": 100
},
"weight": 1
},
{
"categories": [
"Urban",
"Rail",
"Infrastructure"
],
"description": "Supporting beams and a rail for a train to run on",
"destruction": {
"group": "destroyed_furniture_medium",
"sprite": "wreck_wood_generic_32.png"
},
"edgesnapping": "None",
"id": "railroad_railsection",
"moveable": false,
"name": "Railroad rail section",
"references": {
"core": {
"maps": [
"subway_station"
]
}
},
"sprite": "railroad_railsection.png",
"support_shape": {
"color": "a65a2eff",
"depth_scale": 100,
"height": 0.5,
"shape": "Box",
"transparent": false,
"width_scale": 100
},
"weight": 1
}
]
Binary file added Mods/Core/Furniture/railroad_midsection.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/railroad_midsection.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ddi3y85wo84u2"
path="res://.godot/imported/railroad_midsection.png-a8cedc13146930ef68eab6d26801cbd8.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Mods/Core/Furniture/railroad_midsection.png"
dest_files=["res://.godot/imported/railroad_midsection.png-a8cedc13146930ef68eab6d26801cbd8.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/railroad_railsection.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/railroad_railsection.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cr146myq63t7s"
path="res://.godot/imported/railroad_railsection.png-5553de9a8f74e19146c7b78711b58b6e.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Mods/Core/Furniture/railroad_railsection.png"
dest_files=["res://.godot/imported/railroad_railsection.png-5553de9a8f74e19146c7b78711b58b6e.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