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

Implement #14 Agents should query the ResourceType they're carrying #31

Merged
merged 5 commits into from
Feb 18, 2024
Merged

Implement #14 Agents should query the ResourceType they're carrying #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56db1a3
added `carryingResourceType` to AgentInterface and its implementations
tommy33790 Feb 7, 2024
06cddce
Merge remote-tracking branch 'origin/dev' into feature/#14_agents_que…
tommy33790 Feb 12, 2024
ee322ff
Merge dev into feature/#14_agents_query_resourcetype
github-actions[bot] Feb 12, 2024
aadea1b
Merge branch 'dev' into feature/#14_agents_query_resourcetype
DivineThreepwood Feb 17, 2024
ac6c6f7
Merge dev into feature/#14_agents_query_resourcetype
github-actions[bot] Feb 17, 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
3 changes: 3 additions & 0 deletions src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ class Agent(
override val isDisabled: Boolean
get() = !isAlive || !hasFuel()

override val carryingResourceType: ResourceType
get() = resource?.type ?: ResourceType.Unknown

override fun isCarryingResource(type: ResourceType): Boolean {
if (isCarryingResource) {
return resource?.type == type
Expand Down
5 changes: 5 additions & 0 deletions src/main/kotlin/org/openbase/planetsudo/level/levelobjects/AgentInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ interface AgentInterface {
*/
val angle: Int

/**
* Gibt die Art der Resource an, die der Agent trägt.
*/
val carryingResourceType: ResourceType

/**
* Zeigt den verbliebenen Treibstoff des Agenten an.
*
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/org/openbase/planetsudo/level/levelobjects/AgentMock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ class AgentMock : AgentInterface {
get() = error("Mock does not offer any functionality.")
override val angle: Int
get() = error("Mock does not offer any functionality.")
override val carryingResourceType: Resource.ResourceType
get() = error("Mock does not offer any functionality.")
override val fuel: Int
get() = error("Mock does not offer any functionality.")
override val fuelInPercent: Int
Expand Down
Loading