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

Add cattle samples to more ungulates #73782

Merged
merged 2 commits into from
May 17, 2024

Conversation

Karol1223
Copy link
Contributor

@Karol1223 Karol1223 commented May 14, 2024

Summary

None

Purpose of change

Recently realized we had a bunch of ungulates that didn't give cattle samples when dissected

Describe the solution

Add cattle samples to llamas, lambs, sheep (and so goat and goat kids by extension) as well as horse foals (don't start this argument in the comments - cattle is a generic ungulate line, and adult horses already give samples)

Also removed the useless empty anger trigger field from llamas

Describe alternatives you've considered

Pigs? They're ungulates. But they feel unique enough in dietary preferences at least if nothing else to warrant not being included in the Cool Cattle Club

Testing

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels May 14, 2024
@IdleSol
Copy link

IdleSol commented May 14, 2024

What I think about it, I've already said.

Add a command to close the topic #73679 if this change is merged. As an automatic resolution to the dispute.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 14, 2024
@fairyarmadillo
Copy link
Contributor

fairyarmadillo commented May 15, 2024

Pigs and boars should drop beast samples IMO. Pigs do have hooves, but that's about all they have in common with the Cattle line. They're not ruminants or beasts of burden, they're more about being berserker dudes which is kinda Beast's whole deal.

All the Cattle animals other than horses fall under the suborder Ruminantia while pigs are in the suborder Suina. Horses have a similar lifestyle to cows though, and pigs don't, so it seems like a good enough place to draw the line.

@Maleclypse
Copy link
Member

Maleclypse commented May 15, 2024

These are all singles?

{
    "id": "dissect_cattle_sample_single",
    "type": "harvest",
    "message": "With cuts and pulls equally similar to both extraction and vandalism, you scrape together the most important parts of the creature.",
    "entries": [ { "drop": "cattle_sample_single", "type": "mutagen_group" } ]
  },
  {
    "id": "dissect_cattle_sample_small",
    "type": "harvest",
    "message": "With cuts and pulls equally similar to both extraction and vandalism, you scrape together the most important parts of the creature.",
    "entries": [ { "drop": "cattle_sample_small", "type": "mutagen_group" } ]
  },
  {
    "id": "dissect_cattle_sample_large",
    "type": "harvest",
    "message": "With cuts and pulls equally similar to both extraction and vandalism, you scrape together the most important parts of the creature.",
    "entries": [ { "drop": "cattle_sample_large", "type": "mutagen_group" } ]
  },
  {
    "id": "dissect_cattle_sample_huge",
    "type": "harvest",
    "message": "With cuts and pulls equally similar to both extraction and vandalism, you scrape together the most important parts of the creature.",
    "entries": [ { "drop": "cattle_sample_huge", "type": "mutagen_group" } ]
  },

Llama seems like it would at least be large?

@Karol1223
Copy link
Contributor Author

Pigs and boars should drop beast samples IMO

That was my first thought as well but I don't wanna be the one to pull the trigger on this decision in particular tbh

Llama seems like it would at least be large?

I could increase it but I think after all this time we're still missing guidelines of how many samples should be given for which monster weight category, so I typically just throw in singles as a safety measure.

@IdleSol
Copy link

IdleSol commented May 15, 2024

Pigs are much closer to bulls than horses.

graph LR
classDef green fill:#00FF00
classDef red fill:#FF0000
classDef none fill:#FFFFFF

text1((Ungulate)):::green --> Perissodactyla & Artiodactyla
Perissodactyla --> t1(...)
Perissodactyla --> Hippomorpha --> Equoidea --> Equidae --> Equus -->Horses:::green & t2("Wild asses"):::none & Zebras:::none

Artiodactyla --> Tylopoda & Artiofabula
Tylopoda --> Camelidae ---> t3(...) --> Camels:::none & Llamas:::green
Artiofabula --> Suina & Cetruminantia
Suina --> Suidae & Tayassuidae
Suidae --> Sus --> t4("wild boar"):::green & Pigs:::green
Tayassuidae ---> Peccary:::none
Cetruminantia ---> t5(...) --> Hippopotamus:::none & Whales:::none & Dolphins:::none
Cetruminantia --> Ruminantia --> Tragulina -->Tragulidae:::none
Ruminantia --> Pecora --> Antilocapridae & Giraffidae & Cervidae & Moschidae & Bovidae

Antilocapridae --> t6(...) --> Pronghorn:::none
Giraffidae --> t7(...) -->Giraffe:::none
Cervidae --> t8(...) --> Moose:::green & Deers:::green
Moschidae --->Moschus:::none
Bovidae --> Aegodontia & Bovinae
Aegodontia --> t9(...) -->Sheeps:::green & Goats:::green
Bovinae --> Bovini --> t10(Cattle = cow and bulls):::red & Bison:::none & Buffalo:::none

And if

How does this matter? We're not going by taxonomy. Our "Cattle" is a generic ungulate.

... then extend that rule without exception.

@Karol1223
Copy link
Contributor Author

We're not going by taxonomy

You quoted this yourself, and continue to argue that we should care about taxonomy. We do not. Our samples and mutations aren't genetics-based, they're phenotype-based. Taxonomy does not matter. Stop repeating yourself all the time.

@IdleSol
Copy link

IdleSol commented May 15, 2024

Then use the correct words. Not a cow sample, but an ungulate sample.

@Karol1223
Copy link
Contributor Author

Karol1223 commented May 15, 2024

Then use the correct words. Not a cow sample, but an ungulate sample.

Then we'd have you arguing that since it's an ungulate sample, all ungulates should be included so pigs should, too, despite not fitting the phenotype. No, it's trading one problem for another, and I have no interest in discussing this further.

@fairyarmadillo
Copy link
Contributor

fairyarmadillo commented May 15, 2024

Then use the correct words. Not a cow sample, but an ungulate sample.

It's not a cow sample, it's a cattle sample. Cattle in English can refer both to cows and to any large hoofed animal of the sort raised on farms. I recall that your primary language is not English, so it is possible that the translation you are working with is inaccurate and could be updated.

(https://www.merriam-webster.com/dictionary/cattle)
1
: domesticated quadrupeds held as property or raised for use
specifically : bovine animals on a farm or ranch

Cattle is not a scientific term and its usage is somewhat loose - it can sometimes mean specifically a cow such as you get beef from, or it can mean any animal owned for farming. It's even been used to refer to people in some cases.

Ungulate is a broader term, but may be less appropriate as it literally just means an animal with hooves. But not all ungulates are cattle - for instance, rhinoceros and elephants are not cattle. Cattle is also what the mutation line has been called since it was added to the game many years ago, and changing it is probably beyond what Karol is trying to do here.

@Karol1223
Copy link
Contributor Author

Cattle is also what the mutation line has been called since it was added to the game many years ago, and changing it is probably beyond what Karol is trying to do here.

I am pro-changing some mutation lines but there's no ideal solution.

Again, "insect" includes myriapods. "Cattle" includes basically all grazing ungulates (with exceptions like Rhinos, so it's even more convoluted). My personal nemesis is Lupine (there's 0 reason for it to not just be Canine)

But you're right in that it is way beyond the scope of what I want to do.

@fairyarmadillo
Copy link
Contributor

I agree, bovine or ungulate would be a better name.

Insect is just a mess. It's the most diverse group of animals on earth and they're all lumped into a nonsensical pile.

@Karol1223
Copy link
Contributor Author

@Maleclypse I looked at some other definitions and most ungulates use singles. I would like a full review of how many samples we end up giving per bodymass kg in the future but for now I'd like to keep them all as singles since I don't want to replace one asspull with another.

@Maleclypse Maleclypse merged commit 388f8e5 into CleverRaven:master May 17, 2024
20 of 25 checks passed
@Maleclypse
Copy link
Member

@Maleclypse I looked at some other definitions and most ungulates use singles. I would like a full review of how many samples we end up giving per bodymass kg in the future but for now I'd like to keep them all as singles since I don't want to replace one asspull with another.

Fair due. Let me know if you need any help with deciding what sample groups should belong to what size.

@Karol1223 Karol1223 deleted the cattle-samples branch May 17, 2024 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants