Verified Commit 357412c1 authored by Camil Staps's avatar Camil Staps 🚀

Update Incidone, ShipAdventure and Ligretto to ABC interpreter in frontend

parent 25920302
Pipeline #21561 failed with stage
in 1 minute and 54 seconds
......@@ -3,9 +3,12 @@ Global
ProjectRoot: .
Target: iTasks
Exec: {Project}/IncidoneCCC.exe
ByteCode: {Project}/IncidoneCCC.bc
CodeGen
CheckStacks: False
CheckIndexes: True
OptimiseABC: True
GenerateByteCode: True
Application
HeapSize: 209715200
StackSize: 1512000
......@@ -25,7 +28,7 @@ Global
Stack: False
Dynamics: True
GenericFusion: False
DescExL: False
DescExL: True
Output
Output: ShowConstructors
Font: Monaco
......@@ -40,6 +43,9 @@ Global
ResourceSource:
GenerateDLL: False
ExportedNames:
StripByteCode: True
KeepByteCodeSymbols: True
PrelinkByteCode: True
Paths
Path: {Project}
Precompile:
......
......@@ -20,19 +20,6 @@ import C2.Apps.ShipAdventure.PathFinding, C2.Apps.ShipAdventure.Util
derive class iTask ChoiceGrid, ChoiceRow
derive JSEncode Map2D, Network, Coord2D, Cable, CableType, Section, Borders, Border
derive JSEncode Device, SectionStatus, DeviceType, DeviceKind, User, Dir, Availability
derive JSEncode Actor, ActorStatus, ActorEnergy, ActorHealth, Object, ObjectType
derive JSEncode MapAction
derive JSEncode Map, IntMap
derive JSDecode Map2D, Network, Coord2D, Cable, CableType, Section, Borders, Border
derive JSDecode Device, SectionStatus, DeviceType, DeviceKind, User, Dir, Availability
derive JSDecode Actor, ActorStatus, ActorEnergy, ActorHealth, Object, ObjectType
derive JSDecode MapAction
derive JSDecode Map, IntMap
// the next function should be placed in the library somewhere
mkTable :: [String] ![a] -> (ChoiceGrid,[Int]) | gText{|*|} a
mkTable header a = ({ChoiceGrid|header=header,rows=[{ChoiceRow|id=i,cells = row r} \\ r <- a & i <- [0..]]},[])
......
......@@ -22,11 +22,6 @@ import Graphics.Scalable.Types
//from Graphics.Scalable import normalFontDef, above, class margin(..), instance margin (Span,Span), px
//from Graphics.Scalable import :: ImageOffset, :: Host(..)
derive JSEncode Map2D, Section, Coord2D, Borders, Border, IntMap, Device, DeviceType, DeviceKind, CableType, Map
derive JSEncode Network, Cable, Object, ObjectType, MapAction, SectionStatus, Dir
derive JSDecode Map2D, Section, Coord2D, Borders, Border, IntMap, Device, DeviceType, DeviceKind, CableType, Map
derive JSDecode Network, Cable, Object, ObjectType, MapAction, SectionStatus, Dir
shipEditorTabs :: Task ()
shipEditorTabs = allTasks [ viewLayout <<@ Title "View Ship"
, editLayout <<@ Title "Edit Ship"
......
......@@ -32,14 +32,6 @@ derive gText Set
derive JSONEncode Set
derive JSONDecode Set
derive JSEncode Map2D, Coord2D, Map, IntMap, Dir, User, Section, Borders, Border, MapAction, Object, Actor
derive JSEncode ObjectType, ActorStatus, Availability, ActorHealth, ActorEnergy, DeviceType, SectionStatus
derive JSEncode Cable, Priority, Network, Device, CableType, DeviceKind, CommandAim, Set, Capability, CapabilityExpr
derive JSDecode Map2D, Coord2D, Map, IntMap, Dir, User, Section, Borders, Border, MapAction, Object, Actor
derive JSDecode ObjectType, ActorStatus, Availability, ActorHealth, ActorEnergy, DeviceType, SectionStatus
derive JSDecode Cable, Priority, Network, Device, CableType, DeviceKind, CommandAim, Set, Capability, CapabilityExpr
// std overloading instances
//instance == Object where (==) o1 o2 = o1 === o2
......
......@@ -3,9 +3,12 @@ Global
ProjectRoot: .
Target: iTasks
Exec: {Project}/main.exe
ByteCode: {Project}/main.bc
CodeGen
CheckStacks: False
CheckIndexes: True
OptimiseABC: True
GenerateByteCode: True
Application
HeapSize: 524288000
StackSize: 10485760
......@@ -25,7 +28,7 @@ Global
Stack: False
Dynamics: True
GenericFusion: False
DescExL: False
DescExL: True
Output
Output: ShowConstructors
Font: Courier
......@@ -40,6 +43,9 @@ Global
ResourceSource:
GenerateDLL: False
ExportedNames:
StripByteCode: True
KeepByteCodeSymbols: True
PrelinkByteCode: True
Paths
Path: {Project}
Precompile:
......
......@@ -3,9 +3,12 @@ Global
ProjectRoot: ...
Target: iTasks
Exec: {Project}/Games/Ligretto/Ligretto.exe
ByteCode: {Project}/Games/Ligretto/Ligretto.bc
CodeGen
CheckStacks: False
CheckIndexes: True
OptimiseABC: True
GenerateByteCode: True
Application
HeapSize: 134217728
StackSize: 512000
......@@ -25,7 +28,7 @@ Global
Stack: False
Dynamics: True
GenericFusion: False
DescExL: False
DescExL: True
Output
Output: ShowConstructors
Font: Monaco
......@@ -40,6 +43,9 @@ Global
ResourceSource:
GenerateDLL: False
ExportedNames:
StripByteCode: True
KeepByteCodeSymbols: True
PrelinkByteCode: True
Paths
Path: {Project}*Games*Ligretto
Path: {Project}*Games
......
......@@ -3,15 +3,11 @@ implementation module Ligretto.UI
import StdBool, StdEnum, StdList
from StdFunc import id, const
import Data.GenEq
import iTasks.UI.JS.Encoding
import iTasks.WF.Tasks.Interaction
import Graphics.Scalable.Extensions
import iTasks.Extensions.SVG.SVGEditor
import Ligretto.UoD
derive JSEncode GameSt, Player, Color, Hand, Card, SideUp
derive JSDecode GameSt, Player, Color, Hand, Card, SideUp
ligrettoEditor :: !Color -> UpdateOption GameSt GameSt
ligrettoEditor me = UpdateUsing id (const id) (fromSVGEditor
{ initView = id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment