Projects >> Custom-Salem >>28193704879029c5c82132db77bc909d85a4a145

Chunk
Conflicting content 
    }
    
    public BufferedImage longtip() {
<<<<<<< HEAD
	String text = String.format("Salt: %.2f, Mercury: %.2f, Sulphur: %.2f, Lead: %.2f\nPurity: %.2f", salt, merc, sulf, lead, purity);
	return RichText.stdf.render(text).img;
=======
	StringBuilder buf = new StringBuilder();
	for(int i = 0; i < 4; i++) {
	    if(i > 0)
		buf.append(", ");
	    buf.append(String.format("%s: $col[%s]{%.2f}", names[i], tcolors[i], a[i] / 100.0));
	}
	buf.append(String.format(" (%d%% pure)", (int)(purity() * 100)));
	return(RichText.render(buf.toString(), 0).img);
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
    }
    
    public BufferedImage smallmeter() {
Solution content 
    }
    
    public BufferedImage longtip() {
	StringBuilder buf = new StringBuilder();
	for(int i = 0; i < 4; i++) {
	    if(i > 0)
		buf.append(", ");
	    buf.append(String.format("%s: $col[%s]{%.2f}", names[i], tcolors[i], a[i] / 100.0));
	}
	buf.append(String.format(" (%d%% pure)", (int)(purity() * 100)));
	return(RichText.render(buf.toString(), 0).img);
    }
    
    public BufferedImage smallmeter() {
File
Alchemy.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
		if(insp != null) {
		    for(int i = 0; i < insp.attrs.length; i++) {
			if(insp.attrs[i].equals(nm)) {
<<<<<<< HEAD
			    int w = ((expsz.x - 2) * (insp.exp[i]+sexp)) / (attr.comp * 100);
			    if(w >= expsz.x - 2) {
				w = expsz.x - 2;
				g.chcolor(GAIN_FULL);
			    } else {
				g.chcolor(GAIN_SMALL);
			    }
=======
			    int w = Math.min(((expsz.x - 2) * insp.exp[i]) / (attr.comp * 100),
					     expsz.x - 2);
			    if(insp.exp[i] > (attr.comp * 100))
				g.chcolor(255, 255, 0, 255);
			    else
				g.chcolor(255, 192, 0, 255);
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
			    g.frect(expc.add(1, 1), new Coord(w, (expsz.y / 2)));
			    break;
			}
Solution content 
		if(insp != null) {
		    for(int i = 0; i < insp.attrs.length; i++) {
			if(insp.attrs[i].equals(nm)) {
			    int w = Math.min(((expsz.x - 2) * insp.exp[i]) / (attr.comp * 100),
					     expsz.x - 2);
			    if(insp.exp[i] > (attr.comp * 100))
				g.chcolor(GAIN_FULL);
			    else
				g.chcolor(GAIN_SMALL);
			    g.frect(expc.add(1, 1), new Coord(w, (expsz.y / 2)));
			    break;
			}
File
CharWnd.java
Developer's decision
Combination
Kind of conflict
Array access
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
		Skill sk = nsk.skills[nsk.sel];
		for(int i = 0; i < sk.costa.length; i++) {
		    if(sk.costa[i].equals(nm)) {
<<<<<<< HEAD
			int w = ((expsz.x - 2) * sk.costv[i]) / (attr.comp * 100);
			if(w > expsz.x - 2) {
			    w = expsz.x - 2;
			    g.chcolor(REQ_NOT_ENOUGH);
			} else {
			    g.chcolor(REQ_ENOUGH);
			}
=======
			int w = Math.min(((expsz.x - 2) * sk.costv[i]) / (attr.comp * 100),
					 expsz.x - 2);
			if(sk.costv[i] > (attr.comp * 100))
			    g.chcolor(255, 0, 0, 255);
			else
			    g.chcolor(128, 0, 0, 255);
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
			g.frect(expc.add(1, expsz.y / 2), new Coord(w, (expsz.y / 2)));
			break;
		    }
Solution content 
		Skill sk = nsk.skills[nsk.sel];
		for(int i = 0; i < sk.costa.length; i++) {
		    if(sk.costa[i].equals(nm)) {
			int w = Math.min(((expsz.x - 2) * sk.costv[i]) / (attr.comp * 100),
					 expsz.x - 2);
			if(sk.costv[i] > (attr.comp * 100))
			    g.chcolor(REQ_NOT_ENOUGH);
			else
			    g.chcolor(REQ_ENOUGH);
			g.frect(expc.add(1, expsz.y / 2), new Coord(w, (expsz.y / 2)));
			break;
		    }
File
CharWnd.java
Developer's decision
Combination
Kind of conflict
Array access
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
		    ski.setsk(sk);
		}
	    };
<<<<<<< HEAD
	new Label(new Coord(250, 170), container, "Available:");
	this.nsk = new SkillList(new Coord(250, 185), new Coord(170, 120), container) {
=======
	new Label(new Coord(250, 170), this, "Available:");
	this.nsk = new SkillList(new Coord(250, 185), new Coord(170, 120), this) {
		protected void drawsk(GOut g, Skill sk, Coord c) {
		    int astate = sk.afforded();
		    if(astate == 3)
			g.chcolor(255, 128, 128, 255);
		    else if(astate == 2)
			g.chcolor(255, 192, 128, 255);
		    else if(astate == 1)
			g.chcolor(255, 255, 128, 255);
		    super.drawsk(g, sk, c);
		    g.chcolor();
		}
		
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
		protected void changed(Skill sk) {
		    if(sk != null)
			csk.unsel();
Solution content 
		    ski.setsk(sk);
		}
	    };
	new Label(new Coord(250, 170), container, "Available:");
	this.nsk = new SkillList(new Coord(250, 185), new Coord(170, 120), container) {
		protected void drawsk(GOut g, Skill sk, Coord c) {
		    int astate = sk.afforded();
		    if(astate == 3)
			g.chcolor(255, 128, 128, 255);
		    else if(astate == 2)
			g.chcolor(255, 192, 128, 255);
		    else if(astate == 1)
			g.chcolor(255, 255, 128, 255);
		    super.drawsk(g, sk, c);
		    g.chcolor();
		}
		
		protected void changed(Skill sk) {
		    if(sk != null)
			csk.unsel();
File
CharWnd.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
	this.ski = new SkillInfo(new Coord(430, 30), new Coord(190, 275), container);
    }
    
<<<<<<< HEAD
    protected void toggle() {
	container.visible = !container.visible;
	resize(container.visible?SZ_FULL:SZ_SHORT);
	btntoggle.change(container.visible?"<<":">>");
    }

=======
    private void decsklist(Collection buf, Object[] args, int a) {
	while(a < args.length) {
	    String nm = (String)args[a++];
	    Indir res = ui.sess.getres((Integer)args[a++]);
	    int n;
	    for(n = 0; !((String)args[a + (n * 2)]).equals(""); n++);
	    String[] costa = new String[n];
	    int[] costv = new int[n];
	    for(int i = 0; i < n; i++) {
		costa[i] = (String)args[a + (i * 2)];
		costv[i] = (Integer)args[a + (i * 2) + 1];
	    }
	    a += (n * 2) + 1;
	    buf.add(new Skill(nm, res, costa, costv));
	}
    }
    
    private Collection acccsk, accnsk;
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
    public void uimsg(String msg, Object... args) {
	if(msg == "exp") {
	    for(int i = 0; i < args.length; i += 4) {
Solution content 
	this.ski = new SkillInfo(new Coord(430, 30), new Coord(190, 275), container);
    }
    
    protected void toggle() {
	container.visible = !container.visible;
	resize(container.visible?SZ_FULL:SZ_SHORT);
	btntoggle.change(container.visible?"<<":">>");
    }

    private void decsklist(Collection buf, Object[] args, int a) {
	while(a < args.length) {
	    String nm = (String)args[a++];
	    Indir res = ui.sess.getres((Integer)args[a++]);
	    int n;
	    for(n = 0; !((String)args[a + (n * 2)]).equals(""); n++);
	    String[] costa = new String[n];
	    int[] costv = new int[n];
	    for(int i = 0; i < n; i++) {
		costa[i] = (String)args[a + (i * 2)];
		costv[i] = (Integer)args[a + (i * 2) + 1];
	    }
	    a += (n * 2) + 1;
	    buf.add(new Skill(nm, res, costa, costv));
	}
    }
    
    private Collection acccsk, accnsk;
    public void uimsg(String msg, Object... args) {
	if(msg == "exp") {
	    for(int i = 0; i < args.length; i += 4) {
File
CharWnd.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method declaration
Chunk
Conflicting content 
	gl.glBegin(GL.GL_TRIANGLES);
	for(int i = 0; i < num * 3; i++) {
	    int idx = indb.get(i);
<<<<<<< HEAD
	    int o = idx * 3;
	    gl.glNormal3f(vert.nrmb.get(o), vert.nrmb.get(o + 1), vert.nrmb.get(o + 2));
	   if(vert.texb != null) {
		int u = idx * 2;
		gl.glTexCoord2f(vert.texb.get(u), vert.texb.get(u + 1));
	    }
	    gl.glVertex3f(vert.posb.get(o), vert.posb.get(o + 1), vert.posb.get(o + 2));
=======
	    for(int o = 0; o < n; o++)
		data[o].set(g, idx);
	    vbuf.set(g, idx);
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
	}
	gl.glEnd();
    }
Solution content 
	gl.glBegin(GL.GL_TRIANGLES);
	for(int i = 0; i < num * 3; i++) {
	    int idx = indb.get(i);
	    for(int o = 0; o < n; o++)
		data[o].set(g, idx);
	    vbuf.set(g, idx);
	}
	gl.glEnd();
    }
File
FastMesh.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
import java.util.Comparator;
import java.util.List;

<<<<<<< HEAD
public class GItem extends AWidget {
    public static volatile long infoUpdated = 0;
    
=======
public class GItem extends AWidget implements ItemInfo.ResOwner {
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
    public Indir res;
    public int meter = 0;
    public int num = -1;
Solution content 
import java.util.List;

public class GItem extends AWidget implements ItemInfo.ResOwner {
    public static volatile long infoUpdated;
    public Indir res;
    public int meter = 0;
    public int num = -1;
File
GItem.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
    public Glob glob() {
	return(ui.sess.glob);
    }
<<<<<<< HEAD
    
    public String resname(){
	Resource r = res.get();
	if(r != null){
	    return r.name;
	}
	return "";
    }
    
    public List info() {
	if(info == null) {
	    info = buildinfo(rawinfo);
	}
=======

    public List info() {
	if(info == null)
	    info = ItemInfo.buildinfo(this, rawinfo);
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
	return(info);
    }
Solution content 
    public Glob glob() {
	return(ui.sess.glob);
    }

    public List info() {
	if(info == null)
	    info = ItemInfo.buildinfo(this, rawinfo);
	return(info);
    }
File
GItem.java
Developer's decision
Version 2
Kind of conflict
If statement
Method declaration
Method signature
Chunk
Conflicting content 
import java.awt.RenderingHints;
import java.io.*;
import java.nio.*;
<<<<<<< HEAD
import java.text.SimpleDateFormat;
=======
import java.lang.reflect.*;
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03
import java.util.prefs.*;
import java.util.*;
import java.awt.Graphics;
Solution content 
import java.awt.RenderingHints;
import java.io.*;
import java.nio.*;
import java.text.SimpleDateFormat;
import java.lang.reflect.*;
import java.util.prefs.*;
import java.util.*;
import java.awt.Graphics;
File
Utils.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import java.awt.Color;
import java.awt.image.BufferedImage;
<<<<<<< HEAD
import java.util.List;
=======
import java.util.*;
import static haven.ItemInfo.find;
>>>>>>> 3187c8c7b603df3d655e9aa985bfe7506231ea03

public class WItem extends Widget implements DTarget {
    public static final Resource missing = Resource.load("gfx/invobjs/missing");
Solution content 
import java.awt.Color;
import java.awt.image.BufferedImage;
import java.util.List;
import java.util.*;
import static haven.ItemInfo.find;

public class WItem extends Widget implements DTarget {
    public static final Resource missing = Resource.load("gfx/invobjs/missing");
File
WItem.java
Developer's decision
Concatenation
Kind of conflict
Import