Changeset a601a209df9b4408f6e4d2c5aec8338dc800efd6
- Timestamp:
- 03/18/07 16:12:54 (2 years ago)
- git-parent:
- Files:
-
- src/net/driftingsouls/ds2/server/werften/WerftGUI.java (modified) (5 diffs)
- templates/werft.werftgui.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
src/net/driftingsouls/ds2/server/werften/WerftGUI.java
r7cc6d49 ra601a20 110 110 this.out_werftbuilding( werft, conf ); 111 111 } 112 else if( !werft.isBuilding() ) { 113 //Resourcenliste 114 this.out_ResourceList( werft ); 115 112 else if( !werft.isBuilding() ) { 113 SQLResultRow[] shipdata = werft.getBuildShipList(); 114 115 // Resourcenliste 116 Cargo costs = new Cargo(); 117 for( int i=0; i < shipdata.length; i++ ) { 118 costs.addCargo((Cargo)shipdata[i].get("costs")); 119 } 120 121 this.out_ResourceList( werft, costs ); 122 116 123 //Schiffsliste 117 this.out_buildShipList( werft );124 this.out_buildShipList( werft, shipdata ); 118 125 119 126 this.out_wsShipList(werft); … … 189 196 } 190 197 191 private void out_buildShipList(WerftObject werft ) {198 private void out_buildShipList(WerftObject werft, SQLResultRow[] shipdata) { 192 199 t.set_var("werftgui.buildshiplist", 1); 193 200 t.set_block("_WERFT.WERFTGUI", "buildshiplist.listitem", "buildshiplist.list"); 194 201 t.set_block("buildshiplist.listitem", "buildship.res.listitem", "buildship.res.list"); 195 196 SQLResultRow[] shipdata = werft.getBuildShipList();197 202 198 203 Cargo availablecargo = werft.getCargo(false); … … 247 252 t.parse("buildship.res.list", "buildship.res.listitem", true); 248 253 254 SQLResultRow shiptype = Ships.getShipType(ashipdata.getInt("type"), false); 255 249 256 t.set_var( "buildship.id", ashipdata.getInt("id"), 250 257 "buildship.type.id", ashipdata.getInt("type"), 258 "buildship.type.image", shiptype.getString("picture"), 251 259 "buildship.flagschiff", ashipdata.getBoolean("flagschiff"), 252 260 "buildship.type.name", tmptype.getString("nickname") ); … … 258 266 } 259 267 260 private void out_ResourceList(WerftObject werft ) {268 private void out_ResourceList(WerftObject werft, Cargo showonly) { 261 269 t.set_var("werftgui.reslist", 1); 262 270 t.set_block("_WERFT.WERFTGUI", "reslist.res.listitem", "reslist.res.list"); … … 265 273 int frei = werft.getCrew(); 266 274 267 ResourceList reslist = cargo.getResourceList();275 ResourceList reslist = showonly.compare(cargo, false); 268 276 for( ResourceEntry res : reslist ) { 269 277 t.set_var( "res.image", res.getImage(), 270 278 "res.plainname", res.getPlainName(), 271 "res.cargo", res.getCargo 1() );279 "res.cargo", res.getCargo2() ); 272 280 t.parse("reslist.res.list", "reslist.res.listitem", true); 273 281 } templates/werft.werftgui.html
r98d4544 ra601a20 227 227 {/endif} 228 228 {if werftgui.reslist} 229 {!table_begin 850,left} 230 Waren vorhanden:<br /> 229 {!table_begin 810} 230 <h3>Vorhandene Rohstoffe</h3> 231 <table class="noBorderX" style="width:90%; margin-left:auto; margin-right:auto"> 232 <tr> 231 233 <!-- BEGIN reslist.res.listitem --> 232 <span class="nobr"><img style="vertical-align:middle" src="{res.image}" alt="" title="{res.plainname}" />{res.cargo}</span> 234 <td class="noBorderX" style="text-align:center"> 235 <img style="vertical-align:middle" src="{res.image}" alt="" title="{res.plainname}" /><br /> 236 <span class="nobr">{res.cargo}</span> 237 </td> 233 238 <!-- END reslist.res.listitem --> 239 </tr> 240 </table> 234 241 {!table_end} 235 242 <br /> 236 243 {/endif} 237 244 {if werftgui.buildshiplist} 238 {!table_begin 850,left} 239 <table class="noBorderX" width="100%"> 240 <tr><td class="noBorderX">ID</td><td class="noBorderX">Type</td><td class="noBorderX">?</td><td class="noBorderX">Kosten</td></tr> 241 <!-- BEGIN buildshiplist.listitem --> 245 {!table_begin 810,left} 246 <div style="height:400px; overflow:auto;"> 247 <table class="noBorderX" style="width:95%"> 242 248 <tr> 243 <td class="noBorderX"> 244 <a class="forschinfo" href="{werftgui.urlbase}&sess={global.sess}&build={buildship.id}{if buildship.item.id}&item={buildship.item.id}{/endif}">{buildship.type.id}</a> 245 </td> 246 <td class="noBorderX"> 247 {if buildship.item.id} 248 <span style="color:{buildship.item.color}">[Item]</span> 249 {if buildship.item.uses} 250 <span style="font-style:italic">[{buildship.item.uses}]</span> 251 {/endif} 252 {/endif} 253 {if buildship.flagschiff} 254 <span class="smallfont" style="color:#EECC44">[Flagschiff]</span> 255 {/endif} 256 <a class="forschinfo" href="{werftgui.urlbase}&sess={global.sess}&build={buildship.id}{if buildship.item.id}&item={buildship.item.id}{/endif}">{buildship.type.name}</a> 257 </td> 258 <td class="noBorderX"> 259 <a class="forschinfo" href="./main.php?module=schiffinfo&sess={global.sess}&ship={buildship.type.id}" target="_blank">?</a> 260 </td> 261 <td class="noBorderX"> 262 <!-- BEGIN buildship.res.listitem --> 263 <img src="{res.image}" alt="" title="{res.plainname}" />{if res.mangel}<span style="color:red">{/endif}{res.count}{if res.mangel}</span>{/endif} 264 <!-- END buildship.res.listitem --> 265 </td> 266 </tr> 267 <!-- END buildshiplist.listitem --> 268 </table> 249 <td class="noBorderX"></td> 250 <td class="noBorderX" style="text-align:center" colspan="2">Typ</td> 251 <td class="noBorderX" style="text-align:center">Kosten pro Schiff</td> 252 <td class="noBorderX"></td> 253 </tr> 254 <!-- BEGIN buildshiplist.listitem --> 255 <tr> 256 <td class="noBorderX"> 257 {if buildship.item.id} 258 <span style="color:{buildship.item.color}">[Item]</span> 259 {if buildship.item.uses} 260 <span style="font-style:italic">[{buildship.item.uses}]</span> 261 {/endif} 262 {/endif} 263 {if buildship.flagschiff} 264 <span class="smallfont" style="color:#EECC44" title="Flagschiff">[FS]</span> 265 {/endif} 266 </td> 267 <td class="noBorderX"> 268 <img style="vertical-align:middle;width:64px" src="{buildship.type.image}" alt="" /> 269 </td> 270 <td class="noBorderX"> 271 <a class="forschinfo" href="./main.php?module=schiffinfo&sess={global.sess}&ship={buildship.type.id}">{buildship.type.name}</a> 272 </td> 273 <td class="noBorderX"> 274 <!-- BEGIN buildship.res.listitem --> 275 <span class="nobr"><img src="{res.image}" alt="" title="{res.plainname}" />{if res.mangel}<span style="color:red">{/endif}{res.count}{if res.mangel}</span>{/endif}</span> 276 <!-- END buildship.res.listitem --> 277 </td> 278 <td class="noBorderX"> 279 <a class="forschinfo" href="{werftgui.urlbase}&sess={global.sess}&build={buildship.id}{if buildship.item.id}&item={buildship.item.id}{/endif}">bauen</a> 280 </td> 281 </tr> 282 <!-- END buildshiplist.listitem --> 283 </table> 284 </div> 269 285 {!table_end} 270 286 {/endif}
