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

Update butlertron foods and payout #2500

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+102 −17
Open

Update butlertron foods and payout #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
679c1da
Holy shit this took forever
Stop-Signs Dec 21, 2024
82da389
fucking mothmallows
Stop-Signs Dec 21, 2024
1d133f2
Fucking weed
Stop-Signs Dec 21, 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
117 changes: 101 additions & 16 deletions Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ public sealed partial class RoboisseurComponent : Component
"roboisseur-deny-2",
"roboisseur-deny-3"
};

/// <summary>
/// these protos need to be updated when new food is added
/// </summary>
[DataField("tier2Protos")]
public List<String> Tier2Protos = new()
{
Expand All @@ -98,37 +100,62 @@ public sealed partial class RoboisseurComponent : Component
"FoodSoupTomato",
"FoodBreadMeat",
"FoodBreadCreamcheese",
"FoodBreadTofu",
"FoodCheeseCurds",
"FoodBurgerSuper",
"FoodNoodlesCopy",
// "FoodMothMallow",
"FoodPizzaCorncob",
"FoodPizzaDonkpocket",
"FoodSoupMonkey",
"FoodCakeCarrot",
"FoodBreadBaguette",
"FoodTartGrape",
"FoodMealSashimi",
"FoodBurgerCarp",
"FoodMothMacBalls",
"FoodBakedChevreChaud",
"FoodMealPotatoLoaded",
"FoodMealRibs",
"FoodMealQueso",
"FoodSoupNettle",
"FoodBurgerDuck",
"FoodBurgerBear",
"FoodMealEnchiladas",
"FoodBurgerBaseball"
};

