Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add single warrior battle support #75

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Add single warrior battle support #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed54b6
gmars: refactor to handle single warrior battles
bobertlo Nov 19, 2024
58f6cb1
refactor vmars to handle single warrior battles
bobertlo Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 64 additions & 52 deletions cmd/gmars/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,53 +46,49 @@ func main() {

args := flag.Args()

if *assembleFlag {
if len(args) != 1 {
fmt.Println("wrong number of arguments")
os.Exit(1)
}
} else if len(args) < 2 || len(args) > 2 {
fmt.Println("only 2 warrior battles supported")
if len(args) > 2 {
fmt.Fprintf(os.Stderr, "only 2 warrior battles supported")
os.Exit(1)
}

w1file, err := os.Open(args[0])
if err != nil {
fmt.Printf("error opening warrior file '%s': %s\n", args[0], err)
os.Exit(1)
warriors := make([]gmars.WarriorData, 0)
for _, arg := range args {
in, err := os.Open(arg)
if err != nil {
fmt.Printf("error opening warrior file '%s': %s\n", arg, err)
os.Exit(1)
}
defer in.Close()

warrior, err := gmars.CompileWarrior(in, config)
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing warrior file '%s': %s\n", arg, err)
os.Exit(1)
}

warriors = append(warriors, warrior)
}
defer w1file.Close()
w1data, err := gmars.CompileWarrior(w1file, config)
if err != nil {
fmt.Printf("error parsing warrior file '%s': %s\n", args[0], err)

if len(warriors) == 0 {
fmt.Fprintf(os.Stderr, "no warriors specified\n")
os.Exit(1)
}
w1file.Close()

if *assembleFlag {
sim, err := gmars.NewSimulator(config)
if err != nil {
fmt.Printf("error creating sim: %s", err)
}
w1, err := sim.AddWarrior(&w1data)
if err != nil {
fmt.Printf("error loading warrior: %s", err)

for _, warriorData := range warriors {
w, err := sim.AddWarrior(&warriorData)
if err != nil {
fmt.Printf("error loading warrior: %s", err)
}
fmt.Println(w.LoadCode())
}
fmt.Println(w1.LoadCode())
return
}

w2file, err := os.Open(args[1])
if err != nil {
fmt.Printf("error opening warrior file '%s': %s\n", args[1], err)
os.Exit(1)
}
defer w1file.Close()
w2data, err := gmars.CompileWarrior(w2file, config)
if err != nil {
fmt.Printf("error parsing warrior file '%s': %s\n", args[1], err)
return
}
w1file.Close()

rounds := *roundFlag

Expand All @@ -117,42 +113,58 @@ func main() {
w2start = rand.Intn(int(startRange)+1) + int(minStart)
}

w1, err := sim.AddWarrior(&w1data)
w1, err := sim.AddWarrior(&warriors[0])
if err != nil {
fmt.Printf("error adding warrior 1: %s", err)
os.Exit(1)
}
err = sim.SpawnWarrior(0, 0)
if err != nil {
fmt.Printf("error adding warrior 1: %s", err)
os.Exit(1)
}

w2, err := sim.AddWarrior(&w2data)
if err != nil {
fmt.Printf("error adding warrior 2: %s", err)
}
err = sim.SpawnWarrior(1, gmars.Address(w2start))
if err != nil {
fmt.Printf("error spawning warrior 1: %s", err)
var w2 gmars.Warrior
if len(warriors) > 1 {
w, err := sim.AddWarrior(&warriors[1])
if err != nil {
fmt.Printf("error adding warrior 2: %s", err)
os.Exit(1)
}
err = sim.SpawnWarrior(1, gmars.Address(w2start))
if err != nil {
fmt.Printf("error spawning warrior 1: %s", err)
os.Exit(1)
}
w2 = w
}

sim.Run()

if w1.Alive() {
if w2.Alive() {
w1tie += 1
} else {
if len(warriors) == 1 {
if w1.Alive() {
w1win += 1
}
}

if w2.Alive() {
} else if len(warriors) == 2 {
if w1.Alive() {
w2tie += 1
} else {
w2win += 1
if w2.Alive() {
w1tie += 1
} else {
w1win += 1
}
}

if w2.Alive() {
if w1.Alive() {
w2tie += 1
} else {
w2win += 1
}
}
}
}
fmt.Printf("%d %d\n", w1win, w1tie)
fmt.Printf("%d %d\n", w2win, w2tie)
if len(warriors) > 1 {
fmt.Printf("%d %d\n", w2win, w2tie)
}
}
44 changes: 23 additions & 21 deletions cmd/vmars/draw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,30 @@ func (g *Game) Draw(screen *ebiten.Image) {

// draw results if finished
if g.finished {
w1a := g.sim.GetWarrior(0).Alive()
w2a := g.sim.GetWarrior(1).Alive()

if w1a || w2a {

var msg string
op = &text.DrawOptions{}
op.GeoM.Translate(115, 465)
if w1a && w2a {
op.ColorScale = warriorColors[0]
msg = "tie"
} else if w1a {
op.ColorScale = warriorColors[1]
msg = fmt.Sprintf("%s wins", g.sim.GetWarrior(0).Name())
} else if w2a {
op.ColorScale = warriorColors[2]
msg = fmt.Sprintf("%s wins", g.sim.GetWarrior(1).Name())
if g.sim.WarriorCount() > 1 {
w1a := g.sim.GetWarrior(0).Alive()
w2a := g.sim.GetWarrior(1).Alive()

if w1a || w2a {

var msg string
op = &text.DrawOptions{}
op.GeoM.Translate(115, 465)
if w1a && w2a {
op.ColorScale = warriorColors[0]
msg = "tie"
} else if w1a {
op.ColorScale = warriorColors[1]
msg = fmt.Sprintf("%s wins", g.sim.GetWarrior(0).Name())
} else if w2a {
op.ColorScale = warriorColors[2]
msg = fmt.Sprintf("%s wins", g.sim.GetWarrior(1).Name())
}
text.Draw(screen, msg, &text.GoTextFace{
Source: mplusFaceSource,
Size: 10,
}, op)
}
text.Draw(screen, msg, &text.GoTextFace{
Source: mplusFaceSource,
Size: 10,
}, op)
}
} else if !g.running {
op = &text.DrawOptions{}
Expand Down
21 changes: 12 additions & 9 deletions cmd/vmars/game.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,17 @@ func (g *Game) handleInput() {
g.sim.Reset()
g.sim.SpawnWarrior(0, 0)

w2start := g.fixedStart
if w2start == 0 {
minStart := 2 * g.config.Length
maxStart := g.config.CoreSize - g.config.Length - 1
startRange := maxStart - minStart
w2start = rand.Intn(int(startRange)+1) + int(minStart)
if g.sim.WarriorCount() > 1 {
w2start := g.fixedStart
if w2start == 0 {
minStart := 2 * g.config.Length
maxStart := g.config.CoreSize - g.config.Length - 1
startRange := maxStart - minStart
w2start = rand.Intn(int(startRange)+1) + int(minStart)
}
g.sim.SpawnWarrior(1, gmars.Address(w2start))
}

g.sim.SpawnWarrior(1, gmars.Address(w2start))

g.finished = false
} else if inpututil.IsKeyJustPressed(ebiten.KeyDown) {
g.slowDown()
Expand All @@ -78,7 +79,9 @@ func (g *Game) runCycle() {
return
}

if g.sim.WarriorLivingCount() > 1 && g.sim.CycleCount() < g.sim.MaxCycles() {
count := g.sim.WarriorCount()
living := g.sim.WarriorLivingCount()
if ((count > 1 && living > 1) || living > 0) && g.sim.CycleCount() < g.sim.MaxCycles() {
g.sim.RunCycle()
} else {
g.finished = true
Expand Down
71 changes: 36 additions & 35 deletions cmd/vmars/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,35 +89,28 @@ func main() {

args := flag.Args()

if len(args) < 2 || len(args) > 2 {
fmt.Println("only 2 warrior battles supported")
if len(args) > 2 {
fmt.Fprintf(os.Stderr, "only 2 warrior battles supported")
os.Exit(1)
}

w1file, err := os.Open(args[0])
if err != nil {
fmt.Printf("error opening warrior file '%s': %s\n", args[0], err)
os.Exit(1)
}
defer w1file.Close()
w1data, err := gmars.CompileWarrior(w1file, config)
if err != nil {
fmt.Printf("error parsing warrior file '%s': %s\n", args[0], err)
os.Exit(1)
}
w1file.Close()
warriors := make([]gmars.WarriorData, 0)
for _, arg := range args {
in, err := os.Open(arg)
if err != nil {
fmt.Printf("error opening warrior file '%s': %s\n", arg, err)
os.Exit(1)
}
defer in.Close()

w2file, err := os.Open(args[1])
if err != nil {
fmt.Printf("error opening warrior file '%s': %s\n", args[1], err)
os.Exit(1)
}
defer w1file.Close()
w2data, err := gmars.CompileWarrior(w2file, config)
if err != nil {
fmt.Printf("error parsing warrior file '%s': %s\n", args[1], err)
warrior, err := gmars.CompileWarrior(in, config)
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing warrior file '%s': %s\n", arg, err)
os.Exit(1)
}

warriors = append(warriors, warrior)
}
w1file.Close()

sim, err := gmars.NewReportingSimulator(config)
if err != nil {
Expand All @@ -130,19 +123,23 @@ func main() {
rec.SetRecordRead(*showReadFlag)
sim.AddReporter(rec)

w2start := *fixedFlag
if w2start == 0 {
minStart := 2 * config.Length
maxStart := config.CoreSize - config.Length - 1
startRange := maxStart - minStart
w2start = rand.Intn(int(startRange)+1) + int(minStart)
sim.AddWarrior(&warriors[0])
if len(warriors) > 1 {
sim.AddWarrior(&warriors[1])
}

sim.AddWarrior(&w1data)
sim.AddWarrior(&w2data)

sim.SpawnWarrior(0, 0)
sim.SpawnWarrior(1, gmars.Address(w2start))

if len(warriors) > 1 {
w2start := *fixedFlag
if w2start == 0 {
minStart := 2 * config.Length
maxStart := config.CoreSize - config.Length - 1
startRange := maxStart - minStart
w2start = rand.Intn(int(startRange)+1) + int(minStart)
}
sim.SpawnWarrior(1, gmars.Address(w2start))
}

game := &Game{
sim: sim,
Expand All @@ -153,7 +150,11 @@ func main() {
}

ebiten.SetWindowSize(screenWidth, screenHeight)
ebiten.SetWindowTitle(fmt.Sprintf("gMARS - '%s' vs '%s'", w1data.Name, w2data.Name))
if len(warriors) > 1 {
ebiten.SetWindowTitle(fmt.Sprintf("gMARS - '%s' vs '%s'", warriors[0].Name, warriors[1].Name))
} else {
ebiten.SetWindowTitle(fmt.Sprintf("gMARS - '%s'", warriors[0].Name))
}
if err := ebiten.RunGame(game); err != nil {
log.Fatal(err)
}
Expand Down
Loading