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.

Sign up for GitHub

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

Neighborhood school #443

Merged
merged 22 commits into from
Nov 15, 2024
Merged

Neighborhood school #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
46f7d93
Hide content lists
snipercup Nov 6, 2024
f7919be
Save content list visibility state
snipercup Nov 6, 2024
b520703
Add drain attributes to editor
snipercup Nov 8, 2024
f51333f
Add depleting effect to data
snipercup Nov 9, 2024
38c664b
Add poison attribute
snipercup Nov 9, 2024
0047b2b
Add drain to playerattribute
snipercup Nov 9, 2024
814b5b1
Deplete other attributes
snipercup Nov 9, 2024
70ff42b
Give poison attack
snipercup Nov 9, 2024
e58a024
Add maxed effect
snipercup Nov 9, 2024
fd67c25
player dies full of poison
snipercup Nov 9, 2024
0ab6c77
Add antidote
snipercup Nov 10, 2024
30e02e3
Mob editor extra attributes
snipercup Nov 10, 2024
ff0fa9b
Restructure attributes
snipercup Nov 10, 2024
1d25642
Support both grids
snipercup Nov 10, 2024
7430708
Add damage spinbox
snipercup Nov 10, 2024
3a64b21
replace melee damage
snipercup Nov 11, 2024
89d9d89
Cooldown and knockback
snipercup Nov 11, 2024
b691fb3
Implement knockback
snipercup Nov 11, 2024
a02ee65
Add stun and knockback
snipercup Nov 11, 2024
2dce25a
Implement mob attack cooldown
snipercup Nov 11, 2024
161e562
give stun attack to drone
snipercup Nov 11, 2024
49176e8
Add neighborhood school map
snipercup Nov 11, 2024
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
37 changes: 32 additions & 5 deletions ItemProtosets.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ json_data = "[
\"mob_loot\",
\"destroyed_furniture_medium\",
\"disassembled_furniture_medium\",
\"test_items\",
\"debris_urban\"
],
\"items\": [
Expand Down Expand Up @@ -3041,8 +3040,7 @@ json_data = "[
\"core\": {
\"itemgroups\": [
\"tree_destroyed\",
\"generic_forest_finds\",
\"test_items\"
\"generic_forest_finds\"
],
\"items\": [
\"stone_spear\"
Expand All @@ -3067,8 +3065,7 @@ json_data = "[
\"references\": {
\"core\": {
\"itemgroups\": [
\"generic_field_finds\",
\"test_items\"
\"generic_field_finds\"
],
\"items\": [
\"stone_spear\"
Expand Down Expand Up @@ -3299,5 +3296,35 @@ json_data = "[
\"two_handed\": false,
\"volume\": 150,
\"weight\": 5
},
{
\"Medical\": {
\"amount\": -50,
\"attributes\": [
{
\"amount\": 0,
\"id\": \"poison\"
}
],
\"order\": \"Lowest first\"
},
\"description\": \"A small bottle that contains antidote. It helps to recover from poison.\",
\"id\": \"bottle_antidote\",
\"image\": \"./Mods/Core/Items/antidote_32.png\",
\"max_stack_size\": 5,
\"name\": \"Bottle of antidote\",
\"references\": {
\"core\": {
\"itemgroups\": [
\"test_items\",
\"kitchen_cupboard\"
]
}
},
\"sprite\": \"antidote_32.png\",
\"stack_size\": 1,
\"two_handed\": false,
\"volume\": 5,
\"weight\": 0.1
}
]"
66 changes: 44 additions & 22 deletions Mods/Core/Furniture/Furniture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"generichouse_end",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -61,7 +62,8 @@
"generichouse_end",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -154,7 +156,8 @@
"subway_station",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -203,7 +206,8 @@
"subway_station",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -255,7 +259,8 @@
"subway_station",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -292,7 +297,8 @@
"store_groceries",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -334,7 +340,8 @@
"generichouse_end",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -446,7 +453,8 @@
"Generichouse_00",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -490,7 +498,8 @@
"Generichouse_00",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -531,7 +540,8 @@
"store_groceries",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -574,7 +584,8 @@
"store_groceries",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -609,7 +620,8 @@
"Generichouse",
"store_electronic_clothing",
"subway_station",
"city_square"
"city_square",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -648,7 +660,8 @@
"Generichouse",
"Generichouse_00",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -717,7 +730,8 @@
"store_electronic_clothing",
"store_groceries",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -815,7 +829,8 @@
"store_electronic_clothing",
"store_groceries",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -884,7 +899,8 @@
"Generichouse",
"Generichouse_00",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1093,7 +1109,8 @@
"subway_station",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1195,7 +1212,8 @@
"RockyHill_SW",
"store_groceries",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1239,7 +1257,8 @@
"subway_station",
"city_square",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1270,7 +1289,8 @@
"store_groceries",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1310,7 +1330,8 @@
"store_groceries",
"generichouse_end",
"office_building_00",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1379,7 +1400,8 @@
"maps": [
"abandoned_building",
"parking_garage",
"city_square"
"city_square",
"neighborhood_school"
]
}
},
Expand Down
29 changes: 13 additions & 16 deletions Mods/Core/Itemgroups/Itemgroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
"max": 1,
"min": 1,
"probability": 20
},
{
"id": "bottle_antidote",
"max": 1,
"min": 1,
"probability": 20
}
],
"mode": "Collection",
Expand Down Expand Up @@ -273,7 +279,8 @@
"abandoned_building",
"subway_station",
"city_square",
"skyscraper"
"skyscraper",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -757,7 +764,8 @@
"store_electronic_clothing",
"store_groceries",
"subway_station",
"city_square"
"city_square",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -789,7 +797,8 @@
"store_groceries",
"subway_station",
"city_square",
"office_building_00"
"office_building_00",
"neighborhood_school"
]
}
},
Expand Down Expand Up @@ -1055,22 +1064,10 @@
"probability": 100
},
{
"id": "long_stick",
"max": 1,
"min": 1,
"probability": 100
},
{
"id": "sharp_stone",
"id": "bottle_antidote",
"max": 1,
"min": 1,
"probability": 100
},
{
"id": "steel_scrap",
"max": 22,
"min": 22,
"probability": 100
}
],
"mode": "Collection",
Expand Down
Loading