[DataField("tier3Protos")]
public List<String> Tier3Protos = new()
{
"FoodBurgerGhost",
"FoodSoupChiliClown",
"FoodCakeCheese",
"FoodCakeLemoon",
"FoodTartGapple",
"FoodMealNachosCuban",
"FoodSaladWatermelonFruitBowl",
"FoodBakedDumplings",
"FoodMealCubancarp",
"FoodBakedCannabisBrownieBatch",
"FoodPizzaDank",
"FoodBreadFrenchToast",
"FoodMothSeedSoup",
"FoodPieFrosty",
"FoodBreadBanana",
"FoodBreadCotton",
"FoodBurgerCarp",
"FoodBurgerMcguffin",
"FoodBurgerMcrib",
"FoodMothFleetSalad",
"FoodCakeSuppermatter",
"FoodBurgerFive",
"FoodPieBaklava",
"FoodNoodlesMeatball",
"FoodSaladValid",
"FoodSaladKimchi",
"FoodSaladCitrus",
"FoodSoupMeatball",
"FoodSoupWingFangChu",
"FoodTacoChickenSupreme",
"FoodTacoBeefSupreme",
"FoodMealGrilledCheese",
"FoodMothCheesecakeBalls",
"FoodSoupChiliCold",
"FoodMothKachumbariSalad",
"FoodMothChiliCabbageWrap",
"FoodMothHeartburnSoup",
"FoodSoupBisque",
"FoodCakeSlime",
"FoodBurgerCrazy"
Expand Down Expand Up @@ -159,16 +186,23 @@ public sealed partial class RoboisseurComponent : Component
"FoodBurgerSpell",
"FoodMothSqueakingFry",
"FoodBurgerMime",
"FoodPizzaCorncob",
"FoodBurgerGhost",
"FoodCakeClown",
"FoodCakeSpaceman",
"MobCatCake",
"MobBreadDog",
"FoodBreadMimana",
"FoodBreadMeatSpider",
"FoodBurgerHuman",
"FoodNoodlesBoiled",
"FoodPizzaDonkpocket",
"FoodMothOatStew",
"FoodDonkpocketBerryWarm",
"FoodBreadButteredToast",
"FoodMothCottonSoup",
"LeavesTobaccoDried",
"FoodSoupEyeball",
"FoodMothKachumbariSalad",
"FoodBurgerCorgi",
"FoodBreadPlain",
"FoodBreadBun",
Expand All @@ -189,35 +223,86 @@ public sealed partial class RoboisseurComponent : Component
// "FoodBreadMoldySlice",
"FoodRiceBoiled",
"FoodMothEyeballSoup",
"FoodSoupOnion",
"FoodBurgerAppendix",
"FoodBurgerRat",
"FoodBurgerRobot",
"RegenerativeMesh",
"FoodDonkpocketHonkWarm",
"FoodOatmeal",
"FoodBreadJellySlice",
"FoodMothCottonSalad",
// "FoodBreadMoldy",
"FoodDonkpocketSpicyWarm",
"FoodPizzaDank",
"FoodCannabisButter",
"FoodNoodles",
"LeavesCannabisDried",
"FoodBurgerCheese",
"FoodDonkpocketDankWarm",
"FoodDonkpocketDank",
"FoodSpaceshroomCooked",
"FoodMealFries",
"MedicatedSuture",
"FoodDonkpocketWarm",
"FoodCakePlain",
"DisgustingSweptSoup",
"FoodBurgerPlain",
"FoodBreadGarlicSlice",
"FoodSoupMushroom",
"FoodSoupWingFangChu",
"FoodDonkpocketCarp",
"FoodDonkpocketCarpWarm",
"FoodDonkpocketDink",
"FoodDonkpocketStonkWarm",
"FoodDonkpocketStonk",
"FoodDonkpocketBerryWarm",
"FoodDonkpocketBerry",
"FoodDonkpocketHonkWarm",
"FoodDonkpocketHonk",
"FoodDonkpocketPizzaWarm",
"FoodDonkpocketPizza",
"FoodBreadMeatXeno",
"FoodBakedNugget",
"FoodBakedPancake",
"FoodBakedPancakeBb",
"FoodBakedPancakeCc",
"FoodBakedWaffle",
"FoodBakedWaffleSoy",
"FoodBakedWaffleSoylent",
"FoodBakedWaffleRoffle",
"FoodBakedBrownieBatch",
"FoodBakedBrownie",
"FoodBakedCannabisBrownieBatch",
"FoodBakedCannabisBrownie",
"FoodTartMime",
"FoodPieAmanita",
"FoodPizzaMargherita", // pizza lovers in shambles
"FoodPizzaMeat",
"FoodPizzaMushroom",
"FoodPizzaVegetable",
"FoodPizzaDank",
"FoodPizzaSassysage",
"FoodPizzaPineapple",
"FoodPizzaArnold",
"FoodPizzaMoldySlice",
"FoodPizzaUranium",
"FoodPizzaCotton",
"FoodMothPizzaFirecracker",
"FoodMothPizzaFiveCheese",
"FoodMothPizzaPesto",
"FoodBurgerDuck",
"FoodBurgerBear",
"FoodBurgerClown",
"FoodBurgerCrab",
"FoodBurgerXeno",
"FoodMealMemoryleek",
"FoodMothMacBalls",
"FoodJellyAmanita",
"FoodSoupMiso",
"FoodSoupTomatoBlue",
"FoodBoritoPie",
"LeavesCannabisRainbowDried",
"LeavesCannabisDried",
"FoodCakeBrain",
"FoodBurgerBrain",
"FoodSaladCaesar"
"FoodBurgerBrain"
};
}
}
2 changes: 1 addition & 1 deletion Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public override void Update(float frameTime)
private void RewardServicer(EntityUid uid, RoboisseurComponent component, int tier)
{
var r = new Random();
int rewardToDispense = r.Next(500, 1000) + 350 * tier;
int rewardToDispense = r.Next(750, 1250) + 550 * tier;

_material.SpawnMultipleFromMaterial(rewardToDispense, "Credit", Transform(uid).Coordinates);
if(tier > 1)
Expand Down
Loading