Skip to content

Commit

Permalink
Report result + effects refactoring #2273
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Core/src/core/database/game/models/Player.ts
#	Core/src/core/maps/TravelTime.ts
#	Core/src/data/WitchAction.ts
#	Discord/src/bot/DiscordCache.ts
#	Discord/src/commands/player/ReportCommand.ts
#	Discord/src/packetHandlers/handlers/CommandHandlers.ts
#	Lang/de/commands.json
#	Lang/de/discordBuilder.json
#	Lang/de/error.json
#	Lang/en/commands.json
#	Lang/en/error.json
#	Lang/es/commands.json
#	Lang/es/discordBuilder.json
#	Lang/es/error.json
#	Lang/fr/commands.json
#	Lang/fr/error.json
#	Lang/it/commands.json
#	Lang/it/discordBuilder.json
#	Lang/it/error.json
#	Lang/pt/commands.json
#	Lang/pt/discordBuilder.json
#	Lang/pt/error.json
#	Lib/src/constants/PlayersConstants.ts
  • Loading branch information
@Feiryn @BastLast
Feiryn authored and BastLast committed Mar 12, 2024
1 parent a1a727e commit 3e4ab49
Show file tree
Hide file tree
Showing 118 changed files with 2,317 additions and 2,180 deletions.
6 changes: 3 additions & 3 deletions Core/resources/events/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"cutTree": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30
}
}
},
"end": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 100
}
}
Expand All @@ -20,7 +20,7 @@
"outcomes": {
"0": {},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"health": -5,
"lostTime": 30
}
Expand Down
6 changes: 3 additions & 3 deletions Core/resources/events/10.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
"outcomes": {
"0": {},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30,
"randomItem": {}
},
"2": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30,
"money": 234
},
"3": {
"effect": ":confounded:",
"effect": "confounded",
"health": -10
}
}
Expand Down
12 changes: 6 additions & 6 deletions Core/resources/events/11.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"end": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 45
}
}
Expand All @@ -12,7 +12,7 @@
"outcomes": {
"0": {},
"1": {
"effect": ":head_bandage:",
"effect": "hurt",
"health": -40,
"money": -200
}
Expand All @@ -21,23 +21,23 @@
"forest": {
"outcomes": {
"0": {
"effect": ":face_with_monocle:"
"effect": "lost"
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 130,
"randomItem": {}
},
"2": {
"effect": ":head_bandage:",
"effect": "hurt",
"health": -20
}
}
},
"oppositeSide": {
"outcomes": {
"0": {
"effect": ":face_with_monocle:"
"effect": "lost"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions Core/resources/events/12.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"craftBoat": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"health": -5,
"lostTime": 30
},
"1": {
"effect": ":cold_face:",
"effect": "freezing",
"health": -30
},
"2": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 140,
"randomItem": {}
}
Expand All @@ -21,42 +21,42 @@
"end": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 165
}
}
},
"otherWay": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 55
}
}
},
"searchBridge": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 60
},
"2": {
"money": 30
},
"3": {
"effect": ":confounded:",
"effect": "confounded",
"health": -25
}
}
},
"swim": {
"outcomes": {
"0": {
"effect": ":cold_face:",
"effect": "freezing",
"health": -30
},
"1": {
Expand Down
20 changes: 10 additions & 10 deletions Core/resources/events/13.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"end": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 200
}
}
},
"goAway": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 25
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 70
}
}
Expand All @@ -24,7 +24,7 @@
"outcomes": {
"0": {},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 40,
"money": -300
},
Expand All @@ -33,19 +33,19 @@
},
"3": {},
"4": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 20
}
}
},
"goInn": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 120
},
"1": {
"effect": ":sleeping:",
"effect": "sleeping",
"health": 15,
"money": -70,
"tags": [
Expand All @@ -58,16 +58,16 @@
"goMarket": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30,
"randomItem": {}
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 60
},
"2": {
"effect": ":dizzy_face:",
"effect": "injured",
"health": -60
}
}
Expand Down
18 changes: 9 additions & 9 deletions Core/resources/events/14.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
"chatWorker": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 60,
"randomItem": {}
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 10
},
"2": {
"effect": ":dizzy_face:",
"effect": "injured",
"health": -70
}
}
},
"end": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30
}
}
Expand All @@ -29,28 +29,28 @@
"outcomes": {
"0": {},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 20
},
"2": {
"effect": ":sleeping:",
"effect": "sleeping",
"health": -20
}
}
},
"stayNight": {
"outcomes": {
"0": {
"effect": ":sleeping:",
"effect": "sleeping",
"health": 10
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 5
},
"2": {},
"3": {
"effect": ":clock2:",
"effect": "occupied",
"health": 5,
"lostTime": 100
}
Expand Down
14 changes: 7 additions & 7 deletions Core/resources/events/15.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"end": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 35
}
}
Expand All @@ -14,7 +14,7 @@
"1": {},
"2": {},
"3": {
"effect": ":confounded:",
"effect": "confounded",
"health": -5
}
}
Expand All @@ -25,20 +25,20 @@
"money": 100
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 30,
"money": -200
},
"2": {
"effect": ":confounded:",
"effect": "confounded",
"health": -20
}
}
},
"trade": {
"outcomes": {
"0": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 45,
"money": -200,
"randomItem": {},
Expand All @@ -47,14 +47,14 @@
]
},
"1": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 10
},
"2": {
"money": -70
},
"3": {
"effect": ":clock2:",
"effect": "occupied",
"lostTime": 45,
"money": -200,
"tags": [
Expand Down
Loading

0 comments on commit 3e4ab49

Please sign in to comment.