@paintswap/estfor-definitions 0.1.81 → 0.1.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paintswap/estfor-definitions",
-  "version": "0.1.81",
+  "version": "0.1.83",
   "description": "Types and constants for Estfor Kingdom",
   "repository": {
     "type": "git",

package/src/types.ts

@@ -154,7 +154,6 @@ export const defaultInputItem = new InputItem()
 export const noAttire = new Attire()
 
 export class PastRandomRewardInfo {
-  actionId: u16 = 0
   queueId: u64 = 0
   itemTokenId: u16 = 0
   amount: u32 = 0
@@ -177,15 +176,24 @@ export class PendingQueuedActionMetadata {
   xpElapsedTime: i32 = 0
 }
 
-export class PendingQueuedActionXPGained {
-  // The amount of XP that the queued action has already gained
+// The amount of XP that the queued action has already been gained in the current action
+class PendingQueuedActionData {
+  // The amount of XP that the queued
+  skill1: Skill = Skill.NONE
+  xpGained1: u32 = 0
+  skill2: Skill = Skill.NONE
+  xpGained2: u32 = 0
+  // How much food is consumed in the current action so far
+  foodConsumed: u16 = 0
+  // How many base consumables are consumed in the current action so far
+  numConsumed: u16 = 0
+}
+
+class PendingQueuedActionProcessed {
   // XP gained during this session
   skills: Skill[] = []
   xpGainedSkills: u32[] = []
-  alreadyProcessedSkill: Skill = Skill.NONE
-  alreadyProcessedXPGained: u32 = 0
-  alreadyProcessedSkill1: Skill = Skill.NONE
-  alreadyProcessedXPGained1: u32 = 0
+  currentAction: PendingQueuedActionData = new PendingQueuedActionData()
 }
 
 export class QuestState {
@@ -203,7 +211,7 @@ export class PendingQueuedActionState {
   // First 2 are in sync
   equipmentStates: PendingQueuedActionEquipmentState[] = []
   actionMetadatas: PendingQueuedActionMetadata[] = []
-  xpGained: PendingQueuedActionXPGained = new PendingQueuedActionXPGained()
+  processedData: PendingQueuedActionProcessed = new PendingQueuedActionProcessed()
   producedPastRandomRewards: PastRandomRewardInfo[] = []
   xpRewardItemTokenIds: string[] = []
   xpRewardAmounts: string[] = []
@@ -238,6 +246,7 @@ export class Player {
   pendingRandomRewards: string[] = [] // Timestamps for any rewards which are waiting on the next seed
   activeQuest: PlayerQuest = new PlayerQuest()
   numFixedQuestsCompleted: u32 = 0
+  isBurnt: boolean = false // Whether the NFT associated with this player has been burnt
 
   /* Skill XP */
   woodcuttingXP: string = '0'
@@ -513,18 +522,18 @@ export class Quest {
   id: string = '' // quest id
 
   dependentQuest: Quest = new Quest() // The quest that must be completed before this one can be started
-  action: Action = new Action() // action to do
-  actionNum: u16 = 0 // how many (up to 65535)
-  action1: Action = new Action() // another action to do
+  action1: Action = new Action() // action to do
   actionNum1: u16 = 0 // how many (up to 65535)
+  action2: Action = new Action() // another action to do
+  actionNum2: u16 = 0 // how many (up to 65535)
   actionChoice: ActionChoice = new ActionChoice() // actionChoice to perform
   actionChoiceNum: u16 = 0 // how many to do (base number), (up to 65535)
   skillReward: Skill = Skill.NONE // The skill to reward XP to
   skillXPGained: u16 = 0 // The amount of XP to give (up to 65535)
-  rewardItem: Item = new Item() // Reward an item
-  rewardAmount: u16 = 0 // amount of the reward (up to 65535)
-  rewardItem1: Item = new Item() // Reward another item
+  rewardItem1: Item = new Item() // Reward an item
   rewardAmount1: u16 = 0 // amount of the reward (up to 65535)
+  rewardItem2: Item = new Item() // Reward another item
+  rewardAmount2: u16 = 0 // amount of the reward (up to 65535)
   burnItem: Item = new Item() // Burn an item
   burnAmount: u16 = 0 // amount of the burn (up to 65535)
   requireActionsCompletedBeforeBurning: boolean // Whether we can start burning before other things are completed
@@ -536,8 +545,8 @@ export class Quest {
 
 export class PlayerQuestOutput {
   questId: string = ''
-  actionCompletedNum: u32 = 0
   actionCompletedNum1: u32 = 0
+  actionCompletedNum2: u32 = 0
   actionChoiceCompletedNum: u32 = 0
   burnCompletedAmount: u32 = 0
 }
@@ -551,8 +560,8 @@ export class PlayerQuest {
   lastUpdatedTimestamp: string = ''
 
   // Progression in this quest
-  actionCompletedNum: u32 = 0
   actionCompletedNum1: u32 = 0
+  actionCompletedNum2: u32 = 0
   actionChoiceCompletedNum: u32 = 0
   burnCompletedAmount: u32 = 0
 
@@ -572,6 +581,8 @@ export class Clan {
   id: string = ''
   owner: Player = new Player()
   name: string = ''
+  discord: string | null = ''
+  telegram: string | null = ''
   imageId: u16 = 0
   tier: ClanTier = new ClanTier()
   createdTimestamp: string = ''

package/src/whitelisted_admins.ts

@@ -11,6 +11,5 @@ export const whitelistedAdmins = [
   '0xa69950c58fd6f885088f492c80162eba237931c2',
   '0x1d877c5e1452a635b3feaa47994b03c7c0976ad3',
   '0xb4dda75e5dee0a9e999152c3b72816fc1004d1dd',
-  '0xdea975931e3c827cb64cd978c5b43504e56d675c',
 ]
 export default whitelistedAdmins