+ [table][tr][th]Item[/th][th]Produces[/th][/tr]
+ {% for item in items %}
+ {% if item.primary_recipee %}
+ [tr]
+ {% with item.primary_recipee as recipee %}
+
+ [td]
+ {{ item.name }}
+ [/td]
+
+
+
+
+ [td]
+ {{ recipee.output.name }}
+ [LIST]
+ {% for ingredient in recipee.ingredients %}
+ {% if ingredient.item != item %}
+ [*]{{ ingredient.amount }} x {{ ingredient.item.name }}[/*]
+ {% else %}
+ {% if ingredient.amount > 1 %}
+ [*][b]{{ ingredient.amount }} x [/b]{{ ingredient.item.name }}[/*]
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+ [/LIST]
+ [/td]
+ {% endwith %}
+ [/tr]
+ {% endif %}
+ {% endfor %}
+ [/table]
+
+{% endblock context %}
\ No newline at end of file
diff --git a/dj/scon/templates/scon/crafting/forum_efefay.html b/dj/scon/templates/scon/crafting/forum_efefay.html
new file mode 100644
index 0000000..bd5922b
--- /dev/null
+++ b/dj/scon/templates/scon/crafting/forum_efefay.html
@@ -0,0 +1,133 @@
+{% extends "scon/base.html" %}
+
+{% block css %}
+{{ block.super }}
+
+
+
+{% endblock css %}
+
+{% block context %}
+
+| What ya wanna | +What ya needze | +
|---|---|
| {{ ore.name }} | +N/A{% if ore.typ == 13 %} (This is a component you cannot craft){% endif %} | +
| + {{ recipee.output.name }} + | + +
+
|
+ {% endwith %}
+
+ [table]
+ [tr][th][b][font=arial, sans-serif][size=12]Crafting Result [/size][/font][/b]
+ [b][font=arial, sans-serif][size=12](the components you want)[/size][/font][/b][/th][th][b][font=arial, sans-serif][size=12]Prerequisite Materials [/size][/font][/b]
+ [b][font=arial, sans-serif][size=12](what you need to get the result)[/size][/font][/b][/th][/tr]
+ {% for ore in ores %}
+ [tr]
+ [td][color=#595959]{{ ore.name }}[/color][/td]
+ [td]N/A{% if ore.typ == 13 %} (This is a component you cannot craft){% endif %}[/td]
+ [/tr]
+ {% endfor %}
+ {% for item in items %}
+ {% if item.primary_recipee %}
+ [tr]
+ {% with item.primary_recipee as recipee %}
+ [td]
+ {% with recipee.output.parents|length as depth %}
+ [color={% if depth == 0 %}#595959{% elif depth == 1 %}#00b050{% elif depth == 2 %}#1f497d{% else %}#7030a0{% endif %}]{{ recipee.output.name }}[/color]
+ {% endwith %}
+ [/td]
+
+
+ [td]
+ [LIST]
+ {% for ingredient in recipee.ingredients %}
+ [*]{% with ingredient.item.parents|length as depth %}
+ [font=arial, sans-serif][size=12]
+ {% if ingredient.item != item %}
+ {{ ingredient.amount }} x [color={% if depth == 0 %}#595959{% elif depth == 1 %}#00b050{% elif depth == 2 %}#1f497d{% else %}#7030a0{% endif %}]{{ ingredient.item.name }}[/color]
+ {% else %}
+ {% if ingredient.amount > 1 %}
+ [b][i]{{ ingredient.amount }}[/i] x [color={% if depth == 0 %}#595959{% elif depth == 1 %}#00b050{% elif depth == 2 %}#1f497d{% else %}#7030a0{% endif %}]{{ ingredient.item.name }}[/color][/b]
+ {% else %}
+ [b]{{ ingredient.amount }} x [color={% if depth == 0 %}#595959{% elif depth == 1 %}#00b050{% elif depth == 2 %}#1f497d{% else %}#7030a0{% endif %}]{{ ingredient.item.name }}[/color][/b]
+ {% endif %}
+ {% endif %}
+ {% endwith %}[/size][/font][/*]
+ {% endfor %}
+ [/LIST]
+ [/td]
+
+ {% endwith %}
+ [/tr]
+ {% endif %}
+ {% endfor %}
+ [/table]
+
+{% endblock context %}
\ No newline at end of file
diff --git a/dj/scon/views.py b/dj/scon/views.py
index 7864a18..022d568 100644
--- a/dj/scon/views.py
+++ b/dj/scon/views.py
@@ -16,4 +16,17 @@ def crafting(request):
tree = None
c = RequestContext(request, {'tree': tree,
'items': items})
- return HttpResponse(t.render(c))
\ No newline at end of file
+ return HttpResponse(t.render(c))
+
+def crafting_forum(request):
+ t = loader.get_template('scon/crafting/forum_efefay.html')
+ items = models.Item.objects.filter(craftable=True)
+ ores = []
+ for item in items.filter(typ__in=[12, 13]):
+ if len(item.parents()) == 0 and item.primary_recipee():
+ ores.append(item)
+ tree = None
+ c = RequestContext(request, {'tree': tree,
+ 'ores': ores,
+ 'items': items})
+ return HttpResponse(t.render(c))
diff --git a/dj/urls.py b/dj/urls.py
index 8133e37..e8464b3 100644
--- a/dj/urls.py
+++ b/dj/urls.py
@@ -8,7 +8,9 @@ urlpatterns = patterns('',
# url(r'^$', 'dj.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
url(r'^admin/', include(admin.site.urls)),
- url(r'^crafting/', 'dj.scon.views.crafting', name='scon_crafting'),
+ url(r'^crafting/forum/$', 'dj.scon.views.crafting_forum', name='scon_crafting_forum'),
+ url(r'^crafting/$', 'dj.scon.views.crafting', name='scon_crafting'),
+
)
if settings.DEBUG or getattr(settings, 'SERVE_INTERNAL', False):
diff --git a/gui/viewer.py b/gui/viewer.py
index 5ac2be9..ff59fa6 100644
--- a/gui/viewer.py
+++ b/gui/viewer.py
@@ -77,7 +77,7 @@ class Browser(QtGui.QMainWindow):
self.connect(self.bt_back, QtCore.SIGNAL("clicked()"), self.html.back)
self.connect(self.bt_ahead, QtCore.SIGNAL("clicked()"), self.html.forward)
- self.tb_url.setText('Search...')
+ self.tb_url.setText('/crafting/forum')
self.browse()
@@ -87,10 +87,13 @@ class Browser(QtGui.QMainWindow):
Webview widget.
"""
- #url = self.tb_url.text() if self.tb_url.text() else self.default_url
- #self.html.load(QtCore.QUrl(url))
+ url = self.tb_url.text() if self.tb_url.text() else 'page:///'
+ if not str(url).startswith('page://'):
+ url = 'page://' + url
+ self.html.load(QtCore.QUrl(url))
#self.html.setHtml(self.serve())
- self.html.load(QtCore.QUrl('page:///crafting/overview/'))
+
+ #self.html.load(QtCore.QUrl('page:///crafting/forum/'))
self.html.show()
def serve(self, what=None):
diff --git a/logs/__init__.py b/logs/__init__.py
index e3d7ef9..4bf1f8d 100644
--- a/logs/__init__.py
+++ b/logs/__init__.py
@@ -1,13 +1,14 @@
-"""
- Library dedicated to Star Conflict Logs.
-
- Development plan:
- - Make Combat Log parse completely.
- - Make Game Log parse to get information like the local nickname or other needed infos.
- - Create a soft emulation, which keeps track of the basic game outcome / events.
-
- Additional Goals:
- - probably save games in own format to keep space.
- - database entries for kills, encountered players, etc.
-
+# -*- coding: utf-8 -*-
+"""
+ Library dedicated to Star Conflict Logs.
+
+ Development plan:
+ - Make Combat Log parse completely.
+ - Make Game Log parse to get information like the local nickname or other needed infos.
+ - Create a soft emulation, which keeps track of the basic game outcome / events.
+
+ Additional Goals:
+ - probably save games in own format to keep space.
+ - database entries for kills, encountered players, etc.
+
"""
\ No newline at end of file
diff --git a/logs/base.py b/logs/base.py
index a4ae7c0..308abad 100644
--- a/logs/base.py
+++ b/logs/base.py
@@ -1,9 +1,16 @@
+L_CMBT = 'CMBT'
+L_WARNING = 'WARNING'
+L_NET = 'NET'
+L_CHAT = 'CHAT'
class Log(object):
matcher = None
+ trash = False
@classmethod
def is_handler(cls, log):
return False
-
\ No newline at end of file
+
+ def unpack(self):
+ pass
diff --git a/logs/chat.py b/logs/chat.py
index e69de29..4c48b5a 100644
--- a/logs/chat.py
+++ b/logs/chat.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/logs/combat.py b/logs/combat.py
index 8673003..20c635d 100644
--- a/logs/combat.py
+++ b/logs/combat.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
"""
todo:
- English implementation first.
@@ -19,9 +21,10 @@
The typical log entry
"""
import re
-from base import Log
+from base import Log, L_CMBT
class CombatLog(Log):
+ __slots__ = ['matcher', 'trash', '_match_id', 'values']
@classmethod
def _log_handler(cls, log):
if log.get('log', '').strip().startswith(cls.__name__):
@@ -30,7 +33,7 @@ class CombatLog(Log):
@classmethod
def is_handler(cls, log):
- if log.get('logtype', None) == 'CMBT':
+ if log.get('logtype', None) == L_CMBT:
return cls._log_handler(log)
return False
@@ -38,22 +41,28 @@ class CombatLog(Log):
self.values = values
def unpack(self):
+ self._match_id = None
# unpacks the data from the values.
if hasattr(self, 'matcher') and self.matcher:
matchers = self.matcher
if not isinstance(matchers, list):
matchers = [matchers,]
- for matcher in matchers:
+ for i, matcher in enumerate(matchers):
m = matcher.match(self.values.get('log', ''))
if m:
self.values.update(m.groupdict())
+ self._match_id = i
return True
+ # unknown?
+ self.trash = True
# @todo: where does this come from?
class Action(CombatLog):
+ __slots__ = CombatLog.__slots__
pass
class Gameplay(CombatLog):
+ __slots__ = CombatLog.__slots__
matcher = [
# usual: team(reason). explained reason.
re.compile(r"^Gameplay\sfinished\.\sWinner\steam\:\s+(?P