Skip to content

Commit

Permalink
Merge pull request #144 from Preponderous-Software/feature/markets
Browse files Browse the repository at this point in the history
Settlement Markets
  • Loading branch information
dmccoystephenson authored Jul 15, 2023
2 parents dc072d9 + 0d66904 commit e822fee
Show file tree
Hide file tree
Showing 99 changed files with 2,525 additions and 836 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.25.0",
"commands": [
"dotnet-csharpier"
]
}
}
}
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,19 @@ The following controls are available in the game:
| `N` | Create a new nation |
| `J` | Join a random nation |
| `L` | Leave your current nation |
| `T` | Teleport all living entities to you |
| `F` | Found a settlement |
| `P` | Plant a sapling |
| `Num Lock` | Toggle auto-walk |
| `F1` | Spawn a new pawn |
| `H` | Teleport to home settlement |
| `B` | Build stall |
| `Insert` | Toggle auto-walk |
| `Page Up` | Increase render distance |
| `Page Down` | Decrease render distance |
| `F1` | Toggle show debug menu |
| `F2` | Generate nearby land |
| `F3` | Spawn money |
| `F3` | Spawn a new pawn |
| `F4` | Spawn money |
| `F5` | Spawn wood |
| `F6` | Teleport all pawns to you |

## Game Systems
There are a number of systems that will be implemented in the game. These systems will be used to create a rich and engaging gameplay experience. Details can be found in the [Systems Document](./docs/SYSTEMS.md).
Expand Down
513 changes: 393 additions & 120 deletions src/c#/main/OpenSourceGame.cs

Large diffs are not rendered by default.

27 changes: 23 additions & 4 deletions src/c#/main/behavior/BehaviorType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,31 @@ namespace osg {

public enum BehaviorType {
NONE,

// environment modification
GATHER_RESOURCES,
SELL_RESOURCES,
PLANT_SAPLING,

// movement
WANDER,
GO_TO_HOME_SETTLEMENT,
EXIT_SETTLEMENT,

// trading
SELL_RESOURCES,
PURCHASE_FOOD,
CREATE_SETTLEMENT,
GO_HOME,
PLANT_SAPLING,
PURCHASE_STALL,
TRANSFER_ITEMS_TO_STALL,
COLLECT_PROFIT_FROM_STALL,
COLLECT_FOOD_FROM_STALL,

// construction
CONSTRUCT_SETTLEMENT,
CONSTRUCT_STALL,

// nation
CREATE_NATION,
JOIN_NATION,
JOIN_RANDOM_SETTLEMENT
}
}
243 changes: 154 additions & 89 deletions src/c#/main/behavior/PawnBehaviorCalculator.cs

Large diffs are not rendered by default.

Loading

0 comments on commit e822fee

Please sign in to comment.