feat(explore): you can only wave at a person once every 12 hours, closes

 #51

README.md

@@ -72,6 +72,7 @@ we love eating our oats
 - `EXPLORE_EVENT_WAVE_PERCENT_BOOST` - the percent boost to wave events happening (default: 0)
 - `EXPLORE_SPEED_MULTIPLIER` - the multiplier for explore speed [percent] (default: 100)
 - `EXPLORE_XP_MULTIPLIER` - the multiplier for explore XP [percent] (default: 100)
+- `EXPLORE_EVENT_WAVE_COOLDOWN` - the hour cooldown between waves (default: 12)
 
 #### Finding Items
 

server/src/app.module.ts

@@ -31,6 +31,7 @@ import { GameplayModule } from './modules/gameplay/gameplay.module';
 import { LeaderboardModule } from './modules/leaderboard/leaderboard.module';
 import { MarketModule } from './modules/market/market.module';
 import { UpdateAuthTimeInterceptor } from './utils/updatetime.interceptor';
+import { WaveModule } from './modules/wave/wave.module';
 
 const logLevel = process.env.LOG_LEVEL || 'trace';
 
@@ -97,6 +98,7 @@ const logLevel = process.env.LOG_LEVEL || 'trace';
     AggregatorModule,
     EventsModule,
     LeaderboardModule,
+    WaveModule,
   ],
   controllers: [AppController, GameplayController],
   providers: [

server/src/modules/config/mikro-orm-config.ts

@@ -11,6 +11,7 @@ import { Notification } from '@modules/notification/notification.schema';
 import { Player } from '@modules/player/player.schema';
 import { Stats } from '@modules/stats/stats.schema';
 import { User } from '@modules/user/user.schema';
+import { PlayerWave } from '@modules/wave/playerwave.schema';
 import { ConfigService } from '@nestjs/config';
 
 export const MIKRO_ORM_CONFIG = Symbol('MIKRO_ORM_CONFIG');
@@ -42,6 +43,7 @@ function mikroOrmConfigFactory(
       MarketItem,
       MarketSale,
       Fight,
+      PlayerWave,
     ],
     dbName: process.env.NODE_ENV === 'production' ? 'ateoat' : 'ateoattest',
     type: 'mongo',

server/src/modules/content/constants.service.ts

@@ -14,6 +14,7 @@ export class ConstantsService {
   public readonly baseExploreSpeed: number = 3;
 
   public readonly wavePercentBoost: number = 0;
+  public readonly waveHourCooldown: number = 12;
   public readonly itemFindPercentBoost: number = 0;
   public readonly collectibleFindPercentBoost: number = 0;
   public readonly resourceFindPercentBoost: number = 0;
@@ -83,6 +84,10 @@ export class ConstantsService {
       'EXPLORE_EVENT_WAVE_PERCENT_BOOST',
       0,
     );
+    this.waveHourCooldown = +this.configService.get<number>(
+      'EXPLORE_EVENT_WAVE_COOLDOWN',
+      12,
+    );
     this.itemFindPercentBoost = +this.configService.get<number>(
       'EXPLORE_EVENT_ITEM_FIND_PERCENT_BOOST',
       0,

server/src/modules/gameplay/gameplay.module.ts

@@ -9,6 +9,7 @@ import { InventoryModule } from '@modules/inventory/inventory.module';
 import { NotificationModule } from '@modules/notification/notification.module';
 import { PlayerModule } from '@modules/player/player.module';
 import { StatsModule } from '@modules/stats/stats.module';
+import { WaveModule } from '@modules/wave/wave.module';
 import { Module } from '@nestjs/common';
 import { ItemService } from './item.service';
 import { NpcService } from './npc.service';
@@ -25,20 +26,21 @@ import { TravelService } from './travel.service';
     PlayerModule,
     CraftingModule,
     FightModule,
+    WaveModule,
   ],
   providers: [
     GameplayService,
     TravelService,
-    WaveService,
     ItemService,
     NpcService,
+    WaveService,
   ],
   exports: [
     GameplayService,
     TravelService,
-    WaveService,
     ItemService,
     NpcService,
+    WaveService,
   ],
 })
 export class GameplayModule {}

server/src/modules/gameplay/wave.service.ts

@@ -4,6 +4,7 @@ import { NotificationService } from '@modules/notification/notification.service'
 import { Player } from '@modules/player/player.schema';
 import { PlayerService } from '@modules/player/player.service';
 import { StatsService } from '@modules/stats/stats.service';
