From 92b0b2dfedf701e6c0bdda1e66ded4aec7a1ec39 Mon Sep 17 00:00:00 2001 From: bartavelle Date: Fri, 19 Jan 2018 14:05:43 +0100 Subject: [PATCH] Quick reskin --- Startups/Base.hs | 16 ++--- Startups/CardList.hs | 146 ++++++++++++++++++++-------------------- Startups/Cards.hs | 2 +- Startups/PrettyPrint.hs | 2 +- src/Xmpp/Backend.hs | 2 +- tests/tests.hs | 20 +++--- 6 files changed, 94 insertions(+), 94 deletions(-) diff --git a/Startups/Base.hs b/Startups/Base.hs index ea3e796..a416811 100644 --- a/Startups/Base.hs +++ b/Startups/Base.hs @@ -35,20 +35,20 @@ data CompanySide = A | B data CompanyProfile = CompanyProfile Company CompanySide deriving (Eq, Ord, Show) -data Resource = Youthfulness -- ^ Glass - | Vision -- ^ Papyrus - | Adoption -- ^ Fabric - | Development -- ^ Clay - | Operations -- ^ Stone - | Marketing -- ^ Wood - | Finance -- ^ Ore +data Resource = Hype -- ^ Glass + | Vision -- ^ Papyrus + | Adoption -- ^ Fabric + | Development -- ^ Clay + | Operations -- ^ Stone + | Marketing -- ^ Wood + | Finance -- ^ Ore deriving (Ord, Eq, Show, Enum, Bounded) baseResources :: S.Set Resource baseResources = S.fromList [Development, Operations, Marketing, Finance] advancedResources :: S.Set Resource -advancedResources = S.fromList [Adoption, Vision, Youthfulness] +advancedResources = S.fromList [Adoption, Vision, Hype] newtype Poacher = Poacher { getPoacher :: Integer } deriving (Ord, Eq, Num, Integral, Real, Enum, Show, FromJSON, ToJSON) diff --git a/Startups/CardList.hs b/Startups/CardList.hs index 9e36916..0a05cdc 100644 --- a/Startups/CardList.hs +++ b/Startups/CardList.hs @@ -16,7 +16,7 @@ getResourceCard :: CompanyProfile -> CompanyStage -> Card getResourceCard p@(CompanyProfile c _) Project = CompanyCard p Project "" [ProvideResource r 1 Shared] where r = case c of Facebook -> Finance - Twitter -> Youthfulness + Twitter -> Hype Apple -> Vision Google -> Development Yahoo -> Marketing @@ -46,7 +46,7 @@ getResourceCard p@(CompanyProfile c A) Stage3 = CompanyCard p Stage3 cost [AddVi where cost = case c of Facebook -> "FFFF" - Twitter -> "YY" + Twitter -> "HH" Apple -> "VV" Google -> "DDDD" Yahoo -> "FF" @@ -59,16 +59,16 @@ getResourceCard c@(CompanyProfile Twitter B) s@Stage2 = CompanyCard c s "MM" getResourceCard c@(CompanyProfile Twitter B) s@Stage3 = CompanyCard c s "OOO" [AddVictory CompanyVictory 7 HappensOnce] getResourceCard c@(CompanyProfile Apple B) s@Stage1 = CompanyCard c s "OO" [AddVictory CompanyVictory 2 HappensOnce, GainFunding 4 HappensOnce] getResourceCard c@(CompanyProfile Apple B) s@Stage2 = CompanyCard c s "MM" [AddVictory CompanyVictory 3 HappensOnce, GainFunding 4 HappensOnce] -getResourceCard c@(CompanyProfile Apple B) s@Stage3 = CompanyCard c s "YVA" [AddVictory CompanyVictory 5 HappensOnce, GainFunding 4 HappensOnce] +getResourceCard c@(CompanyProfile Apple B) s@Stage3 = CompanyCard c s "HVA" [AddVictory CompanyVictory 5 HappensOnce, GainFunding 4 HappensOnce] getResourceCard c@(CompanyProfile Google B) s@Stage1 = CompanyCard c s "DA" [AddVictory CompanyVictory 3 HappensOnce] -getResourceCard c@(CompanyProfile Google B) s@Stage2 = CompanyCard c s "MMY" [Efficiency] +getResourceCard c@(CompanyProfile Google B) s@Stage2 = CompanyCard c s "MMH" [Efficiency] getResourceCard c@(CompanyProfile Google B) s@Stage3 = CompanyCard c s "DDDV" [ScientificBreakthrough] getResourceCard c@(CompanyProfile Yahoo B) s@Stage1 = CompanyCard c s "MM" [CheapExchange baseResources (S.fromList [NLeft, NRight])] getResourceCard c@(CompanyProfile Yahoo B) s@Stage2 = CompanyCard c s "OO" [AddVictory CompanyVictory 5 HappensOnce] getResourceCard c@(CompanyProfile Yahoo B) s@Stage3 = CompanyCard c s "FFA" [CopyCommunity] getResourceCard c@(CompanyProfile Amazon B) s@Stage1 = CompanyCard c s "FF" [AddVictory CompanyVictory 2 HappensOnce, Recycling] getResourceCard c@(CompanyProfile Amazon B) s@Stage2 = CompanyCard c s "DDD" [AddVictory CompanyVictory 1 HappensOnce, Recycling] -getResourceCard c@(CompanyProfile Amazon B) s@Stage3 = CompanyCard c s "YVA" [Recycling] +getResourceCard c@(CompanyProfile Amazon B) s@Stage3 = CompanyCard c s "HVA" [Recycling] getResourceCard c@(CompanyProfile Microsoft B) s@Stage1 = CompanyCard c s "MM" [AddVictory CompanyVictory 3 HappensOnce] getResourceCard c@(CompanyProfile Microsoft B) s@Stage2 = CompanyCard c s "OOO" [AddVictory CompanyVictory 5 HappensOnce] getResourceCard c@(CompanyProfile Microsoft B) s@Stage3 = CompanyCard c s "DDD" [AddVictory CompanyVictory 5 HappensOnce] @@ -76,50 +76,50 @@ getResourceCard c@(CompanyProfile Microsoft B) s@Stage4 = CompanyCard c s "OOOOA getResourceCard _ _ = error "Invalid card" communities :: [Card] -communities = [ community "Workers Union" "FFDOM" [perCard 1 neighbors [BaseResource]] +communities = [ community "Raw Water Spring" "FFDOM" [perCard 1 neighbors [BaseResource]] , community "Hipster Bar" "FFOO" [perCard 2 neighbors [AdvancedResource]] - , community "Caviar Restaurant" "YVA" [perCard 1 neighbors [Commercial]] + , community "Caviar Restaurant" "HVA" [perCard 1 neighbors [Commercial]] , community "Train Club" "DDDAV" [perCard 1 neighbors [ResearchDevelopment]] - , community "No-Poaching Agreement" "DDDY" [perCard 1 neighbors [HeadHunting]] + , community "No-Poaching Agreement" "DDDH" [perCard 1 neighbors [HeadHunting]] , community "Gloating Party" "FFOA" [AddVictory CommunityVictory 1 (ByPoachingResult neighbors (S.singleton Defeat))] - , community "Secret Society" "MMMVY" [perCard 1 myself [BaseResource,AdvancedResource,Community]] + , community "Secret Society" "MMMVH" [perCard 1 myself [BaseResource,AdvancedResource,Community]] , community "Science Club" "MMFFV" [ScientificBreakthrough] , community "Legal Department" "MMMOV" [perCard 1 neighbors [Commercial]] - , community "Company Monument" "OODDY" [AddVictory CommunityVictory 1 (ByStartupStage everyone)] + , community "Company Monument" "OODDH" [AddVictory CommunityVictory 1 (ByStartupStage everyone)] ] allcards :: [Card] allcards = [ Card "Marketroid" 3 Age1 BaseResource "" [] [ProvideResource Marketing 1 Shared] , Card "Marketroid" 4 Age1 BaseResource "" [] [ProvideResource Marketing 1 Shared] - , Card "IT Technician" 3 Age1 BaseResource "" [] [ProvideResource Operations 1 Shared] - , Card "IT Technician" 5 Age1 BaseResource "" [] [ProvideResource Operations 1 Shared] - , Card "Enterprise Programmer" 3 Age1 BaseResource "" [] [ProvideResource Development 1 Shared] - , Card "Enterprise Programmer" 5 Age1 BaseResource "" [] [ProvideResource Development 1 Shared] + , Card "Sysadmin" 3 Age1 BaseResource "" [] [ProvideResource Operations 1 Shared] + , Card "Sysadmin" 5 Age1 BaseResource "" [] [ProvideResource Operations 1 Shared] + , Card "Brogrammer" 3 Age1 BaseResource "" [] [ProvideResource Development 1 Shared] + , Card "Brogrammer" 5 Age1 BaseResource "" [] [ProvideResource Development 1 Shared] , Card "Accountant" 3 Age1 BaseResource "" [] [ProvideResource Finance 1 Shared] , Card "Accountant" 4 Age1 BaseResource "" [] [ProvideResource Finance 1 Shared] - , Card "Feature Driven Team" 6 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Marketing, Development]) Shared] - , Card "Operations Guru" 3 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Marketing, Operations]) Shared] + , Card "UX Expert" 6 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Marketing, Development]) Shared] + , Card "Commercial Engineer" 3 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Marketing, Operations]) Shared] , Card "Value Optimizer" 5 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Marketing, Finance]) Shared] , Card "Devops Team" 4 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Operations, Development]) Shared] - , Card "Financial Developer" 3 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Development, Finance]) Shared] - , Card "High Frequency Trader" 6 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Finance, Operations]) Shared] - , Card "Marketing Expert" 3 Age2 BaseResource "$" [] [ProvideResource Marketing 2 Shared] - , Card "Marketing Expert" 4 Age2 BaseResource "$" [] [ProvideResource Marketing 2 Shared] - , Card "IT Architect" 3 Age2 BaseResource "$" [] [ProvideResource Operations 2 Shared] - , Card "IT Architect" 4 Age2 BaseResource "$" [] [ProvideResource Operations 2 Shared] + , Card "High Frequency Trader" 3 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Development, Finance]) Shared] + , Card "Financial RE" 6 Age1 BaseResource "$" [] [ResourceChoice (S.fromList [Finance, Operations]) Shared] + , Card "Growth Hacker" 3 Age2 BaseResource "$" [] [ProvideResource Marketing 2 Shared] + , Card "Growth Hacker" 4 Age2 BaseResource "$" [] [ProvideResource Marketing 2 Shared] + , Card "SRE" 3 Age2 BaseResource "$" [] [ProvideResource Operations 2 Shared] + , Card "SRE" 4 Age2 BaseResource "$" [] [ProvideResource Operations 2 Shared] , Card "Functional Programmer" 3 Age2 BaseResource "$" [] [ProvideResource Development 2 Shared] , Card "Functional Programmer" 4 Age2 BaseResource "$" [] [ProvideResource Development 2 Shared] , Card "Double Irish Expert" 3 Age2 BaseResource "$" [] [ProvideResource Finance 2 Shared] , Card "Double Irish Expert" 4 Age2 BaseResource "$" [] [ProvideResource Finance 2 Shared] - , Card "Rock Star Evangelist" 3 Age1 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] - , Card "Rock Star Evangelist" 6 Age1 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] - , Card "Rock Star Evangelist" 3 Age2 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] - , Card "Rock Star Evangelist" 5 Age2 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] - , Card "Company Nerf Battles" 3 Age1 AdvancedResource "" [] [ProvideResource Youthfulness 1 Shared] - , Card "Company Nerf Battles" 6 Age1 AdvancedResource "" [] [ProvideResource Youthfulness 1 Shared] - , Card "Company Nerf Battles" 3 Age2 AdvancedResource "" [] [ProvideResource Youthfulness 1 Shared] - , Card "Company Nerf Battles" 5 Age2 AdvancedResource "" [] [ProvideResource Youthfulness 1 Shared] + , Card "Benevolent Dictator" 3 Age1 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] + , Card "Benevolent Dictator" 6 Age1 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] + , Card "Benevolent Dictator" 3 Age2 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] + , Card "Benevolent Dictator" 5 Age2 AdvancedResource "" [] [ProvideResource Adoption 1 Shared] + , Card "Internet Legend" 3 Age1 AdvancedResource "" [] [ProvideResource Hype 1 Shared] + , Card "Internet Legend" 6 Age1 AdvancedResource "" [] [ProvideResource Hype 1 Shared] + , Card "Internet Legend" 3 Age2 AdvancedResource "" [] [ProvideResource Hype 1 Shared] + , Card "Internet Legend" 5 Age2 AdvancedResource "" [] [ProvideResource Hype 1 Shared] , Card "Charismatic Leader" 3 Age1 AdvancedResource "" [] [ProvideResource Vision 1 Shared] , Card "Charismatic Leader" 6 Age1 AdvancedResource "" [] [ProvideResource Vision 1 Shared] , Card "Charismatic Leader" 3 Age2 AdvancedResource "" [] [ProvideResource Vision 1 Shared] @@ -127,16 +127,16 @@ allcards = [ Card "Marketroid" 3 Age1 BaseResource "" [] [ProvideRes , Card "High Speed Internet" 4 Age1 Infrastructure "" [] [AddVictory InfrastructureVictory 3 HappensOnce] , Card "High Speed Internet" 7 Age1 Infrastructure "" [] [AddVictory InfrastructureVictory 3 HappensOnce] - , Card "Admin Network" 3 Age1 Infrastructure "O" ["Operations Center"] [AddVictory InfrastructureVictory 3 HappensOnce] - , Card "Admin Network" 7 Age1 Infrastructure "O" ["Operations Center"] [AddVictory InfrastructureVictory 3 HappensOnce] + , Card "Segmented Network" 3 Age1 Infrastructure "O" ["Operations Center"] [AddVictory InfrastructureVictory 3 HappensOnce] + , Card "Segmented Network" 7 Age1 Infrastructure "O" ["Operations Center"] [AddVictory InfrastructureVictory 3 HappensOnce] , Card "Operations Center" 3 Age2 Infrastructure "OOO" [] [AddVictory InfrastructureVictory 5 HappensOnce] , Card "Operations Center" 7 Age2 Infrastructure "OOO" [] [AddVictory InfrastructureVictory 5 HappensOnce] - , Card "Cloud Servers" 3 Age1 Infrastructure "" ["Collocated Datacenter"] [AddVictory InfrastructureVictory 2 HappensOnce] - , Card "Cloud Servers" 5 Age1 Infrastructure "" ["Collocated Datacenter"] [AddVictory InfrastructureVictory 2 HappensOnce] - , Card "Collocated Datacenter" 3 Age2 Infrastructure "MDY" ["Company Datacenter"] [AddVictory InfrastructureVictory 3 HappensOnce] - , Card "Collocated Datacenter" 6 Age2 Infrastructure "MDY" ["Company Datacenter"] [AddVictory InfrastructureVictory 3 HappensOnce] - , Card "Company Datacenter" 3 Age3 Infrastructure "DDFYVA" [] [AddVictory InfrastructureVictory 7 HappensOnce] - , Card "Company Datacenter" 6 Age3 Infrastructure "DDFYVA" [] [AddVictory InfrastructureVictory 7 HappensOnce] + , Card "Private Cloud" 3 Age1 Infrastructure "" ["Containers"] [AddVictory InfrastructureVictory 2 HappensOnce] + , Card "Private Cloud" 5 Age1 Infrastructure "" ["Containers"] [AddVictory InfrastructureVictory 2 HappensOnce] + , Card "Containers" 3 Age2 Infrastructure "MDH" ["Serverless"] [AddVictory InfrastructureVictory 3 HappensOnce] + , Card "Containers" 6 Age2 Infrastructure "MDH" ["Serverless"] [AddVictory InfrastructureVictory 3 HappensOnce] + , Card "Serverless" 3 Age3 Infrastructure "DDFHVA" [] [AddVictory InfrastructureVictory 7 HappensOnce] + , Card "Serverless" 6 Age3 Infrastructure "DDFHVA" [] [AddVictory InfrastructureVictory 7 HappensOnce] , Card "Garage" 3 Age1 Infrastructure "" ["Office"] [AddVictory InfrastructureVictory 2 HappensOnce] , Card "Garage" 6 Age1 Infrastructure "" ["Office"] [AddVictory InfrastructureVictory 2 HappensOnce] , Card "Office" 3 Age2 Infrastructure "FFM" ["Company Building"] [AddVictory InfrastructureVictory 4 HappensOnce] @@ -147,18 +147,18 @@ allcards = [ Card "Marketroid" 3 Age1 BaseResource "" [] [ProvideRes , Card "Custom Routers" 5 Age2 Infrastructure "DDA" [] [AddVictory InfrastructureVictory 4 HappensOnce] , Card "Custom Servers" 3 Age3 Infrastructure "MMFO" [] [AddVictory InfrastructureVictory 6 HappensOnce] , Card "Custom Servers" 5 Age3 Infrastructure "MMFO" [] [AddVictory InfrastructureVictory 6 HappensOnce] - , Card "National Fiber Network" 3 Age3 Infrastructure "OOFY" [] [AddVictory InfrastructureVictory 6 HappensOnce] - , Card "National Fiber Network" 5 Age3 Infrastructure "OOFY" [] [AddVictory InfrastructureVictory 6 HappensOnce] - , Card "National Fiber Network" 6 Age3 Infrastructure "OOFY" [] [AddVictory InfrastructureVictory 6 HappensOnce] - , Card "Lavish Headquarters" 3 Age3 Infrastructure "YVADOMF" [] [AddVictory InfrastructureVictory 8 HappensOnce] - , Card "Lavish Headquarters" 7 Age3 Infrastructure "YVADOMF" [] [AddVictory InfrastructureVictory 8 HappensOnce] + , Card "National Fiber Network" 3 Age3 Infrastructure "OOFH" [] [AddVictory InfrastructureVictory 6 HappensOnce] + , Card "National Fiber Network" 5 Age3 Infrastructure "OOFH" [] [AddVictory InfrastructureVictory 6 HappensOnce] + , Card "National Fiber Network" 6 Age3 Infrastructure "OOFH" [] [AddVictory InfrastructureVictory 6 HappensOnce] + , Card "Lavish Headquarters" 3 Age3 Infrastructure "HVADOMF" [] [AddVictory InfrastructureVictory 8 HappensOnce] + , Card "Lavish Headquarters" 7 Age3 Infrastructure "HVADOMF" [] [AddVictory InfrastructureVictory 8 HappensOnce] , Card "Free Drinks" 3 Age1 HeadHunting "M" [] [Poaching 1] , Card "Free Drinks" 7 Age1 HeadHunting "M" [] [Poaching 1] - , Card "Standing Desks" 3 Age1 HeadHunting "F" [] [Poaching 1] - , Card "Standing Desks" 5 Age1 HeadHunting "F" [] [Poaching 1] - , Card "Free Food" 3 Age1 HeadHunting "D" [] [Poaching 1] - , Card "Free Food" 4 Age1 HeadHunting "D" [] [Poaching 1] + , Card "Fußball" 3 Age1 HeadHunting "F" [] [Poaching 1] + , Card "Fußball" 5 Age1 HeadHunting "F" [] [Poaching 1] + , Card "Artisan Chef" 3 Age1 HeadHunting "D" [] [Poaching 1] + , Card "Artisan Chef" 4 Age1 HeadHunting "D" [] [Poaching 1] , Card "Car Fleet" 3 Age2 HeadHunting "OOO" ["Segways"] [Poaching 2] , Card "Car Fleet" 7 Age2 HeadHunting "OOO" ["Segways"] [Poaching 2] , Card "Segways" 3 Age3 HeadHunting "FFFO" [] [Poaching 3] @@ -179,30 +179,30 @@ allcards = [ Card "Marketroid" 3 Age1 BaseResource "" [] [ProvideRes , Card "Can Work In Haskell" 3 Age3 HeadHunting "MDDD" [] [Poaching 3] , Card "Can Work In Haskell" 5 Age3 HeadHunting "MDDD" [] [Poaching 3] - , Card "Database Sharding" 3 Age1 ResearchDevelopment "A" ["Global Databases", "Technology Guru"] [RnD Scaling] - , Card "Database Sharding" 5 Age1 ResearchDevelopment "A" ["Global Databases", "Technology Guru"] [RnD Scaling] - , Card "Global Databases" 3 Age2 ResearchDevelopment "FFY" ["Tech Conference", "Architecture Mastery"] [RnD Scaling] - , Card "Global Databases" 4 Age2 ResearchDevelopment "FFY" ["Tech Conference", "Architecture Mastery"] [RnD Scaling] - , Card "Architecture Mastery" 3 Age3 ResearchDevelopment "DDVA" [] [RnD Scaling] - , Card "Architecture Mastery" 6 Age3 ResearchDevelopment "DDVA" [] [RnD Scaling] - , Card "Anything But Java" 3 Age1 ResearchDevelopment "Y" ["Proper Typing", "Cool Internal Language"] [RnD Programming] - , Card "Anything But Java" 7 Age1 ResearchDevelopment "Y" ["Proper Typing", "Cool Internal Language"] [RnD Programming] - , Card "Proper Typing" 3 Age2 ResearchDevelopment "DDV" ["Functional Mastery", "Can Work In Haskell"] [RnD Programming] - , Card "Proper Typing" 5 Age2 ResearchDevelopment "DDV" ["Functional Mastery", "Can Work In Haskell"] [RnD Programming] - , Card "Functional Mastery" 3 Age3 ResearchDevelopment "FFYA" [] [RnD Programming] - , Card "Functional Mastery" 7 Age3 ResearchDevelopment "FFYA" [] [RnD Programming] - , Card "Hardware Knowledge" 3 Age1 ResearchDevelopment "V" ["Custom Routers", "Efficiency Advances"] [RnD CustomSolution] - , Card "Hardware Knowledge" 4 Age1 ResearchDevelopment "V" ["Custom Routers", "Efficiency Advances"] [RnD CustomSolution] - , Card "Efficiency Advances" 3 Age2 ResearchDevelopment "OOA" ["Custom Servers", "Seven Nines"] [RnD CustomSolution] - , Card "Efficiency Advances" 6 Age2 ResearchDevelopment "OOA" ["Custom Servers", "Seven Nines"] [RnD CustomSolution] - , Card "Seven Nines" 3 Age3 ResearchDevelopment "MMYV" [] [RnD CustomSolution] - , Card "Seven Nines" 4 Age3 ResearchDevelopment "MMYV" [] [RnD CustomSolution] - , Card "Efficient Fiber Networks" 3 Age2 ResearchDevelopment "MV" ["Global Clusters","Cloud Language"] [RnD CustomSolution] - , Card "Efficient Fiber Networks" 7 Age2 ResearchDevelopment "MV" ["Global Clusters","Cloud Language"] [RnD CustomSolution] - , Card "Global Clusters" 3 Age3 ResearchDevelopment "OOOY" [] [RnD Scaling] - , Card "Global Clusters" 7 Age3 ResearchDevelopment "OOOY" [] [RnD Scaling] - , Card "Cloud Language" 3 Age3 ResearchDevelopment "MAV" [] [RnD Programming] - , Card "Cloud Language" 5 Age3 ResearchDevelopment "MAV" [] [RnD Programming] + , Card "Database Sharding" 3 Age1 ResearchDevelopment "A" ["Webscale!", "Technology Guru"] [RnD Scaling] + , Card "Database Sharding" 5 Age1 ResearchDevelopment "A" ["Webscale!", "Technology Guru"] [RnD Scaling] + , Card "Webscale!" 3 Age2 ResearchDevelopment "FFH" ["Tech Conference", "Fearless Concurrency"] [RnD Scaling] + , Card "Webscale!" 4 Age2 ResearchDevelopment "FFH" ["Tech Conference", "Fearless Concurrency"] [RnD Scaling] + , Card "Fearless Concurrency" 3 Age3 ResearchDevelopment "DDVA" [] [RnD Scaling] + , Card "Fearless Concurrency" 6 Age3 ResearchDevelopment "DDVA" [] [RnD Scaling] + , Card "Generics" 3 Age1 ResearchDevelopment "H" ["Higher Kinded Types", "Cool Internal Language"] [RnD Programming] + , Card "Generics" 7 Age1 ResearchDevelopment "H" ["Higher Kinded Types", "Cool Internal Language"] [RnD Programming] + , Card "Higher Kinded Types" 3 Age2 ResearchDevelopment "DDV" ["Dependent Types", "Can Work In Haskell"] [RnD Programming] + , Card "Higher Kinded Types" 5 Age2 ResearchDevelopment "DDV" ["Dependent Types", "Can Work In Haskell"] [RnD Programming] + , Card "Dependent Types" 3 Age3 ResearchDevelopment "FFHA" [] [RnD Programming] + , Card "Dependent Types" 7 Age3 ResearchDevelopment "FFHA" [] [RnD Programming] + , Card "Microcontrollers" 3 Age1 ResearchDevelopment "V" ["Custom Routers", "FPGAs"] [RnD CustomSolution] + , Card "Microcontrollers" 4 Age1 ResearchDevelopment "V" ["Custom Routers", "FPGAs"] [RnD CustomSolution] + , Card "FPGAs" 3 Age2 ResearchDevelopment "OOA" ["Custom Servers", "ASICs"] [RnD CustomSolution] + , Card "FPGAs" 6 Age2 ResearchDevelopment "OOA" ["Custom Servers", "ASICs"] [RnD CustomSolution] + , Card "ASICs" 3 Age3 ResearchDevelopment "MMHV" [] [RnD CustomSolution] + , Card "ASICs" 4 Age3 ResearchDevelopment "MMHV" [] [RnD CustomSolution] + , Card "Custom CPU" 3 Age2 ResearchDevelopment "MV" ["Global Clusters","Zygohistomorphic Prepromorphisms"] [RnD CustomSolution] + , Card "Custom CPU" 7 Age2 ResearchDevelopment "MV" ["Global Clusters","Zygohistomorphic Prepromorphisms"] [RnD CustomSolution] + , Card "Global Clusters" 3 Age3 ResearchDevelopment "OOOH" [] [RnD Scaling] + , Card "Global Clusters" 7 Age3 ResearchDevelopment "OOOH" [] [RnD Scaling] + , Card "Zygohistomorphic Prepromorphisms" 3 Age3 ResearchDevelopment "MAV" [] [RnD Programming] + , Card "Zygohistomorphic Prepromorphisms" 5 Age3 ResearchDevelopment "MAV" [] [RnD Programming] , Card "Business Angel" 4 Age1 Commercial "" [] [GainFunding 5 HappensOnce] , Card "Business Angel" 5 Age1 Commercial "" [] [GainFunding 5 HappensOnce] @@ -225,8 +225,8 @@ allcards = [ Card "Marketroid" 3 Age1 BaseResource "" [] [ProvideRes , Card "Consulting Gig" 7 Age2 Commercial "" [] [GainFunding 2 (PerCard everyone (S.singleton AdvancedResource))] , Card "Software Product" 3 Age3 Commercial "MFA" [] [GainFunding 1 (PerCard myself (S.singleton BaseResource)), perCard 1 myself [BaseResource]] , Card "Software Product" 4 Age3 Commercial "MFA" [] [GainFunding 1 (PerCard myself (S.singleton BaseResource)), perCard 1 myself [BaseResource]] - , Card "Brand Recognition" 3 Age3 Commercial "OY" [] [GainFunding 1 (PerCard myself (S.singleton Commercial)), perCard 1 myself [Commercial]] - , Card "Brand Recognition" 6 Age3 Commercial "OY" [] [GainFunding 1 (PerCard myself (S.singleton Commercial)), perCard 1 myself [Commercial]] + , Card "Brand Recognition" 3 Age3 Commercial "OH" [] [GainFunding 1 (PerCard myself (S.singleton Commercial)), perCard 1 myself [Commercial]] + , Card "Brand Recognition" 6 Age3 Commercial "OH" [] [GainFunding 1 (PerCard myself (S.singleton Commercial)), perCard 1 myself [Commercial]] , Card "Global Vision" 4 Age3 Commercial "DDV" [] [GainFunding 2 (PerCard myself (S.singleton AdvancedResource)), perCard 2 myself [AdvancedResource]] , Card "Global Vision" 6 Age3 Commercial "DDV" [] [GainFunding 2 (PerCard myself (S.singleton AdvancedResource)), perCard 2 myself [AdvancedResource]] , Card "Tech Conference" 3 Age3 Commercial "OOF" [] [GainFunding 3 (ByStartupStage myself), AddVictory CommercialVictory 1 (ByStartupStage myself)] diff --git a/Startups/Cards.hs b/Startups/Cards.hs index e7325c0..b4114ba 100644 --- a/Startups/Cards.hs +++ b/Startups/Cards.hs @@ -83,7 +83,7 @@ instance Monoid Cost where instance IsString Cost where fromString = F.foldMap toCost where - toCost 'Y' = Cost (MS.singleton Youthfulness) 0 + toCost 'H' = Cost (MS.singleton Hype) 0 toCost 'V' = Cost (MS.singleton Vision) 0 toCost 'A' = Cost (MS.singleton Adoption) 0 toCost 'D' = Cost (MS.singleton Development) 0 diff --git a/Startups/PrettyPrint.hs b/Startups/PrettyPrint.hs index 8450bae..e64a101 100644 --- a/Startups/PrettyPrint.hs +++ b/Startups/PrettyPrint.hs @@ -240,7 +240,7 @@ instance PP.Pretty PrettyDoc where PVictory vp -> PP.pretty $ numerical vp PPlayerCount pc -> PP.pretty $ numerical pc PTurn t -> PP.pretty $ numerical t - PResource Youthfulness -> PP.cyan "Y" + PResource Hype -> PP.cyan "H" PResource Adoption -> PP.dullwhite "A" PResource Vision -> PP.magenta "V" PResource Development -> PP.dullyellow "D" diff --git a/src/Xmpp/Backend.hs b/src/Xmpp/Backend.hs index 3c5251e..6b46c72 100644 --- a/src/Xmpp/Backend.hs +++ b/src/Xmpp/Backend.hs @@ -76,7 +76,7 @@ toNode (PResource Finance) = [addColor "#373737" "F"] toNode (PResource Development) = [addColor "#FF893D" "D"] toNode (PResource Adoption) = [addColor "#D69469" "A"] toNode (PResource Vision) = [addColor "#F700FF" "V"] -toNode (PResource Youthfulness) = [addColor "#2028FA" "Y"] +toNode (PResource Hype) = [addColor "#2028FA" "H"] toNode (PAge Age1) = toNode "Ⅰ" toNode (PAge Age2) = toNode "Ⅱ" toNode (PAge Age3) = toNode "Ⅲ" diff --git a/tests/tests.hs b/tests/tests.hs index f3170fe..b8f715a 100644 --- a/tests/tests.hs +++ b/tests/tests.hs @@ -43,23 +43,23 @@ testState = GameState (M.fromList players) [] (mkStdGen 5) pam = PlayerState ppam Project pamcards 3 ("poum", "pim") [] poum = PlayerState ppoum Project poumcards 6 ("bob", "pam") [] bob = PlayerState pbob Project bobcards 5 ("pim", "poum") [] - pimcards = map (getResourceCard ppim) [Project .. Stage1] <> map getCard [ "Cloud Servers" + pimcards = map (getResourceCard ppim) [Project .. Stage1] <> map getCard [ "Private Cloud" , "Marketroid" - , "Company Nerf Battles" + , "Internet Legend" ] pamcards = map (getResourceCard ppam) [Project] <> map getCard [ "High Speed Internet" - , "Free Food" - , "Enterprise Programmer" - , "Rock Star Evangelist" + , "Artisan Chef" + , "Brogrammer" + , "Benevolent Dictator" ] poumcards = map (getResourceCard ppoum) [Project .. Stage1] <> map getCard [ "Garage" , "Business Angel" - , "Admin Network" + , "Segmented Network" ] bobcards = map (getResourceCard pbob) [Project] <> map getCard [ "Accountant" - , "Operations Guru" - , "Financial Developer" - , "Standing Desks" + , "Commercial Engineer" + , "High Frequency Trader" + , "Fußball" ] main :: IO () @@ -75,7 +75,7 @@ main = hspec $ do cardsCount age nbplayers = length (filter (\c -> c ^? cAge == Just age && c ^? cMinplayers <= Just nbplayers) allcards) mapM_ (uncurry nbc) [ (age, nbp) | age <- [Age1,Age2,Age3], nbp <- [3 .. 7] ] describe "availableResources" $ - forM_ [("pam", ["AVD$$$"]), ("pim", ["YMF$"]), ("poum", ["D$$$$$$"]), ("bob", ["YF$$$$$DM", "YF$$$$$FO", "YF$$$$$DO", "YF$$$$$FM"])] $ \(pid, reslist) -> + forM_ [("pam", ["AVD$$$"]), ("pim", ["HMF$"]), ("poum", ["D$$$$$$"]), ("bob", ["HF$$$$$DM", "HF$$$$$FO", "HF$$$$$DO", "HF$$$$$FM"])] $ \(pid, reslist) -> let getResCost (Cost rescost _) = rescost expected = S.fromList (map getResCost reslist) actual = S.fromList $ availableResources OwnRes (fromJust (testState ^? playermap . ix pid))