Skip to content

Commit

Permalink
Add new starting scenario The Last Delivery (#39703)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fris0uman authored Apr 21, 2020
1 parent 2d89311 commit 449b326
Show file tree
Hide file tree
Showing 13 changed files with 456 additions and 7 deletions.
2 changes: 2 additions & 0 deletions data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@
{ "item": "yoghurt", "prob": 40 },
{ "item": "pudding", "prob": 50 },
{ "item": "V8", "prob": 15 },
{ "item": "foodplace_food", "prob": 8 },
{ "item": "sandwich_t", "prob": 30 },
{ "item": "sandwich_pb", "prob": 30 },
{ "item": "sandwich_pbj", "prob": 30 },
Expand Down Expand Up @@ -760,6 +761,7 @@
{ "item": "cheeseburger", "prob": 35 },
{ "item": "hotdogs_frozen", "prob": 12 },
{ "item": "hotdogs_cooked", "prob": 35 },
{ "item": "foodplace_food", "prob": 8 },
{ "item": "chili", "prob": 20 },
{ "item": "chilidogs", "prob": 20 },
{ "item": "fries", "prob": 80 },
Expand Down
3 changes: 3 additions & 0 deletions data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,7 @@
[ "currywurst", 5 ],
[ "macaroni_cooked", 5 ],
[ "lasagne", 5 ],
[ "foodplace_food", 2 ],
[ "spaghetti_pesto", 5 ],
[ "glazed_tenderloin", 5 ]
]
Expand All @@ -781,6 +782,7 @@
[ "tomato", 20 ],
[ "lettuce", 15 ],
[ "zucchini", 15 ],
[ "foodplace_food", 20 ],
[ "onion", 15 ],
[ "chili_pepper", 15 ],
[ "carrot", 15 ],
Expand Down Expand Up @@ -842,6 +844,7 @@
[ "spaghetti_raw", 20 ],
[ "lasagne_raw", 20 ],
[ "macaroni_raw", 20 ],
[ "foodplace_food", 5 ],
[ "knife_butcher", 10 ]
]
},
Expand Down
20 changes: 20 additions & 0 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,26 @@
"vitamins": [ [ "calcium", 4 ], [ "iron", 47 ], [ "vitC", 7 ] ],
"fun": -10
},
{
"type": "COMESTIBLE",
"id": "foodplace_food",
"name": { "str": "Foodplace's delicious food™", "str_pl": "Foodplace's delicious food™" },
"weight": "500 g",
"color": "magenta",
"comestible_type": "FOOD",
"container": "box_small",
"symbol": "f",
"calories": 500,
"description": "The best-seller from Foodplace, delicious food™, is made with real foodstuff and is guaranteed 100% edible!",
"price": 500,
"price_postapoc": 1000,
"material": "foodplace_foodstuff",
"volume": "500 ml",
"flags": [ "EDIBLE_FROZEN", "IRREPLACEABLE_CONSUMABLE" ],
"addiction_potential": 1,
"charges": 4,
"fun": 2
},
{
"type": "COMESTIBLE",
"id": "lentils_cooked",
Expand Down
6 changes: 6 additions & 0 deletions data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,12 @@
"cut_dmg_verb": "cut",
"burn_data": [ { "fuel": 1, "smoke": 1, "burn": 1 }, { "fuel": 1, "smoke": 1, "burn": 2 }, { "fuel": 1, "smoke": 1, "burn": 3 } ]
},
{
"type": "material",
"ident": "foodplace_foodstuff",
"name": "Foodplace'delicious foodstuff",
"copy-from": "junk"
},
{
"type": "material",
"ident": "kevlar",
Expand Down
11 changes: 11 additions & 0 deletions data/json/npcs/missiondef.json
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,17 @@
"start": "find_safety",
"origins": [ "ORIGIN_NULL" ]
},
{
"id": "MISSION_LAST_DELIVERY",
"type": "mission_definition",
"name": { "str": "Reach The Mansion And Finish This Delivery" },
"goal": "MGOAL_GO_TO_TYPE",
"destination": "mansion_c3_north",
"difficulty": 1,
"value": 0,
"start": { "assign_mission_target": { "om_terrain": "mansion_c3", "om_special": "Mansion_Wild", "search_range": 200 } },
"origins": [ "ORIGIN_GAME_START" ]
},
{
"id": "MISSION_RECOVER_PRIEST_DIARY",
"type": "mission_definition",
Expand Down
4 changes: 2 additions & 2 deletions data/json/overmap/overmap_special/specials.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@
],
"connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "existing": true } ],
"locations": [ "land", "swamp" ],
"city_distance": [ 10, 200 ],
"city_sizes": [ 1, 3 ],
"city_distance": [ 20, -1 ],
"city_sizes": [ 1, 8 ],
"occurrences": [ 0, 2 ],
"flags": [ "CLASSIC", "WILDERNESS" ]
},
Expand Down
15 changes: 14 additions & 1 deletion data/json/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,25 @@
"ident": "foodplace",
"name": "The Mascot Rises",
"points": 0,
"description": "You just finished your shift and got back in the break room when you heard the alarms and the security door shutting down behind you. There's a lot of customers out there and you're not sure Foodplace delicious food is going to be enough for them.",
"description": "You just finished your shift and got back in the break room when you heard the alarms and the security door shutting down behind you. There's a lot of customers out there and you're not sure Foodplace's delicious food is going to be enough for them.",
"allowed_locs": [ "sloc_restaraunt_foodplace_break_room" ],
"professions": [ "true_foodperson", "unemployed" ],
"start_name": "Foodplace Break Room",
"flags": [ "CITY_START" ]
},
{
"type": "scenario",
"ident": "last_delivery",
"name": "The Last Delivery",
"points": 2,
"description": "While the world was falling apart someone called to order some of Foodplace's delicious food™ and they sent you to do the delivery. You're not sure about much, but one thing is certain: that delicious food™ is going to get delivered even if that's the last thing you do!",
"vehicle": "food_truck_delivery_mission",
"professions": [ "true_foodperson", "unemployed" ],
"start_name": "A Stop On The Road",
"allowed_locs": [ "sloc_gas_station" ],
"missions": [ "MISSION_LAST_DELIVERY" ],
"flags": [ "LONE_START" ]
},
{
"type": "scenario",
"ident": "wilderness",
Expand Down
6 changes: 6 additions & 0 deletions data/json/start_locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,12 @@
"name": "Lake Cabin",
"terrain": [ "cabin_lake" ]
},
{
"type": "start_location",
"id": "sloc_gas_station",
"name": "Gas Station",
"terrain": [ "s_gas_rural" ]
},
{
"type": "start_location",
"id": "sloc_lighthouse_ground",
Expand Down
2 changes: 2 additions & 0 deletions data/json/vehicle_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
[ "humvee", 150 ],
[ "humvee_gl", 50 ],
[ "icecream_truck", 50 ],
[ "food_truck", 50 ],
[ "wienermobile", 5 ],
[ "tatra_truck", 100 ],
[ "4x4_car", 500 ]
Expand Down Expand Up @@ -236,6 +237,7 @@
[ "motorcycle_sidecart", 300 ],
[ "shopping_cart", 1000 ],
[ "icecream_truck", 50 ],
[ "food_truck", 20 ],
[ "wienermobile", 5 ],
[ "portable_generator", 50 ],
[ "4x4_car", 200 ]
Expand Down
Loading

0 comments on commit 449b326

Please sign in to comment.