+import { WaveDBService } from '@modules/wave/wavedb.service';
 import {
   ForbiddenException,
   Injectable,
@@ -22,6 +23,7 @@ export class WaveService {
     private readonly analyticsService: AnalyticsService,
     private readonly events: EventEmitter2,
     private readonly notificationService: NotificationService,
+    private readonly waveDBService: WaveDBService,
   ) {}
 
   async waveToPlayerFromExplore(userId: string): Promise<UserResponse> {
@@ -141,6 +143,8 @@ export class WaveService {
 
     this.logger.verbose(`Player ${userId} waved to ${targetUserId}.`);
 
+    await this.waveDBService.addWave(userId, targetUserId);
+
     return { player: playerPatches };
   }
 }

server/src/modules/player/player.module.ts

@@ -6,6 +6,7 @@ import { NpcService } from '@modules/player/npc.service';
 import { PlayerController } from '@modules/player/player.controller';
 import { Player } from '@modules/player/player.schema';
 import { PlayerService } from '@modules/player/player.service';
+import { WaveModule } from '@modules/wave/wave.module';
 import { Module } from '@nestjs/common';
 
 @Module({
@@ -15,6 +16,7 @@ import { Module } from '@nestjs/common';
     ContentModule,
     InventoryModule,
     DiscoveriesModule,
+    WaveModule,
   ],
   providers: [PlayerService, NpcService],
   exports: [PlayerService],

server/src/modules/player/player.service.ts

@@ -18,6 +18,7 @@ import { Inventory } from '@modules/inventory/inventory.schema';
 import { InventoryService } from '@modules/inventory/inventory.service';
 import { NpcService } from '@modules/player/npc.service';
 import { Player } from '@modules/player/player.schema';
+import { WaveDBService } from '@modules/wave/wavedb.service';
 import {
   BadRequestException,
   ForbiddenException,
@@ -43,6 +44,7 @@ export class PlayerService {
     private readonly discoveriesService: DiscoveriesService,
     private readonly npcService: NpcService,
     private readonly events: EventEmitter2,
+    private readonly waveDBService: WaveDBService,
   ) {}
 
   async getPlayerForUser(userId: string): Promise<Player | undefined> {
@@ -437,6 +439,12 @@ export class PlayerService {
 
     if (!randomPlayer) return;
 
+    const existingWave = await this.waveDBService.getExistingWave(
+      player.userId,
+      randomPlayer.userId,
+    );
+    if (existingWave) return;
+
     this.setPlayerAction(player, {
       text: 'Wave',
       action: 'wave',

server/src/modules/wave/playerwave.schema.ts

@@ -0,0 +1,41 @@
+import {
+  Entity,
+  Index,
+  PrimaryKey,
+  Property,
+  SerializedPrimaryKey,
+} from '@mikro-orm/core';
+import { ObjectId } from '@mikro-orm/mongodb';
+
+@Entity()
+export class PlayerWave {
+  @PrimaryKey({ hidden: true })
+  _id!: ObjectId;
+
+  @SerializedPrimaryKey({ hidden: true })
+  id!: string;
+
+  @Index()
+  @Property()
+  playerWaving: string;
+
+  @Index()
+  @Property()
+  playerWavingAt: string;
+
+  @Property()
+  @Index({ options: { expireAfterSeconds: 0 } })
+  expiresAt: Date;
+
+  constructor(
+    playerWaving: string,
+    playerWavingAt: string,
+    expiresAfterHours = 12,
+  ) {
+    this.playerWaving = playerWaving;
+    this.playerWavingAt = playerWavingAt;
+
+    this.expiresAt = new Date();
+    this.expiresAt.setHours(this.expiresAt.getHours() + expiresAfterHours);
+  }
+}

server/src/modules/wave/wave.module.ts

@@ -0,0 +1,11 @@
+import { MikroOrmModule } from '@mikro-orm/nestjs';
+import { PlayerWave } from '@modules/wave/playerwave.schema';
+import { Module } from '@nestjs/common';
+import { WaveDBService } from './wavedb.service';
+
+@Module({
+  imports: [MikroOrmModule.forFeature([PlayerWave])],
+  providers: [WaveDBService],
+  exports: [WaveDBService],
+})
+export class WaveModule {}

server/src/modules/wave/wavedb.service.ts

@@ -0,0 +1,27 @@
+import { EntityRepository } from '@mikro-orm/mongodb';
+import { InjectRepository } from '@mikro-orm/nestjs';
+import { PlayerWave } from '@modules/wave/playerwave.schema';
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class WaveDBService {
+  constructor(
+    @InjectRepository(PlayerWave)
+    private readonly playerWaves: EntityRepository<PlayerWave>,
+  ) {}
+
+  async getExistingWave(
+    waver: string,
+    wavedAt: string,
+  ): Promise<PlayerWave | null> {
+    return this.playerWaves.findOne({
+      playerWaving: waver,
+      playerWavingAt: wavedAt,
+    });
+  }
+
+  async addWave(waver: string, wavedAt: string): Promise<void> {
+    const wave = new PlayerWave(waver, wavedAt);
+    await this.playerWaves.create(wave);
+  }
+}