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

Jump to bottom

Reverted Weed #333

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reverted Weed #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15efa80
Reverted Weed
Gingerbeard5773 Mar 13, 2022
168cbc5
Merge branch 'master' into Removed-weed
Gingerbeard5773 Mar 15, 2022
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
9 changes: 0 additions & 9 deletions TFlippy_TerritoryControl_Characters_Dev/Entities/NPC/Hobo/Hobo.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,15 +355,6 @@ void onInit(CBlob@ this)
}
else if (rand.NextRanged(100) < 40)
{

if (rand.NextRanged(100) < 70)
{
u32 cost = getRandomCost(@rand, 300, 500);
ShopItem@ s = addShopItem(this, "sell boof", "$COIN$", "coin-" + cost, "ill take this giggly shit off yer hands fer " + cost + " coins.");
AddRequirement(s.requirements, "blob", "boof", "Boof", 1);
s.spawnNothing = true;
}

if (rand.NextRanged(100) < 50)
{
u32 cost = getRandomCost(@rand, 500, 700);
Expand Down
Binary file removed TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Ganja/Ganja.png
View file
Open in desktop
Binary file not shown.
111 changes: 0 additions & 111 deletions TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Ganja/GanjaPlant.cfg
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Ganja/GanjaPlantLogic.as
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Ganja/GanjaPlantStuff.as
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Ganja/GanjaPod.cfg
View file
Open in desktop

This file was deleted.

Binary file removed TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Ganja/GanjaPod.png
View file
Open in desktop
Binary file not shown.
6 changes: 2 additions & 4 deletions TFlippy_TerritoryControl_Characters_Dev/Entities/Nature/Seed/Seed.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ const string[] seed_sprites =
"Entities/Natural/Seed/Seed.png", // bush
"Entities/Natural/Seed/Seed.png", // flowers
"Entities/Natural/Seed/Seed.png", // pumpkin
"Entities/Natural/Seed/Seed.png", // protopopov
"Entities/Natural/Seed/Seed.png" // ganja
"Entities/Natural/Seed/Seed.png" // protopopov
};

// names of seeds
Expand All @@ -29,8 +28,7 @@ const string[] seed_names =
"Bush Seed", // bush
"Flower Seed", // flowers
"Pumpkin Seed", // pumpkin
"Protopopov Seed", // protopopov
"Ganja Seed" // ganja
"Protopopov Seed" // protopopov
};

const u32 OPT_TICK = 31;
Expand Down
73 changes: 0 additions & 73 deletions TFlippy_TerritoryControl_Core_Dev/Entities/Materials/Construction/Material_Boof.as
View file
Open in desktop

This file was deleted.

Loading